Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16:/tmp/cvs-serv17585/include
Modified Files:
proto.h struct.h
Log Message:
This patch focuses on getting windows geometries to save via
the in-game save key.
Redefined win->orig_* to mean not the values in newwin(), but
rather the original values as determined by the netrekrc.
New variables to window struct, win->actual_*, which are defined
at the exact moment of window creation to get the true screen
coordinates of the original window (note that these are NOT the
same as the coordinates you put in the netrekrc file! They are
modified by things like border, padding, system metrics, etc).
New function checkWindowsGeometry() which checks current
windows placement vs. the placement that was originally given
(win->actual_*).
If they differ, to then backwards convert the current screen
coordinates into a netrekrc entry, the current coordinates are
modified by (win->actual_* - win->orig_*), to take into account
things like borders, padding, etc.
If they don't differ, then the netrekrc string is used (i.e.
"local.geometry: xxxx").
In the in-game save function, a call to checkWindowGeometry
is made to get the geometry. Also, the current mapped state of
window is used for saving, rather than the one from the netrekrc,
so that if people change window mappings, they save.
Fixed documentation incorrectness on playerListObserver option.
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- struct.h 9 Apr 2007 02:52:30 -0000 1.17
+++ struct.h 10 Apr 2007 00:44:02 -0000 1.18
@@ -656,6 +656,10 @@
int orig_y;
int orig_width;
int orig_height;
+ int actual_x;
+ int actual_y;
+ int actual_width;
+ int actual_height;
int wam; /* Window Allowed Messages */
int sdb_flags; /* SDB flags */
}
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- proto.h 9 Apr 2007 11:07:17 -0000 1.47
+++ proto.h 10 Apr 2007 00:44:02 -0000 1.48
@@ -767,6 +767,7 @@
char *name);
inline void ResetSysColors (void);
inline void SetTrekSysColors (void);
+char * checkWindowsGeometry (W_Window win);
void updateWindowsGeometry (W_Window win);
void W_MessageAllowedWindows (int messtype,
int x,