Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19533/include
Modified Files:
data.h proto.h
Log Message:
Rewrote TTS centering/refresh code so that text is properly centered and clears properly when the message expires.
The old code used an average text width that was not so good, resulting in poor centering for long messages. The new code measures the length of the message directly.
Also, the W_ClearArea function was not catching the 3 left-most pixels for whatever reason, so the call to this function slightly extends the area to clear.
Updated COW manual to reflect change of tts_pos variable to tts_ypos.
This patch could be applied to other windows clients as well.
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- data.h 18 Apr 2006 13:41:48 -0000 1.4
+++ data.h 19 Apr 2006 13:02:33 -0000 1.5
@@ -392,10 +392,11 @@
extern int tts_len;
extern int tts_max_len;
-extern int tts_width;
+extern int last_tts_xpos;
+extern int last_tts_width;
extern int tts_timer;
extern int tts_time;
-extern int tts_pos;
+extern int tts_ypos;
extern char lastIn[100];
#endif /* BEEPLITE */
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- proto.h 18 Apr 2006 13:41:48 -0000 1.4
+++ proto.h 19 Apr 2006 13:02:33 -0000 1.5
@@ -687,17 +687,14 @@
W_Icon icon,
W_Color color);
void W_EraseTTSText (W_Window window,
- int max_width,
- int y,
- int width);
+ int last_tts_xpos,
+ int tts_ypos,
+ int last_tts_width);
void W_WriteTTSText (W_Window window,
int max_width,
- int y,
- int width,
+ int tts_ypos,
char *str,
int len);
-int W_TTSTextWidth (char *s,
- int len);
void W_SetWindowName (W_Window window,
char *name);
inline void ResetSysColors (void);