From 0058331aeb027f7441a04d99cc7c1e445bd896d9 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Fri, 21 Apr 2023 15:50:05 +0100 Subject: New backend functions: get_prefs and set_prefs. These are similar to the existing pair configure() and custom_params() in that get_prefs() returns an array of config_item describing a set of dialog-box controls to present to the user, and set_prefs() receives the same array with answers filled in and implements the answers. But where configure() and custom_params() operate on a game_params structure, the new pair operate on a game_ui, and are intended to permit GUI configuration of all the settings I just moved into that structure. However, nothing actually _calls_ these routines yet. All I've done in this commit is to add them to 'struct game' and implement them for the functions that need them. Also, config_item has new fields, permitting each config option to define a machine-readable identifying keyword as well as the user-facing description. For options of type C_CHOICES, each choice also has a keyword. These keyword fields are only defined at all by the new get_prefs() function - they're left uninitialised in existing uses of the dialog system. The idea is to use them when writing out the user's preferences into a configuration file on disk, although I haven't actually done any of that work in this commit. --- range.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'range.c') diff --git a/range.c b/range.c index cd5e89e..4cb771a 100644 --- a/range.c +++ b/range.c @@ -1271,6 +1271,31 @@ static game_ui *new_ui(const game_state *state) return ui; } +static config_item *get_prefs(game_ui *ui) +{ + config_item *ret; + + ret = snewn(2, config_item); + + ret[0].name = "Mouse button order"; + ret[0].kw = "left-mouse-button"; + ret[0].type = C_CHOICES; + ret[0].u.choices.choicenames = + ":Left to fill, right to dot:Left to dot, right to fill"; + ret[0].u.choices.choicekws = ":fill:dot"; + ret[0].u.choices.selected = ui->swap_buttons; + + ret[1].name = NULL; + ret[1].type = C_END; + + return ret; +} + +static void set_prefs(game_ui *ui, const config_item *cfg) +{ + ui->swap_buttons = cfg[0].u.choices.selected; +} + static void free_ui(game_ui *ui) { sfree(ui); @@ -1834,6 +1859,7 @@ struct game const thegame = { free_game, true, solve_game, true, game_can_format_as_text_now, game_text_format, + get_prefs, set_prefs, new_ui, free_ui, NULL, /* encode_ui */ -- cgit v1.1