[Gnash-commit] gnash ChangeLog gui/kde.cpp libbase/curl_adapte...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/10/08 12:56:27

Modified files:
        .              : ChangeLog 
        gui            : kde.cpp 
        libbase        : curl_adapter.cpp rc.cpp rc.h 
        server/asobj   : Key.cpp 
        testsuite/libbase: TCXXRc.cpp 

Log message:
                * libbase/rc.{h,cpp}, testsuite/libbase/TCCXXRc.cpp
                  libbase/curl_adapter.cpp: rename variable and function to 
_insecureSSL
                  / insecureSSL().
                * gui/kde.cpp: complete keyboard handling from the GUI.
                * server/asobj/Key.cpp (set_key_up): key releases also update
                  m_last_key_pressed, so that the last key released is not 
necessarily
                  the same as the last key pressed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4568&r2=1.4569
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4568
retrieving revision 1.4569
diff -u -b -r1.4568 -r1.4569
--- ChangeLog   8 Oct 2007 11:00:04 -0000       1.4568
+++ ChangeLog   8 Oct 2007 12:56:26 -0000       1.4569
@@ -1,3 +1,13 @@
+2007-10-08 Benjamin Wolsey <address@hidden>
+
+       * libbase/rc.{h,cpp}, testsuite/libbase/TCCXXRc.cpp
+         libbase/curl_adapter.cpp: rename variable and function to _insecureSSL
+         / insecureSSL().
+       * gui/kde.cpp: complete keyboard handling from the GUI.
+       * server/asobj/Key.cpp (set_key_up): key releases also update
+         m_last_key_pressed, so that the last key released is not necessarily
+         the same as the last key pressed.
+
 2007-10-08 Tomas Groth Christensen <address@hidden>
 
        * libmedia/AudioDecoderSimple.cpp: Fix stereo/mono resampling.

Index: gui/kde.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gui/kde.cpp 20 Sep 2007 06:57:01 -0000      1.23
+++ gui/kde.cpp 8 Oct 2007 12:56:27 -0000       1.24
@@ -156,19 +156,51 @@
 gnash::key::code
 KdeGui::qtToGnashKey(QKeyEvent *event)
 {
+
+    // Gnash uses its own keycodes to map key events
+    // to the three sometimes weird and confusing values that flash movies
+    // can refer to. See gnash.h for the keycodes and map.
+    //
+    // Gnash's keycodes are gnash::key::code. They are mainly in ascii order.
+    // Standard ascii characters (32-127) have the same value. Extended ascii
+    // characters (160-254) are in ascii order but correspond to 
gnash::key::code
+    // 169-263. Non-character values must normally be mapped separately.
+
     gnash::key::code c = gnash::key::INVALID;
     int key = event->key();
     
+    // Qt seems to treat numbers on the keypad and main keyboard
+    // as the same key event, so needs this check:
     if (key >= Qt::Key_0 && key <= Qt::Key_9) {
       if (event->state() & Qt::Keypad)
           c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::KP_0);
       else
           c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::_0);
-    } else if (key >= Qt::Key_A && key <= Qt::Key_Z) {
-        c = (gnash::key::code) ((key - Qt::Key_A) + gnash::key::A);
-    } else if (key >= Qt::Key_F1 && key <= Qt::Key_F15) {
+    }
+
+    // All other characters between ascii 32 and 126 are simple.
+    // From space (32) to slash (47):
+    else if (key >= Qt::Key_Space && key <= Qt::Key_Slash) {
+        c = (gnash::key::code) ((key - Qt::Key_Space) + gnash::key::SPACE);
+    }
+
+    // From colon (58) to tilde (126):
+    else if (key >= Qt::Key_Colon && key <= Qt::Key_AsciiTilde) {
+        c = (gnash::key::code) ((key - Qt::Key_Colon) + gnash::key::COLON);
+    }
+
+    // Function keys:
+    else if (key >= Qt::Key_F1 && key <= Qt::Key_F15) {
         c = (gnash::key::code) ((key - Qt::Key_F1) + gnash::key::F1);
-    } else {
+    }
+
+    // Extended ascii from non-breaking (160) space to ÿ (264) is in the same
+    // order.
+    else if (key >= Qt::Key_nobreakspace && key <= Qt::Key_ydiaeresis) {
+        c = (gnash::key::code) ((key - Qt::Key_nobreakspace) + 
gnash::key::NOBREAKSPACE);
+    }
+
+    else {
         // many keys don't correlate, so just use a look-up table.
         struct {
             int               qt;
@@ -186,7 +218,7 @@
             { Qt::Key_CapsLock, gnash::key::CAPSLOCK },
 
             { Qt::Key_Escape, gnash::key::ESCAPE },
-            { Qt::Key_Space, gnash::key::SPACE },
+            //{ Qt::Key_Space, gnash::key::SPACE },
 
             { Qt::Key_Next, gnash::key::PGDN },
             { Qt::Key_Prior, gnash::key::PGUP },
@@ -201,14 +233,14 @@
 
             { Qt::Key_Help, gnash::key::HELP },
             { Qt::Key_NumLock, gnash::key::NUM_LOCK },
-            { Qt::Key_Semicolon, gnash::key::SEMICOLON },
-            { Qt::Key_Equal, gnash::key::EQUALS },
-            { Qt::Key_Minus, gnash::key::MINUS },
-            { Qt::Key_Slash, gnash::key::SLASH },
-            { Qt::Key_BracketLeft, gnash::key::LEFT_BRACKET },
-            { Qt::Key_Backslash, gnash::key::BACKSLASH },
-            { Qt::Key_BracketRight, gnash::key::RIGHT_BRACKET },
-            { Qt::Key_QuoteDbl, gnash::key::DOUBLE_QUOTE },
+            //{ Qt::Key_Semicolon, gnash::key::SEMICOLON },
+            //{ Qt::Key_Equal, gnash::key::EQUALS },
+            //{ Qt::Key_Minus, gnash::key::MINUS },
+            //{ Qt::Key_Slash, gnash::key::SLASH },
+            //{ Qt::Key_BracketLeft, gnash::key::LEFT_BRACKET },
+            //{ Qt::Key_Backslash, gnash::key::BACKSLASH },
+            //{ Qt::Key_BracketRight, gnash::key::RIGHT_BRACKET },
+            //{ Qt::Key_QuoteDbl, gnash::key::DOUBLE_QUOTE },
             { 0, gnash::key::INVALID }
         };
         

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- libbase/curl_adapter.cpp    6 Oct 2007 10:31:18 -0000       1.42
+++ libbase/curl_adapter.cpp    8 Oct 2007 12:56:27 -0000       1.43
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: curl_adapter.cpp,v 1.42 2007/10/06 10:31:18 strk Exp $ */
+/* $Id: curl_adapter.cpp,v 1.43 2007/10/08 12:56:27 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -474,7 +474,7 @@
        // Override cURL's default verification of SSL certificates
        // This is insecure, so log security warning.
        // Equivalent to curl -k or curl --insecure.
-       if (gnash::RcInitFile::getDefaultInstance().SSLInsecure())
+       if (gnash::RcInitFile::getDefaultInstance().insecureSSL())
        {
                 gnash::log_security(_("Allowing connections to SSL sites with 
invalid"
                                 " or absent certificates"));           

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- libbase/rc.cpp      3 Oct 2007 17:55:13 -0000       1.41
+++ libbase/rc.cpp      8 Oct 2007 12:56:27 -0000       1.42
@@ -80,7 +80,7 @@
                            _plugin_sound(true),
                           _extensionsEnabled(false),
                           _startStopped(false),
-                          _SSLInsecure(false),
+                          _insecureSSL(false),
                           _streamsTimeout(DEFAULT_STREAMS_TIMEOUT)
 
 {
@@ -389,7 +389,7 @@
                                value);
                      extractSetting(&_localdomain_only, "localdomain", 
variable,
                                value);
-                     extractSetting(&_SSLInsecure, "InsecureSSL", variable,
+                     extractSetting(&_insecureSSL, "InsecureSSL", variable,
                                value);
                      extractSetting(&_debugger, "debugger", variable, value);
                      extractSetting(&_actiondump, "actionDump", variable, 
value);
@@ -518,7 +518,7 @@
     cerr << "\tWrite Debug Log To Disk: "
          << ((_writelog)?"enabled":"disabled") << endl;
     cerr << "\tAllow insecure SSL connections: "
-         << ((_SSLInsecure)?"yes":"no") << endl;
+         << ((_insecureSSL)?"yes":"no") << endl;
     cerr << "\tEnable sound: "
          << ((_sound)?"enabled":"disabled") << endl;
     cerr << "\tEnable Plugin sound: "

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- libbase/rc.h        3 Oct 2007 17:55:13 -0000       1.30
+++ libbase/rc.h        8 Oct 2007 12:56:27 -0000       1.31
@@ -73,7 +73,7 @@
     ///
     bool startStopped() const { return _startStopped; }
 
-    bool SSLInsecure() const { return _SSLInsecure; }
+    bool insecureSSL() const { return _insecureSSL; }
     
     int verbosityLevel() const { return _verbosity; }
     void verbosityLevel(int value) { _verbosity = value; }
@@ -157,7 +157,7 @@
 
     bool _startStopped;                // whether to start the gui in "stop" 
mode
 
-    bool _SSLInsecure;         // When TRUE, does not verify SSL certificates
+    bool _insecureSSL;         // When TRUE, does not verify SSL certificates
                                // so is INSECURE.
 
     /// The number of seconds of inactivity triggering download timeout

Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/Key.cpp        20 Sep 2007 08:13:23 -0000      1.35
+++ server/asobj/Key.cpp        8 Oct 2007 12:56:27 -0000       1.36
@@ -93,6 +93,8 @@
 {
     if (code < 0 || code >= key::KEYCOUNT) return;
 
+    m_last_key_pressed = code;
+
     int byte_index = code >> 3;
     int bit_index = code - (byte_index << 3);
     int mask = 1 << bit_index;

Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- testsuite/libbase/TCXXRc.cpp        3 Oct 2007 14:15:23 -0000       1.20
+++ testsuite/libbase/TCXXRc.cpp        8 Oct 2007 12:56:27 -0000       1.21
@@ -182,7 +182,7 @@
         runtest.fail ("streamsTimeout");
     }
 
-    if (rc.SSLInsecure()) {
+    if (rc.insecureSSL()) {
         runtest.pass ("insecureSSL");
     } else {
         runtest.fail ("insecureSSL");