Changeset 4112

Timestamp:

2006年07月17日 16時05分41秒 (2 years ago)

Author:

yamazaki

Message:

Change the treatment of main_thread_hdc.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/mw32fns.c (modified) (4 diffs)
• trunk/src/mw32term.c (modified) (6 diffs)
• trunk/src/mw32term.h (modified) (2 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-07-17  YAMAZAKI Katsuhiro <yamazaki-k@mwe.biglobe.ne.jp>
+
+        * mw32fns.c (Fx_create_frame): Move the position in which
+        GET_FRAME_HDC is called after mw32window, because the window handle
+        is obtained in there.
+        (mw32_WndProc<WM_PAINT>): Changes from EnterCriticalSection and
+        LeaveCriticalSection to MW32_BLOCK_FRAME_HDC and
+        MW32_BLOCK_FRAME_HDC.
+
+        * mw32term.h (GET_FRAME_HDC_LEVEL_LIMIT): Moved to `mw32term.c'.
+        (MW32_BLOCK_FRAME_HDC): New Macro.
+        (MW32_UNBLOCK_FRAME_HDC): Ditto.
+        (GET_FRAME_HDC): Changes from the macro to the function call. 
+        (RELEASE_FRAME_HDC): Ditto.
+        (CLEANUP_FRAME_HDC): Ditto.
+
+        * mw32term.c (GET_FRAME_HDC_LEVEL_LIMIT): Moved from `mw32term.h'.
+        (MAIN_THREAD_FRAME_HDC_STACK): New define.
+        (main_thread_hdc_frame): New variable.
+        (old_main_thread_hdc_stack): Ditto.
+        (old_main_thread_hdc): Ditto.
+        (old_main_thread_hdc_nestlevel): Ditto.
+        (old_main_thread_hdc_hwnd): Ditto.
+        (old_main_thread_hdc_frame): Ditto.
+        (mw32_init_frame_hdc): New function.
+        (mw32_get_frame_hdc): Ditto.
+        (mw32_release_frame_hdc): Ditto.
+        (mw32_cleanup_frame_hdc): Ditto.
+        (MW32_update_begin): Changes from EnterCriticalSection and
+        LeaveCriticalSection to MW32_BLOCK_FRAME_HDC and
+        MW32_BLOCK_FRAME_HDC.
+        (mw32_clear_mouse_face): Ditto.
+        (mw32_initialize): Call mw32_init_frame_hdc.
+
-2006-07-16  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/mw32fns.c

@@ -1941 +1941 @@
-            return 0;
-
-EnterCriticalSection (&(f->output_data.mw32->hdc_critsec)
+MW32_BLOCK_FRAME_HDC (f
-          if (main_thread_hdc == INVALID_HANDLE_VALUE)
-            {
@@ -1963 +1963 @@
-              Sleep (2);
-            }
-LeaveCriticalSection (&(f->output_data.mw32->hdc_critsec)
+MW32_UNBLOCK_FRAME_HDC (f
-
-          return 0;
@@ -3057 +3057 @@
-    }
-
-  GET_FRAME_HDC (f);
-
-  /* Extract the window parameters from the supplied values
-     that are needed to determine window geometry.  */
@@ -3182 +3180 @@
-  /* Create the X widget or window.  */
-  mw32_window (f, minibuffer_only);
+
+  GET_FRAME_HDC (f);
-
-  /* Now consider the frame official.  */

trunk/src/mw32term.c

@@ -195 +195 @@
-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.
@@ -352 +344 @@
-#endif /* 0 */
-
+
+/***********************************************************************
+                          FRAME HDC handling
+ ***********************************************************************/
+/* main_thread_hdc_nestlevel never exceeds this limit under normal usage. */
+#define GET_FRAME_HDC_LEVEL_LIMIT 10
+
+/* main_thread_hdc stack never exceeds this limit under normal usage. */
+#define MAIN_THREAD_FRAME_HDC_STACK 10
+
+/* 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;
+
+/* frame when main_thread_hdc is operated. */
+FRAME_PTR main_thread_hdc_frame = NULL;
+
+/* Stack level of main_thread_hdc. */
+int old_main_thread_hdc_stack;
+
+/* Stack of main_thread_hdc. */
+HDC old_main_thread_hdc[MAIN_THREAD_FRAME_HDC_STACK];
+
+/* Stack of main_thread_hdc_nestlevel. */
+int old_main_thread_hdc_nestlevel[MAIN_THREAD_FRAME_HDC_STACK];
+
+/* Stack of main_thread_hdc_hwnd. */
+HWND old_main_thread_hdc_hwnd[MAIN_THREAD_FRAME_HDC_STACK];
+
+/* Stack of main_thread_hdc_frame. */
+FRAME_PTR old_main_thread_hdc_frame[MAIN_THREAD_FRAME_HDC_STACK];
+
+void
+mw32_init_frame_hdc ()
+{
+  int i;
+
+  for (i = 0; i < MAIN_THREAD_FRAME_HDC_STACK; i++)
+    {
+      old_main_thread_hdc[i] = INVALID_HANDLE_VALUE;;
+      old_main_thread_hdc_nestlevel[i] = 0;
+      old_main_thread_hdc_hwnd[i] = INVALID_HANDLE_VALUE;
+      old_main_thread_hdc_frame[i] = NULL;
+    }
+  old_main_thread_hdc_stack = 0;
+}
+
+/* Check whether the same frame is a nest. */
+#define MW32_HDC_NEST_CHECK 0
+
+HDC
+mw32_get_frame_hdc (f)
+     FRAME_PTR f;
+{
+  HDC ret_hdc = INVALID_HANDLE_VALUE;
+#if MW32_HDC_NEST_CHECK
+  int i;
+#endif
+
+  if (FRAME_WINDOW_P (f))
+    {
+      if (MW32_MAIN_THREAD_P())
+        {
+          if (main_thread_hdc != INVALID_HANDLE_VALUE)
+            {
+              if (main_thread_hdc_hwnd != FRAME_MW32_WINDOW (f))
+                {
+                  if (old_main_thread_hdc_stack < MAIN_THREAD_FRAME_HDC_STACK)
+                    {
+                      old_main_thread_hdc_hwnd[old_main_thread_hdc_stack]
+                        = main_thread_hdc_hwnd;
+                      main_thread_hdc_hwnd = INVALID_HANDLE_VALUE;
+                      old_main_thread_hdc_nestlevel[old_main_thread_hdc_stack]
+                        = main_thread_hdc_nestlevel;
+                      main_thread_hdc_nestlevel = 0;
+
+                      MW32_BLOCK_FRAME_HDC (main_thread_hdc_frame);
+                      old_main_thread_hdc[old_main_thread_hdc_stack]
+                        = main_thread_hdc;
+                      main_thread_hdc = INVALID_HANDLE_VALUE;
+                      MW32_UNBLOCK_FRAME_HDC (main_thread_hdc_frame);
+
+                      old_main_thread_hdc_frame[old_main_thread_hdc_stack]
+                        = main_thread_hdc_frame;
+                      main_thread_hdc_frame = NULL;
+                      old_main_thread_hdc_stack++;
+
+                      update_begin_hook (f);
+                      main_thread_hdc_frame = f;
+                      ret_hdc = main_thread_hdc;
+
+#if MW32_HDC_NEST_CHECK
+                      /* Check whether the same frame is a nest. */
+                      for (i = 0; i < old_main_thread_hdc_stack; i++)
+                        {
+                          if (f == old_main_thread_hdc_frame[i])
+                            {
+                              abort ();
+                            }
+                        }
+#endif
+                    }
+                  else
+                    {
+                      abort ();
+                    }
+                }
+              else
+                {
+                  if (main_thread_hdc_nestlevel++ > GET_FRAME_HDC_LEVEL_LIMIT)
+                    {
+                      abort ();
+                    }
+                  else
+                    {
+                      ret_hdc = main_thread_hdc;
+                    }
+                }
+            }
+          else
+            {
+              update_begin_hook (f);
+              main_thread_hdc_frame = f;
+              ret_hdc = main_thread_hdc;
+            }
+        }
+      else
+        {
+          if ((f)->output_data.mw32->hdc != INVALID_HANDLE_VALUE)
+            {
+              if ((f)->output_data.mw32->hdc_nestlevel++
+                  > GET_FRAME_HDC_LEVEL_LIMIT)
+                {
+                  abort ();
+                }
+              else
+                {
+                  ret_hdc = (f)->output_data.mw32->hdc;
+                }
+            }
+          else
+            {
+              update_begin_hook (f);
+              ret_hdc = (f)->output_data.mw32->hdc;
+            }
+        }
+    }
+  return ret_hdc;
+}
+
+int
+mw32_release_frame_hdc (f)
+     FRAME_PTR f;
+{
+  if (FRAME_WINDOW_P (f))
+    {
+      int *pcount;
+      HDC *phdc;
+      if (MW32_MAIN_THREAD_P ())
+        {
+          phdc = &main_thread_hdc;
+          pcount = &main_thread_hdc_nestlevel;
+        }
+      else
+        {
+          phdc = &((f)->output_data.mw32->hdc);
+          pcount = &((f)->output_data.mw32->hdc_nestlevel);
+        }
+
+      if (*phdc == INVALID_HANDLE_VALUE)
+        abort ();
+
+      if (*pcount > 1)
+        (*pcount)--;
+      else
+        {
+          update_end_hook (f);
+          if (MW32_MAIN_THREAD_P ())
+            {
+              if (old_main_thread_hdc_stack)
+                {
+                  old_main_thread_hdc_stack--;
+                  main_thread_hdc_frame
+                    = old_main_thread_hdc_frame[old_main_thread_hdc_stack];
+                  old_main_thread_hdc_frame[old_main_thread_hdc_stack]
+                    = NULL;
+
+                  MW32_BLOCK_FRAME_HDC (main_thread_hdc_frame);
+                  main_thread_hdc
+                    = old_main_thread_hdc[old_main_thread_hdc_stack];
+                  old_main_thread_hdc[old_main_thread_hdc_stack]
+                    = INVALID_HANDLE_VALUE;
+                  MW32_UNBLOCK_FRAME_HDC (main_thread_hdc_frame);
+
+                  main_thread_hdc_nestlevel
+                    = old_main_thread_hdc_nestlevel[old_main_thread_hdc_stack];
+                  old_main_thread_hdc_nestlevel[old_main_thread_hdc_stack]
+                    = 0;
+                  main_thread_hdc_hwnd
+                    = old_main_thread_hdc_hwnd[old_main_thread_hdc_stack];
+                  old_main_thread_hdc_hwnd[old_main_thread_hdc_stack]
+                    = INVALID_HANDLE_VALUE;
+                }
+              else
+                {
+                  main_thread_hdc_frame = NULL;
+                }
+            }
+        }
+    }
+}
+
+int
+mw32_cleanup_frame_hdc (f)
+     FRAME_PTR f;
+{
+  if (FRAME_WINDOW_P (f))
+    {
+      if (MW32_MAIN_THREAD_P ())
+        {
+          if (main_thread_hdc != INVALID_HANDLE_VALUE)
+            {
+              main_thread_hdc_nestlevel = 1;
+              update_end_hook (f);
+              if (old_main_thread_hdc_stack)
+                {
+                  old_main_thread_hdc_stack--;
+                  main_thread_hdc_frame
+                    = old_main_thread_hdc_frame[old_main_thread_hdc_stack];
+                  old_main_thread_hdc_frame[old_main_thread_hdc_stack] = NULL;
+
+                  MW32_BLOCK_FRAME_HDC (main_thread_hdc_frame);
+                  main_thread_hdc
+                    = old_main_thread_hdc[old_main_thread_hdc_stack];
+                  old_main_thread_hdc[old_main_thread_hdc_stack]
+                    = INVALID_HANDLE_VALUE;
+                  MW32_UNBLOCK_FRAME_HDC (main_thread_hdc_frame);
+
+                  main_thread_hdc_nestlevel
+                    = old_main_thread_hdc_nestlevel[old_main_thread_hdc_stack];
+                  old_main_thread_hdc_nestlevel[old_main_thread_hdc_stack] = 0;
+                  main_thread_hdc_hwnd
+                    = old_main_thread_hdc_hwnd[old_main_thread_hdc_stack];
+                  old_main_thread_hdc_hwnd[old_main_thread_hdc_stack]
+                    = INVALID_HANDLE_VALUE;
+                }
+              else
+                {
+                  main_thread_hdc_frame = NULL;
+                }
+            }
+        }
+      else
+        {
+          if ((f)->output_data.mw32->hdc != INVALID_HANDLE_VALUE)
+            {
+              (f)->output_data.mw32->hdc_nestlevel = 1;
+              update_end_hook (f);
+            }
+        }
+    }
+}
-
-
@@ -567 +826 @@
-
-          main_thread_hdc_hwnd = FRAME_MW32_WINDOW (f);
-EnterCriticalSection (&(f->output_data.mw32->hdc_critsec)
+MW32_BLOCK_FRAME_HDC (f
-          main_thread_hdc = GetDC (main_thread_hdc_hwnd);
-LeaveCriticalSection (&(f->output_data.mw32->hdc_critsec)
+MW32_UNBLOCK_FRAME_HDC (f
-
-          main_thread_hdc_nestlevel = 1;
@@ -4287 +4546 @@
-  struct mw32_display_info  *dpyinfo = FRAME_MW32_DISPLAY_INFO (f);
-
-EnterCriticalSection (&(f->output_data.mw32->hdc_critsec)
+MW32_BLOCK_FRAME_HDC (f
-  if (main_thread_hdc == INVALID_HANDLE_VALUE)
-    {
@@ -4299 +4558 @@
-  /* Pending process will be donw in mw32_message_loop */
-
-LeaveCriticalSection (&(f->output_data.mw32->hdc_critsec)
+MW32_UNBLOCK_FRAME_HDC (f
-}
-
@@ -6352 +6611 @@
-  main_thread_id = GetCurrentThreadId ();
-
+  mw32_init_frame_hdc ();
+
-  /* Create message thread.  */
-  /* Caution!!!!! inherited thread can't make Lisp Object directly

trunk/src/mw32term.h

@@ -531 +531 @@
-#define FRAME_OUTER_WINDOW(f) (FRAME_MW32_WINDOW (f))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define MW32_BLOCK_CARET(f)                             \
@@ -1139 +1089 @@
-/* for mw32fns module interfaces. */
-extern void mw32_setup_default_hdc P_ ((HDC hdc));
-extern HDC mw32_get_frame_hdc P_ ((struct frame *f));
-extern void mw32_destroy_frame_hdc P_ ((struct frame *f));
-/* extern void mw32_lower_frame P_ ((struct frame *f)); */