Ticket #7987: scumm-zaurus-cvs020723.patch

Makefile.Qtopia

@@ +1 @@
+# $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.41 2002/04/27 16:58:28 ender Exp $
+
+CC      = arm-linux-g++
+CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
+DEFINES = -DUNIX -DCOMPRESSED_SOUND_FILE -DBYPASS_COPY_PROT -DQTOPIA -DSCUMM_NEED_ALIGNMENT 
+LDFLAGS :=
+INCLUDES:= `/opt/Qtopia/sharp/bin/sdl-config --cflags` -I./ -I./sound
+CPPFLAGS= $(DEFINES) $(INCLUDES)
+
+# Add -lmad for -DCOMPRESSED_SOUND_FILE
+LIBS    = `/opt/Qtopia/sharp/bin/sdl-config --libs` -lmad
+#-lncurses
+
+OBJS    = sdl.o
+
+include Makefile.common
+
+dist:
+        rm -f $(ZIPFILE)
+        zip -q $(ZIPFILE) $(DISTFILES)

config-file.cpp

@@ -74 +74 @@
 }
 
 hashconfig::~hashconfig () {
+        #ifndef QTOPIA
+        // i dont know what this does but it appears to be needed
         xfree(domain);
+        #endif
 }
 
 bool hashconfig::is_domain(const char *d) const
@@ -205 +208 @@
 }
 
 Config::~Config () {
+        #ifndef QTOPIA
+        //i dont know what this does but it appears to be needed
         int i;
 
         xfree(filename);
@@ -214 +219 @@
                 delete hash[i];
         }
         xfree(hash);
+        #endif
 }
 
 const char *Config::get(const char *key, const char *d) const

main.cpp

@@ -28 +28 @@
 #include "simon/simon.h"
 #include "config-file.h"
 
+#if defined(QTOPIA)
+// i dont know what this does it's just needed
+extern "C" int main(int argc, char *argv[]);
+#endif
+
 GameDetector detector;
 Gui gui;
 
@@ -39 +44 @@
 Config * scummcfg;
 
 
-#if defined(MACOSX) && defined(UNIX)
+#if defined(MACOSX) && defined(UNIX) && defined(QTOPIA)
 #include <SDL.h>
-#elif !defined(__MORPHOS__)
+#elif !defined(__MORPHOS__) && !defined(QTOPIA)
 #undef main
 #endif
 

sdl.cpp

@@ -846 +846 @@
                                         quit();
                                         break;
                                 }
-        
                                 if (b == (KBD_CTRL|KBD_ALT) && 
                                         (ev.key.keysym.sym>='1') && (ev.key.keysym.sym<='7')) {
                                         Property prop;
@@ -854 +853 @@
                                         property(PROP_SET_GFX_MODE, &prop);
                                         break;
                                 }
-        
-        
+                                #ifdef QTOPIA
+                                // quit on fn+backspace on zaurus
+                                if (ev.key.keysym.sym==127) {
+                                        quit();
+                                        break;
+                                }
+                                // map menu key (f11) to f5 (scumm menu)
+                                if (ev.key.keysym.sym==292) {
+                                        event->event_code = EVENT_KEYDOWN;
+                                        event->kbd.keycode = 286;
+                                        event->kbd.ascii = mapKey(286, ev.key.keysym.mod);
+                                }
+                                // map center (space) to tab (default action )
+                                // i wanted to map the calendar button but the calendar comes up
+                                //
+                                else if (ev.key.keysym.sym==32) {
+                                        event->event_code = EVENT_KEYDOWN;
+                                        event->kbd.keycode = 9;
+                                        event->kbd.ascii = mapKey(9, ev.key.keysym.mod);
+                                }
+                                // since we stole space (pause) above we'll rebind it to the tab key on the keyboard
+                                else if (ev.key.keysym.sym==9) {
+                                        event->event_code = EVENT_KEYDOWN;
+                                        event->kbd.keycode = 32;
+                                        event->kbd.ascii = mapKey(32, ev.key.keysym.mod);
+                                }
+                                else {
+                                // let the events fall through if we didn't change them, this may not be the best way to
+                                // set it up, but i'm not sure how sdl would like it if we let if fall through then redid it though.
+                                // and yes i have an huge terminal size so i dont wrap soon enough.
+                                        event->event_code = EVENT_KEYDOWN;
+                                        event->kbd.keycode = ev.key.keysym.sym;
+                                        event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod);
+                                }
+                                #endif
+                                #ifndef QTOPIA
                                 event->event_code = EVENT_KEYDOWN;
                                 event->kbd.keycode = ev.key.keysym.sym;
                                 event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod);
+                                #endif
+                                
                                 switch(ev.key.keysym.sym) {
                                         case SDLK_LEFT:
                                                 km.x_vel = -1;