Commit 0d1c48287fed8bca4ab68f31d09488c9fb7ff9be to why's shoes

why / shoes

505

Description:	a tiny graphical app kit for ruby edit
Homepage:	http://code.whytheluckystiff.net/shoes edit
Public Clone URL:	git://github.com/why/shoes.git Give this clone URL to anyone. `git clone git://github.com/why/shoes.git`
Your Clone URL:	git@github.com:why/shoes.git Use this clone URL yourself. `git clone git@github.com:why/shoes.git`

 * shoes/native/windows.c: okay, mouse events have converged for all three 
 platforms now.  on windows, when mouse events happen on a lower window, they 
 get sent through the toplevel window now.  this just required some translating 
 of screen coordinates, but means that `leave` events will work right and that 
 mouse events will trickle through nested slots.

why (author)

Fri Jul 11 12:25:51 -0700 2008

commit 0d1c48287fed8bca4ab68f31d09488c9fb7ff9be
tree 1c97fcca13dc260f5bc7d8b7e89d214de098f634
parent 2228b9fb19a21c643a2dc4f99ddcdd469e3f82fa

shoes/canvas.c
shoes/native/windows.c

shoes/canvas.c

0
@@ -1759,7 +1759,6 @@ shoes_canvas_send_click2(VALUE self, int button, int x, int y, VALUE *clicked)
0
   shoes_canvas *self_t;
0
   Data_Get_Struct(self, shoes_canvas, self_t);
0
 
0
-#ifndef SHOES_WIN32
0
   if (ORIGIN(self_t->place))
0
   {
0
     x -= self_t->place.ix + self_t->place.dx;
0
@@ -1767,7 +1766,6 @@ shoes_canvas_send_click2(VALUE self, int button, int x, int y, VALUE *clicked)
0
     if (y < self_t->slot.scrolly || x < 0 || y > self_t->slot.scrolly + self_t->height || x > self_t->width)
0
       return Qnil;
0
   }
0
-#endif
0
 
0
   if (ATTR(self_t->attr, hidden) != Qtrue)
0
   {
0
@@ -1785,10 +1783,6 @@ shoes_canvas_send_click2(VALUE self, int button, int x, int y, VALUE *clicked)
0
       VALUE ele = rb_ary_entry(self_t->contents, i);
0
       if (rb_obj_is_kind_of(ele, cCanvas))
0
       {
0
-#ifdef SHOES_WIN32
0
-        if (!shoes_canvas_inherits(ele, self_t))
0
-          continue;
0
-#endif
0
         v = shoes_canvas_send_click(ele, button, x, y);
0
         *clicked = ele;
0
       }
0
@@ -1860,7 +1854,6 @@ shoes_canvas_send_release(VALUE self, int button, int x, int y)
0
   long i;
0
   shoes_canvas *self_t;
0
   Data_Get_Struct(self, shoes_canvas, self_t);
0
-#ifndef SHOES_WIN32
0
   if (ORIGIN(self_t->place))
0
   {
0
     x -= (self_t->place.ix + self_t->place.dx);
0
@@ -1868,7 +1861,6 @@ shoes_canvas_send_release(VALUE self, int button, int x, int y)
0
     if (y < self_t->slot.scrolly || x < 0 || y > self_t->slot.scrolly + self_t->height || x > self_t->width)
0
       return;
0
   }
0
-#endif
0
 
0
   // INFO("release(%d, %d, %d)\n", button, x, y);
0
 
0
@@ -1888,10 +1880,6 @@ shoes_canvas_send_release(VALUE self, int button, int x, int y)
0
       VALUE ele = rb_ary_entry(self_t->contents, i);
0
       if (rb_obj_is_kind_of(ele, cCanvas))
0
       {
0
-#ifdef SHOES_WIN32
0
-        if (!shoes_canvas_inherits(ele, self_t))
0
-          continue;
0
-#endif
0
         shoes_canvas_send_release(ele, button, x, y);
0
       }
0
       else if (rb_obj_is_kind_of(ele, cTextBlock))
0
@@ -1921,7 +1909,6 @@ shoes_canvas_send_motion(VALUE self, int x, int y, VALUE url)
0
   h = IS_INSIDE(self_t, x, y);
0
   CHECK_HOVER(self_t, h, n);
0
 
0
-#ifndef SHOES_WIN32
0
   if (ORIGIN(self_t->place))
0
   {
0
     x -= (self_t->place.ix + self_t->place.dx);
0
@@ -1929,7 +1916,6 @@ shoes_canvas_send_motion(VALUE self, int x, int y, VALUE url)
0
     if (y < self_t->slot.scrolly || x < 0 || y > self_t->slot.scrolly + self_t->height || x > self_t->width)
0
       return Qnil;
0
   }
0
-#endif
0
 
0
   h = 0;
0
   if (ATTR(self_t->attr, hidden) != Qtrue)
0
@@ -1946,10 +1932,6 @@ shoes_canvas_send_motion(VALUE self, int x, int y, VALUE url)
0
       VALUE ele = rb_ary_entry(self_t->contents, i);
0
       if (rb_obj_is_kind_of(ele, cCanvas))
0
       {
0
-#ifdef SHOES_WIN32
0
-        if (!shoes_canvas_inherits(ele, self_t))
0
-          continue;
0
-#endif
0
         urll = shoes_canvas_send_motion(ele, x, y, url);
0
       }
0
       else if (rb_obj_is_kind_of(ele, cTextBlock))

shoes/native/windows.c

0
@@ -120,8 +120,13 @@ void shoes_native_remove_item(SHOES_SLOT_OS *slot, VALUE item, char c)
0
 #define WINDOW_STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX
0
 
0
 #define WM_POINTS() \
0
-  x = LOWORD(l); \
0
-  y = HIWORD(l)
0
+  POINT p; \
0
+  p.x = LOWORD(l); \
0
+  p.y = HIWORD(l)
0
+#define WM_POINTS2() \
0
+  WM_POINTS(); \
0
+  ClientToScreen(win, &p); \
0
+  ScreenToClient(canvas->app->slot.window, &p); \
0
 
0
 #define KEY_SYM(sym)  shoes_app_keypress(app, ID2SYM(rb_intern("" # sym)))
0
 #define KEYPRESS(name, sym) \
0
@@ -208,52 +213,52 @@ shoes_slot_win32proc(
0
 
0
       case WM_LBUTTONDOWN:
0
       {
0
-        WM_POINTS();
0
-        shoes_canvas_send_click(c, 1, x, y + canvas->slot.scrolly);
0
+        WM_POINTS2();
0
+        shoes_app_click(canvas->app, 1, p.x, p.y + canvas->slot.scrolly);
0
       }
0
       break;
0
 
0
       case WM_RBUTTONDOWN:
0
       {
0
-        WM_POINTS();
0
-        shoes_canvas_send_click(c, 2, x, y + canvas->slot.scrolly);
0
+        WM_POINTS2();
0
+        shoes_app_click(canvas->app, 2, p.x, p.y + canvas->slot.scrolly);
0
       }
0
       break;
0
 
0
       case WM_MBUTTONDOWN:
0
       {
0
-        WM_POINTS();
0
-        shoes_canvas_send_click(c, 3, x, y + canvas->slot.scrolly);
0
+        WM_POINTS2();
0
+        shoes_app_click(canvas->app, 3, p.x, p.y + canvas->slot.scrolly);
0
       }
0
       break;
0
 
0
       case WM_LBUTTONUP:
0
       {
0
-        WM_POINTS();
0
-        shoes_canvas_send_release(c, 1, x, y + canvas->slot.scrolly);
0
+        WM_POINTS2();
0
+        shoes_app_release(canvas->app, 1, p.x, p.y + canvas->slot.scrolly);
0
       }
0
       break;
0
 
0
       case WM_RBUTTONUP:
0
       {
0
-        WM_POINTS();
0
-        shoes_canvas_send_release(c, 2, x, y + canvas->slot.scrolly);
0
+        WM_POINTS2();
0
+        shoes_app_release(canvas->app, 2, p.x, p.y + canvas->slot.scrolly);
0
       }
0
       break;
0
 
0
       case WM_MBUTTONUP:
0
       {
0
-        WM_POINTS();
0
-        shoes_canvas_send_release(c, 3, x, y + canvas->slot.scrolly);
0
+        WM_POINTS2();
0
+        shoes_app_release(canvas->app, 3, p.x, p.y + canvas->slot.scrolly);
0
       }
0
       break;
0
 
0
       case WM_MOUSEMOVE:
0
       {
0
-        WM_POINTS();
0
-        shoes_canvas_send_motion(c, x, y + canvas->slot.scrolly, Qnil);
0
+        WM_POINTS2();
0
+        shoes_app_motion(canvas->app, p.x, p.y + canvas->app->slot.scrolly);
0
       }
0
-      break;
0
+      return 1;
0
 
0
       case WM_ACTIVATE:
0
         if (LOWORD(w) == WA_INACTIVE)
0
@@ -362,7 +367,7 @@ shoes_app_win32proc(
0
       shoes_canvas *canvas;
0
       Data_Get_Struct(app->canvas, shoes_canvas, canvas);
0
       WM_POINTS();
0
-      shoes_app_click(app, 1, x, y + canvas->slot.scrolly);
0
+      shoes_app_click(app, 1, p.x, p.y + canvas->slot.scrolly);
0
     }
0
     break;
0
 
0
@@ -371,7 +376,7 @@ shoes_app_win32proc(
0
       shoes_canvas *canvas;
0
       Data_Get_Struct(app->canvas, shoes_canvas, canvas);
0
       WM_POINTS();
0
-      shoes_app_click(app, 2, x, y + canvas->slot.scrolly);
0
+      shoes_app_click(app, 2, p.x, p.y + canvas->slot.scrolly);
0
     }
0
     break;
0
 
0
@@ -380,7 +385,7 @@ shoes_app_win32proc(
0
       shoes_canvas *canvas;
0
       Data_Get_Struct(app->canvas, shoes_canvas, canvas);
0
       WM_POINTS();
0
-      shoes_app_click(app, 3, x, y + canvas->slot.scrolly);
0
+      shoes_app_click(app, 3, p.x, p.y + canvas->slot.scrolly);
0
     }
0
     break;
0
 
0
@@ -389,7 +394,7 @@ shoes_app_win32proc(
0
       shoes_canvas *canvas;
0
       Data_Get_Struct(app->canvas, shoes_canvas, canvas);
0
       WM_POINTS();
0
-      shoes_app_release(app, 1, x, y + canvas->slot.scrolly);
0
+      shoes_app_release(app, 1, p.x, p.y + canvas->slot.scrolly);
0
     }
0
     break;
0
 
0
@@ -398,7 +403,7 @@ shoes_app_win32proc(
0
       shoes_canvas *canvas;
0
       Data_Get_Struct(app->canvas, shoes_canvas, canvas);
0
       WM_POINTS();
0
-      shoes_app_release(app, 2, x, y + canvas->slot.scrolly);
0
+      shoes_app_release(app, 2, p.x, p.y + canvas->slot.scrolly);
0
     }
0
     break;
0
 
0
@@ -407,7 +412,7 @@ shoes_app_win32proc(
0
       shoes_canvas *canvas;
0
       Data_Get_Struct(app->canvas, shoes_canvas, canvas);
0
       WM_POINTS();
0
-      shoes_app_release(app, 3, x, y + canvas->slot.scrolly);
0
+      shoes_app_release(app, 3, p.x, p.y + canvas->slot.scrolly);
0
     }
0
     break;
0
 
0
@@ -416,9 +421,9 @@ shoes_app_win32proc(
0
       shoes_canvas *canvas;
0
       Data_Get_Struct(app->canvas, shoes_canvas, canvas);
0
       WM_POINTS();
0
-      shoes_app_motion(app, x, y + canvas->slot.scrolly);
0
+      shoes_app_motion(app, p.x, p.y + canvas->slot.scrolly);
0
     }
0
-    break;
0
+    return 1;
0
 
0
     case WM_CHAR:
0
       switch(w)

Comments