Changeset 3900

Timestamp:

10/12/05 04:25:23 (3 years ago)

Author:

horiguti

Message:

Inhibit hiding mouse cursor when displaying dialogue.
Fixed ticket: 164

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-10-12  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+        * mw32fns.c: include <windows.h> to use
+        (mw32_inhibit_hide_mouse): New extern.
+        (Fmw32_file_dialog): Inhibit hiding mouse cursor when displaying
+        dialogue.
+        Fixed ticket: 164
+
+        * mw32term.c: include <windows.h> to use
+        (mw32_inhibit_hide_mouse): New varialbe.
+        (show_or_hide_mouse_cursor): Inhibit hiding mouse cursor when
+        mw32_inhibit_hide_mouse is not 0.
+
-2005-10-12  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
-

trunk/src/mw32fns.c

@@ -4426 +4426 @@
-}
-
+extern int mw32_inhibit_hide_mouse;
+
-DEFUN ("mw32-file-dialog", Fmw32_file_dialog, Smw32_file_dialog, 2, 5, 0,
-       doc: /* Read file name, prompting with PROMPT in directory DIR.
@@ -4443 +4445 @@
-  int filter_index = 1;
-  OPENFILENAME file_details;
+  int ret;
-
-  GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
@@ -4507 +4510 @@
-  file_details.lpfnHook = (LPOFNHOOKPROC) file_dialog_callback;
-
-
+
+
+
+
-    {
-      file = mw32_decode_lispy_string (Vlocale_coding_system,

trunk/src/mw32term.c

@@ -4177 +4177 @@
-}
-
+int mw32_inhibit_hide_mouse = 0;
+
-static void
-show_or_hide_mouse_cursor (struct mw32_display_info *dpyinfo, MSG msg)
@@ -4182 +4184 @@
-  static unsigned int mouse_hide_timer = 0;
-
+  if (mw32_inhibit_hide_mouse)
+    {
+      if (dpyinfo->mouse_cursor_stat < 0)
+        {
+          dpyinfo->mouse_cursor_stat = 0;
+          ShowCursor (TRUE);
+        }
+      return;
+    }
+      
-  if (mw32_hide_mouse_timeout > 0
-      && mouse_hide_timer == 0
@@ -4198 +4210 @@
-          last_mouse_movement_time = msg.time;
-
-< 0
+== -1
-            {
-              dpyinfo->mouse_cursor_stat = 0;