rendered paste bodydiff -urp exult/exult.cc exult-1.2.cvs20070114/exult.cc--- exult/exult.cc 2008-01-09 02:04:58.000000000 +0100+++ exult-1.2.cvs20070114/exult.cc 2008-01-14 19:41:29.000000000 +0100@@ -97,7 +97,7 @@ #include "items.h" #include "gamemgr/modmgr.h" -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO #include "Keyboard_gump.h" #include "touchscreen.h" #endif@@ -137,6 +137,8 @@ const std::string c_empty_string; #ifdef UNDER_CE string WINCE_exepath;+#endif+#ifdef UNDER_CE || UNDER_MAEMO bool minimized; Keyboard_gump *gkeyboard; clsTouchscreen *Touchscreen;@@ -159,6 +161,9 @@ struct resolution { { 240, 160, 2 }, { 160, 240, 2 }, { 240, 320, 2 },+#elif UNDER_MAEMO+ { 400, 300, 1 },+ { 400, 300, 2 }, #endif { 320, 200, 1 }, { 320, 240, 1 },@@ -544,7 +549,7 @@ int exult_main(const char *runpath) cheat.init(); -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO GXOpenInput(); GXKeyList keys = GXGetDefaultKeys(GX_LANDSCAPEKEYS);@@ -572,7 +577,7 @@ int exult_main(const char *runpath) Mouse::mouse = new Mouse(gwin); Mouse::mouse->set_shape(Mouse::hand); -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->autopaint = false; gkeyboard->minimize(); gkeyboard->autopaint = true;@@ -580,7 +585,7 @@ int exult_main(const char *runpath) int result = Play(); // start game -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO GXCloseInput(); #endif @@ -676,6 +681,11 @@ static void Init h = 240; sc = 1; sclr = Image_window::SaI;+#elif UNDER_MAEMO+ w = 400;+ h = 240;+ sc = 2;+ sclr = Image_window::SaI; #else // Default resolution is 320x200 with 2x scaling w = 320;@@ -711,7 +721,7 @@ static void Init if (arg_buildmap < 0) { -#if defined(__zaurus__) || defined(UNDER_CE)+#if defined(__zaurus__) || defined(UNDER_CE) || defined(UNDER_MAEMO) gwin = new Game_window(sw, sh, scaleval, sclr); #else if (arg_gamename != "default" || run_bg || run_si)@@ -764,7 +774,7 @@ static void Init else { #if !(defined(__zaurus__))-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gwin->resized(sw, sh, scaleval, sclr); // Ensure proper clipping: gwin->get_win()->set_clip(0, 0, sw, sh);@@ -1207,7 +1217,7 @@ static void Handle_event { if (dont_move_mode) break;-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO if (gkeyboard->handle_event(&event)) break; Touchscreen->handle_event(&event);@@ -1301,7 +1311,7 @@ static void Handle_event { if (dont_move_mode) break;-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO if (gkeyboard->handle_event(&event)) break; Touchscreen->handle_event(&event);@@ -1572,7 +1582,7 @@ static int Get_click switch (event.type) { case SDL_MOUSEBUTTONDOWN:-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO if (gkeyboard->handle_event(&event)) break; Touchscreen->handle_event(&event);@@ -1588,7 +1598,7 @@ static int Get_click } break; case SDL_MOUSEBUTTONUP:-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO if (gkeyboard->handle_event(&event)) break; Touchscreen->handle_event(&event);diff -urp exult/exult.h exult-1.2.cvs20070114/exult.h--- exult/exult.h 2007-06-28 21:24:54.000000000 +0200+++ exult-1.2.cvs20070114/exult.h 2008-01-14 19:38:30.000000000 +0100@@ -86,6 +86,8 @@ extern quitting_time_enum quitting_time; #ifdef UNDER_CE extern std::string WINCE_exepath;+#endif+#ifdef UNDER_CE || UNDER_MAEMO extern bool minimized; extern class Keyboard_gump *gkeyboard; extern class clsTouchscreen *Touchscreen;diff -urp exult/fnames.h exult-1.2.cvs20070114/fnames.h--- exult/fnames.h 2007-06-24 18:06:41.000000000 +0200+++ exult-1.2.cvs20070114/fnames.h 2008-01-14 19:44:43.000000000 +0100@@ -147,7 +147,7 @@ #define MAINMENU_TIM "<STATIC>/mainmenu.tim" #define EXULT_FLX "<DATA>/exult.flx"-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO #define POCKETPC_FLX "<DATA>/exult_pocketpc.flx" #endif #define AUTONOTES "autonotes.txt"diff -urp exult/gamemgr/bggame.cc exult-1.2.cvs20070114/gamemgr/bggame.cc--- exult/gamemgr/bggame.cc 2007-06-30 21:28:41.000000000 +0200+++ exult-1.2.cvs20070114/gamemgr/bggame.cc 2008-01-14 19:40:29.000000000 +0100@@ -1584,7 +1584,7 @@ bool BG_Game::new_game(Vga_file &shapes) // Create palette translation table. Maybe make them static? unsigned char *transto = new unsigned char[256]; oldpal->create_palette_map(pal, transto);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->autopaint = false; gkeyboard->minimize(); #endif@@ -1613,14 +1613,14 @@ bool BG_Game::new_game(Vga_file &shapes) else snprintf(disp_name, max_name_len+2, "%s", npc_name); font->draw_text(ibuf, topx+60, menuy+10, disp_name, transto);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->paint(); #endif pal->apply(); redraw = false; } SDL_WaitEvent(&event);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO if (gkeyboard->handle_event(&event)) redraw = true; #endif@@ -1731,7 +1731,7 @@ bool BG_Game::new_game(Vga_file &shapes) #ifdef DEBUG std::cout << "Skin is: " << skindata->skin_id << " Sex is: " << skindata->is_female << std::endl; #endif-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->minimize(); gkeyboard->autopaint = true; #endifdiff -urp exult/gamemgr/sigame.cc exult-1.2.cvs20070114/gamemgr/sigame.cc--- exult/gamemgr/sigame.cc 2007-06-30 21:28:41.000000000 +0200+++ exult-1.2.cvs20070114/gamemgr/sigame.cc 2008-01-14 19:40:37.000000000 +0100@@ -1241,7 +1241,7 @@ bool SI_Game::new_game(Vga_file &shapes) Skin_data *skindata = Shapeinfo_lookup::GetSkinInfoSafe( defskin->default_skin, defskin->default_female, true);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->autopaint = false; gkeyboard->minimize(); #endif@@ -1264,14 +1264,14 @@ bool SI_Game::new_game(Vga_file &shapes) else snprintf(disp_name, max_len+2, "%s", npc_name); font->draw_text(ibuf, topx+60, menuy+10, disp_name);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->paint(); #endif pal->apply(); redraw = false; } SDL_WaitEvent(&event);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO if (gkeyboard->handle_event(&event)) redraw = true; #endif@@ -1382,7 +1382,7 @@ bool SI_Game::new_game(Vga_file &shapes) #ifdef DEBUG std::cout << "Skin is: " << skindata->skin_id << " Sex is: " << skindata->is_female << std::endl; #endif-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->minimize(); gkeyboard->autopaint = true; #endifdiff -urp exult/gamerend.cc exult-1.2.cvs20070114/gamerend.cc--- exult/gamerend.cc 2007-11-06 12:21:11.000000000 +0100+++ exult-1.2.cvs20070114/gamerend.cc 2008-01-14 19:34:50.000000000 +0100@@ -563,7 +563,7 @@ void Game_window::paint_dirty() if (box.w > 0 && box.h > 0) paint(box); // (Could create new dirty rects.) clear_dirty();-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->paint(); #endif }diff -urp exult/gamewin.cc exult-1.2.cvs20070114/gamewin.cc--- exult/gamewin.cc 2007-11-07 06:34:36.000000000 +0100+++ exult-1.2.cvs20070114/gamewin.cc 2008-01-14 19:38:39.000000000 +0100@@ -521,11 +521,11 @@ void Game_window::init_files(bool cycle) keybinder->LoadFromFile(keyfilename.c_str()); } keybinder->LoadFromPatch();-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO // Take care of special WinCE D-PAD Options int dpadopt; config->value("config/gameplay/dpadopt", dpadopt, 3);- keybinder->WINCE_LoadFromDPADOPT(dpadopt);+ keybinder->LoadFromDPADOPT(dpadopt); #endif CYCLE_RED_PLASMA(); // initialize .wav SFX packdiff -urp exult/gumps/Gamemenu_gump.cc exult-1.2.cvs20070114/gumps/Gamemenu_gump.cc--- exult/gumps/Gamemenu_gump.cc 2007-06-26 21:52:43.000000000 +0200+++ exult-1.2.cvs20070114/gumps/Gamemenu_gump.cc 2008-01-14 19:39:54.000000000 +0100@@ -104,7 +104,7 @@ void Gamemenu_gump::quit(bool return_to_ { if (!Yesno_gump::ask("Do you really want to quit?")) {-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO if (Yesno_gump::ask("Do you want to minimize?")) { ActionMinimizeGame(NULL);diff -urp exult/gumps/GameplayOptions_gump.cc exult-1.2.cvs20070114/gumps/GameplayOptions_gump.cc--- exult/gumps/GameplayOptions_gump.cc 2007-11-07 06:34:37.000000000 +0100+++ exult-1.2.cvs20070114/gumps/GameplayOptions_gump.cc 2008-01-14 19:39:49.000000000 +0100@@ -125,7 +125,7 @@ void GameplayOptions_gump::toggle(Gump_b else if (btn == buttons[1]) fastmouse = state; else if (btn == buttons[2])-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO dpadopt = state; #else mouse3rd = state;@@ -194,7 +194,7 @@ void GameplayOptions_gump::build_buttons textbgcolor[10] = "Dark gray"; textbgcolor[11] = "White"; -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO std::string *dpadtext = new std::string[4]; dpadtext[0] = "Portrait"; dpadtext[1] = "Landscape1";@@ -218,7 +218,7 @@ void GameplayOptions_gump::build_buttons paperdolls); buttons[1] = new GameplayEnabledToggle(this, colx[3], rowy[3], 59, fastmouse);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO buttons[2] = new GameplayTextToggle(this, dpadtext, colx[3]-21, rowy[4], 80, dpadopt, 4); #else@@ -244,7 +244,7 @@ void GameplayOptions_gump::build_buttons void GameplayOptions_gump::load_settings() { fastmouse = gwin->get_fastmouse();-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO config->value("config/gameplay/dpadopt", dpadopt, 0); #else mouse3rd = gwin->get_mouse3rd();@@ -318,9 +318,9 @@ void GameplayOptions_gump::save_settings config->set("config/video/fps", fps, true); gwin->set_fastmouse(fastmouse!=false); config->set("config/gameplay/fastmouse", fastmouse ? "yes" : "no", true);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO config->set("config/gameplay/dpadopt", dpadopt, true);- keybinder->WINCE_LoadFromDPADOPT(dpadopt);+ keybinder->LoadFromDPADOPT(dpadopt); #else gwin->set_mouse3rd(mouse3rd!=false); config->set("config/gameplay/mouse3rd", mouse3rd ? "yes" : "no", true);@@ -362,7 +362,7 @@ void GameplayOptions_gump::paint() if (GAME_BG) sman->paint_text(2, "Paperdolls:", x + colx[0], y + rowy[2] + 1); sman->paint_text(2, "Fast Mouse:", x + colx[0], y + rowy[3] + 1);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO sman->paint_text(2, "D-Pad:", x + colx[0], y + rowy[4] + 1); #else sman->paint_text(2, "Use Middle Mouse Button:", x + colx[0], y + rowy[4] + 1);diff -urp exult/gumps/GameplayOptions_gump.h exult-1.2.cvs20070114/gumps/GameplayOptions_gump.h--- exult/gumps/GameplayOptions_gump.h 2007-11-06 12:21:14.000000000 +0100+++ exult-1.2.cvs20070114/gumps/GameplayOptions_gump.h 2008-01-14 19:39:56.000000000 +0100@@ -32,7 +32,7 @@ class GameplayOptions_gump : public Moda Gump_button* buttons[15]; int facestats; int fastmouse;-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO int dpadopt; #endif int mouse3rd;diff -urp exult/gumps/Gump_manager.cc exult-1.2.cvs20070114/gumps/Gump_manager.cc--- exult/gumps/Gump_manager.cc 2007-06-24 18:06:41.000000000 +0200+++ exult-1.2.cvs20070114/gumps/Gump_manager.cc 2008-01-14 19:40:08.000000000 +0100@@ -429,7 +429,7 @@ void Gump_manager::paint() { for (Gump_list *gmp = open_gumps; gmp; gmp = gmp->next) gmp->gump->paint();-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->paint(); #endif }@@ -461,7 +461,7 @@ int Gump_manager::handle_modal_gump_even switch (event.type) {-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO case SDL_ACTIVEEVENT: if ((event.active.state & SDL_APPACTIVE) && event.active.gain && minimized) {@@ -476,7 +476,7 @@ int Gump_manager::handle_modal_gump_even cout << "(x,y) rel. to gump is (" << ((event.button.x / scale_factor) - gump->get_x()) << ", " << ((event.button.y / scale_factor) - gump->get_y()) << ")"<<endl; #endif-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO if (gkeyboard->handle_event(&event)) break; #endif@@ -494,7 +494,7 @@ cout << "(x,y) rel. to gump is (" << ((e gump->mousewheel_down(); break; case SDL_MOUSEBUTTONUP:-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO if (gkeyboard->handle_event(&event)) break; #endif@@ -580,7 +580,7 @@ int Gump_manager::do_modal_gump paint->paint(); Mouse::mouse->show(); gwin->show();-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->paint(); #endif do@@ -601,7 +601,7 @@ int Gump_manager::do_modal_gump if (!gwin->show() && // Blit to screen if necessary. Mouse::mouse_update) // If not, did mouse change? Mouse::mouse->blit_dirty();-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO gkeyboard->paint(); #endif }diff -urp exult/gumps/Keyboard_gump.cc exult-1.2.cvs20070114/gumps/Keyboard_gump.cc--- exult/gumps/Keyboard_gump.cc 2007-06-29 17:36:03.000000000 +0200+++ exult-1.2.cvs20070114/gumps/Keyboard_gump.cc 2008-01-14 19:40:11.000000000 +0100@@ -16,7 +16,7 @@ along with this program; if not, write t Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO #ifdef HAVE_CONFIG_H # include <config.h>diff -urp exult/gumps/Keyboard_gump.h exult-1.2.cvs20070114/gumps/Keyboard_gump.h--- exult/gumps/Keyboard_gump.h 2007-06-29 17:36:03.000000000 +0200+++ exult-1.2.cvs20070114/gumps/Keyboard_gump.h 2008-01-14 19:39:33.000000000 +0100@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suit #ifndef _POCKETPC_KEYBOARD_GUMP_H #define _POCKETPC_KEYBOARD_GUMP_H -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO #define KEYBOARD_GUMP_NUMBUTTONS 48 diff -urp exult/imagewin/ibuf8.cc exult-1.2.cvs20070114/imagewin/ibuf8.cc--- exult/imagewin/ibuf8.cc 2007-06-17 01:44:44.000000000 +0200+++ exult-1.2.cvs20070114/imagewin/ibuf8.cc 2008-01-14 19:39:00.000000000 +0100@@ -215,7 +215,7 @@ void Image_buffer8::copy8 if (!clip(srcx, srcy, srcw, srch, destx, desty)) return; -#if !(defined(__sparc__) || defined(__zaurus__) || defined(UNDER_CE))+#if !(defined(__sparc__) || defined(__zaurus__) || defined(UNDER_CE) || defined(UNDER_MAEMO)) uint32 *to = (uint32*) (bits + desty*line_width + destx); uint32 *from = (uint32*) (src_pixels + srcy*src_width + srcx); int to_next = line_width - srcw;// # pixels to next line.diff -urp exult/keyactions.cc exult-1.2.cvs20070114/keyactions.cc--- exult/keyactions.cc 2007-06-29 17:36:02.000000000 +0200+++ exult-1.2.cvs20070114/keyactions.cc 2008-01-14 19:38:17.000000000 +0100@@ -46,7 +46,7 @@ #include "effects.h" #include "palette.h" -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO #include "Keyboard_gump.h" #include "Touchscreen.h" #endif@@ -82,7 +82,7 @@ void ActionOldFileGump(int *params) delete fileio; } -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO // { ActionMinimizeGame, 0, "Minimize game", true, false, NONE }, void ActionMinimizeGame(int *params) {diff -urp exult/keyactions.h exult-1.2.cvs20070114/keyactions.h--- exult/keyactions.h 2007-06-29 17:36:02.000000000 +0200+++ exult-1.2.cvs20070114/keyactions.h 2008-01-14 19:34:47.000000000 +0100@@ -29,7 +29,7 @@ void ActionCloseGumps(int* params); void ActionCloseOrMenu(int* params); void ActionMenuGump(int* params); void ActionOldFileGump(int* params);-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO void ActionMinimizeGame(int* params); void ActionTouchscreenMode(int* params); void ActionKeyboardPosition(int* params);diff -urp exult/keys.cc exult-1.2.cvs20070114/keys.cc--- exult/keys.cc 2007-10-06 06:52:15.000000000 +0200+++ exult-1.2.cvs20070114/keys.cc 2008-01-14 19:34:54.000000000 +0100@@ -87,7 +87,7 @@ const struct Action { { "GAME_MENU", ActionMenuGump, 0, "Game Menu", true, false, NONE, true }, { "OLD_FILE_GUMP", ActionOldFileGump, 0, "Save/restore", true, false, NONE, true },-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO { "MINIMIZE_GAME", ActionMinimizeGame, 0, "Minimize game", true, false, NONE, true }, { "TOUCHSCREEN_MODE", ActionTouchscreenMode, 0, "Touchscreen mode", true, false, NONE, true }, { "KEYBOARD_POSITION", ActionKeyboardPosition, 0, "Keyboard position", true, false, NONE, true },@@ -589,8 +589,8 @@ void KeyBinder::LoadFromPatch() } } -#ifdef UNDER_CE-void KeyBinder::WINCE_LoadFromDPADOPT(int opt)+#ifdef UNDER_CE || UNDER_MAEMO+void KeyBinder::LoadFromDPADOPT(int opt) { if (opt == 0) // Portrait {diff -urp exult/keys.h exult-1.2.cvs20070114/keys.h--- exult/keys.h 2007-06-20 00:55:32.000000000 +0200+++ exult-1.2.cvs20070114/keys.h 2008-01-14 19:34:02.000000000 +0100@@ -72,8 +72,8 @@ public: void LoadFromFile(const char* filename); void LoadFromPatch(); void LoadDefaults();-#ifdef UNDER_CE- void WINCE_LoadFromDPADOPT(int opt);+#ifdef UNDER_CE || UNDER_MAEMO+ void LoadFromDPADOPT(int opt); #endif void ShowHelp(); void ShowCheatHelp();diff -urp exult/shapeid.cc exult-1.2.cvs20070114/shapeid.cc--- exult/shapeid.cc 2007-06-24 18:06:41.000000000 +0200+++ exult-1.2.cvs20070114/shapeid.cc 2008-01-14 19:44:21.000000000 +0100@@ -221,7 +221,7 @@ void Shape_manager::load fonts->init(); } -#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO files[SF_POCKETPC_FLX].load(POCKETPC_FLX); #endif diff -urp exult/shapeid.h exult-1.2.cvs20070114/shapeid.h--- exult/shapeid.h 2007-06-24 18:06:41.000000000 +0200+++ exult-1.2.cvs20070114/shapeid.h 2008-01-14 19:44:58.000000000 +0100@@ -40,7 +40,7 @@ enum ShapeFile { SF_GAME_FLX, // <DATA>/bg_data.flx or <DATA>/si_data.flx // Not yet //SF_FONTS_VGA, // <STATIC>/fonts.vga-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO SF_POCKETPC_FLX, #endif SF_OTHER, // Other unknown FLXdiff -urp exult/touchscreen.cc exult-1.2.cvs20070114/touchscreen.cc--- exult/touchscreen.cc 2007-06-29 17:36:02.000000000 +0200+++ exult-1.2.cvs20070114/touchscreen.cc 2008-01-14 19:38:35.000000000 +0100@@ -1,4 +1,4 @@-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO #include "touchscreen.h" #include <sdl.h> diff -urp exult/touchscreen.h exult-1.2.cvs20070114/touchscreen.h--- exult/touchscreen.h 2007-06-29 17:36:02.000000000 +0200+++ exult-1.2.cvs20070114/touchscreen.h 2008-01-14 19:38:19.000000000 +0100@@ -1,4 +1,4 @@-#ifdef UNDER_CE+#ifdef UNDER_CE || UNDER_MAEMO #ifndef TOUCHSCREEN_H #define TOUCHSCREEN_H