ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,505 Commits 45 Branches 139 Tags
9ebcaa33e7080098e686c02ec03dff65a0a55174
Commit Graph
65 Commits
Author SHA1 Message Date
Tarek Soliman 1b11139dc5 KEYMAPPER: Switch to using addClearButton() 2011-12-13 08:37:19 -06:00
Tarek Soliman feb04d2164 KEYMAPPER: Add Common::KeyActionEntry for making simple keymap tables 2011-12-12 20:18:40 -06:00
Tarek Soliman b708d6de79 Revert "KEYMAPPER: Make global keymap that is always active" 
This reverts commit ac85d134b3.
 2011-11-02 10:16:16 -05:00
Tarek Soliman 57bc9a21cc KEYMAPPER: Improved clear button 
It uses the fancy new kImageEraser now
 2011-10-28 22:53:30 -05:00
Tarek Soliman 07f1c2032a KEYMAPPER: Add tooltip text for clear buttons 2011-10-28 22:51:53 -05:00
Tarek Soliman b8ef739d14 KEYMAPPER: Only skip the top GUI keymap when populating the active keymap 
This is because the top GUI keymap is for the keymapper dialog itself.
If all GUI keymaps are skipped then when inside a game with the GMM displayed
and the keymapper dialog invoked, the game keymap is displayed even though it
is not the active one.
 2011-10-27 10:46:23 -05:00
Tarek Soliman a5082ffa5d KEYMAPPER: Skip GUI keymap when displaying active keymap in keymapper dialog 
This fixes a problem where opening the keymapper dialog would cause the current game
keymap to be displayed as the active keymap but then changing the keymap selection
back to it would cause the GUI keymap to be displayed as the active one. The GUI keymap
was indeed at the top of the stack but that's not the desired effect.

Also move the pushing and popping of the keymap to Dialog::Open/Close
Also constantify the GUI keymap name
 2011-10-27 10:46:22 -05:00
Tarek Soliman ac85d134b3 KEYMAPPER: Make global keymap that is always active 
Keymapper now has a global keymap outside the active keymap stack.
That global keymap is always checked after the active stack has been checked.
 2011-10-27 10:46:22 -05:00
Tarek Soliman 913b36ab83 KEYMAPPER: Added clear buttons in remap dialog 
This allows clearing of the assigned key for an action.
 2011-10-27 10:46:22 -05:00
Tarek Soliman e4f1277913 KEYMAPPER: Debugging and minor cleanup 2011-10-27 10:46:22 -05:00
Tarek Soliman 5e2ab7435d KEYMAPPER: Fix showing active keymap in remap dialog 2011-10-27 10:46:22 -05:00
Tarek Soliman d5aa988f16 KEYMAPPER: Disable the broken auto mapping code 2011-10-27 09:53:26 -05:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn 7f74c477c6 BACKENDS: Really *really* fix keymapper code 2011-04-29 13:18:41 +02:00
Max Horn 5dd3c24238 BACKENDS: Really fix keymapper 2011-04-29 12:58:01 +02:00
Max Horn cc9ffb58fa BACKENDS: Fix compilation of keymapper code 2011-04-29 12:54:10 +02:00
Ori Avtalion cd6ee0589d JANITORIAL: Format forward declarations to follow convention 2011-04-28 12:20:34 +03:00
Max Horn 668adaa461 GUI: Rename gui/GuiManager.* to gui/gui-manager.* 
svn-id: r54265
 2010-11-16 10:19:01 +00:00
Max Horn 427dc1ae93 GUI: Move major widgets to new directory gui/widgets 
Also renamed the source/header files, now they are more closely
aligned to how we rename most other source files

svn-id: r54264
 2010-11-16 10:11:57 +00:00
Eugene Sandulenko 9e006b74d3 Keymapper: sync with recent GUI changes. 
svn-id: r49796
 2010-06-15 11:02:42 +00:00
Johannes Schickel caf31ee5af Replace various strncpy usages by strlcpy. 
svn-id: r48955
 2010-05-05 17:54:12 +00:00
Max Horn ef93d6921e Make keymapper compilable again 
svn-id: r48278
 2010-03-18 15:05:14 +00:00
Max Horn 490153232a Fix header guard 
svn-id: r47181
 2010-01-08 22:07:56 +00:00
Torbjörn Andersson 72eb9ec9ea Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null 
before freeing it, which isn't necessary.

svn-id: r46941
 2010-01-03 19:37:43 +00:00
Max Horn f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency 
svn-id: r44634
 2009-10-04 21:26:33 +00:00
Johannes Schickel ef71667403 - Adapt DefaultEventManager to use Common::ArtificialEventSource 
- Adapt Keymapper to implement EventMapper interface

svn-id: r42727
 2009-07-25 01:01:05 +00:00
Eugene Sandulenko b9017519fa Rename KeyRemapper dialog to KeyMapper 
svn-id: r41462
 2009-06-12 08:00:26 +00:00
Eugene Sandulenko b0db1b5ed0 Implement FR#2507667: "GUI: Improve PopupWidget rendering / theme layouting". 
- Split out label from PopUp widget
- Aligned every widget on all layouts so GUI becomes to look nice again
- Moved textHAlign to layout properties

svn-id: r41266
 2009-06-06 17:52:44 +00:00
Torbjörn Andersson 0999534749 The error() and warning() functions add ! and newline automatically. (I didn't 
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
 2009-05-31 10:02:16 +00:00
Johannes Schickel b3c6751b9b Strip trailing whitespaces in the whole code base. 
svn-id: r40867
 2009-05-24 15:17:42 +00:00
Eugene Sandulenko ca7cf951a7 Allow ESC button also be assigned in keymapper. 
svn-id: r40511
 2009-05-12 20:40:15 +00:00
Eugene Sandulenko 79777a0076 Increase HW key ID size so all modifiers fit too. 
svn-id: r40446
 2009-05-11 09:04:04 +00:00
Eugene Sandulenko d41db6ae87 Define hardware keys for 101 keyboard in SDL backend. 
TODO: speedup initialization. Now it is quite slowww.

svn-id: r40445
 2009-05-11 09:01:54 +00:00
Eugene Sandulenko 665e472ef0 Keymapper: 
- Introduced new OSystem method getHardwareKeySet() with default implementation
- Moved global keymap creation to base/main.cpp
- Moved GUI keymap creation to gui/GuiManager.cpp
- Added various safeguard checks to various keymapper methods

Now it is really possible to add keymapper to all backends.

svn-id: r40439
 2009-05-10 22:05:04 +00:00
Eugene Sandulenko c7e5cc2935 Actually save keymap after remapping 
svn-id: r40429
 2009-05-10 18:04:47 +00:00
Eugene Sandulenko 7d79a092b5 Store global keymaps into a separate section 
svn-id: r40427
 2009-05-10 17:33:31 +00:00
Eugene Sandulenko 2cc7763971 whitespaces 
svn-id: r40424
 2009-05-10 17:18:59 +00:00
Eugene Sandulenko 87fdc5d544 Original GSoC'08 keymapper now works. 
Plans:
  - Make remap dialog less ugly
  - Port dialog to other resolutions and classic theme
  - Stop polluting config namespaces with keymap
  - Improve automapper
  - Add support to the engines and backends

svn-id: r40404
 2009-05-09 22:36:57 +00:00
Eugene Sandulenko 66067b0b6a Fix keymapper compilation 
svn-id: r40320
 2009-05-05 10:54:56 +00:00
Max Horn edbf8c6720 Yet more cleanup 
svn-id: r35975
 2009-01-21 02:28:14 +00:00
Max Horn b7f7a8c660 Yet more cleanup 
svn-id: r35973
 2009-01-21 02:11:25 +00:00
Max Horn 99c6943e3d Fix what I believe to be an error in Keymapper::cleanupGameKeymaps 
svn-id: r35972
 2009-01-21 02:07:23 +00:00
Max Horn 250acd4c8d more cleanup 
svn-id: r35971
 2009-01-21 02:02:55 +00:00
Max Horn 9abce1b894 Some cleanup / code simplification 
svn-id: r35970
 2009-01-21 01:26:04 +00:00
Max Horn c69638d915 Added keymapper code to build system (still disabled unless ENABLE_KEYMAPPER is set); made some code fixes (still not working properly, but it is a start) 
svn-id: r35897
 2009-01-18 14:46:53 +00:00
Stephen Kennedy df3b8fd14c Added preprocessor flags 'ENABLE_VKEYBD' and 'ENABLE_KEYMAPPER' to control inclusion of vkeybd and keymapper in build.\n\nAlso added corresponding --enable-vkeybd and --enable-keymapper flags to configure scripts. 
svn-id: r34706
 2008-09-30 13:51:01 +00:00
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 2d52f129bb Fix for key repeat bug 
svn-id: r34094
 2008-08-22 10:36:12 +00:00
Stephen Kennedy 3451895189 Final changes to keymapper: 
* HardwareKey's now have a type too, so that we can either match a key to an action or vice versa.
* Better test keymaps - with special gui keymap that is activated when a dialog is opened

svn-id: r34005
 2008-08-18 19:54:46 +00:00
Stephen Kennedy 12d649f011 remap dialog updates 
svn-id: r33990
 2008-08-18 15:13:55 +00:00