Commit Graph

55 Commits

Author SHA1 Message Date
Johannes Schickel
9d4cb7c23c Add missing tokenizer.h include.
svn-id: r48326
2010-03-20 16:45:11 +00:00
Max Horn
8ac5d00d57 Hide ZipArchive implementation, only expose it via factory functions: makeZipArchive()
svn-id: r48040
2010-02-13 11:56:30 +00:00
Johannes Schickel
64491356b8 Fix virtual-keyboard not changing size, when the user changes the scaler while it is not visible.
svn-id: r47544
2010-01-25 02:08:28 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Torbjörn Andersson
4818467908 Silenced some more cppcheck warnings. Some of these may seem silly, but the way
I figure it the changes are harmless at worst, and making them will make it
easier to find real errors in the (still quite long) list of warnings.

svn-id: r47443
2010-01-22 19:05:02 +00:00
Johannes Schickel
af1ba42298 Fix some memory leaks.
svn-id: r47284
2010-01-12 21:46:50 +00:00
Marcus Comstedt
40f9506163 The default keycolor for mouse pointers used to be 255.
This makes sense as a default for CLUT8 modes, but not really
for anything else.  As part of the gsoc2009-16bit merge, the
default was changed to "all ones", with extra code in the SDL
backend to truncate this to the depth of the mode.  However,
"all ones" (white) still isn't a very useful default for RGB modes.
So rather than jumping through hoops to provide a bad default,
it's better to remove the default altogether.  Engines which relied
on the old default of 255 have been updated to specify it explicitly.

svn-id: r47118
2010-01-07 15:07:36 +00:00
Max Horn
d60b5ca516 Include font.h instead of fontman.h in places that don't need fontman :)
svn-id: r46311
2009-12-09 16:46:14 +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
Max Horn
8ba75fc522 Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things)
svn-id: r44495
2009-09-30 16:16:53 +00:00
John Willis
3fb1b79018 Virtual Keyboard: Update default keyboard pack using slightly tweaked versions of the graphics very kindly provided by Carl Mitchell. Also update xml file to make best use of the keyboard graphics and add the 'delete' event in addition the passing backspace back to the calling textarea.
svn-id: r42807
2009-07-26 12:58:22 +00:00
Andre Heider
89599dd4ce split loadKeyboardPack(), fallback to the current dir when searching for packs, and free memory in the case of an error.
svn-id: r41705
2009-06-20 11:48:42 +00:00
John Willis
8b1a6b1b6d Virtual Keyboard: Add some quick changes to the virtual keyboard to activate submit and cancel events from the default lowercase keyboards. This makes it possible to cancel and submit without having to call Common::KEYCODE_F7 again. Sorry for the nasty (temp) graphics.
svn-id: r41385
2009-06-08 20:31:49 +00:00
John Willis
2c55c49534 Virtual Keyboard: Fix slight error in earlier commit (failed to rename the XML to match the keyboard pack name).
svn-id: r41376
2009-06-08 15:45:03 +00:00
John Willis
e78edd8ef6 Virtual Keyboard: Move vkeybd.zip into packs folder and rename default keyboard pack to vkeybd_default(.zip) with updates to default-events.cpp. Also update vkeybdpack.py to use zlib compression if Python zlib is found. Update GP2X and GP2XWiz bundle files to get new vkeybd_default.zip.
svn-id: r41373
2009-06-08 14:47:38 +00:00
John Willis
4ff5a39f75 Virtual Keyboard: Add source files for the default keyboard pack seperate from ZIP archive (makes it easier to version the packs vkeybd.xml and track fixes) and add script to build keyboard pack(s) ZIP's from source files (based on /gui/themes/scummtheme.py).
svn-id: r41366
2009-06-08 09:10:12 +00:00
John Willis
e4a3219103 Virtual Keyboard: Fix default keyboard pack to return correct events for ENTER and !.
svn-id: r41363
2009-06-08 08:21:18 +00:00
John Willis
f788920af9 Virtual Keyboard: Add 320*240 support (in addition to 640*480) to the default keyboard pack. Also tweak vkeybd.xml to make it a little more like valid XML). New graphics still to come so excuse the ugly keyboard images for now.
svn-id: r41303
2009-06-06 20:36:12 +00:00
John Willis
d89fbd5b75 Virtual Keyboard: 'Ab'use the console font to get a font small enough to be usable on 320*240 virtual keyboards for display_area (GUI and BigGUI take up far too much space).
svn-id: r41300
2009-06-06 20:05:21 +00:00
John Willis
4ceec0dfbb Virtual Keyboard: Fix detection of v_align option when used in the keyboard definition.
svn-id: r41232
2009-06-06 17:21:50 +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
0fe9cab48a Fix bug #2595364: "Virtual Keyboard: number keys not working"
svn-id: r40462
2009-05-11 18:40:59 +00:00
Max Horn
5556fc7f72 Changed Graphics::ImageDecoder to allow custom PixelFormats
svn-id: r36026
2009-01-23 23:50:54 +00:00
Max Horn
14c5bbbccf Renamed Archive::openFile to createReadStreamForMember
svn-id: r36021
2009-01-23 04:45:44 +00:00
Max Horn
abc06ca18e Moved Graphics::PixelFormat into its own header file; turned RGBToColor etc. into methods, and added an operator==
svn-id: r35993
2009-01-22 04:35:10 +00:00
Johannes Schickel
ceefbd19b9 Fixed vkbd drawing and GUI drawing on screen change while vkbd is shown.
svn-id: r35979
2009-01-21 15:23:30 +00:00
Max Horn
299736c9e1 some code cleanup
svn-id: r35966
2009-01-20 23:19:42 +00:00
Max Horn
c210b71876 Moved Surface::blit to backends/vkeybd/virtual-keyboard-gui.cpp
svn-id: r35965
2009-01-20 22:52:29 +00:00
Johannes Schickel
4c62af49c2 Removed ImageMan again, now the code uses Graphics::ImageDecoder directly.
svn-id: r35960
2009-01-20 18:31:35 +00:00
Johannes Schickel
496ab478a2 Some formatting.
svn-id: r35959
2009-01-20 17:38:48 +00:00
Andre Heider
f67bb6c8f1 fixed vkeybd.zip loading
svn-id: r35957
2009-01-20 16:13:08 +00:00
Andre Heider
fbfec8e63e protect all vkeybd code with ENABLE_VKEYBD
svn-id: r35956
2009-01-20 16:00:36 +00:00
Andre Heider
60beb35a5a added the required XML header to vkeybd.zip
svn-id: r35955
2009-01-20 15:28:07 +00:00
Andre Heider
1e5165bd84 added proper ImageMan includes
svn-id: r35954
2009-01-20 15:27:13 +00:00
Andre Heider
089548fb81 use Surface instead of SurfaceKeyColored
svn-id: r35953
2009-01-20 15:26:15 +00:00
Andre Heider
15b3c680da added ImageMan to vkeybd
svn-id: r35952
2009-01-20 15:24:47 +00:00
Max Horn
a27e456ace Some basic work on the vkeybd code
svn-id: r35931
2009-01-20 00:03:35 +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
Stephen Kennedy
11c0a3bded Updated comments, and general cleanup
svn-id: r34203
2008-08-29 21:10:10 +00:00
Stephen Kennedy
648f6ed934 Fixed display cursor position bug
svn-id: r34095
2008-08-22 10:47:36 +00:00
Stephen Kennedy
049ac6c42b Updated to latest version of XMLParser, and modified VirtualKeyboardParser to reflect changes.
svn-id: r33987
2008-08-18 12:44:54 +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
8c2340d323 Optimization and cleanup of VirtualKeyboardGUI
svn-id: r33916
2008-08-15 21:00:54 +00:00
Stephen Kennedy
93780d51ca Added clear event to virtual keyboard
svn-id: r33913
2008-08-15 19:41:34 +00:00
Stephen Kennedy
6ef8324302 * Added Virtual Keyboard descriptions for all keycodes
* Tweaking of key delivery queue

svn-id: r33907
2008-08-15 17:53:18 +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
08ef79ce45 Loads of valgrind fixes
svn-id: r33869
2008-08-14 19:20:25 +00:00
Stephen Kennedy
c1e8e340ff * Saving of keymaps fully implemented
* Added Keymapper::cleanupGameKeymaps() with code to remove game keymaps from active stack

svn-id: r33853
2008-08-14 01:42:02 +00:00