summaryrefslogtreecommitdiffstats
path: root/hacks/glx/starwars.c
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-06 14:23:46 +0200
committerSimon Rettberg2021-04-06 14:23:46 +0200
commit26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9 (patch)
treea51e1637554bcd84e63cccb1cb220c898a2c4ee8 /hacks/glx/starwars.c
parent5.44 (diff)
downloadxscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.tar.gz
xscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.tar.xz
xscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.zip
xscreensaver 6.00
Diffstat (limited to 'hacks/glx/starwars.c')
-rw-r--r--hacks/glx/starwars.c25
1 files changed, 9 insertions, 16 deletions
diff --git a/hacks/glx/starwars.c b/hacks/glx/starwars.c
index 0f1457a..fbdf39d 100644
--- a/hacks/glx/starwars.c
+++ b/hacks/glx/starwars.c
@@ -25,18 +25,6 @@
* starwars -program 'cat starwars.txt' -columns 25 -no-wrap
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#include <ctype.h>
-#include <sys/stat.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include "starwars.h"
#define DEFAULTS "*delay: 40000 \n" \
"*showFPS: False \n" \
"*fpsTop: True \n" \
@@ -48,12 +36,18 @@
# define release_sws 0
# define sws_handle_event xlockmore_no_events
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
#include "xlockmore.h"
#include "textclient.h"
#include "utf8wc.h"
+#include "starwars.h"
+
+#include <ctype.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef USE_GL /* whole file */
@@ -79,8 +73,7 @@
#define DEF_FADE "True"
#define DEF_TEXTURES "True"
#define DEF_DEBUG "False"
-
-#define DEF_FONT "-*-utopia-bold-r-normal-*-*-360-*-*-*-*-*-*"
+#define DEF_FONT "sans-serif 36"
#define TAB_WIDTH 8