diff options
Diffstat (limited to 'xorg-server/hw/xwin/winwindow.h')
-rw-r--r-- | xorg-server/hw/xwin/winwindow.h | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h index 7e6bd565c..534b524b7 100644 --- a/xorg-server/hw/xwin/winwindow.h +++ b/xorg-server/hw/xwin/winwindow.h @@ -32,6 +32,8 @@ * Colin Harrison */ +#include <pthread.h> + #ifndef NO #define NO 0 #endif @@ -41,30 +43,24 @@ /* Constant strings */ #ifndef PROJECT_NAME -#define PROJECT_NAME "Cygwin/X" +#define PROJECT_NAME "VcXsrv" #endif -#define EXECUTABLE_NAME "XWin" -#define WINDOW_CLASS "cygwin/x" -#define WINDOW_TITLE PROJECT_NAME ":%s.%d" -#define WINDOW_TITLE_XDMCP "%s:%s.%d" -#define WIN_SCR_PROP "cyg_screen_prop rl" -#define WINDOW_CLASS_X "cygwin/x X rl" -#define WINDOW_CLASS_X_MSG "cygwin/x X msg" -#define WINDOW_TITLE_X PROJECT_NAME " X" -#define WIN_WINDOW_PROP "cyg_window_prop_rl" +#define EXECUTABLE_NAME "VcXsrv" +#define WINDOW_CLASS "VcXsrv/x" +#define WINDOW_TITLE PROJECT_NAME " Server - Display %s:%s.%d" +#define WINDOW_TITLE_XDMCP PROJECT_NAME " Server - %s - Display %s:%s.%d" +extern const char WIN_SCR_PROP[]; +#define WINDOW_CLASS_X "vcxsrv/x X rl" +#define WINDOW_CLASS_X_MSG "vcxsrv/x X msg" +#define WINDOW_TITLE_X PROJECT_NAME " X" +extern const char WIN_WINDOW_PROP[]; #ifdef HAS_DEVWINDOWS -#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" -#ifndef CYGMULTIWINDOW_DEBUG -#define CYGMULTIWINDOW_DEBUG NO -#endif -#ifndef CYGWINDOWING_DEBUG -#define CYGWINDOWING_DEBUG NO +#define WIN_MSG_QUEUE_FNAME "/dev/windows" #endif +extern const char WIN_WID_PROP[]; +extern const char WIN_NEEDMANAGE_PROP[]; -#define XMING_SIGNATURE 0x12345678L +#define VCXSRV_SIGNATURE 0xdeaddeadL typedef struct _winPrivScreenRec *winPrivScreenPtr; @@ -76,6 +72,7 @@ typedef struct { DWORD dwDummy; HRGN hRgn; HWND hWnd; + BOOL OpenGlWindow; winPrivScreenPtr pScreenPriv; Bool fXKilled; HDWP hDwp; @@ -151,6 +148,15 @@ void winMinimizeWindow(Window id); void +winTaskbarInit (void); + +void +winTaskbarDestroy (void); + +void +winSetAppID (HWND hWnd, const char* AppID); + +void winPropertyStoreInit(void); void |