Commit graph

40 commits

Author SHA1 Message Date
Eugene Sandulenko
70b7ebb339 Patch #2826508: "Motorola A1200/E6/A1600 (motoezx) patch"
svn-id: r43636
2009-08-22 12:35:49 +00:00
Eugene Sandulenko
c295f524b2 Implement feature request #1180217: "GUI: Mute option"
svn-id: r41233
2009-06-06 17:36:06 +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
e46d81b822 Fix GUI keymap.
svn-id: r40405
2009-05-09 23:01:02 +00:00
Bertrand Augereau
bb2540a4d1 Renamed aspectRatio to aspectRatioCorrection in the SDL backend to match the accessor functions
(don't worry, o reader, for this is the only modification going to the SVN :) )

svn-id: r40226
2009-05-01 09:09:07 +00:00
Max Horn
b7f7a8c660 Yet more cleanup
svn-id: r35973
2009-01-21 02:11:25 +00:00
Eugene Sandulenko
83972e2001 Merge in Virtual Keybpard & KeyMapper branch,
- Merge is perfromed in order to not let rotting the code
- Makefile modifications were avoided

Stuff to resolve:
- Circular dependency of common/vkeybd from graphics/
- Make it compilable (?)
- Add some keyboards
- Decide on the key bindings

svn-id: r35813
2009-01-11 00:20:27 +00:00
Johannes Schickel
a33a5d0f14 Fixed the way how screen changes are tracked. This should fix a crash when doing an RTL from COMI when a 3x scaler is enabled.
svn-id: r35685
2009-01-02 21:52:32 +00:00
Johannes Schickel
5a0556f09c Committed my patch #2123680 "SDL: Backend transaction / rollback support".
svn-id: r35062
2008-11-14 22:08:10 +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
a7bb113e83 Merged revisions 33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621,33623,33626-33627,33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716,33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766,33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919,33928,33930,33932-33936,33938-33940,33942-33943,33948,33950,33953,33967,33973,33976,33978,33980,33985,33991,33993,33999-34000,34006,34009,34011,34013,34015,34019,34021-34023,34025,34027-34028,34030,34032-34034,34036,34038-34039,34041,34046-34048,34050-34055,34057,34059-34065,34067,34072,34074,34076,34078-34081,34084,34086-34087,34089-34090,34093,34096-34102,34104,34107,34113,34116,34119,34122,34124,34126,34128,34131-34132,34135,34138,34141,34144,34146,34149,34152-34154,34156-34157,34160,34163-34164,34169,34173,34179-34194,34196-34198,34200-34201,34205-34206,34208-34217,34219-34225,34227-34228,34234-34237,34239-34249,34251-34279,34281-34284,34286-34288,34290-34320,34323-34324,34326,34328-34329,34332,34334,34336,34338-34340,34343-34353,34356-34357,34359-34371,34373,34375,34378,34381-34382,34384-34385,34389-34391,34393-34394,34396-34397,34399-34405,34407-34409,34411,34413,34415,34417-34420,34423-34426,34428-34438,34440-34454,34456-34458,34460,34462-34469,34472,34474,34479-34481,34483-34498,34501-34505,34508,34511-34518,34520-34524,34526-34563,34566-34569,34571-34590,34592,34595-34599,34602-34603,34605,34613-34615,34617,34619-34624,34627-34628,34630-34639,34642-34649 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r34654
2008-09-26 21:53:08 +00:00
Johannes Schickel
f8574c52f8 Fixed full screen toggling via alt+enter.
svn-id: r34627
2008-09-22 17:33:30 +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
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
c61294e70f Changed Action constructor to take a pointer to the Keymap it belongs too, meaning Keymap::addAction is automatically called
svn-id: r33885
2008-08-14 23:45:02 +00:00
Stephen Kennedy
86d0c8cb11 Fixed simple keymap test
svn-id: r33874
2008-08-14 21:21:05 +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
532faef82b Keymapper WIP:
* Improved automatic mapping algorithm
* Remap dialog overhaul - now displays active keymap(s)

svn-id: r33821
2008-08-13 11:46:08 +00:00
Stephen Kennedy
300a1df2b0 Remap dialog WIP
svn-id: r33791
2008-08-11 23:08:21 +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
Johannes Schickel
73da6ab51e - Removed -Wconversion from compiler options for g++ 4.3, it's behavior has fundamently changed in g++ 4.3
- Added -Wno-empty-body and -Wno-parentheses as compiler flags for g++ 4.3 for *now* (we should think of removing -Wparentheses though)
- Fixed some warnings for g++ 4.3 (only for the engines I'm using)

svn-id: r32540
2008-06-04 17:20:25 +00:00
Paul Gilbert
806ac51e45 Added events for the middle mouse button - EVENT_MBUTTONDOWN and EVENT_MBUTTONUP
svn-id: r30068
2007-12-29 09:48:49 +00:00
Nicola Mettifogo
e74af15a7f Workaround for bug #1763018. Since Amiga key doesn't work as a modifier with SDL, we're allowing Amiga users to quit with Ctrl-z or Alt-x. This also fixes bug #1762886.
svn-id: r29826
2007-12-11 20:21:44 +00:00
Max Horn
9402981517 SDL backend cleanup (minor)
svn-id: r28520
2007-08-11 08:44:43 +00:00
Max Horn
45aea284d1 whitespaces
svn-id: r27787
2007-06-30 12:39:12 +00:00
Max Horn
f97cbb8294 Update GUI::Key constructs
svn-id: r27643
2007-06-23 00:05:32 +00:00
Max Horn
2b23374468 Converted lots of code to use Common::ASCII_* and COMMON::KEYCODE_* constants. This also revealed the evil mixing of keycodes and ascii we do in many places :-/
svn-id: r27616
2007-06-22 20:04:44 +00:00
Matthew Hoops
2496c5b554 fix compile (thanks salty-horse!)
svn-id: r27614
2007-06-22 18:57:07 +00:00
Max Horn
55f93678b8 Heavily modified/reduced version of patch #1741454 (EVENTS: ASCII enum)
svn-id: r27612
2007-06-22 17:51:51 +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
Torbjörn Andersson
6a9eb08ac7 Fixed indentation.
svn-id: r26308
2007-03-27 14:28:48 +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
Max Horn
352ed7299f Patch #1605290: Change quit shortcut for Amiga to match style guide
svn-id: r24803
2006-12-03 15:42:41 +00:00
Max Horn
ca7880df6c Added new method OSystem::getScreenChangeID(), which can be used by code to track screen changes even without getting all EVENT_SCREEN_CHANGED events
svn-id: r23661
2006-08-04 13:10:28 +00:00
Torbjörn Andersson
6358547a43 More whitespace changes.
svn-id: r23496
2006-07-14 13:33:58 +00:00
Max Horn
492c65009c Started to move 'monolithic' parts of our ports to the new 'background/platform' directory (see also the 'Modular_Backends' page in our Wiki)
svn-id: r23293
2006-06-24 12:33:52 +00:00
Renamed from backends/sdl/events.cpp (Browse further)