diff options
Diffstat (limited to 'xorg-server/hw/xwin/win.h')
| -rw-r--r-- | xorg-server/hw/xwin/win.h | 81 |
1 files changed, 28 insertions, 53 deletions
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h index ac26d0181..5ec7e3bee 100644 --- a/xorg-server/hw/xwin/win.h +++ b/xorg-server/hw/xwin/win.h @@ -42,11 +42,6 @@ #define YES 1 #endif -/* Turn debug messages on or off */ -#ifndef CYGDEBUG -#define CYGDEBUG NO -#endif - /* WM_XBUTTON Messages. They should go into w32api. */ #ifndef WM_XBUTTONDOWN # define WM_XBUTTONDOWN 523 @@ -102,6 +97,7 @@ #define MOUSE_POLLING_INTERVAL 50 #define WIN_E3B_OFF -1 +#define WIN_E3B_DEFAULT 0 #define WIN_FD_INVALID -1 #define WIN_SERVER_NONE 0x0L /* 0 */ @@ -139,6 +135,9 @@ #include <errno.h> #if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW) #define HANDLE void * +#ifdef _MSC_VER +typedef int pid_t; +#endif #include <pthread.h> #undef HANDLE #endif @@ -206,44 +205,6 @@ #include "winwindow.h" #include "winmsg.h" - -/* - * Debugging macros - */ - -#if CYGDEBUG -#define DEBUG_MSG(str,...) \ -if (fDebugProcMsg) \ -{ \ - char *pszTemp; \ - int iLength; \ - if (asprintf (&pszTemp, str, ##__VA_ARGS__) != -1) { \ - MessageBox (NULL, pszTemp, szFunctionName, MB_OK); \ - free (pszTemp); \ - } \ -} -#else -#define DEBUG_MSG(str,...) -#endif - -#if CYGDEBUG -#define DEBUG_FN_NAME(str) PTSTR szFunctionName = str -#else -#define DEBUG_FN_NAME(str) -#endif - -#if CYGDEBUG || YES -#define DEBUGVARS BOOL fDebugProcMsg = FALSE -#else -#define DEBUGVARS -#endif - -#if CYGDEBUG || YES -#define DEBUGPROC_MSG fDebugProcMsg = TRUE -#else -#define DEBUGPROC_MSG -#endif - #define PROFILEPOINT(point,thresh)\ {\ static unsigned int PROFPT##point = 0;\ @@ -434,9 +395,11 @@ typedef struct Bool fDecoration; #ifdef XWIN_MULTIWINDOWEXTWM Bool fMWExtWM; - Bool fInternalWM; Bool fAnotherWMRunning; #endif +#ifdef XWIN_MULTIWINDOWINTWM + Bool fInternalWM; +#endif Bool fRootless; #ifdef XWIN_MULTIWINDOW Bool fMultiWindow; @@ -507,17 +470,19 @@ typedef struct _winPrivScreenRec /* Privates used by shadow fb and primary fb DirectDraw servers */ LPDIRECTDRAW pdd; - LPDIRECTDRAWSURFACE2 pddsPrimary; + LPDIRECTDRAWSURFACE pddsPrimary; LPDIRECTDRAW2 pdd2; /* Privates used by shadow fb DirectDraw server */ - LPDIRECTDRAWSURFACE2 pddsShadow; + LPDIRECTDRAWSURFACE pddsShadow; LPDDSURFACEDESC pddsdShadow; +#ifdef XWIN_PRIMARYFB /* Privates used by primary fb DirectDraw server */ - LPDIRECTDRAWSURFACE2 pddsOffscreen; + LPDIRECTDRAWSURFACE pddsOffscreen; LPDDSURFACEDESC pddsdOffscreen; LPDDSURFACEDESC pddsdPrimary; +#endif /* Privates used by shadow fb DirectDraw Nonlocking server */ LPDIRECTDRAW4 pdd4; @@ -820,7 +785,7 @@ Bool winInitClipboard (void); void -winFixClipboardChain (void); +winFixClipboardChain (int Removed); #endif @@ -850,6 +815,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen); * windialogs.c */ +int +GetLiveClients (winPrivScreenPtr pScreenPriv); + void winDisplayExitDialog (winPrivScreenPtr pScreenPriv); @@ -1323,7 +1291,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message, */ void -winInitNotifyIcon (winPrivScreenPtr pScreenPriv); +winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify); void winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv); @@ -1426,13 +1394,13 @@ winMWExtWMUpdateWindowDecoration (win32RootlessWindowPtr pRLWinPriv, wBOOL CALLBACK winMWExtWMDecorateWindow (HWND hwnd, LPARAM lParam); -Bool -winIsInternalWMRunning (winScreenInfoPtr pScreenInfo); - void winMWExtWMRestackWindows (ScreenPtr pScreen); #endif - +#ifdef XWIN_MULTIWINDOWINTWM +Bool +winIsInternalWMRunning (winScreenInfoPtr pScreenInfo); +#endif #ifdef XWIN_MULTIWINDOWEXTWM /* @@ -1470,6 +1438,13 @@ void winInitializeScreens(int maxscreens); /* + * windisplay.c + */ + +void +winGetDisplayName(char *szDisplay, unsigned int screen); + +/* * winrandr.c */ Bool |