Changeset 4052

Timestamp:

2006年03月13日 03時39分22秒 (2 years ago)

Author:

horiguti

Message:

Synchronizing clear-glyph-matrix with message-thread.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/dispnew.c (modified) (4 diffs)
• trunk/src/xdisp.c (modified) (3 diffs)

trunk/src/ChangeLog.Meadow

@@ -29 +29 @@
-        (fep-force-on): Ditto.
-        (syms_of_mw32ime): Add initialize of Vmw32_ime_composition_window.
+
+        * dispnew.c (clear_current_matrices): Sync with message-thread.
+
+        * xdisp.c (display_echo_area_1): Ditto.
+        (redisplay_tool_bar): Ditto.
+        (redisplay_window_0): Ditto.
-
-2006-02-24  Kyotaro HORIGUCHI  <horiguti@meadowy.org>

trunk/src/dispnew.c

@@ -1020 +1020 @@
-     register struct frame *f;
-{
+#ifdef MEADOW
+  GET_FRAME_HDC (f);
+#endif
-  /* Clear frame current matrix, if we have one.  */
-  if (f->current_matrix)
@@ -1037 +1040 @@
-  xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
-  clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0);
+#ifdef MEADOW
+  RELEASE_FRAME_HDC (f);
+#endif
-}
-
@@ -1046 +1052 @@
-     register struct frame *f;
-{
+#ifdef MEADOW
+  GET_FRAME_HDC (f);
+#endif
-  if (f->desired_matrix)
-    clear_glyph_matrix (f->desired_matrix);
@@ -1058 +1067 @@
-  xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
-  clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1);
+#ifdef MEADOW
+  RELEASE_FRAME_HDC (f);
+#endif
-}
-

trunk/src/xdisp.c

@@ -8008 +8008 @@
-
-  /* Display.  */
+#ifdef MEADOW
+  GET_FRAME_HDC (WINDOW_XFRAME (w));
+#endif
-  clear_glyph_matrix (w->desired_matrix);
+#ifdef MEADOW
+  RELEASE_FRAME_HDC (WINDOW_XFRAME (w));
+#endif
-  XSETWINDOW (window, w);
-  try_window (window, start, 0);
@@ -9668 +9674 @@
-
-          XSETFRAME (frame, f);
+#ifdef MEADOW
+          GET_FRAME_HDC (f);
+#endif
-          clear_glyph_matrix (w->desired_matrix);
+#ifdef MEADOW
+          RELEASE_FRAME_HDC (f);
+#endif
-          Fmodify_frame_parameters (frame,
-                                    Fcons (Fcons (Qtool_bar_lines,
@@ -11473 +11485 @@
-     Lisp_Object window;
-{
+#ifdef MEADOW
+  GET_FRAME_HDC (WINDOW_XFRAME (XWINDOW (window)));
+#endif
-  if (displayed_buffer->display_error_modiff < BUF_MODIFF (displayed_buffer))
-    redisplay_window (window, 0);
+#ifdef MEADOW
+  RELEASE_FRAME_HDC (WINDOW_XFRAME (XWINDOW (window)));
+#endif
-  return Qnil;
-}