summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-09-16 18:46:39 +0000
committerJens Arnold <amiconn@rockbox.org>2007-09-16 18:46:39 +0000
commit65b4aae61eb473fff935928b9818b206daaf2e57 (patch)
tree4f77c2badc4434c06c5692a682e91aa980af4b66
parentf90837f80ebb0129d29ad692c0f4e3a96c621687 (diff)
downloadrockbox-65b4aae61eb473fff935928b9818b206daaf2e57.tar.gz
rockbox-65b4aae61eb473fff935928b9818b206daaf2e57.zip
Sudoku: Optionally display coloured numbers on colour targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14730 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/bitmaps/native/sudoku_inverse.128x128x16.bmpbin2278 -> 3080 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_inverse.160x128x16.bmpbin4376 -> 8696 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_inverse.220x176x16.bmpbin7736 -> 15416 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_inverse.320x240x16.bmpbin6838 -> 12600 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_normal.128x128x16.bmpbin2278 -> 6056 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_normal.160x128x16.bmpbin4376 -> 8696 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_normal.220x176x16.bmpbin7736 -> 15416 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_normal.320x240x16.bmpbin6838 -> 34616 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_start.128x128x16.bmpbin2278 -> 6056 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_start.160x128x16.bmpbin4376 -> 8696 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_start.220x176x16.bmpbin7736 -> 15416 bytes
-rw-r--r--apps/plugins/bitmaps/native/sudoku_start.320x240x16.bmpbin6838 -> 34616 bytes
-rw-r--r--apps/plugins/sudoku/sudoku.c156
13 files changed, 117 insertions, 39 deletions
diff --git a/apps/plugins/bitmaps/native/sudoku_inverse.128x128x16.bmp b/apps/plugins/bitmaps/native/sudoku_inverse.128x128x16.bmp
index 4a21aa81d8..69e6eabf3c 100644
--- a/apps/plugins/bitmaps/native/sudoku_inverse.128x128x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_inverse.128x128x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_inverse.160x128x16.bmp b/apps/plugins/bitmaps/native/sudoku_inverse.160x128x16.bmp
index ce6d88d24e..8ea9cdec44 100644
--- a/apps/plugins/bitmaps/native/sudoku_inverse.160x128x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_inverse.160x128x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_inverse.220x176x16.bmp b/apps/plugins/bitmaps/native/sudoku_inverse.220x176x16.bmp
index 89ad25885d..efb2747ece 100644
--- a/apps/plugins/bitmaps/native/sudoku_inverse.220x176x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_inverse.220x176x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_inverse.320x240x16.bmp b/apps/plugins/bitmaps/native/sudoku_inverse.320x240x16.bmp
index faf0616280..e6d69bc581 100644
--- a/apps/plugins/bitmaps/native/sudoku_inverse.320x240x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_inverse.320x240x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_normal.128x128x16.bmp b/apps/plugins/bitmaps/native/sudoku_normal.128x128x16.bmp
index ce2dec5b9d..d8483eb870 100644
--- a/apps/plugins/bitmaps/native/sudoku_normal.128x128x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_normal.128x128x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_normal.160x128x16.bmp b/apps/plugins/bitmaps/native/sudoku_normal.160x128x16.bmp
index a64efb8ac6..719c55547c 100644
--- a/apps/plugins/bitmaps/native/sudoku_normal.160x128x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_normal.160x128x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_normal.220x176x16.bmp b/apps/plugins/bitmaps/native/sudoku_normal.220x176x16.bmp
index 47963758e2..a7dfe494d6 100644
--- a/apps/plugins/bitmaps/native/sudoku_normal.220x176x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_normal.220x176x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_normal.320x240x16.bmp b/apps/plugins/bitmaps/native/sudoku_normal.320x240x16.bmp
index 8cd9e29d96..07ffa3632d 100644
--- a/apps/plugins/bitmaps/native/sudoku_normal.320x240x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_normal.320x240x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_start.128x128x16.bmp b/apps/plugins/bitmaps/native/sudoku_start.128x128x16.bmp
index 74a46304e5..c3004328cc 100644
--- a/apps/plugins/bitmaps/native/sudoku_start.128x128x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_start.128x128x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_start.160x128x16.bmp b/apps/plugins/bitmaps/native/sudoku_start.160x128x16.bmp
index 361b7385a1..9d659266bc 100644
--- a/apps/plugins/bitmaps/native/sudoku_start.160x128x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_start.160x128x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_start.220x176x16.bmp b/apps/plugins/bitmaps/native/sudoku_start.220x176x16.bmp
index 5fed00b9be..58f218b696 100644
--- a/apps/plugins/bitmaps/native/sudoku_start.220x176x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_start.220x176x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/sudoku_start.320x240x16.bmp b/apps/plugins/bitmaps/native/sudoku_start.320x240x16.bmp
index b223614341..190ac520dd 100644
--- a/apps/plugins/bitmaps/native/sudoku_start.320x240x16.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_start.320x240x16.bmp
Binary files differ
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c
index fcf1566d65..9485f2de23 100644
--- a/apps/plugins/sudoku/sudoku.c
+++ b/apps/plugins/sudoku/sudoku.c
@@ -57,6 +57,7 @@ Example ".ss" file, and one with a saved state:
*/
#include "plugin.h"
+#include "lib/configfile.h"
#include "lib/oldmenuapi.h"
#ifdef HAVE_LCD_BITMAP
@@ -171,6 +172,28 @@ static const char default_game[9][9] =
#endif /* Layout */
+#define CFGFILE_VERSION 0 /* Current config file version */
+#define CFGFILE_MINVERSION 0 /* Minimum config file version to accept */
+
+#ifdef HAVE_LCD_COLOR
+/* settings */
+struct sudoku_config {
+ int number_display;
+};
+struct sudoku_config sudcfg_disk = { 0 };
+struct sudoku_config sudcfg;
+
+static const char cfg_filename[] = "sudoku.cfg";
+static char *number_str[2] = { "black", "coloured" };
+
+struct configdata disk_config[] = {
+ { TYPE_ENUM, 0, 2, &sudcfg_disk.number_display, "numbers", number_str, NULL },
+};
+#define NUMBER_TYPE (sudcfg.number_display*CELL_WIDTH)
+#else
+#define NUMBER_TYPE 0
+#endif
+
/* Size dependent build-time calculations */
#ifdef SMALL_BOARD
#define BOARD_WIDTH (CELL_WIDTH*9+10)
@@ -767,20 +790,20 @@ void update_cell(struct sudoku_state_t* state, int r, int c)
*/
if ((r==state->y) && (c==state->x)) {
- rb->lcd_bitmap_part(sudoku_inverse,0,
+ rb->lcd_bitmap_part(sudoku_inverse,NUMBER_TYPE,
BITMAP_HEIGHT*(state->currentboard[r][c]-'0'),
BITMAP_STRIDE,
XOFS+cellxpos[c],YOFS+cellypos[r],CELL_WIDTH,
CELL_HEIGHT);
} else {
if (state->startboard[r][c]!='0') {
- rb->lcd_bitmap_part(sudoku_start,0,
+ rb->lcd_bitmap_part(sudoku_start,NUMBER_TYPE,
BITMAP_HEIGHT*(state->startboard[r][c]-'0'),
BITMAP_STRIDE,
XOFS+cellxpos[c],YOFS+cellypos[r],
CELL_WIDTH,CELL_HEIGHT);
} else {
- rb->lcd_bitmap_part(sudoku_normal,0,
+ rb->lcd_bitmap_part(sudoku_normal,NUMBER_TYPE,
BITMAP_HEIGHT*(state->currentboard[r][c]-'0'),
BITMAP_STRIDE,
XOFS+cellxpos[c],YOFS+cellypos[r],
@@ -862,9 +885,9 @@ void display_board(struct sudoku_state_t* state)
YOFSSCRATCHPAD+CELL_HEIGHT+1);
#endif
if ((r>0) && state->possiblevals[state->y][state->x]&(1<<(r)))
- rb->lcd_bitmap_part(sudoku_normal,0,BITMAP_HEIGHT*r,BITMAP_STRIDE,
- XOFS+cellxpos[r-1],YOFSSCRATCHPAD+1,
- CELL_WIDTH,CELL_HEIGHT);
+ rb->lcd_bitmap_part(sudoku_normal,NUMBER_TYPE,BITMAP_HEIGHT*r,
+ BITMAP_STRIDE,XOFS+cellxpos[r-1],
+ YOFSSCRATCHPAD+1,CELL_WIDTH,CELL_HEIGHT);
}
rb->lcd_vline(XOFS+cellxpos[8]+CELL_WIDTH,YOFSSCRATCHPAD,
YOFSSCRATCHPAD+CELL_HEIGHT+1);
@@ -873,8 +896,8 @@ void display_board(struct sudoku_state_t* state)
YOFSSCRATCHPAD+CELL_HEIGHT+1);
#endif
if (state->possiblevals[state->y][state->x]&(1<<(r)))
- rb->lcd_bitmap_part(sudoku_normal,0,BITMAP_HEIGHT*r,BITMAP_STRIDE,
- XOFS+cellxpos[8],YOFSSCRATCHPAD+1,
+ rb->lcd_bitmap_part(sudoku_normal,NUMBER_TYPE,BITMAP_HEIGHT*r,
+ BITMAP_STRIDE,XOFS+cellxpos[8],YOFSSCRATCHPAD+1,
CELL_WIDTH,CELL_HEIGHT);
#else /* Horizontal layout */
rb->lcd_vline(XOFSSCRATCHPAD,YOFS,YOFS+BOARD_HEIGHT-1);
@@ -901,9 +924,9 @@ void display_board(struct sudoku_state_t* state)
YOFS+cellypos[r]-2);
#endif
if ((r>0) && state->possiblevals[state->y][state->x]&(1<<(r)))
- rb->lcd_bitmap_part(sudoku_normal,0,BITMAP_HEIGHT*r,BITMAP_STRIDE,
- XOFSSCRATCHPAD+1,YOFS+cellypos[r-1],
- CELL_WIDTH,CELL_HEIGHT);
+ rb->lcd_bitmap_part(sudoku_normal,NUMBER_TYPE,BITMAP_HEIGHT*r,
+ BITMAP_STRIDE,XOFSSCRATCHPAD+1,
+ YOFS+cellypos[r-1],CELL_WIDTH,CELL_HEIGHT);
}
rb->lcd_hline(XOFSSCRATCHPAD,XOFSSCRATCHPAD+CELL_WIDTH+1,
YOFS+cellypos[8]+CELL_HEIGHT);
@@ -912,8 +935,8 @@ void display_board(struct sudoku_state_t* state)
YOFS+cellypos[8]+CELL_HEIGHT+1);
#endif
if (state->possiblevals[state->y][state->x]&(1<<(r)))
- rb->lcd_bitmap_part(sudoku_normal,0,BITMAP_HEIGHT*r,BITMAP_STRIDE,
- XOFSSCRATCHPAD+1,YOFS+cellypos[8],
+ rb->lcd_bitmap_part(sudoku_normal,NUMBER_TYPE,BITMAP_HEIGHT*r,
+ BITMAP_STRIDE,XOFSSCRATCHPAD+1,YOFS+cellypos[8],
CELL_WIDTH,CELL_HEIGHT);
#endif /* Layout */
#endif /* SUDOKU_BUTTON_POSSIBLE */
@@ -928,7 +951,7 @@ void display_board(struct sudoku_state_t* state)
*/
if ((r==state->y) && (c==state->x)) {
- rb->lcd_bitmap_part(sudoku_inverse,0,
+ rb->lcd_bitmap_part(sudoku_inverse,NUMBER_TYPE,
BITMAP_HEIGHT*(state->currentboard[r][c]-
'0'),
BITMAP_STRIDE,
@@ -936,14 +959,14 @@ void display_board(struct sudoku_state_t* state)
CELL_WIDTH,CELL_HEIGHT);
} else {
if (state->startboard[r][c]!='0') {
- rb->lcd_bitmap_part(sudoku_start,0,
+ rb->lcd_bitmap_part(sudoku_start,NUMBER_TYPE,
BITMAP_HEIGHT*(state->startboard[r][c]-
'0'),
BITMAP_STRIDE,
XOFS+cellxpos[c],YOFS+cellypos[r],
CELL_WIDTH,CELL_HEIGHT);
} else {
- rb->lcd_bitmap_part(sudoku_normal,0,
+ rb->lcd_bitmap_part(sudoku_normal,NUMBER_TYPE,
BITMAP_HEIGHT*
(state->currentboard[r][c]-'0'),
BITMAP_STRIDE,
@@ -992,20 +1015,50 @@ bool sudoku_generate(struct sudoku_state_t* state)
return res;
}
+#ifdef HAVE_LCD_COLOR
+static bool numdisplay_setting(void)
+{
+ static const struct opt_items names[] = {
+ {"Black", -1},
+ {"Coloured", -1},
+ };
+
+ return rb->set_option("Number Display", &sudcfg.number_display, INT, names,
+ sizeof(names) / sizeof(names[0]), NULL);
+}
+#endif
+
+enum {
+ SM_AUDIO_PLAYBACK = 0,
+#ifdef HAVE_LCD_COLOR
+ SM_NUMBER_DISPLAY,
+#endif
+ SM_SAVE,
+ SM_RELOAD,
+ SM_CLEAR,
+ SM_SOLVE,
+ SM_GENERATE,
+ SM_NEW,
+ SM_QUIT,
+};
+
bool sudoku_menu(struct sudoku_state_t* state)
{
int m;
int result;
static const struct menu_item items[] = {
- { "Audio Playback", NULL },
- { "Save", NULL },
- { "Reload", NULL },
- { "Clear", NULL },
- { "Solve", NULL },
- { "Generate", NULL },
- { "New", NULL },
- { "Quit", NULL },
+ [SM_AUDIO_PLAYBACK] = { "Audio Playback", NULL },
+#ifdef HAVE_LCD_COLOR
+ [SM_NUMBER_DISPLAY] = { "Number Display", NULL },
+#endif
+ [SM_SAVE] = { "Save", NULL },
+ [SM_RELOAD] = { "Reload", NULL },
+ [SM_CLEAR] = { "Clear", NULL },
+ [SM_SOLVE] = { "Solve", NULL },
+ [SM_GENERATE] = { "Generate", NULL },
+ [SM_NEW] = { "New", NULL },
+ [SM_QUIT] = { "Quit", NULL },
};
m = menu_init(rb,items, sizeof(items) / sizeof(*items),
@@ -1014,36 +1067,41 @@ bool sudoku_menu(struct sudoku_state_t* state)
result=menu_show(m);
switch (result) {
- case 0: /* Audio playback */
+ case SM_AUDIO_PLAYBACK:
playback_control(rb);
break;
- case 1: /* Save state */
+#ifdef HAVE_LCD_COLOR
+ case SM_NUMBER_DISPLAY:
+ numdisplay_setting();
+ break;
+#endif
+ case SM_SAVE:
save_sudoku(state);
break;
- case 2: /* Restore state */
+ case SM_RELOAD:
restore_state(state);
break;
- case 3: /* Clear all */
+ case SM_CLEAR:
clear_board(state);
break;
- case 4: /* Solve */
+ case SM_SOLVE:
sudoku_solve(state);
break;
- case 5: /* Generate Game */
+ case SM_GENERATE:
sudoku_generate(state);
break;
- case 6: /* Create a new game manually */
+ case SM_NEW:
clear_state(state);
state->editmode=1;
break;
- case 7: /* Quit */
+ case SM_QUIT:
save_sudoku(state);
menu_exit(m);
return true;
@@ -1126,12 +1184,21 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
int button;
int lastbutton = BUTTON_NONE;
int res;
+ int rc = PLUGIN_OK;
long ticks;
struct sudoku_state_t state;
/* plugin init */
rb = api;
/* end of plugin init */
+
+#ifdef HAVE_LCD_COLOR
+ configfile_init(rb);
+ configfile_load(cfg_filename, disk_config,
+ sizeof(disk_config) / sizeof(disk_config[0]),
+ CFGFILE_MINVERSION);
+ rb->memcpy(&sudcfg, &sudcfg_disk, sizeof(sudcfg)); /* copy to running config */
+#endif
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL);
@@ -1173,7 +1240,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->button_clear_queue();
} else {
save_sudoku(&state);
- exit=1;
+ exit=true;
}
break;
#endif
@@ -1324,13 +1391,15 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
if (state.editmode) {
res = sudoku_edit_menu(&state);
if (res == MENU_ATTACHED_USB) {
- return PLUGIN_USB_CONNECTED;
+ rc = PLUGIN_USB_CONNECTED;
+ exit = true;
} else if (res == 1) { /* Quit */
- return PLUGIN_OK;
+ exit = true;
}
} else {
if (sudoku_menu(&state)) {
- return PLUGIN_USB_CONNECTED;
+ rc = PLUGIN_USB_CONNECTED;
+ exit = true;
}
}
}
@@ -1347,7 +1416,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
default:
if (rb->default_event_handler(button) == SYS_USB_CONNECTED) {
/* Quit if USB has been connected */
- return PLUGIN_USB_CONNECTED;
+ rc = PLUGIN_USB_CONNECTED;
+ exit = true;
}
break;
}
@@ -1356,8 +1426,16 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
display_board(&state);
}
-
- return PLUGIN_OK;
+#ifdef HAVE_LCD_COLOR
+ if (rb->memcmp(&sudcfg, &sudcfg_disk, sizeof(sudcfg))) /* save settings if changed */
+ {
+ rb->memcpy(&sudcfg_disk, &sudcfg, sizeof(sudcfg));
+ configfile_save(cfg_filename, disk_config,
+ sizeof(disk_config) / sizeof(disk_config[0]),
+ CFGFILE_VERSION);
+ }
+#endif
+ return rc;
}
#endif