Stop embedding the default theme in the executable

Now the theme is always dynamically loaded as if we used the -graphic option
hugomg · Apr 21, 2015 · eef4885 · eef4885
1 parent d64e316
commit eef4885
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,13 +2,13 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-#AC_INIT([xjump], [2.8], []) #email
 AC_INIT([xjump], [2.8], []) #email
+
 AC_CONFIG_SRCDIR([src/game.c])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile themes/Makefile])
 
 AM_INIT_AUTOMAKE
-
 
 # Checks for programs.
 AC_PROG_CC
@@ -27,4 +27,4 @@ AC_TYPE_UID_T
 AC_FUNC_ERROR_AT_LINE
 AC_CHECK_FUNCS([ftruncate])
 
-AC_OUTPUT(Makefile src/Makefile man/Makefile themes/Makefile)
+AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,5 +1,7 @@
 AM_CFLAGS   = --std=c99 --pedantic -Wall -O2
-AM_CPPFLAGS = -DRECORD_ENTRY=20 -DRECORD_FILE=\"@localstatedir@/xjump/highscores\"
+AM_CPPFLAGS = -DRECORD_ENTRY=20 \
+              -DRECORD_FILE=\"@localstatedir@/xjump/highscores\" \
+              -DGRAPH_FILE=\"$(pkgdatadir)/themes/default.xpm\"
 AM_LDFLAGS = -lXaw -lXt -lXpm -lX11
 
 bin_PROGRAMS = xjump

diff --git a/src/main.c b/src/main.c
@@ -26,7 +26,6 @@
 #include"record.h"
 #include"config.h"
 
-#include"themes/default.xpm"
 #include"icon.xbm"
 #include"icon_msk.xbm"
 
@@ -58,7 +57,7 @@ static Colormap Cmap;
 static int IntervalState;
 static XtIntervalId IntervalId;
 
-static char *GraphFile = NULL; /* For custom graphics */
+static char *GraphFile = GRAPH_FILE; /* For custom graphics */
 
 static GameState GameMode; /* 0=Title; 1=Game; 2=GameOver; 3=Pause */
 
@@ -417,20 +416,14 @@ static void option( int argc, char **argv )
 
 static void make_graphic( void )
 {
-  int i;
   XpmAttributes attr;
-
   attr.valuemask = XpmColormap;
   attr.colormap = Cmap;
 
-  if( GraphFile != NULL )
-    i = XpmReadFileToPixmap( Disp,DefaultRootWindow(Disp),GraphFile,
-                            &Char_p,&Char_m,&attr );
-    else
-      i = XpmCreatePixmapFromData( Disp,DefaultRootWindow(Disp),
-                                  picture_xpm,&Char_p,&Char_m,&attr );
-  if( i ){
-    fprintf( stderr,"%s: %s\n",Myname,XpmGetErrorString(i) );
+  int err = XpmReadFileToPixmap( Disp, DefaultRootWindow(Disp), GraphFile,
+                                 &Char_p,&Char_m,&attr );
+  if( err ){
+    fprintf( stderr,"%s: %s\n",Myname,XpmGetErrorString(err) );
     exit(1);
   }