Page MenuHome
Files F4299

border.patch
Public
Actions

border.patch
View Options

Index: ./source/creator/creator.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/creator/creator.c,v
retrieving revision 1.70
diff -u -r1.70 creator.c
--- ./source/creator/creator.c 26 Mar 2007 15:07:38 -0000 1.70
+++ ./source/creator/creator.c 11 Apr 2007 09:34:21 -0000
@@ -195,10 +195,8 @@
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 with borders (default)\n");
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");
@@ -391,7 +389,7 @@
/* for all platforms, even windos has it! */
if(G.background) signal(SIGINT, blender_esc); /* ctrl c out bg render */
- /* background render uses this font too */
+ /* background render uses this font too */
BKE_font_register_builtin(datatoc_Bfont, datatoc_Bfont_size);
init_def_material();
@@ -437,20 +435,15 @@
*/
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
+ /* XXX, fixme zr, borderless on win32 */
+ /* now on all platforms as of 20070411 - DJC */
G.windowstate = G_WINDOWSTATE_FULLSCREEN;
-#endif
break;
case 'R':
- /* Registering filetypes only makes sense on windows... */
+ /* Registering filetypes only makes sense on windows... */
#ifdef WIN32
RegisterBlendExtension(argv[0]);
#endif
@@ -461,7 +454,7 @@
/**
notify the gameengine that no audio is wanted, even if the user didn't give
the flag -g noaudio.
- */
+ */
SYS_WriteCommandLineInt(syshandle,"noaudio",1);
audio = 0;
Index: ./source/blender/src/editscreen.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editscreen.c,v
retrieving revision 1.154
diff -u -r1.154 editscreen.c
--- ./source/blender/src/editscreen.c 5 Apr 2007 12:42:07 -0000 1.154
+++ ./source/blender/src/editscreen.c 11 Apr 2007 09:34:22 -0000
@@ -2191,15 +2191,10 @@
sc->scene= G.scene;
if (!mainwin) {
-#if 0
-//#ifdef _WIN32 // FULLSCREEN
if (G.windowstate == G_WINDOWSTATE_FULLSCREEN)
mainwin= window_open("Blender", sc->startx, sc->starty, sc->sizex, sc->sizey, G_WINDOWSTATE_FULLSCREEN);
else
mainwin= window_open("Blender", sc->startx, sc->starty, sc->sizex, sc->sizey, start_maximized);
-#else
- mainwin= window_open("Blender", sc->startx, sc->starty, sc->sizex, sc->sizey, start_maximized);
-#endif
if (!mainwin) {
printf("ERROR: Unable to open Blender window\n");
Index: ./source/blender/src/ghostwinlay.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/ghostwinlay.c,v
retrieving revision 1.47
diff -u -r1.47 ghostwinlay.c
--- ./source/blender/src/ghostwinlay.c 5 Apr 2007 12:42:07 -0000 1.47
+++ ./source/blender/src/ghostwinlay.c 11 Apr 2007 09:34:22 -0000
@@ -338,20 +338,12 @@
winlay_get_screensize(&scr_w, &scr_h);
posy= (scr_h-posy-sizey);
- /* create a fullscreen window on unix by default*/
-#if !defined(WIN32) && !defined(__APPLE__)
- inital_state= start_maximized?
- GHOST_kWindowStateFullScreen:GHOST_kWindowStateNormal;
-#else
-#ifdef _WIN32 // FULLSCREEN
-// if (start_maximized == G_WINDOWSTATE_FULLSCREEN)
-// inital_state= GHOST_kWindowStateFullScreen;
-// else
- inital_state= start_maximized?GHOST_kWindowStateMaximized:GHOST_kWindowStateNormal;
-#else // APPLE
- inital_state= start_maximized?GHOST_kWindowStateMaximized:GHOST_kWindowStateNormal;
+ if (start_maximized == G_WINDOWSTATE_FULLSCREEN)
+ inital_state = start_maximized?GHOST_kWindowStateFullScreen:GHOST_kWindowStateNormal;
+ else
+ inital_state = start_maximized?GHOST_kWindowStateMaximized:GHOST_kWindowStateNormal;
+#ifdef __APPLE__
inital_state += macPrefState;
-#endif
#endif
ghostwin= GHOST_CreateWindow(g_system,

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
f6/a8/df3d8e04097acf3ae477e55953fb

Event Timeline