andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Imakefile

Browse Source 
InitOutput.c
XWin.rc
winerror.c
wintrayicon.c
winvideo.c
Set PROJECT_NAME in Imakefile to create alternative window titles for
    Cygwin/X and Xming
This commit is contained in:
Alexander Gottwald 2005-01-06 16:02:47 +00:00
parent 3165236483
commit d6a74f2c4a
7 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xwin/ChangeLog
View File

@ -1,3 +1,15 @@
2005-01-06 Alexander Gottwald <ago at freedesktop dot org>
* Imakefile
* InitOutput.c
* XWin.rc
* winerror.c
* wintrayicon.c
* winvideo.c
* winwindow.h:
Set PROJECT_NAME in Imakefile to create alternative window titles
for Cygwin/X and Xming
2005-01-06 Alexander Gottwald <ago at freedesktop dot org>
* winmultiwindowclass.c:

6
hw/xwin/InitOutput.c
View File

@ -759,7 +759,7 @@ winUseMsg (void)
ErrorF ("-lesspointer\n"
"\tHide the windows mouse pointer when it is over an inactive\n"
"\tCygwin/X window. This prevents ghost cursors appearing where\n"
"\t" PROJECT_NAME " window. This prevents ghost cursors appearing where\n"
"\tthe Windows cursor is drawn overtop of the X cursor\n");
ErrorF ("-nodecoration\n"
@ -891,7 +891,7 @@ ddxUseMsg(void)
/* Notify user where UseMsg text can be found.*/
if (!g_fNoHelpMessageBox)
winMessageBoxF ("The Cygwin/X help text has been printed to "
winMessageBoxF ("The " PROJECT_NAME " help text has been printed to "
"/tmp/XWin.log.\n"
"Please open /tmp/XWin.log to read the help text.\n",
MB_ICONINFORMATION);
@ -1104,7 +1104,7 @@ winCheckDisplayNumber ()
if (GetLastError () == ERROR_ALREADY_EXISTS)
{
ErrorF ("winCheckDisplayNumber - "
"Cygwin/X is already running on display %d\n",
PROJECT_NAME " is already running on display %d\n",
nDisp);
return FALSE;
}

15
hw/xwin/XWin.rc
View File

@ -31,7 +31,6 @@
#include "windows.h"
#include "winresource.h"
/*
* Dialogs
*/
@ -39,10 +38,10 @@
/* About */
ABOUT_BOX DIALOG DISCARDABLE 32, 32, 240, 105
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE
CAPTION "About Cygwin/X"
CAPTION "About " PROJECT_NAME
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "Cygwin/X Website", ID_ABOUT_WEBSITE, "Button",
CONTROL PROJECT_NAME " Website", ID_ABOUT_WEBSITE, "Button",
BS_OWNERDRAW | WS_TABSTOP, 30, 45, 75, 15
CONTROL "Change Log", ID_ABOUT_CHANGELOG, "Button",
BS_OWNERDRAW | WS_TABSTOP, 135, 45, 75, 15
@ -53,7 +52,7 @@ BEGIN
DEFPUSHBUTTON "Dismiss", IDOK, 95, 85, 50, 15
CTEXT "Welcome to the preliminary About box for the Cygwin/X X Server. This dialog was created on 2004/03/25 and will eventually be filled with more useful information. For now, use the links below to learn more about the Cygwin/X project.", IDC_STATIC, 5, 5, 230, 35
CTEXT "Welcome to the preliminary About box for the " PROJECT_NAME " X Server. This dialog was created on 2004/03/25 and will eventually be filled with more useful information. For now, use the links below to learn more about the " PROJECT_NAME " project.", IDC_STATIC, 5, 5, 230, 35
END
@ -62,12 +61,12 @@ END
DEPTH_CHANGE_BOX DIALOG DISCARDABLE 32, 32, 180, 100
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE
FONT 8, "MS Sans Serif"
CAPTION "Cygwin/X"
CAPTION PROJECT_NAME
BEGIN
DEFPUSHBUTTON "Dismiss", IDOK, 66, 80, 50, 14
CTEXT "Cygwin/X", IDC_STATIC, 40, 12, 100, 8
CTEXT PROJECT_NAME, IDC_STATIC, 40, 12, 100, 8
CTEXT "Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8
CTEXT "Restore previous resolution to use Cygwin/X.", IDC_STATIC, 7, 52, 166, 8
CTEXT "Restore previous resolution to use " PROJECT_NAME ".", IDC_STATIC, 7, 52, 166, 8
END
@ -76,7 +75,7 @@ END
EXIT_DIALOG DIALOG DISCARDABLE 32, 32, 180, 78
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE
FONT 8, "MS Sans Serif"
CAPTION "Cygwin/X - Exit?"
CAPTION PROJECT_NAME " - Exit?"
BEGIN
PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14
DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14

5
hw/xwin/winerror.c
View File

@ -78,7 +78,8 @@ OsVendorFatalError (void)
if (g_fSilentFatalError)
return;
winMessageBoxF ("A fatal error has occurred and Cygwin/X will now exit.\n" \
winMessageBoxF (
"A fatal error has occurred and " PROJECT_NAME " will now exit.\n" \
"Please open /tmp/XWin.log for more information.\n",
MB_ICONERROR);
}
@ -120,7 +121,7 @@ winMessageBoxF (const char *pszError, UINT uType, ...)
/* Display the message box string */
MessageBox (NULL,
pszMsgBox,
"Cygwin/X",
PROJECT_NAME,
MB_OK | uType);
winMessageBoxF_Cleanup:

2
hw/xwin/wintrayicon.c
View File

@ -57,7 +57,7 @@ winInitNotifyIcon (winPrivScreenPtr pScreenPriv)
/* Set display and screen-specific tooltip text */
snprintf (nid.szTip,
sizeof (nid.szTip),
"Cygwin/X Server - %s:%d",
PROJECT_NAME " Server - %s:%d",
display,
(int) pScreenInfo->dwScreen);

2
hw/xwin/winvideo.c
View File

@ -145,7 +145,7 @@ winSetupImageVideo (ScreenPtr pScreen)
adapt->type = XvWindowMask | XvInputMask | XvImageMask;
adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
adapt->name = "Cygwin/X Video Overlay";
adapt->name = PROJECT_NAME " Video Overlay";
adapt->nEncodings = 1;
adapt->pEncodings = DummyEncoding;
adapt->nFormats = NUM_FORMATS;

9
hw/xwin/winwindow.h
View File

@ -39,12 +39,15 @@
#endif
/* Constant strings */
#ifndef PROJECT_NAME
# define PROJECT_NAME "Cygwin/X"
#endif
#define WINDOW_CLASS "cygwin/x"
#define WINDOW_TITLE "Cygwin/X - %s:%d"
#define WINDOW_TITLE_XDMCP "Cygwin/X - %s"
#define WINDOW_TITLE PROJECT_NAME " - %s:%d"
#define WINDOW_TITLE_XDMCP PROJECT_NAME " - %s"
#define WIN_SCR_PROP "cyg_screen_prop rl"
#define WINDOW_CLASS_X "cygwin/x X rl"
#define WINDOW_TITLE_X "Cygwin/X X"
#define WINDOW_TITLE_X PROJECT_NAME " X"
#define WIN_WINDOW_PROP "cyg_window_prop_rl"
#ifdef HAS_DEVWINDOWS
# define WIN_MSG_QUEUE_FNAME "/dev/windows"