[Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gui.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/10 09:05:10

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp gui.cpp 

Log message:
        * gui/gtk.cpp, gui/gui.cpp: make "CTRL- q, w, p" and ESC work again.
        patch by annonygmouse <address@hidden>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.616&r2=1.617
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -b -r1.616 -r1.617
--- ChangeLog   10 Aug 2006 09:00:28 -0000      1.616
+++ ChangeLog   10 Aug 2006 09:05:09 -0000      1.617
@@ -1,3 +1,8 @@
+2006-08-10 annonygmouse <address@hidden>
+
+       * gui/gtk.cpp, gui/gui.cpp: 
+         make "CTRL- q, w, p" and ESC work again. 
+
 2006-08-10  Sandro Santilli  <address@hidden>
 
        * server/asobj/NetConnection.cpp: added 'using namespace rtmp'

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gui/gtk.cpp 31 Jul 2006 23:26:33 -0000      1.15
+++ gui/gtk.cpp 10 Aug 2006 09:05:10 -0000      1.16
@@ -51,6 +51,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
 
 
 using namespace std;
@@ -324,6 +325,7 @@
                         gpointer data)
 {
 //    GNASH_REPORT_FUNCTION;
+    dbglogfile << "menuitem_pause_callback: " << endl;
     menu_pause();
 }
 
@@ -456,44 +458,41 @@
     GNASH_REPORT_FUNCTION;
 
     switch (event->keyval) {
-    case XK_Home:
+    case GDK_Home:
 //        info.what = viewer::key_home;
         break;
-
-    case XK_Left:
+    case GDK_Left:
 //        info.what = viewer::key_left;
         break;
-
-    case XK_Up:
+    case GDK_Up:
 //        info.what = viewer::key_up;
         break;
-
-    case XK_Right:
+    case GDK_Right:
 //        info.what = viewer::key_right;
         break;
-
-    case XK_Down:
+    case GDK_Down:
 //        info.what = viewer::key_down;
         break;
-
-    case XK_Page_Up:
+    case GDK_Page_Up:
 //        info.what = viewer::key_page_up;
         break;
-
-    case XK_Page_Down:
+    case GDK_Page_Down:
 //        info.what = viewer::key_page_down;
         break;
-
     default:
         if (event->length <= 0) {
             return true;
         }
-        char key = gdk_unicode_to_keyval(event->keyval);
+        unsigned int key = gdk_unicode_to_keyval(event->keyval);
         if (event->state == GDK_SHIFT_MASK) {
             dbglogfile << "Got Shift-key: " << key << endl;
         }
         if (event->state == GDK_CONTROL_MASK) {
-            switch(key) {
+            switch( (char)key) {
+              case 'q':
+              case 'w':
+                  menuitem_quit_callback(NULL, NULL);
+                  break;
               case 'r':
                   menuitem_restart_callback(NULL, NULL);
                   break;
@@ -505,18 +504,16 @@
                   break;
             }
         }
+       if ( event->hardware_keycode == 9 )
+               menuitem_quit_callback(NULL,NULL); //Only hardware_keycode 
worked to detect Escape key pressed.
         if ((event->state != GDK_CONTROL_MASK) || !(event->state != 
GDK_SHIFT_MASK)) {
-            dbglogfile << "Got key: " << key << endl;
+           dbglogfile << "Got key: '" << (char) key << "' its name is: " << 
gdk_keyval_name(key) << " hwkeycode: " << event->hardware_keycode << endl;
         }
         
         gnash::key::code       c(gnash::key::INVALID);
         
         if (key >= 'a' && key <= 'z') {
             c = (gnash::key::code) ((key - 'a') + gnash::key::A);
-//         } else if (key >= SDLK_F1 && key <= SDLK_F15)       {
-//             c = (gnash::key::code) ((key - SDLK_F1) + gnash::key::F1);
-//         } else if (key >= SDLK_KP0 && key <= SDLK_KP9) {
-//             c = (gnash::key::code) ((key - SDLK_KP0) + gnash::key::KP_0);
         }
         switch (key) {
           case '[':

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gui/gui.cpp 9 Aug 2006 11:47:30 -0000       1.13
+++ gui/gui.cpp 10 Aug 2006 09:05:10 -0000      1.14
@@ -140,6 +140,7 @@
     } else {
       m->set_play_state(gnash::movie_interface::STOP);
     }
+
 }
 
 void
@@ -201,17 +202,16 @@
     Gui *gui = reinterpret_cast<Gui*> (data);
     gnash::movie_interface* m = gnash::get_current_root();
 
+    if (m->get_play_state() == gnash::movie_interface::PLAY) {
     m->advance(1.0);
+    }
     m->display();
-    
     gui->renderBuffer();
     
-    if (!gui->loops()) {
         if (m->get_current_frame() + 1 ==
             m->get_root_movie()->get_movie_definition()->get_frame_count()) {
             exit(0); // TODO: quit in a more gentile fashion.
         }
-    }
 
     return true;
 }