Commit d577c60
mikulik
SF #1651350 win terminal: pause mouse key|any does not work
mouse.c (event_keypress): Kill pending Pause dialog.
win/wpause.c (PauseBox): Don't show "OK CANCEL" dialog when pausing for mouse.1 parent a1f8286 commit d577c60
3 files changed
Lines changed: 27 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,12 @@ | |||
| 1 | + 2007-02-10 Petr Mikulik <mikulik@physics.muni.cz> | ||
| 2 | + | ||
| 3 | + SF #1651350 win terminal: pause mouse key|any does not work | ||
| 4 | + | ||
| 5 | + * src/mouse.c (event_keypress): Kill pending Pause dialog. | ||
| 6 | + | ||
| 7 | + * src/win/wpause.c (PauseBox): Don't show "OK CANCEL" dialog when | ||
| 8 | + pausing for mouse. | ||
| 9 | + | ||
| 1 | 10 | 2007-02-09 Daniel Sebald <daniel.sebald@ieee.org> | |
| 2 | 11 | ||
| 3 | 12 | * term/pdf.trm (PDF_point): Point type 1 was incorrectly drawn as a dot. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | #ifndef lint | |
| 2 | - static char *RCSid() { return RCSid("$Id: mouse.c,v 1.85 2006/07/18 05:20:50 mikulik Exp $"); } | ||
| 2 | + static char *RCSid() { return RCSid("$Id: mouse.c,v 1.86 2007/02/10 00:14:54 mikulik Exp $"); } | ||
| 3 | 3 | #endif | |
| 4 | 4 | ||
| 5 | 5 | /* GNUPLOT - mouse.c */ | |
@@ -1362,6 +1362,11 @@ event_keypress(struct gp_event_t *ge, TBOOLEAN current) | |||
| 1362 | 1362 | * which is a bad thing if you are in the middle of a mousing operation. | |
| 1363 | 1363 | */ | |
| 1364 | 1364 | ||
| 1365 | + #ifdef _Windows | ||
| 1366 | + if (paused_for_mouse & PAUSE_KEYSTROKE) | ||
| 1367 | + kill_pending_Pause_dialog(); | ||
| 1368 | + #endif | ||
| 1369 | + | ||
| 1365 | 1370 | if ((paused_for_mouse & PAUSE_KEYSTROKE) && (c > '\0') && current) { | |
| 1366 | 1371 | load_mouse_variables(x, y, FALSE, c); | |
| 1367 | 1372 | return; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | #ifndef lint | |
| 2 | - static char *RCSid() { return RCSid("$Id: wpause.c,v 1.14 2006/11/10 22:30:16 tlecomte Exp $"); } | ||
| 2 | + static char *RCSid() { return RCSid("$Id: wpause.c,v 1.15 2007/02/10 00:14:54 mikulik Exp $"); } | ||
| 3 | 3 | #endif | |
| 4 | 4 | ||
| 5 | 5 | /* GNUPLOT - win/wpause.c */ | |
@@ -180,9 +180,17 @@ PauseBox(LPPW lppw) | |||
| 180 | 180 | lppw->hWndParent, NULL, lppw->hInstance, lppw); | |
| 181 | 181 | ||
| 182 | 182 | SendMessage(lppw->hCancel, BM_SETSTYLE, (WPARAM)BS_DEFPUSHBUTTON, (LPARAM)FALSE); | |
| 183 | - ShowWindow(lppw->hWndPause, SW_SHOWNORMAL); | ||
| 184 | - BringWindowToTop(lppw->hWndPause); | ||
| 185 | - UpdateWindow(lppw->hWndPause); | ||
| 183 | + | ||
| 184 | + /* Don't show the pause "OK CANCEL" dialog for "pause mouse ..." -- well, show | ||
| 185 | + it only for "pause -1". | ||
| 186 | + Note: maybe to show in the window titlebar or somewhere else a message like | ||
| 187 | + graphwin.Title = "gnuplot pausing (waiting for mouse click)"; | ||
| 188 | + */ | ||
| 189 | + if (!paused_for_mouse) { | ||
| 190 | + ShowWindow(lppw->hWndPause, SW_SHOWNORMAL); | ||
| 191 | + BringWindowToTop(lppw->hWndPause); | ||
| 192 | + UpdateWindow(lppw->hWndPause); | ||
| 193 | + } | ||
| 186 | 194 | ||
| 187 | 195 | lppw->bPause = TRUE; | |
| 188 | 196 | lppw->bPauseCancel = IDCANCEL; | |
0 commit comments