Ticket #5907: zoomKeysPatch.patch

backends/events/sdl/sdl-events.cpp

@@ -402 +402 @@
 
 
 bool SdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
-
         SDLModToOSystemKeyFlags(SDL_GetModState(), event);
-
         // Handle scroll lock as a key modifier
         if (ev.key.keysym.sym == SDLK_SCROLLOCK)
                 _scrollLock = !_scrollLock;

backends/graphics/surfacesdl/surfacesdl-graphics.cpp

@@ -715 +715 @@
         width = bestMode->w;
         height = bestMode->h;
 }
+#ifdef MAEMO
+#include "SDL_syswm.h"
+
+static void maemo5_WM_init(int fullscreen){
+//static int fsdone=0;
+//static int wmdone=0;
+SDL_SysWMinfo info;
+SDL_VERSION(&info.version);
+
+if ( SDL_GetWMInfo(&info) ) {
+
+        Display *dpy = info.info.x11.display;
+
+        Window win;
+
+        unsigned long val = 1;
+        Atom atom_zoom = XInternAtom(dpy, "_HILDON_ZOOM_KEY_ATOM", 0);
+        info.info.x11.lock_func();
+        win = info.info.x11.fswindow;
+
+        if (win)
+                XChangeProperty (dpy,win,atom_zoom,XA_INTEGER,32,PropModeReplace,(unsigned char *) &val,1); // grab zoom keys
+        win = info.info.x11.wmwindow;
+
+        if (win)
+                XChangeProperty (dpy,win,atom_zoom,XA_INTEGER,32,PropModeReplace,(unsigned char *) &val,1); // grab zoom keys
+        info.info.x11.unlock_func();
+}
+}
+#endif
+
 
 bool SurfaceSdlGraphicsManager::loadGFXMode() {
         _forceFull = true;
@@ -756 +787 @@
                 error("allocating _screen failed");
 #endif
 
+#ifdef MAEMO
+        maemo5_WM_init(_videoMode.fullscreen);
+#endif
+
         // SDL 1.2 palettes default to all black,
         // SDL 1.3 palettes default to all white,
         // Thus set our own default palette to all black.

backends/graphics/surfacesdl/surfacesdl-graphics.h

@@ -97 +97 @@
         virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
 #endif
         virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL);
+
         virtual int getScreenChangeID() const { return _screenChangeCount; }
 
         virtual void beginGFXTransaction();

backends/platform/maemo/maemo.cpp

@@ -108 +108 @@
         return *model;
 }
 
+void OSystem_SDL_Maemo::setupIcon() {
+ // no Maemo version needs setupIcon
+
+ // also N900 is hit by SDL_WM_SetIcon bug (window cannot receive input)
+
+ // http://bugzilla.libsdl.org/show_bug.cgi?id=586
+
+}
+
 } //namespace Maemo
 
 #endif

backends/platform/maemo/maemo.h

@@ -38 +38 @@
         virtual void quit();
         virtual void fatalError();
         virtual void setWindowCaption(const char *caption);
+        virtual void setupIcon();
 
         Model getModel() { return _model; }
 

backends/platform/sdl/sdl.cpp

@@ -242 +242 @@
 #endif
 
 void OSystem_SDL::initSDL() {
+
         // Check if SDL has not been initialized
         if (!_initedSDL) {
                 uint32 sdlFlags = 0;

scummvm-1.4.

@@ -2267 +2267 @@
                         INCLUDES="$INCLUDES -I/usr/X11R6/include"
                         LIBS="$LIBS -lpthread"
                         LIBS="$LIBS -L/usr/lib"
+                        LIBS="$LIBS -lX11"
                         
                         _backend="maemo"
                         _vkeybd=yes

scummvm-1.4.

@@ -8 +8 @@
 DEFINES     := -DHAVE_CONFIG_H
 LDFLAGS     :=
 INCLUDES    := -I. -I$(srcdir) -I$(srcdir)/engines
-LIBS        :=
+LIBS        := -lX11
 OBJS        :=
 DEPDIR      := .deps