1 diff -Naur SDL-1.2.9-orig/src/video/qtopia/Makefile.am SDL-1.2.9/src/video/qtopia/Makefile.am
2 --- SDL-1.2.9-orig/src/video/qtopia/Makefile.am 2007-03-12 20:57:23.000000000 +0100
3 +++ SDL-1.2.9/src/video/qtopia/Makefile.am 2007-03-12 20:58:02.000000000 +0100
5 # overwrite USER variables
7 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
8 - $(AM_LDFLAGS) $(LDFLAGS) -o $@
9 + $(AM_LDFLAGS) $(LDFLAGS) -lopiecore2 -o $@
10 diff -Naur SDL-1.2.9-orig/src/video/qtopia/SDL_QWin.cc SDL-1.2.9/src/video/qtopia/SDL_QWin.cc
11 --- SDL-1.2.9-orig/src/video/qtopia/SDL_QWin.cc 2007-03-12 20:57:00.000000000 +0100
12 +++ SDL-1.2.9/src/video/qtopia/SDL_QWin.cc 2007-03-12 20:58:02.000000000 +0100
15 #include <qapplication.h>
16 #include <qpe/qpeapplication.h>
17 +#include <opie2/odevice.h>
18 #include <qdirectpainter_qws.h>
20 +using namespace Opie::Core;
24 extern bool is_VGA_machine;
26 case Qt::Key_F7: scancode = SDLK_F7; break;
27 case Qt::Key_F8: scancode = SDLK_F8; break;
30 - mouse_button_mode=1;
31 + if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
32 + scancode = SDLK_y; }
35 + mouse_button_mode=1; }
38 - scancode = SDLK_F10;
39 - mouse_button_mode=2;
40 + if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
41 + scancode = SDLK_LALT; }
43 + scancode = SDLK_F10;
44 + mouse_button_mode=2; }
46 case Qt::Key_F11: scancode = SDLK_F11; break;
47 - case Qt::Key_F12: scancode = SDLK_F12; break;
49 + if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
50 + scancode = SDLK_RETURN; }
52 + scancode = SDLK_F12; }
55 - scancode = SDLK_F13;
56 - mouse_button_mode=3;
57 + if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
58 + scancode = SDLK_ESCAPE; }
60 + scancode = SDLK_F13;
61 + mouse_button_mode=3; }
63 case Qt::Key_F14: scancode = SDLK_F14; break;
64 case Qt::Key_F15: scancode = SDLK_F15; break;
66 scancode = SDLK_RETURN;
69 + // To use record button on ipaq
70 + case Qt::Key_F24: scancode = SDLK_LSHIFT; break;
73 scancode = SDLK_UNKNOWN;
75 diff -Naur SDL-1.2.9-orig/src/video/qtopia/SDL_sysvideo.cc SDL-1.2.9/src/video/qtopia/SDL_sysvideo.cc
76 --- SDL-1.2.9-orig/src/video/qtopia/SDL_sysvideo.cc 2007-03-12 20:55:07.000000000 +0100
77 +++ SDL-1.2.9/src/video/qtopia/SDL_sysvideo.cc 2007-03-12 20:58:02.000000000 +0100
79 #include <qapplication.h>
80 #include <qpe/qpeapplication.h>
81 #include <qpe/qcopenvelope_qws.h>
82 +#include <opie2/odevice.h>
84 #include <qwindowsystem_qws.h>
87 #include "SDL_syswm_c.h"
88 #include "SDL_lowvideo.h"
90 +using namespace Opie::Core;
92 //#define QTOPIA_DEBUG
94 #define QT_HIDDEN_SIZE 32 /* starting hidden window size */
104 { "Sharp", "SL-C760", 0 },
105 { "Sharp", "SL-C860", 0 },
106 { "Sharp", "SL-6000", 0 },
107 + { "HP", "HP IPAQ", 0 },
110 /* Name of the environment variable used to invert the screen rotation or not:
112 machine = MACHINE_SHARP_SLC760;
113 else if (strstr(buf, "SHARP Boxer") != NULL)
114 machine = MACHINE_SHARP_SLC860;
115 + else if ( ODevice::inst ( )-> series ( ) == Model_iPAQ )
116 + machine = MACHINE_IPAQ;
119 + machine = MACHINE_SHARP_SL5000D;
120 + LOG("Can't detect machine defaulting to SL5000D");
126 if (machine == MACHINE_SHARP_SL5500)
130 + if ( ODevice::inst( )-> series ( ) == Model_iPAQ ) {
133 + if ( ODevice::inst ( )-> model ( ) == Model_iPAQ_H38xx ) {
138 // SL-B500 Íѥϥå¯(¤È¤ê¤¢¤¨¤º¡¢¤Í)
139 if (machine == MACHINE_SHARP_SLB500)