Changeset 3901

Timestamp:

10/12/05 21:13:32 (3 years ago)

Author:

horiguti

Message:

mw32term.c: Restore mouse-face control of mouse-cursor hiding functions.
xdisp.c: Fix of ticket:166 (Crash with many frames)

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-10-12  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32term.c: (show_or_hide_mouse_cursor): Do mouse-face control.
+        (mw32_message_loop): Move code about mouse-face hiding into
+        show_or_hide_mouse_cursor.
+
+        * xdisp.c (erase_phys_cursor): Now message_thread_hdc here is not
+        from BeginPaint(), so let it be used when valid. Re-get main
+        thread hdc when hdc is invalidated. Move position of the code
+        block to cover draw_phys_cursor_glyph().
+        Fixed ticket:166
+
-2005-10-12  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
-        * mw32fns.c: include <windows.h> to use

trunk/src/mw32term.c

@@ -352 +352 @@
-  int ret;
-  int retry = SAVEDC_RETRY;
+  int cause = 0;
-
-  do
@@ -360 +361 @@
-
-  if (ret == 0)
-
-
+
+
+
+
-  return ret;
-}
@@ -4187 +4190 @@
-    {
-      if (dpyinfo->mouse_cursor_stat < 0)
+          ShowCursor (TRUE);
+      dpyinfo->mouse_cursor_stat = 0;
+
+      if (dpyinfo->mouse_face_hidden)
-        {
-cursor_stat
-ShowCursor (TRUE
+face_hidden
+clear_mouse_face (dpyinfo
-        }
+
-      return;
-    }
@@ -4210 +4218 @@
-          last_mouse_movement_time = msg.time;
-
-== -1
+< 0
-            {
-              dpyinfo->mouse_cursor_stat = 0;
-              ShowCursor (TRUE);
-            }
+          if (dpyinfo->mouse_face_hidden)
+            {   
+              dpyinfo->mouse_face_hidden = 0;
+              clear_mouse_face (dpyinfo);
+            }
+
-        }
-      break;
@@ -4239 +4253 @@
-                  ShowCursor (FALSE);
-                  dpyinfo->mouse_cursor_stat = -1;
+                  if (!dpyinfo->mouse_face_hidden
+                      && INTEGERP (Vmouse_highlight))
+                    {
+                      clear_mouse_face (dpyinfo);
+                      dpyinfo->mouse_face_hidden = 1;
+                    }
-                }
-            }
@@ -4250 +4270 @@
-          mouse_hide_timer = 0;
-        }      
+      dpyinfo->mouse_face_hidden = 0;
+
-      break;
-
@@ -4260 +4282 @@
-          ShowCursor (TRUE);
-        }
+      if (dpyinfo->mouse_face_hidden)
+        {
+          dpyinfo->mouse_face_hidden = 0;
+          clear_mouse_face (dpyinfo);
+        }
+      
-      break;
-
@@ -4273 +4301 @@
-
-      if (dpyinfo->mouse_cursor_stat < 0)
-
+  
-
-      dpyinfo->mouse_cursor_stat = 0;
-      last_mouse_movement_time = msg.time;
+
+      if (dpyinfo->mouse_face_hidden)
+        {
+          dpyinfo->mouse_face_hidden = 0;
+          clear_mouse_face (dpyinfo);
+        }
-
-      break;
@@ -4285 +4319 @@
-          dpyinfo->mouse_cursor_stat = -1;
-          ShowCursor (FALSE);
+
+          if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+            {
+              clear_mouse_face (dpyinfo);
+              dpyinfo->mouse_face_hidden = 1;
+            }
-        }
-      break;
@@ -4365 +4405 @@
-        {
-        case WM_KEYDOWN:
-          if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
-            {
-              clear_mouse_face (dpyinfo);
-              dpyinfo->mouse_face_hidden = 1;
-            }
-
-        case WM_SYSKEYDOWN:
-
@@ -4534 +4568 @@
-              XSETFRAME (last_mouse_motion_frame, f);
-              dpyinfo->mouse_face_mouse_frame = f;
-            }
-          if (dpyinfo->mouse_face_hidden)
-            {
-              dpyinfo->mouse_face_hidden = 0;
-              clear_mouse_face (dpyinfo);
-            }
-

trunk/src/xdisp.c

@@ -20947 +20947 @@
-    mouse_face_here_p = 1;
-
+#ifdef MEADOW
+  if (! MW32_MAIN_THREAD_P ()
+      && f->output_data.mw32->message_thread_hdc == INVALID_HANDLE_VALUE)
+    {
+      if (f->output_data.mw32->hdc == INVALID_HANDLE_VALUE)
+        mw32_get_frame_hdc (f);
+      
+      f->output_data.mw32->message_thread_hdc = f->output_data.mw32->hdc;
+    }
+#endif
+
-  /* Maybe clear the display under the cursor.  */
-  if (w->phys_cursor_type == HOLLOW_BOX_CURSOR)
@@ -20963 +20974 @@
-                   window_box_width (w, TEXT_AREA) - w->phys_cursor.x);
-
-      /* erase_phys_cursor seems to be called always on message thread
-         and hdc of message thread is acquired by BeginPaint () so
-         cursor region is out of clipped region and cannot be updated
-         in most cases. Thus, use main thread hdc to erase the
-         cursor. */
-#ifdef MEADOW
-      if (! MW32_MAIN_THREAD_P ())
-        f->output_data.mw32->message_thread_hdc = f->output_data.mw32->hdc;
-#endif
-      rif->clear_frame_area (f, x, y, width, cursor_row->visible_height);
-    }