[Gnash-commit] gnash ChangeLog server/mouse_button_state.h ser...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/31 16:12:06

Modified files:
        .              : ChangeLog 
        server         : mouse_button_state.h movie_root.cpp 

Log message:
                * server/mouse_button_state.h: symbolic button states.
                * server/movie_root.cpp (generate_mouse_button_events):
                  use symbolic names for button states.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2208&r2=1.2209
http://cvs.savannah.gnu.org/viewcvs/gnash/server/mouse_button_state.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2208
retrieving revision 1.2209
diff -u -b -r1.2208 -r1.2209
--- ChangeLog   31 Jan 2007 15:50:09 -0000      1.2208
+++ ChangeLog   31 Jan 2007 16:12:06 -0000      1.2209
@@ -1,5 +1,8 @@
 2007-01-31 Sandro Santilli <address@hidden>
 
+       * server/mouse_button_state.h: symbolic button states.
+       * server/movie_root.cpp (generate_mouse_button_events):
+         use symbolic names for button states.
        * server/as_object.cpp (set_member_default): more verbose warning
          for invalid properties found in the inheritance chain.
 

Index: server/mouse_button_state.h
===================================================================
RCS file: /sources/gnash/gnash/server/mouse_button_state.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/mouse_button_state.h 21 Nov 2006 08:56:12 -0000      1.6
+++ server/mouse_button_state.h 31 Jan 2007 16:12:06 -0000      1.7
@@ -27,6 +27,16 @@
 
 public:
 
+       /// Possible button states
+       enum state {
+
+               /// Button is depressed
+               UP=0,
+
+               /// Button is pressed
+               DOWN=1
+       };
+
        /// entity that currently owns the mouse pointer
        boost::intrusive_ptr<character> m_active_entity;
 
@@ -44,8 +54,8 @@
 
        mouse_button_state()
                :
-               m_mouse_button_state_last(0),
-               m_mouse_button_state_current(0),
+               m_mouse_button_state_last(UP),
+               m_mouse_button_state_current(UP),
                m_mouse_inside_entity_last(false)
        {
        }

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/movie_root.cpp       7 Dec 2006 11:52:39 -0000       1.34
+++ server/movie_root.cpp       31 Jan 2007 16:12:06 -0000      1.35
@@ -170,7 +170,7 @@
        // Did this event trigger any action that needs redisplay ?
        bool need_redisplay = false;
 
-       if (ms->m_mouse_button_state_last == 1)
+       if (ms->m_mouse_button_state_last == mouse_button_state::DOWN)
        {
                // Mouse button was down.
 
@@ -244,7 +244,7 @@
                }
        }
 
-       if (ms->m_mouse_button_state_last == 0)
+       if ( ms->m_mouse_button_state_last == mouse_button_state::UP )
        {
                // Mouse button was up.
 
@@ -277,7 +277,7 @@
                }
 
                // mouse button press
-               if (ms->m_mouse_button_state_current == 1)
+               if (ms->m_mouse_button_state_current == 
mouse_button_state::DOWN )
                {
                        // onPress
 
@@ -318,7 +318,7 @@
                                need_redisplay=true;
                        }
                        ms->m_mouse_inside_entity_last = true;
-                       ms->m_mouse_button_state_last = 1;
+                       ms->m_mouse_button_state_last = 
mouse_button_state::DOWN;
                }
        }