diff options
Diffstat (limited to 'xorg-server/hw/xwin/winprocarg.c')
| -rw-r--r-- | xorg-server/hw/xwin/winprocarg.c | 1792 |
1 files changed, 859 insertions, 933 deletions
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c index 1418f78bc..bb7f2fd94 100644 --- a/xorg-server/hw/xwin/winprocarg.c +++ b/xorg-server/hw/xwin/winprocarg.c @@ -42,9 +42,9 @@ from The Open Group. */ #ifdef XWIN_CLIPBOARD -extern Bool g_fUnicodeClipboard; -extern Bool g_fClipboard; -extern Bool g_fClipboardPrimary; +extern Bool g_fUnicodeClipboard; +extern Bool g_fClipboard; +extern Bool g_fClipboardPrimary; #endif /* @@ -52,13 +52,13 @@ extern Bool g_fClipboardPrimary; */ void -winLogCommandLine (int argc, char *argv[]); + winLogCommandLine(int argc, char *argv[]); void -winLogVersionInfo (void); + winLogVersionInfo(void); #ifdef DDXOSVERRORF -void OsVendorVErrorF (const char *pszFormat, va_list va_args); +void OsVendorVErrorF(const char *pszFormat, va_list va_args); #endif /* @@ -71,122 +71,128 @@ static winScreenInfo defaultScreenInfo; static void winInitializeScreenDefaults(void) { - DWORD dwWidth, dwHeight; - static Bool fInitializedScreenDefaults = FALSE; - - /* Bail out early if default screen has already been initialized */ - if (fInitializedScreenDefaults) - return; - - /* Zero the memory used for storing the screen info */ - memset(&defaultScreenInfo, 0, sizeof(winScreenInfo)); - - /* Get default width and height */ - /* - * NOTE: These defaults will cause the window to cover only - * the primary monitor in the case that we have multiple monitors. - */ - dwWidth = GetSystemMetrics (SM_CXSCREEN); - dwHeight = GetSystemMetrics (SM_CYSCREEN); - - winDebug ("winInitializeScreenDefaults - primary monitor w %d h %d\n", (int) dwWidth, (int) dwHeight); - - /* Set a default DPI, if no '-dpi' option was used */ - if (monitorResolution == 0) - { - HDC hdc = GetDC(NULL); - if (hdc) - { - int dpiX = GetDeviceCaps(hdc, LOGPIXELSX); - int dpiY = GetDeviceCaps(hdc, LOGPIXELSY); - - winDebug("winInitializeDefaultScreens - native DPI x %d y %d\n", dpiX, dpiY); - monitorResolution = dpiY; - ReleaseDC(NULL, hdc); + DWORD dwWidth, dwHeight; + static Bool fInitializedScreenDefaults = FALSE; + + /* Bail out early if default screen has already been initialized */ + if (fInitializedScreenDefaults) + return; + + /* Zero the memory used for storing the screen info */ + memset(&defaultScreenInfo, 0, sizeof(winScreenInfo)); + + /* Get default width and height */ + /* + * NOTE: These defaults will cause the window to cover only + * the primary monitor in the case that we have multiple monitors. + */ + dwWidth = GetSystemMetrics(SM_CXSCREEN); + dwHeight = GetSystemMetrics(SM_CYSCREEN); + + winDebug ( + "winInitializeScreenDefaults - primary monitor w %d h %d\n", + (int) dwWidth, (int) dwHeight); + + /* Set a default DPI, if no '-dpi' option was used */ + if (monitorResolution == 0) { + HDC hdc = GetDC(NULL); + + if (hdc) { + int dpiX = GetDeviceCaps(hdc, LOGPIXELSX); + int dpiY = GetDeviceCaps(hdc, LOGPIXELSY); + + winDebug( + "winInitializeDefaultScreens - native DPI x %d y %d\n", + dpiX, dpiY); + monitorResolution = dpiY; + ReleaseDC(NULL, hdc); } - else - { - winDebug("winInitializeDefaultScreens - Failed to retrieve native DPI, falling back to default of %d DPI\n", WIN_DEFAULT_DPI); - monitorResolution = WIN_DEFAULT_DPI; + else { + winDebug( + "winInitializeDefaultScreens - Failed to retrieve native DPI, falling back to default of %d DPI\n", + WIN_DEFAULT_DPI); + monitorResolution = WIN_DEFAULT_DPI; } } - defaultScreenInfo.iMonitor = 1; - defaultScreenInfo.hMonitor = MonitorFromWindow(NULL, MONITOR_DEFAULTTOPRIMARY); - defaultScreenInfo.dwWidth = dwWidth; - defaultScreenInfo.dwHeight = dwHeight; - defaultScreenInfo.dwUserWidth = dwWidth; - defaultScreenInfo.dwUserHeight = dwHeight; - defaultScreenInfo.fUserGaveHeightAndWidth = WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH; - defaultScreenInfo.fUserGavePosition = FALSE; - defaultScreenInfo.dwBPP = WIN_DEFAULT_BPP; - defaultScreenInfo.dwClipUpdatesNBoxes = WIN_DEFAULT_CLIP_UPDATES_NBOXES; + defaultScreenInfo.iMonitor = 1; + defaultScreenInfo.hMonitor = MonitorFromWindow(NULL, MONITOR_DEFAULTTOPRIMARY); + defaultScreenInfo.dwWidth = dwWidth; + defaultScreenInfo.dwHeight = dwHeight; + defaultScreenInfo.dwUserWidth = dwWidth; + defaultScreenInfo.dwUserHeight = dwHeight; + defaultScreenInfo.fUserGaveHeightAndWidth = + WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH; + defaultScreenInfo.fUserGavePosition = FALSE; + defaultScreenInfo.dwBPP = WIN_DEFAULT_BPP; + defaultScreenInfo.dwClipUpdatesNBoxes = WIN_DEFAULT_CLIP_UPDATES_NBOXES; #ifdef XWIN_EMULATEPSEUDO - defaultScreenInfo.fEmulatePseudo = WIN_DEFAULT_EMULATE_PSEUDO; + defaultScreenInfo.fEmulatePseudo = WIN_DEFAULT_EMULATE_PSEUDO; #endif - defaultScreenInfo.dwRefreshRate = WIN_DEFAULT_REFRESH; - defaultScreenInfo.pfb = NULL; - defaultScreenInfo.fFullScreen = FALSE; - defaultScreenInfo.fDecoration = TRUE; + defaultScreenInfo.dwRefreshRate = WIN_DEFAULT_REFRESH; + defaultScreenInfo.pfb = NULL; + defaultScreenInfo.fFullScreen = FALSE; + defaultScreenInfo.fDecoration = TRUE; #ifdef XWIN_MULTIWINDOWEXTWM - defaultScreenInfo.fMWExtWM = FALSE; + defaultScreenInfo.fMWExtWM = FALSE; #endif #ifdef XWIN_MULTIWINDOWINTWM - defaultScreenInfo.fInternalWM = FALSE; + defaultScreenInfo.fInternalWM = FALSE; #endif - defaultScreenInfo.fRootless = FALSE; + defaultScreenInfo.fRootless = FALSE; #ifdef XWIN_MULTIWINDOW - defaultScreenInfo.fMultiWindow = FALSE; + defaultScreenInfo.fMultiWindow = FALSE; #endif #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) - defaultScreenInfo.fMultiMonitorOverride = FALSE; + defaultScreenInfo.fMultiMonitorOverride = FALSE; #endif - defaultScreenInfo.fMultipleMonitors = FALSE; - defaultScreenInfo.fLessPointer = FALSE; - defaultScreenInfo.iResizeMode = resizeWithRandr; - defaultScreenInfo.fNoTrayIcon = FALSE; - defaultScreenInfo.iE3BTimeout = WIN_E3B_DEFAULT; - defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL; - defaultScreenInfo.fUseUnixKillKey = WIN_DEFAULT_UNIX_KILL; - defaultScreenInfo.fIgnoreInput = FALSE; - defaultScreenInfo.fExplicitScreen = FALSE; - - /* Note that the default screen has been initialized */ - fInitializedScreenDefaults = TRUE; + defaultScreenInfo.fMultipleMonitors = FALSE; + defaultScreenInfo.fLessPointer = FALSE; + defaultScreenInfo.iResizeMode = resizeWithRandr; + defaultScreenInfo.fNoTrayIcon = FALSE; + defaultScreenInfo.iE3BTimeout = WIN_E3B_DEFAULT; + defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL; + defaultScreenInfo.fUseUnixKillKey = WIN_DEFAULT_UNIX_KILL; + defaultScreenInfo.fIgnoreInput = FALSE; + defaultScreenInfo.fExplicitScreen = FALSE; + + /* Note that the default screen has been initialized */ + fInitializedScreenDefaults = TRUE; } static void winInitializeScreen(int i) { - winDebug ("winInitializeScreen - %d\n",i); + winDebug ("winInitializeScreen - %d\n",i); - /* Initialize default screen values, if needed */ - winInitializeScreenDefaults(); + /* Initialize default screen values, if needed */ + winInitializeScreenDefaults(); - /* Copy the default screen info */ - g_ScreenInfo[i] = defaultScreenInfo; + /* Copy the default screen info */ + g_ScreenInfo[i] = defaultScreenInfo; - /* Set the screen number */ - g_ScreenInfo[i].dwScreen = i; + /* Set the screen number */ + g_ScreenInfo[i].dwScreen = i; } void winInitializeScreens(int maxscreens) { - int i; - winDebug ("winInitializeScreens - %i\n", maxscreens); + int i; - if (maxscreens > g_iNumScreens) - { - /* Reallocate the memory for DDX-specific screen info */ - g_ScreenInfo = realloc(g_ScreenInfo, maxscreens * sizeof (winScreenInfo)); + winDebug ("winInitializeScreens - %i\n", maxscreens); + + if (maxscreens > g_iNumScreens) { + /* Reallocate the memory for DDX-specific screen info */ + g_ScreenInfo = + realloc(g_ScreenInfo, maxscreens * sizeof(winScreenInfo)); - /* Set default values for any new screens */ - for (i = g_iNumScreens; i < maxscreens ; i++) - winInitializeScreen(i); + /* Set default values for any new screens */ + for (i = g_iNumScreens; i < maxscreens; i++) + winInitializeScreen(i); - /* Keep a count of the number of screens */ - g_iNumScreens = maxscreens; + /* Keep a count of the number of screens */ + g_iNumScreens = maxscreens; } } @@ -212,539 +218,507 @@ winInitializeScreens(int maxscreens) /* Check if enough arguments are given for the option */ #define CHECK_ARGS(count) if (i + count >= argc) { UseMsg (); return 0; } -/* Compare the current option with the string. */ +/* Compare the current option with the string. */ #define IS_OPTION(name) (strcmp (argv[i], name) == 0) int -ddxProcessArgument (int argc, char *argv[], int i) +ddxProcessArgument(int argc, char *argv[], int i) { - static Bool s_fBeenHere = FALSE; - winScreenInfo *screenInfoPtr = NULL; + static Bool s_fBeenHere = FALSE; + winScreenInfo *screenInfoPtr = NULL; - /* Initialize once */ - if (!s_fBeenHere) - { + /* Initialize once */ + if (!s_fBeenHere) { #ifdef DDXOSVERRORF - /* - * This initialises our hook into VErrorF () for catching log messages - * that are generated before OsInit () is called. - */ - OsVendorVErrorFProc = OsVendorVErrorF; + /* + * This initialises our hook into VErrorF () for catching log messages + * that are generated before OsInit () is called. + */ + OsVendorVErrorFProc = OsVendorVErrorF; #endif - s_fBeenHere = TRUE; + s_fBeenHere = TRUE; - /* Initialize only if option is not -help */ - if (!IS_OPTION("-help") && !IS_OPTION("-h") && !IS_OPTION("--help") && - !IS_OPTION("-version") && !IS_OPTION("--version")) - { + /* Initialize only if option is not -help */ + if (!IS_OPTION("-help") && !IS_OPTION("-h") && !IS_OPTION("--help") && + !IS_OPTION("-version") && !IS_OPTION("--version")) { - /* Log the version information */ - winLogVersionInfo (); + /* Log the version information */ + winLogVersionInfo(); - /* Log the command line */ - winLogCommandLine (argc, argv); + /* Log the command line */ + winLogCommandLine(argc, argv); - /* - * Initialize default screen settings. We have to do this before - * OsVendorInit () gets called, otherwise we will overwrite - * settings changed by parameters such as -fullscreen, etc. - */ - winDebug ("ddxProcessArgument - Initializing default " - "screens\n"); - winInitializeScreenDefaults(); - } + /* + * Initialize default screen settings. We have to do this before + * OsVendorInit () gets called, otherwise we will overwrite + * settings changed by parameters such as -fullscreen, etc. + */ + winDebug ("ddxProcessArgument - Initializing default " + "screens\n"); + winInitializeScreenDefaults(); + } } - winDebug ("ddxProcessArgument - arg: %s\n", argv[i]); - - /* - * Look for the '-help' and similar options - */ - if (IS_OPTION ("-help") || IS_OPTION("-h") || IS_OPTION("--help")) - { - /* Reset logfile. We don't need that helpmessage in the logfile */ - g_pszLogFile = NULL; - g_fNoHelpMessageBox = TRUE; - UseMsg(); - exit (0); - return 1; + winDebug("ddxProcessArgument - arg: %s\n", argv[i]); + + /* + * Look for the '-help' and similar options + */ + if (IS_OPTION("-help") || IS_OPTION("-h") || IS_OPTION("--help")) { + /* Reset logfile. We don't need that helpmessage in the logfile */ + g_pszLogFile = NULL; + g_fNoHelpMessageBox = TRUE; + UseMsg(); + exit(0); + return 1; } - if (IS_OPTION ("-version") || IS_OPTION("--version")) - { - /* Reset logfile. We don't need that versioninfo in the logfile */ - g_pszLogFile = NULL; - winLogVersionInfo (); - exit (0); - return 1; + if (IS_OPTION("-version") || IS_OPTION("--version")) { + /* Reset logfile. We don't need that versioninfo in the logfile */ + g_pszLogFile = NULL; + winLogVersionInfo(); + exit(0); + return 1; } - /* - * Look for the '-screen scr_num [width height]' argument - */ - if (IS_OPTION ("-screen")) - { - int iArgsProcessed = 1; - int nScreenNum; - int iWidth, iHeight, iX, iY; - int iMonitor; - - winDebug ("ddxProcessArgument - screen - argc: %d i: %d\n", - argc, i); - - /* Display the usage message if the argument is malformed */ - if (i + 1 >= argc) - { - return 0; - } - - /* Grab screen number */ - nScreenNum = atoi (argv[i + 1]); - - /* Validate the specified screen number */ - if (nScreenNum < 0) - { - ErrorF ("ddxProcessArgument - screen - Invalid screen number %d\n", - nScreenNum); - UseMsg (); - return 0; + /* + * Look for the '-screen scr_num [width height]' argument + */ + if (IS_OPTION("-screen")) { + int iArgsProcessed = 1; + int nScreenNum; + int iWidth, iHeight, iX, iY; + int iMonitor; + + winDebug("ddxProcessArgument - screen - argc: %d i: %d\n", argc, i); + + /* Display the usage message if the argument is malformed */ + if (i + 1 >= argc) { + return 0; + } + + /* Grab screen number */ + nScreenNum = atoi(argv[i + 1]); + + /* Validate the specified screen number */ + if (nScreenNum < 0) { + ErrorF("ddxProcessArgument - screen - Invalid screen number %d\n", + nScreenNum); + UseMsg(); + return 0; } - /* - Initialize default values for any new screens + /* + Initialize default values for any new screens - Note that default values can't change after a -screen option is - seen, so it's safe to do this for each screen as it is introduced - */ - winInitializeScreens(nScreenNum+1); + Note that default values can't change after a -screen option is + seen, so it's safe to do this for each screen as it is introduced + */ + winInitializeScreens(nScreenNum + 1); - /* look for @m where m is monitor number */ - if (i + 2 < argc - && 1 == sscanf(argv[i + 2], "@%d", (int *) &iMonitor)) - { - struct GetMonitorInfoData data; - if (!QueryMonitor(iMonitor, &data)) - { - ErrorF ("ddxProcessArgument - screen - Querying monitors failed\n"); - } else if (data.bMonitorSpecifiedExists == TRUE) - { - winDebug("ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor); - iArgsProcessed = 3; - g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE; - g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE; - g_ScreenInfo[nScreenNum].iMonitor = iMonitor; - g_ScreenInfo[nScreenNum].hMonitor = data.monitorHandle; - g_ScreenInfo[nScreenNum].dwWidth = data.monitorWidth; - g_ScreenInfo[nScreenNum].dwHeight = data.monitorHeight; - g_ScreenInfo[nScreenNum].dwUserWidth = data.monitorWidth; - g_ScreenInfo[nScreenNum].dwUserHeight = data.monitorHeight; - g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX; - g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY; - } - else - { - /* monitor does not exist, error out */ - ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n", - iMonitor); - UseMsg (); - exit (0); - return 0; - } - } - - /* Look for 'WxD' or 'W D' */ - else if (i + 2 < argc - && 2 == sscanf (argv[i + 2], "%dx%d", - (int *) &iWidth, - (int *) &iHeight)) - { - winDebug ("ddxProcessArgument - screen - Found ``WxD'' arg\n"); - iArgsProcessed = 3; - g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE; - g_ScreenInfo[nScreenNum].dwWidth = iWidth; - g_ScreenInfo[nScreenNum].dwHeight = iHeight; - g_ScreenInfo[nScreenNum].dwUserWidth = iWidth; - g_ScreenInfo[nScreenNum].dwUserHeight = iHeight; - /* Look for WxD+X+Y */ - if (2 == sscanf (argv[i + 2], "%*dx%*d+%d+%d", - (int *) &iX, - (int *) &iY)) - { - winDebug("ddxProcessArgument - screen - Found ``X+Y'' arg\n"); - g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE; - g_ScreenInfo[nScreenNum].dwInitialX = iX; - g_ScreenInfo[nScreenNum].dwInitialY = iY; - - /* look for WxD+X+Y@m where m is monitor number. take X,Y to be offsets from monitor's root position */ - if (1 == sscanf (argv[i + 2], "%*dx%*d+%*d+%*d@%d", - (int *) &iMonitor)) - { - struct GetMonitorInfoData data; - if (!QueryMonitor(iMonitor, &data)) - { - ErrorF ("ddxProcessArgument - screen - Querying monitors failed\n"); - } else if (data.bMonitorSpecifiedExists == TRUE) - { - g_ScreenInfo[nScreenNum].iMonitor = iMonitor; + /* look for @m where m is monitor number */ + if (i + 2 < argc && 1 == sscanf(argv[i + 2], "@%d", (int *) &iMonitor)) { + struct GetMonitorInfoData data; + + if (!QueryMonitor(iMonitor, &data)) { + ErrorF + ("ddxProcessArgument - screen - Querying monitors failed\n"); + } + else if (data.bMonitorSpecifiedExists == TRUE) { + winDebug( + "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", + iMonitor); + iArgsProcessed = 3; + g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE; + g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE; + g_ScreenInfo[nScreenNum].iMonitor = iMonitor; + g_ScreenInfo[nScreenNum].hMonitor = data.monitorHandle; + g_ScreenInfo[nScreenNum].dwWidth = data.monitorWidth; + g_ScreenInfo[nScreenNum].dwHeight = data.monitorHeight; + g_ScreenInfo[nScreenNum].dwUserWidth = data.monitorWidth; + g_ScreenInfo[nScreenNum].dwUserHeight = data.monitorHeight; + g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX; + g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY; + } + else { + /* monitor does not exist, error out */ + ErrorF + ("ddxProcessArgument - screen - Invalid monitor number %d\n", + iMonitor); + UseMsg(); + exit(0); + return 0; + } + } + + /* Look for 'WxD' or 'W D' */ + else if (i + 2 < argc + && 2 == sscanf(argv[i + 2], "%dx%d", + (int *) &iWidth, (int *) &iHeight)) { + winDebug ( + "ddxProcessArgument - screen - Found ``WxD'' arg\n"); + iArgsProcessed = 3; + g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE; + g_ScreenInfo[nScreenNum].dwWidth = iWidth; + g_ScreenInfo[nScreenNum].dwHeight = iHeight; + g_ScreenInfo[nScreenNum].dwUserWidth = iWidth; + g_ScreenInfo[nScreenNum].dwUserHeight = iHeight; + /* Look for WxD+X+Y */ + if (2 == sscanf(argv[i + 2], "%*dx%*d+%d+%d", + (int *) &iX, (int *) &iY)) { + winDebug ( + "ddxProcessArgument - screen - Found ``X+Y'' arg\n"); + g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE; + g_ScreenInfo[nScreenNum].dwInitialX = iX; + g_ScreenInfo[nScreenNum].dwInitialY = iY; + + /* look for WxD+X+Y@m where m is monitor number. take X,Y to be offsets from monitor's root position */ + if (1 == sscanf(argv[i + 2], "%*dx%*d+%*d+%*d@%d", + (int *) &iMonitor)) { + struct GetMonitorInfoData data; + + if (!QueryMonitor(iMonitor, &data)) { + ErrorF + ("ddxProcessArgument - screen - Querying monitors failed\n"); + } + else if (data.bMonitorSpecifiedExists == TRUE) { + g_ScreenInfo[nScreenNum].iMonitor = iMonitor; g_ScreenInfo[nScreenNum].hMonitor = data.monitorHandle; - g_ScreenInfo[nScreenNum].dwInitialX += data.monitorOffsetX; - g_ScreenInfo[nScreenNum].dwInitialY += data.monitorOffsetY; - } - else - { - /* monitor does not exist, error out */ - ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n", - iMonitor); - UseMsg (); - exit (0); - return 0; - } - - } - } - - /* look for WxD@m where m is monitor number */ - else if (1 == sscanf(argv[i + 2], "%*dx%*d@%d", - (int *) &iMonitor)) - { - struct GetMonitorInfoData data; - if (!QueryMonitor(iMonitor, &data)) - { - ErrorF ("ddxProcessArgument - screen - Querying monitors failed\n"); - } else if (data.bMonitorSpecifiedExists == TRUE) - { - winDebug ("ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor); - g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE; - g_ScreenInfo[nScreenNum].iMonitor = iMonitor; - g_ScreenInfo[nScreenNum].hMonitor = data.monitorHandle; - g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX; - g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY; - } - else - { - /* monitor does not exist, error out */ - ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n", - iMonitor); - UseMsg (); - exit (0); - return 0; - } - - } - } - else if (i + 3 < argc - && 1 == sscanf (argv[i + 2], "%d", - (int *) &iWidth) - && 1 == sscanf (argv[i + 3], "%d", - (int *) &iHeight)) - { - winDebug ("ddxProcessArgument - screen - Found ``W D'' arg\n"); - iArgsProcessed = 4; - g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE; - g_ScreenInfo[nScreenNum].dwWidth = iWidth; - g_ScreenInfo[nScreenNum].dwHeight = iHeight; - g_ScreenInfo[nScreenNum].dwUserWidth = iWidth; - g_ScreenInfo[nScreenNum].dwUserHeight = iHeight; - if (i + 5 < argc - && 1 == sscanf (argv[i + 4], "%d", - (int *) &iX) - && 1 == sscanf (argv[i + 5], "%d", - (int *) &iY)) - { - winDebug ("ddxProcessArgument - screen - Found ``X Y'' arg\n"); - iArgsProcessed = 6; - g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE; - g_ScreenInfo[nScreenNum].dwInitialX = iX; - g_ScreenInfo[nScreenNum].dwInitialY = iY; - } - } - else - { - ErrorF ("ddxProcessArgument - screen - Did not find size arg. " - "dwWidth: %d dwHeight: %d\n", - (int) g_ScreenInfo[nScreenNum].dwWidth, - (int) g_ScreenInfo[nScreenNum].dwHeight); - iArgsProcessed = 2; - g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE; - } - - /* Flag that this screen was explicity specified by the user */ - g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE; - - /* - * Keep track of the last screen number seen, as parameters seen - * before a screen number apply to all screens, whereas parameters - * seen after a screen number apply to that screen number only. - */ - iLastScreen = nScreenNum; - - return iArgsProcessed; - } + g_ScreenInfo[nScreenNum].dwInitialX += + data.monitorOffsetX; + g_ScreenInfo[nScreenNum].dwInitialY += + data.monitorOffsetY; + } + else { + /* monitor does not exist, error out */ + ErrorF + ("ddxProcessArgument - screen - Invalid monitor number %d\n", + iMonitor); + UseMsg(); + exit(0); + return 0; + } + + } + } + /* look for WxD@m where m is monitor number */ + else if (1 == sscanf(argv[i + 2], "%*dx%*d@%d", (int *) &iMonitor)) { + struct GetMonitorInfoData data; + + if (!QueryMonitor(iMonitor, &data)) { + ErrorF + ("ddxProcessArgument - screen - Querying monitors failed\n"); + } + else if (data.bMonitorSpecifiedExists == TRUE) { + winDebug ( + "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", + iMonitor); + g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE; + g_ScreenInfo[nScreenNum].iMonitor = iMonitor; + g_ScreenInfo[nScreenNum].hMonitor = data.monitorHandle; + g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX; + g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY; + } + else { + /* monitor does not exist, error out */ + ErrorF + ("ddxProcessArgument - screen - Invalid monitor number %d\n", + iMonitor); + UseMsg(); + exit(0); + return 0; + } - /* - * Is this parameter attached to a screen or global? - * - * If the parameter is for all screens (appears before - * any -screen option), store it in the default screen - * info - * - * If the parameter is for a single screen (appears - * after a -screen option), store it in the screen info - * for that screen - * - */ - if (iLastScreen == -1) - { - screenInfoPtr = &defaultScreenInfo; + } + } + else if (i + 3 < argc && 1 == sscanf(argv[i + 2], "%d", (int *) &iWidth) + && 1 == sscanf(argv[i + 3], "%d", (int *) &iHeight)) { + winDebug ( + "ddxProcessArgument - screen - Found ``W D'' arg\n"); + iArgsProcessed = 4; + g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE; + g_ScreenInfo[nScreenNum].dwWidth = iWidth; + g_ScreenInfo[nScreenNum].dwHeight = iHeight; + g_ScreenInfo[nScreenNum].dwUserWidth = iWidth; + g_ScreenInfo[nScreenNum].dwUserHeight = iHeight; + if (i + 5 < argc && 1 == sscanf(argv[i + 4], "%d", (int *) &iX) + && 1 == sscanf(argv[i + 5], "%d", (int *) &iY)) { + winDebug ( + "ddxProcessArgument - screen - Found ``X Y'' arg\n"); + iArgsProcessed = 6; + g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE; + g_ScreenInfo[nScreenNum].dwInitialX = iX; + g_ScreenInfo[nScreenNum].dwInitialY = iY; + } + } + else { + ErrorF ( + "ddxProcessArgument - screen - Did not find size arg. " + "dwWidth: %d dwHeight: %d\n", + (int) g_ScreenInfo[nScreenNum].dwWidth, + (int) g_ScreenInfo[nScreenNum].dwHeight); + iArgsProcessed = 2; + g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE; + } + + /* Flag that this screen was explicity specified by the user */ + g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE; + + /* + * Keep track of the last screen number seen, as parameters seen + * before a screen number apply to all screens, whereas parameters + * seen after a screen number apply to that screen number only. + */ + iLastScreen = nScreenNum; + + return iArgsProcessed; } - else - { - screenInfoPtr = &(g_ScreenInfo[iLastScreen]); + + /* + * Is this parameter attached to a screen or global? + * + * If the parameter is for all screens (appears before + * any -screen option), store it in the default screen + * info + * + * If the parameter is for a single screen (appears + * after a -screen option), store it in the screen info + * for that screen + * + */ + if (iLastScreen == -1) { + screenInfoPtr = &defaultScreenInfo; + } + else { + screenInfoPtr = &(g_ScreenInfo[iLastScreen]); } - /* - * Look for the '-engine n' argument - */ - if (IS_OPTION ("-engine")) - { - DWORD dwEngine = 0; - CARD8 c8OnBits = 0; - - /* Display the usage message if the argument is malformed */ - if (++i >= argc) - { - UseMsg (); - return 0; - } - - /* Grab the argument */ - dwEngine = atoi (argv[i]); - - /* Count the one bits in the engine argument */ - c8OnBits = winCountBits (dwEngine); - - /* Argument should only have a single bit on */ - if (c8OnBits != 1) - { - UseMsg (); - return 0; - } - - screenInfoPtr->dwEnginePreferred = dwEngine; - - /* Indicate that we have processed the argument */ - return 2; + /* + * Look for the '-engine n' argument + */ + if (IS_OPTION("-engine")) { + DWORD dwEngine = 0; + CARD8 c8OnBits = 0; + + /* Display the usage message if the argument is malformed */ + if (++i >= argc) { + UseMsg(); + return 0; + } + + /* Grab the argument */ + dwEngine = atoi(argv[i]); + + /* Count the one bits in the engine argument */ + c8OnBits = winCountBits(dwEngine); + + /* Argument should only have a single bit on */ + if (c8OnBits != 1) { + UseMsg(); + return 0; + } + + screenInfoPtr->dwEnginePreferred = dwEngine; + + /* Indicate that we have processed the argument */ + return 2; } - /* - * Look for the '-fullscreen' argument - */ - if (IS_OPTION ("-fullscreen")) - { + /* + * Look for the '-fullscreen' argument + */ + if (IS_OPTION("-fullscreen")) { #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) - if (!screenInfoPtr->fMultiMonitorOverride) + if (!screenInfoPtr->fMultiMonitorOverride) screenInfoPtr->fMultipleMonitors = FALSE; #endif - screenInfoPtr->fFullScreen = TRUE; + screenInfoPtr->fFullScreen = TRUE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-lesspointer' argument - */ - if (IS_OPTION ("-lesspointer")) - { - screenInfoPtr->fLessPointer = TRUE; + /* + * Look for the '-lesspointer' argument + */ + if (IS_OPTION("-lesspointer")) { + screenInfoPtr->fLessPointer = TRUE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-nodecoration' argument - */ - if (IS_OPTION ("-nodecoration")) - { + /* + * Look for the '-nodecoration' argument + */ + if (IS_OPTION("-nodecoration")) { #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) - if (!screenInfoPtr->fMultiMonitorOverride) - screenInfoPtr->fMultipleMonitors = FALSE; + if (!screenInfoPtr->fMultiMonitorOverride) + screenInfoPtr->fMultipleMonitors = FALSE; #endif - screenInfoPtr->fDecoration = FALSE; + screenInfoPtr->fDecoration = FALSE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } #ifdef XWIN_MULTIWINDOWEXTWM - /* - * Look for the '-mwextwm' argument - */ - if (IS_OPTION ("-mwextwm")) - { - if (!screenInfoPtr->fMultiMonitorOverride) - screenInfoPtr->fMultipleMonitors = TRUE; - screenInfoPtr->fMWExtWM = TRUE; - - /* Indicate that we have processed this argument */ - return 1; + /* + * Look for the '-mwextwm' argument + */ + if (IS_OPTION("-mwextwm")) { + if (!screenInfoPtr->fMultiMonitorOverride) + screenInfoPtr->fMultipleMonitors = TRUE; + screenInfoPtr->fMWExtWM = TRUE; + + /* Indicate that we have processed this argument */ + return 1; } #endif #ifdef XWIN_MULTIWINDOWINTWM - /* - * Look for the '-internalwm' argument - */ - if (IS_OPTION ("-internalwm")) - { - if (!screenInfoPtr->fMultiMonitorOverride) - screenInfoPtr->fMultipleMonitors = TRUE; - screenInfoPtr->fMWExtWM = TRUE; - screenInfoPtr->fInternalWM = TRUE; - - /* Indicate that we have processed this argument */ - return 1; + /* + * Look for the '-internalwm' argument + */ + if (IS_OPTION("-internalwm")) { + if (!screenInfoPtr->fMultiMonitorOverride) + screenInfoPtr->fMultipleMonitors = TRUE; + screenInfoPtr->fMWExtWM = TRUE; + screenInfoPtr->fInternalWM = TRUE; + + /* Indicate that we have processed this argument */ + return 1; } #endif - /* - * Look for the '-rootless' argument - */ - if (IS_OPTION ("-rootless")) - { + /* + * Look for the '-rootless' argument + */ + if (IS_OPTION("-rootless")) { #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) - if (!screenInfoPtr->fMultiMonitorOverride) - screenInfoPtr->fMultipleMonitors = FALSE; + if (!screenInfoPtr->fMultiMonitorOverride) + screenInfoPtr->fMultipleMonitors = FALSE; #endif - screenInfoPtr->fRootless = TRUE; + screenInfoPtr->fRootless = TRUE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } #ifdef XWIN_MULTIWINDOW - /* - * Look for the '-multiwindow' argument - */ - if (IS_OPTION ("-multiwindow")) - { + /* + * Look for the '-multiwindow' argument + */ + if (IS_OPTION("-multiwindow")) { #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) - if (!screenInfoPtr->fMultiMonitorOverride) - screenInfoPtr->fMultipleMonitors = TRUE; + if (!screenInfoPtr->fMultiMonitorOverride) + screenInfoPtr->fMultipleMonitors = TRUE; #endif - screenInfoPtr->fMultiWindow = TRUE; + screenInfoPtr->fMultiWindow = TRUE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } #endif - /* - * Look for the '-multiplemonitors' argument - */ - if (IS_OPTION ("-multiplemonitors") - || IS_OPTION ("-multimonitors")) - { + /* + * Look for the '-multiplemonitors' argument + */ + if (IS_OPTION("-multiplemonitors") + || IS_OPTION("-multimonitors")) { #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) - screenInfoPtr->fMultiMonitorOverride = TRUE; + screenInfoPtr->fMultiMonitorOverride = TRUE; #endif - screenInfoPtr->fMultipleMonitors = TRUE; + screenInfoPtr->fMultipleMonitors = TRUE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-nomultiplemonitors' argument - */ - if (IS_OPTION ("-nomultiplemonitors") - || IS_OPTION ("-nomultimonitors")) - { + /* + * Look for the '-nomultiplemonitors' argument + */ + if (IS_OPTION("-nomultiplemonitors") + || IS_OPTION("-nomultimonitors")) { #if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) - screenInfoPtr->fMultiMonitorOverride = TRUE; + screenInfoPtr->fMultiMonitorOverride = TRUE; #endif - screenInfoPtr->fMultipleMonitors = FALSE; + screenInfoPtr->fMultipleMonitors = FALSE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } + /* + * Look for the '-scrollbars' argument + */ + if (IS_OPTION("-scrollbars")) { - /* - * Look for the '-scrollbars' argument - */ - if (IS_OPTION ("-scrollbars")) - { - - screenInfoPtr->iResizeMode = resizeWithScrollbars; + screenInfoPtr->iResizeMode = resizeWithScrollbars; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-resize' argument - */ - if (IS_OPTION ("-resize") || IS_OPTION ("-noresize") || - (strncmp(argv[i], "-resize=",strlen("-resize=")) == 0)) - { - winResizeMode mode; + /* + * Look for the '-resize' argument + */ + if (IS_OPTION("-resize") || IS_OPTION("-noresize") || + (strncmp(argv[i], "-resize=", strlen("-resize=")) == 0)) { + winResizeMode mode; - if (IS_OPTION ("-resize")) - mode = resizeWithRandr; - else if (IS_OPTION ("-noresize")) - mode = notAllowed; - else if (strncmp(argv[i], "-resize=",strlen("-resize=")) == 0) - { - char *option = argv[i] + strlen("-resize="); - if (strcmp(option, "randr") == 0) + if (IS_OPTION("-resize")) mode = resizeWithRandr; - else if (strcmp(option, "scrollbars") == 0) - mode = resizeWithScrollbars; - else if (strcmp(option, "none") == 0) + else if (IS_OPTION("-noresize")) mode = notAllowed; - else - { - ErrorF ("ddxProcessArgument - resize - Invalid resize mode %s\n", option); - return 0; + else if (strncmp(argv[i], "-resize=", strlen("-resize=")) == 0) { + char *option = argv[i] + strlen("-resize="); + + if (strcmp(option, "randr") == 0) + mode = resizeWithRandr; + else if (strcmp(option, "scrollbars") == 0) + mode = resizeWithScrollbars; + else if (strcmp(option, "none") == 0) + mode = notAllowed; + else { + ErrorF("ddxProcessArgument - resize - Invalid resize mode %s\n", + option); + return 0; } } - else - { - ErrorF ("ddxProcessArgument - resize - Invalid resize option %s\n", argv[i]); - return 0; + else { + ErrorF("ddxProcessArgument - resize - Invalid resize option %s\n", + argv[i]); + return 0; } - screenInfoPtr->iResizeMode = mode; + screenInfoPtr->iResizeMode = mode; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } #ifdef XWIN_CLIPBOARD - /* - * Look for the '-clipboard' argument - */ - if (IS_OPTION ("-clipboard")) - { - /* Now the default, we still accept the arg for backwards compatibility */ - g_fClipboard = TRUE; - - /* Indicate that we have processed this argument */ - return 1; + /* + * Look for the '-clipboard' argument + */ + if (IS_OPTION("-clipboard")) { + /* Now the default, we still accept the arg for backwards compatibility */ + g_fClipboard = TRUE; + + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-noclipboard' argument - */ - if (IS_OPTION ("-noclipboard")) - { - g_fClipboard = FALSE; + /* + * Look for the '-noclipboard' argument + */ + if (IS_OPTION("-noclipboard")) { + g_fClipboard = FALSE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } /* @@ -772,516 +746,468 @@ ddxProcessArgument (int argc, char *argv[], int i) #endif + /* + * Look for the '-ignoreinput' argument + */ + if (IS_OPTION("-ignoreinput")) { + screenInfoPtr->fIgnoreInput = TRUE; - /* - * Look for the '-ignoreinput' argument - */ - if (IS_OPTION ("-ignoreinput")) - { - screenInfoPtr->fIgnoreInput = TRUE; - - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-emulate3buttons' argument - */ - if (IS_OPTION ("-emulate3buttons")) - { - int iArgsProcessed = 1; - int iE3BTimeout = WIN_DEFAULT_E3B_TIME; - - /* Grab the optional timeout value */ - if (i + 1 < argc - && 1 == sscanf (argv[i + 1], "%d", - &iE3BTimeout)) - { - /* Indicate that we have processed the next argument */ - iArgsProcessed++; + /* + * Look for the '-emulate3buttons' argument + */ + if (IS_OPTION("-emulate3buttons")) { + int iArgsProcessed = 1; + int iE3BTimeout = WIN_DEFAULT_E3B_TIME; + + /* Grab the optional timeout value */ + if (i + 1 < argc && 1 == sscanf(argv[i + 1], "%d", &iE3BTimeout)) { + /* Indicate that we have processed the next argument */ + iArgsProcessed++; + } + else { + /* + * sscanf () won't modify iE3BTimeout if it doesn't find + * the specified format; however, I want to be explicit + * about setting the default timeout in such cases to + * prevent some programs (me) from getting confused. + */ + iE3BTimeout = WIN_DEFAULT_E3B_TIME; } - else - { - /* - * sscanf () won't modify iE3BTimeout if it doesn't find - * the specified format; however, I want to be explicit - * about setting the default timeout in such cases to - * prevent some programs (me) from getting confused. - */ - iE3BTimeout = WIN_DEFAULT_E3B_TIME; - } - - screenInfoPtr->iE3BTimeout = iE3BTimeout; - /* Indicate that we have processed this argument */ - return iArgsProcessed; + screenInfoPtr->iE3BTimeout = iE3BTimeout; + + /* Indicate that we have processed this argument */ + return iArgsProcessed; } - /* - * Look for the '-noemulate3buttons' argument - */ - if (IS_OPTION ("-noemulate3buttons")) - { - screenInfoPtr->iE3BTimeout = WIN_E3B_OFF; + /* + * Look for the '-noemulate3buttons' argument + */ + if (IS_OPTION("-noemulate3buttons")) { + screenInfoPtr->iE3BTimeout = WIN_E3B_OFF; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-depth n' argument - */ - if (IS_OPTION ("-depth")) - { - DWORD dwBPP = 0; - - /* Display the usage message if the argument is malformed */ - if (++i >= argc) - { - UseMsg (); - return 0; - } - - /* Grab the argument */ - dwBPP = atoi (argv[i]); - - screenInfoPtr->dwBPP = dwBPP; - - /* Indicate that we have processed the argument */ - return 2; + /* + * Look for the '-depth n' argument + */ + if (IS_OPTION("-depth")) { + DWORD dwBPP = 0; + + /* Display the usage message if the argument is malformed */ + if (++i >= argc) { + UseMsg(); + return 0; + } + + /* Grab the argument */ + dwBPP = atoi(argv[i]); + + screenInfoPtr->dwBPP = dwBPP; + + /* Indicate that we have processed the argument */ + return 2; } - /* - * Look for the '-refresh n' argument - */ - if (IS_OPTION ("-refresh")) - { - DWORD dwRefreshRate = 0; - - /* Display the usage message if the argument is malformed */ - if (++i >= argc) - { - UseMsg (); - return 0; - } - - /* Grab the argument */ - dwRefreshRate = atoi (argv[i]); - - screenInfoPtr->dwRefreshRate = dwRefreshRate; - - /* Indicate that we have processed the argument */ - return 2; + /* + * Look for the '-refresh n' argument + */ + if (IS_OPTION("-refresh")) { + DWORD dwRefreshRate = 0; + + /* Display the usage message if the argument is malformed */ + if (++i >= argc) { + UseMsg(); + return 0; + } + + /* Grab the argument */ + dwRefreshRate = atoi(argv[i]); + + screenInfoPtr->dwRefreshRate = dwRefreshRate; + + /* Indicate that we have processed the argument */ + return 2; } - /* - * Look for the '-clipupdates num_boxes' argument - */ - if (IS_OPTION ("-clipupdates")) - { - DWORD dwNumBoxes = 0; - - /* Display the usage message if the argument is malformed */ - if (++i >= argc) - { - UseMsg (); - return 0; - } - - /* Grab the argument */ - dwNumBoxes = atoi (argv[i]); - - screenInfoPtr->dwClipUpdatesNBoxes = dwNumBoxes; - - /* Indicate that we have processed the argument */ - return 2; + /* + * Look for the '-clipupdates num_boxes' argument + */ + if (IS_OPTION("-clipupdates")) { + DWORD dwNumBoxes = 0; + + /* Display the usage message if the argument is malformed */ + if (++i >= argc) { + UseMsg(); + return 0; + } + + /* Grab the argument */ + dwNumBoxes = atoi(argv[i]); + + screenInfoPtr->dwClipUpdatesNBoxes = dwNumBoxes; + + /* Indicate that we have processed the argument */ + return 2; } #ifdef XWIN_EMULATEPSEUDO - /* - * Look for the '-emulatepseudo' argument - */ - if (IS_OPTION ("-emulatepseudo")) - { - screenInfoPtr->fEmulatePseudo = TRUE; - - /* Indicate that we have processed this argument */ - return 1; + /* + * Look for the '-emulatepseudo' argument + */ + if (IS_OPTION("-emulatepseudo")) { + screenInfoPtr->fEmulatePseudo = TRUE; + + /* Indicate that we have processed this argument */ + return 1; } #endif - /* - * Look for the '-nowinkill' argument - */ - if (IS_OPTION ("-nowinkill")) - { - screenInfoPtr->fUseWinKillKey = FALSE; + /* + * Look for the '-nowinkill' argument + */ + if (IS_OPTION("-nowinkill")) { + screenInfoPtr->fUseWinKillKey = FALSE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-winkill' argument - */ - if (IS_OPTION ("-winkill")) - { - screenInfoPtr->fUseWinKillKey = TRUE; + /* + * Look for the '-winkill' argument + */ + if (IS_OPTION("-winkill")) { + screenInfoPtr->fUseWinKillKey = TRUE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-nounixkill' argument - */ - if (IS_OPTION ("-nounixkill")) - { - screenInfoPtr->fUseUnixKillKey = FALSE; + /* + * Look for the '-nounixkill' argument + */ + if (IS_OPTION("-nounixkill")) { + screenInfoPtr->fUseUnixKillKey = FALSE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-unixkill' argument - */ - if (IS_OPTION ("-unixkill")) - { - screenInfoPtr->fUseUnixKillKey = TRUE; + /* + * Look for the '-unixkill' argument + */ + if (IS_OPTION("-unixkill")) { + screenInfoPtr->fUseUnixKillKey = TRUE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-notrayicon' argument - */ - if (IS_OPTION ("-notrayicon")) - { - screenInfoPtr->fNoTrayIcon = TRUE; + /* + * Look for the '-notrayicon' argument + */ + if (IS_OPTION("-notrayicon")) { + screenInfoPtr->fNoTrayIcon = TRUE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-trayicon' argument - */ - if (IS_OPTION ("-trayicon")) - { - screenInfoPtr->fNoTrayIcon = FALSE; + /* + * Look for the '-trayicon' argument + */ + if (IS_OPTION("-trayicon")) { + screenInfoPtr->fNoTrayIcon = FALSE; - /* Indicate that we have processed this argument */ - return 1; + /* Indicate that we have processed this argument */ + return 1; } - /* - * Look for the '-fp' argument - */ - if (IS_OPTION ("-fp")) - { - CHECK_ARGS (1); - g_cmdline.fontPath = argv[++i]; - return 0; /* Let DIX parse this again */ + /* + * Look for the '-fp' argument + */ + if (IS_OPTION("-fp")) { + CHECK_ARGS(1); + g_cmdline.fontPath = argv[++i]; + return 0; /* Let DIX parse this again */ } - /* - * Look for the '-query' argument - */ - if (IS_OPTION ("-query")) - { - CHECK_ARGS (1); - g_fXdmcpEnabled = TRUE; - g_pszQueryHost = argv[++i]; - return 0; /* Let DIX parse this again */ + /* + * Look for the '-query' argument + */ + if (IS_OPTION("-query")) { + CHECK_ARGS(1); + g_fXdmcpEnabled = TRUE; + g_pszQueryHost = argv[++i]; + return 0; /* Let DIX parse this again */ } - /* - * Look for the '-auth' argument - */ - if (IS_OPTION ("-auth")) - { - g_fAuthEnabled = TRUE; - return 0; /* Let DIX parse this again */ + /* + * Look for the '-auth' argument + */ + if (IS_OPTION("-auth")) { + g_fAuthEnabled = TRUE; + return 0; /* Let DIX parse this again */ } - /* - * Look for the '-indirect' or '-broadcast' arguments - */ - if (IS_OPTION ("-indirect") - || IS_OPTION ("-broadcast")) - { - g_fXdmcpEnabled = TRUE; - return 0; /* Let DIX parse this again */ + /* + * Look for the '-indirect' or '-broadcast' arguments + */ + if (IS_OPTION("-indirect") + || IS_OPTION("-broadcast")) { + g_fXdmcpEnabled = TRUE; + return 0; /* Let DIX parse this again */ } - /* - * Look for the '-config' argument - */ - if (IS_OPTION ("-config") - || IS_OPTION ("-xf86config")) - { - CHECK_ARGS (1); + /* + * Look for the '-config' argument + */ + if (IS_OPTION("-config") + || IS_OPTION("-xf86config")) { + CHECK_ARGS(1); #ifdef XWIN_XF86CONFIG - g_cmdline.configFile = argv[++i]; + g_cmdline.configFile = argv[++i]; #else - winMessageBoxF ("The %s option is not supported in this " - "release.\n" - "Ignoring this option and continuing.\n", - MB_ICONINFORMATION, - argv[i]); + winMessageBoxF("The %s option is not supported in this " + "release.\n" + "Ignoring this option and continuing.\n", + MB_ICONINFORMATION, argv[i]); #endif - return 2; + return 2; } - /* - * Look for the '-configdir' argument - */ - if (IS_OPTION ("-configdir")) - { - CHECK_ARGS (1); + /* + * Look for the '-configdir' argument + */ + if (IS_OPTION("-configdir")) { + CHECK_ARGS(1); #ifdef XWIN_XF86CONFIG - g_cmdline.configDir = argv[++i]; + g_cmdline.configDir = argv[++i]; #else - winMessageBoxF ("The %s option is not supported in this " - "release.\n" - "Ignoring this option and continuing.\n", - MB_ICONINFORMATION, - argv[i]); + winMessageBoxF("The %s option is not supported in this " + "release.\n" + "Ignoring this option and continuing.\n", + MB_ICONINFORMATION, argv[i]); #endif - return 2; + return 2; } - /* - * Look for the '-keyboard' argument - */ - if (IS_OPTION ("-keyboard")) - { + /* + * Look for the '-keyboard' argument + */ + if (IS_OPTION("-keyboard")) { #ifdef XWIN_XF86CONFIG - CHECK_ARGS (1); - g_cmdline.keyboard = argv[++i]; + CHECK_ARGS(1); + g_cmdline.keyboard = argv[++i]; #else - winMessageBoxF ("The -keyboard option is not supported in this " - "release.\n" - "Ignoring this option and continuing.\n", - MB_ICONINFORMATION); + winMessageBoxF("The -keyboard option is not supported in this " + "release.\n" + "Ignoring this option and continuing.\n", + MB_ICONINFORMATION); #endif - return 2; + return 2; } - /* - * Look for the '-logfile' argument - */ - if (IS_OPTION ("-logfile")) - { - CHECK_ARGS (1); - g_pszLogFile = argv[++i]; + /* + * Look for the '-logfile' argument + */ + if (IS_OPTION("-logfile")) { + CHECK_ARGS(1); + g_pszLogFile = argv[++i]; #ifdef RELOCATE_PROJECTROOT - g_fLogFileChanged = TRUE; + g_fLogFileChanged = TRUE; #endif - return 2; + return 2; } - /* - * Look for the '-logverbose' argument - */ - if (IS_OPTION ("-logverbose")) - { - CHECK_ARGS (1); - g_iLogVerbose = atoi(argv[++i]); - return 2; + /* + * Look for the '-logverbose' argument + */ + if (IS_OPTION("-logverbose")) { + CHECK_ARGS(1); + g_iLogVerbose = atoi(argv[++i]); + return 2; } #ifdef XWIN_CLIPBOARD - /* - * Look for the '-nounicodeclipboard' argument - */ - if (IS_OPTION ("-nounicodeclipboard")) - { - g_fUnicodeClipboard = FALSE; - /* Indicate that we have processed the argument */ - return 1; + /* + * Look for the '-nounicodeclipboard' argument + */ + if (IS_OPTION("-nounicodeclipboard")) { + g_fUnicodeClipboard = FALSE; + /* Indicate that we have processed the argument */ + return 1; } #endif - if (IS_OPTION ("-xkbrules")) - { - CHECK_ARGS (1); - g_cmdline.xkbRules = argv[++i]; - return 2; + if (IS_OPTION("-xkbrules")) { + CHECK_ARGS(1); + g_cmdline.xkbRules = argv[++i]; + return 2; } - if (IS_OPTION ("-xkbmodel")) - { - CHECK_ARGS (1); - g_cmdline.xkbModel = argv[++i]; - return 2; + if (IS_OPTION("-xkbmodel")) { + CHECK_ARGS(1); + g_cmdline.xkbModel = argv[++i]; + return 2; } - if (IS_OPTION ("-xkblayout")) - { - CHECK_ARGS (1); - g_cmdline.xkbLayout = argv[++i]; - return 2; + if (IS_OPTION("-xkblayout")) { + CHECK_ARGS(1); + g_cmdline.xkbLayout = argv[++i]; + return 2; } - if (IS_OPTION ("-xkbvariant")) - { - CHECK_ARGS (1); - g_cmdline.xkbVariant = argv[++i]; - return 2; + if (IS_OPTION("-xkbvariant")) { + CHECK_ARGS(1); + g_cmdline.xkbVariant = argv[++i]; + return 2; } - if (IS_OPTION ("-xkboptions")) - { - CHECK_ARGS (1); - g_cmdline.xkbOptions = argv[++i]; - return 2; + if (IS_OPTION("-xkboptions")) { + CHECK_ARGS(1); + g_cmdline.xkbOptions = argv[++i]; + return 2; } - if (IS_OPTION ("-keyhook")) - { - g_fKeyboardHookLL = TRUE; - return 1; + if (IS_OPTION("-keyhook")) { + g_fKeyboardHookLL = TRUE; + return 1; } - - if (IS_OPTION ("-nokeyhook")) - { - g_fKeyboardHookLL = FALSE; - return 1; + + if (IS_OPTION("-nokeyhook")) { + g_fKeyboardHookLL = FALSE; + return 1; } - - if (IS_OPTION ("-swcursor")) - { - g_fSoftwareCursor = TRUE; - return 1; + + if (IS_OPTION("-swcursor")) { + g_fSoftwareCursor = TRUE; + return 1; } - - if (IS_OPTION ("-silent-dup-error")) - { - g_fSilentDupError = TRUE; - return 1; + + if (IS_OPTION("-silent-dup-error")) { + g_fSilentDupError = TRUE; + return 1; } - if (IS_OPTION("-wgl")) - { - g_fNativeGl = TRUE; - return 1; + if (IS_OPTION("-wgl")) { + g_fNativeGl = TRUE; + return 1; } - else if (IS_OPTION("-nowgl")) - { - g_fNativeGl = FALSE; - return 1; + + else if (IS_OPTION("-nowgl")) { + g_fNativeGl = FALSE; + return 1; } - else if (IS_OPTION("-swrastwgl")) + else if (IS_OPTION("-swrastwgl")) { - g_fswrastwgl = TRUE; - return 1; + g_fswrastwgl = TRUE; + return 1; } - else if (IS_OPTION("-parentprocessid")) + else if (IS_OPTION("-parentprocessid")) { - DWORD dwProcessId; - CHECK_ARGS (1); - dwProcessId = atoi(argv[++i]); - if (!AllowSetForegroundWindow(dwProcessId)) + DWORD dwProcessId; + CHECK_ARGS (1); + dwProcessId = atoi(argv[++i]); + if (!AllowSetForegroundWindow(dwProcessId)) { - winMessageBoxF ("Error calling AllowSetForegroundWindow.", MB_ICONINFORMATION); - return 0; - } - return 2; + winMessageBoxF ("Error calling AllowSetForegroundWindow.", MB_ICONINFORMATION); + return 0; + } + return 2; } - return 0; + return 0; } - /* * winLogCommandLine - Write entire command line to the log file */ void -winLogCommandLine (int argc, char *argv[]) +winLogCommandLine(int argc, char *argv[]) { - int i; - int iSize = 0; - int iCurrLen = 0; + int i; + int iSize = 0; + int iCurrLen = 0; #define CHARS_PER_LINE 60 - /* Bail if command line has already been logged */ - if (g_pszCommandLine) - return; - - /* Count how much memory is needed for concatenated command line */ - for (i = 0, iCurrLen = 0; i < argc; ++i) - if (argv[i]) - { - /* Adds two characters for lines that overflow */ - if ((strlen (argv[i]) < CHARS_PER_LINE - && iCurrLen + strlen (argv[i]) > CHARS_PER_LINE) - || strlen (argv[i]) > CHARS_PER_LINE) - { - iCurrLen = 0; - iSize += 2; - } - - /* Add space for item and trailing space */ - iSize += strlen (argv[i]) + 1; - - /* Update current line length */ - iCurrLen += strlen (argv[i]); - } - - /* Allocate memory for concatenated command line */ - g_pszCommandLine = malloc (iSize + 1); - if (!g_pszCommandLine) - FatalError ("winLogCommandLine - Could not allocate memory for " - "command line string. Exiting.\n"); - - /* Set first character to concatenated command line to null */ - g_pszCommandLine[0] = '\0'; - - /* Loop through all args */ - for (i = 0, iCurrLen = 0; i < argc; ++i) - { - /* Add a character for lines that overflow */ - if ((strlen (argv[i]) < CHARS_PER_LINE - && iCurrLen + strlen (argv[i]) > CHARS_PER_LINE) - || strlen (argv[i]) > CHARS_PER_LINE) - { - iCurrLen = 0; - - /* Add line break if it fits */ - strncat (g_pszCommandLine, "\n ", iSize - strlen (g_pszCommandLine)); - } - - strncat (g_pszCommandLine, argv[i], iSize - strlen (g_pszCommandLine)); - strncat (g_pszCommandLine, " ", iSize - strlen (g_pszCommandLine)); - - /* Save new line length */ - iCurrLen += strlen (argv[i]); + /* Bail if command line has already been logged */ + if (g_pszCommandLine) + return; + + /* Count how much memory is needed for concatenated command line */ + for (i = 0, iCurrLen = 0; i < argc; ++i) + if (argv[i]) { + /* Adds two characters for lines that overflow */ + if ((strlen(argv[i]) < CHARS_PER_LINE + && iCurrLen + strlen(argv[i]) > CHARS_PER_LINE) + || strlen(argv[i]) > CHARS_PER_LINE) { + iCurrLen = 0; + iSize += 2; + } + + /* Add space for item and trailing space */ + iSize += strlen(argv[i]) + 1; + + /* Update current line length */ + iCurrLen += strlen(argv[i]); + } + + /* Allocate memory for concatenated command line */ + g_pszCommandLine = malloc(iSize + 1); + if (!g_pszCommandLine) + FatalError("winLogCommandLine - Could not allocate memory for " + "command line string. Exiting.\n"); + + /* Set first character to concatenated command line to null */ + g_pszCommandLine[0] = '\0'; + + /* Loop through all args */ + for (i = 0, iCurrLen = 0; i < argc; ++i) { + /* Add a character for lines that overflow */ + if ((strlen(argv[i]) < CHARS_PER_LINE + && iCurrLen + strlen(argv[i]) > CHARS_PER_LINE) + || strlen(argv[i]) > CHARS_PER_LINE) { + iCurrLen = 0; + + /* Add line break if it fits */ + strncat(g_pszCommandLine, "\n ", iSize - strlen(g_pszCommandLine)); + } + + strncat(g_pszCommandLine, argv[i], iSize - strlen(g_pszCommandLine)); + strncat(g_pszCommandLine, " ", iSize - strlen(g_pszCommandLine)); + + /* Save new line length */ + iCurrLen += strlen(argv[i]); } - winDebug ("XWin was started with the following command line:\n\n" - "%s\n\n", g_pszCommandLine); + winDebug ("XWin was started with the following command line:\n\n" + "%s\n\n", g_pszCommandLine); } - /* * winLogVersionInfo - Log version information */ void -winLogVersionInfo (void) +winLogVersionInfo(void) { #ifdef WINDBG - static Bool s_fBeenHere = FALSE; - - if (s_fBeenHere) - return; - s_fBeenHere = TRUE; - - winDebug ("Welcome to the VcXsrv X Server\n"); - winDebug ("Vendor: %s\n", XVENDORNAME); - winDebug ("Release: %d.%d.%d.%d\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP); - winDebug ("%s\n\n", BUILDERSTRING); - winDebug ("Contact: %s\n\n", BUILDERADDR); + static Bool s_fBeenHere = FALSE; + + if (s_fBeenHere) + return; + s_fBeenHere = TRUE; + + winDebug ("Welcome to the VcXsrv X Server\n"); + winDebug ("Vendor: %s\n", XVENDORNAME); + winDebug ("Release: %d.%d.%d.%d\n\n", XORG_VERSION_MAJOR, + XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP); + winDebug ("%s\n\n", BUILDERSTRING); + winDebug ("Contact: %s\n\n", BUILDERADDR); #endif } |