From a3e2e51ac91351a6e406e685026a5ed212a9d687 Mon Sep 17 00:00:00 2001 From: patrick96 Date: Sat, 1 Jun 2019 19:28:23 +0200 Subject: [PATCH] build: remove xdamage extension Unused Ref: #1730 --- cmake/02-opts.cmake | 1 - cmake/03-libs.cmake | 1 - cmake/05-summary.cmake | 1 - include/CMakeLists.txt | 3 --- include/settings.hpp.cmake | 4 +--- include/x11/extensions/all.hpp | 3 --- include/x11/extensions/damage.hpp | 23 ----------------------- include/x11/extensions/fwd.hpp | 5 ----- lib/CMakeLists.txt | 3 --- src/CMakeLists.txt | 3 --- src/x11/connection.cpp | 3 --- src/x11/extensions/damage.cpp | 20 -------------------- 12 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 include/x11/extensions/damage.hpp delete mode 100644 src/x11/extensions/damage.cpp diff --git a/cmake/02-opts.cmake b/cmake/02-opts.cmake index ecac5b27..c36c92b0 100644 --- a/cmake/02-opts.cmake +++ b/cmake/02-opts.cmake @@ -44,7 +44,6 @@ option(ENABLE_PULSEAUDIO "Enable PulseAudio support" ON) option(WITH_XRANDR "xcb-randr support" ON) option(WITH_XRANDR_MONITORS "xcb-randr monitor support" ON) -option(WITH_XDAMAGE "xcb-damage support" OFF) option(WITH_XCOMPOSITE "xcb-composite support" ON) option(WITH_XKB "xcb-xkb support" ON) option(WITH_XRM "xcb-xrm support" ON) diff --git a/cmake/03-libs.cmake b/cmake/03-libs.cmake index d23d71cb..1d620e90 100644 --- a/cmake/03-libs.cmake +++ b/cmake/03-libs.cmake @@ -18,7 +18,6 @@ endif() querylib(ENABLE_PULSEAUDIO "pkg-config" libpulse libs dirs) querylib(WITH_XCOMPOSITE "pkg-config" xcb-composite libs dirs) -querylib(WITH_XDAMAGE "pkg-config" xcb-damage libs dirs) querylib(WITH_XKB "pkg-config" xcb-xkb libs dirs) querylib(WITH_XRANDR "pkg-config" xcb-randr libs dirs) querylib(WITH_XRANDR_MONITORS "pkg-config" "xcb-randr>=1.12" libs dirs) diff --git a/cmake/05-summary.cmake b/cmake/05-summary.cmake index 86484484..cbba27e2 100644 --- a/cmake/05-summary.cmake +++ b/cmake/05-summary.cmake @@ -25,7 +25,6 @@ colored_option(" xkeyboard" WITH_XKB) message(STATUS " X extensions:") colored_option(" xcb-randr" WITH_XRANDR) colored_option(" xcb-randr (monitor support)" WITH_XRANDR_MONITORS) -colored_option(" xcb-damage" WITH_XDAMAGE) colored_option(" xcb-composite" WITH_XCOMPOSITE) colored_option(" xcb-xkb" WITH_XKB) colored_option(" xcb-xrm" WITH_XRM) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 71fff412..cde79735 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -7,9 +7,6 @@ list(APPEND dirs ${CMAKE_CURRENT_LIST_DIR}) if(WITH_XRANDR) list(APPEND XPP_EXTENSION_LIST xpp::randr::extension) endif() -if(WITH_XDAMAGE) - list(APPEND XPP_EXTENSION_LIST xpp::damage::extension) -endif() if(WITH_XCOMPOSITE) list(APPEND XPP_EXTENSION_LIST xpp::composite::extension) endif() diff --git a/include/settings.hpp.cmake b/include/settings.hpp.cmake index c4612e0e..2aece68d 100644 --- a/include/settings.hpp.cmake +++ b/include/settings.hpp.cmake @@ -17,7 +17,6 @@ #cmakedefine01 ENABLE_PULSEAUDIO #cmakedefine01 WITH_XRANDR -#cmakedefine01 WITH_XDAMAGE #cmakedefine01 WITH_XCOMPOSITE #cmakedefine01 WITH_XKB #cmakedefine01 WITH_XRM @@ -97,10 +96,9 @@ const auto print_build_info = [](bool extended = false) { (ENABLE_XKEYBOARD ? '+' : '-')); if (extended) { printf("\n"); - printf("X extensions: %crandr (%cmonitors) %cdamage %ccomposite %cxkb %cxrm %cxcursor\n", + printf("X extensions: %crandr (%cmonitors) %ccomposite %cxkb %cxrm %cxcursor\n", (WITH_XRANDR ? '+' : '-'), (WITH_XRANDR_MONITORS ? '+' : '-'), - (WITH_XDAMAGE ? '+' : '-'), (WITH_XCOMPOSITE ? '+' : '-'), (WITH_XKB ? '+' : '-'), (WITH_XRM ? '+' : '-'), diff --git a/include/x11/extensions/all.hpp b/include/x11/extensions/all.hpp index 7251c900..501c07e1 100644 --- a/include/x11/extensions/all.hpp +++ b/include/x11/extensions/all.hpp @@ -2,9 +2,6 @@ #include "settings.hpp" -#if WITH_XDAMAGE -#include "x11/extensions/damage.hpp" -#endif #if WITH_XRANDR #include "x11/extensions/randr.hpp" #endif diff --git a/include/x11/extensions/damage.hpp b/include/x11/extensions/damage.hpp deleted file mode 100644 index 0041b474..00000000 --- a/include/x11/extensions/damage.hpp +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "settings.hpp" - -#if not WITH_XDAMAGE -#error "X Damage extension is disabled..." -#endif - -#include -#include - -#include "common.hpp" - -POLYBAR_NS - -// fwd -class connection; - -namespace damage_util { - void query_extension(connection& conn); -} - -POLYBAR_NS_END diff --git a/include/x11/extensions/fwd.hpp b/include/x11/extensions/fwd.hpp index c3e553a7..71b025f5 100644 --- a/include/x11/extensions/fwd.hpp +++ b/include/x11/extensions/fwd.hpp @@ -3,11 +3,6 @@ #include "settings.hpp" namespace xpp { -#if WITH_XDAMAGE - namespace damage { - class extension; - } -#endif #if WITH_XRANDR namespace randr { class extension; diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index baecce25..b74af3bc 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -17,9 +17,6 @@ set(XCB_PROTOS xproto) if(WITH_XRANDR) list(APPEND XCB_PROTOS randr) endif() -if(WITH_XDAMAGE) - list(APPEND XCB_PROTOS damage) -endif() if(WITH_XCOMPOSITE) list(APPEND XCB_PROTOS composite) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86d091dd..5299e3ec 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,9 +42,6 @@ endif() if(NOT WITH_XRANDR) list(REMOVE_ITEM files x11/extensions/randr.cpp) endif() -if(NOT WITH_XDAMAGE) - list(REMOVE_ITEM files x11/extensions/damage.cpp) -endif() if(NOT WITH_XCOMPOSITE) list(REMOVE_ITEM files x11/extensions/composite.cpp) endif() diff --git a/src/x11/connection.cpp b/src/x11/connection.cpp index 9b008f1f..cdb26d69 100644 --- a/src/x11/connection.cpp +++ b/src/x11/connection.cpp @@ -38,9 +38,6 @@ connection::connection(xcb_connection_t* c, int default_screen) : base_type(c, d // }}} // Query for X extensions {{{ -#if WITH_XDAMAGE - damage_util::query_extension(*this); -#endif #if WITH_XRANDR randr_util::query_extension(*this); #endif diff --git a/src/x11/extensions/damage.cpp b/src/x11/extensions/damage.cpp deleted file mode 100644 index ab93d25d..00000000 --- a/src/x11/extensions/damage.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "x11/extensions/damage.hpp" -#include "errors.hpp" -#include "x11/connection.hpp" - -POLYBAR_NS - -namespace damage_util { - /** - * Query for the XDAMAGE extension - */ - void query_extension(connection& conn) { - conn.damage().query_version(XCB_DAMAGE_MAJOR_VERSION, XCB_DAMAGE_MINOR_VERSION); - - if (!conn.extension()->present) { - throw application_error("Missing X extension: Damage"); - } - } -} - -POLYBAR_NS_END