~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work around an annoying GTK behaviour I noticed the other day on my
[sgt/puzzles]
/
nullgame.c
diff --git
a/nullgame.c
b/nullgame.c
index
46f903f
..
5a0ba42
100644
(file)
--- a/
nullgame.c
+++ b/
nullgame.c
@@
-78,28
+78,23
@@
static game_params *custom_params(config_item *cfg)
return NULL;
}
return NULL;
}
-static char *validate_params(game_params *params)
+static char *validate_params(game_params *params
, int full
)
{
return NULL;
}
static char *new_game_desc(game_params *params, random_state *rs,
{
return NULL;
}
static char *new_game_desc(game_params *params, random_state *rs,
-
game_aux_info
**aux, int interactive)
+
char
**aux, int interactive)
{
return dupstr("FIXME");
}
{
return dupstr("FIXME");
}
-static void game_free_aux_info(game_aux_info *aux)
-{
- assert(!"Shouldn't happen");
-}
-
static char *validate_desc(game_params *params, char *desc)
{
return NULL;
}
static char *validate_desc(game_params *params, char *desc)
{
return NULL;
}
-static game_state *new_game(midend
_data
*me, game_params *params, char *desc)
+static game_state *new_game(midend *me, game_params *params, char *desc)
{
game_state *state = snew(game_state);
{
game_state *state = snew(game_state);
@@
-123,11
+118,16
@@
static void free_game(game_state *state)
}
static char *solve_game(game_state *state, game_state *currstate,
}
static char *solve_game(game_state *state, game_state *currstate,
-
game_aux_info
*aux, char **error)
+
char
*aux, char **error)
{
return NULL;
}
{
return NULL;
}
+static int game_can_format_as_text_now(game_params *params)
+{
+ return TRUE;
+}
+
static char *game_text_format(game_state *state)
{
return NULL;
static char *game_text_format(game_state *state)
{
return NULL;
@@
-142,12
+142,12
@@
static void free_ui(game_ui *ui)
{
}
{
}
-char *encode_ui(game_ui *ui)
+
static
char *encode_ui(game_ui *ui)
{
return NULL;
}
{
return NULL;
}
-void decode_ui(game_ui *ui, char *encoding)
+
static
void decode_ui(game_ui *ui, char *encoding)
{
}
{
}
@@
-157,10
+157,11
@@
static void game_changed_state(game_ui *ui, game_state *oldstate,
}
struct game_drawstate {
}
struct game_drawstate {
+ int tilesize;
int FIXME;
};
int FIXME;
};
-static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
+static char *interpret_move(game_state *state, game_ui *ui,
const
game_drawstate *ds,
int x, int y, int button)
{
return NULL;
int x, int y, int button)
{
return NULL;
@@
-175,13
+176,19
@@
static game_state *execute_move(game_state *state, char *move)
* Drawing routines.
*/
* Drawing routines.
*/
-static void game_
size(game_params *params, game_drawstate *ds
,
-
int *x, int *y, int expand
)
+static void game_
compute_size(game_params *params, int tilesize
,
+
int *x, int *y
)
{
{
- *x = *y =
200;
/* FIXME */
+ *x = *y =
10 * tilesize;
/* FIXME */
}
}
-static float *game_colours(frontend *fe, game_state *state, int *ncolours)
+static void game_set_size(drawing *dr, game_drawstate *ds,
+ game_params *params, int tilesize)
+{
+ ds->tilesize = tilesize;
+}
+
+static float *game_colours(frontend *fe, int *ncolours)
{
float *ret = snewn(3 * NCOLOURS, float);
{
float *ret = snewn(3 * NCOLOURS, float);
@@
-191,21
+198,22
@@
static float *game_colours(frontend *fe, game_state *state, int *ncolours)
return ret;
}
return ret;
}
-static game_drawstate *game_new_drawstate(game_state *state)
+static game_drawstate *game_new_drawstate(
drawing *dr,
game_state *state)
{
struct game_drawstate *ds = snew(struct game_drawstate);
{
struct game_drawstate *ds = snew(struct game_drawstate);
+ ds->tilesize = 0;
ds->FIXME = 0;
return ds;
}
ds->FIXME = 0;
return ds;
}
-static void game_free_drawstate(game_drawstate *ds)
+static void game_free_drawstate(
drawing *dr,
game_drawstate *ds)
{
sfree(ds);
}
{
sfree(ds);
}
-static void game_redraw(
frontend *fe
, game_drawstate *ds, game_state *oldstate,
+static void game_redraw(
drawing *dr
, game_drawstate *ds, game_state *oldstate,
game_state *state, int dir, game_ui *ui,
float animtime, float flashtime)
{
game_state *state, int dir, game_ui *ui,
float animtime, float flashtime)
{
@@
-215,7
+223,7
@@
static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
* should start by drawing a big background-colour rectangle
* covering the whole window.
*/
* should start by drawing a big background-colour rectangle
* covering the whole window.
*/
- draw_rect(
fe, 0, 0, 200, 200
, COL_BACKGROUND);
+ draw_rect(
dr, 0, 0, 10*ds->tilesize, 10*ds->tilesize
, COL_BACKGROUND);
}
static float game_anim_length(game_state *oldstate, game_state *newstate,
}
static float game_anim_length(game_state *oldstate, game_state *newstate,
@@
-230,22
+238,30
@@
static float game_flash_length(game_state *oldstate, game_state *newstate,
return 0.0F;
}
return 0.0F;
}
-static int game_
wants_statusbar(void
)
+static int game_
status(game_state *state
)
{
{
- return
FALSE
;
+ return
0
;
}
}
-static int game_timing_state(game_state *state)
+static int game_timing_state(game_state *state
, game_ui *ui
)
{
return TRUE;
}
{
return TRUE;
}
+static void game_print_size(game_params *params, float *x, float *y)
+{
+}
+
+static void game_print(drawing *dr, game_state *state, int tilesize)
+{
+}
+
#ifdef COMBINED
#define thegame nullgame
#endif
const struct game thegame = {
#ifdef COMBINED
#define thegame nullgame
#endif
const struct game thegame = {
- "Null Game", NULL,
+ "Null Game", NULL,
NULL,
default_params,
game_fetch_preset,
decode_params,
default_params,
game_fetch_preset,
decode_params,
@@
-255,13
+271,12
@@
const struct game thegame = {
FALSE, game_configure, custom_params,
validate_params,
new_game_desc,
FALSE, game_configure, custom_params,
validate_params,
new_game_desc,
- game_free_aux_info,
validate_desc,
new_game,
dup_game,
free_game,
FALSE, solve_game,
validate_desc,
new_game,
dup_game,
free_game,
FALSE, solve_game,
- FALSE, game_text_format,
+ FALSE, game_
can_format_as_text_now, game_
text_format,
new_ui,
free_ui,
encode_ui,
new_ui,
free_ui,
encode_ui,
@@
-269,14
+284,16
@@
const struct game thegame = {
game_changed_state,
interpret_move,
execute_move,
game_changed_state,
interpret_move,
execute_move,
-
game
_size,
+
20 /* FIXME */, game_compute_size, game_set
_size,
game_colours,
game_new_drawstate,
game_free_drawstate,
game_redraw,
game_anim_length,
game_flash_length,
game_colours,
game_new_drawstate,
game_free_drawstate,
game_redraw,
game_anim_length,
game_flash_length,
- game_wants_statusbar,
+ game_status,
+ FALSE, FALSE, game_print_size, game_print,
+ FALSE, /* wants_statusbar */
FALSE, game_timing_state,
FALSE, game_timing_state,
- 0, /*
mouse_prioritie
s */
+ 0, /*
flag
s */
};
};