gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ChangeLog server/event_id.h


From: Zou Lunkai
Subject: [Gnash-commit] gnash ChangeLog server/event_id.h
Date: Thu, 26 Apr 2007 11:36:34 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/04/26 11:36:34

Modified files:
        .              : ChangeLog 
        server         : event_id.h 

Log message:
        forgot to commit this in last step

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3002&r2=1.3003
http://cvs.savannah.gnu.org/viewcvs/gnash/server/event_id.h?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3002
retrieving revision 1.3003
diff -u -b -r1.3002 -r1.3003
--- ChangeLog   26 Apr 2007 11:18:03 -0000      1.3002
+++ ChangeLog   26 Apr 2007 11:36:34 -0000      1.3003
@@ -1,6 +1,8 @@
 2007-04-26 Zou Lunkai <address@hidden>
        *       server/asobj/Key.h
                change "Event_id.h" to "event_id.h"
+       *       server/event_id.h
+               forgot to commit it in last commit
        
 2007-04-26 Zou Lunkai <address@hidden>
        *       server/vm/action.cpp:

Index: server/event_id.h
===================================================================
RCS file: /sources/gnash/gnash/server/event_id.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/event_id.h   11 Apr 2007 14:20:20 -0000      1.5
+++ server/event_id.h   26 Apr 2007 11:36:34 -0000      1.6
@@ -102,10 +102,13 @@
                m_id(id),
                m_key_code((unsigned char) c)
        {
-               // For the button key events, you must supply a keycode.
-               // Otherwise, don't.
-               assert((m_key_code == key::INVALID && (m_id != KEY_PRESS))
-                       || (m_key_code != key::INVALID && (m_id == KEY_PRESS)));
+               // you must supply a key code for KEY_PRESS event
+               // 
+               // we do have a testcase with m_id == KEY_PRESS, and 
m_key_code==0(KEY_INVALID)
+               // see key_event_test.swf(produced by Ming)
+               // 
+               //assert((m_key_code == key::INVALID && (m_id != KEY_PRESS))
+               //      || (m_key_code != key::INVALID && (m_id == KEY_PRESS)));
        }
 
        void setKeyCode(unsigned char key)
@@ -134,6 +137,10 @@
        /// (triggerable with a mouse activity)
        bool is_mouse_event() const;
 
+  /// \brief
+       /// Return true if this is a key event
+       bool is_key_event() const;
+
        id_code id() const { return m_id; }
 };
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]