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

savedir/datadir neatened up

Browse source
This commit is contained in:
Albert Cahalan 2009-11-21 09:44:11 +00:00
parent a9b8f6ea1c
commit dd90d90624
4 changed files with 149 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/cursor.c
View file

@ -36,7 +36,18 @@ SDL_Cursor *cursor_hand, *cursor_arrow, *cursor_watch,
*cursor_up, *cursor_down, *cursor_tiny, *cursor_crosshair, *cursor_up, *cursor_down, *cursor_tiny, *cursor_crosshair,
*cursor_brush, *cursor_wand, *cursor_insertion, *cursor_rotate; *cursor_brush, *cursor_wand, *cursor_insertion, *cursor_rotate;
int no_fancy_cursors, hide_cursor; #ifdef NOKIA_770
int hide_cursor = 1;
#else
int hide_cursor;
#endif
#if defined(NOKIA_770) || defined(__BEOS__)
// Fancy cursors on BeOS are buggy in SDL
int no_fancy_cursors = 1;
#else
int no_fancy_cursors;
#endif
void do_setcursor(SDL_Cursor * c) void do_setcursor(SDL_Cursor * c)
{ {

4
src/fonts.c
View file

@ -119,7 +119,11 @@ SDL_Thread *font_thread;
#endif #endif
#ifdef FORKED_FONTS
int no_system_fonts; int no_system_fonts;
#else
int no_system_fonts = 1;
#endif
int all_locale_fonts; int all_locale_fonts;
volatile long font_thread_done = 0, font_thread_aborted = 0; volatile long font_thread_done = 0, font_thread_aborted = 0;
volatile long waiting_for_fonts = 0; volatile long waiting_for_fonts = 0;

3
src/playsound.c
View file

@ -29,7 +29,8 @@
Mix_Chunk *sounds[NUM_SOUNDS]; Mix_Chunk *sounds[NUM_SOUNDS];
#endif #endif
int mute, use_sound; int mute;
int use_sound = 1;
int old_sound[4] = { -1, -1, -1, -1 }; int old_sound[4] = { -1, -1, -1, -1 };
void playsound(SDL_Surface * screen, int chan, int s, int override, int x, void playsound(SDL_Surface * screen, int chan, int s, int override, int x,

344
src/tuxpaint.c
View file

@ -607,7 +607,17 @@ static grid_dims gd_colors; /* was 17x1 */
#define THUMB_W ((WINDOW_WIDTH - 96 - 96) / 4) #define THUMB_W ((WINDOW_WIDTH - 96 - 96) / 4)
#define THUMB_H (((48 * 7 + 40 + HEIGHTOFFSET) - 72) / 4) #define THUMB_H (((48 * 7 + 40 + HEIGHTOFFSET) - 72) / 4)
static int WINDOW_WIDTH, WINDOW_HEIGHT; #ifdef NOKIA_770
static int WINDOW_WIDTH = 800;
static int WINDOW_HEIGHT = 480;
#elif defined(OLPC_XO)
// ideally we'd support rotation and 2x scaling
static int WINDOW_WIDTH = 1200;
static int WINDOW_HEIGHT = 900;
#else
static int WINDOW_WIDTH = 800;
static int WINDOW_HEIGHT = 600;
#endif
void magic_putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel); void magic_putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel);
Uint32 magic_getpixel(SDL_Surface * surface, int x, int y); Uint32 magic_getpixel(SDL_Surface * surface, int x, int y);
@ -855,7 +865,11 @@ static int grid_hit_gd(const SDL_Rect * const r, unsigned x, unsigned y,
/* One global variable defined here so that update_canvas() need not be moved below */ /* One global variable defined here so that update_canvas() need not be moved below */
#if VIDEO_BPP != 32
static int disable_label = 1;
#else
static int disable_label; static int disable_label;
#endif
/* Update the screen with the new canvas: */ /* Update the screen with the new canvas: */
static void update_canvas(int x1, int y1, int x2, int y2) static void update_canvas(int x1, int y1, int x2, int y2)
@ -893,58 +907,88 @@ static void update_canvas(int x1, int y1, int x2, int y2)
/* Globals: */ /* Globals: */
static int static int disable_screensaver;
disable_screensaver, fullscreen, native_screensize, grab_input, #ifdef NOKIA_770
rotate_orientation, static int fullscreen = 1;
#else
static int fullscreen;
#endif
static int native_screensize;
static int grab_input;
static int rotate_orientation;
disable_print, print_delay, use_print_config, alt_print_command_default, static int disable_print;
want_alt_printcommand, static int print_delay;
static int use_print_config = 1;
static int alt_print_command_default = ALTPRINT_MOD;
static int want_alt_printcommand;
wheely, keymouse, mouse_x, mouse_y, static int wheely = 1;
no_button_distinction, static int keymouse;
mousekey_up, mousekey_down, mousekey_left, mousekey_right, static int mouse_x;
button_down, static int mouse_y;
scrolling, static int no_button_distinction;
static int mousekey_up;
static int mousekey_down;
static int mousekey_left;
static int mousekey_right;
static int button_down;
static int scrolling;
promptless_save, disable_quit, static int promptless_save = SAVE_OVER_PROMPT;
static int disable_quit;
noshortcuts, static int noshortcuts;
disable_save, ok_to_use_lockfile, static int disable_save;
start_blank, autosave_on_quit, static int ok_to_use_lockfile = 1;
static int start_blank;
static int autosave_on_quit;
dont_do_xor, dont_load_stamps, mirrorstamps, disable_stamp_controls, static int dont_do_xor;
stamp_size_override, static int dont_load_stamps;
static int mirrorstamps;
static int disable_stamp_controls;
static int stamp_size_override = -1;
simple_shapes, only_uppercase, #ifdef NOKIA_770
static int simple_shapes = 1;
#else
static int simple_shapes;
#endif
static int only_uppercase;
disable_magic_controls; static int disable_magic_controls;
static int starter_mirrored, starter_flipped, starter_personal; static int starter_mirrored;
static int starter_flipped;
static int starter_personal;
static int template_personal; static int template_personal;
static Uint8 canvas_color_r, canvas_color_g, canvas_color_b; static Uint8 canvas_color_r, canvas_color_g, canvas_color_b;
Uint8 * touched; Uint8 * touched;
int shape_radius; int shape_radius;
/* Text label tool struct to hold information about text on the label layer */ /* Text label tool struct to hold information about text on the label layer */
typedef struct label_node { typedef struct label_node
unsigned int save_texttool_len; {
wchar_t save_texttool_str[256]; unsigned int save_texttool_len;
unsigned save_color; wchar_t save_texttool_str[256];
int save_width; unsigned save_color;
int save_height; int save_width;
Uint16 save_x; int save_height;
Uint16 save_y; Uint16 save_x;
int save_cur_font; Uint16 save_y;
int save_cur_font;
char * save_font_type; char * save_font_type;
int save_text_state; int save_text_state;
unsigned save_text_size; unsigned save_text_size;
int save_undoid; int save_undoid;
int is_enabled; int is_enabled;
struct label_node* disables; struct label_node* disables;
struct label_node* next_to_up_label_node; struct label_node* next_to_up_label_node;
struct label_node* next_to_down_label_node; struct label_node* next_to_down_label_node;
SDL_Surface* label_node_surface; SDL_Surface* label_node_surface;
} label_node; } label_node;
@ -18891,7 +18935,6 @@ static void parse_file_options(struct cfginfo *restrict tmpcfg, const char *file
static void parse_argv_options(struct cfginfo *restrict tmpcfg, char *argv[]) static void parse_argv_options(struct cfginfo *restrict tmpcfg, char *argv[])
{ {
const char *progname = argv[0];
char *str; char *str;
/* FIXME: Bring back support for single-dash options: /* FIXME: Bring back support for single-dash options:
@ -18958,196 +19001,52 @@ static void setup_config(char *argv[])
struct cfginfo tmpcfg_cmd; struct cfginfo tmpcfg_cmd;
memset(&tmpcfg_cmd, '\0', sizeof tmpcfg_cmd); memset(&tmpcfg_cmd, '\0', sizeof tmpcfg_cmd);
struct cfginfo tmpcfg = struct cfginfo tmpcfg;
{ memset(&tmpcfg, '\0', sizeof tmpcfg);
.all_locale_fonts = "",
.alt_print_command_default = "",
.altprintcommand = "",
.autosave_on_quit = "",
.colorfile = "",
.datadir = "",
.disable_label = "",
.disable_magic_controls = PARSE_NO,
.disable_print = PARSE_NO,
.disable_quit = PARSE_NO,
.disable_save = PARSE_NO,
.disable_screensaver = PARSE_NO,
.disable_stamp_controls = "",
.dont_do_xor = PARSE_NO,
.dont_load_stamps = PARSE_NO,
.fullscreen = PARSE_NO,
.grab_input = "",
.hide_cursor = "",
.keymouse = "",
.mirrorstamps = "",
.native_screensize = "",
.no_button_distinction = "",
.no_fancy_cursors = "",
.no_system_fonts = "",
.noshortcuts = "",
.ok_to_use_lockfile = "",
.only_uppercase = "",
.papersize = "",
.parsertmp_fullscreen_native = "",
.parsertmp_lang = "",
.parsertmp_locale = "",
.parsertmp_sysconfig = "",
.parsertmp_windowsize = "",
.print_delay = "",
.printcommand = "",
.promptless_save = "",
.rotate_orientation = "",
.savedir = "",
.simple_shapes = "",
.stamp_size_override = "",
.start_blank = "",
.use_print_config = "",
.use_sound = PARSE_YES,
.wheely = "",
};
/* Set default options: */
use_sound = 1;
#ifdef NOKIA_770
fullscreen = 1;
#else
fullscreen = 0;
#endif
disable_screensaver = 0;
dont_do_xor = 0;
grab_input = 0;
keymouse = 0;
native_screensize = 0;
no_button_distinction = 0;
noshortcuts = 0;
rotate_orientation = 0;
wheely = 1;
#ifdef NOKIA_770
hide_cursor = 1;
no_fancy_cursors = 1;
simple_shapes = 1;
#else
hide_cursor = 0;
no_fancy_cursors = 0;
simple_shapes = 0;
#endif
all_locale_fonts = 0;
alt_print_command_default = ALTPRINT_MOD;
autosave_on_quit = 0;
disable_magic_controls = 0;
disable_print = 0;
disable_quit = 0;
disable_save = 0;
disable_stamp_controls = 0;
dont_load_stamps = 0;
mirrorstamps = 0;
no_system_fonts = 1;
only_uppercase = 0;
print_delay = 0;
promptless_save = SAVE_OVER_PROMPT;
stamp_size_override = -1;
use_print_config = 1;
if(VIDEO_BPP != 32)
disable_label = 1;
else
disable_label = 0;
#ifndef WINDOW_WIDTH
WINDOW_WIDTH = 800;
WINDOW_HEIGHT = 600;
#endif
#ifdef NOKIA_770
WINDOW_WIDTH = 800;
WINDOW_HEIGHT = 480;
#endif
#ifdef OLPC_XO
/* ideally we'd support rotation and 2x scaling */
WINDOW_WIDTH = 1200;
WINDOW_HEIGHT = 900;
#endif
colorfile[0] = '\0';
ok_to_use_lockfile = 1;
start_blank = 0;
#ifdef __BEOS__
/* Fancy cursors on BeOS are buggy in SDL */
no_fancy_cursors = 1;
#endif
#ifdef WIN32
/* Windows */
savedir = GetDefaultSaveDir("TuxPaint");
datadir = GetDefaultSaveDir("TuxPaint");
#elif __BEOS__
/* BeOS */
savedir = strdup("./userdata");
datadir = strdup("./userdata");
#elif __APPLE__
/* Mac OS X */
savedir = strdup(macosx.preferencesPath);
datadir = strdup(macosx.preferencesPath);
#else
/* Linux */
if (getenv("HOME") != NULL)
{
char tmp[MAX_PATH];
snprintf(tmp, MAX_PATH, "%s/%s", getenv("HOME"), ".tuxpaint");
savedir = strdup(tmp);
datadir = strdup(tmp);
}
else
{
/* Woah, don't know where $HOME is? */
fprintf(stderr, "Error: You have no $HOME environment variable!\n");
exit(1);
}
#endif
parse_argv_options(&tmpcfg_cmd, argv); parse_argv_options(&tmpcfg_cmd, argv);
/* Set default options: */
const char *home = getenv("HOME");
if(!home)
{
/* Woah, don't know where $HOME is? */
fprintf(stderr, "Error: You have no $HOME environment variable!\n");
exit(1);
}
if(tmpcfg_cmd.savedir)
savedir = strdup(tmpcfg_cmd.savedir);
else
{
#ifdef _WIN32
savedir = GetDefaultSaveDir("TuxPaint");
#elif __BEOS__
savedir = strdup("./userdata");
#elif __APPLE__
savedir = strdup(macosx.preferencesPath);
#else
asprintf(&savedir, "%s/%s", home, ".tuxpaint");
#endif
}
/* Load options from user's own configuration (".rc" / ".cfg") file: */ /* Load options from user's own configuration (".rc" / ".cfg") file: */
#if defined(WIN32) #if defined(_WIN32)
/* Default local config file in users savedir directory on Windows */ /* Default local config file in users savedir directory on Windows */
snprintf(str, sizeof(str), "%s/tuxpaint.cfg", savedir); /* FIXME */ snprintf(str, sizeof(str), "%s/tuxpaint.cfg", savedir); /* FIXME */
#elif defined(__BEOS__) #elif defined(__BEOS__)
/* BeOS: Use a "tuxpaint.cfg" file: */ /* BeOS: Use a "tuxpaint.cfg" file: */
strcpy(str, "tuxpaint.cfg"); strcpy(str, "tuxpaint.cfg");
#elif defined(__APPLE__) #elif defined(__APPLE__)
/* Mac OS X: Use a "tuxpaint.cfg" file in the Tux Paint application support folder */ /* Mac OS X: Use a "tuxpaint.cfg" file in the Tux Paint application support folder */
snprintf(str, sizeof(str), "%s/tuxpaint.cfg", macosx.preferencesPath); snprintf(str, sizeof(str), "%s/tuxpaint.cfg", macosx.preferencesPath);
#else #else
/* Linux and other Unixes: Use 'rc' style (~/.tuxpaintrc) */ /* Linux and other Unixes: Use 'rc' style (~/.tuxpaintrc) */
// it should it be "~/.tuxpaint/tuxpaintrc" instead, but too late now
if (getenv("HOME") != NULL) snprintf(str, sizeof(str), "%s/.tuxpaintrc", home);
{
/* Should it be "~/.tuxpaint/tuxpaintrc" instead???
Comments welcome ... bill@newbreedsoftware.com */
snprintf(str, sizeof(str), "%s/.tuxpaintrc", getenv("HOME"));
}
else
{
/* WOAH! We don't know what our home directory is!? Last resort,
do it Windows/BeOS way: */
strcpy(str, "tuxpaint.cfg");
}
#endif #endif
parse_file_options(&tmpcfg_usr, str); parse_file_options(&tmpcfg_usr, str);
@ -19155,8 +19054,6 @@ static void setup_config(char *argv[])
tmpcfg_merge(&tmpcfg_usr, &tmpcfg_cmd); tmpcfg_merge(&tmpcfg_usr, &tmpcfg_cmd);
if (tmpcfg_usr.parsertmp_sysconfig != PARSE_NO) if (tmpcfg_usr.parsertmp_sysconfig != PARSE_NO)
{ {
struct cfginfo tmpcfg_sys; struct cfginfo tmpcfg_sys;
@ -19172,8 +19069,29 @@ static void setup_config(char *argv[])
} }
tmpcfg_merge(&tmpcfg, &tmpcfg_usr); tmpcfg_merge(&tmpcfg, &tmpcfg_usr);
if(tmpcfg.savedir)
{
free(savedir);
savedir = tmpcfg.savedir;
}
datadir = tmpcfg.datadir ? tmpcfg.datadir : savedir;
if(tmpcfg.parsertmp_lang)
set_langstr(tmpcfg.parsertmp_lang);
if(tmpcfg.parsertmp_locale)
do_locale_option(tmpcfg.parsertmp_locale);
#if 0
all_locale_fonts
no_system_fonts
parsertmp_windowsize
parsertmp_fullscreen_native
if(tmpcfg_cmd.papersize && !strcmp(tmpcfg_cmd.papersize, "help"))
show_available_papersizes(0);
#endif
} }
static void chdir_to_binary(char *argv0) static void chdir_to_binary(char *argv0)