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

Refactor modifier handling in Pearl's cursor code.

Browse Source
This commit is contained in:
Jonas Kölker
2015-09-22 11:18:31 +02:00
committed by Simon Tatham
parent 11a394f69b
commit 8e35087e09
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pearl.c
View File

@ -1998,6 +1998,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
int release = FALSE; int release = FALSE;
char tmpbuf[80]; char tmpbuf[80];
int shift = button & MOD_SHFT, control = button & MOD_CTRL;
button &= ~MOD_MASK;
if (IS_MOUSE_DOWN(button)) { if (IS_MOUSE_DOWN(button)) {
ui->cursor_active = FALSE; ui->cursor_active = FALSE;
@ -2020,10 +2023,10 @@ static char *interpret_move(const game_state *state, game_ui *ui,
if (IS_MOUSE_RELEASE(button)) release = TRUE; if (IS_MOUSE_RELEASE(button)) release = TRUE;
if (IS_CURSOR_MOVE(button & ~MOD_MASK)) { if (IS_CURSOR_MOVE(button)) {
if (!ui->cursor_active) { if (!ui->cursor_active) {
ui->cursor_active = TRUE; ui->cursor_active = TRUE;
} else if (button & (MOD_SHFT | MOD_CTRL)) { } else if (control | shift) {
if (ui->ndragcoords > 0) return NULL; if (ui->ndragcoords > 0) return NULL;
ui->ndragcoords = -1; ui->ndragcoords = -1;
return mark_in_direction(state, ui->curx, ui->cury, return mark_in_direction(state, ui->curx, ui->cury,
@ -2037,7 +2040,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
return ""; return "";
} }
if (IS_CURSOR_SELECT(button & ~MOD_MASK)) { if (IS_CURSOR_SELECT(button)) {
if (!ui->cursor_active) { if (!ui->cursor_active) {
ui->cursor_active = TRUE; ui->cursor_active = TRUE;
return ""; return "";