From 335927ab905d38afa4206a394641ec29c8d4b473 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Wed, 22 Apr 2015 14:40:01 +0000
Subject: Fix for STR #3221: restore the correct state of mouse buttons and
 keyboard modifier keys after closing a non-FLTK window (file or printer
 dialogs).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10713 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_GDI_Printer.cxx               | 15 ++++++++++-----
 src/Fl_Native_File_Chooser_WIN32.cxx | 12 ++++++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/Fl_GDI_Printer.cxx b/src/Fl_GDI_Printer.cxx
index 60366424f..98a3a7be4 100644
--- a/src/Fl_GDI_Printer.cxx
+++ b/src/Fl_GDI_Printer.cxx
@@ -68,7 +68,12 @@ int Fl_System_Printer::start_job (int pagecount, int *frompage, int *topage)
   pd.Flags = PD_RETURNDC | PD_USEDEVMODECOPIESANDCOLLATE | PD_NOSELECTION;
   pd.nMinPage = 1;
   pd.nMaxPage = pagecount;
-  if (PrintDlg (&pd) != 0) {
+  BOOL b = PrintDlg (&pd);
+  if (pd.hwndOwner) { // restore the correct state of mouse buttons and keyboard modifier keys (STR #3221)
+    WNDPROC windproc = (WNDPROC)GetWindowLongPtrW(pd.hwndOwner, GWLP_WNDPROC);
+    CallWindowProc(windproc, pd.hwndOwner, WM_ACTIVATEAPP, 1, 0);
+  }
+  if (b != 0) {
     hPr = pd.hDC;
     if (hPr != NULL) {
       strcpy (docName, "FLTK");
@@ -77,14 +82,14 @@ int Fl_System_Printer::start_job (int pagecount, int *frompage, int *topage)
       di.lpszDocName = (LPCSTR) docName;
       prerr = StartDoc (hPr, &di);
       if (prerr < 1) {
-	abortPrint = TRUE;
-	//fl_alert ("StartDoc error %d", prerr);
-	err = 1;
+        abortPrint = TRUE;
+        //fl_alert ("StartDoc error %d", prerr);
+        err = 1;
       }
     } else {
       commdlgerr = CommDlgExtendedError ();
       fl_alert ("Unable to create print context, error %lu",
-		(unsigned long) commdlgerr);
+                (unsigned long) commdlgerr);
       err = 1;
     }
   } else {
diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx
index fbadd21a0..2f36635bc 100644
--- a/src/Fl_Native_File_Chooser_WIN32.cxx
+++ b/src/Fl_Native_File_Chooser_WIN32.cxx
@@ -568,13 +568,21 @@ int Fl_Native_File_Chooser::showdir() {
 //   -1 - failed; errmsg() has reason
 //
 int Fl_Native_File_Chooser::show() {
+  int retval;
   if ( _btype == BROWSE_DIRECTORY ||
        _btype == BROWSE_MULTI_DIRECTORY ||
        _btype == BROWSE_SAVE_DIRECTORY ) {
-    return(showdir());
+    retval = showdir();
   } else {
-    return(showfile());
+    retval = showfile();
   }
+  // restore the correct state of mouse buttons and keyboard modifier keys (STR #3221)
+  HWND h = GetForegroundWindow();
+  if (h) {
+    WNDPROC windproc = (WNDPROC)GetWindowLongPtrW(h, GWLP_WNDPROC);
+    CallWindowProc(windproc, h, WM_ACTIVATEAPP, 1, 0);
+  }
+  return retval;
 }
 
 // RETURN ERROR MESSAGE
-- 
cgit v1.2.3