diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-25 09:24:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 09:24:55 +0200 |
| commit | af62a89a4e677bc0a10094be86816b2e273b2c4a (patch) | |
| tree | 3cceb0e23b7ab79dbcedb27c5546cf2666c1c7a0 /xorg-server/hw/xwin/winwindow.h | |
| parent | de54c5b749b3eefb75d420840c889533a58aa342 (diff) | |
| parent | acf3535c75d7c79154b6b89c66567317944d244c (diff) | |
| download | vcxsrv-af62a89a4e677bc0a10094be86816b2e273b2c4a.tar.gz vcxsrv-af62a89a4e677bc0a10094be86816b2e273b2c4a.tar.bz2 vcxsrv-af62a89a4e677bc0a10094be86816b2e273b2c4a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 25 Jul 2013
Conflicts:
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmultiwindowclass.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'xorg-server/hw/xwin/winwindow.h')
| -rw-r--r-- | xorg-server/hw/xwin/winwindow.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h index 0b4713a27..3ab7148d7 100644 --- a/xorg-server/hw/xwin/winwindow.h +++ b/xorg-server/hw/xwin/winwindow.h @@ -44,20 +44,21 @@ #define PROJECT_NAME "VcXsrv" #endif #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" +#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_TITLE_X PROJECT_NAME " X" +#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" +#define WIN_MSG_QUEUE_FNAME "/dev/windows" #endif extern const char WIN_WID_PROP[]; extern const char WIN_NEEDMANAGE_PROP[]; -#define VCXSRV_SIGNATURE 0xdeaddeadL +#define VCXSRV_SIGNATURE 0xdeaddeadL typedef struct _winPrivScreenRec *winPrivScreenPtr; |