Changeset 3898

Timestamp:

10/12/05 00:52:53 (3 years ago)

Author:

horiguti

Message:

Use timer to perform hiding mouse cursor by timeout.
Fixed ticket: 182

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/mw32term.c (modified) (4 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-10-12  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32term.c (MW32_MOUSE_HIDE_TIMER_ID): New constant;
+        (show_or_hide_mouse_cursor): Use timer to perform hiding mouse
+        cursor by timeout.
+        Fixed ticket: 182
+
-2005-10-05  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

trunk/src/mw32term.c

@@ -263 +263 @@
-#define MW32GETMOUSEMODIFIER(dpyinfo, mouse) \
- (MW32GETMODIFIER (dpyinfo) | (mouse ? up_modifier : down_modifier))
+
+#define MW32_MOUSE_HIDE_TIMER_ID 1
-
-static void mw32_clip_to_row P_ ((HDC, struct window *,
@@ -4130 +4132 @@
-show_or_hide_mouse_cursor (struct mw32_display_info *dpyinfo, MSG msg)
-{
+  static unsigned int mouse_hide_timer = 0;
+
+  if (mw32_hide_mouse_timeout > 0
+      && mouse_hide_timer == 0
+      && dpyinfo->mouse_cursor_stat == 0)
+    mouse_hide_timer = SetTimer (msg.hwnd, MW32_MOUSE_HIDE_TIMER_ID,
+                                 mw32_hide_mouse_timeout,
+                                 NULL);
+
-  switch (msg.message)
-    {
@@ -4145 +4156 @@
-            }
-        }
+      break;
+
+    case WM_TIMER:
+      if (msg.wParam == mouse_hide_timer)
+        {
+          /* If we've had mouse motion after last SetTimer, extend timeout. */
+          if (msg.time - last_mouse_movement_time < mw32_hide_mouse_timeout
+              && dpyinfo->mouse_cursor_stat == 0)
+            {
+              int extend_mills =
+                mw32_hide_mouse_timeout - (msg.time - last_mouse_movement_time);
+              
+              mouse_hide_timer = SetTimer (msg.hwnd, MW32_MOUSE_HIDE_TIMER_ID,
+                                           extend_mills, NULL);
+            }
+          else
+            {
+              mouse_hide_timer = 0;
+              
+              if (dpyinfo->mouse_cursor_stat == 0)
+                {
+                  ShowCursor (FALSE);
+                  dpyinfo->mouse_cursor_stat = -1;
+                }
+            }
+        }
+      break;
+
+    case WM_MOUSELEAVE:
+      if (mouse_hide_timer)
+        {
+          KillTimer (msg.hwnd, mouse_hide_timer);
+          mouse_hide_timer = 0;
+        }      
-      break;
-
@@ -4182 +4227 @@
-        }
-      break;
-    }
-
-  /* hide by timeout */
-  if (dpyinfo->mouse_cursor_stat == 0
-      && XFASTINT (mw32_hide_mouse_timeout) > 0
-      && msg.time - last_mouse_movement_time
-      > XFASTINT (mw32_hide_mouse_timeout))
-    {
-      ShowCursor (FALSE);
-      dpyinfo->mouse_cursor_stat = -1;
-    }
-}