From c7b5484cfe4d60457ce790d2588952c7003d8392 Mon Sep 17 00:00:00 2001 From: Harold L Hunt II Date: Wed, 3 Mar 2004 02:57:00 +0000 Subject: [PATCH] Rename Rootless and PseudoRootless modes. Improve error reporting information. --- hw/xwin/InitOutput.c | 84 +++++++++----- hw/xwin/XWin.man | 11 +- hw/xwin/win.h | 92 +++++++-------- hw/xwin/winblock.c | 4 +- hw/xwin/wincreatewnd.c | 18 +-- hw/xwin/winengine.c | 2 +- hw/xwin/winerror.c | 85 +++++++++++++- hw/xwin/winglobals.c | 2 + hw/xwin/winprocarg.c | 181 +++++++++++++++++++++++------- hw/xwin/winscrinit.c | 71 ++++++------ hw/xwin/winvalargs.c | 24 ++-- hw/xwin/winwakeup.c | 4 +- hw/xwin/winwin32rootless.c | 140 +++++++++++------------ hw/xwin/winwin32rootlesswindow.c | 26 ++--- hw/xwin/winwin32rootlesswndproc.c | 74 ++++++------ hw/xwin/winwindow.c | 60 +++++----- hw/xwin/winwindowswm.c | 4 +- hw/xwin/winwndproc.c | 32 +++--- 18 files changed, 561 insertions(+), 353 deletions(-) diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index cab164ec9..022a1e653 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -44,6 +44,8 @@ from The Open Group. extern int g_iNumScreens; extern winScreenInfo g_ScreenInfo[]; extern int g_iLastScreen; +extern char * g_pszCommandLine; +extern Bool g_fUseMsg; extern char * g_pszLogFile; extern int g_iLogVerbose; @@ -76,12 +78,21 @@ extern FARPROC g_fpTrackMouseEvent; */ #if defined(DDXOSVERRORF) -void OsVendorVErrorF (const char *pszFormat, va_list va_args); +void +OsVendorVErrorF (const char *pszFormat, va_list va_args); #endif -void winInitializeDefaultScreens (void); +void +winInitializeDefaultScreens (void); -static Bool winCheckDisplayNumber (void); +static Bool +winCheckDisplayNumber (void); + +void +winLogCommandLine (int argc, char *argv[]); + +void +winLogVersionInfo (void); /* @@ -118,9 +129,9 @@ const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]); */ void -BeforeReset (void) +ddxBeforeReset (void) { - ErrorF ("BeforeReset - Hello\n"); + ErrorF ("ddxBeforeReset - Hello\n"); #ifdef XWIN_CLIPBOARD /* Close down clipboard resources */ @@ -133,7 +144,7 @@ BeforeReset (void) /* Wait for the clipboard thread to exit */ pthread_join (g_ptClipboardProc, NULL); - ErrorF ("BeforeReset - Clipboard thread has exited.\n"); + ErrorF ("ddxBeforeReset - Clipboard thread has exited.\n"); } #endif } @@ -189,6 +200,13 @@ ddxGiveUp (void) g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA; } + /* Free concatenated command line */ + if (g_pszCommandLine) + { + free (g_pszCommandLine); + g_pszCommandLine = NULL; + } + /* Tell Windows that we want to end the app */ PostQuitMessage (0); } @@ -223,13 +241,9 @@ OsVendorInit (void) LogSetParameter (XLOG_FLUSH, 1); LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose); - /* Check for duplicate invocation on same display number.*/ - if (serverGeneration == 1 && !winCheckDisplayNumber ()) - { - FatalError ("OsVendorInit - Duplicate invocation on display " - "number: %s. Exiting.\n", display); - return; - } + /* Log the version information */ + if (serverGeneration == 1) + winLogVersionInfo (); /* Add a default screen if no screens were specified */ if (g_iNumScreens == 0) @@ -254,13 +268,6 @@ OsVendorInit (void) /* We have to flag this as an explicit screen, even though it isn't */ g_ScreenInfo[0].fExplicitScreen = TRUE; } - - /* Validate command-line arguments */ - if (serverGeneration == 1 && !winValidateArgs ()) - { - FatalError ("OsVendorInit - Invalid command-line arguments found. " - "Exiting.\n"); - } } @@ -268,6 +275,9 @@ OsVendorInit (void) void ddxUseMsg (void) { + /* Set a flag so that FatalError won't give duplicate warning message */ + g_fUseMsg = TRUE; + ErrorF ("-depth bits_per_pixel\n" "\tSpecify an optional bitdepth to use in fullscreen mode\n" "\twith a DirectDraw engine.\n"); @@ -307,12 +317,12 @@ ddxUseMsg (void) "\tmode only.\n"); #ifdef XWIN_MULTIWINDOWEXTWM - ErrorF ("-rootless\n" - "\tRun the server in rootless mode.\n"); + ErrorF ("-mwextwm\n" + "\tRun the server in multi-window external window manager mode.\n"); #endif - ErrorF ("-pseudorootless\n" - "\tRun the server in pseudo-rootless mode.\n"); + ErrorF ("-rootless\n" + "\tRun the server in rootless mode.\n"); #ifdef XWIN_MULTIWINDOW ErrorF ("-multiwindow\n" @@ -396,11 +406,10 @@ ddxUseMsg (void) LogClose (); /* Notify user where UseMsg text can be found.*/ - MessageBox (NULL, - "The Cygwin/X help text has been printed to /tmp/XWin.log.\n" - "Please open /tmp/XWin.log to read the help text.", - "Cygwin/X - Help Text Information", - MB_OK); + winMessageBoxF ("The Cygwin/X help text has been printed to " + "/tmp/XWin.log.\n" + "Please open /tmp/XWin.log to read the help text.\n", + MB_ICONINFORMATION); } @@ -425,10 +434,27 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[]) { int i; + /* Log the command line */ + winLogCommandLine (argc, argv); + #if CYGDEBUG winErrorFVerb (2, "InitOutput\n"); #endif + /* Validate command-line arguments */ + if (serverGeneration == 1 && !winValidateArgs ()) + { + FatalError ("InitOutput - Invalid command-line arguments found. " + "Exiting.\n"); + } + + /* Check for duplicate invocation on same display number.*/ + if (serverGeneration == 1 && !winCheckDisplayNumber ()) + { + FatalError ("InitOutput - Duplicate invocation on display " + "number: %s. Exiting.\n", display); + } + #ifdef XWIN_XF86CONFIG /* Try to read the XF86Config-style configuration file */ if (!winReadConfigfile ()) diff --git a/hw/xwin/XWin.man b/hw/xwin/XWin.man index 00c744cb0..e76d6d2ed 100644 --- a/hw/xwin/XWin.man +++ b/hw/xwin/XWin.man @@ -50,8 +50,10 @@ Sets the display resolution for the X server to use on screen .B \-nodecoration Draw the Cygwin/X window without a border or title bar. .TP 8 +.B \-mwextwm +Run the server in multi-window external window manager mode. .B \-rootless -EXPERIMENTAL: Run Cygwin/X in pseduo-rootless mode. +Run the server in rootless mode. .TP 8 .B \-lesspointer Hide the Windows mouse pointer when over an inactive Cygwin/X window @@ -120,10 +122,3 @@ Harold L Hunt II - Project leader, lead developer, documentation, and website updates .br Suhaib Siddiqi - Originator of the project - - - - - - - diff --git a/hw/xwin/win.h b/hw/xwin/win.h index c42b1e357..994e12b99 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -390,9 +390,9 @@ typedef struct Bool fFullScreen; Bool fDecoration; #ifdef XWIN_MULTIWINDOWEXTWM - Bool fRootless; + Bool fMWExtWM; #endif - Bool fPseudoRootless; + Bool fRootless; #ifdef XWIN_MULTIWINDOW Bool fMultiWindow; #endif @@ -487,24 +487,25 @@ typedef struct _winPrivScreenRec /* Privates used by both shadow fb DirectDraw servers */ LPDIRECTDRAWCLIPPER pddcPrimary; - /* Privates used by rootless server */ - RootlessFrameID widTop; - QueryBestSizeProcPtr QueryBestSize; - miPointerSpriteFuncPtr spriteFuncs; - HCURSOR hCursor; - Bool fCursorVisible; - int nCX; - int nCY; - +#ifdef XWIN_MULTIWINDOWEXTWM + /* Privates used by multi-window external window manager */ + RootlessFrameID widTop; + QueryBestSizeProcPtr QueryBestSize; + miPointerSpriteFuncPtr spriteFuncs; + HCURSOR hCursor; + Bool fCursorVisible; + int nCX; + int nCY; +#endif #ifdef XWIN_MULTIWINDOW - /* Privates used by multi-window server */ + /* Privates used by multi-window */ pthread_t ptWMProc; pthread_t ptXMsgProc; void *pWMInfo; #endif - /* Privates used by both multi-window and pseudo rootless */ + /* Privates used by both multi-window and rootless */ Bool fRootWindowShown; Bool fRestacking; Bool fWindowOrderChanged; @@ -827,15 +828,18 @@ Bool winGetDDProcAddresses (void); -#ifdef DDXOSVERRORF /* * winerror.c */ +#ifdef DDXOSVERRORF void OSVenderVErrorF (const char *pszFormat, va_list va_args); #endif +void +winMessageBoxF (const char *pszError, UINT uType, ...); + #ifdef XWIN_NATIVEGDI /* @@ -1431,26 +1435,26 @@ winMapWindowNativeGDI (WindowPtr pWindow); #endif Bool -winCreateWindowPRootless (WindowPtr pWindow); +winCreateWindowRootless (WindowPtr pWindow); Bool -winDestroyWindowPRootless (WindowPtr pWindow); +winDestroyWindowRootless (WindowPtr pWindow); Bool -winPositionWindowPRootless (WindowPtr pWindow, int x, int y); +winPositionWindowRootless (WindowPtr pWindow, int x, int y); Bool -winChangeWindowAttributesPRootless (WindowPtr pWindow, unsigned long mask); +winChangeWindowAttributesRootless (WindowPtr pWindow, unsigned long mask); Bool -winUnmapWindowPRootless (WindowPtr pWindow); +winUnmapWindowRootless (WindowPtr pWindow); Bool -winMapWindowPRootless (WindowPtr pWindow); +winMapWindowRootless (WindowPtr pWindow); #ifdef SHAPE void -winSetShapePRootless (WindowPtr pWindow); +winSetShapeRootless (WindowPtr pWindow); #endif @@ -1581,62 +1585,62 @@ winWindowProc (HWND hWnd, UINT message, */ Bool -winWin32RootlessCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, +winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, int newX, int newY, RegionPtr pShape); void -winWin32RootlessDestroyFrame (RootlessFrameID wid); +winMWExtWMDestroyFrame (RootlessFrameID wid); void -winWin32RootlessMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY); +winMWExtWMMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY); void -winWin32RootlessResizeFrame (RootlessFrameID wid, ScreenPtr pScreen, +winMWExtWMResizeFrame (RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY, unsigned int newW, unsigned int newH, unsigned int gravity); void -winWin32RootlessRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid); +winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid); void -winWin32RootlessReshapeFrame (RootlessFrameID wid, RegionPtr pShape); +winMWExtWMReshapeFrame (RootlessFrameID wid, RegionPtr pShape); void -winWin32RootlessUnmapFrame (RootlessFrameID wid); +winMWExtWMUnmapFrame (RootlessFrameID wid); void -winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow); +winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow); void -winWin32RootlessStopDrawing (RootlessFrameID wid, Bool flush); +winMWExtWMStopDrawing (RootlessFrameID wid, Bool flush); void -winWin32RootlessUpdateRegion (RootlessFrameID wid, RegionPtr pDamage); +winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage); void -winWin32RootlessDamageRects (RootlessFrameID wid, int count, const BoxRec *rects, +winMWExtWMDamageRects (RootlessFrameID wid, int count, const BoxRec *rects, int shift_x, int shift_y); void -winWin32RootlessRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin); +winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin); void -winWin32RootlessCopyBytes (unsigned int width, unsigned int height, +winMWExtWMCopyBytes (unsigned int width, unsigned int height, const void *src, unsigned int srcRowBytes, void *dst, unsigned int dstRowBytes); void -winWin32RootlessFillBytes (unsigned int width, unsigned int height, unsigned int value, +winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value, void *dst, unsigned int dstRowBytes); int -winWin32RootlessCompositePixels (unsigned int width, unsigned int height, unsigned int function, +winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int function, void *src[2], unsigned int srcRowBytes[2], void *mask, unsigned int maskRowBytes, void *dst[2], unsigned int dstRowBytes[2]); void -winWin32RootlessCopyWindow (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects, +winMWExtWMCopyWindow (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects, int dx, int dy); #endif @@ -1647,19 +1651,19 @@ winWin32RootlessCopyWindow (RootlessFrameID wid, int dstNrects, const BoxRec *ds */ void -winWin32RootlessReorderWindows (ScreenPtr pScreen); +winMWExtWMReorderWindows (ScreenPtr pScreen); void -winWin32RootlessMoveXWindow (WindowPtr pWin, int x, int y); +winMWExtWMMoveXWindow (WindowPtr pWin, int x, int y); void -winWin32RootlessResizeXWindow (WindowPtr pWin, int w, int h); +winMWExtWMResizeXWindow (WindowPtr pWin, int w, int h); void -winWin32RootlessMoveResizeXWindow (WindowPtr pWin, int x, int y, int w, int h); +winMWExtWMMoveResizeXWindow (WindowPtr pWin, int x, int y, int w, int h); void -winWin32RootlessUpdateIcon (Window id); +winMWExtWMUpdateIcon (Window id); #endif @@ -1669,7 +1673,7 @@ winWin32RootlessUpdateIcon (Window id); */ Bool -winWin32RootlessInitCursor (ScreenPtr pScreen); +winMWExtWMInitCursor (ScreenPtr pScreen); #endif @@ -1679,7 +1683,7 @@ winWin32RootlessInitCursor (ScreenPtr pScreen); */ LRESULT CALLBACK -winWin32RootlessWindowProc (HWND hwnd, UINT message, +winMWExtWMWindowProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); #endif diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c index 66aa602b9..941c2b53c 100644 --- a/hw/xwin/winblock.c +++ b/hw/xwin/winblock.c @@ -94,7 +94,7 @@ winBlockHandler_ProcessMessages: #endif #ifdef XWIN_MULTIWINDOWEXTWM - if (pScreenPriv->pScreenInfo->fRootless) - winWin32RootlessReorderWindows ((ScreenPtr)pBlockData); + if (pScreenPriv->pScreenInfo->fMWExtWM) + winMWExtWMReorderWindows ((ScreenPtr)pBlockData); #endif } diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index aef548af2..3936ebd1b 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -157,9 +157,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen) /* Decorated or undecorated window */ if (pScreenInfo->fDecoration #ifdef XWIN_MULTIWINDOWEXTWM - && !pScreenInfo->fRootless + && !pScreenInfo->fMWExtWM #endif - && !pScreenInfo->fPseudoRootless + && !pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow #endif @@ -203,9 +203,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen) /* Adjust the window width and height for borders and title bar */ if (pScreenInfo->fDecoration #ifdef XWIN_MULTIWINDOWEXTWM - && !pScreenInfo->fRootless + && !pScreenInfo->fMWExtWM #endif - && !pScreenInfo->fPseudoRootless + && !pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow #endif @@ -275,9 +275,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen) /* Clean up the scrollbars flag, if necessary */ if ((!pScreenInfo->fDecoration #ifdef XWIN_MULTIWINDOWEXTWM - || pScreenInfo->fRootless + || pScreenInfo->fMWExtWM #endif - || pScreenInfo->fPseudoRootless + || pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW || pScreenInfo->fMultiWindow #endif @@ -418,7 +418,7 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen) /* Show the window */ if (FALSE #ifdef XWIN_MULTIWINDOWEXTWM - || pScreenInfo->fRootless + || pScreenInfo->fMWExtWM #endif #ifdef XWIN_MULTIWINDOW || pScreenInfo->fMultiWindow @@ -439,9 +439,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen) /* Attempt to bring our window to the top of the display */ if (TRUE #ifdef XWIN_MULTIWINDOWEXTWM - && !pScreenInfo->fRootless + && !pScreenInfo->fMWExtWM #endif - && !pScreenInfo->fPseudoRootless + && !pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow #endif diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c index 02455f201..27d7fa2aa 100644 --- a/hw/xwin/winengine.c +++ b/hw/xwin/winengine.c @@ -187,7 +187,7 @@ winSetEngine (ScreenPtr pScreen) /* ShadowGDI is the only engine that supports Multi Window Mode */ if (TRUE #ifdef XWIN_MULTIWINDOWEXTWM - || pScreenInfo->fRootless + || pScreenInfo->fMWExtWM #endif #ifdef XWIN_MULTIWINDOW || pScreenInfo->fMultiWindow diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index 3b7eb6895..1474a3116 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -31,6 +31,11 @@ #include "win.h" +/* References to external symbols */ +extern char * g_pszCommandLine; +extern Bool g_fUseMsg; + + #ifdef DDXOSVERRORF /* Prototype */ void @@ -64,10 +69,80 @@ OsVendorVErrorF (const char *pszFormat, va_list va_args) void OsVendorFatalError (void) { - MessageBox (NULL, - "A fatal error has occurred and Cygwin/X will now exit.\n" - "Please open /tmp/XWin.log for more information.\n", - "Cygwin/X - Fatal Error", - MB_OK); + /* Don't give duplicate warning if UseMsg was called */ + if (g_fUseMsg) + return; + + winMessageBoxF ("A fatal error has occurred and Cygwin/X will now exit.\n" \ + "Please open /tmp/XWin.log for more information.\n", + MB_ICONERROR); } #endif + + +/* + * winMessageBoxF - Print a formatted error message in a useful + * message box. + */ + +void +winMessageBoxF (const char *pszError, UINT uType, ...) +{ + int i; + char * pszErrorF = NULL; + char * pszMsgBox = NULL; + va_list args; + + /* Get length of formatted error string */ + va_start (args, pszError); + i = sprintf (NULL, pszError, args); + va_end (args); + + /* Allocate memory for formatted error string */ + pszErrorF = malloc (i); + if (!pszErrorF) + goto winMessageBoxF_Cleanup; + + /* Create the formatted error string */ + va_start (args, pszError); + sprintf (pszErrorF, pszError, args); + va_end (args); + +#define MESSAGEBOXF \ + "%s\n" \ + "Vendor: %s\n" \ + "Release: %s\n" \ + "Contact: %s\n" \ + "XWin was started with the following command-line:\n\n" \ + "%s\n" + + /* Get length of message box string */ + i = sprintf (NULL, MESSAGEBOXF, + pszErrorF, + VENDOR_STRING, VERSION_STRING, VENDOR_CONTACT, + g_pszCommandLine); + + /* Allocate memory for message box string */ + pszMsgBox = malloc (i); + if (!pszMsgBox) + goto winMessageBoxF_Cleanup; + + /* Format the message box string */ + sprintf (pszMsgBox, MESSAGEBOXF, + pszErrorF, + VENDOR_STRING, VERSION_STRING, VENDOR_CONTACT, + g_pszCommandLine); + + /* Display the message box string */ + MessageBox (NULL, + pszMsgBox, + "Cygwin/X", + MB_OK | uType); + + winMessageBoxF_Cleanup: + if (pszErrorF) + free (pszErrorF); + if (pszMsgBox) + free (pszMsgBox); +#undef MESSAGEBOXF +} diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c index 429cca2b5..057b4f55e 100644 --- a/hw/xwin/winglobals.c +++ b/hw/xwin/winglobals.c @@ -56,6 +56,8 @@ HICON g_hiconX = NULL; char * g_pszLogFile = "/tmp/XWin.log"; int g_iLogVerbose = 4; Bool g_fLogInited = FALSE; +char * g_pszCommandLine = NULL; +Bool g_fUseMsg = FALSE; /* diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 1a09b7818..c819bb494 100755 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -47,11 +47,19 @@ extern Bool g_fClipboard; extern int g_iLogVerbose; extern char * g_pszLogFile; extern Bool g_fXdmcpEnabled; +extern char * g_pszCommandLine; + /* * Function prototypes */ +void +winLogCommandLine (int argc, char *argv[]); + +void +winLogVersionInfo (void); + #ifdef DDXOSVERRORF void OsVendorVErrorF (const char *pszFormat, va_list va_args); #endif @@ -108,9 +116,9 @@ winInitializeDefaultScreens (void) g_ScreenInfo[i].fFullScreen = FALSE; g_ScreenInfo[i].fDecoration = TRUE; #ifdef XWIN_MULTIWINDOWEXTWM - g_ScreenInfo[i].fRootless = FALSE; + g_ScreenInfo[i].fMWExtWM = FALSE; #endif - g_ScreenInfo[i].fPseudoRootless = FALSE; + g_ScreenInfo[i].fRootless = FALSE; #ifdef XWIN_MULTIWINDOW g_ScreenInfo[i].fMultiWindow = FALSE; #endif @@ -165,8 +173,8 @@ ddxProcessArgument (int argc, char *argv[], int i) { static Bool s_fBeenHere = FALSE; - /* Initialize once - only if option is not -help */ - if (!s_fBeenHere && !IS_OPTION ("-help")) + /* Initialize once */ + if (!s_fBeenHere) { #ifdef DDXOSVERRORF /* @@ -178,13 +186,24 @@ ddxProcessArgument (int argc, char *argv[], int i) s_fBeenHere = TRUE; - /* - * 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. - */ - winErrorFVerb (2, "ddxProcessArgument - Initializing default screens\n"); - winInitializeDefaultScreens (); + /* Log the version information */ + winLogVersionInfo (); + + /* Log the command line */ + winLogCommandLine (argc, argv); + + /* Initialize only if option is not -help */ + if (!IS_OPTION("-help")) + { + /* + * 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. + */ + winErrorFVerb (2, "ddxProcessArgument - Initializing default " + "screens\n"); + winInitializeDefaultScreens (); + } } #if CYGDEBUG @@ -416,6 +435,33 @@ ddxProcessArgument (int argc, char *argv[], int i) } #ifdef XWIN_MULTIWINDOWEXTWM + /* + * Look for the '-mwextwm' argument + */ + if (IS_OPTION ("-mwextwm")) + { + /* Is this parameter attached to a screen or is it global? */ + if (-1 == g_iLastScreen) + { + int j; + + /* Parameter is for all screens */ + for (j = 0; j < MAXSCREENS; j++) + { + g_ScreenInfo[j].fMWExtWM = TRUE; + } + } + else + { + /* Parameter is for a single screen */ + g_ScreenInfo[g_iLastScreen].fMWExtWM = TRUE; + } + + /* Indicate that we have processed this argument */ + return 1; + } +#endif + /* * Look for the '-rootless' argument */ @@ -441,33 +487,6 @@ ddxProcessArgument (int argc, char *argv[], int i) /* Indicate that we have processed this argument */ return 1; } -#endif - - /* - * Look for the '-pseudorootless' argument - */ - if (IS_OPTION ("-pseudorootless")) - { - /* Is this parameter attached to a screen or is it global? */ - if (-1 == g_iLastScreen) - { - int j; - - /* Parameter is for all screens */ - for (j = 0; j < MAXSCREENS; j++) - { - g_ScreenInfo[j].fPseudoRootless = TRUE; - } - } - else - { - /* Parameter is for a single screen */ - g_ScreenInfo[g_iLastScreen].fPseudoRootless = TRUE; - } - - /* Indicate that we have processed this argument */ - return 1; - } #ifdef XWIN_MULTIWINDOW /* @@ -1074,3 +1093,89 @@ ddxProcessArgument (int argc, char *argv[], int i) return 0; } + + +/* + * winLogCommandLine - Write entire command line to the log file + */ + +void +winLogCommandLine (int argc, char *argv[]) +{ + 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]) + { + /* 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; + ++iSize; + } + + /* 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]); + } + + ErrorF ("XWin was started with the following command line:\n\n" + "%s\n\n", g_pszCommandLine); +} + + +/* + * winLogVersionInfo - Log Cygwin/X version information + */ + +void +winLogVersionInfo (void) +{ + ErrorF ("Welcome to the XWin X Server\n"); + ErrorF ("Vendor: %s\n", VENDOR_STRING); + ErrorF ("Release: %s\n\n", VERSION_STRING); + ErrorF ("Contact: %s\n\n", VENDOR_CONTACT); +} diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index 0a2a5b40b..8200a6f38 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -39,28 +39,28 @@ #ifdef XWIN_MULTIWINDOWEXTWM static RootlessFrameProcsRec -winWin32RootlessProcs = { - winWin32RootlessCreateFrame, - winWin32RootlessDestroyFrame, +winMWExtWMProcs = { + winMWExtWMCreateFrame, + winMWExtWMDestroyFrame, - winWin32RootlessMoveFrame, - winWin32RootlessResizeFrame, - winWin32RootlessRestackFrame, - winWin32RootlessReshapeFrame, - winWin32RootlessUnmapFrame, + winMWExtWMMoveFrame, + winMWExtWMResizeFrame, + winMWExtWMRestackFrame, + winMWExtWMReshapeFrame, + winMWExtWMUnmapFrame, - winWin32RootlessStartDrawing, - winWin32RootlessStopDrawing, - winWin32RootlessUpdateRegion, + winMWExtWMStartDrawing, + winMWExtWMStopDrawing, + winMWExtWMUpdateRegion, #ifndef ROOTLESS_TRACK_DAMAGE - winWin32RootlessDamageRects, + winMWExtWMDamageRects, #endif - winWin32RootlessRootlessSwitchWindow, + winMWExtWMRootlessSwitchWindow, - NULL,//winWin32RootlessCopyBytes, - NULL,//winWin32RootlessFillBytes, - NULL,//winWin32RootlessCompositePixels, - winWin32RootlessCopyWindow + NULL,//winMWExtWMCopyBytes, + NULL,//winMWExtWMFillBytes, + NULL,//winMWExtWMCompositePixels, + winMWExtWMCopyWindow }; #endif @@ -439,7 +439,7 @@ winFinishScreenInitFB (int index, || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL) #ifdef XWIN_MULTIWINDOWEXTWM - && !pScreenInfo->fRootless + && !pScreenInfo->fMWExtWM #endif ) { @@ -457,21 +457,22 @@ winFinishScreenInitFB (int index, #endif #ifdef XWIN_MULTIWINDOWEXTWM - /* Handle rootless mode */ - if (pScreenInfo->fRootless) + /* Handle multi-window external window manager mode */ + if (pScreenInfo->fMWExtWM) { - ErrorF ("winScreenInit - RootlessInit\n"); + ErrorF ("winScreenInit - MultiWindowExtWM - Calling RootlessInit\n"); - RootlessInit(pScreen, &winWin32RootlessProcs); + RootlessInit(pScreen, &winMWExtWMProcs); - ErrorF ("winScreenInit - RootlessInit - done\n"); + ErrorF ("winScreenInit - MultiWindowExtWM - RootlessInit returned\n"); rootless_CopyBytes_threshold = 0; rootless_FillBytes_threshold = 0; rootless_CompositePixels_threshold = 0; - rootless_CopyWindow_threshold = 1;/* FIXME: How many? Profiling needed? */ + /* FIXME: How many? Profiling needed? */ + rootless_CopyWindow_threshold = 1; - if (!winWin32RootlessInitCursor (pScreen)) + if (!winMWExtWMInitCursor (pScreen)) { return FALSE; } @@ -479,8 +480,8 @@ winFinishScreenInitFB (int index, } #endif - /* Handle pseudo-rootless mode */ - if (pScreenInfo->fPseudoRootless) + /* Handle rootless mode */ + if (pScreenInfo->fRootless) { /* Define the WRAP macro temporarily for local use */ #define WRAP(a) \ @@ -502,15 +503,15 @@ winFinishScreenInitFB (int index, WRAP(SetShape); #endif - /* Assign pseudo-rootless window procedures to be top level procedures */ - pScreen->CreateWindow = winCreateWindowPRootless; - pScreen->DestroyWindow = winDestroyWindowPRootless; - pScreen->PositionWindow = winPositionWindowPRootless; - pScreen->ChangeWindowAttributes = winChangeWindowAttributesPRootless; - pScreen->RealizeWindow = winMapWindowPRootless; - pScreen->UnrealizeWindow = winUnmapWindowPRootless; + /* Assign rootless window procedures to be top level procedures */ + pScreen->CreateWindow = winCreateWindowRootless; + pScreen->DestroyWindow = winDestroyWindowRootless; + pScreen->PositionWindow = winPositionWindowRootless; + pScreen->ChangeWindowAttributes = winChangeWindowAttributesRootless; + pScreen->RealizeWindow = winMapWindowRootless; + pScreen->UnrealizeWindow = winUnmapWindowRootless; #ifdef SHAPE - pScreen->SetShape = winSetShapePRootless; + pScreen->SetShape = winSetShapeRootless; #endif /* Undefine the WRAP macro, as it is not needed elsewhere */ diff --git a/hw/xwin/winvalargs.c b/hw/xwin/winvalargs.c index 033c58d70..f2765c0ff 100755 --- a/hw/xwin/winvalargs.c +++ b/hw/xwin/winvalargs.c @@ -83,7 +83,7 @@ winValidateArgs (void) { /* * Check for any combination of - * -multiwindow, -rootless, and -pseudorootless. + * -multiwindow, -mwextwm, and -rootless. */ { int iCount = 0; @@ -94,52 +94,52 @@ winValidateArgs (void) ++iCount; #endif #ifdef XWIN_MULTIWINDOWEXTWM - if (g_ScreenInfo[i].fRootless) + if (g_ScreenInfo[i].fMWExtWM) ++iCount; #endif - if (g_ScreenInfo[i].fPseudoRootless) + if (g_ScreenInfo[i].fRootless) ++iCount; /* Fail if two or more conflicting options */ if (iCount > 1) { - ErrorF ("winValidateArgs - Only one of -multiwindow, -rootless, " - "and -pseudorootless can be specific at a time.\n"); + ErrorF ("winValidateArgs - Only one of -multiwindow, -mwextwm, " + "and -rootless can be specific at a time.\n"); return FALSE; } } - /* Check for multiwindow or rootless and Xdmcp */ + /* Check for -multiwindow or -mwextwm and Xdmcp */ if (g_fXdmcpEnabled && (FALSE #ifdef XWIN_MULTIWINDOW || g_ScreenInfo[i].fMultiWindow #endif #ifdef XWIN_MULTIWINDOWEXTWM - || g_ScreenInfo[i].fRootless + || g_ScreenInfo[i].fMWExtWM #endif ) ) { ErrorF ("winValidateArgs - Xdmcp (-query, -broadcast, or -indirect) " - "is invalid with -multiwindow or -rootless.\n"); + "is invalid with -multiwindow or -mwextwm.\n"); return FALSE; } - /* Check for multiwindow, rootless, or pseudorootless and fullscreen */ + /* Check for -multiwindow, -mwextwm, or -rootless and fullscreen */ if (g_ScreenInfo[i].fFullScreen && (FALSE #ifdef XWIN_MULTIWINDOW || g_ScreenInfo[i].fMultiWindow #endif #ifdef XWIN_MULTIWINDOWEXTWM - || g_ScreenInfo[i].fRootless + || g_ScreenInfo[i].fMWExtWM #endif - || g_ScreenInfo[i].fPseudoRootless) + || g_ScreenInfo[i].fRootless) ) { ErrorF ("winValidateArgs - -fullscreen is invalid with " - "-multiwindow, -rootless, or -pseudorootless.\n"); + "-multiwindow, -mwextwm, or -rootless.\n"); return FALSE; } diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c index f87aa8f38..2e5db91fb 100644 --- a/hw/xwin/winwakeup.c +++ b/hw/xwin/winwakeup.c @@ -71,7 +71,7 @@ winWakeupHandler (int nScreen, #endif #ifdef XWIN_MULTIWINDOWEXTWM - if (pScreenPriv->pScreenInfo->fRootless) - winWin32RootlessReorderWindows ((ScreenPtr)pWakeupData); + if (pScreenPriv->pScreenInfo->fMWExtWM) + winMWExtWMReorderWindows ((ScreenPtr)pWakeupData); #endif } diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c index 5d4ca2655..53c3d8479 100755 --- a/hw/xwin/winwin32rootless.c +++ b/hw/xwin/winwin32rootless.c @@ -60,7 +60,7 @@ DEFINE_ATOM_HELPER(AtmWindowsWmNativeHwnd, WINDOWSWM_NATIVE_HWND) static void -winWin32RootlessSetNativeProperty (RootlessWindowPtr pFrame); +winMWExtWMSetNativeProperty (RootlessWindowPtr pFrame); /* * Global variables @@ -83,7 +83,7 @@ extern HICON g_hiconX; static Bool -winWin32RootlessQueryDIBFormat (win32RootlessWindowPtr pRLWinPriv, BITMAPINFOHEADER *pbmih) +winMWExtWMQueryDIBFormat (win32RootlessWindowPtr pRLWinPriv, BITMAPINFOHEADER *pbmih) { HBITMAP hbmp; #if CYGMULTIWINDOW_DEBUG @@ -94,7 +94,7 @@ winWin32RootlessQueryDIBFormat (win32RootlessWindowPtr pRLWinPriv, BITMAPINFOHEA hbmp = CreateCompatibleBitmap (pRLWinPriv->hdcScreen, 1, 1); if (hbmp == NULL) { - ErrorF ("winWin32RootlessQueryDIBFormat - CreateCompatibleBitmap failed\n"); + ErrorF ("winMWExtWMQueryDIBFormat - CreateCompatibleBitmap failed\n"); return FALSE; } @@ -110,7 +110,7 @@ winWin32RootlessQueryDIBFormat (win32RootlessWindowPtr pRLWinPriv, BITMAPINFOHEA (BITMAPINFO*) pbmih, DIB_RGB_COLORS)) { - ErrorF ("winWin32RootlessQueryDIBFormat - First call to GetDIBits failed\n"); + ErrorF ("winMWExtWMQueryDIBFormat - First call to GetDIBits failed\n"); DeleteObject (hbmp); return FALSE; } @@ -119,7 +119,7 @@ winWin32RootlessQueryDIBFormat (win32RootlessWindowPtr pRLWinPriv, BITMAPINFOHEA /* Get a pointer to bitfields */ pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER)); - ErrorF ("winWin32RootlessQueryDIBFormat - First call masks: %08x %08x %08x\n", + ErrorF ("winMWExtWMQueryDIBFormat - First call masks: %08x %08x %08x\n", (unsigned int)pdw[0], (unsigned int)pdw[1], (unsigned int)pdw[2]); #endif @@ -131,7 +131,7 @@ winWin32RootlessQueryDIBFormat (win32RootlessWindowPtr pRLWinPriv, BITMAPINFOHEA (BITMAPINFO*)pbmih, DIB_RGB_COLORS)) { - ErrorF ("winWin32RootlessQueryDIBFormat - Second call to GetDIBits " + ErrorF ("winMWExtWMQueryDIBFormat - Second call to GetDIBits " "failed\n"); DeleteObject (hbmp); return FALSE; @@ -144,7 +144,7 @@ winWin32RootlessQueryDIBFormat (win32RootlessWindowPtr pRLWinPriv, BITMAPINFOHEA } static HRGN -winWin32RootlessCreateRgnFromRegion (RegionPtr pShape) +winMWExtWMCreateRgnFromRegion (RegionPtr pShape) { int nRects; BoxPtr pRects, pEnd; @@ -208,17 +208,17 @@ InitWin32RootlessEngine (win32RootlessWindowPtr pRLWinPriv) + 256 * sizeof (RGBQUAD)); if (pRLWinPriv->pbmihShadow == NULL) { - ErrorF ("winWin32RootlessCreateFrame - malloc () failed\n"); + ErrorF ("winMWExtWMCreateFrame - malloc () failed\n"); return; } /* Query the screen format */ - winWin32RootlessQueryDIBFormat (pRLWinPriv, + winMWExtWMQueryDIBFormat (pRLWinPriv, pRLWinPriv->pbmihShadow); } Bool -winWin32RootlessCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, +winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, int newX, int newY, RegionPtr pShape) { #define CLASS_NAME_LENGTH 512 @@ -231,7 +231,7 @@ winWin32RootlessCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, static int s_iWindowID = 0; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessCreateFrame %d %d - %d %d\n", + ErrorF ("winMWExtWMCreateFrame %d %d - %d %d\n", newX, newY, pFrame->width, pFrame->height); #endif @@ -301,7 +301,7 @@ winWin32RootlessCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, /* Setup our window class */ wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = winWin32RootlessWindowProc; + wc.lpfnWndProc = winMWExtWMWindowProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = g_hInstance; @@ -328,13 +328,13 @@ winWin32RootlessCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, pRLWinPriv); /* ScreenPrivates */ if (pRLWinPriv->hWnd == NULL) { - ErrorF ("winWin32RootlessCreateFrame - CreateWindowExA () failed: %d\n", + ErrorF ("winMWExtWMCreateFrame - CreateWindowExA () failed: %d\n", (int) GetLastError ()); fResult = FALSE; } #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessCreateFrame - ShowWindow\n"); + ErrorF ("winMWExtWMCreateFrame - ShowWindow\n"); #endif //ShowWindow (pRLWinPriv->hWnd, SW_SHOWNOACTIVATE); @@ -342,11 +342,11 @@ winWin32RootlessCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, if (pShape != NULL) { - winWin32RootlessReshapeFrame (pFrame->wid, pShape); + winMWExtWMReshapeFrame (pFrame->wid, pShape); } #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessCreateFrame - (%08x) %08x\n", + ErrorF ("winMWExtWMCreateFrame - (%08x) %08x\n", (int) pFrame->wid, (int) pRLWinPriv->hWnd); #if 0 { @@ -358,7 +358,7 @@ winWin32RootlessCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, { pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE); } - ErrorF ("winWin32RootlessCreateFrame2 (%08x) %08x\n", + ErrorF ("winMWExtWMCreateFrame2 (%08x) %08x\n", pRLWinPriv2, pRLWinPriv2->hWnd); if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd) { @@ -368,17 +368,17 @@ winWin32RootlessCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen, #endif #endif - winWin32RootlessSetNativeProperty (pFrame); + winMWExtWMSetNativeProperty (pFrame); return fResult; } void -winWin32RootlessDestroyFrame (RootlessFrameID wid) +winMWExtWMDestroyFrame (RootlessFrameID wid) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessDestroyFrame (%08x) %08x\n", + ErrorF ("winMWExtWMDestroyFrame (%08x) %08x\n", (int) pRLWinPriv, (int) pRLWinPriv->hWnd); #if 0 { @@ -390,7 +390,7 @@ winWin32RootlessDestroyFrame (RootlessFrameID wid) { pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE); } - ErrorF ("winWin32RootlessDestroyFrame2 (%08x) %08x\n", + ErrorF ("winMWExtWMDestroyFrame2 (%08x) %08x\n", pRLWinPriv2, pRLWinPriv2->hWnd); if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd) { @@ -407,12 +407,12 @@ winWin32RootlessDestroyFrame (RootlessFrameID wid) DestroyWindow (pRLWinPriv->hWnd); #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessDestroyFrame - done\n"); + ErrorF ("winMWExtWMDestroyFrame - done\n"); #endif } void -winWin32RootlessMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int iNewX, int iNewY) +winMWExtWMMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int iNewX, int iNewY) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; RECT rcNew; @@ -421,7 +421,7 @@ winWin32RootlessMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int iNewX, in int iX, iY, iWidth, iHeight; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessMoveFrame (%08x) (%d %d)\n", (int) pRLWinPriv, iNewX, iNewY); + ErrorF ("winMWExtWMMoveFrame (%08x) (%d %d)\n", (int) pRLWinPriv, iNewX, iNewY); #endif /* Get the Windows window style and extended style */ @@ -452,7 +452,7 @@ winWin32RootlessMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int iNewX, in } void -winWin32RootlessResizeFrame (RootlessFrameID wid, ScreenPtr pScreen, +winMWExtWMResizeFrame (RootlessFrameID wid, ScreenPtr pScreen, int iNewX, int iNewY, unsigned int uiNewWidth, unsigned int uiNewHeight, unsigned int uiGravity) @@ -465,7 +465,7 @@ winWin32RootlessResizeFrame (RootlessFrameID wid, ScreenPtr pScreen, int iX, iY; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessResizeFrame (%08x) (%d %d)-(%d %d)\n", + ErrorF ("winMWExtWMResizeFrame (%08x) (%d %d)-(%d %d)\n", (int) pRLWinPriv, iNewX, iNewY, uiNewWidth, uiNewHeight); #endif @@ -505,7 +505,7 @@ winWin32RootlessResizeFrame (RootlessFrameID wid, ScreenPtr pScreen, } void -winWin32RootlessRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid) +winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; win32RootlessWindowPtr pRLNextWinPriv = (win32RootlessWindowPtr) nextWid; @@ -516,7 +516,7 @@ winWin32RootlessRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid) Bool fFirst = TRUE; Bool fNeedRestack = TRUE; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessRestackFrame (%08x)\n", (int) pRLWinPriv); + ErrorF ("winMWExtWMRestackFrame (%08x)\n", (int) pRLWinPriv); #endif if (pScreenPriv->fRestacking) return; @@ -603,17 +603,17 @@ winWin32RootlessRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid) } void -winWin32RootlessReshapeFrame (RootlessFrameID wid, RegionPtr pShape) +winMWExtWMReshapeFrame (RootlessFrameID wid, RegionPtr pShape) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; HRGN hRgn, hRgnWindow, hRgnClient; RECT rcWindow, rcClient; POINT ptOffset; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessReshapeFrame (%08x)\n", (int) pRLWinPriv); + ErrorF ("winMWExtWMReshapeFrame (%08x)\n", (int) pRLWinPriv); #endif - hRgn = winWin32RootlessCreateRgnFromRegion (pShape); + hRgn = winMWExtWMCreateRgnFromRegion (pShape); /* Create region for non-client area */ GetWindowRect (pRLWinPriv->hWnd, &rcWindow); @@ -635,11 +635,11 @@ winWin32RootlessReshapeFrame (RootlessFrameID wid, RegionPtr pShape) } void -winWin32RootlessUnmapFrame (RootlessFrameID wid) +winMWExtWMUnmapFrame (RootlessFrameID wid) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessUnmapFrame (%08x)\n", (int) pRLWinPriv); + ErrorF ("winMWExtWMUnmapFrame (%08x)\n", (int) pRLWinPriv); #endif g_fNoConfigureWindow = TRUE; @@ -652,7 +652,7 @@ winWin32RootlessUnmapFrame (RootlessFrameID wid) * Fixme: Code sharing with winshadgdi.c and other engine support */ void -winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow) +winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; winPrivScreenPtr pScreenPriv = NULL; @@ -663,7 +663,7 @@ winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesP HDC hdcNew; HBITMAP hbmpNew; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessStartDrawing (%08x) %08x\n", (int) pRLWinPriv, pRLWinPriv->fDestroyed); + ErrorF ("winMWExtWMStartDrawing (%08x) %08x\n", (int) pRLWinPriv, pRLWinPriv->fDestroyed); #endif if (!pRLWinPriv->fDestroyed) @@ -697,13 +697,13 @@ winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesP 0); if (hbmpNew == NULL || pRLWinPriv->pfb == NULL) { - ErrorF ("winWin32RootlessStartDrawing - CreateDIBSection failed\n"); + ErrorF ("winMWExtWMStartDrawing - CreateDIBSection failed\n"); //return FALSE; } else { #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessStartDrawing - Shadow buffer allocated\n"); + ErrorF ("winMWExtWMStartDrawing - Shadow buffer allocated\n"); #endif } @@ -712,7 +712,7 @@ winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesP #if CYGMULTIWINDOW_DEBUG /* Print information about bitmap allocated */ - ErrorF ("winWin32RootlessStartDrawing - Dibsection width: %d height: %d " + ErrorF ("winMWExtWMStartDrawing - Dibsection width: %d height: %d " "depth: %d size image: %d\n", (unsigned int)dibsection.dsBmih.biWidth, (unsigned int)dibsection.dsBmih.biHeight, @@ -724,7 +724,7 @@ winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesP SelectObject (hdcNew, hbmpNew); #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessStartDrawing - Attempting a shadow blit\n"); + ErrorF ("winMWExtWMStartDrawing - Attempting a shadow blit\n"); #endif /* Blit from the old shadow to the new shadow */ @@ -737,19 +737,19 @@ winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesP if (fReturn) { #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessStartDrawing - Shadow blit success\n"); + ErrorF ("winMWExtWMStartDrawing - Shadow blit success\n"); #endif } else { - ErrorF ("winWin32RootlessStartDrawing - Shadow blit failure\n"); + ErrorF ("winMWExtWMStartDrawing - Shadow blit failure\n"); } /* Look for height weirdness */ if (dibsection.dsBmih.biHeight < 0) { /* FIXME: Figure out why biHeight is sometimes negative */ - ErrorF ("winWin32RootlessStartDrawing - WEIRDNESS - biHeight " + ErrorF ("winMWExtWMStartDrawing - WEIRDNESS - biHeight " "still negative: %d\n" "winAllocateFBShadowGDI - WEIRDNESS - Flipping biHeight sign\n", (int) dibsection.dsBmih.biHeight); @@ -759,7 +759,7 @@ winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesP pRLWinPriv->dwWidthBytes = dibsection.dsBm.bmWidthBytes; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessStartDrawing - bytesPerRow: %d\n", + ErrorF ("winMWExtWMStartDrawing - bytesPerRow: %d\n", (unsigned int)dibsection.dsBm.bmWidthBytes); #endif @@ -773,16 +773,16 @@ winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesP pRLWinPriv->fResized = FALSE; } #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessStartDrawing - 0x%08x %d\n", + ErrorF ("winMWExtWMStartDrawing - 0x%08x %d\n", (unsigned int)pRLWinPriv->pfb, (unsigned int)dibsection.dsBm.bmWidthBytes); #endif } else { - ErrorF ("winWin32RootlessStartDrawing - Already window was destoroyed \n"); + ErrorF ("winMWExtWMStartDrawing - Already window was destoroyed \n"); } #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessStartDrawing - done (0x08x) 0x%08x %d\n", + ErrorF ("winMWExtWMStartDrawing - done (0x08x) 0x%08x %d\n", (int) pRLWinPriv, (unsigned int)pRLWinPriv->pfb, (unsigned int)pRLWinPriv->dwWidthBytes); #endif @@ -791,7 +791,7 @@ winWin32RootlessStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesP } void -winWin32RootlessStopDrawing (RootlessFrameID wid, Bool fFlush) +winMWExtWMStopDrawing (RootlessFrameID wid, Bool fFlush) { #if 0 win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; @@ -799,7 +799,7 @@ winWin32RootlessStopDrawing (RootlessFrameID wid, Bool fFlush) SIZE szWin; POINT ptSrc; #if CYGMULTIWINDOW_DEBUG || TRUE - ErrorF ("winWin32RootlessStopDrawing (%08x)\n", pRLWinPriv); + ErrorF ("winMWExtWMStopDrawing (%08x)\n", pRLWinPriv); #endif szWin.cx = pRLWinPriv->dwWidth; szWin.cy = pRLWinPriv->dwHeight; @@ -815,13 +815,13 @@ winWin32RootlessStopDrawing (RootlessFrameID wid, Bool fFlush) pRLWinPriv->hdcShadow, &ptSrc, 0, &bfBlend, ULW_ALPHA)) { - ErrorF ("winWin32RootlessStopDrawing - UpdateLayeredWindow failed\n"); + ErrorF ("winMWExtWMStopDrawing - UpdateLayeredWindow failed\n"); } #endif } void -winWin32RootlessUpdateRegion (RootlessFrameID wid, RegionPtr pDamage) +winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; #if 0 @@ -830,7 +830,7 @@ winWin32RootlessUpdateRegion (RootlessFrameID wid, RegionPtr pDamage) POINT ptSrc; #endif #if CYGMULTIWINDOW_DEBUG && 0 - ErrorF ("winWin32RootlessUpdateRegion (%08x)\n", pRLWinPriv); + ErrorF ("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv); #endif #if 0 szWin.cx = pRLWinPriv->dwWidth; @@ -859,7 +859,7 @@ winWin32RootlessUpdateRegion (RootlessFrameID wid, RegionPtr pDamage) (LPTSTR) &lpMsgBuf, 0, NULL); - ErrorF ("winWin32RootlessUpdateRegion - UpdateLayeredWindow failed: %s\n", + ErrorF ("winMWExtWMUpdateRegion - UpdateLayeredWindow failed: %s\n", (LPSTR)lpMsgBuf); LocalFree (lpMsgBuf); } @@ -868,13 +868,13 @@ winWin32RootlessUpdateRegion (RootlessFrameID wid, RegionPtr pDamage) } void -winWin32RootlessDamageRects (RootlessFrameID wid, int nCount, const BoxRec *pRects, +winMWExtWMDamageRects (RootlessFrameID wid, int nCount, const BoxRec *pRects, int shift_x, int shift_y) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; const BoxRec *pEnd; #if CYGMULTIWINDOW_DEBUG && 0 - ErrorF ("winWin32RootlessDamageRects (%08x, %d, %08x, %d, %d)\n", + ErrorF ("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n", pRLWinPriv, nCount, pRects, shift_x, shift_y); #endif @@ -890,18 +890,18 @@ winWin32RootlessDamageRects (RootlessFrameID wid, int nCount, const BoxRec *pRec } void -winWin32RootlessRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin) +winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) pFrame->wid; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessRootlessSwitchWindow (%08x) %08x\n", + ErrorF ("winMWExtWMRootlessSwitchWindow (%08x) %08x\n", (int) pRLWinPriv, (int) pRLWinPriv->hWnd); #endif pRLWinPriv->pFrame = pFrame; pRLWinPriv->fResized = TRUE; DeleteProperty (oldWin, AtmWindowsWmNativeHwnd ()); - winWin32RootlessSetNativeProperty (pFrame); + winMWExtWMSetNativeProperty (pFrame); #if CYGMULTIWINDOW_DEBUG #if 0 { @@ -913,7 +913,7 @@ winWin32RootlessRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin { pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE); } - ErrorF ("winWin32RootlessSwitchFrame2 (%08x) %08x\n", + ErrorF ("winMWExtWMSwitchFrame2 (%08x) %08x\n", pRLWinPriv2, pRLWinPriv2->hWnd); if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd) { @@ -925,46 +925,46 @@ winWin32RootlessRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin } void -winWin32RootlessCopyBytes (unsigned int width, unsigned int height, +winMWExtWMCopyBytes (unsigned int width, unsigned int height, const void *src, unsigned int srcRowBytes, void *dst, unsigned int dstRowBytes) { #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessCopyBytes - Not implemented\n"); + ErrorF ("winMWExtWMCopyBytes - Not implemented\n"); #endif } void -winWin32RootlessFillBytes (unsigned int width, unsigned int height, unsigned int value, +winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value, void *dst, unsigned int dstRowBytes) { #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessFillBytes - Not implemented\n"); + ErrorF ("winMWExtWMFillBytes - Not implemented\n"); #endif } int -winWin32RootlessCompositePixels (unsigned int width, unsigned int height, unsigned int function, +winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int function, void *src[2], unsigned int srcRowBytes[2], void *mask, unsigned int maskRowBytes, void *dst[2], unsigned int dstRowBytes[2]) { #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessCompositePixels - Not implemented\n"); + ErrorF ("winMWExtWMCompositePixels - Not implemented\n"); #endif return 0; } void -winWin32RootlessCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pDstRects, +winMWExtWMCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pDstRects, int nDx, int nDy) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; const BoxRec *pEnd; RECT rcDmg; #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessCopyWindow (%08x, %d, %08x, %d, %d)\n", + ErrorF ("winMWExtWMCopyWindow (%08x, %d, %08x, %d, %d)\n", (int) pRLWinPriv, nDstRects, (int) pDstRects, nDx, nDy); #endif @@ -987,7 +987,7 @@ winWin32RootlessCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pD pDstRects->x1 + nDx, pDstRects->y1 + nDy, SRCCOPY)) { - ErrorF ("winWin32RootlessCopyWindow - BitBlt failed.\n"); + ErrorF ("winMWExtWMCopyWindow - BitBlt failed.\n"); } rcDmg.left = pDstRects->x1; @@ -998,17 +998,17 @@ winWin32RootlessCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pD InvalidateRect (pRLWinPriv->hWnd, &rcDmg, FALSE); } #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessCopyWindow - done\n"); + ErrorF ("winMWExtWMCopyWindow - done\n"); #endif } /* - * winWin32RootlessSetNativeProperty + * winMWExtWMSetNativeProperty */ static void -winWin32RootlessSetNativeProperty (RootlessWindowPtr pFrame) +winMWExtWMSetNativeProperty (RootlessWindowPtr pFrame) { win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) pFrame->wid; long lData; diff --git a/hw/xwin/winwin32rootlesswindow.c b/hw/xwin/winwin32rootlesswindow.c index 4b19c0e24..e68d524b7 100755 --- a/hw/xwin/winwin32rootlesswindow.c +++ b/hw/xwin/winwin32rootlesswindow.c @@ -42,11 +42,11 @@ extern HICON g_hiconX; /* - * winWin32RootlessReorderWindows + * winMWExtWMReorderWindows */ void -winWin32RootlessReorderWindows (ScreenPtr pScreen) +winMWExtWMReorderWindows (ScreenPtr pScreen) { winScreenPriv(pScreen); HWND hwnd = NULL; @@ -56,7 +56,7 @@ winWin32RootlessReorderWindows (ScreenPtr pScreen) DWORD dwWindowProcessID = 0; #if CYGMULTIWINDOW_DEBUG && FALSE - ErrorF ("winWin32RootlessReorderWindows\n"); + ErrorF ("winMWExtWMReorderWindows\n"); #endif pScreenPriv->fRestacking = TRUE; @@ -64,7 +64,7 @@ winWin32RootlessReorderWindows (ScreenPtr pScreen) if (pScreenPriv->fWindowOrderChanged) { #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessReorderWindows - Need to restack\n"); + ErrorF ("winMWExtWMReorderWindows - Need to restack\n"); #endif hwnd = GetTopWindow (NULL); @@ -84,7 +84,7 @@ winWin32RootlessReorderWindows (ScreenPtr pScreen) if (vlist == NULL) { - ErrorF ("winWin32RootlessReorderWindows - malloc () " + ErrorF ("winMWExtWMReorderWindows - malloc () " "failed\n"); return; } @@ -109,11 +109,11 @@ winWin32RootlessReorderWindows (ScreenPtr pScreen) /* - * winWin32RootlessMoveXWindow + * winMWExtWMMoveXWindow */ void -winWin32RootlessMoveXWindow (WindowPtr pWin, int x, int y) +winMWExtWMMoveXWindow (WindowPtr pWin, int x, int y) { XID *vlist = malloc(sizeof(long)*2); @@ -125,11 +125,11 @@ winWin32RootlessMoveXWindow (WindowPtr pWin, int x, int y) /* - * winWin32RootlessResizeXWindow + * winMWExtWMResizeXWindow */ void -winWin32RootlessResizeXWindow (WindowPtr pWin, int w, int h) +winMWExtWMResizeXWindow (WindowPtr pWin, int w, int h) { XID *vlist = malloc(sizeof(long)*2); @@ -141,11 +141,11 @@ winWin32RootlessResizeXWindow (WindowPtr pWin, int w, int h) /* - * winWin32RootlessMoveResizeXWindow + * winMWExtWMMoveResizeXWindow */ void -winWin32RootlessMoveResizeXWindow (WindowPtr pWin, int x, int y, int w, int h) +winMWExtWMMoveResizeXWindow (WindowPtr pWin, int x, int y, int w, int h) { XID *vlist = malloc(sizeof(long)*4); @@ -160,12 +160,12 @@ winWin32RootlessMoveResizeXWindow (WindowPtr pWin, int x, int y, int w, int h) /* - * winWin32RootlessUpdateIcon + * winMWExtWMUpdateIcon * Change the Windows window icon */ void -winWin32RootlessUpdateIcon (Window id) +winMWExtWMUpdateIcon (Window id) { WindowPtr pWin; HICON hIcon, hiconOld; diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c index ad6c4a324..75cf3c50d 100755 --- a/hw/xwin/winwin32rootlesswndproc.c +++ b/hw/xwin/winwin32rootlesswndproc.c @@ -393,11 +393,11 @@ IsMouseActive (WindowPtr pWin) /* - * winWin32RootlessWindowProc - Window procedure + * winMWExtWMWindowProc - Window procedure */ LRESULT CALLBACK -winWin32RootlessWindowProc (HWND hwnd, UINT message, +winMWExtWMWindowProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WindowPtr pWin = NULL; @@ -426,7 +426,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, ErrorF ("pScreenPriv %08X\n", pScreenPriv); ErrorF ("pScreenInfo %08X\n", pScreenInfo); ErrorF ("hwndScreen %08X\n", hwndScreen); - ErrorF ("winWin32RootlessWindowProc (%08x) %08x %08x %08x\n", + ErrorF ("winMWExtWMWindowProc (%08x) %08x %08x %08x\n", pRLWinPriv, message, wParam, lParam); #endif } @@ -435,7 +435,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, { case WM_CREATE: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_CREATE\n"); + ErrorF ("winMWExtWMWindowProc - WM_CREATE\n"); #endif /* */ SetProp (hwnd, @@ -445,7 +445,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_CLOSE: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_CLOSE %d\n", pRLWinPriv->fClose); + ErrorF ("winMWExtWMWindowProc - WM_CLOSE %d\n", pRLWinPriv->fClose); #endif /* Tell window-manager to close window */ if (pRLWinPriv->fClose) @@ -465,7 +465,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_DESTROY: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_DESTROY\n"); + ErrorF ("winMWExtWMWindowProc - WM_DESTROY\n"); #endif /* Free the shaodw DC; which allows the bitmap to be freed */ DeleteDC (pRLWinPriv->hdcShadow); @@ -487,7 +487,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_MOUSEMOVE: #if CYGMULTIWINDOW_DEBUG && 0 - ErrorF ("winWin32RootlessWindowProc - WM_MOUSEMOVE\n"); + ErrorF ("winMWExtWMWindowProc - WM_MOUSEMOVE\n"); #endif /* Unpack the client area mouse coordinates */ ptMouse.x = GET_X_LPARAM(lParam); @@ -523,7 +523,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, /* Call the tracking function */ if (!(*g_fpTrackMouseEvent) (&tme)) - ErrorF ("winWin32RootlessWindowProc - _TrackMouseEvent failed\n"); + ErrorF ("winMWExtWMWindowProc - _TrackMouseEvent failed\n"); /* Flag that we are tracking now */ s_fTracking = TRUE; @@ -544,7 +544,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_NCMOUSEMOVE: #if CYGMULTIWINDOW_DEBUG && 0 - ErrorF ("winWin32RootlessWindowProc - WM_NCMOUSEMOVE\n"); + ErrorF ("winMWExtWMWindowProc - WM_NCMOUSEMOVE\n"); #endif /* * We break instead of returning 0 since we need to call @@ -572,7 +572,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_MOUSELEAVE: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_MOUSELEAVE\n"); + ErrorF ("winMWExtWMWindowProc - WM_MOUSELEAVE\n"); #endif /* Mouse has left our client area */ @@ -593,7 +593,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_LBUTTONDBLCLK\n"); + ErrorF ("winMWExtWMWindowProc - WM_LBUTTONDBLCLK\n"); #endif if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput) break; @@ -602,7 +602,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_LBUTTONUP: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_LBUTTONUP\n"); + ErrorF ("winMWExtWMWindowProc - WM_LBUTTONUP\n"); #endif if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput) break; @@ -612,7 +612,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_MBUTTONDBLCLK: case WM_MBUTTONDOWN: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_MBUTTONDBLCLK\n"); + ErrorF ("winMWExtWMWindowProc - WM_MBUTTONDBLCLK\n"); #endif if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput) break; @@ -621,7 +621,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_MBUTTONUP: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_MBUTTONUP\n"); + ErrorF ("winMWExtWMWindowProc - WM_MBUTTONUP\n"); #endif if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput) break; @@ -631,7 +631,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_RBUTTONDBLCLK: case WM_RBUTTONDOWN: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_RBUTTONDBLCLK\n"); + ErrorF ("winMWExtWMWindowProc - WM_RBUTTONDBLCLK\n"); #endif if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput) break; @@ -640,7 +640,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_RBUTTONUP: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_RBUTTONUP\n"); + ErrorF ("winMWExtWMWindowProc - WM_RBUTTONUP\n"); #endif if (pScreenPriv == NULL || pScreenInfo->fIgnoreInput) break; @@ -649,7 +649,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_MOUSEWHEEL: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_MOUSEWHEEL\n"); + ErrorF ("winMWExtWMWindowProc - WM_MOUSEWHEEL\n"); #endif /* Pass the message to the root window */ @@ -658,14 +658,14 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_MOUSEACTIVATE: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_MOUSEACTIVATE\n"); + ErrorF ("winMWExtWMWindowProc - WM_MOUSEACTIVATE\n"); #endif #if 0 /* Check if this window needs to be made active when clicked */ if (pWin->overrideRedirect) { #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_MOUSEACTIVATE - " + ErrorF ("winMWExtWMWindowProc - WM_MOUSEACTIVATE - " "MA_NOACTIVATE\n"); #endif @@ -693,7 +693,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_SYSKEYDOWN: case WM_KEYDOWN: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_*KEYDOWN\n"); + ErrorF ("winMWExtWMWindowProc - WM_*KEYDOWN\n"); #endif /* @@ -721,7 +721,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_KEYUP: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_*KEYUP\n"); + ErrorF ("winMWExtWMWindowProc - WM_*KEYUP\n"); #endif /* Pass the message to the root window */ @@ -730,7 +730,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_HOTKEY: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_HOTKEY\n"); + ErrorF ("winMWExtWMWindowProc - WM_HOTKEY\n"); #endif /* Pass the message to the root window */ @@ -763,7 +763,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, (LPTSTR) &lpMsgBuf, 0, NULL); - ErrorF ("winWin32RootlessWindowProc - BitBlt failed: %s\n", + ErrorF ("winMWExtWMWindowProc - BitBlt failed: %s\n", (LPSTR)lpMsgBuf); LocalFree (lpMsgBuf); } @@ -774,7 +774,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_ACTIVATE: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_ACTIVATE\n"); + ErrorF ("winMWExtWMWindowProc - WM_ACTIVATE\n"); #endif if (LOWORD(wParam) != WA_INACTIVE) { @@ -820,7 +820,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_MOVE: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_MOVE - %d ms\n", + ErrorF ("winMWExtWMWindowProc - WM_MOVE - %d ms\n", (unsigned int)GetTickCount ()); #endif if (g_fNoConfigureWindow) break; @@ -850,7 +850,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, #endif if (!pRLWinPriv->fMovingOrSizing) { - winWin32RootlessMoveXWindow (pWin, + winMWExtWMMoveXWindow (pWin, (LOWORD(lParam) - wBorderWidth (pWin) - GetSystemMetrics (SM_XVIRTUALSCREEN)), (HIWORD(lParam) - wBorderWidth (pWin) @@ -860,7 +860,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_SHOWWINDOW: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_SHOWWINDOW - %d ms\n", + ErrorF ("winMWExtWMWindowProc - WM_SHOWWINDOW - %d ms\n", (unsigned int)GetTickCount ()); #endif if (pScreenPriv != NULL) @@ -874,7 +874,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_WINDOWPOSCHANGED: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_WINDOWPOSCHANGED\n"); + ErrorF ("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED\n"); #endif { pWinPos = (LPWINDOWPOS) lParam; @@ -945,7 +945,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, #if CYGMULTIWINDOW_DEBUG ErrorF ("\tmove & resize\n"); #endif - winWin32RootlessMoveResizeXWindow (pWin, + winMWExtWMMoveResizeXWindow (pWin, rcClient.left - wBorderWidth (pWin) - GetSystemMetrics (SM_XVIRTUALSCREEN), rcClient.top - wBorderWidth (pWin) @@ -958,7 +958,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, #if CYGMULTIWINDOW_DEBUG ErrorF ("\tmove\n"); #endif - winWin32RootlessMoveXWindow (pWin, + winMWExtWMMoveXWindow (pWin, rcClient.left - wBorderWidth (pWin) - GetSystemMetrics (SM_XVIRTUALSCREEN), rcClient.top - wBorderWidth (pWin) @@ -967,7 +967,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, #if CYGMULTIWINDOW_DEBUG ErrorF ("\tresize\n"); #endif - winWin32RootlessResizeXWindow (pWin, + winMWExtWMResizeXWindow (pWin, rcClient.right - rcClient.left - wBorderWidth (pWin)*2, rcClient.bottom - rcClient.top @@ -977,7 +977,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, } } #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_WINDOWPOSCHANGED - done.\n"); + ErrorF ("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED - done.\n"); #endif return 0; @@ -985,7 +985,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, /* see dix/window.c */ /* FIXME: Maximize/Restore? */ #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_SIZE - %d ms\n", + ErrorF ("winMWExtWMWindowProc - WM_SIZE - %d ms\n", (unsigned int)GetTickCount ()); #endif #if CYGMULTIWINDOW_DEBUG @@ -1042,7 +1042,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, /* Perform the resize and notify the X client */ if (!pRLWinPriv->fMovingOrSizing) { - winWin32RootlessResizeXWindow (pWin, + winMWExtWMResizeXWindow (pWin, (short) LOWORD(lParam) - wBorderWidth (pWin)*2, (short) HIWORD(lParam) @@ -1083,7 +1083,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_ENTERSIZEMOVE: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_ENTERSIZEMOVE - %d ms\n", + ErrorF ("winMWExtWMWindowProc - WM_ENTERSIZEMOVE - %d ms\n", (unsigned int)GetTickCount ()); #endif pRLWinPriv->fMovingOrSizing = TRUE; @@ -1091,7 +1091,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, case WM_EXITSIZEMOVE: #if CYGMULTIWINDOW_DEBUG - ErrorF ("winWin32RootlessWindowProc - WM_EXITSIZEMOVE - %d ms\n", + ErrorF ("winMWExtWMWindowProc - WM_EXITSIZEMOVE - %d ms\n", (unsigned int)GetTickCount ()); #endif pRLWinPriv->fMovingOrSizing = FALSE; @@ -1099,7 +1099,7 @@ winWin32RootlessWindowProc (HWND hwnd, UINT message, GetClientRect (hwnd, &rcClient); MapWindowPoints (hwnd, HWND_DESKTOP, (LPPOINT)&rcClient, 2); - winWin32RootlessMoveResizeXWindow (pWin, + winMWExtWMMoveResizeXWindow (pWin, rcClient.left - wBorderWidth (pWin) - GetSystemMetrics (SM_XVIRTUALSCREEN), rcClient.top - wBorderWidth (pWin) diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c index 7f77bda6a..22031a974 100644 --- a/hw/xwin/winwindow.c +++ b/hw/xwin/winwindow.c @@ -42,12 +42,12 @@ winAddRgn (WindowPtr pWindow, pointer data); static void -winUpdateRgnPRootless (WindowPtr pWindow); +winUpdateRgnRootless (WindowPtr pWindow); #ifdef SHAPE static void -winReshapePRootless (WindowPtr pWin); +winReshapeRootless (WindowPtr pWin); #endif @@ -221,13 +221,13 @@ winMapWindowNativeGDI (WindowPtr pWindow) /* See mfb/mfbwindow.c - mfbCreateWindow() */ Bool -winCreateWindowPRootless (WindowPtr pWin) +winCreateWindowRootless (WindowPtr pWin) { Bool fResult = FALSE; winWindowPriv(pWin); #if CYGDEBUG - ErrorF ("winCreateWindowPRootless ()\n"); + ErrorF ("winCreateWindowRootless ()\n"); #endif fResult = winGetScreenPriv(pWin->drawable.pScreen)->CreateWindow(pWin); @@ -242,13 +242,13 @@ winCreateWindowPRootless (WindowPtr pWin) /* See mfb/mfbwindow.c - mfbDestroyWindow() */ Bool -winDestroyWindowPRootless (WindowPtr pWin) +winDestroyWindowRootless (WindowPtr pWin) { Bool fResult = FALSE; winWindowPriv(pWin); #if CYGDEBUG - ErrorF ("winDestroyWindowPRootless ()\n"); + ErrorF ("winDestroyWindowRootless ()\n"); #endif fResult = winGetScreenPriv(pWin->drawable.pScreen)->DestroyWindow(pWin); @@ -259,7 +259,7 @@ winDestroyWindowPRootless (WindowPtr pWin) pWinPriv->hRgn = NULL; } - winUpdateRgnPRootless (pWin); + winUpdateRgnRootless (pWin); return fResult; } @@ -269,17 +269,17 @@ winDestroyWindowPRootless (WindowPtr pWin) /* See mfb/mfbwindow.c - mfbPositionWindow() */ Bool -winPositionWindowPRootless (WindowPtr pWin, int x, int y) +winPositionWindowRootless (WindowPtr pWin, int x, int y) { Bool fResult = FALSE; #if CYGDEBUG - ErrorF ("winPositionWindowPRootless ()\n"); + ErrorF ("winPositionWindowRootless ()\n"); #endif fResult = winGetScreenPriv(pWin->drawable.pScreen)->PositionWindow(pWin, x, y); - winUpdateRgnPRootless (pWin); + winUpdateRgnRootless (pWin); return fResult; } @@ -289,17 +289,17 @@ winPositionWindowPRootless (WindowPtr pWin, int x, int y) /* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */ Bool -winChangeWindowAttributesPRootless (WindowPtr pWin, unsigned long mask) +winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask) { Bool fResult = FALSE; #if CYGDEBUG - ErrorF ("winChangeWindowAttributesPRootless ()\n"); + ErrorF ("winChangeWindowAttributesRootless ()\n"); #endif fResult = winGetScreenPriv(pWin->drawable.pScreen)->ChangeWindowAttributes(pWin, mask); - winUpdateRgnPRootless (pWin); + winUpdateRgnRootless (pWin); return fResult; } @@ -310,13 +310,13 @@ winChangeWindowAttributesPRootless (WindowPtr pWin, unsigned long mask) */ Bool -winUnmapWindowPRootless (WindowPtr pWin) +winUnmapWindowRootless (WindowPtr pWin) { Bool fResult = FALSE; winWindowPriv(pWin); #if CYGDEBUG - ErrorF ("winUnmapWindowPRootless ()\n"); + ErrorF ("winUnmapWindowRootless ()\n"); #endif fResult = winGetScreenPriv(pWin->drawable.pScreen)->UnrealizeWindow(pWin); @@ -327,7 +327,7 @@ winUnmapWindowPRootless (WindowPtr pWin) pWinPriv->hRgn = NULL; } - winUpdateRgnPRootless (pWin); + winUpdateRgnRootless (pWin); return fResult; } @@ -338,21 +338,21 @@ winUnmapWindowPRootless (WindowPtr pWin) */ Bool -winMapWindowPRootless (WindowPtr pWin) +winMapWindowRootless (WindowPtr pWin) { Bool fResult = FALSE; #if CYGDEBUG - ErrorF ("winMapWindowPRootless ()\n"); + ErrorF ("winMapWindowRootless ()\n"); #endif fResult = winGetScreenPriv(pWin->drawable.pScreen)->RealizeWindow(pWin); #ifdef SHAPE - winReshapePRootless (pWin); + winReshapeRootless (pWin); #endif - winUpdateRgnPRootless (pWin); + winUpdateRgnRootless (pWin); return fResult; } @@ -360,16 +360,16 @@ winMapWindowPRootless (WindowPtr pWin) #ifdef SHAPE void -winSetShapePRootless (WindowPtr pWin) +winSetShapeRootless (WindowPtr pWin) { #if CYGDEBUG - ErrorF ("winSetShapePRootless ()\n"); + ErrorF ("winSetShapeRootless ()\n"); #endif winGetScreenPriv(pWin->drawable.pScreen)->SetShape(pWin); - winReshapePRootless (pWin); - winUpdateRgnPRootless (pWin); + winReshapeRootless (pWin); + winUpdateRgnRootless (pWin); return; } @@ -447,7 +447,7 @@ winAddRgn (WindowPtr pWin, pointer data) static void -winUpdateRgnPRootless (WindowPtr pWin) +winUpdateRgnRootless (WindowPtr pWin) { HRGN hRgn = CreateRectRgn (0, 0, 0, 0); @@ -459,7 +459,7 @@ winUpdateRgnPRootless (WindowPtr pWin) } else { - ErrorF ("winUpdateRgnPRootless - CreateRectRgn failed.\n"); + ErrorF ("winUpdateRgnRootless - CreateRectRgn failed.\n"); } } @@ -467,7 +467,7 @@ winUpdateRgnPRootless (WindowPtr pWin) #ifdef SHAPE static void -winReshapePRootless (WindowPtr pWin) +winReshapeRootless (WindowPtr pWin) { int nRects; ScreenPtr pScreen = pWin->drawable.pScreen; @@ -477,7 +477,7 @@ winReshapePRootless (WindowPtr pWin) winWindowPriv(pWin); #if CYGDEBUG - ErrorF ("winReshapePRootless ()\n"); + ErrorF ("winReshapeRootless ()\n"); #endif /* Bail if the window is the root window */ @@ -520,13 +520,13 @@ winReshapePRootless (WindowPtr pWin) pRects->x2, pRects->y2); if (hRgnRect == NULL) { - ErrorF("winReshapePRootless - CreateRectRgn() failed\n"); + ErrorF("winReshapeRootless - CreateRectRgn() failed\n"); } /* Merge the Windows region with the accumulated region */ if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR) { - ErrorF("winReshapePRootless - CombineRgn() failed\n"); + ErrorF("winReshapeRootless - CombineRgn() failed\n"); } /* Delete the temporary Windows region */ diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c index ec8e7df4e..a63c09210 100755 --- a/hw/xwin/winwindowswm.c +++ b/hw/xwin/winwindowswm.c @@ -504,7 +504,7 @@ ProcWindowsWMFrameDraw (register ClientPtr client) ShowWindow (pRLWinPriv->hWnd, nCmdShow); - winWin32RootlessUpdateIcon (pWin->drawable.id); + winMWExtWMUpdateIcon (pWin->drawable.id); if (wBoundingShape(pWin) != NULL) { @@ -515,7 +515,7 @@ ProcWindowsWMFrameDraw (register ClientPtr client) REGION_NULL(pScreen, &newShape); REGION_COPY(pScreen, &newShape, wBoundingShape(pWin)); REGION_TRANSLATE(pScreen, &newShape, pWin->borderWidth, pWin->borderWidth); - winWin32RootlessReshapeFrame (pRLWinPriv, &newShape); + winMWExtWMReshapeFrame (pRLWinPriv, &newShape); REGION_UNINIT(pScreen, &newShape); } #if CYGMULTIWINDOW_DEBUG diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 9e98797fd..87d7f6bc9 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -315,9 +315,9 @@ winWindowProc (HWND hwnd, UINT message, if (!s_pScreenInfo->fScrollbars || !s_pScreenInfo->fDecoration #ifdef XWIN_MULTIWINDOWEXTWM - || s_pScreenInfo->fRootless + || s_pScreenInfo->fMWExtWM #endif - || s_pScreenInfo->fPseudoRootless + || s_pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW || s_pScreenInfo->fMultiWindow #endif @@ -591,9 +591,9 @@ winWindowProc (HWND hwnd, UINT message, || s_pScreenInfo->fFullScreen || !s_pScreenInfo->fDecoration #ifdef XWIN_MULTIWINDOWEXTWM - || s_pScreenInfo->fRootless + || s_pScreenInfo->fMWExtWM #endif - || s_pScreenInfo->fPseudoRootless + || s_pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW || s_pScreenInfo->fMultiWindow #endif @@ -779,9 +779,9 @@ winWindowProc (HWND hwnd, UINT message, case WM_LBUTTONDOWN: if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput) break; - if (s_pScreenInfo->fPseudoRootless + if (s_pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOWEXTWM - || s_pScreenInfo->fRootless + || s_pScreenInfo->fMWExtWM #endif ) SetCapture (hwnd); @@ -790,9 +790,9 @@ winWindowProc (HWND hwnd, UINT message, case WM_LBUTTONUP: if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput) break; - if (s_pScreenInfo->fPseudoRootless + if (s_pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOWEXTWM - || s_pScreenInfo->fRootless + || s_pScreenInfo->fMWExtWM #endif ) ReleaseCapture (); @@ -802,9 +802,9 @@ winWindowProc (HWND hwnd, UINT message, case WM_MBUTTONDOWN: if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput) break; - if (s_pScreenInfo->fPseudoRootless + if (s_pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOWEXTWM - || s_pScreenInfo->fRootless + || s_pScreenInfo->fMWExtWM #endif ) SetCapture (hwnd); @@ -813,9 +813,9 @@ winWindowProc (HWND hwnd, UINT message, case WM_MBUTTONUP: if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput) break; - if (s_pScreenInfo->fPseudoRootless + if (s_pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOWEXTWM - || s_pScreenInfo->fRootless + || s_pScreenInfo->fMWExtWM #endif ) ReleaseCapture (); @@ -825,9 +825,9 @@ winWindowProc (HWND hwnd, UINT message, case WM_RBUTTONDOWN: if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput) break; - if (s_pScreenInfo->fPseudoRootless + if (s_pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOWEXTWM - || s_pScreenInfo->fRootless + || s_pScreenInfo->fMWExtWM #endif ) SetCapture (hwnd); @@ -836,9 +836,9 @@ winWindowProc (HWND hwnd, UINT message, case WM_RBUTTONUP: if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput) break; - if (s_pScreenInfo->fPseudoRootless + if (s_pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOWEXTWM - || s_pScreenInfo->fRootless + || s_pScreenInfo->fMWExtWM #endif ) ReleaseCapture ();