Changeset 348

Timestamp:

07/26/06 11:55:56 (4 years ago)

Author:

vasi

Message:

update patch

Files:

• gtk-osx/trunk/patch/gtk+/mouse-button-emulation.patch (modified) (6 diffs)

gtk-osx/trunk/patch/gtk+/mouse-button-emulation.patch

@@ -2 +2 @@
 --- gtk+/gdk/quartz/gdkevents-quartz.c  15 May 2006 19:01:57 -0000      1.7
 +++ gtk+/gdk/quartz/gdkevents-quartz.c  5 Jul 2006 05:15:09 -0000
-@@ -26,6 +26,12 @@
- #include <pthread.h>
- #include <unistd.h>
+@@ -28,6 +28,12 @@
+ 
+ #include <Carbon/Carbon.h>
  
 +/* If true, control-left-click is interpreted as a right mouse button click, and
@@ -13 +13 @@
 +
  #include "gdkscreen.h"
- #include "gdkprivate-quartz.h"
+ #include "gdkkeysyms.h"
  
-@@ -625,12 +631,16 @@
+@@ -599,12 +605,16 @@
  }
  
@@ -34 +34 @@
        return 3;
      case 2:
-@@ -674,7 +684,7 @@
-       {
-        GdkEventMask mask = GDK_POINTER_MOTION_MASK|GDK_POINTER_MOTION_HINT_MASK|
-                            GDK_BUTTON_MOTION_MASK;
+@@ -650,7 +660,7 @@
+                GDK_POINTER_MOTION_HINT_MASK |
+                GDK_BUTTON_MOTION_MASK);
+ 
 -       if (convert_mouse_button_number ([nsevent buttonNumber]) == 2)
 +       if (convert_mouse_button_number (nsevent) == 2)
@@ -43 +43 @@
  
         return mask;
-@@ -741,17 +751,29 @@
+@@ -745,17 +755,29 @@
  {
    GdkModifierType modifiers = 0;
@@ -75 +75 @@
    /* FIXME: Support GDK_BUTTON_MASK */
  
-@@ -1178,19 +1200,13 @@
-     case NSRightMouseDown:
-     case NSOtherMouseDown:
-       type = GDK_BUTTON_PRESS;
--      button = convert_mouse_button_number ([nsevent buttonNumber]);
-+      button = convert_mouse_button_number (nsevent);
-       break;
-     case NSLeftMouseUp:
--      type = GDK_BUTTON_RELEASE;
--      button = 1;
--      break;
-     case NSRightMouseUp:
--      type = GDK_BUTTON_RELEASE;
--      button = 3;
--      break;
-     case NSOtherMouseUp:
-       type = GDK_BUTTON_RELEASE;
--      button = convert_mouse_button_number ([nsevent buttonNumber]);
-+      button = convert_mouse_button_number (nsevent);
-       break;
-     default:
+@@ -1212,7 +1234,7 @@
        g_assert_not_reached ();
-@@ -1209,6 +1225,12 @@
+     }
+   
+-  button = convert_mouse_button_number ([nsevent buttonNumber]);
++  button = convert_mouse_button_number (nsevent);
+ 
+   event = gdk_event_new (type);
+   event->button.window = window;
+@@ -1227,6 +1249,12 @@
                                       &event->button.x_root,
                                       &event->button.y_root);
@@ -110 +97 @@
  }
  
-@@ -1225,7 +1247,7 @@
+@@ -1243,7 +1271,7 @@
      case NSLeftMouseDragged:
      case NSRightMouseDragged: