rpms/xgalaxy/devel xgalaxy-2.0.34-fullscreen.patch, 1.2, 1.3 xgalaxy-2.0.34-xgalaxy.patch, 1.2, 1.3 xgalaxy.spec, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed May 31 20:42:33 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/xgalaxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21202
Modified Files:
xgalaxy-2.0.34-fullscreen.patch xgalaxy-2.0.34-xgalaxy.patch
xgalaxy.spec
Log Message:
* Mon May 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.34-3
- Fixed ships not being centered when flying in in level 1
- Fixed artifacts (ships not yet on screen showing) in level 2
- Added -winsize widthxheight option, which can be used to specify an
alternative window size
- Documented the -level, -window, -winsize switch in the manpage.
xgalaxy-2.0.34-fullscreen.patch:
Index: xgalaxy-2.0.34-fullscreen.patch
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-fullscreen.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xgalaxy-2.0.34-fullscreen.patch 31 May 2006 15:16:41 -0000 1.2
+++ xgalaxy-2.0.34-fullscreen.patch 31 May 2006 20:42:33 -0000 1.3
@@ -1,50 +1,199 @@
---- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/struct.h 2006-05-31 16:56:50.000000000 +0200
-@@ -55,6 +55,8 @@
- W_Callback handle_button;
- W_Callback handle_expose;
- #endif /* 0 */
-+ W_Window wm_window;
-+ Window fs_window;
- };
+--- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200
++++ xgalaga-2.0.34/Wproto.h 2006-05-31 22:28:06.000000000 +0200
+@@ -63,6 +63,7 @@
+ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
+ W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
+ void W_SetIconWindow(W_Window win, W_Window icon);
++void W_ToggleFullscreen(W_Window win);
+ /* point.c */
+ void W_DrawPoint(W_Window window, int x, int y, W_Color color);
+ void FlushPointCache(Window win, int color);
+--- xgalaga-2.0.34/data.h.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/data.h 2006-05-31 22:28:06.000000000 +0200
+@@ -35,6 +35,9 @@
+ extern int mouseControl;
+ extern int wantStars;
- struct stringList {
---- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-31 16:56:50.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/data.c 2006-05-31 16:56:50.000000000 +0200
-@@ -158,3 +158,6 @@
++extern int winwidth;
++extern int winheight;
++
+ extern int alien_shape[];
- int useBuffered = 1;
+ extern int weapon;
+--- xgalaga-2.0.34/main.c.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/main.c 2006-05-31 22:28:06.000000000 +0200
+@@ -32,6 +32,7 @@
+ static int attacking = 0, maxattacking, entering=0;
+ static int maxetorps = 5, numetorps=0;
+ static int plflash = 50;
++static int fullscreen = 0;
+ #ifndef ORIGINAL_XGALAGA
+ static int shots = 0;
+ static int hits = 0;
+@@ -63,10 +64,14 @@
+ xgal_exit(int v)
+ {
+ /* W_AutoRepeatOn();*/
++ /* Destroy our main window so the fullscreen mode gets unset if we're
++ running fullscreen. (We should really clean up much more here!) */
++ W_DestroyWindow(shellWin);
+ #ifdef SOUND
+ kill_sound();
+ #endif
+ /* sleep(1);*/ /* Without this, the auto-repeat request fails on my machine... */
++ /* Note if we ever need this autorepeat thingie again, the sleep can and should be replaced by a call to XSync() */
+ exit(v);
+ }
-+#ifdef XF86VIDMODE
-+struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 };
-+#endif
---- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-31 16:56:50.000000000 +0200
-@@ -91,6 +91,22 @@
+@@ -89,6 +94,8 @@
+ -mouse Use mouse control (same as 'm' at the title screen)\n\
+ -keyboard Use keyboard control (same as 'k')\n%s\
+ -level <number> Choose starting level (>= 1)\n\
++-window Start in windowed mode instead of fullscreen\n\
++-winsize <WxH> Window size (default 468 x 596)\n\
+ -b turn buffered mode off, use this if it runs\n\
+ too slowly. Will cause flicker, maybe lots,\n\
+ maybe only a little.\n\
+@@ -100,7 +107,8 @@
+ p - pauses\n\
+ q - end this game\n\
+ b - Toggle buffering (flicker vs. speed.)\n\
+-o - Toggle OR mode. Don't use this, it sucks.\n", VERSION,
++o - Toggle OR mode. Don't use this, it sucks.\n\
++alt + enter - Toggle fullscreen - window\n", VERSION,
+ PRINT_SOUND
+ );
+ }
+@@ -470,8 +478,8 @@
+ if(convoyx <= 0) {
+ convoyx=0;
+ convoymove = -convoymove;
+- } else if(convoyx >= WINWIDTH/2) {
+- convoyx = WINWIDTH/2;
++ } else if(convoyx >= (WINWIDTH-180)) {
++ convoyx = WINWIDTH - 180;
+ convoymove = -convoymove;
+ }
+ }
+@@ -844,6 +852,14 @@
+ case 'm':
+ mouseControl = 2;
+ break;
++ case '\r'+256:
++ W_ToggleFullscreen(shellWin);
++ fullscreen = !fullscreen;
++ if (fullscreen)
++ W_BlankCursor(baseWin);
++ else
++ W_RevertCursor(baseWin);
++ break;
+ default:
+ break;
+ }
+@@ -997,6 +1013,14 @@
+ maxtorps = MINTORPS;
+ break;
+ #endif /* IM_A_BIG_FAT_CHEATER */
++ case '\r'+256:
++ W_ToggleFullscreen(shellWin);
++ fullscreen = !fullscreen;
++ if (fullscreen)
++ W_BlankCursor(baseWin);
++ else
++ W_RevertCursor(baseWin);
++ break;
+ default:
+ break;
+ }
+@@ -1214,9 +1238,11 @@
+ int ac;
+ char *dpyname = 0;
+ int mx, my, but;
++ int start_fullscreen = 1;
+
+ for(ac = 1; ac < argc; ac++) {
+ if(*argv[ac] == '-') {
++ int w, h;
+ if(strcmp(argv[ac], "-scores") == 0) {
+ print_scores();
+ exit(0);
+@@ -1245,6 +1271,12 @@
+ useOR = 0;
+ } else if (strcmp(argv[ac], "-noclipmask") == 0) {
+ useClipMask = 0;
++ } else if (strcmp(argv[ac], "-window") == 0) {
++ start_fullscreen = 0;
++ } else if ((strcmp(argv[ac], "-winsize") == 0) && (++ac < argc) &&
++ (sscanf(argv[ac], "%dx%d", &w, &h) == 2)) {
++ WINWIDTH = w;
++ WINHEIGHT = h;
+ } else {
+ print_usage();
+ exit(0);
+@@ -1258,11 +1290,18 @@
+ W_Initialize(dpyname);
- extern int autoPoint, W_KeyDepth, animPointers, useWorkbench;
- extern unsigned long w_socket;
-+
-+/* For XF86VIDMODE Support */
-+#ifdef XF86VIDMODE
-+#include <X11/extensions/xf86dga.h>
-+#include <X11/extensions/xf86vmode.h>
-+
-+struct xf86vidmode_data {
-+ int vidmode_available;
-+ XF86VidModeModeInfo orig_mode;
-+ int orig_viewport_x;
-+ int orig_viewport_y;
-+};
-+
-+extern struct xf86vidmode_data XF86VidModeData;
-+#endif
+ backColor = W_Black;
++ WINHEIGHT -= (W_Textheight+1);
+ shellWin = W_MakeWindow("XGalaga", 0, 0, WINWIDTH, WINHEIGHT + W_Textheight+1, 0, "tiny", 0, W_White);
+ baseWin = W_MakeWindow("", 0, W_Textheight+1, WINWIDTH, WINHEIGHT, shellWin, "tiny", 0, W_White);
+ W_Buffer(shellWin, 0);
+ W_MapWindow(shellWin);
+ W_MapWindow(baseWin);
++ if (start_fullscreen)
++ {
++ W_ToggleFullscreen(shellWin);
++ W_BlankCursor(baseWin);
++ fullscreen = 1;
++ }
+
+ /* W_AutoRepeatOff();*/
+
+--- xgalaga-2.0.34/paths.c.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/paths.c 2006-05-31 22:30:58.000000000 +0200
+@@ -159,6 +159,8 @@
+ { 6,80, -1,-1, },
+ };
+
++/* These aren't used anymore! (see filepath.c) Maybe we should nuke them? */
++#if 0
+ /* enter_paths are for new ships. consists of starting co-ordinates, number of frames
+ to wait at the start (presumably offscreen) and a path to follow.
+ path -1 means this ship is not used on this level
+@@ -1159,6 +1161,8 @@
+ },
+ };
+
++#endif /* This isn't used anymore! Maybe we should nuke it */
+
- #endif /* AMIGA */
+ void path_dir(int path, int pos, int *dir, int *steer)
+ {
+ *dir = paths[path][pos][0];
+--- xgalaga-2.0.34/pathfile.c.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/pathfile.c 2006-05-31 22:28:06.000000000 +0200
+@@ -387,8 +387,8 @@
- #if 0
+ void get_xy(int anum, int* x, int* y)
+ {
+- *x = pathinfo[al_paths[anum]].startx;
+- *y = pathinfo[al_paths[anum]].starty;
++ *x = (WINWIDTH * pathinfo[al_paths[anum]].startx) / 400;
++ *y = (WINHEIGHT * pathinfo[al_paths[anum]].starty) / 500;
+ }
+
+ int get_delay(int anum)
+--- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200
++++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-31 22:28:06.000000000 +0200
+@@ -63,6 +63,7 @@
+ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
+ W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
+ void W_SetIconWindow(W_Window win, W_Window icon);
++void W_ToggleFullscreen(W_Window win);
+ /* point.c */
+ void W_DrawPoint(W_Window window, int x, int y, W_Color color);
+ void FlushPointCache(Window win, int color);
--- xgalaga-2.0.34/libsprite/mapwindow.c.fs 1998-04-12 08:03:22.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-31 16:56:50.000000000 +0200
++++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-31 22:28:06.000000000 +0200
@@ -13,6 +13,8 @@
if(win->type != WIN_BORDER && win->borderwin) {
W_MapWindow(win->borderwin);
@@ -90,52 +239,53 @@
}
void
---- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-31 16:56:50.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/init.c 2006-05-31 16:56:50.000000000 +0200
-@@ -356,6 +356,31 @@
- XFreeModifiermap(m);
- }
+--- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200
++++ xgalaga-2.0.34/libsprite/struct.h 2006-05-31 22:28:06.000000000 +0200
+@@ -55,6 +55,8 @@
+ W_Callback handle_button;
+ W_Callback handle_expose;
+ #endif /* 0 */
++ W_Window wm_window;
++ Window fs_window;
+ };
+
+ struct stringList {
+--- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200
++++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-31 22:28:06.000000000 +0200
+@@ -91,6 +91,22 @@
+ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench;
+ extern unsigned long w_socket;
++
++/* For XF86VIDMODE Support */
+#ifdef XF86VIDMODE
-+static void
-+xf86_vidmode_init ( void )
-+{
-+ int i,j;
-+ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *)
-+ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock);
-+
-+ if (!XF86VidModeQueryVersion(W_Display, &i, &j))
-+ XF86VidModeData.vidmode_available = 0;
-+ else if (!XF86VidModeQueryExtension(W_Display, &i, &j))
-+ XF86VidModeData.vidmode_available = 0;
-+ else if (!XF86VidModeGetModeLine(W_Display, W_Screen,
-+ (int *)&XF86VidModeData.orig_mode.dotclock, l))
-+ XF86VidModeData.vidmode_available = 0;
-+ else if (!XF86VidModeGetViewPort(W_Display, W_Screen,
-+ &XF86VidModeData.orig_viewport_x,
-+ &XF86VidModeData.orig_viewport_y))
-+ XF86VidModeData.vidmode_available = 0;
-+
-+ if (!XF86VidModeData.vidmode_available)
-+ fprintf(stderr, "Warning: XF86VidMode not available\n");
-+}
++#include <X11/extensions/xf86dga.h>
++#include <X11/extensions/xf86vmode.h>
++
++struct xf86vidmode_data {
++ int vidmode_available;
++ XF86VidModeModeInfo orig_mode;
++ int orig_viewport_x;
++ int orig_viewport_y;
++};
++
++extern struct xf86vidmode_data XF86VidModeData;
+#endif
+
- void
- W_Initialize(str)
- char *str;
-@@ -395,5 +420,9 @@
- GetAltMask();
+ #endif /* AMIGA */
+
+ #if 0
+--- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/libsprite/data.c 2006-05-31 22:28:06.000000000 +0200
+@@ -158,3 +158,6 @@
+
+ int useBuffered = 1;
- backColor = W_Black;
-+
+#ifdef XF86VIDMODE
-+ xf86_vidmode_init();
++struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 };
+#endif
- }
-
---- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-31 16:56:50.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-31 16:56:50.000000000 +0200
+--- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-31 22:28:06.000000000 +0200
@@ -236,6 +236,10 @@
neww->type = type;
neww->mapped = 0;
@@ -379,32 +529,52 @@
+ W_RevertCursor(_win);
+ }
+}
---- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-31 16:56:50.000000000 +0200
-@@ -63,6 +63,7 @@
- W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
- W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
- void W_SetIconWindow(W_Window win, W_Window icon);
-+void W_ToggleFullscreen(W_Window win);
- /* point.c */
- void W_DrawPoint(W_Window window, int x, int y, W_Color color);
- void FlushPointCache(Window win, int color);
---- xgalaga-2.0.34/defs.h.fs 2006-05-31 16:56:50.000000000 +0200
-+++ xgalaga-2.0.34/defs.h 2006-05-31 16:56:50.000000000 +0200
-@@ -26,8 +26,9 @@
-
- #define TORPDELAY 5
+--- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/libsprite/init.c 2006-05-31 22:28:06.000000000 +0200
+@@ -356,6 +356,31 @@
+ XFreeModifiermap(m);
+ }
--#define WINWIDTH 400
--#define WINHEIGHT 500
-+/* Modified slightly to better fit on 800x600 in fullscreen mode */
-+#define WINWIDTH 464 /* was 400 */
-+#define WINHEIGHT 580 /* was 500 */
++#ifdef XF86VIDMODE
++static void
++xf86_vidmode_init ( void )
++{
++ int i,j;
++ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *)
++ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock);
++
++ if (!XF86VidModeQueryVersion(W_Display, &i, &j))
++ XF86VidModeData.vidmode_available = 0;
++ else if (!XF86VidModeQueryExtension(W_Display, &i, &j))
++ XF86VidModeData.vidmode_available = 0;
++ else if (!XF86VidModeGetModeLine(W_Display, W_Screen,
++ (int *)&XF86VidModeData.orig_mode.dotclock, l))
++ XF86VidModeData.vidmode_available = 0;
++ else if (!XF86VidModeGetViewPort(W_Display, W_Screen,
++ &XF86VidModeData.orig_viewport_x,
++ &XF86VidModeData.orig_viewport_y))
++ XF86VidModeData.vidmode_available = 0;
++
++ if (!XF86VidModeData.vidmode_available)
++ fprintf(stderr, "Warning: XF86VidMode not available\n");
++}
++#endif
++
+ void
+ W_Initialize(str)
+ char *str;
+@@ -395,5 +420,9 @@
+ GetAltMask();
- #define NUMSTARS 30
+ backColor = W_Black;
++
++#ifdef XF86VIDMODE
++ xf86_vidmode_init();
++#endif
+ }
--- xgalaga-2.0.34/Wlib.h.fs 1998-04-12 08:03:20.000000000 +0200
-+++ xgalaga-2.0.34/Wlib.h 2006-05-31 16:56:50.000000000 +0200
++++ xgalaga-2.0.34/Wlib.h 2006-05-31 22:28:06.000000000 +0200
@@ -91,6 +91,22 @@
extern int autoPoint, W_KeyDepth, animPointers, useWorkbench;
@@ -428,146 +598,68 @@
#endif /* AMIGA */
#if 0
---- xgalaga-2.0.34/main.c.fs 2006-05-31 16:56:50.000000000 +0200
-+++ xgalaga-2.0.34/main.c 2006-05-31 16:56:50.000000000 +0200
-@@ -32,6 +32,7 @@
- static int attacking = 0, maxattacking, entering=0;
- static int maxetorps = 5, numetorps=0;
- static int plflash = 50;
-+static int fullscreen = 0;
- #ifndef ORIGINAL_XGALAGA
- static int shots = 0;
- static int hits = 0;
-@@ -63,10 +64,14 @@
- xgal_exit(int v)
- {
- /* W_AutoRepeatOn();*/
-+ /* Destroy our main window so the fullscreen mode gets unset if we're
-+ running fullscreen. (We should really clean up much more here!) */
-+ W_DestroyWindow(shellWin);
- #ifdef SOUND
- kill_sound();
- #endif
- /* sleep(1);*/ /* Without this, the auto-repeat request fails on my machine... */
-+ /* Note if we ever need this autorepeat thingie again, the sleep can and should be replaced by a call to XSync() */
- exit(v);
- }
+--- xgalaga-2.0.34/data.c.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/data.c 2006-05-31 22:28:06.000000000 +0200
+@@ -32,6 +32,10 @@
+ int mouseControl = 0;
+ int wantStars = 1;
-@@ -89,6 +94,7 @@
- -mouse Use mouse control (same as 'm' at the title screen)\n\
- -keyboard Use keyboard control (same as 'k')\n%s\
- -level <number> Choose starting level (>= 1)\n\
-+-window Start in windowed mode instead of fullscreen\n\
- -b turn buffered mode off, use this if it runs\n\
- too slowly. Will cause flicker, maybe lots,\n\
- maybe only a little.\n\
-@@ -105,7 +111,8 @@
- p - pauses\n\
- q - end this game\n\
- b - Toggle buffering (flicker vs. speed.)\n\
--o - Toggle OR mode. Don't use this, it sucks.\n", VERSION,
-+o - Toggle OR mode. Don't use this, it sucks.\n\
-+alt + enter - Toggle fullscreen - window\n", VERSION,
- PRINT_SOUND
- );
- }
-@@ -844,6 +851,14 @@
- case 'm':
- mouseControl = 2;
- break;
-+ case '\r'+256:
-+ W_ToggleFullscreen(shellWin);
-+ fullscreen = !fullscreen;
-+ if (fullscreen)
-+ W_BlankCursor(baseWin);
-+ else
-+ W_RevertCursor(baseWin);
-+ break;
- default:
- break;
- }
-@@ -997,6 +1012,14 @@
- maxtorps = MINTORPS;
- break;
- #endif /* IM_A_BIG_FAT_CHEATER */
-+ case '\r'+256:
-+ W_ToggleFullscreen(shellWin);
-+ fullscreen = !fullscreen;
-+ if (fullscreen)
-+ W_BlankCursor(baseWin);
-+ else
-+ W_RevertCursor(baseWin);
-+ break;
- default:
- break;
- }
-@@ -1214,6 +1237,7 @@
- int ac;
- char *dpyname = 0;
- int mx, my, but;
-+ int start_fullscreen = 1;
-
- for(ac = 1; ac < argc; ac++) {
- if(*argv[ac] == '-') {
-@@ -1245,6 +1269,8 @@
- useOR = 0;
- } else if (strcmp(argv[ac], "-noclipmask") == 0) {
- useClipMask = 0;
-+ } else if (strcmp(argv[ac], "-window") == 0) {
-+ start_fullscreen = 0;
- } else {
- print_usage();
- exit(0);
-@@ -1263,6 +1289,12 @@
- W_Buffer(shellWin, 0);
- W_MapWindow(shellWin);
- W_MapWindow(baseWin);
-+ if (start_fullscreen)
-+ {
-+ W_ToggleFullscreen(shellWin);
-+ W_BlankCursor(baseWin);
-+ fullscreen = 1;
-+ }
++/* Modified slightly to better fit on 800x600 in fullscreen mode */
++int winwidth = 468; /* was 400 */
++int winheight = 596; /* was 511 */
++
+ int alien_shape[ALIENSHAPES] = {
+ I_ALIEN1,
+ I_ALIEN2,
+--- xgalaga-2.0.34/defs.h.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/defs.h 2006-05-31 22:28:06.000000000 +0200
+@@ -26,8 +26,8 @@
- /* W_AutoRepeatOff();*/
+ #define TORPDELAY 5
---- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200
-+++ xgalaga-2.0.34/Wproto.h 2006-05-31 16:56:50.000000000 +0200
-@@ -63,6 +63,7 @@
- W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
- W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
- void W_SetIconWindow(W_Window win, W_Window icon);
-+void W_ToggleFullscreen(W_Window win);
- /* point.c */
- void W_DrawPoint(W_Window window, int x, int y, W_Color color);
- void FlushPointCache(Window win, int color);
---- xgalaga-2.0.34/xgal.6x.fs 2006-05-31 16:56:50.000000000 +0200
-+++ xgalaga-2.0.34/xgal.6x 2006-05-31 16:56:50.000000000 +0200
-@@ -4,11 +4,11 @@
+-#define WINWIDTH 400
+-#define WINHEIGHT 500
++#define WINWIDTH winwidth /* was 400 */
++#define WINHEIGHT winheight /* was 500 */
+
+ #define NUMSTARS 30
+
+--- xgalaga-2.0.34/xgal.6x.fs 2006-05-31 22:28:06.000000000 +0200
++++ xgalaga-2.0.34/xgal.6x 2006-05-31 22:31:02.000000000 +0200
+@@ -3,12 +3,12 @@
+ xgalaga \- X11 version of the famous Galaga game
.SH SYNOPSIS
.B xgalaga
- [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
+-[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
-[-noclipmask] [-nouseor] [-nostars]
-+[-noclipmask] [-nouseor] [-nostars] [-window]
++[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl]
++[-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars]
.P
.B xgalaga-hyperspace
- [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
+-[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
-[-noclipmask] [-nouseor] [-nostars]
-+[-noclipmask] [-nouseor] [-nostars] [-window]
++[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl]
++[-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars]
.SH INSTRUCTIONS
.LP
It's Galaga, you know how to play Galaga, stop bothering me.
-@@ -35,6 +35,9 @@
+@@ -35,6 +35,15 @@
.B \-nosound
Turn sound OFF
.TP 8
++.B \-level \fIlvl\fP
++Choose starting level (>= 1)
++.TP 8
+.B \-window
+Run in a window, not full screen. Full screen is the default.
+.TP 8
++.B \-winsize \fIwidthxheight\fP
++Set windowsize, default 468x596.
++.TP 8
.B \-b
Turn buffered mode off, use this if it runs too slowly. Will cause
flicker, maybe lots, maybe only a little.
-@@ -68,6 +71,8 @@
+@@ -68,6 +77,8 @@
k - Use keyboard control
.TP 8
x - use your shields (xgalaga-hyperspace only)
@@ -576,16 +668,3 @@
.SH "SEE ALSO"
Xgalaga home page
.RI < http://rumsey.org/xgal.html >
---- xgalaga-2.0.34/pathfile.c.fs 2006-05-31 17:08:48.000000000 +0200
-+++ xgalaga-2.0.34/pathfile.c 2006-05-31 17:09:37.000000000 +0200
-@@ -387,8 +387,8 @@
-
- void get_xy(int anum, int* x, int* y)
- {
-- *x = pathinfo[al_paths[anum]].startx;
-- *y = pathinfo[al_paths[anum]].starty;
-+ *x = (WINWIDTH * pathinfo[al_paths[anum]].startx) / 400;
-+ *y = (WINHEIGHT * pathinfo[al_paths[anum]].starty) / 500;
- }
-
- int get_delay(int anum)
xgalaxy-2.0.34-xgalaxy.patch:
Index: xgalaxy-2.0.34-xgalaxy.patch
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-xgalaxy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 15:16:41 -0000 1.2
+++ xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 20:42:33 -0000 1.3
@@ -1,62 +1,5 @@
---- xgalaga-2.0.34/README.xgalaxy 2006-05-22 15:31:00.000000000 +0200
-+++ xgalaga-2.0.34/README 2006-05-22 15:30:59.000000000 +0200
-@@ -44,9 +44,9 @@
- <anything else> print usage and version.
-
- Basic instructions:
-- It's Galaga, you know how to play Galaga, stop bothering me.
-- (Ship follows the mouse, button fires. Auto-fire by holding it
-- down, so no-one accuses me of breaking their mouse!)
-+ It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga,
-+ stop bothering me. (Ship follows the mouse, button fires. Auto-fire by
-+ holding it down, so no-one accuses me of breaking their mouse!)
-
- Keyboard commands:
-
-@@ -73,7 +73,7 @@
- games written quickly and painlessly.
-
- Credits:
-- Galaga code:
-+ XGalaxy code:
- Joe Rumsey (mrogre at mediaone.net)
- X interface:
- Bill Dyess(dyessww at eng.auburn.edu),
---- xgalaga-2.0.34/xgal.6x.xgalaxy 2006-05-22 15:30:59.000000000 +0200
-+++ xgalaga-2.0.34/xgal.6x 2006-05-22 15:30:59.000000000 +0200
-@@ -1,6 +1,6 @@
--.TH XGALAGA 6x "23 April 2003" "2.0.34"
-+.TH XGALAXY 6 "23 April 2003" "2.0.34"
- .SH NAME
--xgalaga \- X11 version of the famous Galaga game
-+xgalaga \- X11 Galaga like game
- .SH SYNOPSIS
- .B xgalaxy
- [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
-@@ -11,9 +11,9 @@
- [-noclipmask] [-nouseor] [-nostars] [-window]
- .SH INSTRUCTIONS
- .LP
--It's Galaga, you know how to play Galaga, stop bothering me.
--(Ship follows the mouse, button fires. Auto-fire by holding it
--down, so no-one accuses me of breaking their mouse!)
-+It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga,
-+stop bothering me. (Ship follows the mouse, button fires. Auto-fire by
-+holding it down, so no-one accuses me of breaking their mouse!)
- .P
- The xgalaxy-hyperspace version features some new weapons and different
- gameplay.
-@@ -71,7 +71,7 @@
- .TP 8
- alt-enter - Toggle full screen node.
- .SH "SEE ALSO"
--Xgalaga home page
-+XGalaxy home page
- .RI < http://rumsey.org/xgal.html >
- .SH AUTHORS
- Joe Rumsey, <\fIjoe at rumsey.org\fP> (Original author)
---- xgalaga-2.0.34/images.c.xgalaxy 2006-05-22 15:31:13.000000000 +0200
-+++ xgalaga-2.0.34/images.c 2006-05-22 16:14:13.000000000 +0200
+--- xgalaga-2.0.34/images.c.xgalaxy 2006-05-31 22:24:50.000000000 +0200
++++ xgalaga-2.0.34/images.c 2006-05-31 22:24:50.000000000 +0200
@@ -6786,54 +6786,108 @@
/* XPM */
static char * title_xpm[] = {
@@ -212,3 +155,83 @@
/* keep sorted (for bsearch) [BDyess] */
static W_Image imagearray[] = {
+--- xgalaga-2.0.34/README.xgalaxy 2006-05-31 22:24:51.000000000 +0200
++++ xgalaga-2.0.34/README 2006-05-31 22:24:51.000000000 +0200
+@@ -44,9 +44,9 @@
+ <anything else> print usage and version.
+
+ Basic instructions:
+- It's Galaga, you know how to play Galaga, stop bothering me.
+- (Ship follows the mouse, button fires. Auto-fire by holding it
+- down, so no-one accuses me of breaking their mouse!)
++ It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga,
++ stop bothering me. (Ship follows the mouse, button fires. Auto-fire by
++ holding it down, so no-one accuses me of breaking their mouse!)
+
+ Keyboard commands:
+
+@@ -73,7 +73,7 @@
+ games written quickly and painlessly.
+
+ Credits:
+- Galaga code:
++ XGalaxy code:
+ Joe Rumsey (mrogre at mediaone.net)
+ X interface:
+ Bill Dyess(dyessww at eng.auburn.edu),
+--- xgalaga-2.0.34/main.c.xgalaxy 2006-05-31 22:25:01.000000000 +0200
++++ xgalaga-2.0.34/main.c 2006-05-31 22:26:42.000000000 +0200
+@@ -97,15 +97,15 @@
+ -window Start in windowed mode instead of fullscreen\n\
+ -winsize <WxH> Window size (default 468 x 596)\n\
+ -b turn buffered mode off, use this if it runs\n\
+-too slowly. Will cause flicker, maybe lots,\n\
+-maybe only a little.\n\
++ too slowly. Will cause flicker, maybe lots,\n\
++ maybe only a little.\n\
+ \n\
+ This game is now free software, under the GPL\n\
+ \n\
+ Basic instructions:\n\
+-It's Galaga, you know how to play Galaga, stop bothering me.\n\
+-(Ship follows the mouse, button fires. Auto-fire by holding it\n\
+-down, so no-one accuses me of breaking their mouse!)\n\
++It's just like Galaxian / Galaga, you know how to play Galaxian / Galaga,\n\
++stop bothering me. (Ship follows the mouse, button fires. Auto-fire by\n\
++holding it down, so no-one accuses me of breaking their mouse!)\n\
+ \n\
+ Keyboard commands:\n\
+ \n\
+--- xgalaga-2.0.34/xgal.6x.xgalaxy 2006-05-31 22:24:51.000000000 +0200
++++ xgalaga-2.0.34/xgal.6x 2006-05-31 22:24:51.000000000 +0200
+@@ -1,6 +1,6 @@
+-.TH XGALAGA 6x "23 April 2003" "2.0.34"
++.TH XGALAXY 6 "23 April 2003" "2.0.34"
+ .SH NAME
+-xgalaga \- X11 version of the famous Galaga game
++xgalaga \- X11 Galaga like game
+ .SH SYNOPSIS
+ .B xgalaga
+ [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl]
+@@ -11,9 +11,9 @@
+ [-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars]
+ .SH INSTRUCTIONS
+ .LP
+-It's Galaga, you know how to play Galaga, stop bothering me.
+-(Ship follows the mouse, button fires. Auto-fire by holding it
+-down, so no-one accuses me of breaking their mouse!)
++It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga,
++stop bothering me. (Ship follows the mouse, button fires. Auto-fire by
++holding it down, so no-one accuses me of breaking their mouse!)
+ .P
+ The xgalaga-hyperspace version features some new weapons and different
+ gameplay.
+@@ -80,7 +80,7 @@
+ .TP 8
+ alt-enter - Toggle full screen node.
+ .SH "SEE ALSO"
+-Xgalaga home page
++XGalaxy home page
+ .RI < http://rumsey.org/xgal.html >
+ .SH AUTHORS
+ Joe Rumsey, <\fIjoe at rumsey.org\fP> (Original author)
Index: xgalaxy.spec
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xgalaxy.spec 31 May 2006 15:16:41 -0000 1.2
+++ xgalaxy.spec 31 May 2006 20:42:33 -0000 1.3
@@ -98,7 +98,11 @@
%changelog
* Mon May 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.34-3
-- Documented the new -window switch in the manpage.
+- Fixed ships not being centered when flying in in level 1
+- Fixed artifacts (ships not yet on screen showing) in level 2
+- Added -winsize widthxheight option, which can be used to specify an
+ alternative window size
+- Documented the -level, -window, -winsize switch in the manpage.
* Mon May 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.34-2
- Change name to xgalaxy because upstreams name has already been used for a
More information about the fedora-extras-commits
mailing list