Changeset 3868

Timestamp:

2005年09月14日 19時52分51秒 (3 years ago)

Author:

horiguti

Message:

* mw32fns.c (mw32_WndProc<WM_EMACS_SETCARET>): Bug fix. Cope with
sudden switch of frame without WM_KILLFOCUS and occalsional
failure of ShowCaret? ().
Fixed ticket:151

* mw32term.h (TOBESHOWN_CARET): Ditto, New symbol.

* mw32ime.c: Fix type of return values.

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-09-14  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * mw32fns.c (mw32_WndProc<WM_EMACS_SETCARET>): Bug fix. Cope with
+        sudden switch of frame without WM_KILLFOCUS and occalsional
+        failure of ShowCaret ().
+        Fixed ticket:151
+
+        * mw32term.h (TOBESHOWN_CARET): Ditto, New symbol.
+
+        * mw32ime.c: Fix type of return values.
+
-2005-09-10  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/mw32fns.c

@@ -2324 +2324 @@
-      static int last_cursor_width;
-      static int last_cursor_height;
+      static struct frame *last_cursor_frame = NULL;
-      static HBITMAP last_bitmap;
-      struct window *w = XWINDOW (f->selected_window);
-      int count;
-      int caret_spec_changed = 0;
+
+      if (last_cursor_frame
+          && last_cursor_frame != f
+          && MW32_FRAME_CARET_STATE2 (last_cursor_frame) != NO_CARET)
+        {
+          /* Destroy caret in previous frame on sudden switch of
+             message frame. */
+          DestroyCaret ();
+          MW32_FRAME_CARET_STATE (last_cursor_frame) = NO_CARET;
+        }
+      last_cursor_frame = f;
-
-      if (last_phys_cursor_height != w->phys_cursor_height
@@ -2340 +2352 @@
-        w = XWINDOW (echo_area_window);
-
-
-
+
+
+
+
-        {
-          if (MW32_FRAME_CARET_BLOCKED (f) && wParam == UNBLOCK_CARET)
@@ -2351 +2365 @@
-      if (wParam == BLOCK_CARET)
-        {
-
-
+
+
+
+
+
+
+
-          break;
-        }
@@ -2358 +2377 @@
-      if (wParam == UNBLOCK_CARET)
-        {
-
-
+
+
+
+
+
+
+
+
+
+
-          break;
-        }
@@ -2389 +2416 @@
-                           caret_height);
-              MW32_FRAME_CARET_STATE (f) = HIDDEN_CARET;
-0
+FALSE
-              last_phys_cursor_height = w->phys_cursor_height;
-              last_cursor_width = FRAME_CURSOR_WIDTH (f);
@@ -2399 +2426 @@
-
-          if (MW32_FRAME_CARET_SHOWN (f)) break;
-          if (!MW32_FRAME_CARET_BLOCKED (f)) ShowCaret (hwnd);
-
-          MW32_FRAME_CARET_STATE (f) = SHOWN_CARET;
+          if (! MW32_FRAME_CARET_BLOCKED (f))
+            {
+              if (ShowCaret (hwnd) == 0)
+                MW32_FRAME_CARET_STATE (f) = TOBESHOWN_CARET;
+            }
+          
-        }
-      else
-        {
-
-
-
-
+
+
+
+
+
-        }
-    }

trunk/src/mw32ime.c

@@ -109 +109 @@
-     (HIMC, DWORD, LPVOID, DWORD);
-IMMGETCOMPOSITIONSTRINGPROC ImmGetCompositionStringProc;
-LONG
+BOOL
-     (HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD);
-IMMSETCOMPOSITIONSTRINGPROC ImmSetCompositionStringProc;
@@ -120 +120 @@
-typedef BOOL (WINAPI *IMMSETCONVERSIONSTATUSPROC)(HIMC, DWORD, DWORD);
-IMMSETCONVERSIONSTATUSPROC ImmSetConversionStatusProc;
-BOOL
+DWORD
-     (HKL, HIMC, LPCTSTR, LPCANDIDATELIST, DWORD, UINT);
-IMMGETCONVERSIONLISTPROC ImmGetConversionListProc;
@@ -133 +133 @@
-typedef BOOL (WINAPI *IMMDESTROYCONTEXTPROC)(HIMC);
-IMMDESTROYCONTEXTPROC ImmDestroyContextProc;
-BOOL
+HIMC
-IMMASSOCIATECONTEXTPROC ImmAssociateContextProc;
-BOOL
+DWORD
-(HIMC, DWORD, LPCANDIDATELIST, DWORD);
-IMMGETCANDIDATELISTPROC ImmGetCandidateListProc;
-BOOL
+DWORD
-IMMGETCANDIDATELISTCOUNTPROC ImmGetCandidateListCountProc;
-BOOL
+DWORD
-IMMGETHOTKEYPROC ImmGetHotKeyProc;
-
@@ -540 +540 @@
-    return agent[XFASTINT (context)].himc;
-  else
-
-    (((unsigned long) (XCONS (context)->cdr)) & 0xffff
+HIMC)((
+          (((unsigned long) (XCONS (context)->cdr)) & 0xffff)
-}
-
@@ -555 +555 @@
-      himc = (ImmCreateContextProc) ();
-      holdimc = (ImmAssociateContextProc) (hwnd, himc);
-
-
+(LONG)
+(LONG)
-      break;
-
-    case WM_DESTROY:
-
+(HIMC)
-      himc = (ImmAssociateContextProc) (hwnd, holdimc);
-      (ImmDestroyContextProc) (himc);
@@ -1091 +1091 @@
-  hwnd = (HWND) msg.wParam;
-  agent[i].hwnd = hwnd;
-
+(HIMC)
-
-  /*  ShowWindow (hwnd, SW_SHOW); */

trunk/src/mw32term.h

@@ -43 +43 @@
-  BLOCK_CARET,          /* (NOT STATUS) lock caret to be hidden */
-  HIDDEN_CARET,         /* system caret is not shown */
+  TOBESHOWN_CARET,      /* system caret is not shown but to be shown */
-  SHOWN_CARET,          /* system caret is sohwn */
-  UNBLOCK_CARET         /* (NOT STATUS) unlock blocked state of caret  */