[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38329] trunk/blender/intern/ghost: correction to cursor enum and make GHOST_SystemX11' s convertXKey into a static function.

[Campbell Barton]

Revision: 38329
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38329
Author:   campbellbarton
Date:     2011-07-12 12:53:23 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
correction to cursor enum and make GHOST_SystemX11's convertXKey into a static 
function.

Modified Paths:
--------------
    trunk/blender/intern/ghost/GHOST_Types.h
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.h

Modified: trunk/blender/intern/ghost/GHOST_Types.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_Types.h    2011-07-12 12:13:23 UTC (rev 
38328)
+++ trunk/blender/intern/ghost/GHOST_Types.h    2011-07-12 12:53:23 UTC (rev 
38329)
@@ -218,8 +218,9 @@
        GHOST_kStandardCursorBottomLeftCorner,
        GHOST_kStandardCursorCopy,
        GHOST_kStandardCursorCustom, 
-       GHOST_kStandardCursorNumCursors, 
-       GHOST_kStandardCursorPencil
+       GHOST_kStandardCursorPencil,
+
+       GHOST_kStandardCursorNumCursors
 } GHOST_TStandardCursor;
 
 

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp       2011-07-12 
12:13:23 UTC (rev 38328)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp       2011-07-12 
12:53:23 UTC (rev 38329)
@@ -76,6 +76,9 @@
 #include <stdio.h> // for fprintf only
 #include <cstdlib> // for exit
 
+static GHOST_TKey
+convertXKey(KeySym key);
+
 typedef struct NDOFPlatformInfo {
        Display *display;
        Window window;
@@ -923,35 +926,20 @@
        int rx,ry,wx,wy;
        unsigned int mask_return;
 
-       if (XQueryPointer(
-               m_display,
-               RootWindow(m_display,DefaultScreen(m_display)),
-               &root_return,
-               &child_return,
-               &rx,&ry,
-               &wx,&wy,
-               &mask_return
-       ) == False) {
+       if (XQueryPointer(m_display,
+                         RootWindow(m_display,DefaultScreen(m_display)),
+                         &root_return,
+                         &child_return,
+                         &rx,&ry,
+                         &wx,&wy,
+                         &mask_return) == True)
+       {
+               buttons.set(GHOST_kButtonMaskLeft,   (mask_return & 
Button1Mask) != 0);
+               buttons.set(GHOST_kButtonMaskMiddle, (mask_return & 
Button2Mask) != 0);
+               buttons.set(GHOST_kButtonMaskRight,  (mask_return & 
Button3Mask) != 0);
+       }
+       else {
                return GHOST_kFailure;
-       } else {
-
-               if (mask_return & Button1Mask) {
-                       buttons.set(GHOST_kButtonMaskLeft,true);
-               } else {
-                       buttons.set(GHOST_kButtonMaskLeft,false);
-               }
-
-               if (mask_return & Button2Mask) {
-                       buttons.set(GHOST_kButtonMaskMiddle,true);
-               } else {
-                       buttons.set(GHOST_kButtonMaskMiddle,false);
-               }
-
-               if (mask_return & Button3Mask) {
-                       buttons.set(GHOST_kButtonMaskRight,true);
-               } else {
-                       buttons.set(GHOST_kButtonMaskRight,false);
-               }
        }       
 
        return GHOST_kSuccess;
@@ -1056,11 +1044,9 @@
 
 #define GXMAP(k,x,y) case x: k = y; break; 
 
-       GHOST_TKey
-GHOST_SystemX11::
-convertXKey(
-       KeySym key
-){
+static GHOST_TKey
+convertXKey(KeySym key)
+{
        GHOST_TKey type;
 
        if ((key >= XK_A) && (key <= XK_Z)) {

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.h 2011-07-12 12:13:23 UTC 
(rev 38328)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.h 2011-07-12 12:53:23 UTC 
(rev 38329)
@@ -300,12 +300,6 @@
                bool
        generateWindowExposeEvents(
        );
- 
-               GHOST_TKey
-       convertXKey(
-               KeySym key
-       );
-
 };
 
 #endif

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs