shithub: puzzles

Info  •  Files  •  Log  •  Branches

Keyboard control patch for Slant, from James H.

[originally from svn r8417]

--- a/puzzles.but

+++ b/puzzles.but

@@ -1642,6 +1642,10 @@

 blank to \cw{/} to \cw{\\} back to blank. (Therefore, you can play

 the game entirely with one button if you need to.)

+You can also use the cursor keys to move around the grid. Pressing the

+return or space keys will place a \cw{\\} or a \cw{/}, respectively,

+and will then cycle them as above.

+

 (All the actions described in \k{common-actions} are also available.)

 \H{slant-parameters} \I{parameters, for Slant}Slant parameters

--- a/slant.c

+++ b/slant.c

@@ -39,6 +39,7 @@

     COL_SLANT1,

     COL_SLANT2,

     COL_ERROR,

+    COL_CURSOR, COL_LOWLIGHT, /* LOWLIGHT currently not used. */

     NCOLOURS

 };

@@ -1594,13 +1595,20 @@

     return ret;

 }

+struct game_ui {

+    int cur_x, cur_y, cur_visible;

+};

+

 static game_ui *new_ui(game_state *state)

 {

-    return NULL;

+    game_ui *ui = snew(game_ui);

+    ui->cur_x = ui->cur_y = ui->cur_visible = 0;

+    return ui;

 }

 static void free_ui(game_ui *ui)

 {

+    sfree(ui);

 }

 static char *encode_ui(game_ui *ui)

@@ -1648,6 +1656,7 @@

 #define ERR_TR    0x00008000L

 #define ERR_BL    0x00010000L

 #define ERR_BR    0x00020000L

+#define CURSOR    0x00040000L

 struct game_drawstate {

     int tilesize;

@@ -1660,11 +1669,11 @@

 			    int x, int y, int button)

 {

     int w = state->p.w, h = state->p.h;

+    int v;

+    char buf[80];

+    enum { CLOCKWISE, ANTICLOCKWISE, NONE } action = NONE;

     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {

-        int v;

-        char buf[80];

-

 	/*

 	 * This is an utterly awful hack which I should really sort out

 	 * by means of a proper configuration mechanism. One Slant

@@ -1687,13 +1696,29 @@

 		    button = LEFT_BUTTON;

 	    }

 	}

+        action = (button == LEFT_BUTTON) ? CLOCKWISE : ANTICLOCKWISE;

         x = FROMCOORD(x);

         y = FROMCOORD(y);

         if (x < 0 || y < 0 || x >= w || y >= h)

             return NULL;

+    } else if (IS_CURSOR_SELECT(button)) {

+        if (!ui->cur_visible) {

+            ui->cur_visible = 1;

+            return "";

+        }

+        x = ui->cur_x;

+        y = ui->cur_y;

-        if (button == LEFT_BUTTON) {

+        action = (button == CURSOR_SELECT2) ? ANTICLOCKWISE : CLOCKWISE;

+    } else if (IS_CURSOR_MOVE(button)) {

+        move_cursor(button, &ui->cur_x, &ui->cur_y, w, h, 0);

+        ui->cur_visible = 1;

+        return "";

+    }

+

+    if (action != NONE) {

+        if (action == CLOCKWISE) {

             /*

              * Left-clicking cycles blank -> \ -> / -> blank.

              */

@@ -1784,7 +1809,8 @@

 {

     float *ret = snewn(3 * NCOLOURS, float);

-    frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]);

+    /* CURSOR colour is a background highlight. LOWLIGHT is unused. */

+    game_mkhighlight(fe, ret, COL_BACKGROUND, COL_CURSOR, COL_LOWLIGHT);

     ret[COL_GRID * 3 + 0] = ret[COL_BACKGROUND * 3 + 0] * 0.7F;

     ret[COL_GRID * 3 + 1] = ret[COL_BACKGROUND * 3 + 1] * 0.7F;

@@ -1843,7 +1869,7 @@

     if (v < 0)

 	return;

-    p[0] = v + '0';

+    p[0] = (char)v + '0';

     p[1] = '\0';

     draw_circle(dr, COORD(x), COORD(y), CLUE_RADIUS,

 		bg >= 0 ? bg : COL_BACKGROUND, ccol);

@@ -1862,7 +1888,8 @@

     clip(dr, COORD(x), COORD(y), TILESIZE, TILESIZE);

     draw_rect(dr, COORD(x), COORD(y), TILESIZE, TILESIZE,

-	      (v & FLASH) ? COL_GRID : COL_BACKGROUND);

+	      (v & FLASH) ? COL_GRID :

+              (v & CURSOR) ? COL_CURSOR : COL_BACKGROUND);

     /*

      * Draw the grid lines.

@@ -2001,6 +2028,8 @@

                     ds->todraw[(y+2)*(w+2)+(x+1)] |= ERR_T_L | ERR_C_TL;

                 }

 	    }

+            if (ui->cur_visible && ui->cur_x == x && ui->cur_y == y)

+                ds->todraw[(y+1)*(w+2)+(x+1)] |= CURSOR;

 	}

     }

@@ -2056,8 +2085,8 @@

      * I'll use 6mm squares by default.

      */

     game_compute_size(params, 600, &pw, &ph);

-    *x = pw / 100.0;

-    *y = ph / 100.0;

+    *x = pw / 100.0F;

+    *y = ph / 100.0F;

 }

 static void game_print(drawing *dr, game_state *state, int tilesize)

@@ -2249,3 +2278,5 @@

 }

 #endif

+

+/* vim: set shiftwidth=4 tabstop=8: */