chiark
/
gitweb
/
~ian
/
sgt-puzzles.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
11a394f
)
Refactor modifier handling in Pearl's cursor code.
author
Jonas Kölker
<jonaskoelker@yahoo.com>
Tue, 22 Sep 2015 09:18:31 +0000
(11:18 +0200)
committer
Simon Tatham
<anakin@pobox.com>
Sat, 3 Oct 2015 15:59:04 +0000
(16:59 +0100)
pearl.c
patch
|
blob
|
history
diff --git
a/pearl.c
b/pearl.c
index 0eb3d4b2005ae0e7db413ed00335feb55fb1cff0..83413a2b9ecdb9a647836a76265faa9914235cdf 100644
(file)
--- a/
pearl.c
+++ b/
pearl.c
@@
-1998,6
+1998,9
@@
static char *interpret_move(const game_state *state, game_ui *ui,
int release = FALSE;
char tmpbuf[80];
int release = FALSE;
char tmpbuf[80];
+ int shift = button & MOD_SHFT, control = button & MOD_CTRL;
+ button &= ~MOD_MASK;
+
if (IS_MOUSE_DOWN(button)) {
ui->cursor_active = FALSE;
if (IS_MOUSE_DOWN(button)) {
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) {
ui->cursor_active = TRUE;
if (!ui->cursor_active) {
ui->cursor_active = TRUE;
- } else if (
button & (MOD_SHFT | MOD_CTRL)
) {
+ } else if (
control | shift
) {
if (ui->ndragcoords > 0) return NULL;
ui->ndragcoords = -1;
return mark_in_direction(state, ui->curx, ui->cury,
if (ui->ndragcoords > 0) return NULL;
ui->ndragcoords = -1;
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) {
ui->cursor_active = TRUE;
return "";
if (!ui->cursor_active) {
ui->cursor_active = TRUE;
return "";