notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Color data is dynamically stored. This will allow loading from another source (e.g., a file). By default, copies what's compiled in via colors.h.

Browse source
This commit is contained in:
William Kendrick 2006-09-10 02:05:19 +00:00
parent 4f902a3397
commit 4da9ae7c25
2 changed files with 51 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/colors.h
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - February 17, 2006 June 14, 2002 - September 9, 2006
$Id$ $Id$
*/ */
@ -50,13 +50,13 @@ enum
COLOR_BROWN, COLOR_BROWN,
COLOR_TAN, COLOR_TAN,
COLOR_BEIGE, COLOR_BEIGE,
NUM_COLORS NUM_DEFAULT_COLORS
}; };
/* Hex codes: */ /* Hex codes: */
const int color_hexes[NUM_COLORS][3] = { const int default_color_hexes[NUM_DEFAULT_COLORS][3] = {
{0, 0, 0}, /* Black */ {0, 0, 0}, /* Black */
{128, 128, 128}, /* Dark grey */ {128, 128, 128}, /* Dark grey */
{192, 192, 192}, /* Light grey */ {192, 192, 192}, /* Light grey */
@ -79,7 +79,7 @@ const int color_hexes[NUM_COLORS][3] = {
/* Color names: */ /* Color names: */
const char *const color_names[NUM_COLORS] = { const char *const default_color_names[NUM_DEFAULT_COLORS] = {
gettext_noop("Black!"), gettext_noop("Black!"),
gettext_noop("Dark grey! Some people spell it “dark gray”."), gettext_noop("Dark grey! Some people spell it “dark gray”."),
gettext_noop("Light grey! Some people spell it “light gray”."), gettext_noop("Light grey! Some people spell it “light gray”."),

52
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - September 6, 2006 June 14, 2002 - September 9, 2006
$Id$ $Id$
*/ */
@ -434,6 +434,12 @@ enum
STARTER_SCENE STARTER_SCENE
}; };
/* Color globals (copied from colors.h, if no colors specified by user) */
int NUM_COLORS;
Uint8 * * color_hexes;
char * * color_names;
/* Show debugging stuff: */ /* Show debugging stuff: */
@ -786,6 +792,7 @@ static FILE *demofi;
static const char *printcommand = PRINTCOMMAND; static const char *printcommand = PRINTCOMMAND;
static const char *altprintcommand = ALTPRINTCOMMAND; static const char *altprintcommand = ALTPRINTCOMMAND;
enum enum
{ {
UNDO_STARTER_NONE, UNDO_STARTER_NONE,
@ -968,7 +975,7 @@ static SDL_Surface *img_mouse, *img_mouse_click;
#ifdef LOW_QUALITY_COLOR_SELECTOR #ifdef LOW_QUALITY_COLOR_SELECTOR
static SDL_Surface *img_paintcan; static SDL_Surface *img_paintcan;
#else #else
static SDL_Surface *img_color_btns[NUM_COLORS * 2]; static SDL_Surface * * img_color_btns;
static SDL_Surface *img_color_btn_off; static SDL_Surface *img_color_btn_off;
#endif #endif
@ -5709,7 +5716,7 @@ static int load_user_fonts_stub(void *vp)
static void setup(int argc, char *argv[]) static void setup(int argc, char *argv[])
{ {
int i, ok_to_use_sysconfig; int i, j, ok_to_use_sysconfig;
char str[128]; char str[128];
char *upstr; char *upstr;
SDL_Color black = { 0, 0, 0, 0 }; SDL_Color black = { 0, 0, 0, 0 };
@ -6434,9 +6441,34 @@ static void setup(int argc, char *argv[])
} }
/* Load colors, or use default ones: */
if (0 == 1)
{
/* FIXME: Allow loading colors from file: */
}
else
{
NUM_COLORS = NUM_DEFAULT_COLORS;
color_hexes = malloc(sizeof(Uint8 *) * NUM_COLORS);
color_names = malloc(sizeof(char *) * NUM_COLORS);
for (i = 0; i < NUM_COLORS; i++)
{
color_hexes[i] = malloc(sizeof(Uint8 *) * 3);
for (j = 0; j < 3; j++)
color_hexes[i][j] = default_color_hexes[i][j];
color_names[i] = strdup(default_color_names[i]);
}
}
setup_screen_layout(); setup_screen_layout();
/* Set window icon and caption: */ /* Set window icon and caption: */
#ifndef __APPLE__ #ifndef __APPLE__
@ -6922,9 +6954,10 @@ static void setup(int argc, char *argv[])
/* Create surfaces to draw them into: */ /* Create surfaces to draw them into: */
img_color_btns = malloc(sizeof(SDL_Surface *) * NUM_COLORS * 2);
for (i = 0; i < NUM_COLORS * 2; i++) for (i = 0; i < NUM_COLORS * 2; i++)
{ {
img_color_btns[i] = SDL_CreateRGBSurface(screen->flags, img_color_btns[i] = SDL_CreateRGBSurface(screen->flags,
/* (WINDOW_WIDTH - 96) / NUM_COLORS, 48, */ /* (WINDOW_WIDTH - 96) / NUM_COLORS, 48, */
tmp_btn_up->w, tmp_btn_up->h, tmp_btn_up->w, tmp_btn_up->h,
@ -7465,7 +7498,7 @@ static unsigned draw_colors(unsigned action)
return old_colors_state; return old_colors_state;
old_color = cur_color; old_color = cur_color;
for (i = 0; i < NUM_COLORS; i++) for (i = 0; i < (unsigned int) NUM_COLORS; i++)
{ {
dest.x = r_colors.x + i % gd_colors.cols * color_button_w; dest.x = r_colors.x + i % gd_colors.cols * color_button_w;
dest.y = r_colors.y + i / gd_colors.cols * color_button_h; dest.y = r_colors.y + i / gd_colors.cols * color_button_h;
@ -10687,6 +10720,7 @@ static void cleanup(void)
free_surface(&img_paintcan); free_surface(&img_paintcan);
#else #else
free_surface_array(img_color_btns, NUM_COLORS * 2); free_surface_array(img_color_btns, NUM_COLORS * 2);
free(img_color_btns);
#endif #endif
free_surface(&screen); free_surface(&screen);
@ -10768,6 +10802,14 @@ static void cleanup(void)
free_cursor(&cursor_insertion); free_cursor(&cursor_insertion);
free_cursor(&cursor_rotate); free_cursor(&cursor_rotate);
for (i = 0; i < NUM_COLORS; i++)
{
free(color_hexes[i]);
free(color_names[i]);
}
free(color_hexes);
free(color_names);
/* (Just in case...) */ /* (Just in case...) */