X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/3f0f93880087c16c416f2701cd4efcc4dc9c4ed9..41d3adbbfed77605e4a397ce199c5751c35bf94b:/window.c

diff --git a/window.c b/window.c
index 439495af..4bcc2697 100644
--- a/window.c
+++ b/window.c
@@ -11,10 +11,12 @@
 #endif
 #endif
 
+#ifndef NO_MULTIMON
 #if WINVER < 0x0500
 #define COMPILE_MULTIMON_STUBS
 #include <multimon.h>
 #endif
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -104,9 +106,12 @@ static WPARAM pend_netevent_wParam = 0;
 static LPARAM pend_netevent_lParam = 0;
 static void enact_pending_netevent(void);
 static void flash_window(int mode);
+static void sys_cursor_update(void);
 
 static time_t last_movement = 0;
 
+static int caret_x = -1, caret_y = -1;
+
 #define FONT_NORMAL 0
 #define FONT_BOLD 1
 #define FONT_UNDERLINE 2
@@ -720,7 +725,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 		timer_id = 0;
 	    }
 	    HideCaret(hwnd);
-	    term_out();
+	    if (GetCapture() != hwnd)
+		term_out();
 	    term_update();
 	    ShowCaret(hwnd);
 
@@ -1514,7 +1520,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
       case WM_TIMER:
 	if (pending_netevent)
 	    enact_pending_netevent();
-	term_out();
+	if (GetCapture() != hwnd)
+	    term_out();
 	noise_regular();
 	HideCaret(hwnd);
 	term_update();
@@ -1934,7 +1941,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	 */
 	noise_ultralight(lParam);
 
-	if (wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) {
+	if (wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON) &&
+	    GetCapture() == hwnd) {
 	    Mouse_Button b;
 	    if (wParam & MK_LBUTTON)
 		b = MBT_LEFT;
@@ -2039,6 +2047,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	show_mouseptr(1);
 	has_focus = FALSE;
 	DestroyCaret();
+	caret_x = caret_y = -1;	       /* ensure caret is replaced next time */
 	term_out();
 	term_update();
 	break;
@@ -2155,6 +2164,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
       case WM_FULLSCR_ON_MAX:
 	fullscr_on_max = TRUE;
 	break;
+      case WM_MOVE:
+	sys_cursor_update();
+	break;
       case WM_SIZE:
 #ifdef RDB_DEBUG_PATCH
 	debug((27, "WM_SIZE %s (%d,%d)",
@@ -2238,6 +2250,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		    reset_window(0);
 	    }
 	}
+	sys_cursor_update();
 	return 0;
       case WM_VSCROLL:
 	switch (LOWORD(wParam)) {
@@ -2347,6 +2360,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	/* wParam == Font number */
 	/* lParam == Locale */
 	set_input_locale((HKL)lParam);
+	sys_cursor_update();
 	break;
       case WM_IME_NOTIFY:
 	if(wParam == IMN_SETOPENSTATUS) {
@@ -2420,7 +2434,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    return TRUE;
 	}
       default:
-	if (message == wm_mousewheel) {
+	if (message == wm_mousewheel || message == WM_MOUSEWHEEL) {
 	    int shift_pressed=0, control_pressed=0, alt_pressed=0;
 
 	    if (message == WM_MOUSEWHEEL) {
@@ -2482,13 +2496,35 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
  */
 void sys_cursor(int x, int y)
 {
+    int cx, cy;
+
+    if (!has_focus) return;
+
+    /*
+     * Avoid gratuitously re-updating the cursor position and IMM
+     * window if there's no actual change required.
+     */
+    cx = x * font_width + offset_width;
+    cy = y * font_height + offset_height;
+    if (cx == caret_x && cy == caret_y)
+	return;
+    caret_x = cx;
+    caret_y = cy;
+
+    sys_cursor_update();
+}
+
+static void sys_cursor_update(void)
+{
     COMPOSITIONFORM cf;
     HIMC hIMC;
 
     if (!has_focus) return;
-    
-    SetCaretPos(x * font_width + offset_width,
-		y * font_height + offset_height);
+
+    if (caret_x < 0 || caret_y < 0)
+	return;
+
+    SetCaretPos(caret_x, caret_y);
 
     /* IMM calls on Win98 and beyond only */
     if(osVersion.dwPlatformId == VER_PLATFORM_WIN32s) return; /* 3.11 */
@@ -2499,8 +2535,8 @@ void sys_cursor(int x, int y)
     /* we should have the IMM functions */
     hIMC = ImmGetContext(hwnd);
     cf.dwStyle = CFS_POINT;
-    cf.ptCurrentPos.x = x * font_width + offset_width;
-    cf.ptCurrentPos.y = y * font_height + offset_height;
+    cf.ptCurrentPos.x = caret_x;
+    cf.ptCurrentPos.y = caret_y;
     ImmSetCompositionWindow(hIMC, &cf);
 
     ImmReleaseContext(hwnd, hIMC);
@@ -4186,6 +4222,11 @@ void set_iconic(int iconic)
  */
 void move_window(int x, int y)
 {
+    if (cfg.resize_action == RESIZE_DISABLED || 
+        cfg.resize_action == RESIZE_FONT ||
+	IsZoomed(hwnd))
+       return;
+
     SetWindowPos(hwnd, NULL, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
 }