X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2d466ffd08675d26db45e524c2fe6a8cf4628e2b..421e689af0c5510bdc8d37cef225359294cdabe4:/window.c

diff --git a/window.c b/window.c
index ea349bda..11aeb697 100644
--- a/window.c
+++ b/window.c
@@ -77,6 +77,7 @@ static int pending_netevent = 0;
 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 time_t last_movement = 0;
 
@@ -644,11 +645,14 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 		term_out();
 	    term_update();
 	    ShowCaret(hwnd);
+
+	    flash_window(1);	       /* maintain */
+
 	    if (in_vbell)
 		/* Hmm, term_update didn't want to do an update too soon ... */
 		timer_id = SetTimer(hwnd, 1, 50, NULL);
 	    else if (!has_focus)
-		timer_id = SetTimer(hwnd, 1, 2000, NULL);
+		timer_id = SetTimer(hwnd, 1, 500, NULL);
 	    else
 		timer_id = SetTimer(hwnd, 1, 100, NULL);
 	    long_timer = 1;
@@ -1587,11 +1591,11 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	if (wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) {
 	    Mouse_Button b;
 	    if (wParam & MK_LBUTTON)
-		b = MBT_SELECT;
+		b = MBT_LEFT;
 	    else if (wParam & MK_MBUTTON)
-		b = cfg.mouse_is_xterm ? MBT_PASTE : MBT_EXTEND;
+		b = MBT_MIDDLE;
 	    else
-		b = cfg.mouse_is_xterm ? MBT_EXTEND : MBT_PASTE;
+		b = MBT_RIGHT;
 	    term_mouse(b, MA_DRAG, TO_CHR_X(X_POS(lParam)),
 		       TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
 		       wParam & MK_CONTROL);
@@ -1643,6 +1647,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	has_focus = TRUE;
 	CreateCaret(hwnd, caretbm, font_width, font_height);
 	ShowCaret(hwnd);
+	flash_window(0);	       /* stop */
 	compose_state = 0;
 	term_out();
 	term_update();
@@ -3239,6 +3244,42 @@ void fatalbox(char *fmt, ...)
 }
 
 /*
+ * Manage window caption / taskbar flashing, if enabled.
+ * 0 = stop, 1 = maintain, 2 = start
+ */
+static void flash_window(int mode)
+{
+    static long last_flash = 0;
+    static int flashing = 0;
+    if ((mode == 0) || (cfg.beep_ind == B_IND_DISABLED)) {
+	/* stop */
+	if (flashing) {
+	    FlashWindow(hwnd, FALSE);
+	    flashing = 0;
+	}
+
+    } else if (mode == 2) {
+	/* start */
+	if (!flashing) {
+	    last_flash = GetTickCount();
+	    flashing = 1;
+	    FlashWindow(hwnd, TRUE);
+	}
+
+    } else if ((mode == 1) && (cfg.beep_ind == B_IND_FLASH)) {
+	/* maintain */
+	if (flashing) {
+	    long now = GetTickCount();
+	    long fdiff = now - last_flash;
+	    if (fdiff < 0 || fdiff > 450) {
+		last_flash = now;
+		FlashWindow(hwnd, TRUE);	/* toggle */
+	    }
+	}
+    }
+}
+
+/*
  * Beep.
  */
 void beep(int mode)
@@ -3272,4 +3313,8 @@ void beep(int mode)
 	    cfg.beep = BELL_DEFAULT;
 	}
     }
+    /* Otherwise, either visual bell or disabled; do nothing here */
+    if (!has_focus) {
+	flash_window(2);	       /* start */
+    }
 }