Changeset 3997

Timestamp:

2005年12月13日 22時48分17秒 (3 years ago)

Author:

horiguti

Message:

Update for changing HDC handling.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/dispnew.c (modified) (9 diffs)
• trunk/src/eval.c (modified) (1 diff)
• trunk/src/frame.c (modified) (2 diffs)
• trunk/src/image.c (modified) (2 diffs)
• trunk/src/mw32fns.c (modified) (17 diffs)
• trunk/src/mw32font.c (modified) (2 diffs)
• trunk/src/mw32sync.h (modified) (1 diff)
• trunk/src/mw32term.c (modified) (14 diffs)
• trunk/src/mw32term.h (modified) (8 diffs)
• trunk/src/window.c (modified) (6 diffs)
• trunk/src/xdisp.c (modified) (1 diff)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-12-13  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * dispnew.c (adjust_glyphs): Remove W32_BLOCK_INPUT,
+        W32_UNBLOCK_INPUT.
+        (free_glyphs): Ditto.
+        (update_single_window): Ditto.
+        (change_frame_size_1): Ditto.
+        (update_frame): Ditto. Do GET_FRAME_HDC(), RELEASE_FRAME_HDC().
+
+        * mw32term.c (main_thread_hdc): New variable.
+        (main_thread_hdc_nestlevel): Ditto.
+        (main_thread_hdc_hwnd): Ditto.
+        (mw32_destroy_frame_hdc): Release main thread DC on destroying the
+        owner frame.
+        (mw32_set_caret): Remove W32_BLOCK_INPUT/W32_UNBLOCK_INPUT. Avoid
+        unnecessary call to message thread.
+        (MW32_update_begin): Changed. Do blocking of caret.
+        (MW32_update_end): Changed. Do unblocking of caret.
+        (MW32_frame_up_to_date): Remove W32_BLOCK_INPUT/W32_UNBLOCK_INPUT.
+        (mw32_get_ime_font_property): Remove treatment for
+        W32_BLOCK_INPUT.
+        (mw32_process_main_thread_message<WM_EMACS_EXPOSE_FRAME>):
+        Removed.
+        (unwind_get_device_capability): Alter RELEASE_TEMP_HDC with
+        RELEASE_FRAME_HDC.
+        (mw32-get-device-capability): Alter GET_TEMP_HDC with
+        GET_FRAME_HDC.
+
+        * mw32term.h (main_thread_hdc): New extern.
+        (main_thread_hdc_nestlevel): Ditto.
+        (main_thread_hdc_hwnd): Ditto.
+        (struct mw32_output): Rename member hdc_refcount to hdc_nestlevel,
+        message_thread_hdc to hdc. Removed members message_thread_hdc and
+        message_thread_hdc_refcount.
+        (FRAME_HDC): Changed.
+        (GET_FRAME_HDC): Changed.
+        (RELEASE_FRAME_HDC): Ditto.
+        (GET_TEMP_HDC): Removed.
+        (RELEASE_TEMP_HDC): Ditto.
+        (CLEANUP_FRAME_HDC): New macro.
+        (FRAME_HDC_VALID_P): Changed.
+        (update_begin_hook): New extern.
+        (update_end_hook): Ditto.
+
+        * mw32sync.h (main_thread_id): New extern.
+        (W32_BLOCK_INPUT): Removed.
+        (W32_UNBLOCK_INPUT): Removed.
+
+        * mw32fns.c (mw32m_new_focus_frame): Variable name for hdc is
+        changed. Remove W32_BLOCK_INPUT/W32_UNBLOCK_INPUT.
+        (mw32_WndProc<WM_ERASEBKGND>): Variable names for hdc are changed.
+        (mw32_WndProc<WM_PAINT>): Variable name for hdc is changed. Remove
+        W32_BLOCK_INPUT/W32_UNBLOCK_INPUT.
+        (mw32_WndProc<WM_SETFOCUS>): Synchronizing caret state.
+        (mw32_WndProc<WM_KILLFOCUS>): Ditto.
+        (mw32_WndProc<WM_EMACS_SETCARET>): Changed.
+        (x-create-frame): Variable names for hdc are changed. Replace
+        GET_TEMP_HDC with GET_FRAME_HDC. Also for RELEASE_*.
+        (mw32_create_tip_frame)Variable names for hdc are changed.
+
+        * mw32font.c (mw32_load_lf): Replace GET_TEMP_HDC with
+        GET_FRAME_HDC. Also for RELEASE_*.
+
+        * image.c (get_image_data_from_icon): Ditto.
+
+        * xdisp.c (redisplay_internal): Cleanup main thread hdc.
+
+        * frame.c (delete-frame): Use GET_FRAME_HDC to block message
+        thread as alternative of W32_BLOCK_INPUT.
+
+        * window.c (delete_window): Remove
+        W32_BLOCK_INPUT/W32_UNBLOCK_INPUT.
+        (set-window-configuration): Ditto.
+
-2005-12-01  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/dispnew.c

@@ -2081 +2081 @@
-  /* Block input so that expose events and other events that access
-     glyph matrices are not processed while we are changing them.  */
-#ifdef MEADOW
-  W32_BLOCK_INPUT;
-#endif
-  BLOCK_INPUT;
-
@@ -2097 +2094 @@
-
-  UNBLOCK_INPUT;
-#ifdef MEADOW
-  W32_UNBLOCK_INPUT;
-#endif
-}
-
@@ -2494 +2488 @@
-      /* Block interrupt input so that we don't get surprised by an X
-         event while we're in an inconsistent state.  */
-#ifdef MEADOW
-      W32_BLOCK_INPUT;
-#endif
-      BLOCK_INPUT;
-      f->glyphs_initialized_p = 0;
@@ -2543 +2534 @@
-
-      UNBLOCK_INPUT;
-#ifdef MEADOW
-      W32_UNBLOCK_INPUT;
-#endif
-    }
-}
@@ -3848 +3836 @@
-
-#ifdef MEADOW
-W32_BLOCK_INPUT
+GET_FRAME_HDC (f)
-#endif
-  if (FRAME_WINDOW_P (f))
@@ -3928 +3916 @@
-    }
-#ifdef MEADOW
-W32_UNBLOCK_INPUT
+RELEASE_FRAME_HDC (f)
-#endif
-
@@ -3987 +3975 @@
-      /* Update W.  */
-      update_begin (f);
-#ifdef MEADOW
-      W32_BLOCK_INPUT;
-#endif
-      update_window (w, force_p);
-#ifdef MEADOW
-      W32_UNBLOCK_INPUT;
-#endif
-      update_end (f);
-
@@ -6211 +6193 @@
-    return;
-
-#ifdef MEADOW
-  W32_BLOCK_INPUT;
-#endif
-  BLOCK_INPUT;
-
@@ -6282 +6261 @@
-
-  UNBLOCK_INPUT;
-#ifdef MEADOW
-  W32_UNBLOCK_INPUT;
-#endif
-
-  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());

trunk/src/eval.c

@@ -1601 +1601 @@
-  if (gc_in_progress || waiting_for_input)
-    abort ();
-
-#ifdef MEADOW
-  if (W32_SELF_INPUT_BLOCKED_P)
-    W32_UNBLOCK_INPUT;
-#endif /* MEADOW */
-
-  if (NILP (error_symbol))

trunk/src/frame.c

@@ -1277 +1277 @@
-  /* during destroying the windows,
-     we must block the message loop.  */
-W32_BLOCK_INPUT;
+GET_FRAME_HDC (f); /* Use only side effect */
-#endif
-  /* Free glyphs.
@@ -1290 +1290 @@
-  f->root_window = Qnil;
-#ifdef MEADOW
-W32_UNBLOCK_INPUT
+RELEASE_FRAME_HDC (f)
-#endif
-

trunk/src/image.c

@@ -10105 +10105 @@
-  unsigned char *bmpdata;
-  struct frame *f = SELECTED_FRAME ();
-TEMP
+FRAME
-  HDC cdc = CreateCompatibleDC (hdc);
-
@@ -10135 +10135 @@
-  DeleteDC (cdc);
-
-TEMP
+FRAME
-}
-

trunk/src/mw32fns.c

@@ -1698 +1698 @@
-      hdc1 = GetDC (FRAME_MW32_WINDOW (f));
-      mw32_setup_default_hdc (hdc1);
-message_thread_
+
-    }
-  else
@@ -1707 +1707 @@
-      hdc2 = GetDC (FRAME_MW32_WINDOW (fold));
-      mw32_setup_default_hdc (hdc2);
-message_thread_
+
-    }
-  else
-    hdc2 = INVALID_HANDLE_VALUE;
-
-  W32_BLOCK_INPUT;
-  mw32_new_focus_frame (dpyinfo, f);
-  W32_UNBLOCK_INPUT;
-
-  if (hdc1 != INVALID_HANDLE_VALUE)
-    {
-message_thread_
+
-      ReleaseDC (FRAME_MW32_WINDOW (f), hdc1);
-    }
-  if (hdc2 != INVALID_HANDLE_VALUE)
-    {
-message_thread_
+
-      ReleaseDC (FRAME_MW32_WINDOW (fold), hdc2);
-    }
@@ -1940 +1938 @@
-      HDC ohdc;
-
-message_thread_hdc_refcount
-message_thread_
-
-message_thread_
-message_thread_hdc_refcount
+hdc_nestlevel
+
+
+
+hdc_nestlevel
-
-      GetClientRect (FRAME_MW32_WINDOW (f), &rect);
@@ -1950 +1948 @@
-                                    rect.right, rect.bottom);
-
-message_thread_
-message_thread_hdc_refcount
+
+hdc_nestlevel
-
-      return 0;
@@ -1975 +1973 @@
-          /* Avoid conflicting with drawing in main thread. */
-          EnterCriticalSection (&(f->output_data.mw32->hdc_critsec));
-f->output_data.mw32->
+main_thread_
-            {
-              BeginPaint (FRAME_MW32_WINDOW (f), &ps);
@@ -1983 +1981 @@
-              GetClientRect (FRAME_MW32_WINDOW (f), &rc);
-
-              W32_BLOCK_INPUT;
-
-              expose_frame (f,
-                            rc.left, rc.top,
-                            rc.right - rc.left,
-                            rc.bottom - rc.top);
-
+
-              RELEASE_FRAME_HDC (f);
-              EndPaint (FRAME_MW32_WINDOW (f), &ps);
@@ -2017 +2013 @@
-
-    mw32_update_frame_alpha (f);
+
+    /* Synchronize caret state */
+    if (CARET_CURSOR_P (XWINDOW (f->selected_window)->phys_cursor_type)
+        && MW32_FRAME_CARET_SHOWN (f))
+      {
+        DestroyCaret ();
+        MW32_FRAME_CARET_STATE (f) = NO_CARET;
+        MW32_FRAME_CARET_BLOCKED (f) = FALSE;
+        PostMessage (hwnd, WM_EMACS_SETCARET, (WPARAM)SHOWN_CARET, (LPARAM)0);
+      } 
-    return 0;
-
@@ -2025 +2031 @@
-        DestroyCaret ();
-        MW32_FRAME_CARET_STATE (f) = NO_CARET;
+        MW32_FRAME_CARET_BLOCKED (f) = FALSE;
-      }
-
@@ -2031 +2038 @@
-
-    /* reset mouse face and help echo.  */
+    mw32_update_frame_alpha (f);
+    
-    PostMessage (hwnd, WM_EMACS_CLEAR_MOUSE_FACE,
-                 (WPARAM) 1, (LPARAM) 0);
-
-    mw32_update_frame_alpha (f);
-    return 0;
-
@@ -2552 +2560 @@
-          DestroyCaret ();
-          MW32_FRAME_CARET_STATE (last_cursor_frame) = NO_CARET;
+          MW32_FRAME_CARET_BLOCKED (last_cursor_frame) = FALSE;
-        }
-      last_cursor_frame = f;
@@ -2579 +2588 @@
-      if (wParam == BLOCK_CARET)
-        {
+          if (MW32_FRAME_CARET_BLOCKED (f))
+            goto setcaret_end;
+            
-          MW32_FRAME_CARET_BLOCKED (f) = TRUE;
-
@@ -2590 +2602 @@
-      if (wParam == UNBLOCK_CARET)
-        {
+          if (!MW32_FRAME_CARET_BLOCKED (f))
+            goto setcaret_end;
+
-          MW32_FRAME_CARET_BLOCKED (f) = FALSE;
-
-
-
-
-
-
-
-
-
-
+
+
-        }
-
@@ -2612 +2619 @@
-            WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y)
-            + w->phys_cursor_height - caret_height;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-      else
@@ -2921 +2936 @@
-  f->output_data.mw32->menubar_handle = INVALID_HANDLE_VALUE;
-  f->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-
-
-
+
-  f->output_data.mw32->frame_moving_or_sizing = 0;
-  f->output_data.mw32->setcaret_event = CreateEvent (NULL, TRUE, FALSE, NULL);
@@ -3043 +3056 @@
-    }
-
-TEMP
+FRAME
-
-  /* Extract the window parameters from the supplied values
@@ -3251 +3264 @@
-  Vwindow_list = Qnil;
-
-TEMP
+FRAME
-  return unbind_to (count, frame);
-}
@@ -3999 +4012 @@
-  f->output_data.mw32->menubar_handle = INVALID_HANDLE_VALUE;
-  f->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-
-
-
+
-  InitializeCriticalSection (&(f->output_data.mw32->hdc_critsec));
-

trunk/src/mw32font.c

@@ -1467 +1467 @@
-  MW32LogicalFont *plf = NULL;;
-
-TEMP
+FRAME
-
-  for (i = 0; i < mw32_lf_loader_num; i++)
@@ -1483 +1483 @@
-    }
-
-TEMP
+FRAME
-  return plf;
-}

trunk/src/mw32sync.h

@@ -8 +8 @@
-extern HANDLE keyboard_handle;
-extern HANDLE interrupt_handle;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-#define W32_BLOCK_EVENT EnterCriticalSection(&critsec_access_event)

trunk/src/mw32term.c

@@ -194 +194 @@
-HWND mw32_frame_window;
-
+/* Window's DC that is used by main thread. */
+HDC main_thread_hdc = INVALID_HANDLE_VALUE;
+
+/* Nesting level of main_thread_hdc. */
+int main_thread_hdc_nestlevel = 0;
+
+/* hwnd for main_thread_hdc to use on release. */
+HWND main_thread_hdc_hwnd = INVALID_HANDLE_VALUE;
-
-/* The scroll bar in which the last X motion event occurred.
@@ -393 +401 @@
-mw32_destroy_frame_hdc (struct frame *f)
-{
+  if (main_thread_hdc != INVALID_HANDLE_VALUE)
+    ReleaseDC (FRAME_MW32_WINDOW (f), main_thread_hdc);
-  if (f->output_data.mw32->hdc != INVALID_HANDLE_VALUE)
-    ReleaseDC (FRAME_MW32_WINDOW (f), f->output_data.mw32->hdc);
+  main_thread_hdc = INVALID_HANDLE_VALUE;
-  f->output_data.mw32->hdc = INVALID_HANDLE_VALUE;
-}
@@ -461 +472 @@
-mw32_set_caret (struct frame *f, int state)
-{
-
-
-
-
-
-
+
+
+
-      && (state == BLOCK_CARET || state == UNBLOCK_CARET)) return;
-
+  if (MW32_FRAME_CARET_BLOCKED (f))
+    {
+      if (state == BLOCK_CARET)
+        return;
+
+      if (state == SHOWN_CARET || state == HIDDEN_CARET)
+        {
+          MW32_FRAME_CARET_STATE (f) = state;
+          return;
+        }
+    }
-  if (state == BLOCK_CARET || state == HIDDEN_CARET)
-    ResetEvent (f->output_data.mw32->setcaret_event);
-
-  if (W32_SELF_INPUT_BLOCKED_P)
-    {
-      W32_UNBLOCK_INPUT;
-      unblock = TRUE;
-    }
-
-  SEND_INFORM_MESSAGE (FRAME_MW32_WINDOW (f),
@@ -485 +498 @@
-  if (state == BLOCK_CARET || state == HIDDEN_CARET)
-    WaitForSingleObject (f->output_data.mw32->setcaret_event, 10);
-
-  if (unblock)
-    W32_BLOCK_INPUT;
-}
-
@@ -526 +536 @@
-  if (FRAME_MW32_P (f))
-    {
-
-
-
-
+
-      if (MW32_MAIN_THREAD_P ())
-        {
-
-
-
+
-            {
-
-
+
+
+
+
-            }
-
+
+
-          EnterCriticalSection (&(f->output_data.mw32->hdc_critsec));
-phdc = &f->output_data.mw32->hdc
+main_thread_hdc = GetDC (main_thread_hdc_hwnd)
-          LeaveCriticalSection (&(f->output_data.mw32->hdc_critsec));
-
-
-
-
-
+
+
-        }
-      else
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-      if (*phdc != INVALID_HANDLE_VALUE)
-        {
-          if (*pcount > GET_FRAME_HDC_LEVEL_LIMIT)
-            abort ();
-          (*pcount)++;
-          return;
-        }
-
-      *phdc = GetDC (FRAME_MW32_WINDOW (f));
-      *pcount = 1;
-      mw32_setup_default_hdc (*phdc);
-
-      MW32_BLOCK_CARET (f);
-    }
-}
@@ -632 +634 @@
-      Lisp_Object window;
-      HDC *phdc;
+      HWND hwnd;
-      int *pcount;
-
@@ -638 +641 @@
-      if (MW32_MAIN_THREAD_P ())
-        {
-
-
+
+
+
-        }
-      else
-        {
-
-
+
+
+
-        }
-
-hdc != INVALID_HANDLE_VALUE
+
+count > 1
-        {
-
-
-
-
-
-
-
+
+
-        }
+
+      MW32_UNBLOCK_CARET (f);
+      ReleaseDC (hwnd, *phdc);
+      *phdc = INVALID_HANDLE_VALUE;
-
-      /* Synchronize selected_window's caret state */
@@ -668 +672 @@
-            mw32_set_caret (f, SHOWN_CARET);
-        }
-
-      if (*phdc == INVALID_HANDLE_VALUE || *pcount > 1)
-        abort();
-
-      ReleaseDC (FRAME_MW32_WINDOW (f), *phdc);
-      *phdc = INVALID_HANDLE_VALUE;
-      *pcount = 0;
-    }
-}
@@ -814 +811 @@
-        {
-          BLOCK_INPUT;
-
+
-          if (dpyinfo->mouse_face_mouse_frame)
-            note_mouse_highlight (dpyinfo->mouse_face_mouse_frame,
@@ -820 +817 @@
-                                  dpyinfo->mouse_face_mouse_y);
-          dpyinfo->mouse_face_deferred_gc = 0;
-
+
-          UNBLOCK_INPUT;
-        }
@@ -4130 +4127 @@
-        lf.lfHeight = (int) (XFLOATINT (height) * FRAME_LINE_HEIGHT (f));
-    }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
@@ -4188 +4176 @@
-            break;
-          }
-
-        case WM_EMACS_EXPOSE_FRAME:
-          {
-            HDC hdc;
-            RECT rc;
-            struct frame *f = (struct frame *)msg.wParam;
-
-            hdc = GET_FRAME_HDC (f);
-            mw32_setup_default_hdc (hdc);
-
-            GetClientRect (FRAME_MW32_WINDOW (f), &rc);
-
-            W32_BLOCK_INPUT;
-            expose_frame (f,
-                          rc.left, rc.top,
-                          rc.right - rc.left,
-                          rc.bottom - rc.top);
-            W32_UNBLOCK_INPUT;
-            RELEASE_FRAME_HDC (f);
-          }
-          break;
-        }
-      if (pwait_msg && (pwait_msg->message == msg.message))
@@ -6532 +6499 @@
-     Lisp_Object data;
-{
-TEMP
+FRAME
-
-  return Qnil;
@@ -6559 +6526 @@
-  record_unwind_protect (unwind_get_device_capability, frame);
-
-TEMP
+FRAME
-
-  if (EQ (item, intern ("width-in-mm")))

trunk/src/mw32term.h

@@ -319 +319 @@
-extern int unibyte_display_via_language_environment;
-
+/* Window's DC that is used by main thread. */
+extern HDC main_thread_hdc;
+
+/* Nesting level of main_thread_hdc. */
+extern int main_thread_hdc_nestlevel;
+
+/* hwnd for main_thread_hdc to use on release. */
+extern HWND main_thread_hdc_hwnd;
+
-#define GET_MW32_DISPLAY_INFO(arg) (mw32_display_list)
-
@@ -379 +388 @@
-  HDC hdc;
-
-
-
-
-
-
-
-
-
+
+
-
-  /* Critical section to synchronize processces using hdc for this
@@ -525 +528 @@
- (! FRAME_WINDOW_P (f)? INVALID_HANDLE_VALUE:                           \
-  (MW32_MAIN_THREAD_P() ?                                               \
-((f)->output_data.mw32->hdc != INVALID_HANDLE_VALUE)
-(f)->output_data.mw32->hdc
+main_thread_hdc != INVALID_HANDLE_VALUE            
+main_thread_hdc          
-    : (abort (), INVALID_HANDLE_VALUE))                                 \
-message_thread_hdc
+hdc              
-       != INVALID_HANDLE_VALUE)                                         \
-message_thread_hdc
+hdc             
-      : (abort(), INVALID_HANDLE_VALUE))))
-
@@ -538 +541 @@
- (! FRAME_WINDOW_P (f)? INVALID_HANDLE_VALUE:                           \
-  (MW32_MAIN_THREAD_P()                                                 \
-
-
+
+
+
+
+
+
+
+
-       ?(abort(), INVALID_HANDLE_VALUE)                                 \
-       :(f)->output_data.mw32->hdc)                                     \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#define RELEASE_FRAME_HDC(f)                                            \
@@ -571 +561 @@
-    if (MW32_MAIN_THREAD_P ())                                          \
-      {                                                                 \
-((f)->output_data.mw32->hdc);
-((f)->output_data.mw32->hdc_refcount);
+main_thread_hdc;       
+main_thread_hdc_nestlevel;           
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-message_thread_hdc);
-message_thread_hdc_refcount);
+hdc);          
+hdc_nestlevel);      
-      }                                                                 \
-    if (*phdc == INVALID_HANDLE_VALUE)                                  \
@@ -590 +580 @@
-  }
-
-
+
+
+
- if (FRAME_WINDOW_P (f))                                                \
-  {                                                                     \
-    int *pcount;                                                        \
-    HDC *phdc;                                                          \
-    if (MW32_MAIN_THREAD_P ())                                          \
-      {                                                                 \
-
-
+
+
+