rixty
/
bygfoot
mirror of https://github.com/tstellar/bygfoot.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Only add pixmap directories when using gtk2 

add_pixmap_directory() assumes an X display is available.
This commit is contained in:
Tom Stellard 2020-12-13 14:56:19 -08:00 committed by Tom Stellard
parent e7ff2f9d4d
commit b060b141cc
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/callbacks.c
View File

@ -579,6 +579,7 @@ G_MODULE_EXPORT void
on_menu_new_activate (GtkMenuItem *menuitem, on_menu_new_activate (GtkMenuItem *menuitem,
gpointer user_data) gpointer user_data)
{ {
Bygfoot *bygfoot = (Bygfoot*)user_data;
#ifdef DEBUG #ifdef DEBUG
printf("on_menu_new_activate\n"); printf("on_menu_new_activate\n");
#endif #endif
@ -586,7 +587,7 @@ on_menu_new_activate (GtkMenuItem *menuitem,
window_destroy(&window.main); window_destroy(&window.main);
free_memory(); free_memory();
main_init(NULL, NULL); main_init(NULL, NULL, bygfoot);
window_show_startup(user_data); window_show_startup(user_data);
stat0 = STATUS_TEAM_SELECTION; stat0 = STATUS_TEAM_SELECTION;
statp = NULL; statp = NULL;

7
src/file.c
View File

@ -76,7 +76,7 @@ void add_definitions_directory(const gchar *directory)
@see #support_directories @see #support_directories
*/ */
void void
file_add_support_directory_recursive (const gchar *directory) file_add_support_directory_recursive(Bygfoot *bygfoot, const gchar *directory)
{ {
#ifdef DEBUG #ifdef DEBUG
printf("file_add_support_directory_recursive\n"); printf("file_add_support_directory_recursive\n");
@ -98,7 +98,8 @@ file_add_support_directory_recursive (const gchar *directo
} }
add_definitions_directory(directory); add_definitions_directory(directory);
add_pixmap_directory(directory); if (bygfoot->frontend == BYGFOOT_FRONTEND_GTK2)
add_pixmap_directory(directory);
support_directories = g_list_prepend (support_directories, support_directories = g_list_prepend (support_directories,
g_strdup (directory)); g_strdup (directory));
while(TRUE) while(TRUE)
@ -112,7 +113,7 @@ file_add_support_directory_recursive (const gchar *directo
G_DIR_SEPARATOR_S, file); G_DIR_SEPARATOR_S, file);
if(g_file_test(fullpath, G_FILE_TEST_IS_DIR)) if(g_file_test(fullpath, G_FILE_TEST_IS_DIR))
file_add_support_directory_recursive(fullpath); file_add_support_directory_recursive(bygfoot, fullpath);
g_free(fullpath); g_free(fullpath);
} }

2
src/file.h
View File

@ -39,7 +39,7 @@
#endif #endif
void void
file_add_support_directory_recursive (const gchar *directory); file_add_support_directory_recursive(Bygfoot *bygfoot, const gchar *directory);
gchar* gchar*
file_find_support_file (const gchar *filename, gboolean warning); file_find_support_file (const gchar *filename, gboolean warning);

20
src/main.c
View File

@ -72,7 +72,7 @@ gboolean load_last_save;
/** Parse the command line arguments given by the user. */ /** Parse the command line arguments given by the user. */
void void
main_parse_cl_arguments(gint *argc, gchar ***argv) main_parse_cl_arguments(gint *argc, gchar ***argv, Bygfoot *bygfoot)
{ {
#ifdef DEBUG #ifdef DEBUG
printf("main_parse_cl_arguments\n"); printf("main_parse_cl_arguments\n");
@ -163,7 +163,7 @@ main_parse_cl_arguments(gint *argc, gchar ***argv)
gchar *fullpath = (support_dir[strlen(support_dir)] == G_DIR_SEPARATOR) ? gchar *fullpath = (support_dir[strlen(support_dir)] == G_DIR_SEPARATOR) ?
g_path_get_dirname(support_dir) : g_path_get_dirname(support_dir) :
g_strdup_printf("%s%s", support_dir, G_DIR_SEPARATOR_S); g_strdup_printf("%s%s", support_dir, G_DIR_SEPARATOR_S);
file_add_support_directory_recursive(fullpath); file_add_support_directory_recursive(bygfoot, fullpath);
g_free(fullpath); g_free(fullpath);
g_free(support_dir); g_free(support_dir);
} }
@ -346,7 +346,7 @@ static void validate_country_file(gpointer country_file, gpointer user_data)
@param argv Command line arguments array. @param argv Command line arguments array.
*/ */
void void
main_init(gint *argc, gchar ***argv) main_init(gint *argc, gchar ***argv, Bygfoot *bygfoot)
{ {
#ifdef DEBUG #ifdef DEBUG
printf("main_init\n"); printf("main_init\n");
@ -367,28 +367,28 @@ main_init(gint *argc, gchar ***argv)
#endif #endif
#if defined(G_OS_UNIX) && !defined(MAC_BUILD) #if defined(G_OS_UNIX) && !defined(MAC_BUILD)
file_add_support_directory_recursive(PACKAGE_DATA_DIR "/" PACKAGE "/support_files"); file_add_support_directory_recursive(bygfoot, PACKAGE_DATA_DIR "/" PACKAGE "/support_files");
sprintf(buf, "%s%s%s", g_get_home_dir(), G_DIR_SEPARATOR_S, HOMEDIRNAME); sprintf(buf, "%s%s%s", g_get_home_dir(), G_DIR_SEPARATOR_S, HOMEDIRNAME);
file_add_support_directory_recursive(buf); file_add_support_directory_recursive(bygfoot, buf);
#endif #endif
#ifndef MAC_BUILD #ifndef MAC_BUILD
dir = g_get_current_dir(); dir = g_get_current_dir();
sprintf(buf, "%s%ssupport_files", dir, G_DIR_SEPARATOR_S); sprintf(buf, "%s%ssupport_files", dir, G_DIR_SEPARATOR_S);
file_add_support_directory_recursive(buf); file_add_support_directory_recursive(bygfoot, buf);
sprintf(buf, "%s%ssaves", dir, G_DIR_SEPARATOR_S); sprintf(buf, "%s%ssaves", dir, G_DIR_SEPARATOR_S);
file_add_support_directory_recursive(buf); file_add_support_directory_recursive(bygfoot, buf);
g_free(dir); g_free(dir);
#else #else
dir = file_get_mac_resource_path("support_files"); dir = file_get_mac_resource_path("support_files");
file_add_support_directory_recursive(dir); file_add_support_directory_recursive(bygfoot, dir);
#endif #endif
main_init_variables(); main_init_variables();
load_last_save = FALSE; load_last_save = FALSE;
main_parse_cl_arguments(argc, argv); main_parse_cl_arguments(argc, argv, bygfoot);
/* Validate XML */ /* Validate XML */
country_files = file_get_country_files(); country_files = file_get_country_files();
@ -427,7 +427,7 @@ main (gint argc, gchar *argv[])
bygfoot_init(&bygfoot, BYGFOOT_FRONTEND_GTK2); bygfoot_init(&bygfoot, BYGFOOT_FRONTEND_GTK2);
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
main_init(&argc, &argv); main_init(&argc, &argv, &bygfoot);
if((load_last_save && !load_game_from_command_line(&bygfoot, "last_save")) || if((load_last_save && !load_game_from_command_line(&bygfoot, "last_save")) ||
(!load_last_save && (argc == 1 || (!load_last_save && (argc == 1 ||

4
src/main.h
View File

@ -29,7 +29,7 @@
#include "bygfoot.h" #include "bygfoot.h"
void void
main_init(gint *argc, gchar ***argv); main_init(gint *argc, gchar ***argv, Bygfoot *bygfoot);
void void
main_init_variables(void); main_init_variables(void);
@ -44,6 +44,6 @@ main_exit_program(gint exit_code, gchar *format, ...);
#endif #endif
void void
main_parse_cl_arguments(gint *argc, gchar ***argv); main_parse_cl_arguments(gint *argc, gchar ***argv, Bygfoot *bygfoot);
#endif #endif