Index: source/creator/creator.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/creator/creator.c,v
retrieving revision 1.68
diff -u -p -u -r1.68 creator.c
--- source/creator/creator.c	28 Jan 2007 05:45:58 -0000	1.68
+++ source/creator/creator.c	21 Mar 2007 04:40:48 -0000
@@ -194,10 +194,7 @@ static void print_help(void)
 	printf ("    -m\t\tRead from disk (Don't buffer)\n");
 				
 	printf ("\nWindow options:\n");
-	printf ("  -w\t\tForce opening with borders\n");
-#ifdef WIN32
 	printf ("  -W\t\tForce opening without borders\n");
-#endif
 	printf ("  -p <sx> <sy> <w> <h>\tOpen with lower left corner at <sx>, <sy>\n");
 	printf ("                      \tand width and height <w>, <h>\n");
 	printf ("\nGame Engine specific options:\n");
@@ -392,7 +389,10 @@ int main(int argc, char **argv)
 	BKE_font_register_builtin(datatoc_Bfont, datatoc_Bfont_size);
 	
 	init_def_material();
-
+	
+	/* Run in a window unless fullscreen option is set */
+	G.windowstate = G_WINDOWSTATE_BORDER;
+	
 	if(G.background==0) {
 		for(a=1; a<argc; a++) {
 			if(argv[a][0] == '-') {
@@ -425,26 +425,8 @@ int main(int argc, char **argv)
 						printf("argv[%d] = %s\n", i, argv[i]);
 					}
 					break;
-            
-				case 'w':
-					/* XXX, fixme zr, with borders */
-					/* there probably is a better way to do
-					 * this, right now do as if blender was
-					 * called with "-p 0 0 xres yres" -- sgefant
-					 */ 
-					winlay_get_screensize(&sizx, &sizy);
-					setprefsize(0, 0, sizx, sizy);
-#if 0
-//#ifdef _WIN32	// FULLSCREEN
-					G.windowstate = G_WINDOWSTATE_BORDER;
-#endif
-					break;
 				case 'W':
-						/* XXX, fixme zr, borderless on win32 */
-#if 0
-//#ifdef _WIN32	// FULLSCREEN
 					G.windowstate = G_WINDOWSTATE_FULLSCREEN;
-#endif
 					break;
 				case 'R':
 				/* Registering filetypes only makes sense on windows...      */
@@ -468,7 +450,12 @@ int main(int argc, char **argv)
 				}
 			}
 		}
-
+		
+		if (G.windowstate == G_WINDOWSTATE_BORDER) {
+			winlay_get_screensize(&sizx, &sizy);
+			setprefsize(0, 0, sizx, sizy);
+		}
+		
 		BPY_start_python(argc, argv);
 		
 		/**