libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 18:02:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,655 Commits 5 Branches 5 Tags 1.8 GiB
d494db888e
Commit Graph

62 Commits

Author SHA1 Message Date
Matthew Hoops
5159996cec KEYMAPPER: Have clicking on another remap button disable remapping 
Prevents the remapping code from being activated twice (throwing an assertion)
 2014-02-20 01:06:50 -05:00
Johannes Schickel
594aaad38f KEYMAPPER: Make GPL headers consistent in themselves. 2014-02-18 02:39:35 +01:00
Tarek Soliman
d12f21b31d KEYMAPPER: Map non-key custom input events 
This also makes the keymapper be in charge of keymapping logic
 2012-03-02 20:48:50 -06:00
Tarek Soliman
4ee1a3acea KEYMAPPER: Add non-key inputs to HardwareInput 2012-03-02 20:48:50 -06:00
Tarek Soliman
6afac4e01e KEYMAPPER: Rename HardwareKey to HardwareInput 2012-02-27 13:00:56 -06:00
Tarek Soliman
56e517fdad KEYMAPPER: Add some comments 2012-02-20 12:26:25 -06:00
Tarek Soliman
6c4d65e53f KEYMAPPER: Change how keymaps are displayed in the remap dialog 
This makes it so that there's 2 groups:
1 - The keymap stack
2 - The loaded keymaps

The first group displays which keymaps are active and which keymaps
are completely blocked due to an opaque keymap on top.

The second group displays which loaded keymaps store their mappings
globally and which ones store their mappings per-target.
 2012-02-20 10:52:50 -06:00
Tarek Soliman
a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast 
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
 2012-02-15 10:07:10 -06:00
Tarek Soliman
921f602ab8 JANITORIAL: Fix whitespace in pointer template arg 2012-02-15 10:07:08 -06:00
Tarek Soliman
06b5299461 KEYMAPPER: Fix re-selecting the top keymap 
Re-selecting the top entry would always populate the actions
from the GUI keymap since it is the active keymap (the remap
dialog itself is GUI)

The top keymap was correct during RemapDialog::open() because
the gui keymap had not been pushed to the stack yet.
 2012-02-09 02:49:21 -06:00
Tarek Soliman
38dea529e8 KEYMAPPER: Display active keymap stack in remap dialog popup list 
This should make it clear what keymaps are on the stack and in
what order.

Also renamed the label of the top "special" entry in the list to
"(Effective)" since it displays the top keymap's action and also
displays reachable mapped actions from other active keymaps.
 2012-02-09 02:15:35 -06:00
Tarek Soliman
9de279b2ab KEYMAPPER: Fix active keymap name displayed in remap dialog 
This workaround no longer applies and is in fact causing a bug
in the name of active keymap
 2012-02-05 19:01:51 -06:00
Tarek Soliman
07f1d33ef7 KEYMAPPER: Fix annoying debug message 2012-02-04 20:47:12 -06:00
Tarek Soliman
82e0900678 KEYMAPPER: Rename inherit flag to transparent 
Less confusing
 2012-01-07 21:10:05 -06:00
Tarek Soliman
b89bc000d9 KEYMAPPER: Remap dialog shows buttons before labels 2011-12-30 15:52:40 -06:00
Tarek Soliman
16d529cdc3 KEYMAPPER: Use single column in remap dialog 
This is to allow for long labels like in the eob keymap
 2011-12-30 15:52:40 -06:00
Tarek Soliman
0e0eddbab3 KEYMAPPER: Fix clear button behavior in remap dialog 
This is a regression from 1b11139dc5
 2011-12-30 13:13:41 -06:00
Tarek Soliman
1b11139dc5 KEYMAPPER: Switch to using addClearButton() 2011-12-13 08:37:19 -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
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
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
Max Horn
ef93d6921e Make keymapper compilable again 
svn-id: r48278
 2010-03-18 15:05:14 +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
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
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
c7e5cc2935 Actually save keymap after remapping 
svn-id: r40429
 2009-05-10 18:04:47 +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
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