Commit Graph

5223 Commits

Author SHA1 Message Date
D G Turner
7de7d1d414 NDS: Fix build after common util.h split. 2012-02-26 16:59:32 +00:00
Max Horn
367131ef0e COMMON: Move Language and Platform functionality into separate files 2012-02-26 15:21:36 +01:00
Johannes Schickel
3b1e4b5bdc IPHONE: Let hi-color games directly draw onto the screen texture buffer.
This avoids an unecessary copying step from the framebuffer to the texture
buffer.
2012-02-26 01:25:18 +01:00
Johannes Schickel
83ce8da935 IPHONE: Implement 16bpp color support.
This feature is currently disabled by default.
2012-02-26 01:01:19 +01:00
Johannes Schickel
23732c7179 IPHONE: Get rid of _gameScreenRaw, instead use _framebuffer internally. 2012-02-25 20:22:23 +01:00
Johannes Schickel
97e486dee3 IPHONE: Implement very basic GFX transaction support.
This allows for AR ratio correction changes to take place, even when the AR
setting is set after initSize for example.
2012-02-25 19:49:05 +01:00
athrxx
535a55e47a AUDIO: (Windows) fix issue with non-unique MIDI device names
This should fix the issue mentioned here: http://forums.scummvm.org/viewtopic.php?t=11255

Apparently Windows doesn't generate unique names for MIDI devices of the exact same type.
I do not know whether this could be a problem on other backends, too.
2012-02-25 14:15:49 +01:00
Tarek Soliman
3edd4180f3 MAEMO: Move static table out of .h file
Thanks fuzzie & LordHoto for pointing this out
2012-02-24 21:43:08 -06:00
Johannes Schickel
f1a4f508af IPHONE: Move aspect ratio settings to VideoContext. 2012-02-24 22:43:02 +01:00
Johannes Schickel
7fe3bdebc0 Merge pull request #197 from phoenixtail26/cleanedARCorrection.
This is a manual merge with some conflict fixups.

Conflicts:
	backends/platform/iphone/iphone_video.mm
2012-02-24 22:32:49 +01:00
Johannes Schickel
c3b52343dc IPHONE: Only update on screen mouse coordinates when it's needed. 2012-02-24 01:44:17 +01:00
Johannes Schickel
5c55866068 IPHONE: Cleanup mouse cursor handling slightly.
Now the scaling etc. will be precalculated instead of being done on every
frame.
2012-02-24 01:33:37 +01:00
Johannes Schickel
d691ef2260 IPHONE: Clean up mouse texture coordinate handling. 2012-02-24 01:13:44 +01:00
Johannes Schickel
d93e1558fc IPHONE: Move some global variables to iPhoneView. 2012-02-24 01:02:29 +01:00
Johannes Schickel
5863f6a556 IPHONE: Add a mouse texture buffer surface to VideoContext. 2012-02-24 00:56:46 +01:00
Johannes Schickel
4f85ad6b99 IPHONE: Fix mouse coordinates for hi res games. 2012-02-23 21:55:36 +01:00
Johannes Schickel
3f37842580 IPHONE: Directly use the game screen's texture buffer.
This gets rid of another intermediate buffer.
2012-02-23 21:52:44 +01:00
Johannes Schickel
8edcedf3b6 IPHONE: Directly use the overlay's texture buffer instead of another intermediate buffer. 2012-02-23 21:34:12 +01:00
Johannes Schickel
2ab5958c93 IPHONE: Move screen and overlay texture buffer to VideoContext. 2012-02-23 21:20:24 +01:00
Johannes Schickel
97feac5342 IPHONE: Add a constructor to VideoContext. 2012-02-23 20:59:26 +01:00
Gavin Hayler
a71a91db17 IPHONE: Add aspect ratio correction to iPhone 2012-02-23 16:27:04 +02:00
Johannes Schickel
5ae958bcf3 IPHONE: Let iPhoneView and OSystem_IPHONE share the same VideoContext.
This allows for better sharing between the current video state in the view and
the OSystem implementation.

This also gets rid of most C interface functions for calling ObjC code.
2012-02-23 03:18:00 +01:00
Johannes Schickel
e00fc73eb8 IPHONE: Silence a few signed/unsigned integer comparison warnings. 2012-02-23 02:26:54 +01:00
Johannes Schickel
99ffbfedbc IPHONE: Use VideoContext in OSystem_IPHONE. 2012-02-23 02:25:26 +01:00
Johannes Schickel
ab15435ad0 IPHONE: Move overlay visibility status to VideoContext. 2012-02-23 02:09:27 +01:00
Johannes Schickel
e1edb20fed IPHONE: Move VideoContext definition to iphone_common.h. 2012-02-23 02:04:40 +01:00
Johannes Schickel
e83e31c2cc IPHONE: Move mouse coordinate conversion code to iPhoneView. 2012-02-23 02:02:14 +01:00
Johannes Schickel
c5ccb32b48 IPHONE: Move graphics related OSystem code to a ObjC++ file. 2012-02-23 01:52:50 +01:00
Johannes Schickel
04f9fc3e18 IPHONE: Move projection setup code to its own method. 2012-02-23 01:27:38 +01:00
Johannes Schickel
174127c1dd IPHONE: Remove some more dead code. 2012-02-23 01:19:34 +01:00
Johannes Schickel
26405be48f IPHONE: Move setFilterModeForTexture to iPhoneView. 2012-02-23 01:14:39 +01:00
Johannes Schickel
def1471fff IPHONE: Slight formatting fix. 2012-02-23 01:08:48 +01:00
Johannes Schickel
833ce4f348 IPHONE: Fix scale offset addition in the mouse coordinate code.
Formerly the overlay and game screen offset was swapped.
2012-02-23 01:08:47 +01:00
Johannes Schickel
f4579aab9b IPHONE: Create a struct for shared video context variables. 2012-02-23 01:08:47 +01:00
Tarek Soliman
dbdfc13819 KEYMAPPER: Fix a signed/unsigned comparison warning 2012-02-22 15:16:52 -06:00
Tarek Soliman
92aabb6868 KEYMAPPER: Change HardwareKey id to Common::String 2012-02-22 07:44:59 -06:00
Johannes Schickel
6c64fdf4f2 IPHONE: Very minor cleanup. 2012-02-22 02:49:14 +01:00
Johannes Schickel
0e182a9587 IPHONE: Use #include instead of #import. 2012-02-22 02:47:16 +01:00
Johannes Schickel
66199978e2 IPHONE: Silence some warnings. 2012-02-22 02:44:25 +01:00
Johannes Schickel
e79f6a6314 IPHONE: Move ObjC code files (.m) to ObjC++ files (.mm). 2012-02-22 02:30:44 +01:00
Johannes Schickel
1b26346fc8 IPHONE: Implement setShakeOffset.
This should fix bug #3374656 "IPHONE: setShakePos not implemented".
2012-02-22 01:53:20 +01:00
Tarek Soliman
e1e9bd5c0e KEYMAPPER: Clean up more dead code
More automapper related dead code
2012-02-21 13:39:05 -06:00
Johannes Schickel
80b3439817 IPHONE: Rewrite video screen rotation.
Now it should be a little bit more sane. Formerly the width and height
was swapped in rotation mode, which resulted in the x coordinate falling
into the range 0..height in landscape mode for example.

This also fixes the cursor offset in the modern theme.
2012-02-21 18:54:26 +01:00
Johannes Schickel
f6edcbde8e IPHONE: Move _overlayPortraitRatio from global scope to local scope. 2012-02-21 18:54:26 +01:00
Johannes Schickel
cc8a6cc993 IPHONE: Add _overlayRect, which describes the overlay screen rect. 2012-02-21 18:54:26 +01:00
Tarek Soliman
aa42d78658 KEYMAPPER: Remove automapping dead code 2012-02-21 08:20:40 -06:00
Willem Jan Palenstijn
297d15e122 OPENGL: Don't force alpha to 1
This was likely a hack to work around an alpha blending bug in the
gui vector renderer.
2012-02-20 22:17:33 +01:00
Johannes Schickel
6cc5b83bba IPHONE: Default to portrait mode in case the orientation could not be determined. 2012-02-20 21:17:19 +01:00
Johannes Schickel
d8531a939e IPHONE: Move OpenGL ES context generation to its own method. 2012-02-20 21:15:14 +01:00
Johannes Schickel
cf44d49d19 IPHONE: Precalculate vertex/tex coordinates for game screen/overlay. 2012-02-20 19:43:51 +01:00
Tarek Soliman
56e517fdad KEYMAPPER: Add some comments 2012-02-20 12:26:25 -06:00
Johannes Schickel
7957cc956e IPHONE: Use render buffer size instead of application frame size for video size calculations.
These match as far as I can tell, but in case they don't match, the render
buffer size should be the correct thing to use.
2012-02-20 18:39:57 +01:00
Johannes Schickel
d91268c4c1 IPHONE: Rename _screenRect to _gameScreenRect. 2012-02-20 18:39:57 +01:00
Johannes Schickel
87fb115def IPHONE: Rename _backing[Width,Height] to _renderBuffer[Width,Height]. 2012-02-20 18:39:57 +01:00
Johannes Schickel
624d5547dc IPHONE: Don't overwrite orientation when the OpenGL ES context is created. 2012-02-20 18:39:57 +01:00
Johannes Schickel
d4c167414d IPHONE: Refactor event code a bit.
Now mouse x/y coordinates are passed as int.
2012-02-20 18:39:57 +01:00
Johannes Schickel
5cc3d754f7 IPHONE: Even more slight formatting fixes. 2012-02-20 18:39:57 +01: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
Johannes Schickel
a291679445 IPHONE: Slight game screen texture related variable renaming. 2012-02-20 15:37:24 +01:00
Johannes Schickel
46e622c0fe IPHONE: Slight cleanup. 2012-02-20 15:37:24 +01:00
Johannes Schickel
76be031ed4 IPHONE: Remove some unused variables. 2012-02-20 15:37:23 +01:00
Tarek Soliman
3f6d549b0e KEYMAPPER: Move F7 and F8 handling to DefaultEventMapper 2012-02-20 06:49:22 -06:00
Tarek Soliman
cfe91c8d44 KEYMAPPER: Move CTRL-F5 handling to DefaultEventMapper 2012-02-20 06:49:22 -06:00
Tarek Soliman
a0ba4eb569 KEYMAPPER: Rewrite the EventMapper API 2012-02-20 06:49:22 -06:00
Tarek Soliman
5c3e48fddf KEYMAPPER: Create a DefaultEventMapper when Keymapper isn't enabled
This allows migration to unconditional mapping
2012-02-20 06:49:22 -06:00
Tarek Soliman
e7ade8ae05 KEYMAPPER: EventMapper must now eat all events 2012-02-20 06:49:21 -06:00
Johannes Schickel
ae992bebe3 IPHONE: More formatting fixes. 2012-02-20 13:48:09 +01:00
Johannes Schickel
d77253fbe5 IPHONE: Add support for unfiltered upscaling. 2012-02-20 02:32:10 +01:00
Johannes Schickel
8102e7e645 IPHONE: Implement cursor palette support. 2012-02-20 01:32:48 +01:00
Johannes Schickel
65cda4cd6b IPHONE: Fix some mismatching malloc/delete calls. 2012-02-20 00:36:13 +01:00
Johannes Schickel
1b9c4f3845 IPHONE: Remove some dead code. 2012-02-20 00:35:44 +01:00
Johannes Schickel
723a38c699 IPHONE: Rename screen related buffers a bit. 2012-02-20 00:35:14 +01:00
Johannes Schickel
93d80793b4 IPHONE: Implement cursor visibility change again. 2012-02-20 00:29:08 +01:00
Johannes Schickel
438bc50115 IPHONE: Fix cursor hotspots. 2012-02-20 00:25:48 +01:00
Johannes Schickel
68bbe973bd IPHONE: Always use the mouse texture.
Formerly the mouse texture was only used when the overlay was visible. When
only the game screen was visible, the code rendered the mouse cursor on the
game screen texture.

This simplifies the drawing pipeline a bit.
2012-02-20 00:08:42 +01:00
Johannes Schickel
87d85a7b20 IPHONE: Use the proper RGBA5551 palette for the mouse cursor.
Formerly the overlay cursor was using a RGB565 palette, even though the
texture is really set up as RGBA5551.
2012-02-19 22:19:38 +01:00
Johannes Schickel
ceae3dd191 IPHONE: Rename _palette to _gamePalette. 2012-02-19 22:16:38 +01:00
Johannes Schickel
6a31dadfea IPHONE: Use include instead of import for all of our headers. 2012-02-19 22:10:08 +01:00
Johannes Schickel
13358c541d IPHONE: Add include guards. 2012-02-19 21:44:37 +01:00
Johannes Schickel
3d0316ccd2 IPHONE: Formatting fixes. 2012-02-19 21:30:53 +01:00
Johannes Schickel
4244663020 IPHONE: Remove dead code. 2012-02-19 20:33:53 +01:00
Thierry Crozat
7a3df4681b NULL: Fix compiler errors when using the NullGraphicsManager
The errors fixed are inaccessible base class when trying to set the
_graphicsManager and a pure virtual function when trying to create
the NullGraphicsManager instance.
2012-02-19 18:41:49 +00:00
Thierry Crozat
f6b8fec0f1 NULL: Fix compiler error when using NullMutexManager
The compiler error fixed (when trying to set the _mutexManager) is:
error: ‘MutexManager’ is an inaccessible base of ‘NullMutexManager’
2012-02-19 18:38:28 +00:00
Johannes Schickel
ab4420b3ca IPHONE: Take advantage of Common::EVENT_INVALID. 2012-02-19 05:21:17 +01:00
Johannes Schickel
ffaa8612c3 IPHONE: Change F5 (menu) gesture to open up the GMM.
Thanks to tsoliman for this patch.
2012-02-19 05:21:10 +01:00
Tarek Soliman
53d6ef1209 MAEMO: Fix building without keymapper enabled 2012-02-17 14:42:39 -06:00
Tarek Soliman
b6e5e4fe1e MAEMO: Remove pointless copy ctor call
Thanks LordHoto
2012-02-15 17:56:09 -06:00
Tarek Soliman
85c8c84804 KEYMAPPER: Add more warning signs 2012-02-15 17:22:41 -06:00
Tarek Soliman
e55914c51b MAEMO: Register Keymapper Keymap Action default bindings 2012-02-15 17:12:52 -06:00
Tarek Soliman
cce5be67dc KEYMAPPER: Allow ports to define default Keymap Action bindings 2012-02-15 17:07:52 -06:00
Tarek Soliman
974f5eb7b8 MAEMO: Drop the hardcoded keymap in favor of the keymapper 2012-02-15 17:07:52 -06:00
Tarek Soliman
7ae7e80739 MAEMO: Rename hasHwKeyboard and add hasMenuKey 2012-02-15 16:38:53 -06:00
Tarek Soliman
856744aa6a MAEMO: Use bitshifting in ModelType 2012-02-15 15:26:51 -06:00
Tarek Soliman
ea325909cf MAEMO: Fix wrong assert 2012-02-15 12:40:49 -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
dbcd177606 KEYMAPPER: Make some parameters const 2012-02-15 10:07:08 -06:00
Johannes Schickel
37e5b209a7 OPENGL: More formatting fixes. 2012-02-15 02:23:54 +01:00
Johannes Schickel
b6f7d69709 OPENGLSDL: Remove HACK in fullscreen toggle mode.
Altering the fullscreen state will automatically force a refresh now.
2012-02-15 02:23:47 +01:00
Johannes Schickel
5b3ebdf43d OPENGL: Prevent access to a few more members in the SDL OpenGL code. 2012-02-15 02:23:37 +01:00
Johannes Schickel
05af37c08e OPENGL: Use tabs instead of spaces for indentation. 2012-02-15 02:23:22 +01:00
Johannes Schickel
97760ff101 OPENGLSDL: Don't cast EventType into int for switch. 2012-02-15 02:23:14 +01:00
Johannes Schickel
1f01fb330c OPENGL: Use C-style casts. 2012-02-15 02:23:08 +01:00
Johannes Schickel
e5d48797d9 OPENGL: Let getGlErrStr return a Common::String.
This also makes getGlErrStr use Common::String::format instead of snprintf.
2012-02-15 02:23:01 +01:00
Johannes Schickel
beab93e746 OPENGL: Slight formatting fixes. 2012-02-15 02:22:54 +01:00
Johannes Schickel
864eec8cd2 OPENGL: Make all GLTexture members private. 2012-02-15 02:22:45 +01:00
Johannes Schickel
93435b2e3f OPENGL: Unvirtualize all GLTexture methods. 2012-02-15 02:22:37 +01:00
Johannes Schickel
56971f11d1 OPENGL: Remove redundant check in adjustMousePosition. 2012-02-15 02:22:30 +01:00
Tarek Soliman
5cf932198e KEYMAPPER: Fix Action ctor args in most keymaps 2012-02-13 23:24:59 -06:00
Johannes Schickel
57e3388197 SDL: Get rid of unneeded forwards. 2012-02-13 01:25:25 +01:00
Johannes Schickel
d811240a9d ALL: Enable Keymapper specific OSystem API only when the Keymapper is enabled. 2012-02-13 01:20:02 +01:00
Tarek Soliman
c2640ed33a MAEMO: Use custom event Click Mode keymap action 2012-02-12 13:28:13 -06:00
Tarek Soliman
d90d4d10a0 MAEMO: Refactor toggle click mode 2012-02-12 13:28:13 -06:00
Tarek Soliman
8c245af35c MAEMO: Define platform global keymap 2012-02-12 13:28:13 -06:00
Tarek Soliman
705761011d KEYMAPPER: Allow ports to define their own global keymap 2012-02-12 13:28:13 -06:00
Tarek Soliman
e52f75eaa4 MAEMO: Define HardwareKeySet 2012-02-12 13:28:13 -06:00
Tarek Soliman
52da780fbc KEYMAPPER: Refactor HardwareKeySet generation 2012-02-12 13:28:13 -06:00
Tarek Soliman
edc5249772 JANITORIAL: Fix template definition whitespace 2012-02-10 21:17:27 -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
38b8e09069 MAEMO: Add detection entry for the Nokia 700 running OS2008HE
This allows the Nokia 770 running OS2008HE to be used.
Fixes bug#3483921 "Volume rocker do no emulate keypress as it used"
2012-02-04 12:03:22 -06:00
Alyssa Milburn
4763b2c51b ANDROID: Add faked input delay.
This adds an artificial delay for mouse up events to make engines
like Gob work, similar to the iPhone fix in b3062b5e.
2012-02-03 12:36:03 +01:00
Tarek Soliman
a488556dcd KEYMAPPER: Handle EVENT_MAINMENU directly 2012-02-02 19:10:01 -06:00
Tarek Soliman
70d94bdd2c KEYMAPPER: Allow simple events to be added to an Action
This also simplifies the Action code a little bit
2012-02-02 19:05:05 -06:00
Klaus Reimer
7ee77cbd26 WEBOS: Renamed "Touchpad Mode" to "Trackpad Mode" to prevent confusion because one of the target devices is called the "HP Touchpad". 2012-01-28 11:44:31 +01:00
dhewg
51778ed4af TASKBAR: Fix compilation with mingw-w64
mingw-compat.h is not required for newer mingw-w64, all required
symbols are present in the system headers.
2012-01-23 18:41:45 +01:00
Travis Howell
8701e0a382 WINDOWS: Add default save paths for Windows NT4 onwards 2012-01-23 23:18:21 +11:00
David-John Willis
2294b8aa66 GPH: Fix silly copy/paste error in GP2X bundle target. 2012-01-23 12:16:04 +00:00
David-John Willis
7e0a88f69b GPH: Move all dist files into own folder under dists.
* Update vairous GPH bundle targets to suit new layout.
* Also add .in input files so we can automatically update version numbers.
2012-01-22 16:53:32 +00:00
David-John Willis
b429096b36 OPENPANDORA: Move all dist files into own folder under dists.
* Update OpenPandora bundle targets to suit new layout.
* Also add .in input files so we can automatically update version numbers.
2012-01-22 16:53:31 +00:00
dhewg
cc98a1acea WEBOS: Fix whitespace error
Random whitespace fix to kick off the OpenPandora toolchain on
buildbot.
2012-01-21 18:47:36 +01:00
Oystein Eftevaag
78baa27e0e MACOSX: Moved an include a bit to make sure that some defines are there before they are actually used. 2012-01-17 15:19:54 -05:00
Oystein Eftevaag
ba1396954d MACOSX: Changed CoreAudio deprecation check slightly to allow building with older SDKs 2012-01-14 12:12:10 -05:00
Oystein Eftevaag
85c8bd6e65 Merge pull request #157 from fingolfin/coreaudio
MACOSX: Use modern CoreAudio API on modern systems by default, cleanup
2012-01-14 14:00:40 -08:00
Max Horn
ad1c2a45f1 MACOSX: Default to new CoreAudio API on x86, and to old on PowerPC
The new API has been present since Mac OS X 10.5 (released four years ago,
in October 2007), and also since iOS 2.0 (thus, the iOS port may be able to
use it, too). Moreover, 10.5 was the last system to support PowerPC.
2012-01-14 19:36:24 +01:00
Oystein Eftevaag
09ce3407b1 OSX: Avoid use of NSString:stringWithCString, for OS X 10.2 and 10.3 compatibility 2012-01-14 11:04:58 -05:00
Tarek Soliman
37d77253cf KEYMAPPER: Add failsafe code for popping into Keymapper itself
Thanks LordHoto
2012-01-07 22:08:57 -06:00
Tarek Soliman
d143872be6 KEYMAPPER: Constantify global keymap name 2012-01-07 21:20:29 -06:00
Tarek Soliman
82e0900678 KEYMAPPER: Rename inherit flag to transparent
Less confusing
2012-01-07 21:10:05 -06:00
Johannes Schickel
90178d9b87 OPENGL: Fix mouse cursor scaling. 2012-01-03 04:19:08 +01:00
Johannes Schickel
2af87fd4f0 VKEYBD: Fix cursor palette. 2012-01-03 02:13:40 +01:00
Johannes Schickel
1c2a21c42b VKEYBD: Slight cleanup. 2012-01-03 02:13:33 +01:00
Johannes Schickel
24d99038e4 VKEYBD: Properly error out parsing if an area is defined again.
Formerly the code did never check whether ImageMap::createArea returned a
valid pointer and always just assumed so.
2012-01-03 02:13:26 +01:00
Johannes Schickel
d0ddd299a4 VKEYBD: Slight cleanup in ImageMap code. 2012-01-03 02:13:22 +01:00
Johannes Schickel
c98a123f4c VKEYBD: Some formatting fixes. 2012-01-03 02:13:19 +01:00
Strangerke
e2ded73d92 MISC: This is year 2012 2012-01-01 11:49:41 +01: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
366a942a3a KEYMAPPER: Simplify calling getKeymap 2011-12-30 13:03:39 -06: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
Filippos Karapetis
d55ce36268 KEYMAPPER: Use hasFlags() in findHardwareKey() 2011-12-30 01:15:06 +02:00
Filippos Karapetis
1d3ff35373 KEYMAPPER: Disable the (accidentally reenabled automatic mapper again 2011-12-30 00:12:45 +02:00
Filippos Karapetis
410c9e0b30 KEYMAPPER: Fix broken implementation of findHardwareKey()
This fixes the keymapper dialog (at least on desktop platforms), but the
keymapper itself is still not working (tested with LoL)
2011-12-30 00:09:10 +02:00
Johannes Schickel
772aecf5f8 OPENGLSDL: Simplify the code a bit. 2011-12-15 21:53:09 +01:00
Johannes Schickel
c91b6d7d35 OPENGLSDL: Fix video mode initialization for 640x400 games with AR enabled.
Formerly they always used a height of 240 * scaleFactor, which would for
exmaple make the games requesting a 1x scaler use a height of 240 if AR
is enabled.

This was a regression from b8dcd9a25e.
2011-12-15 21:48:14 +01:00
Filippos Karapetis
5eb592a1c9 WIN32: Fix build by adapting to the latest Archive changes 2011-12-13 22:47:46 +02:00
Alyssa Milburn
c780b58e88 ANDROID: Fix assert in JavaInputStream (thanks clone2727). 2011-12-13 18:44:58 +01:00
Alyssa Milburn
6c790ea6a7 ANDROID: Fix compilation by adapting to latest Archive changes (thanks LordHoto). 2011-12-13 18:37:33 +01:00
Johannes Schickel
d085f4f4e2 WIN32: (Hopefully) fix compilation by adapting to latest Archive changes. 2011-12-13 18:29:40 +01:00
Tarek Soliman
1b11139dc5 KEYMAPPER: Switch to using addClearButton() 2011-12-13 08:37:19 -06:00
Filippos Karapetis
d6ee5988d2 Merge pull request #137 from fingolfin/various-cleanup
Various cleanup
2011-12-13 03:12:43 -08:00
Tarek Soliman
feb04d2164 KEYMAPPER: Add Common::KeyActionEntry for making simple keymap tables 2011-12-12 20:18:40 -06:00
Max Horn
9095de4674 MACOSX: Optionally allow building against "new" (10.5+) CoreAudio API
This silences a bunch of deprecation warnings when compiling on any current
system. Moreover, the new API is available on the iPhone, so perhaps this
is interesting for the iPhone port, too.

On the long run, ScummVM will have to switch to the new API, as Apple
will eventually drop the old one.
2011-12-12 16:46:50 +01:00
Max Horn
fe79ce5038 AUDIO: Add endian FIXME to timdity code 2011-12-12 16:27:41 +01:00
Tarek Soliman
4b315b1f15 MAEMO: Remove i386 from Architecture field of debian/control
It confuses the maemo.org autobuilder which tries to build x86 builds with ARMisms in them
2011-12-04 21:23:04 -06:00
CeRiAl
cc81dfed17 WINCE: Update port specific README 2011-12-05 01:44:34 +01:00
CeRiAl
19228af107 WINCE: Update port specific README 2011-12-05 00:40:58 +01:00
Tarek Soliman
29b1f9f517 MAEMO: Add fields to debian/control 2011-12-03 13:34:05 -06:00
Tarek Soliman
fda6e1534b MAEMO: Fix zoom key capture on N900 (fixes bug#3443037)
This was semi-intentionally skipped in the intial port revival
because the focus was on N810 at the time.

This is mostly copied from the old 1.2.1 port and then cleaned up.
2011-11-29 14:39:15 -06:00
Tarek Soliman
29c0386f2c MAEMO: Add basic graphics manager 2011-11-29 13:38:17 -06:00
Tarek Soliman
dabea2b515 MAMEO: Add GMM keybinding for N900 (fix bug #3443043)
The keybinding is Ctrl-Shift-m.
Ctrl-m is more desirable but is toggling mouse capture.
2011-11-29 11:25:58 -06:00
Christoph Mallon
6a9ab747f9 PS2: Remove the unused method OSystem_PS2::grabRawScreen().
This was removed from OSystem in b51f2f3212.
2011-11-27 13:11:58 +01:00
Christoph Mallon
89ccde3948 DS: Remove the unused method OSystem_DS::grabRawScreen().
This was removed from OSystem in b51f2f3212.
2011-11-27 13:09:47 +01:00
Christoph Mallon
a78b2d777d JANITORIAL: Remove extra semicolons. 2011-11-27 12:54:22 +01:00
Tarek Soliman
c451bd4340 MAEMO: Make setupIcon do nothing
It seems N900 is hit by SDL_WM_SetIcon bug (window cannot receive input)
http://bugzilla.libsdl.org/show_bug.cgi?id=586

This fix is based on the old 1.2.1 Maemo port code
2011-11-24 23:06:21 -06:00
Christoph Mallon
e578cb8976 ALL: Remove unnecessary forward declarations. 2011-11-21 15:59:19 +01:00
Johannes Schickel
8f58ddefc6 ALL: Remove more m4/mads leftovers.
Some project files (iPhone) and backend files (Symbian) still reference m4.dat,
but I know not enough on how to remove that without breaking something.
2011-11-20 04:34:22 +01:00
Eugene Sandulenko
5420ad7619 Merge pull request #114 from tsoliman/keymapper2
KEYMAPPER: Keymapper improvements 2
2011-11-17 14:22:48 -08:00
Alyssa Milburn
5647637ea2 COMMON: Move <new> include into scummsys.h.
The header contains forbidden symbols on some platforms, and the
simplest solution seems to be to include it here. This also includes
it from all the portdefs.h files, except the Symbian one. Probably
the FIXME and the #if can be removed once it's known to work.
2011-11-17 12:46:44 +01:00
Willem Jan Palenstijn
f17b9bc5cb COMMON: Remove outdated fixme 2011-11-17 10:29:11 +01:00
Johannes Schickel
61795739f8 COMMON: Rename Common::set_to to Common::fill.
This makes the name match with the name of the STL function with the same
behavior.
2011-11-16 18:06:30 +01:00
Tarek Soliman
7a225191b0 MAEMO: Update debian/changelog to version 1.5.0~git 2011-11-15 15:00:13 -06:00
Tarek Soliman
09697a9c31 MAEMO: Update debian/changelog with 1.4 release 2011-11-15 15:00:13 -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
Alyssa Milburn
764ffff578 ANDROID: Match versions when checking for plugins. 2011-10-25 23:08:29 +02:00
Alyssa Milburn
80e55c5e78 ANDROID: Point the default savepath to external storage.
(If that fails, fall back to a readable app-specific directory.)
2011-10-25 23:04:42 +02:00
Alyssa Milburn
44b7f3aed5 ANDROID: Move from org.inodes.gus to org.scummvm. 2011-10-25 21:18:42 +02:00
Alyssa Milburn
ff3f4d9493 ANDROID: Fix plugins on Android 3.1+.
Android 3.1 changed the default behaviour for broadcasts so that it
doens't wake up non-running receivers, so we need to override that.
2011-10-22 20:45:15 +02:00