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

Xming: Correct the way display and screen number is reported in window titles and tooltips

Browse Source 
Correct the tooltip text for the toolbar X icon to be strictly correct, 'display-number:screen' should be ':display-number.screen'.
Also for the default window title.
Adjust the style of the Windows title in XDMCP mode from 'Xming - hostname' to 'hostname:display-number.screen'.

Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
This commit is contained in:
Colin Harrison 2008-11-02 20:46:38 +00:00 committed by Jon TURNEY
parent 656f92e247
commit 8d82d806ee
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xwin/wincreatewnd.c
View File

@ -88,7 +88,9 @@ winCreateBoundingWindowFullScreen (ScreenPtr pScreen)
snprintf (szTitle,
sizeof (szTitle),
WINDOW_TITLE_XDMCP,
g_pszQueryHost);
g_pszQueryHost,
display,
(int) pScreenInfo->dwScreen);
else
snprintf (szTitle,
sizeof (szTitle),
@ -331,7 +333,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
snprintf (szTitle,
sizeof (szTitle),
WINDOW_TITLE_XDMCP,
g_pszQueryHost);
g_pszQueryHost,
display,
(int) pScreenInfo->dwScreen);
else
snprintf (szTitle,
sizeof (szTitle),

2
hw/xwin/wintrayicon.c
View File

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

4
hw/xwin/winwindow.h
View File

@ -42,8 +42,8 @@
# define PROJECT_NAME "Cygwin/X"
#endif
#define WINDOW_CLASS "cygwin/x"
#define WINDOW_TITLE PROJECT_NAME " - %s:%d"
#define WINDOW_TITLE_XDMCP PROJECT_NAME " - %s"
#define WINDOW_TITLE PROJECT_NAME ":%s.%d"
#define WINDOW_TITLE_XDMCP "%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"