Changeset 4023

Timestamp:

2006年02月01日 03時02分58秒 (3 years ago)

Author:

horiguti

Message:

Include winable.h instead of defining types for SendInput?.
Inhibit calling of main thread during delete_frame.

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-02-01  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+        * mw32term.c: Include winable.h to use SendInput() and related
+        types.
+        (mw32_set_caret): Don't call main thread when this frame is
+        deleted.
+        (mw32_free_frame_resources): Set INVALID_HANDLE_VALUE to windows
+        descriptor to mark this frame is deleted.
+
+        * mw32term.h (ULONG_PTR): Delete definition, which is defined in
+        winable.h newly included in mw32term.c.
+        (PULONG_PTR): Ditto.
+        (MOUSEINPUT): Ditto.
+        (KEYBDINPUT): Ditto.
+        (HARDWAREINPUT): Ditto.
+        (INPUT): Ditto.
+        (INPUT_MOUSE): Ditto.
+        (INPUT_KEYBOARD): Ditto.
+        (INPUT_HARDWARE): Ditto.
+        (SENDINPUTPUROC): Ditto.
+
-2006-01-29  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/mw32term.c

@@ -44 +44 @@
-#include "mw32sync.h"
-#include <shellapi.h>
+#include <winable.h>
-#include "mw32term.h"
-#include "mw32mci.h"
@@ -235 +236 @@
-SETLAYEREDWINDOWATTRPROC SetLayeredWindowAttributes = NULL;
-
+typedef UINT (WINAPI *SENDINPUTPROC)(UINT, INPUT*, int);
-SENDINPUTPROC SendInputProc = NULL;
-
@@ -494 +496 @@
-        }
-    }
+
+  /* If this function is called during processing delete_frame, Lisp
+     frame object is already deleted from frame_list. This condition
+     is marked with f->output_data.mw32->window_desc that has a value
+     of INVALID_HANDLE_VALUE. */
+  if (f->output_data.mw32->window_desc == INVALID_HANDLE_VALUE)
+    return;
+
-  if (state == BLOCK_CARET || state == HIDDEN_CARET)
-    ResetEvent (f->output_data.mw32->setcaret_event);
@@ -5920 +5930 @@
-  free_frame_menubar (f);
-
+  /* Never call main thread for this frame. */
+  f->output_data.mw32->window_desc = INVALID_HANDLE_VALUE;
+
-  if (FRAME_FACE_CACHE (f))
-    free_frame_faces (f);

trunk/src/mw32term.h

@@ -1292 +1292 @@
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-typedef unsigned long ULONG_PTR, *PULONG_PTR;
-#endif
-
-typedef struct{
-  LONG    dx;
-  LONG    dy;
-  DWORD   mouseData;
-  DWORD   dwFlags;
-  DWORD   time;
-  ULONG_PTR dwExtraInfo;
-} MOUSEINPUT;
-
-typedef struct {
-  WORD    wVk;
-  WORD    wScan;
-  DWORD   dwFlags;
-  DWORD   time;
-  ULONG_PTR dwExtraInfo;
-} KEYBDINPUT;
-
-typedef struct {
-  DWORD   uMsg;
-  WORD    wParamL;
-  WORD    wParamH;
-} HARDWAREINPUT;
-
-#define INPUT_MOUSE     0
-#define INPUT_KEYBOARD  1
-#define INPUT_HARDWARE  2
-
-typedef struct {
-  DWORD   type;
-  union
-  {
-    MOUSEINPUT      mi;
-    KEYBDINPUT      ki;
-    HARDWAREINPUT   hi;
-  };
-} INPUT;
-
-typedef UINT (WINAPI *SENDINPUTPROC)(UINT, INPUT*, int);
-
-#endif /* not _MW32TERM_H_ */