Changeset 4032

Timestamp:

2006年02月13日 03時25分50秒 (3 years ago)

Author:

horiguti

Message:

Fixes bugs of synchronization between main-thread and message-thread.

Files:

• trunk/src/mw32fns.c (modified) (5 diffs)
• trunk/src/mw32term.c (modified) (17 diffs)
• trunk/src/mw32term.h (modified) (2 diffs)
• trunk/src/xfaces.c (modified) (2 diffs)

trunk/src/mw32fns.c

@@ -1691 +1691 @@
-#endif /* IME_CONTROL */
-
-static void
-mw32m_new_focus_frame (struct mw32_display_info *dpyinfo, FRAME_PTR f)
-{
-  HDC hdc1, hdc2;
-  FRAME_PTR fold = dpyinfo->mw32_highlight_frame;
-
-  if (f)
-    {
-      hdc1 = GetDC (FRAME_MW32_WINDOW (f));
-      mw32_setup_default_hdc (hdc1);
-      f->output_data.mw32->hdc = hdc1;
-    }
-  else
-    hdc1 = INVALID_HANDLE_VALUE;
-
-  if (fold)
-    {
-      hdc2 = GetDC (FRAME_MW32_WINDOW (fold));
-      mw32_setup_default_hdc (hdc2);
-      fold->output_data.mw32->hdc = hdc2;
-    }
-  else
-    hdc2 = INVALID_HANDLE_VALUE;
-
-  mw32_new_focus_frame (dpyinfo, f);
-
-  if (hdc1 != INVALID_HANDLE_VALUE)
-    {
-      f->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-      ReleaseDC (FRAME_MW32_WINDOW (f), hdc1);
-    }
-  if (hdc2 != INVALID_HANDLE_VALUE)
-    {
-      fold->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-      ReleaseDC (FRAME_MW32_WINDOW (fold), hdc2);
-    }
-}
-
-#ifndef W32_VER4
-static HANDLE
@@ -2006 +1968 @@
-  case WM_SETFOCUS:
-
-m
+
-
-    /* This code is for switching selected-frame.  In order to
@@ -2042 +2004 @@
-
-    if (f == FRAME_MW32_DISPLAY_INFO (f)->mw32_focus_frame)
-m
+
-
-    /* reset mouse face and help echo.  */
@@ -2961 +2923 @@
-  f->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-  f->output_data.mw32->hdc_nestlevel = 0;
+  f->output_data.mw32->pending_clear_mouse_face = 0;
-  f->output_data.mw32->frame_moving_or_sizing = 0;
-  f->output_data.mw32->setcaret_event = CreateEvent (NULL, TRUE, FALSE, NULL);
@@ -4037 +4000 @@
-  f->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-  f->output_data.mw32->hdc_nestlevel = 0;
+  f->output_data.mw32->pending_clear_mouse_face = 0;
-  InitializeCriticalSection (&(f->output_data.mw32->hdc_critsec));
-

trunk/src/mw32term.c

@@ -668 +668 @@
-        }
-          
-
-
-
-
-
+
+
+
-
-      MW32_UNBLOCK_CARET (f);
@@ -2824 +2822 @@
-                      struct frame *frame)
-{
-  struct frame *old_focus = dpyinfo->mw32_focus_frame;
-
-  dpyinfo->mw32_focus_message_frame = frame;
-
@@ -2833 +2829 @@
-         the correct value of x_focus_frame.  */
-      dpyinfo->mw32_focus_frame = frame;
-
-#if 0  /* We shouldn't concern on lowering and raising the frame
-          because the system automatically operate them. */
-      if (old_focus && old_focus->auto_lower)
-        mw32_lower_frame (old_focus);
-#endif
-
-#if 0
-      selected_frame = frame;
-      XSETFRAME (XWINDOW (selected_frame->selected_window)->frame,
-                 selected_frame);
-      Fselect_window (selected_frame->selected_window);
-      choose_minibuf_frame ();
-#endif /* ! 0 */
-
-      /* Only registering.  */
@@ -2883 +2865 @@
-mw32_frame_rehighlight_1 (struct mw32_display_info *dpyinfo)
-{
-  struct frame *old_highlight = dpyinfo->mw32_highlight_frame;
-
-  if (dpyinfo->mw32_focus_frame)
-    {
@@ -2899 +2879 @@
-  else
-    dpyinfo->mw32_highlight_frame = 0;
-
-
-
-
-
-
-
-
-
-
+
-
-
@@ -4273 +4244 @@
-}
-
+
+static void
+mw32_clear_mouse_face (struct frame *f)
+{
+  struct mw32_display_info  *dpyinfo = FRAME_MW32_DISPLAY_INFO (f);
+  
+  EnterCriticalSection (&(f->output_data.mw32->hdc_critsec));
+  if (main_thread_hdc == INVALID_HANDLE_VALUE)
+    {
+      GET_FRAME_HDC (f);
+      clear_mouse_face (dpyinfo);
+      RELEASE_FRAME_HDC (f);
+      f->output_data.mw32->pending_clear_mouse_face = FALSE;
+    }
+  else
+    f->output_data.mw32->pending_clear_mouse_face = TRUE;
+  /* Pending process will be donw in mw32_message_loop */
+
+  LeaveCriticalSection (&(f->output_data.mw32->hdc_critsec));
+  
+}
+
-int mw32_inhibit_hide_mouse = 0;
-
@@ -4295 +4288 @@
-        {
-          dpyinfo->mouse_face_hidden = 0;
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-        }
-
@@ -4354 +4347 @@
-                {
-                  dpyinfo->mouse_face_hidden = 0;
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-                }
-            }
@@ -4401 +4394 @@
-                      && INTEGERP (Vmouse_highlight))
-                    {
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-                      dpyinfo->mouse_face_hidden = 1;
-                    }
@@ -4435 +4428 @@
-        {
-          dpyinfo->mouse_face_hidden = 0;
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-        }
-
@@ -4459 +4452 @@
-        {
-          dpyinfo->mouse_face_hidden = 0;
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-        }
-
@@ -4478 +4471 @@
-          if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
-            {
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-              dpyinfo->mouse_face_hidden = 1;
-            }
@@ -4507 +4500 @@
-              if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
-                {
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-                  dpyinfo->mouse_face_hidden = 1;
-                }
@@ -4584 +4577 @@
-
-          if (f)
-
+
+
+
+
+
-
-          if ((!f) && (!IS_EMACS_PRIVATE_MESSAGE (msg.message)))
@@ -4775 +4772 @@
-
-        case WM_NCMOUSEMOVE:
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-          dpyinfo->mouse_face_mouse_frame = NULL;
-          last_mouse_motion_frame = Qnil;
@@ -4802 +4799 @@
-                  /* If we move outside the frame, then we're
-                     certainly no longer on any text in the frame.  */
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-                  dpyinfo->mouse_face_mouse_frame = 0;
-                  last_mouse_motion_frame = Qnil;
@@ -4969 +4966 @@
-          */
-        case WM_EMACS_CLEAR_MOUSE_FACE:
-WITH_MESSAGE_THREAD_HDC (f, clear_mouse_face (dpyinfo)
+mw32_clear_mouse_face (f
-
-          /* Generate a nil HELP_EVENT to cancel a help-echo.

trunk/src/mw32term.h

@@ -390 +390 @@
-  /* Nesting level of hdc. */
-  int hdc_nestlevel;
+
+  /* If there is pending clear_mouse_face. */
+  int pending_clear_mouse_face;
-
-  /* Critical section to synchronize processces using hdc for this
@@ -603 +606 @@
-  }
-
-
-#define WITH_MESSAGE_THREAD_HDC(f, proc)                \
-  {update_begin_hook (f);(proc);update_end_hook (f);}
-
-#define MW32_BLOCK_CARET(f)                             \

trunk/src/xfaces.c

@@ -5496 +5496 @@
-         current matrix still references freed faces.  */
-      BLOCK_INPUT;
-
+
+
+
-      for (i = 0; i < c->used; ++i)
-        {
@@ -5517 +5519 @@
-        }
-
+#ifdef MEADOW
+      RELEASE_FRAME_HDC (f);
+#endif
-      UNBLOCK_INPUT;
-    }