diff options
Diffstat (limited to 'xorg-server/hw/xwin/wincreatewnd.c')
| -rw-r--r-- | xorg-server/hw/xwin/wincreatewnd.c | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c index 6732dcb58..597f6bc4e 100644 --- a/xorg-server/hw/xwin/wincreatewnd.c +++ b/xorg-server/hw/xwin/wincreatewnd.c @@ -60,10 +60,10 @@ winCreateBoundingWindowFullScreen(ScreenPtr pScreen) HWND *phwnd = &pScreenPriv->hwndScreen; WNDCLASSEX wc; char szTitle[256]; + char HostName[256]; + gethostname(HostName,256); -#if CYGDEBUG winDebug("winCreateBoundingWindowFullScreen\n"); -#endif /* Setup our window class */ wc.cbSize = sizeof(WNDCLASSEX); @@ -91,12 +91,13 @@ winCreateBoundingWindowFullScreen(ScreenPtr pScreen) snprintf(szTitle, sizeof(szTitle), WINDOW_TITLE_XDMCP, - g_pszQueryHost, display, (int) pScreenInfo->dwScreen); + g_pszQueryHost, HostName, display, (int) pScreenInfo->dwScreen); else + { snprintf(szTitle, sizeof(szTitle), - WINDOW_TITLE, display, (int) pScreenInfo->dwScreen); - + WINDOW_TITLE, HostName, display, (int) pScreenInfo->dwScreen); + } /* Create the window */ *phwnd = CreateWindowExA(0, /* Extended styles */ WINDOW_CLASS, /* Class name */ @@ -153,6 +154,9 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) DWORD dwWindowStyle; BOOL fForceShowWindow = FALSE; char szTitle[256]; + char HostName[256]; + + gethostname(HostName,256); winDebug("winCreateBoundingWindowWindowed - User w: %d h: %d\n", (int) pScreenInfo->dwUserWidth, (int) pScreenInfo->dwUserHeight); @@ -244,10 +248,8 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) /* Did the user specify a height and width? */ if (pScreenInfo->fUserGaveHeightAndWidth) { /* User gave a desired height and width, try to accomodate */ -#if CYGDEBUG winDebug("winCreateBoundingWindowWindowed - User gave height " "and width\n"); -#endif /* Adjust the window width and height for borders and title bar */ if (pScreenInfo->fDecoration @@ -259,27 +261,21 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) && !pScreenInfo->fMultiWindow #endif ) { -#if CYGDEBUG winDebug ("winCreateBoundingWindowWindowed - Window has decoration\n"); -#endif /* Are we resizable */ if (pScreenInfo->iResizeMode != notAllowed) { -#if CYGDEBUG winDebug ("winCreateBoundingWindowWindowed - Window is resizable\n"); -#endif iWidth += 2 * GetSystemMetrics(SM_CXSIZEFRAME); iHeight += 2 * GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYCAPTION); } else { -#if CYGDEBUG winDebug ("winCreateBoundingWindowWindowed - Window is not resizable\n"); -#endif iWidth += 2 * GetSystemMetrics(SM_CXFIXEDFRAME); iHeight += 2 * GetSystemMetrics(SM_CYFIXEDFRAME) @@ -289,10 +285,8 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) } else { /* By default, we are creating a window that is as large as possible */ -#if CYGDEBUG winDebug("winCreateBoundingWindowWindowed - User did not give " "height and width\n"); -#endif /* Defaults are wrong if we have multiple monitors */ if (pScreenInfo->fMultipleMonitors) { iWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN); @@ -317,10 +311,8 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) if (iHeight >= (rcWorkArea.bottom - rcWorkArea.top)) iHeight = rcWorkArea.bottom - rcWorkArea.top; -#if CYGDEBUG winDebug("winCreateBoundingWindowWindowed - Adjusted width: %d " "height: %d\n", iWidth, iHeight); -#endif } /* Set display and screen-specific tooltip text */ @@ -328,11 +320,13 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) snprintf(szTitle, sizeof(szTitle), WINDOW_TITLE_XDMCP, - g_pszQueryHost, display, (int) pScreenInfo->dwScreen); + g_pszQueryHost, HostName, display, (int) pScreenInfo->dwScreen); else + { snprintf(szTitle, sizeof(szTitle), - WINDOW_TITLE, display, (int) pScreenInfo->dwScreen); + WINDOW_TITLE, HostName, display, (int) pScreenInfo->dwScreen); + } /* Create the window */ *phwnd = CreateWindowExA(0, /* Extended styles */ @@ -351,9 +345,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) return FALSE; } -#if CYGDEBUG winDebug("winCreateBoundingWindowWindowed - CreateWindowEx () returned\n"); -#endif if (fForceShowWindow) { ErrorF |