Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24034/src
Modified Files:
data.c defaults.c mswindow.c newwin.c
Log Message:
Added "mainTitleBar: on/(off)" to choose whether to start game with title bar on. As always, title bar can be toggled by alt+enter.
Changed default phaser window size.
Updated to do list.
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- newwin.c 14 Jun 2006 10:38:38 -0000 1.40
+++ newwin.c 23 Jun 2006 08:50:14 -0000 1.41
@@ -875,9 +875,9 @@
messwk = W_MakeScrollingRichTextWindow ("review_kill", 506, 717, 81, 3, baseWin, BORDER);
wam_windows[3] = messwk;
- phaserwin = W_MakeScrollingRichTextWindow ("review_phaser", WINSIDE + BORDER + 6, YOFF +
+ phaserwin = W_MakeScrollingRichTextWindow ("review_phaser", WINSIDE + 6, YOFF +
WINSIDE + 3 * BORDER + 2 * MESSAGESIZE +
- 15 * W_Textheight + 16, 80, 4, baseWin, BORDER);
+ 15 * W_Textheight + 16, 81, 4, baseWin, BORDER);
wam_windows[4] = phaserwin;
reviewWin = W_MakeScrollingRichTextWindow ("review", 506, 540, 81, 22, baseWin, BORDER);
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- mswindow.c 13 Jun 2006 11:18:23 -0000 1.36
+++ mswindow.c 23 Jun 2006 08:50:14 -0000 1.37
@@ -1142,19 +1142,14 @@
s = title_buff;
sprintf (title_buff, "Netrek @ %s", serverName);
}
-// SRS /4/4/98 SpecialStyle = WS_OVERLAPPEDWINDOW; //Make main window sizeable
- // These options give a window with a title bar, along with ability to minimize
-// This fullscreen stuff doesn't work. It's throwing exceptions now. No time to fix.
-// SRS 11/29/02
- // if (booleanDefault("fullscreen",0))
// WS_THICKFRAME adds resizing frame to window without adding titlebar
mainResizeable = booleanDefault ("mainResizeable", mainResizeable);
+ mainTitleBar = booleanDefault ("mainTitleBar", mainTitleBar);
+ SpecialStyle |= WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU;
if (mainResizeable)
- SpecialStyle |= WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU;
- else
- SpecialStyle |= WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU;
-// else
-// SpecialStyle |= WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU;
+ SpecialStyle |= WS_THICKFRAME;
+ if (mainTitleBar)
+ SpecialStyle |= WS_CAPTION;
}
else if (strcmp (name, "wait") == 0)
{
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- defaults.c 13 Jun 2006 11:18:23 -0000 1.26
+++ defaults.c 23 Jun 2006 08:50:14 -0000 1.27
@@ -211,6 +211,12 @@
NULL
}
},
+ {"mainTitleBar", &mainTitleBar, RC_BOOL,
+ {
+ "Start main window with title bar on (can be toggled by alt+enter)",
+ NULL
+ }
+ },
{"mainResizeable", &mainResizeable, RC_BOOL,
{
"Make main window resizeable",
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- data.c 14 Jun 2006 10:38:38 -0000 1.38
+++ data.c 23 Jun 2006 08:50:14 -0000 1.39
@@ -734,6 +734,7 @@
int windowMove = 0;
int mainResizeable = 1;
+int mainTitleBar = 0;
int observerMode = 0;
int showHockeyScore = 1;