frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Remove decorations from _NET_WM_WINDOW_TYPE_SPLASH type windows 

In multiwindow mode, remove decorations from _NET_WM_WINDOW_TYPE_SPLASH type
windows.

Some programs use _NET_WM_WINDOW_TYPE_SPLASH_SCREEN in error, so also accept
that as equivalent.

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon Turney 2014-03-13 17:53:44 +00:00
parent 356b912906
commit 866d8299ab
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xwin/winmultiwindowwm.c
View File

@ -1471,6 +1471,7 @@ winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
pWMInfo->ewmh._NET_CLOSE_WINDOW, pWMInfo->ewmh._NET_CLOSE_WINDOW,
pWMInfo->ewmh._NET_WM_WINDOW_TYPE, pWMInfo->ewmh._NET_WM_WINDOW_TYPE,
pWMInfo->ewmh._NET_WM_WINDOW_TYPE_DOCK, pWMInfo->ewmh._NET_WM_WINDOW_TYPE_DOCK,
pWMInfo->ewmh._NET_WM_WINDOW_TYPE_SPLASH,
pWMInfo->ewmh._NET_WM_STATE, pWMInfo->ewmh._NET_WM_STATE,
pWMInfo->ewmh._NET_WM_STATE_HIDDEN, pWMInfo->ewmh._NET_WM_STATE_HIDDEN,
pWMInfo->ewmh._NET_WM_STATE_ABOVE, pWMInfo->ewmh._NET_WM_STATE_ABOVE,
@ -1613,10 +1614,12 @@ winDeinitMultiWindowWM(void)
static void static void
winApplyHints(WMInfoPtr pWMInfo, xcb_window_t iWindow, HWND hWnd, HWND * zstyle) winApplyHints(WMInfoPtr pWMInfo, xcb_window_t iWindow, HWND hWnd, HWND * zstyle)
{ {
xcb_connection_t *conn = pWMInfo->conn; xcb_connection_t *conn = pWMInfo->conn;
static xcb_atom_t windowState, motif_wm_hints; static xcb_atom_t windowState, motif_wm_hints;
static xcb_atom_t hiddenState, fullscreenState, belowState, aboveState, static xcb_atom_t hiddenState, fullscreenState, belowState, aboveState,
skiptaskbarState; skiptaskbarState;
static xcb_atom_t splashType;
static int generation; static int generation;
unsigned long hint = 0, maxmin = 0; unsigned long hint = 0, maxmin = 0;
@ -1636,6 +1639,7 @@ winApplyHints(WMInfoPtr pWMInfo, xcb_window_t iWindow, HWND hWnd, HWND * zstyle)
belowState = intern_atom(conn, "_NET_WM_STATE_BELOW"); belowState = intern_atom(conn, "_NET_WM_STATE_BELOW");
aboveState = intern_atom(conn, "_NET_WM_STATE_ABOVE"); aboveState = intern_atom(conn, "_NET_WM_STATE_ABOVE");
skiptaskbarState = intern_atom(conn, "_NET_WM_STATE_SKIP_TASKBAR"); skiptaskbarState = intern_atom(conn, "_NET_WM_STATE_SKIP_TASKBAR");
splashType = intern_atom(conn, "_NET_WM_WINDOW_TYPE_SPLASHSCREEN");
} }
{ {
@ -1708,6 +1712,11 @@ winApplyHints(WMInfoPtr pWMInfo, xcb_window_t iWindow, HWND hWnd, HWND * zstyle)
hint = (hint & ~HINT_NOFRAME) | HINT_SKIPTASKBAR | HINT_SIZEBOX; hint = (hint & ~HINT_NOFRAME) | HINT_SKIPTASKBAR | HINT_SIZEBOX;
*zstyle = HWND_TOPMOST; *zstyle = HWND_TOPMOST;
} }
else if ((type.atoms[i] == pWMInfo->ewmh._NET_WM_WINDOW_TYPE_SPLASH)
|| (type.atoms[i] == splashType)) {
hint |= (HINT_SKIPTASKBAR | HINT_NOSYSMENU | HINT_NOMINIMIZE | HINT_NOMAXIMIZE);
*zstyle = HWND_TOPMOST;
}
} }
} }
} }