diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest deleted file mode 100644 index 5758c75..0000000 --- a/media-video/obs-studio/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cef_binary_5060_linux64.tar.bz2 132839531 BLAKE2B f7d342cf12bf435aab3873b666a47c42c6583a88f140c28dabfd2dd860cd0d5c96cc51cc034703bffc6f1094a738bd77008c01839fa5ea53b848bc1c483a0ae4 SHA512 c99ce53858c57becd7822e39ff81d59b7296374fa61b29dfd4a572c2ed8f9ab155114ed179764ea05586e0edb2f1654f0b73c471f1cd9b233660e7f1c8b462c4 diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml deleted file mode 100644 index 38d6a6c..0000000 --- a/media-video/obs-studio/metadata.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - florianbadie@odrling.xyz - odrling - - - A rewrite of what was formerly known as "Open Broadcaster Software", - software originally designed for recording and streaming live video - content, efficiently. Aims to be multi-platform, and improved upon - internally. - - - Enable browser source support via (precompiled) CEF. - Build the Decklink plugin. - Build with LibFDK AAC support. - Build with PipeWire support. - Build with scripting support for Python 3. - Build with Intel Quick Sync Video support. - Build with Speex noise suppression filter support. - Build with TLS/SSL support for RTMPS connections. - Build with VLC media source support. - Build with WebSocket API support. - Build with WHIP support. - - - obsproject/obs-studio - obsproject/obs-browser - - diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild deleted file mode 100644 index a5d4868..0000000 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) -LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{9..12} ) - -inherit cmake lua-single optfeature python-single-r1 xdg - -CEF_DIR="cef_binary_5060_linux64" -OBS_BROWSER_COMMIT="291464d6988083411e7369fc53eba6d5ef07ff67" -OBS_WEBSOCKET_COMMIT="6fd18a7ef1ecb149e8444154af1daab61d4241a9" -QR_COMMIT="8518684c0f33d004fa93971be2c6a8eca3167d1e" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git" - EGIT_SUBMODULES=( - plugins/obs-browser - plugins/obs-websocket - plugins/obs-websocket/deps/asio - plugins/obs-websocket/deps/json - plugins/obs-websocket/deps/qr - plugins/obs-websocket/deps/websocketpp - ) -else - SRC_URI=" - https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz - https://github.com/nayuki/QR-Code-generator/archive/${QR_COMMIT}.tar.gz -> qr-${QR_COMMIT}.tar.gz - https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz - " - KEYWORDS="~amd64 ~ppc64 ~x86" -fi -SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )" - -DESCRIPTION="Software for Recording and Streaming Live Video Content" -HOMEPAGE="https://obsproject.com" - -LICENSE="Boost-1.0 GPL-2+ MIT Unlicense" -SLOT="0" -IUSE=" - +alsa browser decklink fdk jack lua nvenc pipewire pulseaudio - python qsv speex +ssl truetype v4l vlc wayland websocket webrtc -" -REQUIRED_USE=" - browser? ( || ( alsa pulseaudio ) ) - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -BDEPEND=" - lua? ( dev-lang/swig ) - python? ( dev-lang/swig ) -" -# media-video/ffmpeg[opus] required due to bug 909566 -DEPEND=" - dev-libs/glib:2 - dev-libs/jansson:= - dev-qt/qtbase:6[network,widgets,xml(+)] - dev-qt/qtsvg:6 - media-libs/libglvnd - media-libs/libva - media-libs/x264:= - media-video/ffmpeg:=[nvenc?,opus,x264] - net-misc/curl - sys-apps/dbus - sys-apps/pciutils - sys-apps/util-linux - sys-libs/zlib:= - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libXcomposite - x11-libs/libXfixes - x11-libs/libxkbcommon - alsa? ( media-libs/alsa-lib ) - browser? ( - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) - dev-cpp/nlohmann_json - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - dev-libs/wayland - media-libs/alsa-lib - media-libs/fontconfig - media-libs/mesa[gbm(+)] - net-print/cups - x11-libs/cairo - x11-libs/libdrm - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXi - x11-libs/libxkbcommon - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libxshmfence - x11-libs/libXtst - x11-libs/pango - ) - fdk? ( media-libs/fdk-aac:= ) - jack? ( virtual/jack ) - lua? ( ${LUA_DEPS} ) - pipewire? ( media-video/pipewire:= ) - pulseaudio? ( media-libs/libpulse ) - python? ( ${PYTHON_DEPS} ) - qsv? ( media-libs/oneVPL ) - speex? ( media-libs/speexdsp ) - ssl? ( net-libs/mbedtls:= ) - truetype? ( - media-libs/fontconfig - media-libs/freetype - ) - v4l? ( - media-libs/libv4l - virtual/udev - ) - vlc? ( media-video/vlc:= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - websocket? ( - dev-cpp/asio - dev-cpp/nlohmann_json - dev-cpp/websocketpp - ) - webrtc? ( - dev-libs/libdatachannel - ) -" -RDEPEND="${DEPEND}" - -QA_PREBUILT=" - usr/lib*/obs-plugins/chrome-sandbox - usr/lib*/obs-plugins/libcef.so - usr/lib*/obs-plugins/libEGL.so - usr/lib*/obs-plugins/libGLESv2.so - usr/lib*/obs-plugins/libvk_swiftshader.so - usr/lib*/obs-plugins/libvulkan.so.1 - usr/lib*/obs-plugins/swiftshader/libEGL.so - usr/lib*/obs-plugins/swiftshader/libGLESv2.so -" - -pkg_setup() { - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - default - - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - else - rm -d ${P}/plugins/obs-browser || die - mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die - - rm -d ${P}/plugins/obs-websocket || die - mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die - - rm -d ${P}/plugins/obs-websocket/deps/qr || die - mv QR-Code-generator-${QR_COMMIT} ${P}/plugins/obs-websocket/deps/qr || die - fi -} - -src_prepare() { - default - - sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die - - cmake_src_prepare -} - -src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - $(usev browser -DCEF_ROOT_DIR=../${CEF_DIR}) - -DCALM_DEPRECATION=ON - -DCCACHE_SUPPORT=OFF - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AJA=OFF - -DENABLE_BROWSER=$(usex browser) - -DENABLE_DECKLINK=$(usex decklink) - -DENABLE_FREETYPE=$(usex truetype) - -DENABLE_JACK=$(usex jack) - -DENABLE_LIBFDK=$(usex fdk) - -DENABLE_NEW_MPEGTS_OUTPUT=OFF # Requires librist and libsrt. - -DENABLE_PIPEWIRE=$(usex pipewire) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_QSV11=$(usex qsv) - -DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861 - -DENABLE_SPEEXDSP=$(usex speex) - -DENABLE_V4L2=$(usex v4l) - -DENABLE_VLC=$(usex vlc) - -DENABLE_VST=ON - -DENABLE_WAYLAND=$(usex wayland) - -DENABLE_WEBRTC=$(usex webrtc) - -DENABLE_WEBSOCKET=$(usex websocket) - -DOBS_MULTIARCH_SUFFIX=${libdir#lib} - -DUNIX_STRUCTURE=1 - ) - - if [[ ${PV} != 9999 ]]; then - mycmakeargs+=( - -DOBS_VERSION_OVERRIDE=${PV} - ) - fi - - if use lua || use python; then - mycmakeargs+=( - -DENABLE_SCRIPTING_LUA=$(usex lua) - -DENABLE_SCRIPTING_PYTHON=$(usex python) - -DENABLE_SCRIPTING=ON - ) - else - mycmakeargs+=( -DENABLE_SCRIPTING=OFF ) - fi - - if use browser && use ssl; then - mycmakeargs+=( -DENABLE_WHATSNEW=ON ) - else - mycmakeargs+=( -DENABLE_WHATSNEW=OFF ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # external plugins may need some things not installed by default, install them here - insinto /usr/include/obs/UI/obs-frontend-api - doins UI/obs-frontend-api/obs-frontend-api.h -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use alsa && ! use pulseaudio; then - elog - elog "For the audio capture features to be available," - elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to" - elog "be enabled." - elog - fi - - if use v4l && has_version media-video/v4l2loopback; then - elog - elog "Depending on system configuration, the v4l2loopback kernel module" - elog "may need to be loaded manually, and needs to be re-built after" - elog "kernel changes." - elog - fi - - optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi] - optfeature "virtual camera support" media-video/v4l2loopback -} diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild deleted file mode 100644 index a0a472d..0000000 --- a/x11-misc/dmenu/dmenu-9999.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit git-r3 savedconfig toolchain-funcs - -DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" -HOMEPAGE="https://tools.suckless.org/dmenu/" -EGIT_REPO_URI="https://git.odrling.xyz/odrling/${PN}-flexipatch.git" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" -IUSE="xinerama" - -RDEPEND=" - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXft - dev-libs/jansson - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=() - -src_prepare() { - default - - sed -i \ - -e "s/ -Os / /" \ - -e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \ - config.mk || die - - restore_config config.h -} - -src_compile() { - emake CC=$(tc-getCC) \ - "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ - "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ - "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ - "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \ - "XINERAMAFLAGS=$( - usex xinerama "-DXINERAMA $( - $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null - )" '' - )" \ - "XINERAMALIBS=$( - usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' - )" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - - save_config config.h -} diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml deleted file mode 100644 index d7e0a90..0000000 --- a/x11-misc/dmenu/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - florianbadie@odrling.xyz - - - desktop-misc@gentoo.org - Gentoo Desktop Miscellaneous Project - - diff --git a/x11-misc/dwmblocks/dwmblocks-9999.ebuild b/x11-misc/dwmblocks/dwmblocks-9999.ebuild deleted file mode 100644 index acd9a44..0000000 --- a/x11-misc/dwmblocks/dwmblocks-9999.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit git-r3 savedconfig - -DESCRIPTION="Modular status bar for dwm" -HOMEPAGE="https://github.com/torrinfail/dwmblocks" -EGIT_REPO_URI="https://git.odrling.xyz/odrling/dwmblocks.git" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND=" - x11-libs/libX11 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=() - -src_prepare() { - default - - restore_config blocks.h -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - - save_config blocks.h -} diff --git a/x11-misc/dwmblocks/metadata.xml b/x11-misc/dwmblocks/metadata.xml deleted file mode 100644 index d0ff381..0000000 --- a/x11-misc/dwmblocks/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - florianbadie@odrling.xyz - - diff --git a/x11-misc/slstatus/metadata.xml b/x11-misc/slstatus/metadata.xml deleted file mode 100644 index d0ff381..0000000 --- a/x11-misc/slstatus/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - florianbadie@odrling.xyz - - diff --git a/x11-misc/slstatus/slstatus-9999.ebuild b/x11-misc/slstatus/slstatus-9999.ebuild deleted file mode 100644 index 59f11cb..0000000 --- a/x11-misc/slstatus/slstatus-9999.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit git-r3 savedconfig toolchain-funcs - -DESCRIPTION="a status monitor for window managers use WM_NAME or stdin to fill the status bar" -HOMEPAGE="https://tools.suckless.org/slstatus/" -EGIT_REPO_URI="https://git.odrling.xyz/odrling/slstatus.git" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND=" - x11-libs/libX11 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=() - -src_prepare() { - default - - sed -i \ - -e 's|^ @| |g' \ - -e '/^ echo/d' \ - Makefile || die - - sed -i \ - -e "s/ -Os / /" \ - -e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \ - config.mk || die - - restore_config config.h -} - -src_compile() { - emake CC=$(tc-getCC) \ - "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ - "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 kvm 2>/dev/null )" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - - save_config config.h -} diff --git a/x11-terms/st-terminfo/metadata.xml b/x11-terms/st-terminfo/metadata.xml deleted file mode 100644 index ad1d4c7..0000000 --- a/x11-terms/st-terminfo/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - florianbadie@odrling.xyz - odrling - - diff --git a/x11-terms/st-terminfo/st-terminfo-9999.ebuild b/x11-terms/st-terminfo/st-terminfo-9999.ebuild deleted file mode 100644 index cc52055..0000000 --- a/x11-terms/st-terminfo/st-terminfo-9999.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Terminfo for x11-terms/st" -HOMEPAGE="https://st.suckless.org/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.odrling.xyz/odrling/st-flexipatch.git" -else - SRC_URI="https://dl.suckless.org/st/st-${PV}.tar.gz" - S="${WORKDIR}/st-${PV}" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86" -fi - -LICENSE="MIT-with-advertising" -SLOT="0" - -BDEPEND=">=sys-libs/ncurses-6.0" - -RESTRICT="test" - -src_prepare() { - mkdir -v terminfo || die "Failed to create terminfo directory" - default -} - -src_configure() { - : -} - -src_compile() { - tic -sxo terminfo st.info || die "Failed to translate terminfo file" -} - -src_install() { - insinto "/usr/share/st" - doins -r terminfo - - newenvd - "51${PN}" <<-_EOF_ - TERMINFO_DIRS="/usr/share/st/terminfo" - COLON_SEPARATED="TERMINFO_DIRS" - _EOF_ -} - -pkg_postinst() { - ewarn "Please run env-update and then source /etc/profile in any open shells" - ewarn "to update terminfo settings. Relogin to update it for any new shells." -} diff --git a/x11-terms/st/files/odrling.patch b/x11-terms/st/files/odrling.patch deleted file mode 100644 index e9af307..0000000 --- a/x11-terms/st/files/odrling.patch +++ /dev/null @@ -1,714 +0,0 @@ -From ca00c65ed876ad4b7267290441fa6c82142b55df Mon Sep 17 00:00:00 2001 -From: odrling -Date: Sun, 7 Mar 2021 16:12:13 +0100 -Subject: [PATCH 01/15] move config to st-flexipatch - ---- - config.def.h | 59 +++++++++++++++++++++++---------------------------- - patches.def.h | 14 ++++++------ - 2 files changed, 34 insertions(+), 39 deletions(-) - -diff --git a/config.def.h b/config.def.h -index ff6b5b3..8dc318b 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -5,7 +5,7 @@ - * - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ --static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; -+static char *font = "monospace:pixelsize=14:antialias=true:autohint=true"; - #if FONT2_PATCH - /* Spare fonts */ - static char *font2[] = { -@@ -116,11 +116,11 @@ static unsigned int cursorthickness = 2; - * Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored. - * 0: disable (render all U25XX glyphs normally from the font). - */ --const int boxdraw = 0; -+const int boxdraw = 1; - const int boxdraw_bold = 0; - - /* braille (U28XX): 1: render as adjacent "pixels", 0: use font */ --const int boxdraw_braille = 0; -+const int boxdraw_braille = 1; - #endif // BOXDRAW_PATCH - - /* -@@ -164,32 +164,32 @@ float alphaUnfocused = 0.6; - /* Terminal colors (16 first used in escape sequence) */ - static const char *colorname[] = { - /* 8 normal colors */ -- "black", -- "red3", -- "green3", -- "yellow3", -- "blue2", -- "magenta3", -- "cyan3", -- "gray90", -+ "#403E41", -+ "#FF6188", -+ "#A9DC76", -+ "#FFD876", -+ "#FC9867", -+ "#AB9DF2", -+ "#78DCE8", -+ "#FCFCFA", - - /* 8 bright colors */ -- "gray50", -- "red", -- "green", -- "yellow", -- "#5c5cff", -- "magenta", -- "cyan", -- "white", -+ "#727072", -+ "#FF6188", -+ "#A9DC76", -+ "#FFD866", -+ "#FC9867", -+ "#AB9DF2", -+ "#78DCE8", -+ "#FCFCFA", - - [255] = 0, - - /* more colors can be added after 255 to use with DefaultXX */ -- "#add8e6", /* 256 -> cursor */ -- "#555555", /* 257 -> rev cursor*/ -- "#000000", /* 258 -> bg */ -- "#e5e5e5", /* 259 -> fg */ -+ "#cccccc", -+ "#555555", -+ "black", -+ "#222222" - }; - - -@@ -197,13 +197,8 @@ static const char *colorname[] = { - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ --#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH --unsigned int defaultbg = 0; --unsigned int bg = 17, bgUnfocused = 16; --#else --unsigned int defaultbg = 258; --#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH --unsigned int defaultfg = 259; -+unsigned int defaultfg = 7; -+unsigned int defaultbg = 259; - unsigned int defaultcs = 256; - unsigned int defaultrcs = 257; - -@@ -239,7 +234,7 @@ Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11}, - * 7: Blinking st cursor - * 8: Steady st cursor - */ --static unsigned int cursorstyle = 1; -+static unsigned int cursorstyle = 4; - static Rune stcursor = 0x2603; /* snowman (U+2603) */ - #else - /* -@@ -249,7 +244,7 @@ static Rune stcursor = 0x2603; /* snowman (U+2603) */ - * 6: Bar ("|") - * 7: Snowman ("☃") - */ --static unsigned int cursorshape = 2; -+static unsigned int cursorshape = 4; - #endif // BLINKING_CURSOR_PATCH - - /* -diff --git a/patches.def.h b/patches.def.h -index 26ae7e6..2e79d14 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -32,7 +32,7 @@ - /* This patch allows st to resize to any pixel size rather than snapping to character width/height. - * https://st.suckless.org/patches/anysize/ - */ --#define ANYSIZE_PATCH 0 -+#define ANYSIZE_PATCH 1 - - /* A simple variant of the anysize patch that only changes the resize hints to allow the window to - * be resized to any size. -@@ -68,7 +68,7 @@ - /* This patch adds custom rendering of lines/blocks/braille characters for gapless alignment. - * https://st.suckless.org/patches/boxdraw/ - */ --#define BOXDRAW_PATCH 0 -+#define BOXDRAW_PATCH 1 - - /* By default st only sets PRIMARY on selection. - * This patch makes st set CLIPBOARD on selection. -@@ -141,7 +141,7 @@ - /* This patch makes the cursor color the inverse of the current cell color. - * https://st.suckless.org/patches/dynamic-cursor-color/ - */ --#define DYNAMIC_CURSOR_COLOR_PATCH 0 -+#define DYNAMIC_CURSOR_COLOR_PATCH 1 - - /* Reading and writing st's screen through a pipe, e.g. pass info to dmenu. - * https://st.suckless.org/patches/externalpipe/ -@@ -272,7 +272,7 @@ - /* Scroll back through terminal output using Shift+{PageUp, PageDown}. - * https://st.suckless.org/patches/scrollback/ - */ --#define SCROLLBACK_PATCH 0 -+#define SCROLLBACK_PATCH 1 - - /* Scroll back through terminal output using Shift+MouseWheel. - * This variant depends on SCROLLBACK_PATCH being enabled. -@@ -390,7 +390,7 @@ - /* Vertically center lines in the space available if you have set a larger chscale in config.h - * https://st.suckless.org/patches/vertcenter/ - */ --#define VERTCENTER_PATCH 0 -+#define VERTCENTER_PATCH 1 - - /* The vim-browse patch offers the possibility to move through the terminal history-buffer, - * search for strings using VIM-like motions, operations and quantifiers. It overlays the -@@ -410,14 +410,14 @@ - /* Adds support for w3m images. - * https://st.suckless.org/patches/w3m/ - */ --#define W3M_PATCH 0 -+#define W3M_PATCH 1 - - /* Adds proper glyphs rendering in st allowing wide glyphs to be drawn as-is as opposed to - * smaller or cut glyphs being rendered. - * https://github.com/Dreomite/st/commit/e3b821dcb3511d60341dec35ee05a4a0abfef7f2 - * https://www.reddit.com/r/suckless/comments/jt90ai/update_support_for_proper_glyph_rendering_in_st/ - */ --#define WIDE_GLYPHS_PATCH 0 -+#define WIDE_GLYPHS_PATCH 1 - - /* There is a known issue that Google's Variable Fonts (VF) can end up with letter spacing - * that is too wide in programs that use Xft, for example Inconsolata v3.000. --- -2.38.1 - - -From cbfab5471aef3ed8606b1fba8890dd5651add7f5 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 25 Mar 2021 17:47:16 +0100 -Subject: [PATCH 02/15] disable dynamic colors - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 2e79d14..3457532 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -141,7 +141,7 @@ - /* This patch makes the cursor color the inverse of the current cell color. - * https://st.suckless.org/patches/dynamic-cursor-color/ - */ --#define DYNAMIC_CURSOR_COLOR_PATCH 1 -+#define DYNAMIC_CURSOR_COLOR_PATCH 0 - - /* Reading and writing st's screen through a pipe, e.g. pass info to dmenu. - * https://st.suckless.org/patches/externalpipe/ --- -2.38.1 - - -From 6118a8e8555abca60380ecc2ddcb47afead3fd94 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 26 May 2022 22:43:52 +0200 -Subject: [PATCH 03/15] update color theme - ---- - config.def.h | 46 +++++++++++++++++++++++++--------------------- - 1 file changed, 25 insertions(+), 21 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 8dc318b..059a925 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -164,32 +164,36 @@ float alphaUnfocused = 0.6; - /* Terminal colors (16 first used in escape sequence) */ - static const char *colorname[] = { - /* 8 normal colors */ -- "#403E41", -- "#FF6188", -- "#A9DC76", -- "#FFD876", -- "#FC9867", -- "#AB9DF2", -- "#78DCE8", -- "#FCFCFA", -+ "#24292e", -+ "#d73a49", -+ "#28a745", -+ "#dbab09", -+ "#0366d6", -+ "#5a32a3", -+ "#0598bc", -+ "#6a737d", - - /* 8 bright colors */ -- "#727072", -- "#FF6188", -- "#A9DC76", -- "#FFD866", -- "#FC9867", -- "#AB9DF2", -- "#78DCE8", -- "#FCFCFA", -+ "#959da5", -+ "#cb2431", -+ "#22863a", -+ "#b08800", -+ "#005cc5", -+ "#5a32a3", -+ "#3192aa", -+ "#d1d5da", -+ -+ /* extra */ -+ "#d18616", -+ "#cb2431", - - [255] = 0, - - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", -- "#555555", -+ "#333333", - "black", -- "#222222" -+ "#ffffff" - }; - - -@@ -197,10 +201,10 @@ static const char *colorname[] = { - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ --unsigned int defaultfg = 7; -+unsigned int defaultfg = 0; - unsigned int defaultbg = 259; --unsigned int defaultcs = 256; --unsigned int defaultrcs = 257; -+unsigned int defaultcs = 257; -+unsigned int defaultrcs = 256; - - #if VIM_BROWSE_PATCH - unsigned int const currentBg = 6, buffSize = 2048; --- -2.38.1 - - -From 612effe1dc6717c26760ac35de785eddba56e26d Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 26 May 2022 22:51:03 +0200 -Subject: [PATCH 04/15] dynamic cursor color - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 3457532..2e79d14 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -141,7 +141,7 @@ - /* This patch makes the cursor color the inverse of the current cell color. - * https://st.suckless.org/patches/dynamic-cursor-color/ - */ --#define DYNAMIC_CURSOR_COLOR_PATCH 0 -+#define DYNAMIC_CURSOR_COLOR_PATCH 1 - - /* Reading and writing st's screen through a pipe, e.g. pass info to dmenu. - * https://st.suckless.org/patches/externalpipe/ --- -2.38.1 - - -From 492667cbb56b3aa10eec66597d702b74815f744b Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 26 May 2022 23:01:04 +0200 -Subject: [PATCH 05/15] move with termmod + j/k - ---- - config.def.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config.def.h b/config.def.h -index 059a925..d52f7d0 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -403,6 +403,8 @@ static Shortcut shortcuts[] = { - #if SCROLLBACK_PATCH - { ShiftMask, XK_Page_Up, kscrollup, {.i = -1}, S_PRI }, - { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1}, S_PRI }, -+ { TERMMOD, XK_K, kscrollup, {.i = 1}, S_PRI }, -+ { TERMMOD, XK_J, kscrolldown, {.i = 1}, S_PRI }, - #endif // SCROLLBACK_PATCH - #if CLIPBOARD_PATCH - { TERMMOD, XK_Y, clippaste, {.i = 0} }, --- -2.38.1 - - -From 72d5946b7a3f024b62e57100a2d8b5209165ea77 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 26 May 2022 23:08:37 +0200 -Subject: [PATCH 06/15] enable more patches ig - ---- - patches.def.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/patches.def.h b/patches.def.h -index 2e79d14..c7009b8 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -63,7 +63,7 @@ - * This patch makes bold text rendered simply as bold, leaving the color unaffected. - * https://st.suckless.org/patches/bold-is-not-bright/ - */ --#define BOLD_IS_NOT_BRIGHT_PATCH 0 -+#define BOLD_IS_NOT_BRIGHT_PATCH 1 - - /* This patch adds custom rendering of lines/blocks/braille characters for gapless alignment. - * https://st.suckless.org/patches/boxdraw/ -@@ -83,7 +83,7 @@ - * - * https://github.com/bakkeby/st-flexipatch/issues/34 - */ --#define COLUMNS_PATCH 0 -+#define COLUMNS_PATCH 1 - - /* Select and copy the last URL displayed with Mod+l. Multiple invocations cycle through the - * available URLs. -@@ -235,7 +235,7 @@ - * same CWD (current working directory) as the original st instance. - * https://st.suckless.org/patches/newterm/ - */ --#define NEWTERM_PATCH 0 -+#define NEWTERM_PATCH 1 - - /* This patch will set the _MOTIF_WM_HINTS property for the st window which, if the window manager - * respects it, will show the st window without window decorations. --- -2.38.1 - - -From 155c8b69eb0ea5601b1ba5f7c95359427289e834 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 00:35:49 +0200 -Subject: [PATCH 07/15] scroll mouse patch - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index c7009b8..020bc59 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -278,7 +278,7 @@ - * This variant depends on SCROLLBACK_PATCH being enabled. - * https://st.suckless.org/patches/scrollback/ - */ --#define SCROLLBACK_MOUSE_PATCH 0 -+#define SCROLLBACK_MOUSE_PATCH 1 - - /* Scroll back through terminal output using mouse wheel (when not in MODE_ALTSCREEN). - * This variant depends on SCROLLBACK_PATCH being enabled. --- -2.38.1 - - -From 256a84049d4f1296e7675af8738fa6f9e0132816 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 00:37:18 +0200 -Subject: [PATCH 08/15] st sync patch - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 020bc59..c406975 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -340,7 +340,7 @@ - * - * https://st.suckless.org/patches/sync/ - */ --#define SYNC_PATCH 0 -+#define SYNC_PATCH 1 - - /* Instead of a default X cursor, use the xterm cursor from your cursor theme. - * You need to uncomment the corresponding line in config.mk to use the -lXcursor library --- -2.38.1 - - -From d27b2513642f1f07281e7c8f94fcac6fa297d921 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 00:38:36 +0200 -Subject: [PATCH 09/15] undercurl - ---- - config.def.h | 2 +- - patches.def.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index d52f7d0..78fd0a2 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -756,5 +756,5 @@ static char *plumb_cmd = "plumb"; - #define UNDERCURL_SPIKY 1 - #define UNDERCURL_CAPPED 2 - // Active style --#define UNDERCURL_STYLE UNDERCURL_SPIKY -+#define UNDERCURL_STYLE UNDERCURL_CAPPED - #endif // UNDERCURL_PATCH -diff --git a/patches.def.h b/patches.def.h -index c406975..837b904 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -365,7 +365,7 @@ - * - * https://st.suckless.org/patches/undercurl/ - */ --#define UNDERCURL_PATCH 0 -+#define UNDERCURL_PATCH 1 - - /* Allows mouse scroll without modifier keys for regardless of alt screen using the external - * scroll program. --- -2.38.1 - - -From 065bf76f1cb9c96ff662dd59b30937b1e1a54a05 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 02:09:19 +0200 -Subject: [PATCH 10/15] anysize simple - ---- - patches.def.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/patches.def.h b/patches.def.h -index 837b904..5c6d41b 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -32,12 +32,12 @@ - /* This patch allows st to resize to any pixel size rather than snapping to character width/height. - * https://st.suckless.org/patches/anysize/ - */ --#define ANYSIZE_PATCH 1 -+#define ANYSIZE_PATCH 0 - - /* A simple variant of the anysize patch that only changes the resize hints to allow the window to - * be resized to any size. - */ --#define ANYSIZE_SIMPLE_PATCH 0 -+#define ANYSIZE_SIMPLE_PATCH 1 - - /* Draws a background image in farbfeld format in place of the defaultbg color allowing for pseudo - * transparency. --- -2.38.1 - - -From 7a1f17e2755e734c39361829da44c5ee5ad24f92 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 02:09:49 +0200 -Subject: [PATCH 11/15] set new font scale binding - ---- - config.def.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 78fd0a2..cd0078f 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -387,8 +387,8 @@ static Shortcut shortcuts[] = { - { ControlMask, XK_Print, toggleprinter, {.i = 0} }, - { ShiftMask, XK_Print, printscreen, {.i = 0} }, - { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, -- { TERMMOD, XK_Prior, zoom, {.f = +1} }, -- { TERMMOD, XK_Next, zoom, {.f = -1} }, -+ { TERMMOD, XK_Up, zoom, {.f = +1} }, -+ { TERMMOD, XK_Down, zoom, {.f = -1} }, - { TERMMOD, XK_Home, zoomreset, {.f = 0} }, - { TERMMOD, XK_C, clipcopy, {.i = 0} }, - { TERMMOD, XK_V, clippaste, {.i = 0} }, --- -2.38.1 - - -From 1eee022a9fe8f0ecca5602740daaed156e6daaf1 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 02:29:39 +0200 -Subject: [PATCH 12/15] swapmouse - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 5c6d41b..56854ec 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -327,7 +327,7 @@ - * shown by vte terminals like termite. - * https://st.suckless.org/patches/swapmouse/ - */ --#define SWAPMOUSE_PATCH 0 -+#define SWAPMOUSE_PATCH 1 - - /* This patch adds synchronized-updates/application-sync support in st. - * This will have no effect except when an application uses the synchronized-update escape --- -2.38.1 - - -From 99513e3a120b6b3546b910f85f67545dc6c484b8 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 02:39:03 +0200 -Subject: [PATCH 13/15] relative border - ---- - config.def.h | 2 +- - patches.def.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index cd0078f..eccec26 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -27,7 +27,7 @@ static const int pseudotransparency = 0; - #if RELATIVEBORDER_PATCH - /* borderperc: percentage of cell width to use as a border - * 0 = no border, 100 = border width is same as cell width */ --int borderperc = 20; -+int borderperc = 40; - #else - static int borderpx = 2; - #endif // RELATIVEBORDER_PATCH -diff --git a/patches.def.h b/patches.def.h -index 56854ec..78b2320 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -261,7 +261,7 @@ - * in the terminal. - * https://st.suckless.org/patches/relativeborder/ - */ --#define RELATIVEBORDER_PATCH 0 -+#define RELATIVEBORDER_PATCH 1 - - /* This patch allows you to right-click on some selected text to send it to the plumbing - * program of choice, e.g. open a file, view an image, open a URL. --- -2.38.1 - - -From 8bb6e96a338fb0153419265a5cbd2e1811726ad7 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 9 Sep 2022 02:13:28 +0200 -Subject: [PATCH 14/15] update enabled patches - ---- - patches.def.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/patches.def.h b/patches.def.h -index 78b2320..1f79bbf 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -101,7 +101,7 @@ - * restores the window title (for instance nvim does this when opening and closing). - * https://st.suckless.org/patches/csi_22_23/ - */ --#define CSI_22_23_PATCH 0 -+#define CSI_22_23_PATCH 1 - - /* According to the specification (see link in BLINKING_CURSOR_PATCH) the "Set cursor style - * (DECSCUSR), VT520." escape sequences define both values of 0 and 1 as a blinking block, -@@ -170,7 +170,7 @@ - * that are available to GUI applications. - * https://st.suckless.org/patches/fix_keyboard_input/ - */ --#define FIXKEYBOARDINPUT_PATCH 0 -+#define FIXKEYBOARDINPUT_PATCH 1 - - /* This patch allows you to add spare font besides the default. Some glyphs can be not present in - * the default font. For this glyphs st uses font-config and try to find them in font cache first. -@@ -320,7 +320,7 @@ - /* Use inverted defaultbg/fg for selection when bg/fg are the same. - * https://st.suckless.org/patches/spoiler/ - */ --#define SPOILER_PATCH 0 -+#define SPOILER_PATCH 1 - - /* This patch changes the mouse shape to the global default when the running program subscribes - * for mouse events, for instance, in programs like ranger and fzf. It emulates the behaviour -@@ -371,7 +371,7 @@ - * scroll program. - * https://st.suckless.org/patches/universcroll/ - */ --#define UNIVERSCROLL_PATCH 0 -+#define UNIVERSCROLL_PATCH 1 - - /* Use XftFontMatch in place of FcFontMatch. - * -@@ -385,7 +385,7 @@ - * - * https://git.suckless.org/st/commit/528241aa3835e2f1f052abeeaf891737712955a0.html - */ --#define USE_XFTFONTMATCH_PATCH 0 -+#define USE_XFTFONTMATCH_PATCH 1 - - /* Vertically center lines in the space available if you have set a larger chscale in config.h - * https://st.suckless.org/patches/vertcenter/ -@@ -410,7 +410,7 @@ - /* Adds support for w3m images. - * https://st.suckless.org/patches/w3m/ - */ --#define W3M_PATCH 1 -+#define W3M_PATCH 0 - - /* Adds proper glyphs rendering in st allowing wide glyphs to be drawn as-is as opposed to - * smaller or cut glyphs being rendered. --- -2.38.1 - - -From e5742da3ae1f3491086585e92babb21a2d411cc6 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 15 Sep 2022 16:02:06 +0200 -Subject: [PATCH 15/15] fix fix keyboard input - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 1f79bbf..5727131 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -170,7 +170,7 @@ - * that are available to GUI applications. - * https://st.suckless.org/patches/fix_keyboard_input/ - */ --#define FIXKEYBOARDINPUT_PATCH 1 -+#define FIXKEYBOARDINPUT_PATCH 0 - - /* This patch allows you to add spare font besides the default. Some glyphs can be not present in - * the default font. For this glyphs st uses font-config and try to find them in font cache first. --- -2.38.1 - diff --git a/x11-terms/st/metadata.xml b/x11-terms/st/metadata.xml deleted file mode 100644 index e80f2b3..0000000 --- a/x11-terms/st/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -florianbadie@odrling.xyz - - diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild deleted file mode 100644 index 9b949d5..0000000 --- a/x11-terms/st/st-9999.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop git-r3 savedconfig toolchain-funcs - -DESCRIPTION="simple terminal implementation for X" -HOMEPAGE="https://st.suckless.org/" -EGIT_REPO_URI="https://github.com/bakkeby/st-flexipatch.git" - -LICENSE="MIT-with-advertising" -SLOT="0" -#KEYWORDS="" -IUSE="savedconfig" - -RDEPEND=" - >=sys-libs/ncurses-6.0:0= - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXft - ~x11-terms/st-terminfo-${PV} -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/odrling.patch -) - -src_prepare() { - default - - sed -i \ - -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \ - -e '/^STLDFLAGS/s|= .*|= $(LDFLAGS) $(LIBS)|g' \ - -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \ - config.mk || die - sed -i \ - -e '/tic/d' \ - Makefile || die - - restore_config config.h -} - -src_configure() { - sed -i \ - -e "s|pkg-config|$(tc-getPKG_CONFIG)|g" \ - config.mk || die - - tc-export CC -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - - make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' '' - - save_config config.h -} - -pkg_postinst() { - if ! [[ "${REPLACING_VERSIONS}" ]]; then - elog "Please ensure a usable font is installed, like" - elog " media-fonts/corefonts" - elog " media-fonts/dejavu" - elog " media-fonts/urw-fonts" - fi -} diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild deleted file mode 100644 index b4d213e..0000000 --- a/x11-wm/dwm/dwm-9999.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit git-r3 toolchain-funcs - -DESCRIPTION="a dynamic window manager for X11" -HOMEPAGE="https://dwm.suckless.org/" -EGIT_REPO_URI="https://github.com/bakkeby/dwm-flexipatch" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" -IUSE="xinerama" - -RDEPEND=" - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXft - x11-libs/libxcb - dev-libs/yajl - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - xinerama? ( x11-base/xorg-proto ) -" -PATCHES=( - "${FILESDIR}"/odrling.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/ -Os / /" \ - -e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \ - config.mk || die -} - -src_compile() { - if use xinerama; then - emake CC=$(tc-getCC) dwm - else - emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm - fi -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - - dodoc README -} diff --git a/x11-wm/dwm/files/odrling.patch b/x11-wm/dwm/files/odrling.patch deleted file mode 100644 index a429814..0000000 --- a/x11-wm/dwm/files/odrling.patch +++ /dev/null @@ -1,1654 +0,0 @@ -From ad10853f082ef927d67beade3b053b301d2fff87 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Sat, 27 Mar 2021 18:56:05 +0100 -Subject: [PATCH 01/33] set up my patches and config - ---- - config.def.h | 120 +++++++++++++++++++++++++++++--------------------- - patches.def.h | 50 ++++++++++----------- - 2 files changed, 95 insertions(+), 75 deletions(-) - -diff --git a/config.def.h b/config.def.h -index e030ee9..c8057af 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -154,11 +154,11 @@ static void (*bartabmonfns[])(Monitor *) = { NULL /* , customlayoutfn */ }; - #endif // MONOCLE_LAYOUT - #endif // BAR_TABGROUPS_PATCH - #if BAR_PANGO_PATCH --static const char font[] = "monospace 10"; -+static const char font[] = "sans 12"; - #else --static const char *fonts[] = { "monospace:size=10" }; -+static const char *fonts[] = { "sans:size=12" }; - #endif // BAR_PANGO_PATCH --static const char dmenufont[] = "monospace:size=10"; -+static const char dmenufont[] = "sans:size=12"; - - static char c000000[] = "#000000"; // placeholder value - -@@ -168,9 +168,9 @@ static char normbordercolor[] = "#444444"; - static char normfloatcolor[] = "#db8fd9"; - - static char selfgcolor[] = "#eeeeee"; --static char selbgcolor[] = "#005577"; --static char selbordercolor[] = "#005577"; --static char selfloatcolor[] = "#005577"; -+static char selbgcolor[] = "#9966cc"; -+static char selbordercolor[] = "#9966cc"; -+static char selfloatcolor[] = "#9966cc"; - - static char titlenormfgcolor[] = "#bbbbbb"; - static char titlenormbgcolor[] = "#222222"; -@@ -178,9 +178,9 @@ static char titlenormbordercolor[] = "#444444"; - static char titlenormfloatcolor[] = "#db8fd9"; - - static char titleselfgcolor[] = "#eeeeee"; --static char titleselbgcolor[] = "#005577"; --static char titleselbordercolor[] = "#005577"; --static char titleselfloatcolor[] = "#005577"; -+static char titleselbgcolor[] = "#9966cc"; -+static char titleselbordercolor[] = "#9966cc"; -+static char titleselfloatcolor[] = "#9966cc"; - - static char tagsnormfgcolor[] = "#bbbbbb"; - static char tagsnormbgcolor[] = "#222222"; -@@ -188,14 +188,14 @@ static char tagsnormbordercolor[] = "#444444"; - static char tagsnormfloatcolor[] = "#db8fd9"; - - static char tagsselfgcolor[] = "#eeeeee"; --static char tagsselbgcolor[] = "#005577"; --static char tagsselbordercolor[] = "#005577"; --static char tagsselfloatcolor[] = "#005577"; -+static char tagsselbgcolor[] = "#9966cc"; -+static char tagsselbordercolor[] = "#9966cc"; -+static char tagsselfloatcolor[] = "#9966cc"; - --static char hidnormfgcolor[] = "#005577"; --static char hidselfgcolor[] = "#227799"; --static char hidnormbgcolor[] = "#222222"; --static char hidselbgcolor[] = "#222222"; -+static char hidnormfgcolor[] = "#9966cc"; -+static char hidselfgcolor[] = "#222222"; -+static char hidnormbgcolor[] = "#9966cc"; -+static char hidselbgcolor[] = "#f76e0c"; - - static char urgfgcolor[] = "#bbbbbb"; - static char urgbgcolor[] = "#222222"; -@@ -395,7 +395,7 @@ static const char *layoutmenu_cmd = "layoutmenu.sh"; - - #if COOL_AUTOSTART_PATCH - static const char *const autostart[] = { -- "st", NULL, -+ "dwmblocks", NULL, - NULL /* terminate */ - }; - #endif // COOL_AUTOSTART_PATCH -@@ -491,11 +491,10 @@ static const Rule rules[] = { - RULE(.wintype = WTYPE "UTILITY", .isfloating = 1) - RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1) - RULE(.wintype = WTYPE "SPLASH", .isfloating = 1) -- RULE(.class = "Gimp", .tags = 1 << 4) -- RULE(.class = "Firefox", .tags = 1 << 7) -- #if RENAMED_SCRATCHPADS_PATCH -- RULE(.instance = "spterm", .scratchkey = 's', .isfloating = 1) -- #elif SCRATCHPADS_PATCH -+ RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 2) -+ RULE(.class = "Ardour", .tags = 1 << 8) -+ RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1) -+ #if SCRATCHPADS_PATCH - RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1) - #endif // SCRATCHPADS_PATCH - }; -@@ -649,13 +648,13 @@ static const int scrollargs[][2] = { - static const Layout layouts[] = { - /* symbol arrange function, { nmaster, nstack, layout, master axis, stack axis, secondary stack axis, symbol func } */ - { "[]=", flextile, { -1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, TOP_TO_BOTTOM, 0, NULL } }, // default tile layout -- { "><>", NULL, {0} }, /* no layout function means floating behavior */ - { "[M]", flextile, { -1, -1, NO_SPLIT, MONOCLE, MONOCLE, 0, NULL } }, // monocle -- { "|||", flextile, { -1, -1, SPLIT_VERTICAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // columns (col) layout -- { ">M>", flextile, { -1, -1, FLOATING_MASTER, LEFT_TO_RIGHT, LEFT_TO_RIGHT, 0, NULL } }, // floating master -- { "[D]", flextile, { -1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, MONOCLE, 0, NULL } }, // deck - { "TTT", flextile, { -1, -1, SPLIT_HORIZONTAL, LEFT_TO_RIGHT, LEFT_TO_RIGHT, 0, NULL } }, // bstack -- { "===", flextile, { -1, -1, SPLIT_HORIZONTAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // bstackhoriz -+ // { "><>", NULL, {0} }, /* no layout function means floating behavior */ -+ // { "|||", flextile, { -1, -1, SPLIT_VERTICAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // columns (col) layout -+ // { ">M>", flextile, { -1, -1, FLOATING_MASTER, LEFT_TO_RIGHT, LEFT_TO_RIGHT, 0, NULL } }, // floating master -+ { "[D]", flextile, { -1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, MONOCLE, 0, NULL } }, // deck -+ // { "===", flextile, { -1, -1, SPLIT_HORIZONTAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // bstackhoriz - { "|M|", flextile, { -1, -1, SPLIT_CENTERED_VERTICAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, TOP_TO_BOTTOM, NULL } }, // centeredmaster - { "-M-", flextile, { -1, -1, SPLIT_CENTERED_HORIZONTAL, TOP_TO_BOTTOM, LEFT_TO_RIGHT, LEFT_TO_RIGHT, NULL } }, // centeredmaster horiz - { ":::", flextile, { -1, -1, NO_SPLIT, GAPPLESSGRID, GAPPLESSGRID, 0, NULL } }, // gappless grid -@@ -714,7 +713,7 @@ static const Layout layouts[] = { - #if TILE_LAYOUT - { "[]=", tile }, /* first entry is default */ - #endif -- { "><>", NULL }, /* no layout function means floating behavior */ -+ // { "><>", NULL }, /* no layout function means floating behavior */ - #if MONOCLE_LAYOUT - { "[M]", monocle }, - #endif -@@ -769,7 +768,7 @@ static const char *xkb_layouts[] = { - #endif // XKB_PATCH - - /* key definitions */ --#define MODKEY Mod1Mask -+#define MODKEY Mod4Mask - #if COMBO_PATCH && SWAPTAGS_PATCH && TAGOTHERMONITOR_PATCH - #define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \ -@@ -870,6 +869,10 @@ static const char *dmenucmd[] = { - NULL - }; - static const char *termcmd[] = { "st", NULL }; -+static const char *passmenucmd[] = { "passmenu", "-m", dmenumon, NULL }; -+static const char *webmenucmd[] = { "webmenu", "-m", dmenumon, NULL }; -+static const char *screenshot[] = { "screenshot", NULL }; -+static const char *screenshots[] = { "screenshot", "-s", "-l", "-c", "0.75,0.5,1.0,0.1", NULL }; - - #if BAR_STATUSCMD_PATCH - #if BAR_DWMBLOCKS_PATCH -@@ -900,7 +903,7 @@ static const Key keys[] = { - #if KEYMODES_PATCH - { MODKEY, XK_Escape, setkeymode, {.ui = COMMANDMODE} }, - #endif // KEYMODES_PATCH -- { MODKEY, XK_p, spawn, {.v = dmenucmd } }, -+ { MODKEY, XK_o, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - #if RIODRAW_PATCH - { MODKEY|ControlMask, XK_p, riospawnsync, {.v = dmenucmd } }, -@@ -1044,14 +1047,14 @@ static const Key keys[] = { - #if BAR_WINTITLEACTIONS_PATCH - { MODKEY|ControlMask, XK_z, showhideclient, {0} }, - #endif // BAR_WINTITLEACTIONS_PATCH -- { MODKEY|ShiftMask, XK_c, killclient, {0} }, -+ { MODKEY, XK_q, killclient, {0} }, - #if KILLUNSEL_PATCH - { MODKEY|ShiftMask, XK_x, killunsel, {0} }, - #endif // KILLUNSEL_PATCH - #if SELFRESTART_PATCH - { MODKEY|ShiftMask, XK_r, self_restart, {0} }, - #endif // SELFRESTART_PATCH -- { MODKEY|ShiftMask, XK_q, quit, {0} }, -+ // { MODKEY|ShiftMask, XK_q, quit, {0} }, - #if RESTARTSIG_PATCH - { MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} }, - #endif // RESTARTSIG_PATCH -@@ -1067,9 +1070,9 @@ static const Key keys[] = { - #if XRDB_PATCH && !BAR_VTCOLORS_PATCH - { MODKEY|ShiftMask, XK_F5, xrdb, {.v = NULL } }, - #endif // XRDB_PATCH -- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, -- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, -- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, -+ { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, // tile -+ { MODKEY, XK_u, setlayout, {.v = &layouts[1]} }, // monocle -+ { MODKEY, XK_y, setlayout, {.v = &layouts[2]} }, // bstack - #if COLUMNS_LAYOUT - { MODKEY, XK_c, setlayout, {.v = &layouts[3]} }, - #endif // COLUMNS_LAYOUT -@@ -1132,10 +1135,10 @@ static const Key keys[] = { - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - #endif // SCRATCHPAD_ALT_1_PATCH -- { MODKEY, XK_comma, focusmon, {.i = -1 } }, -- { MODKEY, XK_period, focusmon, {.i = +1 } }, -- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, -- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, -+ { MODKEY|ControlMask, XK_j, focusmon, {.i = -1 } }, -+ { MODKEY|ControlMask, XK_k, focusmon, {.i = +1 } }, -+ { MODKEY|ShiftMask, XK_j, tagmon, {.i = -1 } }, -+ { MODKEY|ShiftMask, XK_k, tagmon, {.i = +1 } }, - #if FOCUSADJACENTTAG_PATCH - { MODKEY, XK_Left, viewtoleft, {0} }, // note keybinding conflict with focusdir - { MODKEY, XK_Right, viewtoright, {0} }, // note keybinding conflict with focusdir -@@ -1275,23 +1278,40 @@ static const Key keys[] = { - { MODKEY|ControlMask, XK_numbersign, setborderpx, {.i = 0 } }, - #endif // SETBORDERPX_PATCH - #if CYCLELAYOUTS_PATCH -- { MODKEY|ControlMask, XK_comma, cyclelayout, {.i = -1 } }, -- { MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } }, -+ { MODKEY|ShiftMask, XK_Tab, cyclelayout, {.i = -1 } }, -+ { MODKEY, XK_Tab, cyclelayout, {.i = +1 } }, - #endif // CYCLELAYOUTS_PATCH - #if MPDCONTROL_PATCH - { MODKEY, XK_F1, mpdchange, {.i = -1} }, - { MODKEY, XK_F2, mpdchange, {.i = +1} }, - { MODKEY, XK_Escape, mpdcontrol, {0} }, - #endif // MPDCONTROL_PATCH -- TAGKEYS( XK_1, 0) -- TAGKEYS( XK_2, 1) -- TAGKEYS( XK_3, 2) -- TAGKEYS( XK_4, 3) -- TAGKEYS( XK_5, 4) -- TAGKEYS( XK_6, 5) -- TAGKEYS( XK_7, 6) -- TAGKEYS( XK_8, 7) -- TAGKEYS( XK_9, 8) -+ TAGKEYS( XK_ampersand, 0) -+ TAGKEYS( XK_eacute, 1) -+ TAGKEYS( XK_quotedbl, 2) -+ TAGKEYS( XK_apostrophe, 3) -+ TAGKEYS( XK_parenleft, 4) -+ TAGKEYS( XK_minus, 5) -+ TAGKEYS( XK_egrave, 6) -+ TAGKEYS( XK_underscore, 7) -+ TAGKEYS( XK_ccedilla, 8) -+ { MODKEY, XK_Up, spawn, SHCMD("omixer +") }, -+ { MODKEY, XK_Down, spawn, SHCMD("omixer -") }, -+ { MODKEY, XK_Left, spawn, SHCMD("backlight - 5") }, -+ { MODKEY, XK_Right, spawn, SHCMD("backlight + 5") }, -+ { MODKEY|ShiftMask, XK_d, spawn, SHCMD("discord") }, -+ { MODKEY|ShiftMask, XK_f, spawn, SHCMD("firefox") }, -+ { MODKEY, XK_a, spawn, SHCMD("anime") }, -+ { MODKEY, XK_v, spawn, SHCMD("st -e vid") }, -+ { MODKEY, XK_n, spawn, SHCMD("st -e newsboat") }, -+ { MODKEY, XK_comma, spawn, SHCMD("st -e weechat") }, -+ { MODKEY, XK_z, spawn, SHCMD("shortmenu") }, -+ { MODKEY, XK_m, spawn, SHCMD("dmount") }, -+ { MODKEY|ShiftMask, XK_m, spawn, SHCMD("dumount") }, -+ { MODKEY, XK_p, spawn, {.v = passmenucmd } }, -+ { MODKEY, XK_g, spawn, {.v = webmenucmd } }, -+ { MODKEY, XK_s, spawn, {.v = screenshot } }, -+ { MODKEY|ShiftMask, XK_s, spawn, {.v = screenshots } }, - }; - - #if KEYMODES_PATCH -diff --git a/patches.def.h b/patches.def.h -index 1429aa0..8fdae36 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -326,7 +326,7 @@ - * https://github.com/bakkeby/dwm-flexipatch/issues/50 (_IS_FLOATING patch) - * https://dwm.suckless.org/patches/ewmhtags/ - */ --#define BAR_EWMHTAGS_PATCH 0 -+#define BAR_EWMHTAGS_PATCH 1 - - /* Allows the bar height to be explicitly set rather than being derived from font. - * https://dwm.suckless.org/patches/bar_height/ -@@ -336,7 +336,7 @@ - /* This patch prevents dwm from drawing tags with no clients (i.e. vacant) on the bar. - * https://dwm.suckless.org/patches/hide_vacant_tags/ - */ --#define BAR_HIDEVACANTTAGS_PATCH 0 -+#define BAR_HIDEVACANTTAGS_PATCH 1 - - /* With this patch dwm's built-in status bar is only shown when HOLDKEY is pressed - * and the bar will now overlay the display. -@@ -491,7 +491,7 @@ - * get resized/moved. With this patch, they will. - * https://dwm.suckless.org/patches/autoresize/ - */ --#define AUTORESIZE_PATCH 0 -+#define AUTORESIZE_PATCH 1 - - /* This patch adds proper support for Right-To-Left languages. (such as Farsi, Arabic or Hebrew). - * -@@ -521,12 +521,12 @@ - * adding wintype as a client rule filter, hence this no longer works out of the box. This - * patch restores previous behaviour with the center patch. - */ --#define CENTER_TRANSIENT_WINDOWS_PATCH 0 -+#define CENTER_TRANSIENT_WINDOWS_PATCH 1 - - /* As above, except that the transient window is centered within the position of the parent - * window, rather than at the center of the screen. This takes precedence over the above patch. - */ --#define CENTER_TRANSIENT_WINDOWS_BY_PARENT_PATCH 0 -+#define CENTER_TRANSIENT_WINDOWS_BY_PARENT_PATCH 1 - - /* This patch provides the ability to assign different weights to clients in their - * respective stack in tiled layout. -@@ -544,18 +544,18 @@ - * hold MOD and then press and hold 1 and 3 together. - * https://dwm.suckless.org/patches/combo/ - */ --#define COMBO_PATCH 0 -+#define COMBO_PATCH 1 - - /* Allow dwm to execute commands from autostart array in your config.h file. When dwm exits - * then all processes from autostart array will be killed. - * https://dwm.suckless.org/patches/cool_autostart/ - */ --#define COOL_AUTOSTART_PATCH 0 -+#define COOL_AUTOSTART_PATCH 1 - - /* The cyclelayouts patch lets you cycle through all your layouts. - * https://dwm.suckless.org/patches/cyclelayouts/ - */ --#define CYCLELAYOUTS_PATCH 0 -+#define CYCLELAYOUTS_PATCH 1 - - /* Make dwm respect _MOTIF_WM_HINTS property, and not draw borders around windows requesting - * for it. Some applications use this property to notify window managers to not draw window -@@ -661,7 +661,7 @@ - * xdotool selectwindow -- set_window --urgency 1 - * https://dwm.suckless.org/patches/focusurgent/ - */ --#define FOCUSURGENT_PATCH 0 -+#define FOCUSURGENT_PATCH 1 - - /* By default, dwm responds to _NET_ACTIVE_WINDOW client messages by setting - * the urgency bit on the named window. This patch activates the window instead. -@@ -706,7 +706,7 @@ - * https://github.com/mihirlad55/dwm-ipc - * https://dwm.suckless.org/patches/ipc/ - */ --#define IPC_PATCH 0 -+#define IPC_PATCH 1 - - /* Adds rule option for clients to avoid accidental termination by killclient for sticky windows. - * https://dwm.suckless.org/patches/ispermanent/ -@@ -737,7 +737,7 @@ - * in such scenarios the previous window loses fullscreen. - * https://github.com/bakkeby/patches/blob/master/dwm/dwm-losefullscreen-6.2.diff - */ --#define LOSEFULLSCREEN_PATCH 0 -+#define LOSEFULLSCREEN_PATCH 1 - - /* This patch adds helper functions for maximizing, horizontally and vertically, floating - * windows using keybindings. -@@ -815,12 +815,12 @@ - * Zoom video conferencing application. - * https://github.com/bakkeby/patches/wiki/netclientliststacking/ - */ --#define NET_CLIENT_LIST_STACKING_PATCH 0 -+#define NET_CLIENT_LIST_STACKING_PATCH 1 - - /* Removes the border when there is only one window visible. - * https://dwm.suckless.org/patches/noborder/ - */ --#define NOBORDER_PATCH 0 -+#define NOBORDER_PATCH 1 - - /* Enable modifying or removing dmenu in config.def.h which resulted previously in a - * compilation error because two lines of code hardcode dmenu into dwm. -@@ -848,7 +848,7 @@ - * https://github.com/szatanjl/dwm/commit/1529909466206016f2101457bbf37c67195714c8 - * https://dwm.suckless.org/patches/alpha/dwm-fixborders-6.2.diff - */ --#define NO_TRANSPARENT_BORDERS_PATCH 0 -+#define NO_TRANSPARENT_BORDERS_PATCH 1 - - /* Port of InstantWM's on_empty_keys functionality allowing keybindings that apply only when - * a tag is empty. An example use case is being able to launch applications with first hand -@@ -936,7 +936,7 @@ - * This takes precedence over the resizecorners patch. - * https://github.com/bakkeby/patches/blob/master/dwm/dwm-resizepoint-6.2.diff - */ --#define RESIZEPOINT_PATCH 0 -+#define RESIZEPOINT_PATCH 1 - - /* Adds a keyboard shortcut to restart dwm or alternatively by using kill -HUP dwmpid. - * Additionally dwm can quit cleanly by using kill -TERM dwmpid. -@@ -1096,7 +1096,7 @@ - * comes to focusmon, tagmon and similar functionality. - * https://www.mail-archive.com/hackers@suckless.org/msg09400.html - */ --#define SORTSCREENS_PATCH 0 -+#define SORTSCREENS_PATCH 1 - - /* Spawns programs from currently focused client's working directory. - * https://dwm.suckless.org/patches/spawn_cwd/ -@@ -1122,12 +1122,12 @@ - * - * https://github.com/bakkeby/patches/wiki/steam - */ --#define STEAM_PATCH 0 -+#define STEAM_PATCH 1 - - /* Adds toggleable keyboard shortcut to make a client 'sticky', i.e. visible on all tags. - * https://dwm.suckless.org/patches/sticky/ - */ --#define STICKY_PATCH 0 -+#define STICKY_PATCH 1 - - /* This patch adds "window swallowing" to dwm as known from Plan 9's windowing system rio. - * Clients marked with isterminal in config.h swallow a window opened by any child process, -@@ -1144,7 +1144,7 @@ - * - * https://dwm.suckless.org/patches/swallow/ - */ --#define SWALLOW_PATCH 0 -+#define SWALLOW_PATCH 1 - - /* This patch depends on the pertag patch and makes it possible to switch focus with a single - * shortcut (MOD+s) instead of having to think if you should use mod-j or mod-k for reaching -@@ -1180,7 +1180,7 @@ - * https://github.com/bakkeby/patches/blob/master/dwm/dwm-switchtag-6.2.diff - * Also see https://dwm.suckless.org/patches/switchtotag - */ --#define SWITCHTAG_PATCH 0 -+#define SWITCHTAG_PATCH 1 - - /* This patch transforms the monocle layout into a "tabbed" layout if more than one window is - * present on the monocle view. This patch has been added for demonstration purposes only and has -@@ -1222,7 +1222,7 @@ - * while remaining in fullscreen. - * https://github.com/bakkeby/patches/blob/master/dwm/dwm-tagmonfixfs-6.2.diff - */ --#define TAGMONFIXFS_PATCH 0 -+#define TAGMONFIXFS_PATCH 1 - - /* Add functions and keybindings to tag a window to a desired tag on the next (right) - * or previous (left) monitor from the currently selected monitor. -@@ -1320,7 +1320,7 @@ - * when the mouse cursor is (a) on a different screen or (b) on top of a different window. - * https://dwm.suckless.org/patches/warp/ - */ --#define WARP_PATCH 0 -+#define WARP_PATCH 1 - - /* Sometimes a single application opens different windows depending on the task - * at hand and this is often reflected in the WM_WINDOW_ROLE(STRING) x property. -@@ -1348,7 +1348,7 @@ - * the float border color, awesomebar, urgentborder and titlecolor patches. - * https://dwm.suckless.org/patches/xrdb/ - */ --#define XRDB_PATCH 0 -+#define XRDB_PATCH 1 - - /* Simple patch that allows floating windows to be zoomed into the master stack position. - * https://www.reddit.com/r/suckless/comments/ie5fe3/zoomfloating_my_own_simple_original_patch/ -@@ -1410,7 +1410,7 @@ - * A revamped, more flexible, and over-the-top version of the original flextile layout. - * https://dwm.suckless.org/patches/flextile/ (original) - */ --#define FLEXTILE_DELUXE_LAYOUT 0 -+#define FLEXTILE_DELUXE_LAYOUT 1 - - /* Gappless grid layout. - * https://dwm.suckless.org/patches/gaplessgrid/ -@@ -1435,7 +1435,7 @@ - /* The default tile layout. - * This can be optionally disabled in favour of other layouts. - */ --#define TILE_LAYOUT 1 -+#define TILE_LAYOUT 0 - - /* Monocle layout (default). - * This can be optionally disabled in favour of other layouts. --- -2.41.0 - - -From 472312061df8428fd5aa7958e14f58bf5e2c43af Mon Sep 17 00:00:00 2001 -From: odrling -Date: Sat, 27 Mar 2021 19:07:22 +0100 -Subject: [PATCH 02/33] set urgent color - ---- - config.def.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config.def.h b/config.def.h -index c8057af..c2ae077 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -197,9 +197,9 @@ static char hidselfgcolor[] = "#222222"; - static char hidnormbgcolor[] = "#9966cc"; - static char hidselbgcolor[] = "#f76e0c"; - --static char urgfgcolor[] = "#bbbbbb"; --static char urgbgcolor[] = "#222222"; --static char urgbordercolor[] = "#ff0000"; -+static char urgfgcolor[] = "#222222"; -+static char urgbgcolor[] = "#bbbbbb"; -+static char urgbordercolor[] = "#dddddd"; - static char urgfloatcolor[] = "#db8fd9"; - - #if RENAMED_SCRATCHPADS_PATCH --- -2.41.0 - - -From 452774c3c6a59deff7ce7bcc3dd5ae6dbffcae76 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Sun, 28 Mar 2021 20:22:05 +0200 -Subject: [PATCH 03/33] more config - ---- - config.def.h | 15 +++++++++------ - patches.def.h | 10 +++++----- - 2 files changed, 14 insertions(+), 11 deletions(-) - -diff --git a/config.def.h b/config.def.h -index c2ae077..b36c6fe 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -491,8 +491,9 @@ static const Rule rules[] = { - RULE(.wintype = WTYPE "UTILITY", .isfloating = 1) - RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1) - RULE(.wintype = WTYPE "SPLASH", .isfloating = 1) -- RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 2) -- RULE(.class = "Ardour", .tags = 1 << 8) -+ RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1) -+ RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0) -+ RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1) - #if SCRATCHPADS_PATCH - RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1) -@@ -1122,7 +1123,7 @@ static const Key keys[] = { - { MODKEY|ShiftMask, XK_f, fullscreen, {0} }, - #endif // FULLSCREEN_PATCH - #if STICKY_PATCH -- { MODKEY|ShiftMask, XK_s, togglesticky, {0} }, -+ { MODKEY|ShiftMask, XK_t, togglesticky, {0} }, - #endif // STICKY_PATCH - #if SCRATCHPAD_ALT_1_PATCH - { MODKEY, XK_minus, scratchpad_show, {0} }, -@@ -1132,8 +1133,8 @@ static const Key keys[] = { - { MODKEY, XK_0, view, {.ui = ~SPTAGMASK } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~SPTAGMASK } }, - #else -- { MODKEY, XK_0, view, {.ui = ~0 } }, -- { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, -+ { MODKEY, XK_agrave, view, {.ui = ~0 } }, -+ { MODKEY|ShiftMask, XK_agrave, tag, {.ui = ~0 } }, - #endif // SCRATCHPAD_ALT_1_PATCH - { MODKEY|ControlMask, XK_j, focusmon, {.i = -1 } }, - { MODKEY|ControlMask, XK_k, focusmon, {.i = +1 } }, -@@ -1600,7 +1601,9 @@ static const Signal signals[] = { - /* trigger signals using `xsetroot -name "fsignal:"` */ - static Signal signals[] = { - /* signum function argument */ -- { 1, setlayout, {.v = 0} }, -+ { 1, spawn, SHCMD("setaudio") }, -+ { 2, spawn, SHCMD("setoutput") }, -+ { 3, spawn, SHCMD("sethid") }, - }; - #endif // DWMC_PATCH - -diff --git a/patches.def.h b/patches.def.h -index 8fdae36..71a2ef8 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -460,7 +460,7 @@ - * This patch takes precedence over ATTACHASIDE_PATCH. - * https://dwm.suckless.org/patches/attachabove/ - */ --#define ATTACHABOVE_PATCH 0 -+#define ATTACHABOVE_PATCH 1 - - /* This patch adds new clients on top of the stack. - * This patch takes precedence over ATTACHBELOW_PATCH. -@@ -667,14 +667,14 @@ - * the urgency bit on the named window. This patch activates the window instead. - * https://dwm.suckless.org/patches/focusonnetactive/ - */ --#define FOCUSONNETACTIVE_PATCH 0 -+#define FOCUSONNETACTIVE_PATCH 1 - - /* Send "fake signals" to dwm for handling, using xsetroot. This will not conflict with the - * status bar, which also is managed using xsetroot. - * Also see the dwmc patch, which takes precedence over this patch. - * https://dwm.suckless.org/patches/fsignal/ - */ --#define FSIGNAL_PATCH 0 -+#define FSIGNAL_PATCH 1 - - /* Applies the monocle layout with the focused client on top and hides the bar. When pressed - * again it shows the bar and restores the layout that was active before going fullscreen. -@@ -820,7 +820,7 @@ - /* Removes the border when there is only one window visible. - * https://dwm.suckless.org/patches/noborder/ - */ --#define NOBORDER_PATCH 1 -+#define NOBORDER_PATCH 0 - - /* Enable modifying or removing dmenu in config.def.h which resulted previously in a - * compilation error because two lines of code hardcode dmenu into dwm. -@@ -872,7 +872,7 @@ - * monitor (default). - * https://dwm.suckless.org/patches/pertag/ - */ --#define PERTAG_PATCH 0 -+#define PERTAG_PATCH 1 - - /* Option to store gaps on a per tag basis rather than on a per monitor basis. - * Depends on both pertag and vanitygaps patches being enabled. --- -2.41.0 - - -From d7dae7579bd42c0f6afd21de3fed7ae47d5a0adb Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 1 Apr 2021 20:27:49 +0200 -Subject: [PATCH 04/33] edit cyclelayout keybinding - ---- - config.def.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/config.def.h b/config.def.h -index b36c6fe..d94a1da 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -1088,8 +1088,8 @@ static const Key keys[] = { - { MODKEY|Mod5Mask|Mod1Mask, XK_Tab, rotatelayoutaxis, {.i = -4 } }, /* flextile, 4 = secondary stack axis */ - { MODKEY|ControlMask, XK_Return, mirrorlayout, {0} }, /* flextile, flip master and stack areas */ - #endif // FLEXTILE_DELUXE_LAYOUT -- { MODKEY, XK_space, setlayout, {0} }, -- { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, -+ //{ MODKEY, XK_space, setlayout, {0} }, -+ { MODKEY|ControlMask, XK_space, togglefloating, {0} }, - #if MAXIMIZE_PATCH - { MODKEY|ControlMask|ShiftMask, XK_h, togglehorizontalmax, {0} }, - { MODKEY|ControlMask|ShiftMask, XK_l, togglehorizontalmax, {0} }, -@@ -1279,8 +1279,8 @@ static const Key keys[] = { - { MODKEY|ControlMask, XK_numbersign, setborderpx, {.i = 0 } }, - #endif // SETBORDERPX_PATCH - #if CYCLELAYOUTS_PATCH -- { MODKEY|ShiftMask, XK_Tab, cyclelayout, {.i = -1 } }, -- { MODKEY, XK_Tab, cyclelayout, {.i = +1 } }, -+ { MODKEY|ShiftMask, XK_space, cyclelayout, {.i = -1 } }, -+ { MODKEY, XK_space, cyclelayout, {.i = +1 } }, - #endif // CYCLELAYOUTS_PATCH - #if MPDCONTROL_PATCH - { MODKEY, XK_F1, mpdchange, {.i = -1} }, --- -2.41.0 - - -From 545ba57b4707f760b0255034b8376f3625030a8a Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 21 Apr 2021 23:19:07 +0200 -Subject: [PATCH 05/33] I don't think this argument is required - ---- - config.def.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index d94a1da..705617f 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -870,8 +870,8 @@ static const char *dmenucmd[] = { - NULL - }; - static const char *termcmd[] = { "st", NULL }; --static const char *passmenucmd[] = { "passmenu", "-m", dmenumon, NULL }; --static const char *webmenucmd[] = { "webmenu", "-m", dmenumon, NULL }; -+static const char *passmenucmd[] = { "passmenu", NULL }; -+static const char *webmenucmd[] = { "webmenu", NULL }; - static const char *screenshot[] = { "screenshot", NULL }; - static const char *screenshots[] = { "screenshot", "-s", "-l", "-c", "0.75,0.5,1.0,0.1", NULL }; - --- -2.41.0 - - -From f901e799f405043a03599bcf0d5d67fba1744b82 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 21 Apr 2021 23:36:07 +0200 -Subject: [PATCH 06/33] decomment libraries used by enabled patches - ---- - config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config.mk b/config.mk -index 7db6cba..62add36 100644 ---- a/config.mk -+++ b/config.mk -@@ -39,14 +39,14 @@ XRENDER = -lXrender - #PANGOLIB = `pkg-config --libs xft pango pangoxft` - - # Uncomment for the ipc patch / IPC_PATCH --#YAJLLIBS = -lyajl --#YAJLINC = -I/usr/include/yajl -+YAJLLIBS = -lyajl -+YAJLINC = -I/usr/include/yajl - - # Uncomment this for the rounded corners patch / ROUNDED_CORNERS_PATCH - #XEXTLIB = -lXext - - # Uncomment this for the swallow patch / SWALLOW_PATCH --#XCBLIBS = -lX11-xcb -lxcb -lxcb-res -+XCBLIBS = -lX11-xcb -lxcb -lxcb-res - - # This is needed for the winicon and tagpreview patches / BAR_WINICON_PATCH / BAR_TAGPREVIEW_PATCH - #IMLIB2LIBS = -lImlib2 --- -2.41.0 - - -From 204c9419c75b7be43065b554c06da625af00bfd9 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Sat, 24 Apr 2021 15:02:45 +0200 -Subject: [PATCH 07/33] runsvdir on startup - ---- - config.def.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config.def.h b/config.def.h -index 705617f..daaa034 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -396,6 +396,7 @@ static const char *layoutmenu_cmd = "layoutmenu.sh"; - #if COOL_AUTOSTART_PATCH - static const char *const autostart[] = { - "dwmblocks", NULL, -+ "sh", "-c", "runsvdir $HOME/.sv", NULL, - NULL /* terminate */ - }; - #endif // COOL_AUTOSTART_PATCH --- -2.41.0 - - -From 2ac7030d87b54cedf97adfec81cb4105b874b35e Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 14 May 2021 19:58:33 +0200 -Subject: [PATCH 08/33] browser config - ---- - config.def.h | 3 ++- - patches.def.h | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index daaa034..771985a 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -493,6 +493,7 @@ static const Rule rules[] = { - RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1) - RULE(.wintype = WTYPE "SPLASH", .isfloating = 1) - RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1) -+ RULE(.role = "browser", .tags = 1 << 7, .switchtag = 1) - RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0) - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1) -@@ -1302,7 +1303,7 @@ static const Key keys[] = { - { MODKEY, XK_Left, spawn, SHCMD("backlight - 5") }, - { MODKEY, XK_Right, spawn, SHCMD("backlight + 5") }, - { MODKEY|ShiftMask, XK_d, spawn, SHCMD("discord") }, -- { MODKEY|ShiftMask, XK_f, spawn, SHCMD("firefox") }, -+ { MODKEY|ShiftMask, XK_f, spawn, SHCMD("browser") }, - { MODKEY, XK_a, spawn, SHCMD("anime") }, - { MODKEY, XK_v, spawn, SHCMD("st -e vid") }, - { MODKEY, XK_n, spawn, SHCMD("st -e newsboat") }, -diff --git a/patches.def.h b/patches.def.h -index 71a2ef8..1bc2e44 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -1329,7 +1329,7 @@ - * or Google-chrome "browser" vs "pop-up". - * https://github.com/bakkeby/patches/blob/master/dwm/dwm-windowrolerule-6.2.diff - */ --#define WINDOWROLERULE_PATCH 0 -+#define WINDOWROLERULE_PATCH 1 - - /* The winview patch allows switching the view to that of a given client from the all-window - * view (Mod-0) using a keyboard shortcut. --- -2.41.0 - - -From da86ba3b12cac731f4349a442408d14ce20b9047 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 14 May 2021 20:04:15 +0200 -Subject: [PATCH 09/33] discord window rules - ---- - config.def.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config.def.h b/config.def.h -index 771985a..4d41130 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -492,6 +492,8 @@ static const Rule rules[] = { - RULE(.wintype = WTYPE "UTILITY", .isfloating = 1) - RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1) - RULE(.wintype = WTYPE "SPLASH", .isfloating = 1) -+ RULE(.class = "discord", .tags = 1 << 0, .switchtag = 1, .monitor = 0) -+ RULE(.class = "lightcord", .tags = 1 << 0, .switchtag = 1, .monitor = 0) - RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1) - RULE(.role = "browser", .tags = 1 << 7, .switchtag = 1) - RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0) --- -2.41.0 - - -From 0b591fc8a1f745d7425fb66ea25ac8898da3b3e5 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 14 May 2021 20:08:27 +0200 -Subject: [PATCH 10/33] apply one rule patch - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 1bc2e44..9da9a57 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -860,7 +860,7 @@ - #define ON_EMPTY_KEYS_PATCH 0 - - /* Minor patch that prevents more than one rule being matched for a given client. */ --#define ONLY_ONE_RULE_MATCH_PATCH 0 -+#define ONLY_ONE_RULE_MATCH_PATCH 1 - - /* This patch makes it so dwm will only exit via quit() if no windows are open. - * This is to prevent you accidentally losing all your work. --- -2.41.0 - - -From 19fcf9e340695cb419a2d8f4cd4c21cccbb6bf8d Mon Sep 17 00:00:00 2001 -From: odrling -Date: Sun, 20 Jun 2021 18:13:17 +0200 -Subject: [PATCH 11/33] add agordejo rule - ---- - config.def.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config.def.h b/config.def.h -index 4d41130..4dea55d 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -497,6 +497,7 @@ static const Rule rules[] = { - RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1) - RULE(.role = "browser", .tags = 1 << 7, .switchtag = 1) - RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0) -+ RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0) - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1) - #if SCRATCHPADS_PATCH --- -2.41.0 - - -From 3fbf2164023e18bcbfcded0d16a8e241582b884d Mon Sep 17 00:00:00 2001 -From: odrling -Date: Sat, 25 Sep 2021 14:36:07 +0200 -Subject: [PATCH 12/33] start easyeffects on tag 9 - ---- - config.def.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config.def.h b/config.def.h -index 4dea55d..a5e048a 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -497,6 +497,7 @@ static const Rule rules[] = { - RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1) - RULE(.role = "browser", .tags = 1 << 7, .switchtag = 1) - RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0) -+ RULE(.class = "easyeffects", .tags = 1 << 8, .monitor = 0) - RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0) - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1) --- -2.41.0 - - -From 0be5b62fc9764f45bfa96de5b08b3def438fa0e8 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 25 Nov 2021 01:15:38 +0100 -Subject: [PATCH 13/33] set carla to tag 9 - ---- - config.def.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config.def.h b/config.def.h -index a5e048a..14fcda0 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -496,6 +496,7 @@ static const Rule rules[] = { - RULE(.class = "lightcord", .tags = 1 << 0, .switchtag = 1, .monitor = 0) - RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1) - RULE(.role = "browser", .tags = 1 << 7, .switchtag = 1) -+ RULE(.class = "Carla2", .tags = 1 << 8, .monitor = 0, .switchtag = 0) - RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0) - RULE(.class = "easyeffects", .tags = 1 << 8, .monitor = 0) - RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0) --- -2.41.0 - - -From 06ff8f5cb55d6e6b272277f4e0b860b2e7bafc88 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 22 Dec 2021 00:00:07 +0100 -Subject: [PATCH 14/33] set dmenucmd to rofi - ---- - config.def.h | 15 +-------------- - patches.def.h | 2 +- - 2 files changed, 2 insertions(+), 15 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 14fcda0..3ac75f7 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -158,7 +158,6 @@ static const char font[] = "sans 12"; - #else - static const char *fonts[] = { "sans:size=12" }; - #endif // BAR_PANGO_PATCH --static const char dmenufont[] = "sans:size=12"; - - static char c000000[] = "#000000"; // placeholder value - -@@ -862,19 +861,7 @@ static const char *xkb_layouts[] = { - static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ - #endif // NODMENU_PATCH - static const char *dmenucmd[] = { -- "dmenu_run", -- #if !NODMENU_PATCH -- "-m", dmenumon, -- #endif // NODMENU_PATCH -- "-fn", dmenufont, -- "-nb", normbgcolor, -- "-nf", normfgcolor, -- "-sb", selbgcolor, -- "-sf", selfgcolor, -- #if BAR_DMENUMATCHTOP_PATCH -- topbar ? NULL : "-b", -- #endif // BAR_DMENUMATCHTOP_PATCH -- NULL -+ "rofi", "-combi-modi", "window,run", "-show", "combi", NULL - }; - static const char *termcmd[] = { "st", NULL }; - static const char *passmenucmd[] = { "passmenu", NULL }; -diff --git a/patches.def.h b/patches.def.h -index 9da9a57..b3cd508 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -826,7 +826,7 @@ - * compilation error because two lines of code hardcode dmenu into dwm. - * https://dwm.suckless.org/patches/nodmenu/ - */ --#define NODMENU_PATCH 0 -+#define NODMENU_PATCH 1 - - /* This patch allows for toggleable client button bindings that have no modifiers. - * This can, for example, allow you to move or resize using the mouse alone without holding --- -2.41.0 - - -From e1ecf93b6a03995a888a33a32a5796ff5ce0b349 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 20 Apr 2022 13:30:35 +0200 -Subject: [PATCH 15/33] enable no border patch - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index b3cd508..f722a74 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -820,7 +820,7 @@ - /* Removes the border when there is only one window visible. - * https://dwm.suckless.org/patches/noborder/ - */ --#define NOBORDER_PATCH 0 -+#define NOBORDER_PATCH 1 - - /* Enable modifying or removing dmenu in config.def.h which resulted previously in a - * compilation error because two lines of code hardcode dmenu into dwm. --- -2.41.0 - - -From 9b43d8e26bf97f64154c1df0a7025946fc759dc9 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 20 Apr 2022 13:52:04 +0200 -Subject: [PATCH 16/33] force swallow from alacritty - ---- - config.def.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config.def.h b/config.def.h -index 3ac75f7..1fb36c8 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -501,6 +501,7 @@ static const Rule rules[] = { - RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0) - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1) -+ RULE(.class = "Alacritty", .isterminal = 1) - #if SCRATCHPADS_PATCH - RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1) - #endif // SCRATCHPADS_PATCH --- -2.41.0 - - -From d44627cd5a5f7498c32348d3d4d1f686420f59df Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 20 Apr 2022 18:18:33 +0200 -Subject: [PATCH 17/33] remove browser rules and add permanent - ---- - config.def.h | 12 ++++-------- - patches.def.h | 2 +- - 2 files changed, 5 insertions(+), 9 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 1fb36c8..0f75c61 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -491,14 +491,10 @@ static const Rule rules[] = { - RULE(.wintype = WTYPE "UTILITY", .isfloating = 1) - RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1) - RULE(.wintype = WTYPE "SPLASH", .isfloating = 1) -- RULE(.class = "discord", .tags = 1 << 0, .switchtag = 1, .monitor = 0) -- RULE(.class = "lightcord", .tags = 1 << 0, .switchtag = 1, .monitor = 0) -- RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1) -- RULE(.role = "browser", .tags = 1 << 7, .switchtag = 1) -- RULE(.class = "Carla2", .tags = 1 << 8, .monitor = 0, .switchtag = 0) -- RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0) -- RULE(.class = "easyeffects", .tags = 1 << 8, .monitor = 0) -- RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0) -+ RULE(.class = "Carla2", .tags = 1 << 8, .monitor = 0, .switchtag = 0, .ispermanent = 1) -+ RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) -+ RULE(.class = "easyeffects", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) -+ RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1) - RULE(.class = "Alacritty", .isterminal = 1) -diff --git a/patches.def.h b/patches.def.h -index f722a74..a8b02bd 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -711,7 +711,7 @@ - /* Adds rule option for clients to avoid accidental termination by killclient for sticky windows. - * https://dwm.suckless.org/patches/ispermanent/ - */ --#define ISPERMANENT_PATCH 0 -+#define ISPERMANENT_PATCH 1 - - /* This patch adds key modes (like in vim or emacs) where chains of keyboard shortcuts - * can be performed. --- -2.41.0 - - -From 591dde9fceea670cb6de35a8084da6d722560c22 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 20 Apr 2022 19:13:43 +0200 -Subject: [PATCH 18/33] sendmon: keeptag patch - ---- - dwm.c | 2 ++ - patches.def.h | 4 ++++ - 2 files changed, 6 insertions(+) - -diff --git a/dwm.c b/dwm.c -index 60b25ea..3cd0e28 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -3306,11 +3306,13 @@ sendmon(Client *c, Monitor *m) - #if SCRATCHPADS_PATCH && !RENAMED_SCRATCHPADS_PATCH - if (!(c->tags & SPTAGMASK)) - #endif // SCRATCHPADS_PATCH -+ #if !SENDMON_KEEPTAGS - #if EMPTYVIEW_PATCH - c->tags = (m->tagset[m->seltags] ? m->tagset[m->seltags] : 1); - #else - c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ - #endif // EMPTYVIEW_PATCH -+ #endif // SENDMON_KEEPTAGS - #if ATTACHABOVE_PATCH || ATTACHASIDE_PATCH || ATTACHBELOW_PATCH || ATTACHBOTTOM_PATCH - attachx(c); - #else -diff --git a/patches.def.h b/patches.def.h -index a8b02bd..1b509d2 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -1021,6 +1021,10 @@ - */ - #define SENDMON_KEEPFOCUS_PATCH 0 - -+/* This patch allow clients to keep their current tags when sent to another monitor -+ */ -+#define SENDMON_KEEPTAGS 1 -+ - /* This patch allows border pixels to be changed during runtime. - * https://dwm.suckless.org/patches/setborderpx/ - */ --- -2.41.0 - - -From 2b11bc25a6c1f04d52d61d8036faeee4b5577a4e Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 20 Apr 2022 19:31:59 +0200 -Subject: [PATCH 19/33] taglabels - ---- - patches.def.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/patches.def.h b/patches.def.h -index 1b509d2..080a2e3 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -170,12 +170,12 @@ - #define BAR_SYSTRAY_PATCH 0 - - /* Show tag symbols in the bar. */ --#define BAR_TAGS_PATCH 1 -+#define BAR_TAGS_PATCH 0 - - /* Show tag symbols + class of master window in the bar. - * https://dwm.suckless.org/patches/taglabels/ - */ --#define BAR_TAGLABELS_PATCH 0 -+#define BAR_TAGLABELS_PATCH 1 - - /* This patch underlines the selected tag, or optionally all tags. - * https://dwm.suckless.org/patches/underlinetags/ --- -2.41.0 - - -From 5032dafe5d36bd4f0ca75a489d6e6cf219f2ee5e Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 20 Apr 2022 20:26:55 +0200 -Subject: [PATCH 20/33] better taglabels - ---- - config.def.h | 8 +++++--- - dwm.c | 7 +++++++ - patch/bar_taglabels.c | 10 ++++------ - 3 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 0f75c61..2e3e330 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -95,8 +95,8 @@ static const unsigned int systrayspacing = 2; /* systray spacing */ - static const int showsystray = 1; /* 0 means no systray */ - #endif // BAR_SYSTRAY_PATCH - #if BAR_TAGLABELS_PATCH --static const char ptagf[] = "[%s %s]"; /* format of a tag label */ --static const char etagf[] = "[%s]"; /* format of an empty tag */ -+static const char ptagf[] = "%s: %s"; /* format of a tag label */ -+static const char etagf[] = "%s"; /* format of an empty tag */ - static const int lcaselbl = 0; /* 1 means make tag label lowercase */ - #endif // BAR_TAGLABELS_PATCH - #if BAR_UNDERLINETAGS_PATCH -@@ -497,7 +497,9 @@ static const Rule rules[] = { - RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1) -- RULE(.class = "Alacritty", .isterminal = 1) -+ RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120") -+ RULE(.class = "Chromium-browser-chromium", .label = "\uf268") -+ RULE(.class = "firefox", .label = "\uf269") - #if SCRATCHPADS_PATCH - RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1) - #endif // SCRATCHPADS_PATCH -diff --git a/dwm.c b/dwm.c -index 3cd0e28..baa0481 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -344,6 +344,7 @@ struct XkbInfo { - typedef struct Client Client; - struct Client { - char name[256]; -+ char label[48]; - float mina, maxa; - #if CFACTS_PATCH - float cfact; -@@ -534,6 +535,7 @@ typedef struct { - #endif // WINDOWROLERULE_PATCH - const char *instance; - const char *title; -+ const char *label; - const char *wintype; - unsigned int tags; - #if SWITCHTAG_PATCH -@@ -880,6 +882,9 @@ applyrules(Client *c) - class = ch.res_class ? ch.res_class : broken; - instance = ch.res_name ? ch.res_name : broken; - wintype = getatomprop(c, netatom[NetWMWindowType], XA_ATOM); -+ -+ snprintf(c->label, 48, "%s", class); -+ - #if WINDOWROLERULE_PATCH - gettextprop(c->win, wmatom[WMWindowRole], role, sizeof(role)); - #endif // WINDOWROLERULE_PATCH -@@ -899,6 +904,8 @@ applyrules(Client *c) - && (!r->instance || strstr(instance, r->instance)) - && (!r->wintype || wintype == XInternAtom(dpy, r->wintype, False))) - { -+ if (r->label) snprintf(c->label, 48, "%s", r->label); -+ - #if CENTER_PATCH - c->iscentered = r->iscentered; - #endif // CENTER_PATCH -diff --git a/patch/bar_taglabels.c b/patch/bar_taglabels.c -index 9e6d441..f00a7be 100644 ---- a/patch/bar_taglabels.c -+++ b/patch/bar_taglabels.c -@@ -17,17 +17,15 @@ width_taglabels(Bar *bar, BarArg *a) - continue; - #endif // BAR_HIDEVACANTTAGS_PATCH - icon = tagicon(m, i); -- XClassHint ch = { NULL, NULL }; -+ char *label = NULL; - for (c = m->clients; c; c = c->next) { - if (c->tags & (1 << i)) { -- XGetClassHint(dpy, c->win, &ch); -+ label = c->label; - break; - } - } -- if (ch.res_class) { -- if (lcaselbl) -- ch.res_class[0] = tolower(ch.res_class[0]); -- snprintf(m->taglabel[i], 64, ptagf, icon, ch.res_class); -+ if (label) { -+ snprintf(m->taglabel[i], 64, ptagf, icon, label); - } else - snprintf(m->taglabel[i], 64, etagf, icon); - --- -2.41.0 - - -From 03118bebb57bd6cc6cd9d1110f4ed34b56d57a24 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 21 Apr 2022 01:55:12 +0200 -Subject: [PATCH 21/33] no swallow syncplay mpv - ---- - config.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.def.h b/config.def.h -index 2e3e330..ba812f9 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -496,7 +496,7 @@ static const Rule rules[] = { - RULE(.class = "easyeffects", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) - RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) -- RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1) -+ RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1, .noswallow = 1) - RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120") - RULE(.class = "Chromium-browser-chromium", .label = "\uf268") - RULE(.class = "firefox", .label = "\uf269") --- -2.41.0 - - -From a105afcd7b834a6e824c81b4e23113190b410ddf Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 21 Apr 2022 13:39:36 +0200 -Subject: [PATCH 22/33] add thunderbird and ardour labels - ---- - config.def.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/config.def.h b/config.def.h -index ba812f9..d15a4db 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -492,7 +492,7 @@ static const Rule rules[] = { - RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1) - RULE(.wintype = WTYPE "SPLASH", .isfloating = 1) - RULE(.class = "Carla2", .tags = 1 << 8, .monitor = 0, .switchtag = 0, .ispermanent = 1) -- RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) -+ RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0, .ispermanent = 1, .label = "\uf025") - RULE(.class = "easyeffects", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) - RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) -@@ -500,6 +500,7 @@ static const Rule rules[] = { - RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120") - RULE(.class = "Chromium-browser-chromium", .label = "\uf268") - RULE(.class = "firefox", .label = "\uf269") -+ RULE(.class = "Thunderbird", .label = "\uf01c") - #if SCRATCHPADS_PATCH - RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1) - #endif // SCRATCHPADS_PATCH --- -2.41.0 - - -From 3240907f0977144ed6505de75ed33655feb58149 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 5 May 2022 17:29:55 +0200 -Subject: [PATCH 23/33] use rofi run - ---- - config.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.def.h b/config.def.h -index d15a4db..5eeab9a 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -861,7 +861,7 @@ static const char *xkb_layouts[] = { - static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ - #endif // NODMENU_PATCH - static const char *dmenucmd[] = { -- "rofi", "-combi-modi", "window,run", "-show", "combi", NULL -+ "rofi", "-show", "run", NULL - }; - static const char *termcmd[] = { "st", NULL }; - static const char *passmenucmd[] = { "passmenu", NULL }; --- -2.41.0 - - -From 852036b5cc28891cee5f282173c84c569ae297e2 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 26 May 2022 22:32:57 +0200 -Subject: [PATCH 24/33] add st as terminal - ---- - config.def.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config.def.h b/config.def.h -index 5eeab9a..46cf6c4 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -498,6 +498,7 @@ static const Rule rules[] = { - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1, .noswallow = 1) - RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120") -+ RULE(.class = "st-256color", .isterminal = 1, .label = "\uf120") - RULE(.class = "Chromium-browser-chromium", .label = "\uf268") - RULE(.class = "firefox", .label = "\uf269") - RULE(.class = "Thunderbird", .label = "\uf01c") --- -2.41.0 - - -From fed1fd27b8ef2c5dda8d87f3048eb1caf668461d Mon Sep 17 00:00:00 2001 -From: odrling -Date: Mon, 30 May 2022 01:53:40 +0200 -Subject: [PATCH 25/33] add discord icon ig - ---- - config.def.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config.def.h b/config.def.h -index 46cf6c4..f8fa04b 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -499,6 +499,7 @@ static const Rule rules[] = { - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1, .noswallow = 1) - RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120") - RULE(.class = "st-256color", .isterminal = 1, .label = "\uf120") -+ RULE(.class = "discord", .label = "\uf2ee") - RULE(.class = "Chromium-browser-chromium", .label = "\uf268") - RULE(.class = "firefox", .label = "\uf269") - RULE(.class = "Thunderbird", .label = "\uf01c") --- -2.41.0 - - -From ec27dab9b7b227144f5a7254376476d84d6aaa2a Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 2 Jun 2022 16:00:25 +0200 -Subject: [PATCH 26/33] set correct fontawesome discord character - ---- - config.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.def.h b/config.def.h -index f8fa04b..fc709aa 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -499,7 +499,7 @@ static const Rule rules[] = { - RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1, .noswallow = 1) - RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120") - RULE(.class = "st-256color", .isterminal = 1, .label = "\uf120") -- RULE(.class = "discord", .label = "\uf2ee") -+ RULE(.class = "discord", .label = "\uf392") - RULE(.class = "Chromium-browser-chromium", .label = "\uf268") - RULE(.class = "firefox", .label = "\uf269") - RULE(.class = "Thunderbird", .label = "\uf01c") --- -2.41.0 - - -From 66c146fb3b3dda568836e571720ee7db193d42af Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 28 Jul 2022 14:55:49 +0200 -Subject: [PATCH 27/33] set pid to rofi - ---- - config.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.def.h b/config.def.h -index fc709aa..81ed9a3 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -863,7 +863,7 @@ static const char *xkb_layouts[] = { - static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ - #endif // NODMENU_PATCH - static const char *dmenucmd[] = { -- "rofi", "-show", "run", NULL -+ "rofi", "-pid", "/tmp/rofi", "-show", "run", NULL - }; - static const char *termcmd[] = { "st", NULL }; - static const char *passmenucmd[] = { "passmenu", NULL }; --- -2.41.0 - - -From 0b35b663fe896c169f5f891d4589c041809f8f5b Mon Sep 17 00:00:00 2001 -From: odrling -Date: Tue, 11 Oct 2022 17:52:33 +0200 -Subject: [PATCH 28/33] add windowmenu - ---- - config.def.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/config.def.h b/config.def.h -index 81ed9a3..a9551f7 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -865,6 +865,9 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() - static const char *dmenucmd[] = { - "rofi", "-pid", "/tmp/rofi", "-show", "run", NULL - }; -+static const char *windowmenu[] = { -+ "rofi", "-modi", "window", "-show", "window", NULL -+}; - static const char *termcmd[] = { "st", NULL }; - static const char *passmenucmd[] = { "passmenu", NULL }; - static const char *webmenucmd[] = { "webmenu", NULL }; -@@ -902,6 +905,7 @@ static const Key keys[] = { - #endif // KEYMODES_PATCH - { MODKEY, XK_o, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, -+ { MODKEY, XK_w, spawn, {.v = windowmenu} }, - #if RIODRAW_PATCH - { MODKEY|ControlMask, XK_p, riospawnsync, {.v = dmenucmd } }, - { MODKEY|ControlMask, XK_Return, riospawn, {.v = termcmd } }, --- -2.41.0 - - -From a58a90a6cfdb129edc81c80ca881118616823ece Mon Sep 17 00:00:00 2001 -From: odrling -Date: Mon, 21 Nov 2022 10:34:44 +0100 -Subject: [PATCH 29/33] add connect keybinding - ---- - config.def.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index a9551f7..4e039fb 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -863,7 +863,7 @@ static const char *xkb_layouts[] = { - static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ - #endif // NODMENU_PATCH - static const char *dmenucmd[] = { -- "rofi", "-pid", "/tmp/rofi", "-show", "run", NULL -+ "rofi", "-pid", "/tmp/rofi", "-show", "run", NULL - }; - static const char *windowmenu[] = { - "rofi", "-modi", "window", "-show", "window", NULL -@@ -873,6 +873,7 @@ static const char *passmenucmd[] = { "passmenu", NULL }; - static const char *webmenucmd[] = { "webmenu", NULL }; - static const char *screenshot[] = { "screenshot", NULL }; - static const char *screenshots[] = { "screenshot", "-s", "-l", "-c", "0.75,0.5,1.0,0.1", NULL }; -+static const char *connectcmd[] = { "connect", NULL }; - - #if BAR_STATUSCMD_PATCH - #if BAR_DWMBLOCKS_PATCH -@@ -905,7 +906,8 @@ static const Key keys[] = { - #endif // KEYMODES_PATCH - { MODKEY, XK_o, spawn, {.v = dmenucmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, -- { MODKEY, XK_w, spawn, {.v = windowmenu} }, -+ { MODKEY, XK_w, spawn, {.v = windowmenu } }, -+ { MODKEY, XK_c, spawn, {.v = connectcmd } }, - #if RIODRAW_PATCH - { MODKEY|ControlMask, XK_p, riospawnsync, {.v = dmenucmd } }, - { MODKEY|ControlMask, XK_Return, riospawn, {.v = termcmd } }, --- -2.41.0 - - -From 376249965d3c500a6b63615c7946d601fe0c2bb9 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Mon, 21 Nov 2022 11:01:22 +0100 -Subject: [PATCH 30/33] add taskmaster binding - ---- - config.def.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config.def.h b/config.def.h -index 4e039fb..4ab4dec 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -874,6 +874,7 @@ static const char *webmenucmd[] = { "webmenu", NULL }; - static const char *screenshot[] = { "screenshot", NULL }; - static const char *screenshots[] = { "screenshot", "-s", "-l", "-c", "0.75,0.5,1.0,0.1", NULL }; - static const char *connectcmd[] = { "connect", NULL }; -+static const char *taskmaster[] = { "taskmaster", NULL }; - - #if BAR_STATUSCMD_PATCH - #if BAR_DWMBLOCKS_PATCH -@@ -908,6 +909,7 @@ static const Key keys[] = { - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_w, spawn, {.v = windowmenu } }, - { MODKEY, XK_c, spawn, {.v = connectcmd } }, -+ { MODKEY, XK_t, spawn, {.v = taskmaster } }, - #if RIODRAW_PATCH - { MODKEY|ControlMask, XK_p, riospawnsync, {.v = dmenucmd } }, - { MODKEY|ControlMask, XK_Return, riospawn, {.v = termcmd } }, --- -2.41.0 - - -From 566da5d4590dc206471493f2ec7866d3c38e88e2 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 30 Nov 2022 12:30:58 +0100 -Subject: [PATCH 31/33] change taskmaster keymap - ---- - config.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.def.h b/config.def.h -index 4ab4dec..8c0d634 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -909,7 +909,7 @@ static const Key keys[] = { - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_w, spawn, {.v = windowmenu } }, - { MODKEY, XK_c, spawn, {.v = connectcmd } }, -- { MODKEY, XK_t, spawn, {.v = taskmaster } }, -+ { MODKEY|ShiftMask, XK_t, spawn, {.v = taskmaster } }, - #if RIODRAW_PATCH - { MODKEY|ControlMask, XK_p, riospawnsync, {.v = dmenucmd } }, - { MODKEY|ControlMask, XK_Return, riospawn, {.v = termcmd } }, --- -2.41.0 - - -From 1d44062405f4711eccd60ec67d9ccd5b9820c26b Mon Sep 17 00:00:00 2001 -From: odrling -Date: Wed, 3 May 2023 01:50:59 +0200 -Subject: [PATCH 32/33] disable IPC patch - ---- - config.mk | 4 ++-- - patches.def.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config.mk b/config.mk -index 62add36..e823d91 100644 ---- a/config.mk -+++ b/config.mk -@@ -39,8 +39,8 @@ XRENDER = -lXrender - #PANGOLIB = `pkg-config --libs xft pango pangoxft` - - # Uncomment for the ipc patch / IPC_PATCH --YAJLLIBS = -lyajl --YAJLINC = -I/usr/include/yajl -+#YAJLLIBS = -lyajl -+#YAJLINC = -I/usr/include/yajl - - # Uncomment this for the rounded corners patch / ROUNDED_CORNERS_PATCH - #XEXTLIB = -lXext -diff --git a/patches.def.h b/patches.def.h -index 080a2e3..8dbad07 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -706,7 +706,7 @@ - * https://github.com/mihirlad55/dwm-ipc - * https://dwm.suckless.org/patches/ipc/ - */ --#define IPC_PATCH 1 -+#define IPC_PATCH 0 - - /* Adds rule option for clients to avoid accidental termination by killclient for sticky windows. - * https://dwm.suckless.org/patches/ispermanent/ --- -2.41.0 - - -From 319bf66d719824e1aa1ed7b8e5e90fa030e7d392 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Tue, 6 Jun 2023 14:21:16 +0200 -Subject: [PATCH 33/33] add ardour_ardour class ig - ---- - config.def.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config.def.h b/config.def.h -index 8c0d634..3b26eb1 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -493,6 +493,7 @@ static const Rule rules[] = { - RULE(.wintype = WTYPE "SPLASH", .isfloating = 1) - RULE(.class = "Carla2", .tags = 1 << 8, .monitor = 0, .switchtag = 0, .ispermanent = 1) - RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0, .ispermanent = 1, .label = "\uf025") -+ RULE(.class = "ardour_ardour", .tags = 1 << 8, .monitor = 0, .ispermanent = 1, .label = "\uf025") - RULE(.class = "easyeffects", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) - RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0, .ispermanent = 1) - RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0) --- -2.41.0 - diff --git a/x11-wm/dwm/metadata.xml b/x11-wm/dwm/metadata.xml deleted file mode 100644 index a7afd16..0000000 --- a/x11-wm/dwm/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - florianbadie@odrling.xyz - - -dwm is a dynamic window manager for X. It manages windows in tiling and -floating modes. Either mode can be applied dynamically, optimizing the -environment for the application in use and the task performed. - -