Commit graph

60 commits

Author SHA1 Message Date
Chris Taylor ea2de8cb44 Get the clock, 'keypad' info, texture choosing page and object choosing page to draw (latter two just show black squares for ogl) 2012-04-09 10:14:10 +08:00
Chris Taylor fd42ac5cb1 Make the editor draw the same for the non-ogl build as the ogl build, since I just made it draw the grey background over everything in the last commit. If you want to see what it's *supposed* to look like, go to yesterday's commit :P 2012-03-31 20:25:09 +08:00
Chris Taylor cb86ece872 Use correct coordinates for dialog border (still doesn't draw fully) 2012-03-31 19:55:39 +08:00
Chris Taylor b937b4e409 Make the main stuff (gadgets, two viewers) draw for the editor in ogl, still more tweaking required 2012-03-31 18:36:07 +08:00
Chris Taylor 2b7bb2bddc Fix bug where pad buttons would disappear when clicking on them, after opening then closing a dialog 2012-03-24 17:52:08 +08:00
Chris Taylor 4acf60c1c7 Draw in response to EVENT_UI_DIALOG_DRAW, uncomment medlisp_update_screen call. You can now see what you're doing 2012-03-24 17:19:30 +08:00
Chris Taylor c0ed4870c5 Draw the editor menubar properly - by drawing in response to EVENT_WINDOW_DRAW and initialising the screen canvas properly. The latter fixes a lot of other editor drawing issues as well 2012-03-24 13:27:27 +08:00
Chris Taylor 2d54617b91 Remove redundant ui_event_process and duplicate mouse.c in ui/. All editor input is now event-based. 2012-03-18 18:03:29 +08:00
Chris Taylor 8d784e848b Make editor_handler into a proper callback, iron some problems out. Seems to draw a different bunch of stuff now (still erroneous) 2012-03-18 16:02:32 +08:00
Chris Taylor 97d3f3b4e4 Make do_trigger_window into a proper callback 2012-03-17 17:39:24 +08:00
Chris Taylor ffab790447 Use the gadget-sent events in the dialogs in ui 2012-03-05 19:08:41 +08:00
Chris Taylor dc84147b51 All gadgets now send events 2012-03-03 20:19:15 +08:00
Chris Taylor e50a82c743 Actually add editor data files and make sure DXX can find them 2012-03-03 16:03:03 +08:00
Chris Taylor c0d7659a9c Give the last use of a dialog in ui, in PopupMenu, a callback 2012-01-09 23:17:10 +08:00
Chris Taylor ce2b13c956 Give the dialog in MessageBoxN a callback 2012-01-03 17:24:31 +08:00
Chris Taylor 5336ee198d Give the dialog in (also presently unused) MenuX a callback 2012-01-03 16:23:13 +08:00
Chris Taylor 11daae4a2d Give the dialog in (presently unused) GetKeyCode a callback 2012-01-03 13:25:53 +08:00
Chris Taylor ead5b43319 Give ui_get_filename a callback for its dialog. Happy new year 2012-01-02 15:49:59 +08:00
Chris Taylor 16b5d1b101 Make editor menubar and associated menus into windows; either remove or make event-based all the B1_* macros 2011-12-31 17:12:09 +08:00
Chris Taylor 9da79266ee Remove redundant canvas, next and prev members in the UI_DIALOG struct 2011-12-18 20:41:31 +08:00
Chris Taylor 4a3b1532b1 Make ui_userbox_do fully event-responsive 2011-11-14 19:27:59 +08:00
Chris Taylor 3c2f291b5e Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before) 2011-11-12 12:48:26 +08:00
Chris Taylor c52b571391 Make ui_radio_do fully event-responsive 2011-11-06 20:06:41 +08:00
Chris Taylor 576054be55 Make ui_listbox_do fully event-responsive 2011-11-06 11:06:38 +08:00
Chris Taylor 203314b8e7 Say when the event was handled for ui_inputbox_do (was already event-responsive) 2011-11-05 20:12:39 +08:00
Chris Taylor aee464c4ac Fix implicit function declaration in last commit, make ui_icon_do fully event-responsive 2011-11-05 19:45:27 +08:00
Chris Taylor aaeaa30c7b Make ui_checkbox_do fully event-responsive 2011-11-05 17:46:05 +08:00
Chris Taylor 008b24a451 Make B1_JUST_PRESSED event-based, leave ui_dialog_do_gadgets early if a key makes another gadget current, make ui_button_do fully event-responsive (but won't *send* events yet) 2011-11-05 17:08:17 +08:00
Chris Taylor 6978ef2dd0 Return 1 (event handled) in ui_dialog_handler for mouse button events if the mouse was in the dialog 2011-10-30 19:09:11 +08:00
Chris Taylor b8b6a234c2 Pass the event to the individual gadgets' 'do' functions, fix compile warnings introduced in last commit 2011-10-25 09:39:35 +08:00
Chris Taylor 25c1b74e57 Pass the event to ui_dialog_do_gadgets and use it in that immediate function 2011-10-23 17:08:47 +08:00
Chris Taylor 96e619ae29 Move calls to ui_dialog_do_gadgets to the dialog event handler, making sure ui_event_handler gets called beforehand 2011-10-09 20:31:39 +08:00
Chris Taylor 5dc76799f2 Add support for 'modeless' windows - windows that will allow events to be passed on to the underlying window. Intended for the editor 2011-10-09 18:32:53 +08:00
zicodxx aa8286c1d6 Fixed set but unused variables 2011-09-27 01:31:19 +02:00
Chris Taylor 94f896c169 Move EVENT_MOUSE_DOUBLE_CLICKED support from ui/mouse.c to arch/sdl/mouse.c for tidiness and to possibly use it outside the editor 2011-09-12 11:03:57 +08:00
zicodxx dd991fbf6b Got rid of cfile code: Renamed cfile-functions to use PHYSFSX-naming convention, Replaced cfile-macros with proper PHYSFS(X) calls; Introduced PHYSFSX_exists() which can check case-sensitive or case-insensitive to give more flexibility with game content 2011-06-01 09:59:55 +02:00
Chris Taylor eca34c30f5 Rename ui/window.c to ui/dialog.c to avoid confusion with arch/sdl/window.c, also rename UI_WINDOW to UI_DIALOG, rename all associated functions, constants, parameters, local variables etc too; make a window when making a UI_DIALOG (does nothing yet) 2011-01-17 22:42:18 +08:00
Chris Taylor 335a99eedc Fix cursor recentering issues - comment out redundant event_toggle_focus(1) calls in kconfig.c and newmenu.c and use event_toggle_focus(0) in ui_mouse_show() 2011-01-17 16:11:24 +08:00
Chris Taylor 030aef43e3 For editor, replace use of ui_mega_process() with event_process(), with the editor's own default event handler; add EVENT_MOUSE_MOVED event with event_mouse_get_delta() accessor; add event_key_get() to replace ugly casting; rename mouse_get_button() with event_mouse_get_button() to keep with name convention; only send idle events when there are no input events so editor still works properly (or the same anyway); add and use event_send() function for input events (including idle) 2011-01-14 17:51:13 +08:00
Chris Taylor 5cbfece8c4 Copy some editor stuff from d1x-rebirth to d2x-rebirth, like use of the OS native cursor 2010-12-24 12:34:30 +08:00
Chris Taylor b82e1c9c61 Put event_process() in ui_mega_process(), getting editor to (mostly) work 2010-12-22 22:14:46 +08:00
Chris Taylor 22102a3c23 Activate EDITOR for Mac OS X in Xcode, d2x target; fix some warnings and errors 2010-12-22 10:56:28 +08:00
Chris Taylor c00d35f0eb Activate EDITOR for Mac OS X in Xcode, d2x target; fix some warnings and errors 2010-12-21 11:35:50 +08:00
zicodxx 3bcb0ecdde Introduced new data type fix64 to be used for new timers which can last 4462756 years instead of 9 hours; Introduced new timer functions to update and query program time; Used new timer all over the program except GameTime (which comes next) 2010-12-11 00:18:17 +01:00
zicodxx a23618f961 Patching together editor so it compiles again (while still not running); Implemented PhysFS for file accessing for editor- and debugging-related code 2010-08-19 13:32:33 +00:00
kreatordxx bf512bb9ec Remove redundant conf.h directives 2009-04-30 13:01:31 +00:00
zicodxx 02b1872aa9 Yet another UNICODE overhaul - Using seperate buffer for UNICODE chars and only use it in key_ascii() while still using keysyms for the rest of the program so we do not screw up readings by key values altered by modifers - possibly still room to optimize 2008-11-17 23:38:43 +00:00
zicodxx 9cc62df60d Always use printable UNICODE characters for the key_handler and included routine to assign key symbols to UNICODE so we get an equivalent of a Key-Released state which we need for the Keyboard buffer; Removed the shifted_ascii_value field from key_props and stored all usable characters in seperate rows; Improves Text input and makes keyboard mapping independent from keyboard layout without breaking any compability 2008-10-31 16:57:36 +00:00
zicodxx b772706508 Return unicode characters in key_to_ascii for non-EN keyboard layouts; Fixed sound menu issue if not compiled with SDL_mixer; switched -ip_norelay to -ip_relay since it's not tested enough; Renamed jukebox_free() to jukebox_unload() to stay with naming-convention 2008-05-07 14:02:01 +00:00
kreatordxx a62060bacf show a messagebox if there's an error and graphics are initialised, update Xcode project 2008-04-08 12:51:21 +00:00