Commit Graph

19 Commits

Author SHA1 Message Date
Matthew Hoops
bb1e60e8b2 Merge remote branch 'upstream/master' into pegasus
Conflicts:
	AUTHORS
	devtools/credits.pl
	gui/credits.h
2012-08-26 16:12:25 -04:00
Thierry Crozat
50136f43c7 COMMON: Expand a bit the KeyState documentation
This follows a bug that was found in the Lure engine where keycode
was used in a place where it should have used ascii.
2012-07-01 01:03:49 +01:00
Matthew Hoops
f58d834cda COMMON: Add a KBD_META key state flag 2012-04-09 11:18:55 -04:00
Johannes Schickel
b3f265696f COMMON: Slight formatting fix. 2011-12-30 17:52:40 +01:00
Filippos Karapetis
a473934abd COMMON: Perform some keymapper-related changes to the KeyState struct
The == operator in KeyState should not be checking for sticky modifier
keys. This allows the keymapper's defined actions to function correctly
in desktop platforms, when sticky modifier keys such as caps lock and
num lock are turned on. Also, added some sanity checks to hasFlags()
and enums for sticky and non-sticky keys
2011-12-30 13:59:55 +02:00
Tarek Soliman
2df4b5385c COMMON: Remove ascii check from KeyState::operator==
ascii is used for display and text input. Operator== shouldn't be used in those cases.

Besides, it breaks the keymapper for non-ascii keys like KEYCODE_LEFT
2011-10-27 10:46:21 -05:00
Johannes Schickel
5491d9306f COMMON: Slight formatting fix. 2011-08-18 23:15:38 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Filippos Karapetis
626e9413fd AmigaOS: Fixed compilation after the latest GSoC code merging (bug #3121350)
svn-id: r54555
2010-11-28 22:12:11 +00:00
Max Horn
4242229c91 COMMON: Make KeyState::hasFlags const
svn-id: r54146
2010-11-08 19:18:13 +00:00
Max Horn
cdf847408b Update Common::KeyState comments
svn-id: r48120
2010-02-23 22:50:28 +00:00
Yotam Barnoy
ef330ed9b4 Patch for bug 2943361 by littleboy, adding full kb modifier support to all engines + GUI and proper keypad handling
svn-id: r48101
2010-02-21 04:04:13 +00:00
Eugene Sandulenko
a0a44ef498 Allow creation of KeyState with zero ascii value.
svn-id: r40501
2009-05-12 19:03:42 +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
Matthew Hoops
9cb70f6ba7 correct a typo (thanks to salty-horse)
svn-id: r34320
2008-09-03 21:37:19 +00:00
Stephen Kennedy
757ed1a094 Moved UserAction and HardwareKey classes into their own respective header files.
Added HardwareKeySet class to manage a devices set of hardware keys.
Started implementing Keymapper class.

svn-id: r33157
2008-07-21 00:11:25 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Max Horn
2bbe67afdf Added more flexible KeyState constructor; updated comment in gui/Key.h
svn-id: r27654
2007-06-23 10:06:39 +00:00
Max Horn
e7a58d9369 Moved keyboard stuff to a separate header file
svn-id: r27640
2007-06-22 23:20:50 +00:00