diff options
| author | Andrew Shadura <andrew@shadura.me> | 2013-12-02 23:00:48 +0100 |
|---|---|---|
| committer | Andrew Shadura <andrew@shadura.me> | 2013-12-02 23:00:48 +0100 |
| commit | e0276ed026ff646a479c92c4db03d38927f47a61 (patch) | |
| tree | 7e46522e3b414becf03874f0bf46594cf9a00c18 | |
| parent | 31ea6e20385bbbc05e73f516f3d2e736dffc7d5c (diff) | |
New patches
| -rw-r--r-- | debian/patches/16-rc-fixes.patch | 17 | ||||
| -rw-r--r-- | debian/patches/17-witray-fix.patch | 47 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 66 insertions, 0 deletions
diff --git a/debian/patches/16-rc-fixes.patch b/debian/patches/16-rc-fixes.patch new file mode 100644 index 0000000..81ab733 --- /dev/null +++ b/debian/patches/16-rc-fixes.patch @@ -0,0 +1,17 @@ +Subject: Fix Notice command. + +--- a/rc/wmiirc.sh ++++ b/rc/wmiirc.sh +@@ -108,10 +108,10 @@ + fi + }& + Event Notice +- wmiir xwrite $noticebar $wi_arg ++ wmiir xwrite $noticebar "label $wi_arg" + + kill $xpid 2>/dev/null # Let's hope this isn't reused... +- { sleep $noticetimeout; wmiir xwrite $noticebar ' '; }& ++ { sleep $noticetimeout; wmiir xwrite $noticebar 'label '; }& + xpid = $! + + # Menus diff --git a/debian/patches/17-witray-fix.patch b/debian/patches/17-witray-fix.patch new file mode 100644 index 0000000..11a6952 --- /dev/null +++ b/debian/patches/17-witray-fix.patch @@ -0,0 +1,47 @@ +From: Andrew Shadura <andrewsh@debian.org> +Subject: Fix witray on multi-monitor setups + +As witray is displayed on primary screen only, +every time primary screen changes, update the +tray position. + +--- a/cmd/tray/tray.c ++++ b/cmd/tray/tray.c +@@ -77,7 +77,7 @@ + + sethandler(tray.win, &handlers); + pushhandler(&scr.root, &root_handlers, nil); +- selectinput(&scr.root, scr.root.eventmask | PropertyChangeMask); ++ selectinput(&scr.root, scr.root.eventmask | PropertyChangeMask | StructureNotifyMask); + + + changeprop_string(tray.win, "_WMII_TAGS", tray.tags); +@@ -409,6 +409,20 @@ + }; + + static bool ++root_config_event(Window *w, void *aux, XConfigureEvent *ev) { ++ ++ USED(aux); ++ int n; ++ Rectangle *rects; ++ ++ rects = xinerama_screens(&n); ++ ++ scr.rect = rects[0]; ++ tray_update(); ++ return false; ++} ++ ++static bool + property_event(Window *w, void *aux, XPropertyEvent *ev) { + if(ev->atom == NET("CURRENT_DESKTOP")) + tray_resize(tray.r); +@@ -418,6 +432,7 @@ + } + + static Handlers root_handlers = { ++ .config = root_config_event, + .property = property_event, + }; + diff --git a/debian/patches/series b/debian/patches/series index 93a4cf1..b56b660 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,6 @@ 10-hostname.patch 13-fix-spelling-manpages.patch 16-fix-confdir.patch +16-rc-fixes.patch +17-witray-fix.patch 20-libixp-link.patch |