5 files changed, 107 insertions, 2 deletions

diff --git a/firmware/target/hosted/sdl/app/button-application.c b/firmware/target/hosted/sdl/app/button-application.c
index 2ad09dc373..72f4a1770d 100644
--- a/firmware/target/hosted/sdl/app/button-application.c
+++ b/firmware/target/hosted/sdl/app/button-application.c
@@ -30,6 +30,9 @@ int key_to_button(int keyboard_key)
     int new_btn = BUTTON_NONE;
     switch (keyboard_key)
     {
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO4)
+        case SDLK_ESCAPE:
+#endif
         case SDLK_KP7:
             new_btn = BUTTON_TOPLEFT;
             break;
@@ -37,6 +40,9 @@ int key_to_button(int keyboard_key)
         case SDLK_UP:
             new_btn = BUTTON_TOPMIDDLE;
             break;
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO4)
+        case SDLK_F7:
+#endif
         case SDLK_KP9:
             new_btn = BUTTON_TOPRIGHT;
             break;
@@ -44,6 +50,10 @@ int key_to_button(int keyboard_key)
         case SDLK_LEFT:
             new_btn = BUTTON_MIDLEFT;
             break;
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+        case SDLK_RETURN:
+        case SDLK_KP_ENTER:
+#endif
         case SDLK_KP5:
             new_btn = BUTTON_CENTER;
             break;
@@ -51,6 +61,9 @@ int key_to_button(int keyboard_key)
         case SDLK_RIGHT:
             new_btn = BUTTON_MIDRIGHT;
             break;
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO4)
+        case SDLK_F6:
+#endif
         case SDLK_KP1:
             new_btn = BUTTON_BOTTOMLEFT;
             break;
@@ -58,6 +71,9 @@ int key_to_button(int keyboard_key)
         case SDLK_DOWN:
             new_btn = BUTTON_BOTTOMMIDDLE;
             break;
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO4)
+        case SDLK_F8:
+#endif
         case SDLK_KP3:
             new_btn = BUTTON_BOTTOMRIGHT;
             break;
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 3321a01bc6..25dad09341 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -67,6 +67,8 @@ struct event_queue button_queue;
 
 static int btn = 0;    /* Hopefully keeps track of currently pressed keys... */
 
+int sdl_app_has_input_focus = 1;
+
 #ifdef HAS_BUTTON_HOLD
 bool hold_button_state = false;
 bool button_hold(void) {
@@ -209,11 +211,34 @@ static void mouse_event(SDL_MouseButtonEvent *event, bool button_up)
 
 static bool event_handler(SDL_Event *event)
 {
+    SDLKey ev_key;
+
     switch(event->type)
     {
+    case SDL_ACTIVEEVENT:
+        if (event->active.state & SDL_APPINPUTFOCUS)
+        {
+            if (event->active.gain == 1)
+                sdl_app_has_input_focus = 1;
+            else
+                sdl_app_has_input_focus = 0;
+        }
+        break;
     case SDL_KEYDOWN:
     case SDL_KEYUP:
-        button_event(event->key.keysym.sym, event->type == SDL_KEYDOWN);
+        ev_key = event->key.keysym.sym;
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO5)
+        /* N900 with shared up/down cursor mapping. Seen on the German,
+           Finnish, Italian, French and Russian version. Probably more. */
+        if (event->key.keysym.mod & KMOD_MODE)
+        {
+            if (ev_key == SDLK_LEFT)
+                ev_key = SDLK_UP;
+            else if (ev_key == SDLK_RIGHT)
+                ev_key = SDLK_DOWN;
+        }
+#endif
+        button_event(ev_key, event->type == SDL_KEYDOWN);
         break;
 #ifdef HAVE_TOUCHSCREEN
     case SDL_MOUSEMOTION:
diff --git a/firmware/target/hosted/sdl/button-sdl.h b/firmware/target/hosted/sdl/button-sdl.h
index e6fcb9ea83..6b7f632eaf 100644
--- a/firmware/target/hosted/sdl/button-sdl.h
+++ b/firmware/target/hosted/sdl/button-sdl.h
@@ -26,6 +26,8 @@
 #include <stdbool.h>
 #include "config.h"
 
+extern int sdl_app_has_input_focus;
+
 bool button_hold(void);
 #undef button_init_device
 void button_init_device(void);
diff --git a/firmware/target/hosted/sdl/lcd-bitmap.c b/firmware/target/hosted/sdl/lcd-bitmap.c
index 7058b26e8c..4c296924af 100644
--- a/firmware/target/hosted/sdl/lcd-bitmap.c
+++ b/firmware/target/hosted/sdl/lcd-bitmap.c
@@ -22,8 +22,12 @@
 #include "debug.h"
 #include "sim-ui-defines.h"
 #include "system.h"
+#include "button-sdl.h"
 #include "lcd-sdl.h"
 #include "screendump.h"
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+#include "maemo-thread.h"
+#endif
 
 SDL_Surface* lcd_surface;
 
@@ -123,6 +127,16 @@ void lcd_update(void)
 
 void lcd_update_rect(int x_start, int y_start, int width, int height)
 {
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+    /* Don't update display if not shown */
+    if (!maemo_display_on)
+        return;
+
+    /* Don't update if we don't have the input focus */
+    if (!sdl_app_has_input_focus)
+        return;
+#endif
+
     sdl_update_rect(lcd_surface, x_start, y_start, width, height,
                     LCD_WIDTH, LCD_HEIGHT, get_lcd_pixel);
     sdl_gui_update(lcd_surface, x_start, y_start, width,
diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c
index b900d38b43..9ea25c1014 100644
--- a/firmware/target/hosted/sdl/system-sdl.c
+++ b/firmware/target/hosted/sdl/system-sdl.c
@@ -40,6 +40,13 @@
 #include "panic.h"
 #include "debug.h"
 
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+#include <glib.h>
+#include <glib-object.h>
+#include "maemo-thread.h"
+
+#endif
+
 SDL_Surface    *gui_surface;
 
 bool            background = true;          /* use backgrounds by default */
@@ -82,9 +89,13 @@ static int sdl_event_thread(void * param)
 {
     SDL_InitSubSystem(SDL_INIT_VIDEO);
 
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+    SDL_sem *wait_for_maemo_startup;
+#endif
     SDL_Surface *picture_surface = NULL;
     int width, height;
     int depth;
+    Uint32 flags;
 
     /* Try and load the background image. If it fails go without */
     if (background) {
@@ -121,10 +132,21 @@ static int sdl_event_thread(void * param)
     if (depth < 8)
         depth = 16;
 
-    if ((gui_surface = SDL_SetVideoMode(width * display_zoom, height * display_zoom, depth, SDL_HWSURFACE|SDL_DOUBLEBUF)) == NULL) {
+    flags = SDL_HWSURFACE|SDL_DOUBLEBUF;
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+    /* Fullscreen mode for maemo app */
+    flags |= SDL_FULLSCREEN;
+#endif
+
+    if ((gui_surface = SDL_SetVideoMode(width * display_zoom, height * display_zoom, depth, flags)) == NULL) {
         panicf("%s", SDL_GetError());
     }
 
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+    /* Hide mouse cursor on real touchscreen device */
+    SDL_ShowCursor(SDL_DISABLE);
+#endif
+
     SDL_WM_SetCaption(UI_TITLE, NULL);
 
     if (background && picture_surface != NULL)
@@ -133,10 +155,30 @@ static int sdl_event_thread(void * param)
     /* let system_init proceed */
     SDL_SemPost((SDL_sem *)param);
 
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+    /* Start maemo thread: Listen to display on/off events and battery monitoring */
+    wait_for_maemo_startup = SDL_CreateSemaphore(0); /* 0-count so it blocks */
+    SDL_Thread *maemo_thread = SDL_CreateThread(maemo_thread_func, wait_for_maemo_startup);
+#endif
+
     /*
      * finally enter the button loop */
     gui_message_loop();
 
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+    /* Ensure maemo thread is up and running */
+    SDL_SemWait(wait_for_maemo_startup);
+    SDL_DestroySemaphore(wait_for_maemo_startup);
+
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO5)
+    pcm_shutdown_gstreamer();
+#endif
+
+    g_main_loop_quit (maemo_main_loop);
+    g_main_loop_unref(maemo_main_loop);
+    SDL_WaitThread(maemo_thread, NULL);
+#endif
+
     if(picture_surface)
         SDL_FreeSurface(picture_surface);
 
@@ -161,6 +203,12 @@ void system_init(void)
 {
     SDL_sem *s;
 
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+    /* Make glib thread safe */
+    g_thread_init(NULL);
+    g_type_init();
+#endif
+
     if (SDL_Init(SDL_INIT_TIMER))
         panicf("%s", SDL_GetError());