From 7478275c8b46c24eb457dd3458ace3a31263295b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jonas=20K=C3=B6lker?= Date: Mon, 21 Sep 2015 17:33:02 +0200 Subject: [PATCH 1/1] Pattern: color multiple squares with Ctrl- or Shift-cursor keys. --- pattern.c | 16 +++++++++++++++- puzzles.but | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pattern.c b/pattern.c index 0688f33..10621d1 100644 --- a/pattern.c +++ b/pattern.c @@ -1056,6 +1056,7 @@ static char *interpret_move(const game_state *state, game_ui *ui, const game_drawstate *ds, int x, int y, int button) { + int control = button & MOD_CTRL, shift = button & MOD_SHFT; button &= ~MOD_MASK; x = FROMCOORD(state->w, x); @@ -1156,10 +1157,23 @@ static char *interpret_move(const game_state *state, game_ui *ui, } if (IS_CURSOR_MOVE(button)) { + int x = ui->cur_x, y = ui->cur_y, newstate; + char buf[80]; move_cursor(button, &ui->cur_x, &ui->cur_y, state->w, state->h, 0); ui->cur_visible = 1; - return ""; + if (!control && !shift) return ""; + + newstate = control ? shift ? GRID_UNKNOWN : GRID_FULL : GRID_EMPTY; + if (state->grid[y * state->w + x] == newstate && + state->grid[ui->cur_y * state->w + ui->cur_x] == newstate) + return ""; + + sprintf(buf, "%c%d,%d,%d,%d", control ? shift ? 'U' : 'F' : 'E', + min(x, ui->cur_x), min(y, ui->cur_y), + abs(x - ui->cur_x) + 1, abs(y - ui->cur_y) + 1); + return dupstr(buf); } + if (IS_CURSOR_SELECT(button)) { int currstate = state->grid[ui->cur_y * state->w + ui->cur_x]; int newstate; diff --git a/puzzles.but b/puzzles.but index 80727c6..ef96ad1 100644 --- a/puzzles.but +++ b/puzzles.but @@ -897,6 +897,10 @@ You can also move around the grid with the cursor keys. Pressing the return key will cycle the current cell through empty, then black, then white, then empty, and the space bar does the same cycle in reverse. +Moving the cursor while holding Control will colour the moved-over +squares black. Holding Shift will colour the moved-over squares +white, and holding both will colour them grey. + (All the actions described in \k{common-actions} are also available.) \H{pattern-parameters} \I{parameters, for Pattern}Pattern parameters -- 2.30.2