From fdd1017b307eb3b561f0af06344285d3a05d60e6 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 29 Jul 2009 08:32:27 +0000 Subject: Changed project name and window titles --- include/dix-config.h | 18 ++--- include/xwin-config.h | 2 +- xorg-server/hw/xwin/XWin.rc | 20 +++--- xorg-server/hw/xwin/wincreatewnd.c | 15 +++- xorg-server/hw/xwin/winmultiwindowwndproc.c | 4 +- xorg-server/hw/xwin/wintrayicon.c | 6 +- xorg-server/hw/xwin/winwindow.h | 10 +-- xorg-server/system.XWinrc | 9 ++- xorg-server/xwin.rc | 106 ---------------------------- 9 files changed, 48 insertions(+), 142 deletions(-) delete mode 100644 xorg-server/xwin.rc diff --git a/include/dix-config.h b/include/dix-config.h index 1a0f2d1f7..cdf3cf068 100644 --- a/include/dix-config.h +++ b/include/dix-config.h @@ -13,22 +13,22 @@ #define BIGREQS 1 /* Builder address */ -#define BUILDERADDR "cygwin-xfree@cygwin.com" +#define BUILDERADDR "hmca@telenet.be" /* Operating System Name */ -#define OSNAME "Cygwin" +#define OSNAME "Win32" /* Operating System Vendor */ -#define OSVENDOR "Red Hat" +#define OSVENDOR "Microsoft" /* Builder string */ #define BUILDERSTRING "" /* Default font path */ -#define COMPILEDDEFAULTFONTPATH "fonts/misc/,fonts/TTF/,fonts/OTF,fonts/Type1/,fonts/100dpi/,fonts/75dpi/,built-ins" +#define COMPILEDDEFAULTFONTPATH "fonts/misc/,fonts/TTF/,fonts/OTF,fonts/Type1/,fonts/100dpi/,fonts/75dpi/,fonts/cyrillic/,fonts/encodings/,fonts/Speedo/,built-ins" /* Miscellaneous server configuration files path */ -#define SERVER_MISC_CONFIG_PATH "."///usr/lib/X11" +#define SERVER_MISC_CONFIG_PATH "." /* Support Composite Extension */ #define COMPOSITE 1 @@ -72,7 +72,7 @@ /* #undef GLX_DRI */ /* Path to DRI drivers */ -#define DRI_DRIVER_PATH "/usr/lib/dri" +#define DRI_DRIVER_PATH "" /* Include handhelds.org h3600 touchscreen driver */ /* #undef H3600_TS */ @@ -405,10 +405,10 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 10000000) + ((0) * 100000) + ((0) * 1000) + 0) /* Xorg release date */ -#define XORG_DATE "5 November 2008" +#define XORG_DATE "2 August 2009" /* Build Xv Extension */ /* #undef XvExtension */ @@ -455,7 +455,7 @@ #define DBE 1 /* Vendor name */ -#define XVENDORNAME "The Cygwin/X Project" +#define XVENDORNAME "The VcXsrv Project" /* Endian order */ #ifndef X_BYTE_ORDER diff --git a/include/xwin-config.h b/include/xwin-config.h index 9646ab8cd..de6a2b55e 100644 --- a/include/xwin-config.h +++ b/include/xwin-config.h @@ -25,7 +25,7 @@ /* #undef NEED_SNPRINTF */ /* Vendor web address for support */ -#define __VENDORDWEBSUPPORT__ "http://x.cygwin.com/" +#define __VENDORDWEBSUPPORT__ "http://www.hmca.be/" /* Default log location */ #define DEFAULT_LOGDIR "." diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index cbe5244e9..fd45f2d2f 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -40,15 +40,15 @@ /* About */ ABOUT_BOX DIALOGEX 32, 32, 260, 95 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE -CAPTION "About XSrv" +CAPTION "About VcXsrv" FONT 8, "MS Shell Dlg 2" BEGIN CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32 - LTEXT "XSrv X Server ", IDC_STATIC, 36, 8, 220, 8 - LTEXT "Version 0.0 (1 Jan 2009)", IDC_STATIC, 36, 18, 220, 8 - LTEXT "This product is licensed under the terms of the MIT/X11 License.", IDC_STATIC, 36, 38, 220, 20 - CONTROL __VENDORDWEBSUPPORT__, ID_ABOUT_WEBSITE, "Button", - BS_OWNERDRAW | WS_TABSTOP, 36, 58, 68, 8 + LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8 + LTEXT "Version 1.0 (1 Aug 2009)", IDC_STATIC, 36, 18, 220, 8 +// LTEXT "This product is licensed under the terms of the MIT/X11 License.", IDC_STATIC, 36, 38, 220, 20 +// CONTROL __VENDORDWEBSUPPORT__, ID_ABOUT_WEBSITE, "Button", +// BS_OWNERDRAW | WS_TABSTOP, 36, 58, 68, 8 DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15 END @@ -58,12 +58,12 @@ END DEPTH_CHANGE_BOX DIALOGEX 32, 32, 180, 100 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE FONT 8, "MS Shell Dlg 2" -CAPTION "XSrv" +CAPTION "VcXsrv" BEGIN DEFPUSHBUTTON "Dismiss", IDOK, 66, 80, 50, 14 - CTEXT "VCXSrv", IDC_STATIC, 40, 12, 100, 8 + CTEXT "VcXsrv", IDC_STATIC, 40, 12, 100, 8 CTEXT "Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8 - CTEXT "Restore previous resolution to use VCXSrv.", IDC_STATIC, 7, 52, 166, 8 + CTEXT "Restore previous resolution to use VcXsrv.", IDC_STATIC, 7, 52, 166, 8 END @@ -72,7 +72,7 @@ END EXIT_DIALOG DIALOGEX 32, 32, 180, 78 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE FONT 8, "MS Shell Dlg 2" -CAPTION "Exit VCXSrv?" +CAPTION "Exit VcXsrv?" BEGIN PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14 DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14 diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c index 85b6cf8a9..78aea0e47 100644 --- a/xorg-server/hw/xwin/wincreatewnd.c +++ b/xorg-server/hw/xwin/wincreatewnd.c @@ -91,13 +91,17 @@ winCreateBoundingWindowFullScreen (ScreenPtr pScreen) g_pszQueryHost, display, (int) pScreenInfo->dwScreen); - else + else + { + char HostName[256]; + gethostname(HostName,256); snprintf (szTitle, sizeof (szTitle), WINDOW_TITLE, + HostName, display, (int) pScreenInfo->dwScreen); - + } /* Create the window */ *phwnd = CreateWindowExA (0, /* Extended styles */ WINDOW_CLASS, /* Class name */ @@ -336,12 +340,17 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen) g_pszQueryHost, display, (int) pScreenInfo->dwScreen); - else + else + { + char HostName[256]; + gethostname(HostName,256); snprintf (szTitle, sizeof (szTitle), WINDOW_TITLE, + HostName, display, (int) pScreenInfo->dwScreen); + } /* Create the window */ *phwnd = CreateWindowExA (0, /* Extended styles */ diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c index d6182976e..8fbf343e1 100644 --- a/xorg-server/hw/xwin/winmultiwindowwndproc.c +++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c @@ -440,7 +440,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message, SetWindowRgn (hwnd, hRgnWindow, TRUE); DeleteObject(hRgnWindow); - SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)XMING_SIGNATURE); + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)VCXSRV_SIGNATURE); } return 0; @@ -903,7 +903,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message, #endif if (forHwnd != NULL) { - if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)XMING_SIGNATURE) + if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)VCXSRV_SIGNATURE) { if (GetWindowLongPtr(forHwnd, GWL_EXSTYLE) & WS_EX_TOPMOST) SetWindowPos (hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); diff --git a/xorg-server/hw/xwin/wintrayicon.c b/xorg-server/hw/xwin/wintrayicon.c index 054a8e956..9cd1e5c3c 100644 --- a/xorg-server/hw/xwin/wintrayicon.c +++ b/xorg-server/hw/xwin/wintrayicon.c @@ -45,6 +45,7 @@ winInitNotifyIcon (winPrivScreenPtr pScreenPriv) { winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; NOTIFYICONDATA nid = {0}; + char HostName[256]; nid.cbSize = sizeof (NOTIFYICONDATA); nid.hWnd = pScreenPriv->hwndScreen; @@ -55,11 +56,14 @@ winInitNotifyIcon (winPrivScreenPtr pScreenPriv) /* Save handle to the icon so it can be freed later */ pScreenPriv->hiconNotifyIcon = nid.hIcon; + + gethostname(HostName,256); /* Set display and screen-specific tooltip text */ snprintf (nid.szTip, sizeof (nid.szTip), - PROJECT_NAME " Server - %s:%d", + PROJECT_NAME " Server - %s:%s.%d", + HostName, display, (int) pScreenInfo->dwScreen); diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h index 71c5b015e..258913f06 100644 --- a/xorg-server/hw/xwin/winwindow.h +++ b/xorg-server/hw/xwin/winwindow.h @@ -41,11 +41,11 @@ /* Constant strings */ #ifndef PROJECT_NAME -# define PROJECT_NAME "Cygwin/X" +# define PROJECT_NAME "VcXsrv" #endif -#define WINDOW_CLASS "cygwin/x" -#define WINDOW_TITLE PROJECT_NAME ":%s.%d" -#define WINDOW_TITLE_XDMCP "%s:%s.%d" +#define WINDOW_CLASS "VcXsrv/x" +#define WINDOW_TITLE PROJECT_NAME " Server - %s:%s.%d" +#define WINDOW_TITLE_XDMCP PROJECT_NAME " Server - %s:%s.%d" #define WIN_SCR_PROP "cyg_screen_prop rl" #define WINDOW_CLASS_X "cygwin/x X rl" #define WINDOW_TITLE_X PROJECT_NAME " X" @@ -62,7 +62,7 @@ #define CYGWINDOWING_DEBUG NO #endif -#define XMING_SIGNATURE 0x12345678L +#define VCXSRV_SIGNATURE 0xdeaddeadL typedef struct _winPrivScreenRec *winPrivScreenPtr; diff --git a/xorg-server/system.XWinrc b/xorg-server/system.XWinrc index 2360bfc00..db1fd9100 100644 --- a/xorg-server/system.XWinrc +++ b/xorg-server/system.XWinrc @@ -80,16 +80,15 @@ // Make some menus... menu apps { xterm exec "xterm" - "Emacs" exec "emacs" notepad exec notepad xload exec "xload -display %display%" # Comment } menu root { // Comments fit here, too... - "Reload .XWinrc" RELOAD + "Reload system.XWinrc" RELOAD "Applications" menu apps - SEParATOR + Separator } menu aot { @@ -100,7 +99,7 @@ menu aot { menu xtermspecial { "Emacs" exec "emacs" "Always on Top" alwaysontop - SepArAtor + Separator } RootMenu root @@ -121,5 +120,5 @@ SysMenu { # SilentExit -DEBUG "Done parsing the configuration file..." +# DEBUG "Done parsing the configuration file..." diff --git a/xorg-server/xwin.rc b/xorg-server/xwin.rc deleted file mode 100644 index cbe5244e9..000000000 --- a/xorg-server/xwin.rc +++ /dev/null @@ -1,106 +0,0 @@ -/* - *Copyright (C) 2002-2004 Harold L Hunt II All Rights Reserved. - *Copyright (C) 2008 Yaakov Selkowitz All Rights Reserved - * - *Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - *"Software"), to deal in the Software without restriction, including - *without limitation the rights to use, copy, modify, merge, publish, - *distribute, sublicense, and/or sell copies of the Software, and to - *permit persons to whom the Software is furnished to do so, subject to - *the following conditions: - * - *The above copyright notice and this permission notice shall be - *included in all copies or substantial portions of the Software. - * - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR - *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *Except as contained in this notice, the names of the authors - *shall not be used in advertising or otherwise to promote the sale, use - *or other dealings in this Software without prior written authorization - *from the authors. - * - * Authors: Harold L Hunt II, Yaakov Selkowitz - */ - -#include -#include "winresource.h" -#include "xwin-config.h" - -/* - * Dialogs - */ - -/* About */ -ABOUT_BOX DIALOGEX 32, 32, 260, 95 -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE -CAPTION "About XSrv" -FONT 8, "MS Shell Dlg 2" -BEGIN - CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32 - LTEXT "XSrv X Server ", IDC_STATIC, 36, 8, 220, 8 - LTEXT "Version 0.0 (1 Jan 2009)", IDC_STATIC, 36, 18, 220, 8 - LTEXT "This product is licensed under the terms of the MIT/X11 License.", IDC_STATIC, 36, 38, 220, 20 - CONTROL __VENDORDWEBSUPPORT__, ID_ABOUT_WEBSITE, "Button", - BS_OWNERDRAW | WS_TABSTOP, 36, 58, 68, 8 - DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15 -END - - -/* Depth change */ - -DEPTH_CHANGE_BOX DIALOGEX 32, 32, 180, 100 -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE -FONT 8, "MS Shell Dlg 2" -CAPTION "XSrv" -BEGIN - DEFPUSHBUTTON "Dismiss", IDOK, 66, 80, 50, 14 - CTEXT "VCXSrv", IDC_STATIC, 40, 12, 100, 8 - CTEXT "Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8 - CTEXT "Restore previous resolution to use VCXSrv.", IDC_STATIC, 7, 52, 166, 8 -END - - -/* Exit */ - -EXIT_DIALOG DIALOGEX 32, 32, 180, 78 -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE -FONT 8, "MS Shell Dlg 2" -CAPTION "Exit VCXSrv?" -BEGIN - PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14 - DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14 - CTEXT "Exiting will close all screens running on this display.", IDC_STATIC, 7, 12, 166, 8 - CTEXT "No information about connected clients available.", IDC_CLIENTS_CONNECTED, 7, 24, 166, 8 - CTEXT "Proceed with shutdown of this display/server?", IDC_STATIC, 7, 36, 166, 8 -END - - -/* - * Menus - */ - -IDM_TRAYICON_MENU MENU -BEGIN - POPUP "TRAYICON_MENU" - BEGIN - MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT - MENUITEM "&About...", ID_APP_ABOUT - MENUITEM SEPARATOR - MENUITEM "E&xit...", ID_APP_EXIT - END -END - - -/* - * Icons - */ - -IDI_XWIN ICON "X.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "XWin.exe.manifest" -- cgit v1.2.3