r666 - in trunk/code: qcommon unix win32

[DONOTREPLY at icculus.org]

Author: tma
Date: 2006-03-24 12:28:27 -0500 (Fri, 24 Mar 2006)
New Revision: 666

Modified:
   trunk/code/qcommon/q_shared.h
   trunk/code/unix/linux_glimp.c
   trunk/code/unix/sdl_glimp.c
   trunk/code/win32/win_glimp.c
   trunk/code/win32/win_syscon.c
Log:
* Change window title


Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h	2006-03-24 16:28:07 UTC (rev 665)
+++ trunk/code/qcommon/q_shared.h	2006-03-24 17:28:27 UTC (rev 666)
@@ -26,7 +26,11 @@
 // q_shared.h -- included first by ALL program modules.
 // A user mod should never modify this file
 
-#define	Q3_VERSION		"ioQ3 1.34-rc1"
+#define Q3_VERSION            "ioq3 1.33"
+#define CLIENT_WINDOW_TITLE   "icculus.org/quake3"
+#define CLIENT_WINDOW_ICON    "ioq3"
+#define CONSOLE_WINDOW_TITLE  "icculus.org/quake3 console"
+#define CONSOLE_WINDOW_ICON   "ioq3 console"
 // 1.32 released 7-10-2002
 
 #define MAX_TEAMNAME 32

Modified: trunk/code/unix/linux_glimp.c
===================================================================
--- trunk/code/unix/linux_glimp.c	2006-03-24 16:28:07 UTC (rev 665)
+++ trunk/code/unix/linux_glimp.c	2006-03-24 17:28:27 UTC (rev 666)
@@ -81,8 +81,6 @@
 #define HAVE_XF86DGA
 #endif
 
-#define	WINDOW_CLASS_NAME	"Quake III: Arena"
-
 typedef enum
 {
   RSERR_OK,
@@ -1150,7 +1148,7 @@
                       0, visinfo->depth, InputOutput,
                       visinfo->visual, mask, &attr);
 
-  XStoreName( dpy, win, WINDOW_CLASS_NAME );
+  XStoreName( dpy, win, CLIENT_WINDOW_TITLE );
 
   /* GH: Don't let the window be resized */
   sizehints.flags = PMinSize | PMaxSize;

Modified: trunk/code/unix/sdl_glimp.c
===================================================================
--- trunk/code/unix/sdl_glimp.c	2006-03-24 16:28:07 UTC (rev 665)
+++ trunk/code/unix/sdl_glimp.c	2006-03-24 17:28:27 UTC (rev 666)
@@ -89,9 +89,6 @@
 
 static QGLContext opengl_context;
 
-#define	WINDOW_CLASS_NAME	"Quake III: Arena"
-#define	WINDOW_CLASS_NAME_BRIEF	"quake3"
-
 //#define KBD_DBG
 
 typedef enum
@@ -632,7 +629,7 @@
     SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, tstencilbits );
     SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
 
-    SDL_WM_SetCaption(WINDOW_CLASS_NAME, WINDOW_CLASS_NAME_BRIEF);
+    SDL_WM_SetCaption(CLIENT_WINDOW_TITLE, CLIENT_WINDOW_ICON);
     SDL_ShowCursor(0);
     SDL_EnableUNICODE(1);
     SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);

Modified: trunk/code/win32/win_glimp.c
===================================================================
--- trunk/code/win32/win_glimp.c	2006-03-24 16:28:07 UTC (rev 665)
+++ trunk/code/win32/win_glimp.c	2006-03-24 17:28:27 UTC (rev 666)
@@ -57,8 +57,6 @@
 #define TRY_PFD_FAIL_SOFT	1
 #define TRY_PFD_FAIL_HARD	2
 
-#define	WINDOW_CLASS_NAME	"Quake 3: Arena"
-
 static void		GLW_InitExtensions( void );
 static rserr_t	GLW_SetMode( const char *drivername, 
 							 int mode, 
@@ -600,7 +598,7 @@
 		wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
 		wc.hbrBackground = (void *)COLOR_GRAYTEXT;
 		wc.lpszMenuName  = 0;
-		wc.lpszClassName = WINDOW_CLASS_NAME;
+		wc.lpszClassName = CLIENT_WINDOW_TITLE;
 
 		if ( !RegisterClass( &wc ) )
 		{
@@ -669,8 +667,8 @@
 
 		g_wv.hWnd = CreateWindowEx (
 			 exstyle, 
-			 WINDOW_CLASS_NAME,
-			 "Quake 3: Arena",
+			 CLIENT_WINDOW_TITLE,
+			 CLIENT_WINDOW_TITLE,
 			 stylebits,
 			 x, y, w, h,
 			 NULL,

Modified: trunk/code/win32/win_syscon.c
===================================================================
--- trunk/code/win32/win_syscon.c	2006-03-24 16:28:07 UTC (rev 665)
+++ trunk/code/win32/win_syscon.c	2006-03-24 17:28:27 UTC (rev 666)
@@ -334,7 +334,7 @@
 
 	s_wcd.hWnd = CreateWindowEx( 0,
 							   DEDCLASS,
-							   "Quake 3 Console",
+							   CONSOLE_WINDOW_TITLE,
 							   DEDSTYLE,
 							   ( swidth - 600 ) / 2, ( sheight - 450 ) / 2 , rect.right - rect.left + 1, rect.bottom - rect.top + 1,
 							   NULL,