Changeset 3925

Timestamp:

10/20/05 00:48:00 (3 years ago)

Author:

horiguti

Message:

Reconstruct mouse cursor hiding functions. See ticket:205

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-10-19  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32term.c (show_or_hide_mouse_cursor): Reconstruct code. See
+        ticket:205 .
+        (show_or_hide_mouse_cursor<WM_MOUSELEAVE>): Don't change
+        current_cursor of current frame when leaving client area.
+        (w32-hide-mouse-stickiness): New variable. See ticket:205
+        (w32-hide-mouse-timeout): Change meaning. See ticket:205
+        (w32-hide-mouse-on-key): Ditto.
+        (w32-hide-mouse-by-wheel): Ditto.
+
-2005-10-18  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/mw32term.c

@@ -3714 +3714 @@
-int mw32_mbutton_to_emacs_button;
-int mw32_lbutton_to_emacs_button;
-
-
+
+
+
-Lisp_Object mw32_hide_mouse_by_wheel;
-
@@ -4198 +4199 @@
-{
-  static unsigned int mouse_hide_timer = 0;
-
-
-
+
+
+
+
+
-
-  if (mw32_inhibit_hide_mouse)
@@ -4207 +4210 @@
-          ShowCursor (TRUE);
-      dpyinfo->mouse_cursor_stat = 0;
-      hidden_by_wheel = 0;
-
-      if (dpyinfo->mouse_face_hidden)
@@ -4217 +4219 @@
-      return;
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      && mouse_hide_timer == 0
-      && dpyinfo->mouse_cursor_stat == 0)
-    mouse_hide_timer = SetTimer (msg.hwnd, MW32_MOUSE_HIDE_TIMER_ID,
-
-
+
-
-  switch (msg.message)
@@ -4231 +4247 @@
-
-    case WM_NCMOUSEMOVE:
-
-
-
-
-
-
-
-
-
-
+
-        {
+          if (insensitive_range < 0)
+            {
+              lastpos.x = LOWORD (last_mouse_motion_message.lParam);
+              lastpos.y = HIWORD (last_mouse_motion_message.lParam);
+            }
+
-          last_mouse_motion_message = msg;
-          last_mouse_movement_time = msg.time;
-
-
-
-
+
+
+
+
+
-            {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -4264 +4282 @@
-        {
-          /* If we've had mouse motion after last SetTimer, extend timeout. */
-mw32_hide_mouse_
+
-              && dpyinfo->mouse_cursor_stat == 0)
-            {
-              int extend_mills =
-mw32_hide_mouse_
+
-              
-MW32_MOUSE_HIDE_TIMER_ID
+mouse_hide_timer
-                                           extend_mills, NULL);
-            }
@@ -4281 +4299 @@
-                  ShowCursor (FALSE);
-                  dpyinfo->mouse_cursor_stat = -1;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                  if (!dpyinfo->mouse_face_hidden
@@ -4304 +4336 @@
-        }      
-      dpyinfo->mouse_face_hidden = 0;
-      hidden_by_wheel = 0;
-      
-
-
-
+
-
-      break;
@@ -4353 +4382 @@
-
-    case WM_KEYDOWN:
-mw32_hide_mouse_on_key
+! NILP (mw32_hide_mouse_on_key)
-        {
-          dpyinfo->mouse_cursor_stat = -1;
-          ShowCursor (FALSE);
-
+
+
+
+
+
+
-
-          if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
@@ -4373 +4407 @@
-#ifdef W32_INTELLIMOUSE
-    case WM_MOUSEWHEEL:
-
-
-
-
-
-
+
-        {
-
-
-
-
-
-
+
+
+
+
+
-            {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-          
-          POST_THREAD_INFORM_MESSAGE (main_thread_id,
-                                      WM_EMACS_HIDE_TOOLTIP,
-                                      0, 0);
-        }
-      break;
@@ -6819 +6857 @@
-              doc: /* Position of a mouse button sent to emacs, when the w32 right button
-is changed.  */);
-
+
+
+
+
+
+
+
-              doc: /* Mouse cursor will hide after some rest. (in milliseconds)
-
+
+
+
+
-  DEFVAR_LISP ("w32-hide-mouse-by-wheel", &mw32_hide_mouse_by_wheel,
-
-
-
+
+
+
+
+
+
+
-
-
@@ -6835 +6886 @@
-
-
-0
-0
+make_number(0)
+Qnil
-  mw32_hide_mouse_by_wheel = Qnil;
-  mw32_lbutton_to_emacs_button = 0;