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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Rob Savoye <rsavoye>    06/11/05 23:35:34

Modified files:
        gui            : gtk.cpp 
        plugin/klash   : klash.cpp 
        .              : ChangeLog 

Log message:
                * gui/gtk.cpp: Handle control keys better, so Gnash doesn't core
                dump. Works around #18207.
                * plugin/klash.cpp: Don't include tu_opengl.h, it doesn't exist,
                and isn't needed anyway.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.45.2.2&r2=1.45.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.17.2.2&r2=1.17.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.87&r2=1.1412.2.88

Patches:
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.45.2.2
retrieving revision 1.45.2.3
diff -u -b -r1.45.2.2 -r1.45.2.3
--- gui/gtk.cpp 31 Oct 2006 19:31:49 -0000      1.45.2.2
+++ gui/gtk.cpp 5 Nov 2006 23:35:34 -0000       1.45.2.3
@@ -14,6 +14,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+// 
+//
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -446,7 +449,7 @@
 void
 GtkGui::menuitem_sound_callback(GtkMenuItem* /*menuitem*/, gpointer /*data*/)
 {
-    GNASH_REPORT_FUNCTION;
+//    GNASH_REPORT_FUNCTION;
 
     sound_handler* snd_handler = get_sound_handler();
 
@@ -491,7 +494,6 @@
 GtkGui::menuitem_pause_callback(GtkMenuItem* /*menuitem*/, gpointer /*data*/)
 {
 //    GNASH_REPORT_FUNCTION;
-    dbglogfile << "menuitem_pause_callback: " << endl;
     menu_pause();
 }
 
@@ -716,28 +718,28 @@
         dbglogfile << "Got Shift-key: " << key << endl;
     }
     if (event->state == GDK_CONTROL_MASK) {
-        switch( (char)key) {
-          case 'q':
-          case 'w':
-              menuitem_quit_callback(NULL, NULL);
-              break;
+        dbglogfile << "Got Control-key: " << key << endl;
+        switch(key) {
           case 'r':
-              menuitem_restart_callback(NULL, NULL);
+              menu_restart();
               break;
           case 'p':
-              menuitem_pause_callback(NULL, NULL);
+              menu_pause();
+              break;
+          case 'q':
+          case 'w':
+              menu_quit();
               break;
           default:
-              dbglogfile << "Got Control-key: " << key << endl;
               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: '" << (char) key << "' its name is: " << 
gdk_keyval_name(key) << " hwkeycode: " << event->hardware_keycode << endl;
-    }
-        
+    } else {
+#if 0
+        dbglogfile << "Got key: '" << (char) key
+                   << "' its name is: " << gdk_keyval_name(key)
+                   << " it's value is: " << (int)key
+                   << " hwkeycode: " << event->hardware_keycode << endl;
+#endif
     switch (key) {
       case '[':
           menuitem_step_forward_callback(NULL, NULL);
@@ -748,6 +750,7 @@
       default:
           break;
     }
+    }
         
     return true;
 }

Index: plugin/klash/klash.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash.cpp,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -b -r1.17.2.2 -r1.17.2.3
--- plugin/klash/klash.cpp      5 Nov 2006 19:15:28 -0000       1.17.2.2
+++ plugin/klash/klash.cpp      5 Nov 2006 23:35:34 -0000       1.17.2.3
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: klash.cpp,v 1.17.2.2 2006/11/05 19:15:28 nihilus Exp $ */
+/* $Id: klash.cpp,v 1.17.2.3 2006/11/05 23:35:34 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,7 +40,7 @@
 
 #include "gnash.h"
 #include "log.h"
-#include "tu_opengl.h"
+//#include "tu_opengl.h"
 #include "utility.h"
 #include "container.h"
 #include "tu_file.h"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.87
retrieving revision 1.1412.2.88
diff -u -b -r1.1412.2.87 -r1.1412.2.88
--- ChangeLog   5 Nov 2006 20:35:08 -0000       1.1412.2.87
+++ ChangeLog   5 Nov 2006 23:35:34 -0000       1.1412.2.88
@@ -1,3 +1,10 @@
+2006-11-05  Rob Savoye  <address@hidden>
+
+       * gui/gtk.cpp: Handle control keys better, so Gnash doesn't core
+       dump. Works around #18207.
+       * plugin/klash.cpp: Don't include tu_opengl.h, it doesn't exist,
+       and isn't needed anyway.
+
 2006-11-05 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/String.as: