zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Stop Light Up from eating system keypresses, which it was previously

Browse Source 
doing whenever the cursor was active.

[originally from svn r6258]
This commit is contained in:
Simon Tatham
2005-09-01 17:25:06 +00:00
parent bd5606ae74
commit 8d4b62c9bd
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lightup.c
View File

@ -1824,11 +1824,13 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
int x, int y, int button) int x, int y, int button)
{ {
enum { NONE, FLIP_LIGHT, FLIP_IMPOSSIBLE } action = NONE; enum { NONE, FLIP_LIGHT, FLIP_IMPOSSIBLE } action = NONE;
int cx = -1, cy = -1, cv = ui->cur_visible; int cx = -1, cy = -1;
unsigned int flags; unsigned int flags;
char buf[80], *nullret, *empty = "", c; char buf[80], *nullret = NULL, *empty = "", c;
if (button == LEFT_BUTTON || button == RIGHT_BUTTON) { if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
if (ui->cur_visible)
nullret = empty;
ui->cur_visible = 0; ui->cur_visible = 0;
cx = FROMCOORD(x); cx = FROMCOORD(x);
cy = FROMCOORD(y); cy = FROMCOORD(y);
@ -1855,13 +1857,9 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
ui->cur_x = min(max(ui->cur_x, 0), state->w - 1); ui->cur_x = min(max(ui->cur_x, 0), state->w - 1);
ui->cur_y = min(max(ui->cur_y, 0), state->h - 1); ui->cur_y = min(max(ui->cur_y, 0), state->h - 1);
ui->cur_visible = 1; ui->cur_visible = 1;
} nullret = empty;
} else
/* Always redraw if the cursor is on, or if it's just been return NULL;
* removed. */
if (ui->cur_visible) nullret = empty;
else if (cv) nullret = empty;
else nullret = NULL;
switch (action) { switch (action) {
case FLIP_LIGHT: case FLIP_LIGHT: