diff options
author | okan <okan> | 2015-08-28 12:07:28 +0000 |
---|---|---|
committer | okan <okan> | 2015-08-28 12:07:28 +0000 |
commit | 3f0b6cf4ea53d80ef7e2d9a96f4d93bb209aa2b6 (patch) | |
tree | c5a24ee9a664320b85b6a7db1101376c08f4bc7d /screen.c | |
parent | c0f2d0cc756f5ec7076946179efe2399f026c60a (diff) | |
parent | 47a10cc05549b0a94e3606ca7be9fe626754d12d (diff) | |
download | cwm-3f0b6cf4ea53d80ef7e2d9a96f4d93bb209aa2b6.tar.gz cwm-3f0b6cf4ea53d80ef7e2d9a96f4d93bb209aa2b6.tar.xz cwm-3f0b6cf4ea53d80ef7e2d9a96f4d93bb209aa2b6.zip |
cvsimport
* refs/heads/master: (21 commits) Lost fix from r1.112; add comment. Mechanical change: group->gc Add consistent checks against NULL. Move client cycle grab/ungrab into a more relevant place; while here, update comments about why we need to grab/ungrab the keyboard. Re-add lost chunk in group_cycle from r1.113. Further simplify _NET_WM_DESKTOP handling using new group_assign(). oops; remove left over debug print Allowing sending a valid 'nogroup' (0) group_ctx to group_assign() (since we init all groups), though assigning the client's group to NULL for 'sticky'; use this simplification in a few places (others to follow). Split out sticky mode checks and the restoring of a client's group and _NET_WM_DESKTOP from the config-based auto-grouping; no (intentional) behavior changes. Needed for further work in cleaning up this area. Implement _NET_CLIENT_LIST_STACKING (from Thomas Admin), but bottom-to-top order, as per spec (notified Thomas as well). Don't allow freeze operations on fullscreen (consistent with what fullscreen does). Sort _NET_WM_STATE Atoms like the spec. Move CLIENT_STICKY logic from client hide/unhide to group hide/unhide; rationale being that clients should be able to hide/unhide independently of group switching. Add Xkb modifier to ignore mask; from Alexander Polakov. Fix whitespace. Add client freeze extension to _NET_WM_STATE Atom, allowing flag to persist. As usual with new Atoms, requires X restart. _NET_WM_STATE_STICKY implies only sticky at the group/desktop level, not position and size; based on discussion with a few. Instead of special casing the 'term' and 'lock' commands, go back to keeping them hidden; showing them has apparently caused confusion/angst. Leave command list order from .cwmrc alone; remove sort. Bring group and client cycle closer together. ...
Diffstat (limited to 'screen.c')
-rw-r--r-- | screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/screen.c b/screen.c index a8c4575..c51082b 100644 --- a/screen.c +++ b/screen.c @@ -67,12 +67,12 @@ screen_init(int which) xu_ewmh_net_virtual_roots(sc); rootattr.cursor = Conf.cursor[CF_NORMAL]; - rootattr.event_mask = SubstructureRedirectMask|SubstructureNotifyMask| - PropertyChangeMask|EnterWindowMask|LeaveWindowMask| - ColormapChangeMask|BUTTONMASK; + rootattr.event_mask = SubstructureRedirectMask | + SubstructureNotifyMask | PropertyChangeMask | EnterWindowMask | + LeaveWindowMask | ColormapChangeMask | BUTTONMASK; XChangeWindowAttributes(X_Dpy, sc->rootwin, - CWEventMask|CWCursor, &rootattr); + (CWEventMask | CWCursor), &rootattr); /* Deal with existing clients. */ if (XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins)) { |