Patches from Frode Austvik to modify the effects of the mouse

buttons in several games if STYLUS_BASED is defined: in games where
you can set a puzzle element to 'on', 'off' or 'not yet set', when
it's hard to mimic a second mouse button, it's better to have the
one 'button' cycle between all three states rather than from 'on'
back to 'unset'.

[originally from svn r8784]
This commit is contained in:
Simon Tatham
2009-12-17 18:16:42 +00:00
parent 6d5245d8bf
commit 97477f0916
4 changed files with 31 additions and 2 deletions

13
tents.c
View File

@ -1469,6 +1469,7 @@ static int drag_xform(game_ui *ui, int x, int y, int v)
ymin = min(ui->dsy, ui->dey);
ymax = max(ui->dsy, ui->dey);
#ifndef STYLUS_BASED
/*
* Left-dragging has no effect, so we treat a left-drag as a
* single click on dsx,dsy.
@ -1477,6 +1478,7 @@ static int drag_xform(game_ui *ui, int x, int y, int v)
xmin = xmax = ui->dsx;
ymin = ymax = ui->dsy;
}
#endif
if (x < xmin || x > xmax || y < ymin || y > ymax)
return v; /* no change outside drag area */
@ -1489,11 +1491,18 @@ static int drag_xform(game_ui *ui, int x, int y, int v)
* Results of a simple click. Left button sets blanks to
* tents; right button sets blanks to non-tents; either
* button clears a non-blank square.
* If stylus-based however, it loops instead.
*/
if (ui->drag_button == LEFT_BUTTON)
#ifdef STYLUS_BASED
v = (v == BLANK ? TENT : (v == TENT ? NONTENT : BLANK));
else
v = (v == BLANK ? NONTENT : (v == NONTENT ? TENT : BLANK));
#else
v = (v == BLANK ? TENT : BLANK);
else
v = (v == BLANK ? NONTENT : BLANK);
#endif
} else {
/*
* Results of a drag. Left-dragging has no effect.
@ -1503,7 +1512,11 @@ static int drag_xform(game_ui *ui, int x, int y, int v)
if (ui->drag_button == RIGHT_BUTTON)
v = (v == BLANK ? NONTENT : v);
else
#ifdef STYLUS_BASED
v = (v == BLANK ? NONTENT : v);
#else
/* do nothing */;
#endif
}
return v;