From 3fa929938bbb151d9dbc048d2424c7b2dd90a5ce Mon Sep 17 00:00:00 2001
From: Ole Loots <ole@monochrom.net>
Date: Tue, 9 Apr 2013 00:40:21 +0200
Subject: [PATCH] Fix duplicate Ctrl+V (and other shortcuts) key processing, by
 catching event callback return value.

---
 atari/gemtk/guiwin.c |  2 +-
 atari/gui.c          |  2 +-
 atari/rootwin.c      | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c
index 28eea4ebd..c175cce4a 100644
--- a/atari/gemtk/guiwin.c
+++ b/atari/gemtk/guiwin.c
@@ -605,7 +605,7 @@ short gemtk_wm_dispatch_event(EVMULT_IN *ev_in, EVMULT_OUT *ev_out, short msg[8]
             }
 
             if (handler_called==false) {
-                dest->handler_func(dest, ev_out, msg);
+                retval = dest->handler_func(dest, ev_out, msg);
             }
         }
     }
diff --git a/atari/gui.c b/atari/gui.c
index ef6ab07bd..db44c0ae3 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -142,7 +142,7 @@ void gui_poll(bool active)
     aes_event_in.emi_m1.g_x = mx;
     aes_event_in.emi_m1.g_y = my;
     evnt_multi_fast(&aes_event_in, aes_msg_out, &aes_event_out);
-    if(!gemtk_wm_dispatch_event(&aes_event_in, &aes_event_out, aes_msg_out)) {
+    if(gemtk_wm_dispatch_event(&aes_event_in, &aes_event_out, aes_msg_out) == 0) {
         if( (aes_event_out.emo_events & MU_MESAG) != 0 ) {
             LOG(("WM: %d\n", aes_msg_out[0]));
             switch(aes_msg_out[0]) {
diff --git a/atari/rootwin.c b/atari/rootwin.c
index 5b66a25de..775889a4a 100755
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -174,6 +174,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
         uint16_t nkc = gem_to_norm( (short)ev_out->emo_kmeta,
                                     (short)ev_out->emo_kreturn);
         retval = on_window_key_input(data->rootwin, nkc);
+        // printf("on_window_key_input: %d\n", retval);
 
     }
     if ((ev_out->emo_events & MU_BUTTON) != 0) {
@@ -745,7 +746,7 @@ void window_redraw_favicon(ROOTWIN *rootwin, GRECT *clip)
         objc_draw(tree, 0, 8, clip->g_x, clip->g_y, clip->g_w, clip->g_h);
     } else {
         // TODO: consider the clipping rectangle
-        printf("window_redraw_favicon image %p\n", rootwin->icon);
+        //printf("window_redraw_favicon image %p\n", rootwin->icon);
         struct rect work_clip = { 0,0,work.g_w,work.g_h };
         int xoff=0;
         if (work.g_w > work.g_h) {
@@ -1256,37 +1257,45 @@ static bool on_content_keypress(struct browser_window *bw, unsigned short nkc)
             case KEY_LINE_START:
                 gemtk_wm_scroll(w, GEMTK_WM_HSLIDER, -(g.g_w/slid->x_unit_px),
                               false);
+				r = true;
                 break;
 
             case KEY_LINE_END:
                 gemtk_wm_scroll(w, GEMTK_WM_HSLIDER, (g.g_w/slid->x_unit_px),
                               false);
+				r = true;
                 break;
 
             case KEY_PAGE_UP:
                 gemtk_wm_scroll(w, GEMTK_WM_VSLIDER, (g.g_h/slid->y_unit_px),
                               false);
+				r = true;
                 break;
 
             case KEY_PAGE_DOWN:
                 gemtk_wm_scroll(w, GEMTK_WM_VSLIDER, (g.g_h/slid->y_unit_px),
                               false);
+				r = true;
                 break;
 
             case KEY_RIGHT:
                 gemtk_wm_scroll(w, GEMTK_WM_HSLIDER, -1, false);
+				r = true;
                 break;
 
             case KEY_LEFT:
                 gemtk_wm_scroll(w, GEMTK_WM_HSLIDER, 1, false);
+				r = true;
                 break;
 
             case KEY_UP:
                 gemtk_wm_scroll(w, GEMTK_WM_VSLIDER, -1, false);
+				r = true;
                 break;
 
             case KEY_DOWN:
                 gemtk_wm_scroll(w, GEMTK_WM_VSLIDER, 1, false);
+                r = true;
                 break;
 
             default: