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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/09/11 15:35:42

Modified files:
        .              : ChangeLog 
        server         : gnash.h 
        gui            : gtk.cpp 

Log message:
                * server/gnash.h: add more keycodes.
                * gui/gtk.cpp: pass more keystrokes.
                * server/edit_text_character.cpp: do not add character to string
                  when shift pressed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4270&r2=1.4271
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.106&r2=1.107

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4270
retrieving revision 1.4271
diff -u -b -r1.4270 -r1.4271
--- ChangeLog   11 Sep 2007 14:51:06 -0000      1.4270
+++ ChangeLog   11 Sep 2007 15:35:42 -0000      1.4271
@@ -1,3 +1,10 @@
+2007-09-11 Benjamin Wolsey <address@hidden>
+
+       * server/gnash.h: add more keycodes.
+       * gui/gtk.cpp: pass more keystrokes.
+       * server/edit_text_character.cpp: do not add character to string
+         when shift pressed.
+
 2007-09-11 Sandro Santilli <address@hidden>
 
        * testsuite/swfdec/PASSING: super-this-5.swf passes (probably since

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/gnash.h      16 Aug 2007 10:31:51 -0000      1.102
+++ server/gnash.h      11 Sep 2007 15:35:42 -0000      1.103
@@ -481,8 +481,8 @@
        CLEAR = 12,
        ENTER,
        SHIFT = 16,
-       CONTROL,
-       ALT,
+       CONTROL = 17,
+       ALT = 18,
        CAPSLOCK = 20,
        ESCAPE = 27,
        SPACE = 32,
@@ -500,14 +500,47 @@
        NUM_LOCK = 144,
        SEMICOLON = 186,
        EQUALS = 187,
+       COMMA = 188,
        MINUS = 189,
+       PERIOD = 190,
        SLASH = 191,
        BACKTICK = 192,
        LEFT_BRACKET = 219,
        BACKSLASH = 220,
        RIGHT_BRACKET = 221,
+       APOSTROPHE = 222,
+
+       PAREN_RIGHT = 48,
+       EXCLAM = 49,
+       AT = 50,
+       HASH = 51,
+       DOLLAR = 52,
+       PERCENT = 53,
+       ASCIICIRCUM = 54,
+       AMPERSAND = 55,
+       ASTERISK = 56,
+       PAREN_LEFT = 57,
+       COLON = 186,
+       PLUS = 187,
+       LESSTHAN = 188,
+       UNDERSCORE = 189,
+       MORETHAN = 190,
+       QUESTION = 191,
+       ASCIITILDE = 192,
+       CURLYLEFT = 219,
+       PIPE = 220,
+       CURLYRIGHT = 221,
        QUOTE = 222,
 
+       // Extended ASCII
+       NOBREAKSPACE = 160,
+       AGRAVE = 192, 
+       NTILDE = 209,
+       UGRAVE = 217,
+       SSHARPSMALL = 223,
+       UGRAVESMALL = 249,
+       YACUTESMALL = 255, //Last
+
        KEYCOUNT
 };
 enum modifier

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- gui/gtk.cpp 26 Aug 2007 15:46:32 -0000      1.106
+++ gui/gtk.cpp 11 Sep 2007 15:35:42 -0000      1.107
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.106 2007/08/26 15:46:32 bwy Exp $ */
+/* $Id: gtk.cpp,v 1.107 2007/09/11 15:35:42 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1380,8 +1380,27 @@
         c = (gnash::key::code) ((key - GDK_0) + gnash::key::_0);
        } else if (key >= GDK_a && key <= GDK_z) {
         c = (gnash::key::code) ((key - GDK_a) + gnash::key::A);
+    } else if (key >= GDK_A && key <= GDK_Z) {                 
+        c = (gnash::key::code) ((key - GDK_A) + gnash::key::A); // a-z and A-Z 
return same AS key codes.
     } else if (key >= GDK_F1 && key <= GDK_F15)        {
         c = (gnash::key::code) ((key - GDK_F1) + gnash::key::F1);
+    } 
+
+    // actionscript key codes for non-standard ASCII characters
+    // correspond to extended ASCII
+    // GDK is in the same order, but occasionally has an
+    // extra character that we have to miss out.
+
+      else if (key >= GDK_nobreakspace && key <= GDK_Idiaeresis) {
+        c = (gnash::key::code) ((key - GDK_nobreakspace) + 
gnash::key::NOBREAKSPACE); 
+    } else if (key >= GDK_Ntilde && key <= GDK_ETH ) {
+        c = (gnash::key::code) ((key - GDK_Ntilde) + gnash::key::NTILDE);
+    } else if (key >= GDK_Ugrave && key <= GDK_THORN) {
+        c = (gnash::key::code) ((key - GDK_Ugrave) + gnash::key::UGRAVE);
+    } else if (key >= GDK_ssharp && key <= GDK_oslash) {
+        c = (gnash::key::code) ((key - GDK_ssharp) + gnash::key::SSHARPSMALL);
+    } else if (key >= GDK_ugrave && key <= GDK_ydiaeresis) {
+        c = (gnash::key::code) ((key - GDK_ugrave) + gnash::key::UGRAVESMALL);
     } else if (key >= GDK_KP_0 && key <= GDK_KP_9) {
         c = (gnash::key::code) ((key - GDK_KP_0) + gnash::key::KP_0);
     } else {
@@ -1424,10 +1443,35 @@
             { GDK_minus, gnash::key::MINUS },
             { GDK_slash, gnash::key::SLASH },
             /* Backtick */
-            { GDK_bracketleft, gnash::key::LEFT_BRACKET },
+            { GDK_question, gnash::key::QUESTION },
             { GDK_backslash, gnash::key::BACKSLASH },
+            { GDK_apostrophe, gnash::key::APOSTROPHE },
+            { GDK_comma, gnash::key::COMMA },
+            { GDK_period, gnash::key::PERIOD },
+            { GDK_bracketleft, gnash::key::LEFT_BRACKET },
+            { GDK_backslash, gnash::key::SLASH },
             { GDK_bracketright, gnash::key::RIGHT_BRACKET },
             { GDK_quotedbl, gnash::key::QUOTE },
+           { GDK_colon, gnash::key::COLON },
+           { GDK_parenright, gnash::key::PAREN_RIGHT },
+           { GDK_exclam, gnash::key::EXCLAM },
+           { GDK_at, gnash::key::AT },
+           { GDK_numbersign, gnash::key::HASH }, 
+           { GDK_dollar, gnash::key::DOLLAR }, 
+           { GDK_percent, gnash::key::PERCENT }, 
+           { GDK_asciicircum, gnash::key::ASCIICIRCUM }, 
+           { GDK_ampersand, gnash::key::AMPERSAND  },
+           { GDK_asterisk, gnash::key::ASTERISK }, 
+           { GDK_parenleft, gnash::key::PAREN_LEFT }, 
+           { GDK_plus, gnash::key::PLUS }, 
+           { GDK_less, gnash::key::LESSTHAN },
+           { GDK_underscore, gnash::key::UNDERSCORE },
+           { GDK_greater, gnash::key::MORETHAN },
+           { GDK_asciitilde, gnash::key::ASCIITILDE },
+           { GDK_leftmiddlecurlybrace, gnash::key::CURLYLEFT },
+           { GDK_bar, gnash::key::PIPE },
+           { GDK_rightmiddlecurlybrace, gnash::key::CURLYRIGHT },
+
             { GDK_VoidSymbol, gnash::key::INVALID }
         };