From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/hw/xwin/winwindow.h | 84 ++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 44 deletions(-) (limited to 'xorg-server/hw/xwin/winwindow.h') diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h index 229696ae4..c357f8d08 100644 --- a/xorg-server/hw/xwin/winwindow.h +++ b/xorg-server/hw/xwin/winwindow.h @@ -41,7 +41,7 @@ /* Constant strings */ #ifndef PROJECT_NAME -# define PROJECT_NAME "Cygwin/X" +#define PROJECT_NAME "Cygwin/X" #endif #define EXECUTABLE_NAME "XWin" #define WINDOW_CLASS "cygwin/x" @@ -52,7 +52,7 @@ #define WINDOW_TITLE_X PROJECT_NAME " X" #define WIN_WINDOW_PROP "cyg_window_prop_rl" #ifdef HAS_DEVWINDOWS -# define WIN_MSG_QUEUE_FNAME "/dev/windows" +#define WIN_MSG_QUEUE_FNAME "/dev/windows" #endif #define WIN_WID_PROP "cyg_wid_prop_rl" #define WIN_NEEDMANAGE_PROP "cyg_override_redirect_prop_rl" @@ -67,44 +67,41 @@ typedef struct _winPrivScreenRec *winPrivScreenPtr; - /* * Window privates */ -typedef struct -{ - DWORD dwDummy; - HRGN hRgn; - HWND hWnd; - winPrivScreenPtr pScreenPriv; - Bool fXKilled; - HDWP hDwp; +typedef struct { + DWORD dwDummy; + HRGN hRgn; + HWND hWnd; + winPrivScreenPtr pScreenPriv; + Bool fXKilled; + HDWP hDwp; #ifdef XWIN_GLX_WINDOWS - Bool fWglUsed; + Bool fWglUsed; #endif - /* Privates used by primary fb DirectDraw server */ - LPDDSURFACEDESC pddsdPrimary; + /* Privates used by primary fb DirectDraw server */ + LPDDSURFACEDESC pddsdPrimary; - /* Privates used by shadow fb DirectDraw Nonlocking server */ - LPDIRECTDRAWSURFACE4 pddsPrimary4; + /* Privates used by shadow fb DirectDraw Nonlocking server */ + LPDIRECTDRAWSURFACE4 pddsPrimary4; - /* Privates used by both shadow fb DirectDraw servers */ - LPDIRECTDRAWCLIPPER pddcPrimary; + /* Privates used by both shadow fb DirectDraw servers */ + LPDIRECTDRAWCLIPPER pddcPrimary; } winPrivWinRec, *winPrivWinPtr; #ifdef XWIN_MULTIWINDOW -typedef struct _winWMMessageRec{ - DWORD dwID; - DWORD msg; - int iWindow; - HWND hwndWindow; - int iX, iY; - int iWidth, iHeight; +typedef struct _winWMMessageRec { + DWORD dwID; + DWORD msg; + int iWindow; + HWND hwndWindow; + int iX, iY; + int iWidth, iHeight; } winWMMessageRec, *winWMMessagePtr; - /* * winmultiwindowwm.c */ @@ -138,41 +135,40 @@ typedef struct _winWMMessageRec{ /* This structure only contains 3 elements... the Motif 2.0 structure contains 5... we only need the first 3... so that is all we will define */ typedef struct MwmHints { - unsigned long flags, functions, decorations; + unsigned long flags, functions, decorations; } MwmHints; + #define PropMwmHintsElements 3 void -winSendMessageToWM (void *pWMInfo, winWMMessagePtr msg); + winSendMessageToWM(void *pWMInfo, winWMMessagePtr msg); Bool -winInitWM (void **ppWMInfo, - pthread_t *ptWMProc, - pthread_t *ptXMsgProc, - pthread_mutex_t *ppmServerStarted, - int dwScreen, - HWND hwndScreen, - BOOL allowOtherWM); -void -winDeinitMultiWindowWM (void); +winInitWM(void **ppWMInfo, + pthread_t * ptWMProc, + pthread_t * ptXMsgProc, + pthread_mutex_t * ppmServerStarted, + int dwScreen, HWND hwndScreen, BOOL allowOtherWM); void -winMinimizeWindow (Window id); + winDeinitMultiWindowWM(void); +void + winMinimizeWindow(Window id); /* * winmultiwindowicons.c */ void -winUpdateIcon (Window id); + winUpdateIcon(Window id); -void -winInitGlobalIcons (void); +void + winInitGlobalIcons(void); -void -winDestroyIcon(HICON hIcon); +void + winDestroyIcon(HICON hIcon); -#endif /* XWIN_MULTIWINDOW */ +#endif /* XWIN_MULTIWINDOW */ #endif -- cgit v1.2.3