debian/0000755000000000000000000000000013007657772007204 5ustar debian/desktop/0000755000000000000000000000000012710660542010642 5ustar debian/desktop/wmii.desktop0000644000000000000000000000016112710660542013200 0ustar [Desktop Entry] Encoding=UTF-8 Name=Wmii Comment=Window manager improved 3 Exec=wmii Icon=wmii.png Type=XSession debian/postinst0000644000000000000000000000012013007657716011001 0ustar #!/bin/sh -e if [ "$1" = "configure" ]; then ldconfig fi #DEBHELPER# exit 0 debian/get-orig-source.sh0000755000000000000000000000133412710660542012544 0ustar #!/bin/sh -e TARBALLDIR=${1:-.} UPSTREAM_REPO=https://code.google.com/p/wmii/ PACKAGE=wmii SRC_VERSION=$(dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p') SRC_REVISION=${SRC_VERSION##*hg} TARBALL=$(readlink -f "$TARBALLDIR/${PACKAGE}_${SRC_VERSION}.orig.tar.bz2") REPODIR="debian/orig-source/${PACKAGE}-${SRC_VERSION}.orig" if [ -e "$REPODIR" ] then echo "$REPODIR directory found, not removing. Aborted." exit 1 fi mkdir -p debian/orig-source echo "Cloning ${UPSTREAM_REPO}" hg clone "${UPSTREAM_REPO}" "$REPODIR" || exit 1 echo "Creating ${TARBALL} for revision $SRC_REVISION" cd "$REPODIR" hg archive -r "$SRC_REVISION" -X".hg*" "${TARBALL}" || exit 1 cd "$OLDPWD" rm -rf debian/orig-source debian/source/0000755000000000000000000000000012710660542010471 5ustar debian/source/format0000644000000000000000000000001412710660542011677 0ustar 3.0 (quilt) debian/source/options0000644000000000000000000000005112710660542012103 0ustar compression = gzip compression-level = 9 debian/source/include-binaries0000644000000000000000000000002612710660542013627 0ustar debian/icons/wmii.png debian/changelog0000644000000000000000000003071213007657772011061 0ustar wmii (3.10~20120413+hg2813-11) unstable; urgency=medium * QA upload * postint, postrm: start on #!/bin/sh -e (closes: #843294) -- Ralf Treinen Sun, 06 Nov 2016 17:53:14 +0100 wmii (3.10~20120413+hg2813-10) unstable; urgency=medium * Update Vcs-* to point to Dgit. * Unset myself as the maintainer, the package's been orphaned. -- Andrew Shadura Fri, 29 Apr 2016 16:07:26 +0200 wmii (3.10~20120413+hg2813-9) unstable; urgency=medium [ Angel Abad ] * Add -ldl to fix FTBFS with DSO linking. [ Andrew Shadura ] * Unbreak xft support (Closes: #822865): - Allow overriding path to libXft.so and libX11.so - Detect where libXft.so and libX11.so are located at build time. - Depend on libxft2 * Fix bashism (Closes: #772389). -- Andrew Shadura Fri, 29 Apr 2016 15:18:41 +0200 wmii (3.10~20120413+hg2813-8) unstable; urgency=medium * Fix Mod4-a combination by doing stat on /keys (thanks to Thierry Rascle, closes: #713863). -- Andrew Shadura Mon, 24 Nov 2014 20:34:37 +0100 wmii (3.10~20120413+hg2813-7) unstable; urgency=medium * Tweaks to the build system. * Changes from the upstream: - Work around focus drawing issue in newer Xorg versions. - Add command to cleanup old screens after monitor disconnect. - Run wipescreens on Screenchange event in python/wmiirc. - Treat cloned/subsumed screens as one. - Keep regexp clients on the same screen when attaching to new view. -- Andrew Shadura Sun, 03 Aug 2014 00:35:25 +0200 wmii (3.10~20120413+hg2813-6) unstable; urgency=low * Set WMII_TERM to x-terminal-emulator, not xterm. * Fix building on m68k (and probably somewhere else). -- Andrew Shadura Wed, 04 Dec 2013 22:34:00 +0100 wmii (3.10~20120413+hg2813-5) unstable; urgency=low * Update wmiirc to use new bar file structure (fixes Notice command). * Patch witray to reposition tray when primary display changes. -- Andrew Shadura Mon, 02 Dec 2013 23:02:20 +0100 wmii (3.10~20120413+hg2813-4) unstable; urgency=low * Install libwmii_hack.so under a multiarchified private directory. * Link properly against libixp. -- Andrew Shadura Sat, 30 Nov 2013 20:55:07 +0100 wmii (3.10~20120413+hg2813-3) unstable; urgency=low * Upload to unstable. * Drop a patch already applied upstream. -- Andrew Shadura Wed, 08 May 2013 10:20:21 +0200 wmii (3.10~20120413+hg2813-2) experimental; urgency=low * Provide HOST_NAME_MAX on systems not having it (fixes FTBFS on kFreeBSD and Hurd). -- Andrew Shadura Sat, 13 Apr 2013 09:37:36 +0200 wmii (3.10~20120413+hg2813-1) experimental; urgency=low * New maintainer (Closes: #606084). * New upstream release. * Fix the configuration files path in the manpage (Closes: #431942). * Removed autogenerated files. * Don't try to remove .hg* files. * Fix dpkg-shlibdeps warnings. * Bump Standards-Version to 3.9.4. * Suggest Python and Ruby. * Do a ldconfig call in postinst/postrm. * Add a manpage for wihack(1). * Fix the path in LD_PRELOAD for wihack. * Fix some markup in the manpages. * Build-depend on txt2tags to be able to regenerate manpages. * Added doc-base registration file. * Make the Unicode font default (Closes: #598630). * Remove an alternative dependency on dwm-tools. * Build-depend on python-all to ensure dh_python2 is available. -- Andrew Shadura Fri, 12 Apr 2013 21:43:51 +0200 wmii (3.9.2+debian-4) unstable; urgency=low * QA upload. * Fix crashes when additional displays are added (backported patch from upstream, closes: #628575). -- Andrew O. Shadura Mon, 16 Jul 2012 13:22:40 +0200 wmii (3.9.2+debian-3) unstable; urgency=low * QA upload. * Add patch ld-no-add-needed.patch: Fix build failure with ld --no-add-needed. Thanks to Matthias Klose for the patch! (closes: #606209) * Cosmetic changes in debian/rules; put additional files to clean into debian/clean. * Patch: manpage-actions-location.patch: fix location of global action directory in the manpage (closes: #431942) -- Ralf Treinen Wed, 06 Jul 2011 10:05:26 +0200 wmii (3.9.2+debian-2) unstable; urgency=low * QA upload * Added build-dependencies to fix FTBFS: libxft-dev, libfreetype6-dev, libxrandr-dev, libxinerama-dev. Thanks to Nobuhiro Iwamatsu for the patch! Closes: #606070. -- Ralf Treinen Mon, 06 Dec 2010 21:11:52 +0100 wmii (3.9.2+debian-1) unstable; urgency=low * Updating depends on suckless-tools, formerly dwm-tools. * Merging upstream version 3.9.2+debian. * Rediffing x-terminal-emulator.patch. * Rediffing cflags.patch. * Rediffing font.patch. * Removing manpage.patch, not required anymore. * Removing ixp-api.patch, not required anymore. * Updating rules file to remove useless files. * Removing another useless file through rules. * Updating standards version to 3.9.0. * Switching to source format 3.0 (quilt). * Updating to debhelper version 8. * Updating to standards version 3.9.1. * Removing version from libixp build-depends, not needed anymore. * Orphaning package. -- Daniel Baumann Mon, 29 Nov 2010 21:24:05 +0100 wmii (3.6+debian-8) unstable; urgency=low * Adding maintainer homepage field to control. * Marking maintainer homepage field to be also included in binary packages and changelog. * Adding README.source. * Adding explicit debian source version 1.0 until switch to 3.0. * Updating year in copyright file. * Updating to standards 3.8.4. * Sorting dh call in rules to more common order. * Updating README.source. * Making build-depends versioned where needed. * Moving maintainer homepage from control to copyright. * Removing mercurial files in clean target of rules. -- Daniel Baumann Thu, 08 Apr 2010 06:35:44 +0200 wmii (3.6+debian-7) unstable; urgency=low * Updating maintainer field. * Updating vcs fields. * Updating package to standards version 3.8.3. * Sorting depends. * Correcting desktop file location. -- Daniel Baumann Thu, 20 Aug 2009 20:31:37 +0200 wmii (3.6+debian-6) unstable; urgency=low * Updating package to standards version 3.8.2. * Using correct rfc-2822 date formats in changelog. * Prefixing debhelper files with package name. * Updating year in copyright file. * Adding description field in menu file. * Using quilt rather than dpatch. * Minimizing rules file. -- Daniel Baumann Tue, 04 Aug 2009 16:09:38 +0200 wmii (3.6+debian-5) unstable; urgency=low * Applying patch from James Westby to define IXP_NEEDAPI to 88, which is the required ixp API (Closes: #511954). -- Daniel Baumann Sun, 03 May 2009 10:01:00 +0200 wmii (3.6+debian-4) unstable; urgency=low * Bumped to new policy. * Updated menu file to new policy. * Removing empty directories. * Added patch to complete manpage headers. -- Daniel Baumann Sun, 23 Dec 2007 20:52:00 +0100 wmii (3.6+debian-3) unstable; urgency=low * Replaced not available fixed variant with plain 'fixed' font. -- Daniel Baumann Fri, 23 Nov 2007 13:51:00 +0100 wmii (3.6+debian-2) unstable; urgency=low * Removing -std=c99 from CFLAGS, thanks to Dann Frazier (Closes: #452015). -- Daniel Baumann Mon, 19 Nov 2007 21:25:00 +0100 wmii (3.6+debian-1) unstable; urgency=low * New upstream release. * Rebuild upstream tarball without conflicting debian directory. -- Daniel Baumann Sun, 18 Nov 2007 17:39:00 +0100 wmii (3.6~rc2+20070518-3) unstable; urgency=medium * Added libxext-dev to build-depends. -- Daniel Baumann Tue, 04 Sep 2007 23:23:00 +0200 wmii (3.6~rc2+20070518-2) unstable; urgency=medium [ Don Armstrong ] * Fix wmiirc and wmiiloop.sh to properly populate keys and the commands to handle them (Closes: #423521) -- Daniel Baumann Thu, 12 Jul 2007 11:37:00 +0200 wmii (3.6~rc2+20070518-1) unstable; urgency=low * New upstream snapshot. -- Daniel Baumann Fri, 18 May 2007 09:08:00 +0200 wmii (3.6~rc2+20070501-2) unstable; urgency=low * Added lintian override. * Do not compile wmiir statically. -- Daniel Baumann Tue, 15 May 2007 14:52:00 +0200 wmii (3.6~rc2+20070501-1) unstable; urgency=low * New upstream snapshot. * Minor cleanups. -- Daniel Baumann Tue, 01 May 2007 09:10:00 +0200 wmii (3.6~rc2+20070329-3) unstable; urgency=low * Rebuild against fixed debhelper, see #420158 (Closes: #420119, #420146). -- Daniel Baumann Sat, 21 Apr 2007 07:33:00 +0200 wmii (3.6~rc2+20070329-2) unstable; urgency=low * Fixed ETC in rules (Closes: #418003). -- Daniel Baumann Thu, 19 Apr 2007 10:28:00 +0200 wmii (3.6~rc2+20070329-1) unstable; urgency=low * New upstream snapshot: - Fixes problem with libixp (Closes: #416170). - Temporarily using and shipping embedded libixp for this snapshot only, this is not related to #416170. * Minor cleanups. -- Daniel Baumann Thu, 05 Apr 2007 17:01:00 +0200 wmii (3.6~rc2-1) unstable; urgency=low * New upstream release. -- Daniel Baumann Wed, 07 Feb 2007 13:09:00 +0100 wmii (3.6~rc1-1) unstable; urgency=low * New upstream release. -- Daniel Baumann Tue, 06 Feb 2007 16:47:00 +0100 wmii (3.5.1+20070202-1) unstable; urgency=low * New upstream snapshot. -- Daniel Baumann Sat, 03 Feb 2007 10:32:00 +0100 wmii (3.5.1+20070116-1) unstable; urgency=medium * New upstream snapshot: - fixes bug with tags. * Removed libxrand-dev build-depends, xrand patch was not ported to wmii 3.5. -- Daniel Baumann Thu, 18 Jan 2007 20:16:00 +0100 wmii (3.5.1-2) unstable; urgency=low * Triggering rebuild (Closes: #405647). -- Daniel Baumann Mon, 15 Jan 2007 18:46:00 +0100 wmii (3.5.1-1) unstable; urgency=low * New upstream release. -- Daniel Baumann Tue, 02 Jan 2007 21:05:00 +0100 wmii (3.1-5) unstable; urgency=medium * Added patch from Evan Deaubl to add support for xrandr (Closes: #398900). -- Daniel Baumann Thu, 16 Nov 2006 17:04:00 +0100 wmii (3.1-4) unstable; urgency=medium * Updated upstream homepage (Closes: #395005). -- Daniel Baumann Sun, 29 Oct 2006 17:05:00 +0200 wmii (3.1-3) unstable; urgency=medium * Applied patch from Gonzalo Tornaria to fix fontset problem with UTF (Closes: #394781). -- Daniel Baumann Mon, 23 Oct 2006 18:12:00 +0200 wmii (3.1-2) unstable; urgency=low * New email address. -- Daniel Baumann Tue, 04 Jul 2006 23:45:00 +0200 wmii (3.1-1) unstable; urgency=low * New upstream release. -- Daniel Baumann Sun, 18 Jun 2006 11:19:00 +0200 wmii (3.0-1) unstable; urgency=low * New upstream release. -- Daniel Baumann Fri, 19 May 2006 00:00:00 -0500 wmii (2.5.2-1) unstable; urgency=low * New upstream release. * Adjusted confdir path. * Adjusted 9base path in examples. -- Daniel Baumann Sat, 21 Jan 2006 01:14:00 +0100 wmii (2.5.1-1) unstable; urgency=low * New upstream release. * Removed now obsolete binary-package python2.3-libixp. * Removed conflict to wmifs, upstream did rename the binary accordingly. * Added icon and desktop entry for login-session managers (Closes: #345390). -- Daniel Baumann Sat, 14 Jan 2006 14:42:00 +0100 wmii (2-2) unstable; urgency=low * Added temporary conflict to wmifs (Closes: #335446, #338033). I will rename wmifs in the next revision, this conflict is just a quick fix. * Modifing default configuration: - using x-terminal-emulator instead of xterm (Closes: #334017). -- Daniel Baumann Thu, 03 Nov 2005 22:58:00 +0100 wmii (2-1) unstable; urgency=low * Initial release (Closes: #311567). -- Daniel Baumann Fri, 07 Oct 2005 11:26:13 +0200 debian/copyright0000644000000000000000000000454112710663143011130 0ustar Files: * Copyright: (C) 2006-2007 Kris Maglione (C) 2003-2006 Anselm R. Garbe (C) 2005 Georg Neis License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: debian/* Copyright: (C) 2005-2010 Daniel Baumann (C) 2011-2013 Andrew Shadura License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. debian/rules0000755000000000000000000000305412710663143010253 0ustar #!/usr/bin/make -f LIBX11_SO := $(shell readlink /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/libX11.so | sed -ne 's,\.[0-9]\+\.[0-9]\+$$,,p') LIBXFT_SO := $(shell readlink /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/libXft.so | sed -ne 's,\.[0-9]\+\.[0-9]\+$$,,p') export CFLAGS := -Wall -W $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -DLIBX11_SO=\\\"$(LIBX11_SO)\\\" -DLIBXFT_SO=\\\"$(LIBXFT_SO)\\\" export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) ifeq "$(origin CC)" "default" export CC := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)-gcc endif export WMII_HGVERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\(hg.*\)\)-.*/\4/p') %: dh $@ --with python2 override_dh_auto_build: CFLAGS='$(CFLAGS)' $(MAKE) CC="$(CC) -c" PREFIX=/usr ETC=/etc/X11 STATIC="" LIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/wmii" override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/wmii PREFIX=/usr ETC=/etc/X11 LIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/wmii" install # Removing useless files rm -f debian/wmii/usr/share/doc/wmii/LICENSE rm -f debian/wmii/usr/share/doc/wmii/alternative_wmiircs/ruby/LICENSE override_dh_shlibdeps: dh_shlibdeps -Xlibwmii_hack override_dh_installchangelogs: dh_installchangelogs NEWS get-orig-source: @d=$$(readlink -e $(MAKEFILE_LIST)); \ cd $${d%/*}/..; \ debian/get-orig-source.sh $(CURDIR) .PHONY: override_dh_auto_build override_dh_auto_install override_dh_installchangelogs get-orig-source debian/wmii.wm0000644000000000000000000000001611742161352010477 0ustar /usr/bin/wmii debian/wmii.docs0000644000000000000000000000000712710660542011005 0ustar README debian/postrm0000644000000000000000000000011513007657735010447 0ustar #!/bin/sh -e if [ "$1" = "remove" ]; then ldconfig fi #DEBHELPER# exit 0 debian/control0000644000000000000000000000213012710664757010604 0ustar Source: wmii Section: x11 Priority: optional Maintainer: Debian QA Group Build-Depends: debhelper (>= 9), libx11-dev, libxext-dev, libixp-dev, libxt-dev, libxft-dev, libfreetype6-dev, libxrandr-dev, libxinerama-dev, txt2tags, python-all Standards-Version: 3.9.4 Homepage: http://www.suckless.org/ Vcs-Git: https://git.dgit.debian.org/wmii Vcs-Browser: https://browse.dgit.debian.org/wmii.git/ Package: wmii Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libxft2, suckless-tools Suggests: ${python:Depends}, ruby Conflicts: wmii2 Replaces: wmii2 Recommends: wmii-doc Provides: x-window-manager Description: lightweight tabbed and tiled X11 window manager, version 3 wmii is a dynamic window manager for X11, which is highly customizable and usable with keyboard and mouse. It supports conventional, tabbed and tiled window management with low memory usage. It is highly modularized and uses an inter-process communication interface which is oriented on the 9p protocol of plan9. . This package contains version 3 of the window manager, wmii2 contains version 2. debian/wmii.install0000644000000000000000000000010712710660542011524 0ustar debian/desktop/* /usr/share/xsessions debian/icons/* /usr/share/icons debian/wmii.menu0000644000000000000000000000040112710663143011017 0ustar ?package(wmii):needs="wm" section="Window Managers"\ title="Wmii" longtitle="Window manager improved 3"\ description="wmii is a dynamic window manager for X11, which is highly customizable and usable with keyboard and mouse."\ command="/usr/bin/wmii" debian/compat0000644000000000000000000000000212710663143010367 0ustar 9 debian/icons/0000755000000000000000000000000012710660542010304 5ustar debian/icons/wmii.png0000644000000000000000000000045512710660542011763 0ustar PNG  IHDR w}YbKGDC pHYs B(xtIME ];IDATH1 @E߈XYX)Z)9!%l:مeLHfx03 *3SpX0Y0CpƐdnIJI^mH򄝁v| B Description: Replaces not available fixed variant with plain 'fixed' font. --- a/alternative_wmiircs/plan9port/wmiirc +++ b/alternative_wmiircs/plan9port/wmiirc @@ -30,8 +30,8 @@ noticebar=/rbar/!notice # Theme -wmiifont='drift,-*-fixed-*-*-*-*-9-*-*-*-*-*-*-*' -wmiifont='-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*' +wmiifont='-*-fixed-medium-r-*-*-*-120-75-75-c-60-iso10646-' +wmiifont='-*-fixed-medium-r-*-*-*-120-75-75-c-60-iso10646-' wmiinormcol=('#000000' '#c1c48b' '#81654f') wmiifocuscol=('#000000' '#81654f' '#000000') wmiibackground='#333333' --- a/alternative_wmiircs/python/wmiirc.py +++ b/alternative_wmiircs/python/wmiirc.py @@ -38,7 +38,7 @@ background = '#333333' floatbackground='#222222' -wmii['font'] = 'drift,-*-fixed-*-*-*-*-9-*-*-*-*-*-*-*' +wmii['font'] = '-*-fixed-medium-r-*-*-*-120-75-75-c-60-iso10646-*' wmii['normcolors'] = '#000000', '#c1c48b', '#81654f' wmii['focuscolors'] = '#000000', '#81654f', '#000000' wmii['grabmod'] = keys.defs['mod'] --- a/alternative_wmiircs/ruby/config.yaml +++ b/alternative_wmiircs/ruby/config.yaml @@ -36,7 +36,7 @@ ## # The font to use in all text drawn by wmii. # - font: -*-fixed-medium-r-*-*-13-*-*-*-*-*-*-* + font: -*-fixed-medium-r-*-*-*-120-75-75-c-60-iso10646-* ## # Thickness of client border (measured in pixels). --- a/cmd/wmii/dat.h +++ b/cmd/wmii/dat.h @@ -18,7 +18,7 @@ #include #include "debug.h" -#define FONT "fixed" +#define FONT "-*-fixed-medium-r-*-*-*-120-75-75-c-60-iso10646-" #define FOCUSCOLORS "#000000 #81654f #000000" #define NORMCOLORS "#000000 #c1c48b #81654f" --- a/rc/wmiirc.sh +++ b/rc/wmiirc.sh @@ -20,7 +20,7 @@ export WMII_FOCUSCOLORS='#000000 #81654f #000000' export WMII_BACKGROUND='#333333' -export WMII_FONT='-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*' +export WMII_FONT='-*-fixed-medium-r-*-*-*-120-75-75-c-60-iso10646-*' set -- $(echo $WMII_NORMCOLORS $WMII_FOCUSCOLORS) export WMII_TERM="@TERMINAL@" debian/patches/20-libixp-link.patch0000644000000000000000000000224012710660542014300 0ustar Subject: Link against system libixp wherever it is. --- a/config.mk +++ b/config.mk @@ -30,7 +30,7 @@ X11PACKAGES = x11 xinerama xrender xrandr INCX11 = $$(pkg-config --cflags $(X11PACKAGES)) -LIBIXP = $(LIBDIR)/libixp.a +LIBIXP = -lixp # Enable RTLD. Only necessary for Xft support. CFLAGS += -DHAVE_RTLD --- a/cmd/tray/Makefile +++ b/cmd/tray/Makefile @@ -9,8 +9,8 @@ PACKAGES += $(X11PACKAGES) -LIB = $(LIBS9) $(LIBIXP) -LIBS += -lm +LIB = $(LIBS9) +LIBS += -lm $(LIBIXP) OBJ = \ client \ ewmh \ --- a/cmd/wmii/Makefile +++ b/cmd/wmii/Makefile @@ -10,8 +10,8 @@ PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama -LIB = $(LIBIXP) $(LIBS9) -LIBS += -lm +LIB = $(LIBS9) +LIBS += -lm $(LIBIXP) OBJ = area \ bar \ --- a/cmd/x11/Makefile +++ b/cmd/x11/Makefile @@ -7,8 +7,8 @@ PACKAGES += $(X11PACKAGES) -LIB = $(LIBS9) $(LIBIXP) -LIBS += $(LIB) +LIB = $(LIBS9) +LIBS += $(LIB) $(LIBIXP) CFLAGS += $(INCX11) wiclick.out: wiclick.o --- a/cmd/menu/Makefile +++ b/cmd/menu/Makefile @@ -15,8 +15,8 @@ PACKAGES += $(X11PACKAGES) -LIB = $(LIBS9) $(LIBIXP) -LIBS += -lm +LIB = $(LIBS9) +LIBS += -lm $(LIBIXP) OBJ = main \ caret \ history \ debian/patches/16-fix-confdir.patch0000644000000000000000000000041512710660542014275 0ustar Subject: Use the conventional configuration directory. --- a/mk/wmii.mk +++ b/mk/wmii.mk @@ -10,7 +10,7 @@ VERSION = $(WMII_HGVERSION) COPYRIGHT = ©2010 Kris Maglione -CONFDIR = wmii-hg +CONFDIR = wmii LOCALCONF = ~/.$(CONFDIR) GLOBALCONF = $(ETC)/$(CONFDIR) debian/patches/13-fix-spelling-manpages.patch0000644000000000000000000000216712710660542016262 0ustar Description: Fix spelling in manpages. Author: Andrew Shadura --- a/man/wimenu.man1 +++ b/man/wimenu.man1 @@ -104,7 +104,7 @@ Move forward one word. : C-a - Move to the begining of the line. + Move to the beginning of the line. : C-e Move to the end of the line. @@ -172,13 +172,13 @@ the following script provides the appropriate completions: ``` -#!/bin/sh -f +#!/bin/sh \-f rm fifo mkfifo fifo # Open wimenu with a fifo as its stdin -wimenu -c ... debian/patches/27-fix-screens.patch0000644000000000000000000000177012710660542014322 0ustar From: Kris Maglione Subject: Treat cloned/subsumed screens as one. diff --git a/cmd/wmii/main.c b/cmd/wmii/main.c --- a/cmd/wmii/main.c +++ b/cmd/wmii/main.c @@ -163,9 +163,9 @@ static bool keep_screens = true; void init_screens(void) { static int old_n, old_nscreens; - Rectangle *rects; + Rectangle *rects, *r; View *v; - int i, n, m; + int i, j, n, m; #ifdef notdef d.x = Dx(scr.rect) - Dx(screen->r); @@ -178,6 +178,24 @@ init_screens(void) { /* Reallocate screens, zero any new ones. */ rects = xinerama_screens(&n); + r = malloc(n * sizeof *r); + + /* Weed out subsumed/cloned screens */ + for(m=-1; m < n; n=m) { + for(i=n-1, m=0; i >= 0; i--) { + for(j=0; j < n; j++) + if (i != j && + eqrect(rects[i], + rect_intersection(rects[i], rects[j]))) + break; + if (j == n) + r[m++] = rects[i]; + } + for(i=m-1, j=0; i >= 0; i--) + rects[j++] = r[i]; + } + free(r); + m = nscreens; nscreens_new = keep_screens ? max(n, nscreens) : n; debian/patches/16-fix-notice-command.patch0000644000000000000000000000061412710660542015547 0ustar 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 debian/patches/28-fix-regexp-clients.patch0000644000000000000000000000144312710660542015607 0ustar From: Kris Maglione Subject: Keep regexp clients on the same screen when attaching to new view. diff --git a/cmd/wmii/view.c b/cmd/wmii/view.c --- a/cmd/wmii/view.c +++ b/cmd/wmii/view.c @@ -417,6 +417,7 @@ view_attach(View *v, Frame *f) { oldsel = v->oldsel; a = v->sel; + if(c->floating == Never) a = view_findarea(v, v->selscreen, v->selcol, false); else if(client_floats_p(c)) { @@ -424,6 +425,9 @@ view_attach(View *v, Frame *f) { oldsel = v->sel; a = v->floating; } + else if(c->sel && c->sel->screen >= 0 && c->sel->screen < nscreens_new && + c->sel->screen != v->sel->screen) + a = view_findarea(v, c->sel->screen, 0, false); else if((ff = client_groupframe(c, v))) { if (ff->client != c && ff->area->screen < nscreens_new) a = ff->area; debian/patches/24-fix-focus.patch0000644000000000000000000000542412710660542013774 0ustar From: Kris Maglione Subject: Work around focus drawing issue in newer Xorg versions. diff --git a/cmd/wmii/client.c b/cmd/wmii/client.c --- a/cmd/wmii/client.c +++ b/cmd/wmii/client.c @@ -1,5 +1,5 @@ /* Copyright ©2004-2006 Anselm R. Garbe - * Copyright ©2006-2010 Kris Maglione + * Copyright ©2006-2014 Kris Maglione * See LICENSE file for license details. */ #include "dat.h" diff --git a/cmd/wmii/frame.c b/cmd/wmii/frame.c --- a/cmd/wmii/frame.c +++ b/cmd/wmii/frame.c @@ -559,7 +559,7 @@ move_focus(Frame *old_f, Frame *f) { noinput = (old_f && old_f->client->noinput) || (f && f->client->noinput) || disp.hasgrab != &c_root; - if(noinput) { + if(noinput || true) { if(old_f) frame_draw(old_f); if(f) diff --git a/cmd/wmii/message.c b/cmd/wmii/message.c --- a/cmd/wmii/message.c +++ b/cmd/wmii/message.c @@ -1,4 +1,4 @@ -/* Copyright ©2006-2010 Kris Maglione +/* Copyright ©2006-2014 Kris Maglione * See LICENSE file for license details. */ #include "dat.h" @@ -609,26 +609,33 @@ message_root(void *p, IxpMsg *m) { setdef(&screen->barpos, s, barpostab, nelem(barpostab)); view_update(selview); break; + case LBORDER: def.border = msg_getulong(msg_getword(m, 0));; view_update(selview); break; + case LCOLMODE: setdef(&def.colmode, msg_getword(m, 0), modes, Collast); break; + case LDEBUG: msg_debug(msg_getword(m, 0)); break; + case LEXEC: execstr = strdup(m->pos); srv.running = 0; break; + case LSPAWN: spawn_command(m->pos); break; + case LFOCUSCOLORS: msg_parsecolors(m, &def.focuscolor); goto updatecolors; + case LFONT: fn = loadfont(m->pos); if(fn) { @@ -640,6 +647,7 @@ message_root(void *p, IxpMsg *m) { ret = "can't load font"; view_update(selview); break; + case LFONTPAD: if(!getint(msg_getword(m, 0), &def.font->pad.min.x) || !getint(msg_getword(m, 0), &def.font->pad.max.x) || @@ -652,6 +660,7 @@ message_root(void *p, IxpMsg *m) { view_update(selview); } break; + case LGRABMOD: s = msg_getword(m, Ebadvalue); if(!parsekey(s, &i, nil) || i == 0) @@ -659,10 +668,12 @@ message_root(void *p, IxpMsg *m) { def.mod = i; break; + case LINCMODE: setdef(&def.incmode, msg_getword(m, 0), incmodetab, nelem(incmodetab)); view_update(selview); break; + case LNORMCOLORS: msg_parsecolors(m, &def.normcolor); updatecolors: @@ -670,12 +681,15 @@ message_root(void *p, IxpMsg *m) { client_reparent(c); view_update(selview); break; + case LSELCOLORS: warning("selcolors have been removed"); return Ebadcmd; + case LVIEW: view_select(m->pos); break; + case LQUIT: srv.running = 0; break; debian/patches/20-fix-mod4-a.patch0000644000000000000000000000077512710660542013736 0ustar From: Thierry Rascle Subject: stat /keys automatically. --- wmii-3.10~20120413+hg2813.orig/cmd/wmiir.c 2012-04-14 04:37:30.000000000 +0200 +++ wmii-3.10~20120413+hg2813/cmd/wmiir.c 2013-06-23 11:49:13.600784471 +0200 @@ -529,6 +529,7 @@ char *address; exectab *tab; int ret; + Stat *stat; IXP_ASSERT_VERSION; @@ -579,6 +580,9 @@ if(tab->cmd == 0) usage(); + stat = ixp_stat(client, "/keys"); + ixp_freestat(stat); + ret = tab->fn(argc, argv); ixp_unmount(client); debian/patches/30-fix-ftbfs-with-binutils-gold.patch0000644000000000000000000000057012710660542017476 0ustar From: Artur Rona Description: Add -ldl to fix FTBFS with binutils-gold. Author: Angel Abad Last-Update: 2015-01-03 --- a/cmd/x11/Makefile +++ b/cmd/x11/Makefile @@ -8,7 +8,7 @@ PACKAGES += $(X11PACKAGES) LIB = $(LIBS9) -LIBS += $(LIB) $(LIBIXP) +LIBS += $(LIB) $(LIBIXP) -ldl wiclick.out: wiclick.o $(LINK) $@ $< -lXtst debian/patches/25-add-wipescreens.patch0000644000000000000000000001277412710660542015155 0ustar From: Kris Maglione Subject: Add command to cleanup old screens after monitor disconnect. --- a/cmd/wmii/column.c +++ b/cmd/wmii/column.c @@ -1,5 +1,5 @@ /* Copyright ©2004-2006 Anselm R. Garbe - * Copyright ©2006-2010 Kris Maglione + * Copyright ©2006-2014 Kris Maglione * See LICENSE file for license details. */ #include "dat.h" @@ -156,7 +156,7 @@ if(first) stack_scale(first, dy); column_arrange(a, false); - }else if(a->view->areas[a->screen]->next) + }else if(a->view->areas[a->screen]->next && !a->permanent) column_destroy(a); } --- a/cmd/wmii/dat.h +++ b/cmd/wmii/dat.h @@ -1,4 +1,4 @@ -/* Copyright ©2007-2010 Kris Maglione +/* Copyright ©2007-2014 Kris Maglione * See LICENSE file for license details. */ @@ -153,6 +153,7 @@ int mode; int screen; bool max; + bool permanent; Rectangle r; Rectangle r_old; }; @@ -375,6 +376,7 @@ EXTERN bool resizing; EXTERN int starting; EXTERN char* user; +EXTERN long nscreens_new; EXTERN Client* kludge; --- a/cmd/wmii/fns.h +++ b/cmd/wmii/fns.h @@ -1,4 +1,4 @@ -/* Copyright ©2007-2010 Kris Maglione +/* Copyright ©2007-2014 Kris Maglione * See LICENSE file for license details. */ @@ -207,6 +207,7 @@ /* main.c */ void init_screens(void); void spawn_command(const char*); +void wipe_screens(void); /* message.c */ char* mask(char**, int*, int*); @@ -280,6 +281,7 @@ void view_update(View*); void view_update_all(void); void view_update_rect(View*); +void view_update_screens(View*); void view_update_urgency(View*, char*); Rectangle* view_rects(View*, uint *num, Frame *ignore); --- a/cmd/wmii/frame.c +++ b/cmd/wmii/frame.c @@ -1,4 +1,4 @@ -/* Copyright ©2006-2010 Kris Maglione +/* Copyright ©2006-2014 Kris Maglione * See LICENSE file for license details. */ #include "dat.h" @@ -559,6 +559,7 @@ noinput = (old_f && old_f->client->noinput) || (f && f->client->noinput) || disp.hasgrab != &c_root; + if(noinput || true) { if(old_f) frame_draw(old_f); --- a/cmd/wmii/main.c +++ b/cmd/wmii/main.c @@ -1,5 +1,5 @@ /* Copyright ©2004-2006 Anselm R. Garbe - * Copyright ©2006-2010 Kris Maglione + * Copyright ©2006-2014 Kris Maglione * See LICENSE file for license details. */ #define EXTERN @@ -158,6 +158,8 @@ fprint(2, "%s: %s\n", argv0, err); } +static bool keep_screens = true; + void init_screens(void) { static int old_n, old_nscreens; @@ -177,14 +179,14 @@ /* Reallocate screens, zero any new ones. */ rects = xinerama_screens(&n); m = nscreens; - nscreens = max(n, nscreens); + nscreens_new = keep_screens ? max(n, nscreens) : n; + + for(v=view; v; v=v->next) + view_update_screens(v); + + nscreens = nscreens_new; screens = erealloc(screens, (nscreens + 1) * sizeof *screens); screens[nscreens] = nil; - for(v=view; v; v=v->next) { - v->areas = erealloc(v->areas, nscreens * sizeof *v->areas); - v->r = erealloc(v->r, nscreens * sizeof *v->r); - v->pad = erealloc(v->pad, nscreens * sizeof *v->pad); - } /* Reallocate buffers. */ freeimage(disp.ibuf); @@ -207,9 +209,11 @@ screen->r = rects[i]; else screen->r = rectsetorigin(screen->r, scr.rect.max); + if(i >= m) for(v=view; v; v=v->next) view_init(v, i); + def.snap = Dy(screen->r) / 63; bar_init(screens[i]); } @@ -219,10 +223,18 @@ if (old_n != n || old_nscreens != nscreens) event("ScreenChange %d %d\n", n, nscreens); + old_n = n; old_nscreens = nscreens; } +void +wipe_screens(void) { + keep_screens = false; + init_screens(); + keep_screens = true; +} + static void cleanup(void) { starting = -1; --- a/cmd/wmii/message.c +++ b/cmd/wmii/message.c @@ -62,6 +62,7 @@ LUP, LURGENT, LVIEW, + LWIPESCREENS, LTILDE, }; char *symtab[] = { @@ -103,6 +104,7 @@ "up", "urgent", "view", + "wipescreens", "~", }; @@ -690,6 +692,10 @@ view_select(m->pos); break; + case LWIPESCREENS: + wipe_screens(); + break; + case LQUIT: srv.running = 0; break; --- a/cmd/wmii/view.c +++ b/cmd/wmii/view.c @@ -1,5 +1,5 @@ /* Copyright ©2004-2006 Anselm R. Garbe - * Copyright ©2006-2010 Kris Maglione + * Copyright ©2006-2014 Kris Maglione * See LICENSE file for license details. */ #include "dat.h" @@ -113,6 +113,38 @@ } void +view_update_screens(View *v) { + Area *a; + Frame *f; + int s; + + if (v->sel->screen > (long)nscreens) + v->sel = v->floating->next; + + v->selscreen = min(v->selscreen, nscreens); + + if (nscreens_new < nscreens) { + foreach_frame(v, s, a, f) { + f->oldscreen = min(f->oldscreen, nscreens_new); + if (a->screen >= nscreens_new) { + a->permanent = true; + area_detach(f); + view_attach(v, f); + } + } + + foreach_area(v, s, a) { + if (a->screen >= nscreens_new) + area_destroy(a); + } + } + + v->areas = erealloc(v->areas, nscreens_new * sizeof *v->areas); + v->r = erealloc(v->r, nscreens_new * sizeof *v->r); + v->pad = erealloc(v->pad, nscreens_new * sizeof *v->pad); +} + +void view_destroy(View *v) { View **vp; Frame *f; @@ -393,7 +425,8 @@ a = v->floating; } else if((ff = client_groupframe(c, v))) { - a = ff->area; + if (ff->client != c && ff->area->screen < nscreens_new) + a = ff->area; if(v->oldsel && ff->client == view_selclient(v)) a = v->oldsel; } debian/patches/31-fix-dlopen.patch0000644000000000000000000000211012710660542014121 0ustar Description: Allow overriding path to libXft.so and libX11.so Currently, this works only if libx11-dev and libxft-dev are installed. The build script will set those accordingly to the location of actual libraries. Author: Andrew Shadura --- a/lib/libstuff/x11/xft.c +++ b/lib/libstuff/x11/xft.c @@ -9,12 +9,16 @@ #ifdef HAVE_RTLD #include +#ifndef LIBXFT_SO +#define LIBXFT_SO "libXft.so" +#endif + bool havexft(void) { void *libxft; if(xft == nil) { - libxft = dlopen("libXft.so", RTLD_LAZY); + libxft = dlopen(LIBXFT_SO, RTLD_LAZY); if(libxft == nil) return false; xft = emalloc(sizeof *xft); --- a/lib/libwmii_hack/hack.c +++ b/lib/libwmii_hack/hack.c @@ -13,6 +13,10 @@ #include "util.c" #include "x11.c" +#ifndef LIBX11_SO +#define LIBX11_SO "libX11.so" +#endif + enum { Timeout = 10, }; @@ -40,7 +44,7 @@ long n; int i; - xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY); + xlib = dlopen(LIBX11_SO, RTLD_GLOBAL | RTLD_LAZY); if(xlib == nil) return; mapwindow = (mapfn)(uintptr_t)dlsym(xlib, "XMapWindow"); debian/patches/23-buildsys-tweaks.patch0000644000000000000000000000253112710660542015216 0ustar From: Andrew Shadura Subject: Fix the build system. --- a/cmd/x11/Makefile +++ b/cmd/x11/Makefile @@ -9,7 +9,6 @@ LIB = $(LIBS9) LIBS += $(LIB) $(LIBIXP) -CFLAGS += $(INCX11) wiclick.out: wiclick.o $(LINK) $@ $< -lXtst --- a/config.mk +++ b/config.mk @@ -29,7 +29,6 @@ PYTHON = python X11PACKAGES = x11 xinerama xrender xrandr -INCX11 = $$(pkg-config --cflags $(X11PACKAGES)) LIBIXP = -lixp # Enable RTLD. Only necessary for Xft support. --- a/lib/libwmii_hack/Makefile +++ b/lib/libwmii_hack/Makefile @@ -3,9 +3,6 @@ hack.o hack.o_pic: util.c hack.h x11.h -CFLAGS += $(INCX11) -SOLDFLAGS += $(LIBX11) - TARG = libwmii_hack # Can't just link libstuff here. We need PIC objects. OBJ = hack \ --- a/test/Makefile +++ b/test/Makefile @@ -7,8 +7,7 @@ ../cmd/wmii/map.o \ ../cmd/wmii/x11.o -LDFLAGS += $(OFILES) -lfmt -lutf -lbio $(LIBX11) -lXext -CFLAGS += $(INCX11) +LIBS += $(OFILES) -lfmt -lutf -lbio -lXext include $(ROOT)/mk/many.mk --- a/mk/hdr.mk +++ b/mk/hdr.mk @@ -48,13 +48,14 @@ SHELL := $(BINSH) .SHELL: name=sh path=$(SHELL) +all: + include $(ROOT)/config.mk sinclude $(ROOT)/config.local.mk sinclude $(shell echo .)depend #.SILENT: .SUFFIXES: .$(SOEXT) .1 .3 .awk .build .c .clean .depend .install .man1 .man3 .o .o_pic .out .pdf .py .rc .sh .uninstall -all: .c.depend: echo MKDEP $< debian/patches/series0000644000000000000000000000102512710663015012031 0ustar 01-python.patch 02-cflags.patch 02-no-silent.patch 03-font.patch 04-xterm.patch 09-wihack-ld-preload.patch 10-hostname.patch 13-fix-spelling-manpages.patch 16-fix-confdir.patch 16-fix-notice-command.patch 17-fix-multimonitor-witray.patch 20-fix-mod4-a.patch 20-libixp-link.patch 23-buildsys-tweaks.patch 24-fix-focus.patch 25-add-wipescreens.patch 26-run-wipescreens.patch 27-fix-screens.patch 28-fix-regexp-clients.patch 29-witray-xinerama.patch 30-fix-ftbfs-with-binutils-gold.patch 31-fix-dlopen.patch 32-fix-wihack-bashism.patch debian/patches/10-hostname.patch0000644000000000000000000000125112710660542013674 0ustar Subject: Provide a fake HOST_NAME_MAX on systems not having it. --- a/lib/libstuff/x11/windows/createwindow_visual.c +++ b/lib/libstuff/x11/windows/createwindow_visual.c @@ -5,6 +5,10 @@ #include #include +#ifndef HOST_NAME_MAX +#define HOST_NAME_MAX 255 +#endif + static char hostname[HOST_NAME_MAX + 1]; static long pid; --- a/cmd/wmii/dat.h +++ b/cmd/wmii/dat.h @@ -18,6 +18,10 @@ #include #include "debug.h" +#ifndef HOST_NAME_MAX +#define HOST_NAME_MAX 255 +#endif + #define FONT "-*-fixed-medium-r-*-*-*-120-75-75-c-60-iso10646-" #define FOCUSCOLORS "#000000 #81654f #000000" #define NORMCOLORS "#000000 #c1c48b #81654f" debian/patches/02-no-silent.patch0000644000000000000000000000052412710660542013771 0ustar Description: No .SILENT. Author: Andrew Shadura --- a/mk/hdr.mk +++ b/mk/hdr.mk @@ -52,7 +52,7 @@ sinclude $(ROOT)/config.local.mk sinclude $(shell echo .)depend -.SILENT: +#.SILENT: .SUFFIXES: .$(SOEXT) .1 .3 .awk .build .c .clean .depend .install .man1 .man3 .o .o_pic .out .pdf .py .rc .sh .uninstall all: debian/patches/04-xterm.patch0000644000000000000000000000041712710660542013223 0ustar Use x-terminal-emulator, not xterm --- a/config.mk +++ b/config.mk @@ -14,7 +14,7 @@ INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include LIBS = -L$(ROOT)/lib -L/usr/lib -TERMINAL = xterm +TERMINAL = x-terminal-emulator # Flags include $(ROOT)/mk/gcc.mk debian/patches/09-wihack-ld-preload.patch0000644000000000000000000000066112710660542015361 0ustar Description: Fix the patch in LD_PRELOAD for wihack Author: Andrew Shadura --- a/cmd/wihack.sh +++ b/cmd/wihack.sh @@ -36,8 +36,7 @@ if [ ! -u "`which $1`" -a ! -g "`which $1`" ] then - export LD_PRELOAD=libwmii_hack.so - export LD_LIBRARY_PATH="@LIBDIR@${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" + export LD_PRELOAD="@LIBDIR@/libwmii_hack.so" else unset WMII_HACK_TRANSIENT WMII_HACK_TYPE WMII_HACK_TAGS fi debian/patches/32-fix-wihack-bashism.patch0000644000000000000000000000051112710660542015536 0ustar --- a/cmd/wihack.sh +++ b/cmd/wihack.sh @@ -7,12 +7,12 @@ exit 1 } -checkarg='[ ${#@} -gt 0 ] || usage' +checkarg='[ $# -gt 0 ] || usage' export WMII_HACK_TIME=$(date +%s) -while [ ${#@} -gt 0 ] +while [ "$1" != "" ] do - case $1 in + case "$1" in -transient) shift; eval $checkarg export WMII_HACK_TRANSIENT=$1 debian/patches/29-witray-xinerama.patch0000644000000000000000000000131712710660542015214 0ustar Description: Initialise Xinerama screen information so that the tray is correctly placed initially. Author: Andrew Shadura --- a/cmd/tray/tray.c +++ b/cmd/tray/tray.c @@ -55,6 +55,9 @@ ewmh_setstrut(w, strut); } +static bool +root_config_event(Window *w, void *aux, XConfigureEvent *ev); + void tray_init(void) { WinAttr wa; @@ -99,6 +102,7 @@ hints.flags = InputHint; hints.input = false; XSetWMHints(display, tray.win->xid, &hints); + root_config_event(nil, nil, nil); tray_resize(tray.win->r); } @@ -412,7 +416,7 @@ root_config_event(Window *w, void *aux, XConfigureEvent *ev) { USED(aux); - int n; + int i, n; Rectangle *rects; rects = xinerama_screens(&n); debian/patches/02-cflags.patch0000644000000000000000000000041712710660542013321 0ustar From: Andrew Shadura Subject: Remove debug flags from CFLAGS --- a/config.mk +++ b/config.mk @@ -18,7 +18,6 @@ # Flags include $(ROOT)/mk/gcc.mk -CFLAGS += -Os $(DEBUGCFLAGS) LDFLAGS += -g # Compiler, Linker. Linker should usually *not* be ld. debian/patches/17-fix-multimonitor-witray.patch0000644000000000000000000000205512710660542016733 0ustar From: Andrew Shadura 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, }; debian/patches/01-python.patch0000644000000000000000000000061512710660542013402 0ustar Subject: Install Python packages into the correct directories. --- a/mk/python.mk +++ b/mk/python.mk @@ -6,7 +6,7 @@ .py.install: echo PYTHON install $* $(PYPREFIX) DESTDIR=$(DESTDIR); \ - $(DEBUG) $(PYTHON) $< install -c --root=$${DESTDIR:-/} $(PYPREFIX) + $(DEBUG) $(PYTHON) $< install -c --root=$${DESTDIR:-/} --install-layout=deb $(PYPREFIX) pyclean: echo CLEAN build/ rm -rf build debian/patches/26-run-wipescreens.patch0000644000000000000000000000141312710660542015216 0ustar From: Kris Maglione Subject: Run wipescreens on Screenchange event in python/wmiirc. --- a/alternative_wmiircs/python/wmiirc.py +++ b/alternative_wmiircs/python/wmiirc.py @@ -103,6 +103,8 @@ 'Notice': lambda args: notice.show(args), + 'ScreenChange': lambda args: wmii.ctl('wipescreens'), + Match(('LeftBarClick', 'LeftBarDND'), 1): lambda e, b, tag: tags.select(tag), Match('LeftBarClick', 4): lambda *a: tags.select(tags.next(True)), Match('LeftBarClick', 5): lambda *a: tags.select(tags.next()), --- a/rc/wmiirc.sh +++ b/rc/wmiirc.sh @@ -107,6 +107,8 @@ wmiir xwrite /client/$client/ctl slay & fi }& +Event ScreenChange + wmiir xwrite /ctl wipescreens Event Notice wmiir xwrite $noticebar "label $wi_arg" debian/clean0000644000000000000000000000011112710660542010167 0ustar man/*.1 include/ixp.h include/ixp_srvutil.h libixp/* cmd/menu/bindings.c debian/wmii.lintian-overrides0000644000000000000000000000011312710660542013511 0ustar wmii binary: shell-script-fails-syntax-check etc/X11/wmii/plan9port/wmiirc debian/doc-base0000644000000000000000000000032312710660542010567 0ustar Document: wmii Title: The wmii User Guide Author: Kris Maglione Abstract: This manual describes what wmii is, and how it can be used. Section: Window Managers Format: PDF Files: /usr/share/doc/wmii/wmii.pdf.gz