commit 10416e270bc258886dfe403198802fb455df35b7
parent 8293749cfb08c3151928fa16a208c9a7da6d3281
Author: Ingo Bürk <admin@airblader.de>
Date: Tue, 20 Jun 2017 09:53:42 +0200
Revert "Fix covering of composited notifications (#96)" (#133)
This reverts commit 80d4452ec680bcb0e57418f69d44d88ded82047c.
fixes #130
Diffstat:
4 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,6 @@ addons:
- libev-dev
- libxcb-xinerama0-dev
- libxcb-xkb-dev
- - libxcb-composite0-dev
before_install:
- "echo 'APT::Default-Release \"trusty\";' | sudo tee /etc/apt/apt.conf.d/default-release"
- "echo 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' | sudo tee /etc/apt/sources.list.d/wily.list"
diff --git a/Makefile b/Makefile
@@ -15,8 +15,9 @@ CFLAGS += -std=c99
CFLAGS += -pipe
CFLAGS += -Wall
CPPFLAGS += -D_GNU_SOURCE
-CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
-LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+LIBS += -lpam
LIBS += -lev
LIBS += -lm
diff --git a/README.md b/README.md
@@ -25,7 +25,6 @@ Requirements
- libxcb-util
- libpam-dev
- libcairo-dev
-- libxcb-composite0
- libxcb-xinerama
- libev
- libx11-dev
diff --git a/xcb.c b/xcb.c
@@ -11,7 +11,6 @@
#include <xcb/xcb_image.h>
#include <xcb/xcb_atom.h>
#include <xcb/xcb_aux.h>
-#include <xcb/composite.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
@@ -107,29 +106,6 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c
uint32_t mask = 0;
uint32_t values[3];
xcb_window_t win = xcb_generate_id(conn);
- xcb_window_t parent_win = scr->root;
-
- /* Check whether the composite extension is available */
- const xcb_query_extension_reply_t *extension_query = NULL;
- xcb_generic_error_t *error = NULL;
- xcb_composite_get_overlay_window_cookie_t cookie;
- xcb_composite_get_overlay_window_reply_t *composite_reply = NULL;
-
- extension_query = xcb_get_extension_data(conn, &xcb_composite_id);
- if (extension_query && extension_query->present) {
- /* When composition is used, we need to use the composite overlay
- * window instead of the normal root window to be able to cover
- * composited windows */
- cookie = xcb_composite_get_overlay_window(conn, scr->root);
- composite_reply = xcb_composite_get_overlay_window_reply(conn, cookie, &error);
-
- if (!error && composite_reply) {
- parent_win = composite_reply->overlay_win;
- }
-
- free(composite_reply);
- free(error);
- }
if (pixmap == XCB_NONE) {
mask |= XCB_CW_BACK_PIXEL;
@@ -151,8 +127,8 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c
xcb_create_window(conn,
XCB_COPY_FROM_PARENT,
- win, /* the window id */
- parent_win,
+ win, /* the window id */
+ scr->root, /* parent == root */
0, 0,
scr->width_in_pixels,
scr->height_in_pixels, /* dimensions */
