wineconsole[4/6]: allow making selections with a mouse also when not in the QuickEdit mode

Mikołaj Zalewski mikolaj at zalewski.pl
Wed Oct 18 08:54:28 CDT 2006


The user may start the selection from the popup menu. The mouse should 
work then
-------------- next part --------------
diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c
index 557ccfc..c4250e5 100644
--- a/programs/wineconsole/user.c
+++ b/programs/wineconsole/user.c
@@ -1116,12 +1116,14 @@ static LRESULT CALLBACK WCUSER_Proc(HWND
 	WCUSER_GenerateKeyInputRecord(data, uMsg == WM_SYSKEYDOWN, wParam, lParam, TRUE);
 	break;
     case WM_LBUTTONDOWN:
-        if (data->curcfg.quick_edit)
+        if (data->curcfg.quick_edit || PRIVATE(data)->has_selection)
         {
             if (PRIVATE(data)->has_selection)
+                WCUSER_SetSelection(data, 0);
+            
+            if (data->curcfg.quick_edit && PRIVATE(data)->has_selection)
             {
                 PRIVATE(data)->has_selection = FALSE;
-                WCUSER_SetSelection(data, 0);
             }
             else
             {
@@ -1137,7 +1139,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND
         }
 	break;
     case WM_MOUSEMOVE:
-        if (data->curcfg.quick_edit)
+        if (data->curcfg.quick_edit || PRIVATE(data)->has_selection)
         {
             if (GetCapture() == PRIVATE(data)->hWnd && PRIVATE(data)->has_selection &&
                 (wParam & MK_LBUTTON))
@@ -1151,14 +1153,13 @@ static LRESULT CALLBACK WCUSER_Proc(HWND
         }
 	break;
     case WM_LBUTTONUP:
-        if (data->curcfg.quick_edit)
+        if (data->curcfg.quick_edit || PRIVATE(data)->has_selection)
         {
             if (GetCapture() == PRIVATE(data)->hWnd && PRIVATE(data)->has_selection &&
                 (wParam& MK_LBUTTON))
             {
                 WCUSER_MoveSelection(data, PRIVATE(data)->selectPt1, WCUSER_GetCell(data, lParam));
                 ReleaseCapture();
-                PRIVATE(data)->has_selection = FALSE;
             }
         }
         else
-- 
1.4.2.3


More information about the wine-patches mailing list