diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-12-19 13:39:19 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-12-19 13:39:19 +0000 |
| commit | 76049abac505761266f42a53e70f910d3a18063b (patch) | |
| tree | 774179ad9e45022ab820260a08b5126f444b0e42 /hw/xwin/winmultiwindowwm.c | |
| parent | 300976718089800703c8df49e18dde1e49c23d6a (diff) | |
| parent | ec9d7ae80e3cb68bbc58339172f9bae795ff345d (diff) | |
Merge branch 'cygwin-patches-for-1.13' into cygwin-release-1.13xserver-cygwin-1.13.1-1
Conflicts:
hw/xwin/Makefile.am
Diffstat (limited to 'hw/xwin/winmultiwindowwm.c')
| -rw-r--r-- | hw/xwin/winmultiwindowwm.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index b4bd71f62..c948f3080 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -82,6 +82,10 @@ #define WINDOWSWM_NATIVE_HWND "_WINDOWSWM_NATIVE_HWND" #endif +#ifndef HOST_NAME_MAX +#define HOST_NAME_MAX 255 +#endif + extern void winDebug(const char *format, ...); extern void winReshapeMultiWindow(WindowPtr pWin); extern void winUpdateRgnMultiWindow(WindowPtr pWin); @@ -1733,15 +1737,15 @@ winApplyHints(Display * pDisplay, Window iWindow, HWND hWnd, HWND * zstyle) unsigned long i; for (i = 0; i < nitems; i++) { - if (*pAtom == skiptaskbarState) + if (pAtom[i] == skiptaskbarState) hint |= HINT_SKIPTASKBAR; - if (*pAtom == hiddenState) + if (pAtom[i] == hiddenState) maxmin |= HINT_MIN; - else if (*pAtom == fullscreenState) + else if (pAtom[i] == fullscreenState) maxmin |= HINT_MAX; - if (*pAtom == belowState) + if (pAtom[i] == belowState) *zstyle = HWND_BOTTOM; - else if (*pAtom == aboveState) + else if (pAtom[i] == aboveState) *zstyle = HWND_TOPMOST; } |