BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delay window managing 

Create a "critical section" in draw_callback by grabbing the X server.
Delay the managing of newly created windows until we enter the cricial section.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-04-19 20:53:52 +01:00
parent 927cdd8652
commit 58944f36ce
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/compton.c
View File

@ -91,6 +91,11 @@ void set_root_flags(session_t *ps, uint64_t flags) {
ps->root_flags |= flags; ps->root_flags |= flags;
} }
static inline void quit_compton(session_t *ps) {
ps->quit = true;
ev_break(ps->loop, EVBREAK_ALL);
}
/** /**
* Free Xinerama screen info. * Free Xinerama screen info.
* *
@ -1365,6 +1370,14 @@ static void handle_queued_x_events(EV_P_ ev_prepare *w, int revents) {
} }
} }
static void handle_new_windows(session_t *ps) {
list_foreach_safe(struct win, w, &ps->window_stack, stack_neighbour) {
if (w->is_new) {
fill_win(ps, w);
}
}
}
/** /**
* Unredirection timeout callback. * Unredirection timeout callback.
*/ */
@ -1380,6 +1393,26 @@ static void fade_timer_callback(EV_P_ ev_timer *w, int revents) {
} }
static void _draw_callback(EV_P_ session_t *ps, int revents) { static void _draw_callback(EV_P_ session_t *ps, int revents) {
auto e = xcb_request_check(ps->c, xcb_grab_server_checked(ps->c));
if (e) {
log_fatal("failed to grab x server");
x_print_error(e->full_sequence, e->major_code, e->minor_code, e->error_code);
return quit_compton(ps);
}
// Catching up with X server
handle_queued_x_events(ps->loop, &ps->event_check, 0);
// Call fill_win on new windows
handle_new_windows(ps);
e = xcb_request_check(ps->c, xcb_ungrab_server_checked(ps->c));
if (e) {
log_fatal("failed to ungrab x server");
x_print_error(e->full_sequence, e->major_code, e->minor_code, e->error_code);
return quit_compton(ps);
}
if (ps->o.benchmark) { if (ps->o.benchmark) {
if (ps->o.benchmark_wid) { if (ps->o.benchmark_wid) {
auto w = find_managed_win(ps, ps->o.benchmark_wid); auto w = find_managed_win(ps, ps->o.benchmark_wid);

5
src/event.c
View File

@ -170,7 +170,7 @@ static inline void ev_focus_out(session_t *ps, xcb_focus_out_event_t *ev) {
static inline void ev_create_notify(session_t *ps, xcb_create_notify_event_t *ev) { static inline void ev_create_notify(session_t *ps, xcb_create_notify_event_t *ev) {
assert(ev->parent == ps->root); assert(ev->parent == ps->root);
// TODO delay fill_win // TODO delay fill_win
fill_win(ps, add_win_top(ps, ev->window)); add_win_top(ps, ev->window);
} }
static inline void ev_configure_notify(session_t *ps, xcb_configure_notify_event_t *ev) { static inline void ev_configure_notify(session_t *ps, xcb_configure_notify_event_t *ev) {
@ -216,8 +216,7 @@ static inline void ev_reparent_notify(session_t *ps, xcb_reparent_notify_event_t
if (ev->parent == ps->root) { if (ev->parent == ps->root) {
// new window // new window
// TODO delay fill_win add_win_top(ps, ev->window);
fill_win(ps, add_win_top(ps, ev->window));
} else { } else {
// otherwise, find and destroy the window first // otherwise, find and destroy the window first
auto w = find_win(ps, ev->window); auto w = find_win(ps, ev->window);