Commit graph

493 commits

Author SHA1 Message Date
Stephen Kennedy
baae044e38 Proper fix for key repeat bug - r34094 caused different problems due to repeated key up events
svn-id: r34115
2008-08-23 17:04:40 +00:00
Stephen Kennedy
d92909203b - proper init of virtual keyboard now implemented (involved added EventManager::init() which is called after screen has been initialised)
- changed HardwareKey / Action id field to an array of 4 chars instead of int32. Means that the keymap key/value pairs in config file are more readable.

svn-id: r33986
2008-08-18 10:07:11 +00:00
Stephen Kennedy
63c4a61032 Various virtual keyboard bug fixes
svn-id: r33969
2008-08-17 12:11:34 +00:00
Stephen Kennedy
fca5a0ad34 Virtual Keyboard:
* added support for submit, cancel, backspace, and cursor movement commands
* minor API modifications

svn-id: r33887
2008-08-15 01:21:29 +00:00
Stephen Kennedy
70dde2d8bd RemapDialog now properly uses reflowLayout() and open(), so that the same instance can be reopened
svn-id: r33843
2008-08-13 19:24:52 +00:00
Stephen Kennedy
4eacc09024 Keymapper WIP:
* Got rid of default keymaps as they over-complicated the API
* Remapping dialog WIP

svn-id: r33699
2008-08-08 14:23:59 +00:00
Stephen Kennedy
2645ca48ad * Moved VK code into backends/vkeybd
* Moved Keymapper code into backends/keymapper

svn-id: r33681
2008-08-07 16:38:39 +00:00
Stephen Kennedy
57b13141af Keymapper WIP:
* Implemented stack-based active map in Keymapper
* Started proper testing by adding code to OSystem_SDL to set up simple HardwareKeySet and Keymap

svn-id: r33660
2008-08-06 14:21:05 +00:00
Stephen Kennedy
dfcdbb0d33 KeymapManager - implemented loading/saving of keymaps
- Refactoring of code to map a key to a UserAction - now we call a method on UserAction to do it (and it then tells the Keymap class)
- General cleanup of code

svn-id: r33262
2008-07-24 10:00:56 +00:00
Stephen Kennedy
2f064da102 Most of Keymapper class complete
DefaultEventManager now initialises Keymapper and passes key press events to it

svn-id: r33227
2008-07-23 08:45:12 +00:00
Stephen Kennedy
a58080bd58 Changed pushEvent to use a const& argument
svn-id: r33175
2008-07-21 18:53:55 +00:00
Christopher Page
7f480ac571 Quit and RTL code is more modular now. EVENT_RTL no longer sets _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT. EVENT_RTL and EVENT_QUIT are completely separate from each other. Engine::quit() method now checks both _shouldQuit and _shouldRTL to determine if the engine should exit. There is no longer a need for resetQuit(), so it's removed
svn-id: r33082
2008-07-16 04:22:56 +00:00
Christopher Page
7ecd54a9da Reverted some incorrect changes and fixed sound settings issues for LURE. Fixed issues with quitting and calling GMM during intro sequences in LURE. Added a KEYCODE_MAINMENU in common/keyboard.h for the GMM.
svn-id: r33081
2008-07-15 22:54:39 +00:00
Christopher Page
a6e1d6bd3d SKY works with the new GMM implementation, also updated gui/newgui.cpp and prevented pushEvent from pushing more than one EVENT_QUIT into the artificialEventQueue
svn-id: r33041
2008-07-13 20:41:39 +00:00
Stephen Kennedy
28cb417fb1 Added comments in virtual-keyboard-parser.h describing the file format. Added a delay functionality to the delivery of artificial events in DefaultEventManager, to get round events being ignored when delivered consecutively.
svn-id: r33012
2008-07-12 12:40:57 +00:00
Stephen Kennedy
8aa09cbb99 Better handling of virtual keyboard and gui being displayed at the same time. VK now also uses its own cursor.
svn-id: r33008
2008-07-11 20:10:14 +00:00
Christopher Page
67c8c39fdf Queen works with the new GMM implementation, and made a correction to a change in parallaction
svn-id: r32999
2008-07-11 00:49:01 +00:00
Stephen Kennedy
1f0b3ceb36 Added pushEvent to EventManager (from cpage88's branch) and changed VirtualKeyboard so that it uses this method to feed key presses its resulting key press events.
svn-id: r32977
2008-07-09 13:33:36 +00:00
Christopher Page
e808cdf7a0 Reimplemented pushEvent() and artificialEventQueue to work with Events instead of EventTypes. Reimplemented Queue as a List instead of Array. Updated AGOS, AGI, CINE, GOB, and KYRA to work with the current implementation of the GMM
svn-id: r32971
2008-07-09 02:27:05 +00:00
Christopher Page
a4f56de13a Implemented Common::EventManager::pushEvent() to insert fake events into the event queue. Quit and RTL events have been added, and are now tracked by the DefaultEventManager using shouldQuit() and shouldRTL(). AGOS is working with this new implementation, other engines to follow.
svn-id: r32952
2008-07-07 22:34:45 +00:00
Stephen Kennedy
275ffece2f - changed VirtualKeyboard classes to Common namespace
- updated XMLParser from Tanoku's branch

svn-id: r32943
2008-07-07 15:42:26 +00:00
Stephen Kennedy
5840c2480f - renaming of files
svn-id: r32942
2008-07-07 15:06:43 +00:00
Stephen Kennedy
7e3639e68b - moved VirtualKeyboard files into backends/common directory
svn-id: r32941
2008-07-07 14:52:30 +00:00
Stephen Kennedy
98f999f8e0 WIP: VirtualKeyboard updates:
- got keyboard bitmap displaying (no transparency as yet)
- simple event loop for VK to capture mouse clicks done (and untested code to process the clicks)
- pollEvent() method to deliver the virtual key press events to EventManager

svn-id: r32939
2008-07-07 14:30:11 +00:00
Christopher Page
a14a0d16c1 Changes to implementation of the GMM
svn-id: r32872
2008-07-02 00:30:49 +00:00
Christopher Page
d0dcc1ad79 Quit or RTL from the main menu now triggers an EVENT_QUIT in DefaultEventManager::pollEvent()
svn-id: r32813
2008-06-26 22:03:49 +00:00
Christopher Page
f878820bbe Created Global Main Menu Dialog. Made a uniform _quit flag for engines. So far agi, agos, and cine are now using the new _quit flag.
svn-id: r32770
2008-06-24 21:15:30 +00:00
Filippos Karapetis
0bdd409d4b Remove double inclusion of config-manager.h
svn-id: r30951
2008-02-24 13:37:29 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Johannes Schickel
28ef622faa Silence warning.
svn-id: r29087
2007-09-24 17:15:21 +00:00
Eugene Sandulenko
77eea722af Modified patch #1738058: "Action recorder".
svn-id: r28968
2007-09-19 13:55:05 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
a64b12bb03 Only invoke g_engine->pauseEngine if g_engine != NULL
svn-id: r27831
2007-07-01 18:22:25 +00:00
Max Horn
fed38a794f Added Engine::pauseEngine method (allows outside code, like the backend, to pause/resume the active engine); made the global 'confirm exit' dialog use that feature; implemented ScummEngine::pauseEngine
svn-id: r27797
2007-06-30 18:22:21 +00:00
Max Horn
c7fa7baf1f Added global support for the (so far undocumented) confirm_exit config key
svn-id: r27788
2007-06-30 12:43:53 +00:00
Max Horn
bd9ba26109 Modified version of patch #1740493 (EVENTS: Event Key Codes)
svn-id: r27592
2007-06-21 18:35:15 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
2007-03-17 19:02:05 +00:00
Torbjörn Andersson
53624376b4 Applied my re-revised patch #1487149 ("Simplified keyboard repeat"), with
Fingolfin's blessings. Keyboard repeat is now handled by the event manager,
rather than by individual engines.

Since this can cause problems with some engines (see the AGI engine), the extra
"key down" events are marked as "synthetic", so that they can be ignored if
necessary.

svn-id: r26170
2007-03-17 15:44:26 +00:00
Max Horn
e72455c215 cleanup
svn-id: r26169
2007-03-17 14:34:50 +00:00
Max Horn
86ba69f75b oops
svn-id: r26157
2007-03-17 01:11:46 +00:00
Max Horn
8fc8c4847d Implemented a simple EventManager class
svn-id: r26154
2007-03-17 00:07:34 +00:00