Changeset 3923

Timestamp:

10/18/05 00:50:41 (3 years ago)

Author:

horiguti

Message:

Lower sensitivity to mouse motion when hide mouse cursor by wheel
rotaion.

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-10-18  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32term.c (mw32_hide_mouse_by_wheel): Change type to
+        Lisp_Object.
+        (show_or_hide_mouse_cursor): Lower sensitivity to mouse motion
+        when hide mouse cursor by wheel rotaion.
+        
-2005-10-16  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/mw32term.c

@@ -747 +747 @@
-                       | WS_EX_LAYERED);
-    }
-
-
+
+
+
-  if (newalpha >= 0)
-    SetLayeredWindowAttributes (FRAME_MW32_WINDOW (f),
@@ -3714 +3715 @@
-int mw32_lbutton_to_emacs_button;
-int mw32_hide_mouse_timeout;
-int mw32_hide_mouse_by_wheel;
-int mw32_hide_mouse_on_key;
+Lisp_Object mw32_hide_mouse_by_wheel;
-
-static void
@@ -4197 +4198 @@
-{
-  static unsigned int mouse_hide_timer = 0;
+  static int hidden_by_wheel = 0;
+  static POINT hidden_by_wheel_point;
+  int hidden_by_wheel_insensitive_range = 10;
-
-  if (mw32_inhibit_hide_mouse)
@@ -4203 +4207 @@
-          ShowCursor (TRUE);
-      dpyinfo->mouse_cursor_stat = 0;
+      hidden_by_wheel = 0;
-
-      if (dpyinfo->mouse_face_hidden)
@@ -4226 +4231 @@
-
-    case WM_NCMOUSEMOVE:
-
+
+
+
+
+
+
+
+
+
+
-        {
-          last_mouse_motion_message = msg;
-          last_mouse_movement_time = msg.time;
+
+          hidden_by_wheel = 0;
-
-          if (dpyinfo->mouse_cursor_stat < 0)
@@ -4265 +4281 @@
-                  ShowCursor (FALSE);
-                  dpyinfo->mouse_cursor_stat = -1;
+                  hidden_by_wheel = 0;
+
-                  if (!dpyinfo->mouse_face_hidden
-                      && INTEGERP (Vmouse_highlight))
@@ -4286 +4304 @@
-        }      
-      dpyinfo->mouse_face_hidden = 0;
+      hidden_by_wheel = 0;
-      
-      FRAME_MW32_OUTPUT (XFRAME (selected_frame))->current_cursor
@@ -4338 +4357 @@
-          dpyinfo->mouse_cursor_stat = -1;
-          ShowCursor (FALSE);
+          hidden_by_wheel = 0;
-
-          if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
@@ -4353 +4373 @@
-#ifdef W32_INTELLIMOUSE
-    case WM_MOUSEWHEEL:
-
+
+
+
+
+
+
-        {
-          dpyinfo->mouse_cursor_stat = -1;
-          ShowCursor (FALSE);
-
+
+
+
-          if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
-            {
@@ -6795 +6822 @@
-              doc: /* Mouse cursor will hide after some rest. (in milliseconds)
-Cursor will not hide if 0. (default) */);
-BOOL
+LISP
-               doc: /* Non nil means mouse cursor will hide on mouse wheel rotation. */);
-  DEFVAR_BOOL ("w32-hide-mouse-on-key", &mw32_hide_mouse_on_key,
@@ -6810 +6837 @@
-  mw32_hide_mouse_timeout = 0;    /* infinite */
-  mw32_hide_mouse_on_key = 0;
+  mw32_hide_mouse_by_wheel = Qnil;
-  mw32_lbutton_to_emacs_button = 0;
-  mw32_mbutton_to_emacs_button = 2;