Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9198/src
Modified Files:
beeplite.c cowmain.c data.c defaults.c input.c mswindow.c
newwin.c option.c senddist.c
Log Message:
Fixed some inconsistencies in how a few RCDs were named - "taking" renamed to "take",
"generic" renamed to "help", "help3 and help4" renamed to "help1 and help2", and
"doing3 and doing4" renamed to "doing1 and doing2"
Added "saveWindow: (on)/off" and "saveBeeplite: (on)/off" to allow saving of window placments
and beeplite macros to the netrek.sav file.
Save options now can save windows placements, review window .allow settings, and beeplite
macros
Changed some default window sizes/locations that were either too small (i.e. help window)
or in a bad spot (i.e. planet window)
Fixed a bunch of spacing inconsistencies
Added/modified a few checkmapped calls in newwin.c to either use the "newish" checkmappedpref
function, or to add a checkmapped check if I felt it should be checked
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mswindow.c 28 May 2006 06:28:14 -0000 1.27
+++ mswindow.c 28 May 2006 23:05:12 -0000 1.28
@@ -1258,12 +1258,12 @@
W_Color color)
{
Window *newwin;
- int orig_x, orig_y, orig_width, orig_height;
+ int orig_x, orig_y, orig_width, orig_height;
- orig_x = x;
- orig_y = y;
- orig_width = width;
- orig_height = height;
+ orig_x = x;
+ orig_y = y;
+ orig_width = width;
+ orig_height = height;
//Get the default position, etc.
checkGeometry (name, &x, &y, &width, &height);
@@ -1276,12 +1276,12 @@
newWindow (name, x, y, width, height, parent, border, color,
WIN_GRAPH)))
return (0);
-
- /* Set original coordinates, so we will be able to restore to them */
- newwin->orig_x = orig_x;
- newwin->orig_y = orig_y;
- newwin->orig_width = orig_width;
- newwin->orig_height = orig_height;
+
+ /* Set original coordinates, so we will be able to restore to them */
+ newwin->orig_x = orig_x;
+ newwin->orig_y = orig_y;
+ newwin->orig_width = orig_width;
+ newwin->orig_height = orig_height;
//Map (show) the window if the user spec'd it
if (checkMapped (name))
@@ -1306,12 +1306,12 @@
int border)
{
Window *newwin;
- int orig_x, orig_y, orig_width, orig_height;
+ int orig_x, orig_y, orig_width, orig_height;
- orig_x = x;
- orig_y = y;
- orig_width = width;
- orig_height = height;
+ orig_x = x;
+ orig_y = y;
+ orig_width = width;
+ orig_height = height;
//Get the default position, etc.
checkGeometry (name, &x, &y, &width, &height);
@@ -1328,12 +1328,12 @@
//Store the original textheight, width
newwin->TextHeight = (short) height;
newwin->TextWidth = (short) width;
-
- /* Set original coordinates, so we will be able to restore to them */
- newwin->orig_x = orig_x;
- newwin->orig_y = orig_y;
- newwin->orig_width = orig_width;
- newwin->orig_height = orig_height;
+
+ /* Set original coordinates, so we will be able to restore to them */
+ newwin->orig_x = orig_x;
+ newwin->orig_y = orig_y;
+ newwin->orig_width = orig_width;
+ newwin->orig_height = orig_height;
//Map (show) the window if the user spec'd it
if (checkMapped (name))
@@ -1355,12 +1355,12 @@
int border)
{
Window *newwin;
- int orig_x, orig_y, orig_width, orig_height;
+ int orig_x, orig_y, orig_width, orig_height;
- orig_x = x;
- orig_y = y;
- orig_width = width;
- orig_height = height;
+ orig_x = x;
+ orig_y = y;
+ orig_width = width;
+ orig_height = height;
//Get the default position, etc.
checkGeometry (name, &x, &y, &width, &height);
@@ -1378,12 +1378,12 @@
//Store the original textheight, width
newwin->TextHeight = (short) height;
newwin->TextWidth = (short) width;
-
- /* Set original coordinates, so we will be able to restore to them */
- newwin->orig_x = orig_x;
- newwin->orig_y = orig_y;
- newwin->orig_width = orig_width;
- newwin->orig_height = orig_height;
+
+ /* Set original coordinates, so we will be able to restore to them */
+ newwin->orig_x = orig_x;
+ newwin->orig_y = orig_y;
+ newwin->orig_width = orig_width;
+ newwin->orig_height = orig_height;
//Give it a scroll bar, and set the range (to zero, initially)
SetWindowLongPtr (newwin->hwnd, GWL_STYLE,
@@ -1414,12 +1414,12 @@
Window *newwin;
int i;
- int orig_x, orig_y, orig_width, orig_height;
+ int orig_x, orig_y, orig_width, orig_height;
- orig_x = x;
- orig_y = y;
- orig_width = width;
- orig_height = height;
+ orig_x = x;
+ orig_y = y;
+ orig_width = width;
+ orig_height = height;
//Get the default position, etc.
checkGeometry (name, &x, &y, &width, &height);
@@ -1447,12 +1447,12 @@
newwin->items = items;
newwin->NumItems = (short) height;
newwin->TextHeight = (short) height;
-
- /* Set original coordinates, so we will be able to restore to them */
- newwin->orig_x = orig_x;
- newwin->orig_y = orig_y;
- newwin->orig_width = orig_width;
- newwin->orig_height = orig_height;
+
+ /* Set original coordinates, so we will be able to restore to them */
+ newwin->orig_x = orig_x;
+ newwin->orig_y = orig_y;
+ newwin->orig_width = orig_width;
+ newwin->orig_height = orig_height;
//Map (show) the window if the user spec'd it
if (checkMapped (name))
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- newwin.c 26 May 2006 05:58:08 -0000 1.31
+++ newwin.c 28 May 2006 23:05:12 -0000 1.32
@@ -789,27 +789,28 @@
mapSDB = W_InitSDB (mapw);
- tstatw = W_MakeWindow ("tstat", 0, WINSIDE + 6, WINSIDE + 3,
+ tstatw = W_MakeWindow ("tstat", 0, WINSIDE + 6, WINSIDE + 5,
STATSIZE + 2, baseWin, BORDER, foreColor);
W_SetWindowExposeHandler (tstatw, redrawTstats);
-
- warnw = W_MakeWindow ("warn", WINSIDE + 6, WINSIDE + 23, WINSIDE + 4, MESSAGESIZE - 4,
+
+ warnw = W_MakeWindow ("warn", WINSIDE + 6, WINSIDE + 23, WINSIDE + 4, MESSAGESIZE - 4,
baseWin, BORDER, foreColor);
W_SetWindowKeyDownHandler (warnw, handleMessageWindowKeyDown);
-
- messagew = W_MakeWindow ("message", WINSIDE + 6, WINSIDE + 6,
+
+ messagew = W_MakeWindow ("message", WINSIDE + 6, WINSIDE + 6,
WINSIDE + 4, MESSAGESIZE - 4, baseWin, BORDER,
foreColor);
+
W_SetWindowKeyDownHandler (messagew, handleMessageWindowKeyDown);
W_SetWindowButtonHandler (messagew, handleMessageWindowButton);
- W_SetWindowExposeHandler (messagew, DisplayMessage);
+ W_SetWindowExposeHandler (messagew, DisplayMessage);
- planetw = W_MakeTextWindow ("planet", 10, 10, 57, MAXPLANETS + 3, w, 2);
+ planetw = W_MakeTextWindow ("planet", WINSIDE + 160, 10, 57, MAXPLANETS + 3, baseWin, 2);
W_SetWindowExposeHandler (planetw, planetlist);
- rankw = W_MakeTextWindow ("rank", 50, 300, 65, NUMRANKS + 9, w, 2);
+ rankw = W_MakeTextWindow ("rank", 50, 300, 65, NUMRANKS + 9, baseWin, 2);
W_SetWindowExposeHandler (rankw, ranklist);
playerw = W_MakeTextWindow ("player", 0, WINSIDE + 50, PlistMaxWidth (), 32, baseWin, 2);
@@ -827,7 +828,7 @@
#endif
helpWin = W_MakeTextWindow ("help", 20,
YOFF + WINSIDE + 2 * BORDER + 2 * MESSAGESIZE + 30,
- 160, 19, NULL, BORDER);
+ 160, 21, NULL, BORDER);
#ifdef RECORDGAME
if (playback)
@@ -888,9 +889,9 @@
messwk = W_MakeScrollingWindow ("review_kill", 506, 727, 81, 3, baseWin, BORDER);
wam_windows[3] = messwk;
- phaserwin = W_MakeScrollingWindow ("review_phaser", WINSIDE + BORDER + 6, YOFF +
+ phaserwin = W_MakeScrollingWindow ("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_MakeScrollingWindow ("review", 506, 540, 81, 22, baseWin, BORDER);
@@ -980,7 +981,6 @@
war = W_MakeMenu ("war", WINSIDE + 10, -BORDER + 10, WARWIDTH, 6, baseWin, WARBORDER);
W_SetWindowButtonHandler (war, waraction);
-
W_DefineArrowCursor (war);
fillhint ();
@@ -1024,8 +1024,7 @@
W_MapWindow (tstatw);
W_MapWindow (warnw);
#ifdef XTRA_MESSAGE_UI
- /* Grr. checkMapped() defaults to off - not nice */
- if (booleanDefault ("message.mapped", 1))
+ if (checkMappedPref ("message", 1))
#endif
W_MapWindow (messagew);
W_MapWindow (w);
@@ -1040,12 +1039,6 @@
W_MapWindow (rankw);
if (checkMapped ("help"))
W_MapWindow (helpWin);
-
-#ifdef META
- if (checkMapped ("MetaServer List"))
- metawindow ();
-#endif
-
if (checkMapped ("review_all"))
W_MapWindow (messwa);
if (checkMapped ("review_team"))
@@ -1072,7 +1065,8 @@
if (checkMapped ("network"))
spwindow ();
#endif
-
+ if (checkMapped ("stats"))
+ W_MapWindow (statwin);
}
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.c 22 May 2006 08:27:53 -0000 1.12
+++ input.c 28 May 2006 23:05:12 -0000 1.13
@@ -2547,7 +2547,7 @@
void
Key69 (W_Event * data)
{
- emergency (generic, data);
+ emergency (help, data);
}
/******************************************************************************/
@@ -3525,7 +3525,7 @@
void
Key147 (W_Event * data)
{
- emergency (help3, data);
+ emergency (help1, data);
}
/******************************************************************************/
@@ -3534,7 +3534,7 @@
void
Key148 (W_Event * data)
{
- emergency (help4, data);
+ emergency (help2, data);
}
/******************************************************************************/
@@ -3625,7 +3625,7 @@
void
Key151 (W_Event * data)
{
- emergency (doing3, data);
+ emergency (doing1, data);
}
/******************************************************************************/
@@ -3634,7 +3634,7 @@
void
Key152 (W_Event * data)
{
- emergency (doing4, data);
+ emergency (doing2, data);
}
/******************************************************************************/
Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cowmain.c 22 May 2006 08:27:53 -0000 1.14
+++ cowmain.c 28 May 2006 23:05:12 -0000 1.15
@@ -778,16 +778,16 @@
}
#endif
- /* Now we want get serverNick */
- if (serverName)
- serverNick = getServerNick (serverName);
+ /* Now we want get serverNick */
+ if (serverName)
+ serverNick = getServerNick (serverName);
- /* If we have nickname then we probably have type.serverNick defined */
- if (serverType == ST_UNKNOWN && serverNick)
- serverType = getServerType (serverNick);
+ /* If we have nickname then we probably have type.serverNick defined */
+ if (serverType == ST_UNKNOWN && serverNick)
+ serverType = getServerType (serverNick);
- /* Set observer flag as soon as we know port number */
- setObserverMode (xtrekPort);
+ /* Set observer flag as soon as we know port number */
+ setObserverMode (xtrekPort);
resetdefaults ();
savebitmaps ();
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- defaults.c 25 May 2006 08:43:57 -0000 1.21
+++ defaults.c 28 May 2006 23:05:12 -0000 1.22
@@ -451,6 +451,12 @@
NULL
}
},
+ {"saveWindow", &saveWindow, RC_BOOL,
+ {
+ "Save window placements to saveFile",
+ NULL
+ }
+ },
{"saveMacro", &saveMacro, RC_BOOL,
{
"Save macros to saveFile",
@@ -463,6 +469,14 @@
NULL
}
},
+#ifdef BEEPLITE
+ {"saveBeeplite", &saveBeeplite, RC_BOOL,
+ {
+ "Save beeplite macros to saveFile",
+ NULL
+ }
+ },
+#endif
#ifdef RCM
{"saveRCM", &saveRCM, RC_BOOL,
{
@@ -1008,7 +1022,7 @@
#ifdef BEEPLITE
else if (strncasecmp(file, "lite.", 5) == 0)
{
- int offset = 5;
+ int offset = 5;
char **lt;
if (file[6] == '.')
@@ -1107,76 +1121,76 @@
getdefault (char *str)
{
struct stringlist *sl;
- char tmp[256];
-
- /* We want to be able to have option.observer or option.serverNick in rc */
- if (observerMode)
- {
- strcpy (tmp, str);
- strcat (tmp, ".observer");
-
- sl = defaults;
- while (sl != NULL)
- {
- if (strcmpi (sl->string, tmp) == 0)
- return (sl->value);
- sl = sl->next;
- }
- }
-
- if (serverNick)
- {
- strcpy (tmp, str);
- strcat (tmp, ".");
- strcat (tmp, serverNick);
-
- sl = defaults;
- while (sl != NULL)
- {
- if (strcmpi (sl->string, tmp) == 0)
- return (sl->value);
- sl = sl->next;
- }
- }
-
- if (serverType != ST_UNKNOWN)
- {
- strcpy (tmp, str);
- switch (serverType)
- {
- case ST_PARADISE:
- strcat (tmp, ".paradise");
- break;
- case ST_BRONCO:
- strcat (tmp, ".bronco");
- break;
- case ST_CHAOS:
- strcat (tmp, ".chaos");
- break;
- case ST_INL:
- strcat (tmp, ".inl");
- break;
- case ST_STURGEON:
- strcat (tmp, ".sturgeon");
- break;
- case ST_HOCKEY:
- strcat (tmp, ".hockey");
- break;
- case ST_DOGFIGHT:
- strcat (tmp, ".dogfight");
- break;
- default:
- strcat (tmp, ".unknown");
- }
-
- sl = defaults;
- while (sl != NULL)
- {
- if (strcmpi (sl->string, tmp) == 0)
- return (sl->value);
- sl = sl->next;
- }
- }
+ char tmp[256];
+
+ /* We want to be able to have option.observer or option.serverNick in rc */
+ if (observerMode)
+ {
+ strcpy (tmp, str);
+ strcat (tmp, ".observer");
+
+ sl = defaults;
+ while (sl != NULL)
+ {
+ if (strcmpi (sl->string, tmp) == 0)
+ return (sl->value);
+ sl = sl->next;
+ }
+ }
+
+ if (serverNick)
+ {
+ strcpy (tmp, str);
+ strcat (tmp, ".");
+ strcat (tmp, serverNick);
+
+ sl = defaults;
+ while (sl != NULL)
+ {
+ if (strcmpi (sl->string, tmp) == 0)
+ return (sl->value);
+ sl = sl->next;
+ }
+ }
+
+ if (serverType != ST_UNKNOWN)
+ {
+ strcpy (tmp, str);
+ switch (serverType)
+ {
+ case ST_PARADISE:
+ strcat (tmp, ".paradise");
+ break;
+ case ST_BRONCO:
+ strcat (tmp, ".bronco");
+ break;
+ case ST_CHAOS:
+ strcat (tmp, ".chaos");
+ break;
+ case ST_INL:
+ strcat (tmp, ".inl");
+ break;
+ case ST_STURGEON:
+ strcat (tmp, ".sturgeon");
+ break;
+ case ST_HOCKEY:
+ strcat (tmp, ".hockey");
+ break;
+ case ST_DOGFIGHT:
+ strcat (tmp, ".dogfight");
+ break;
+ default:
+ strcat (tmp, ".unknown");
+ }
+
+ sl = defaults;
+ while (sl != NULL)
+ {
+ if (strcmpi (sl->string, tmp) == 0)
+ return (sl->value);
+ sl = sl->next;
+ }
+ }
sl = defaults;
while (sl != NULL)
@@ -1205,8 +1219,8 @@
{
if (strcmpi (sl->value, srvName) == 0)
{
- tmpServerNick = strtok (sl->string, "."); /* Remove server. */
- tmpServerNick = strtok (NULL, "."); /* Get actual server nick */
+ tmpServerNick = strtok (sl->string, "."); /* Remove server. */
+ tmpServerNick = strtok (NULL, "."); /* Get actual server nick */
return strdup (tmpServerNick);
}
sl = sl->next;
@@ -1222,31 +1236,31 @@
getServerType (char *srvName)
{
struct stringlist *sl;
- char tmpTypeStr[128];
-
- sprintf (tmpTypeStr, "servertype.%s", srvName);
+ char tmpTypeStr[128];
+
+ sprintf (tmpTypeStr, "servertype.%s", srvName);
sl = defaults;
while (sl != NULL)
{
if (strcmpi (sl->string, tmpTypeStr) == 0)
{
- if (strcmpi (sl->value, "paradise") == 0)
- return ST_PARADISE;
- else if (strcmpi (sl->value, "bronco") == 0)
- return ST_BRONCO;
- else if (strcmpi (sl->value, "chaos") == 0)
- return ST_CHAOS;
- else if (strcmpi (sl->value, "inl") == 0)
- return ST_INL;
- else if (strcmpi (sl->value, "sturgeon") == 0)
- return ST_STURGEON;
- else if (strcmpi (sl->value, "hockey") == 0)
- return ST_HOCKEY;
- else if (strcmpi (sl->value, "dogfight") == 0)
- return ST_DOGFIGHT;
- else
- return ST_UNKNOWN;
+ if (strcmpi (sl->value, "paradise") == 0)
+ return ST_PARADISE;
+ else if (strcmpi (sl->value, "bronco") == 0)
+ return ST_BRONCO;
+ else if (strcmpi (sl->value, "chaos") == 0)
+ return ST_CHAOS;
+ else if (strcmpi (sl->value, "inl") == 0)
+ return ST_INL;
+ else if (strcmpi (sl->value, "sturgeon") == 0)
+ return ST_STURGEON;
+ else if (strcmpi (sl->value, "hockey") == 0)
+ return ST_HOCKEY;
+ else if (strcmpi (sl->value, "dogfight") == 0)
+ return ST_DOGFIGHT;
+ else
+ return ST_UNKNOWN;
}
sl = sl->next;
}
@@ -1429,6 +1443,10 @@
saveBig = booleanDefault ("saveBig", saveBig);
saveMacro = booleanDefault ("saveMacro", saveMacro);
saveRCD = booleanDefault ("saveRCD", saveRCD);
+ saveWindow = booleanDefault ("saveWindow", saveWindow);
+#ifdef RCM
+ saveBeeplite = booleanDefault ("saveBeeplite", saveBeeplite);
+#endif
#ifdef RCM
saveRCM = booleanDefault ("saveRCM", saveRCM);
#endif
@@ -1643,6 +1661,7 @@
updateWindowsGeometry (planetw);
updateWindowsGeometry (rankw);
updateWindowsGeometry (playerw);
+ updateWindowsGeometry (playerw2);
updateWindowsGeometry (helpWin);
updateWindowsGeometry (messwa);
updateWindowsGeometry (messwt);
@@ -1665,7 +1684,8 @@
updateWindowsGeometry (defWin);
#endif
#ifdef DOC_WIN
- updateWindowsGeometry (docwin);
+ updateWindowsGeometry (DocWin);
+ updateWindowsGeometry (xtrekrcWin);
#endif
for (i = 0; i < 4; i++)
updateWindowsGeometry (teamWin[i]);
@@ -1822,23 +1842,23 @@
// Default character name
if (pseudo != NULL)
{
- if (saveBig)
- fputs ("# Default character name\n", fp);
- sprintf (str, "name: %s\n", pseudo);
- fputs (str, fp);
- if (saveBig)
- fputs ("\n", fp);
+ if (saveBig)
+ fputs ("# Default character name\n", fp);
+ sprintf (str, "name: %s\n", pseudo);
+ fputs (str, fp);
+ if (saveBig)
+ fputs ("\n", fp);
}
// Login
if (login != NULL)
{
- if (saveBig)
- fputs ("# Login name\n", fp);
- sprintf (str, "login: %s\n", login);
- fputs (str, fp);
- if (saveBig)
- fputs ("\n", fp);
+ if (saveBig)
+ fputs ("# Login name\n", fp);
+ sprintf (str, "login: %s\n", login);
+ fputs (str, fp);
+ if (saveBig)
+ fputs ("\n", fp);
}
// Let's print buttonmap
@@ -1975,23 +1995,23 @@
// sound directory
if (sounddir != NULL)
{
- if (saveBig)
- fputs ("# Sound directory\n", fp);
- sprintf (str, "sounddir: %s\n", sounddir);
- fputs (str, fp);
- if (saveBig)
- fputs ("\n", fp);
+ if (saveBig)
+ fputs ("# Sound directory\n", fp);
+ sprintf (str, "sounddir: %s\n", sounddir);
+ fputs (str, fp);
+ if (saveBig)
+ fputs ("\n", fp);
}
// metacache
if (metaCache != NULL)
{
- if (saveBig)
- fputs ("# Metacache file\n", fp);
- sprintf (str, "metaCache: %s\n", metaCache);
- fputs (str, fp);
- if (saveBig)
- fputs ("\n", fp);
+ if (saveBig)
+ fputs ("# Metacache file\n", fp);
+ sprintf (str, "metaCache: %s\n", metaCache);
+ fputs (str, fp);
+ if (saveBig)
+ fputs ("\n", fp);
}
// player list
@@ -2036,6 +2056,585 @@
fputs ("\n", fp);
+ // Window placements
+ if (saveWindow)
+ {
+ char *adefault;
+
+ if (saveBig)
+ {
+ fputs ("# Window placements section\n", fp);
+ fputs ("\n", fp);
+ }
+
+ // Main window - always mapped
+ if ((adefault = stringDefault ("netrek.parent")) != NULL)
+ {
+ sprintf (str, "netrek.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("netrek.geometry")) != NULL)
+ {
+ sprintf (str, "netrek.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Local window - always mapped
+ if ((adefault = stringDefault ("local.parent")) != NULL)
+ {
+ sprintf (str, "local.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("local.geometry")) != NULL)
+ {
+ sprintf (str, "local.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Map window - always mapped
+ if ((adefault = stringDefault ("map.parent")) != NULL)
+ {
+ sprintf (str, "map.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("map.geometry")) != NULL)
+ {
+ sprintf (str, "map.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Dashboard window - always mapped
+ if ((adefault = stringDefault ("tstat.parent")) != NULL)
+ {
+ sprintf (str, "tstat.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("tstat.geometry")) != NULL)
+ {
+ sprintf (str, "tstat.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Warning window - always mapped
+ if ((adefault = stringDefault ("warn.parent")) != NULL)
+ {
+ sprintf (str, "warn.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("warn.geometry")) != NULL)
+ {
+ sprintf (str, "warn.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Message window - preferred mapped
+ if ((adefault = stringDefault ("message.parent")) != NULL)
+ {
+ sprintf (str, "message.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("message.geometry")) != NULL)
+ {
+ sprintf (str, "message.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("message.mapped", 1))
+ sprintf (str, "message.mapped: on\n");
+ else
+ sprintf (str, "message.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // Planet window
+ if ((adefault = stringDefault ("planet.parent")) != NULL)
+ {
+ sprintf (str, "planet.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("planet.geometry")) != NULL)
+ {
+ sprintf (str, "planet.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("planet.mapped", 0))
+ sprintf (str, "planet.mapped: on\n");
+ else
+ sprintf (str, "planet.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // Rank window
+ if ((adefault = stringDefault ("rank.parent")) != NULL)
+ {
+ sprintf (str, "rank.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("rank.geometry")) != NULL)
+ {
+ sprintf (str, "rank.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("rank.mapped", 0))
+ sprintf (str, "rank.mapped: on\n");
+ else
+ sprintf (str, "rank.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // Playerlist window - preferred mapped
+ if ((adefault = stringDefault ("player.parent")) != NULL)
+ {
+ sprintf (str, "player.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("player.geometry")) != NULL)
+ {
+ sprintf (str, "player.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("player.mapped", 1))
+ sprintf (str, "player.mapped: on\n");
+ else
+ sprintf (str, "player.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // Alternate playerlist window
+ if ((adefault = stringDefault ("player2.parent")) != NULL)
+ {
+ sprintf (str, "player2.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("player2.geometry")) != NULL)
+ {
+ sprintf (str, "player2.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("player2.mapped", 0))
+ sprintf (str, "player2.mapped: on\n");
+ else
+ sprintf (str, "player2.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // Help window
+ if ((adefault = stringDefault ("help.parent")) != NULL)
+ {
+ sprintf (str, "help.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("help.geometry")) != NULL)
+ {
+ sprintf (str, "help.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("help.mapped", 0))
+ sprintf (str, "help.mapped: on\n");
+ else
+ sprintf (str, "help.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // Review all window
+ if ((adefault = stringDefault ("review_all.parent")) != NULL)
+ {
+ sprintf (str, "review_all.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("review_all.geometry")) != NULL)
+ {
+ sprintf (str, "review_all.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("review_all.mapped", 0))
+ sprintf (str, "review_all.mapped: on\n");
+ else
+ sprintf (str, "review_all.mapped: off\n");
+ fputs (str, fp);
+ if ((adefault = stringDefault ("review_all.allow")) != NULL)
+ {
+ sprintf (str, "review_all.allow: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Review team window
+ if ((adefault = stringDefault ("review_team.parent")) != NULL)
+ {
+ sprintf (str, "review_team.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("review_team.geometry")) != NULL)
+ {
+ sprintf (str, "review_team.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("review_team.mapped", 0))
+ sprintf (str, "review_team.mapped: on\n");
+ else
+ sprintf (str, "review_team.mapped: off\n");
+ fputs (str, fp);
+ if ((adefault = stringDefault ("review_team.allow")) != NULL)
+ {
+ sprintf (str, "review_team.allow: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Review your window
+ if ((adefault = stringDefault ("review_your.parent")) != NULL)
+ {
+ sprintf (str, "review_your.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("review_your.geometry")) != NULL)
+ {
+ sprintf (str, "review_your.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("review_your.mapped", 0))
+ sprintf (str, "review_your.mapped: on\n");
+ else
+ sprintf (str, "review_your.mapped: off\n");
+ fputs (str, fp);
+ if ((adefault = stringDefault ("review_your.allow")) != NULL)
+ {
+ sprintf (str, "review_your.allow: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Review kill window
+ if ((adefault = stringDefault ("review_kill.parent")) != NULL)
+ {
+ sprintf (str, "review_kill.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("review_kill.geometry")) != NULL)
+ {
+ sprintf (str, "review_kill.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("review_kill.mapped", 0))
+ sprintf (str, "review_kill.mapped: on\n");
+ else
+ sprintf (str, "review_kill.mapped: off\n");
+ fputs (str, fp);
+ if ((adefault = stringDefault ("review_kill.allow")) != NULL)
+ {
+ sprintf (str, "review_kill.allow: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Review phaser window
+ if ((adefault = stringDefault ("review_phaser.parent")) != NULL)
+ {
+ sprintf (str, "review_phaser.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("review_phaser.geometry")) != NULL)
+ {
+ sprintf (str, "review_phaser.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("review_phaser.mapped", 0))
+ sprintf (str, "review_phaser.mapped: on\n");
+ else
+ sprintf (str, "review_phaser.mapped: off\n");
+ fputs (str, fp);
+ if ((adefault = stringDefault ("review_phaser.allow")) != NULL)
+ {
+ sprintf (str, "review_phaser.allow: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Review window - preferred mapped
+ if ((adefault = stringDefault ("review.parent")) != NULL)
+ {
+ sprintf (str, "review.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("review.geometry")) != NULL)
+ {
+ sprintf (str, "review.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("review.mapped", 1))
+ sprintf (str, "review.mapped: on\n");
+ else
+ sprintf (str, "review.mapped: off\n");
+ fputs (str, fp);
+ if ((adefault = stringDefault ("review.allow")) != NULL)
+ {
+ sprintf (str, "review.allow: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Ping Stats window
+ if ((adefault = stringDefault ("pingStats.parent")) != NULL)
+ {
+ sprintf (str, "pingStats.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("pingStats.geometry")) != NULL)
+ {
+ sprintf (str, "pingStats.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("pingStats.mapped", 0))
+ sprintf (str, "pingStats.mapped: on\n");
+ else
+ sprintf (str, "pingStats.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // UDP window
+ if ((adefault = stringDefault ("UDP.parent")) != NULL)
+ {
+ sprintf (str, "UDP.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("UDP.geometry")) != NULL)
+ {
+ sprintf (str, "UDP.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("UDP.mapped", 0))
+ sprintf (str, "UDP.mapped: on\n");
+ else
+ sprintf (str, "UDP.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+#ifdef SHORT_PACKETS
+ // Short packets window
+ if ((adefault = stringDefault ("network.parent")) != NULL)
+ {
+ sprintf (str, "network.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("network.geometry")) != NULL)
+ {
+ sprintf (str, "network.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("network.mapped", 0))
+ sprintf (str, "network.mapped: on\n");
+ else
+ sprintf (str, "network.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+#endif
+
+#ifdef TOOLS
+ // Tools window
+ if ((adefault = stringDefault ("tools.parent")) != NULL)
+ {
+ sprintf (str, "tools.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("tools.geometry")) != NULL)
+ {
+ sprintf (str, "tools.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("tools.mapped", 0))
+ sprintf (str, "tools.mapped: on\n");
+ else
+ sprintf (str, "tools.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+#endif
+
+#ifdef XTREKRC_HELP
+ // Xtrekrc help window
+ if ((adefault = stringDefault ("xtrekrc_help.parent")) != NULL)
+ {
+ sprintf (str, "xtrekrc_help.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("xtrekrc_help.geometry")) != NULL)
+ {
+ sprintf (str, "xtrekrc_help.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("xtrekrc_help.mapped", 0))
+ sprintf (str, "xtrekrc_help.mapped: on\n");
+ else
+ sprintf (str, "xtrekrc_help.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+#endif
+
+#ifdef DOC_WIN
+ // Documentation window
+ if ((adefault = stringDefault ("DocWin.parent")) != NULL)
+ {
+ sprintf (str, "DocWin.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("DocWin.geometry")) != NULL)
+ {
+ sprintf (str, "DocWin.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("DocWin.mapped", 0))
+ sprintf (str, "DocWin.mapped: on\n");
+ else
+ sprintf (str, "DocWin.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // Xtrekrc window
+ if ((adefault = stringDefault ("xtrekrcWin.parent")) != NULL)
+ {
+ sprintf (str, "xtrekrcWin.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("xtrekrcWin.geometry")) != NULL)
+ {
+ sprintf (str, "xtrekrcWin.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("xtrekrcWin.mapped", 0))
+ sprintf (str, "xtrekrcWin.mapped: on\n");
+ else
+ sprintf (str, "xtrekrcWin.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+#endif
+
+ // Fed team window - always mapped
+ if ((adefault = stringDefault ("fed.parent")) != NULL)
+ {
+ sprintf (str, "fed.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("fed.geometry")) != NULL)
+ {
+ sprintf (str, "fed.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Kli team window - always mapped
+ if ((adefault = stringDefault ("kli.parent")) != NULL)
+ {
+ sprintf (str, "kli.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("kli.geometry")) != NULL)
+ {
+ sprintf (str, "kli.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Ori team window - always mapped
+ if ((adefault = stringDefault ("ori.parent")) != NULL)
+ {
+ sprintf (str, "ori.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("ori.geometry")) != NULL)
+ {
+ sprintf (str, "ori.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Rom team window - always mapped
+ if ((adefault = stringDefault ("rom.parent")) != NULL)
+ {
+ sprintf (str, "rom.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("rom.geometry")) != NULL)
+ {
+ sprintf (str, "rom.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Quit window - always mapped
+ if ((adefault = stringDefault ("quit.parent")) != NULL)
+ {
+ sprintf (str, "quit.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("quit.geometry")) != NULL)
+ {
+ sprintf (str, "quit.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ fputs ("\n", fp);
+
+ // Stats window
+ if ((adefault = stringDefault ("stats.parent")) != NULL)
+ {
+ sprintf (str, "stats.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("stats.geometry")) != NULL)
+ {
+ sprintf (str, "stats.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("stats.mapped", 0))
+ sprintf (str, "stats.mapped: on\n");
+ else
+ sprintf (str, "stats.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // War window
+ if ((adefault = stringDefault ("war.parent")) != NULL)
+ {
+ sprintf (str, "war.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("war.geometry")) != NULL)
+ {
+ sprintf (str, "war.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("war.mapped", 0))
+ sprintf (str, "war.mapped: on\n");
+ else
+ sprintf (str, "war.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ // Sound window
+ if ((adefault = stringDefault ("sound.parent")) != NULL)
+ {
+ sprintf (str, "sound.parent: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if ((adefault = stringDefault ("sound.geometry")) != NULL)
+ {
+ sprintf (str, "sound.geometry: %s\n", adefault);
+ fputs (str, fp);
+ }
+ if (booleanDefault ("sound.mapped", 0))
+ sprintf (str, "sound.mapped: on\n");
+ else
+ sprintf (str, "sound.mapped: off\n");
+ fputs (str, fp);
+ fputs ("\n", fp);
+
+ if (saveBig)
+ fputs ("\n", fp);
+ }
+
// macros
if (saveMacro)
{
@@ -2347,7 +2946,6 @@
strcat (str, ": ");
strcat (str, dm->macro);
strcat (str, "\n");
-
fputs (str, fp);
}
@@ -2357,6 +2955,36 @@
fputs ("\n", fp);
}
+#ifdef BEEPLITE
+ // Beeplite macros
+ if (saveBeeplite)
+ {
+ char **lt;
+ if (saveBig)
+ fputs ("# Beeplite macros\n", fp);
+
+ for (lt = &distlite[1], dm = &dist_prefered[1]; dm->name; lt++, dm++)
+ {
+ if (*lt != NULL) // distlite array defined as NULL, so only save the ones
+ // that have been set either through reading in netrekrc
+ // or from defLite settings
+ {
+ strcpy (str, "lite.");
+ strcat (str, dm->name);
+ strcat (str, ": ");
+ strcat (str, *lt);
+ strcat (str, "\n");
+ fputs (str, fp);
+ }
+ }
+
+ fputs ("\n", fp);
+
+ if (saveBig)
+ fputs ("\n", fp);
+ }
+#endif
+
#ifdef RCM
// RCM macros
if (saveRCM)
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- data.c 26 May 2006 06:58:19 -0000 1.29
+++ data.c 28 May 2006 23:05:12 -0000 1.30
@@ -65,7 +65,7 @@
int messpend = 0;
#ifdef XTRA_MESSAGE_UI
int messageHUD = 0; /* Show message being typed on the local display */
-int messageHoldThresh = 0; /* Threshold value for putting a message on hold (squared) */
+int messageHoldThresh = 0; /* Threshold value for putting a message on hold (squared) */
int messMouseDelta = 0; /* To keep track of mouse movement delta */
#endif
int lastcount = 0;
@@ -433,7 +433,7 @@
struct dmacro_list dist_defaults[] = {
{(unsigned char) ('X'), "no zero", "this should never get looked at"},
/* ^t */
- {(unsigned char) ('\xd4'), "taking", " %T%c->%O (%S) Carrying %a to %l%?%n>-1%{ @ %n%}\0"},
+ {(unsigned char) ('\xd4'), "take", " %T%c->%O (%S) Carrying %a to %l%?%n>-1%{ @ %n%}\0"},
/* ^o */
{(unsigned char) ('\xcf'), "ogg", " %T%c->%O Help Ogg %p at %l\0"},
/* ^b */
@@ -700,9 +700,15 @@
char *saveFile = NULL;
int saveBig = 1;
+int saveWindow = 1;
int saveMacro = 1;
int saveRCD = 1;
+#ifdef BEEPLITE
+int saveBeeplite = 1;
+#endif
+#ifdef RCM
int saveRCM = 1;
+#endif
int tpDotDist = 10;
Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- beeplite.c 30 Apr 2006 15:59:39 -0000 1.8
+++ beeplite.c 28 May 2006 23:05:12 -0000 1.9
@@ -52,8 +52,8 @@
distlite[base_ogg] = "/g/m";
if (distlite[pickup] == NULL)
distlite[pickup] = "/p";
- if (distlite[generic] == NULL)
- distlite[generic] = "%?%S=SB%{/c%}";
+ if (distlite[help] == NULL)
+ distlite[help] = "%?%S=SB%{/c%}";
}
void liteplanet(struct planet *l)
Index: senddist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/senddist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- senddist.c 7 May 2006 16:59:27 -0000 1.4
+++ senddist.c 28 May 2006 23:05:12 -0000 1.5
@@ -57,8 +57,8 @@
dist->cloakflag = (unsigned char) (((me->p_flags & PFCLOAK) > 0) ? 1 : 0);
dist->distype = (unsigned char) i;
- if (dist->distype > generic || dist->distype < take)
- dist->distype = generic;
+ if (dist->distype > help || dist->distype < take)
+ dist->distype = help;
target = gettarget2 (me->p_x, me->p_y, TARG_PLANET);
dist->close_pl = (unsigned char) (target->o_num);
Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- option.c 24 May 2006 01:14:39 -0000 1.19
+++ option.c 28 May 2006 23:05:12 -0000 1.20
@@ -398,8 +398,12 @@
{0, "Save Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
{1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
{1, "", &saveBig, 0, 0, 0, savebigmess, NULL},
+ {1, "save window placements", &saveWindow, 0, 0, 0, NULL, NULL},
{1, "save macros", &saveMacro, 0, 0, 0, NULL, NULL},
{1, "save RCD", &saveRCD, 0, 0, 0, NULL, NULL},
+#ifdef BEEPLITE
+ {1, "save beeplite macros", &saveBeeplite, 0, 0, 0, NULL, NULL},
+#endif
#ifdef RCM
{1, "save RCM", &saveRCM, 0, 0, 0, NULL, NULL},
#endif