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

Refactoring 

* Move code around
* Remove unneeded forward declaration
* Rename win->damaged to win->ever_damaged, to be less confusing
* Expose debug functions even when DEBUG is not enabled. Compiler
  would remove the dead code for us anyway.
* Some code cleanup
This commit is contained in:
Yuxuan Shui 2018-09-09 02:29:45 +01:00
parent 2adfdfa897
commit 72231098d1
5 changed files with 116 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/common.h
View File

@ -1050,7 +1050,7 @@ struct win {
/// Window painting mode. /// Window painting mode.
winmode_t mode; winmode_t mode;
/// Whether the window has been damaged at least once. /// Whether the window has been damaged at least once.
bool damaged; bool ever_damaged;
#ifdef CONFIG_XSYNC #ifdef CONFIG_XSYNC
/// X Sync fence of drawable. /// X Sync fence of drawable.
XSyncFence fence; XSyncFence fence;
@ -1494,7 +1494,7 @@ print_timestamp(session_t *ps) {
if (gettimeofday(&tm, NULL)) return; if (gettimeofday(&tm, NULL)) return;
timeval_subtract(&diff, &tm, &ps->time_start); timeval_subtract(&diff, &tm, &ps->time_start);
printf("[ %5ld.%02ld ] ", diff.tv_sec, diff.tv_usec / 10000); fprintf(stderr, "[ %5ld.%02ld ] ", diff.tv_sec, diff.tv_usec / 10000);
} }
/** /**
@ -1741,7 +1741,7 @@ timeout_reset(session_t *ps, timeout_t *ptmout);
/** /**
* Add a file descriptor to a select() fd_set. * Add a file descriptor to a select() fd_set.
*/ */
static inline bool static inline void
fds_insert_select(fd_set **ppfds, int fd) { fds_insert_select(fd_set **ppfds, int fd) {
assert(fd <= FD_SETSIZE); assert(fd <= FD_SETSIZE);
@ -1751,32 +1751,26 @@ fds_insert_select(fd_set **ppfds, int fd) {
} }
else { else {
fprintf(stderr, "Failed to allocate memory for select() fdset.\n"); fprintf(stderr, "Failed to allocate memory for select() fdset.\n");
exit(1); abort();
} }
} }
FD_SET(fd, *ppfds); FD_SET(fd, *ppfds);
return true;
} }
/** /**
* Add a new file descriptor to wait for. * Add a new file descriptor to wait for.
*/ */
static inline bool static inline void
fds_insert(session_t *ps, int fd, short events) { fds_insert(session_t *ps, int fd, short events) {
bool result = true;
ps->nfds_max = max_i(fd + 1, ps->nfds_max); ps->nfds_max = max_i(fd + 1, ps->nfds_max);
if (POLLIN & events) if (POLLIN & events)
result = fds_insert_select(&ps->pfds_read, fd) && result; fds_insert_select(&ps->pfds_read, fd);
if (POLLOUT & events) if (POLLOUT & events)
result = fds_insert_select(&ps->pfds_write, fd) && result; fds_insert_select(&ps->pfds_write, fd);
if (POLLPRI & events) if (POLLPRI & events)
result = fds_insert_select(&ps->pfds_except, fd) && result; fds_insert_select(&ps->pfds_except, fd);
return result;
} }
/** /**
@ -1793,40 +1787,6 @@ fds_drop(session_t *ps, int fd, short events) {
FD_CLR(fd, ps->pfds_except); FD_CLR(fd, ps->pfds_except);
} }
#define CPY_FDS(key) \
fd_set * key = NULL; \
if (ps->key) { \
key = malloc(sizeof(fd_set)); \
memcpy(key, ps->key, sizeof(fd_set)); \
if (!key) { \
fprintf(stderr, "Failed to allocate memory for copying select() fdset.\n"); \
exit(1); \
} \
} \
/**
* Poll for changes.
*
* poll() is much better than select(), but ppoll() does not exist on
* *BSD.
*/
static inline int
fds_poll(session_t *ps, struct timeval *ptv) {
// Copy fds
CPY_FDS(pfds_read);
CPY_FDS(pfds_write);
CPY_FDS(pfds_except);
int ret = select(ps->nfds_max, pfds_read, pfds_write, pfds_except, ptv);
free(pfds_read);
free(pfds_write);
free(pfds_except);
return ret;
}
#undef CPY_FDS
/** /**
* Wrapper of XFree() for convenience. * Wrapper of XFree() for convenience.
* *
@ -2039,21 +1999,6 @@ set_ignore_next(session_t *ps) {
set_ignore(ps, NextRequest(ps->dpy)); set_ignore(ps, NextRequest(ps->dpy));
} }
static inline void
add_damage(session_t *ps, XserverRegion damage) {
// Ignore damage when screen isn't redirected
if (!ps->redirected)
free_region(ps, &damage);
if (!damage) return;
if (ps->all_damage) {
XFixesUnionRegion(ps->dpy, ps->all_damage, ps->all_damage, damage);
XFixesDestroyRegion(ps->dpy, damage);
} else {
ps->all_damage = damage;
}
}
/** /**
* Check if a window is a fullscreen window. * Check if a window is a fullscreen window.
* *

190
src/compton.c
View File

@ -9,6 +9,7 @@
*/ */
#include <ctype.h> #include <ctype.h>
#include <string.h>
#include "compton.h" #include "compton.h"
#include "win.h" #include "win.h"
@ -20,11 +21,6 @@ xr_blur_dst(session_t *ps, Picture tgt_buffer,
int x, int y, int wid, int hei, XFixed **blur_kerns, int x, int y, int wid, int hei, XFixed **blur_kerns,
XserverRegion reg_clip); XserverRegion reg_clip);
#if defined(DEBUG_EVENTS) || defined(DEBUG_RESTACK)
static bool
ev_window_name(session_t *ps, Window wid, char **name);
#endif
inline static void inline static void
ev_handle(session_t *ps, XEvent *ev); ev_handle(session_t *ps, XEvent *ev);
@ -60,9 +56,6 @@ static void
cxinerama_upd_scrs(session_t *ps); cxinerama_upd_scrs(session_t *ps);
#endif #endif
static time_ms_t
timeout_get_poll_time(session_t *ps);
static void static void
timeout_clear(session_t *ps); timeout_clear(session_t *ps);
@ -156,12 +149,6 @@ get_root_tile(session_t *ps);
static void static void
paint_root(session_t *ps, XserverRegion reg_paint); paint_root(session_t *ps, XserverRegion reg_paint);
static void
add_damage(session_t *ps, XserverRegion damage);
static void
repair_win(session_t *ps, win *w);
static void static void
finish_map_win(session_t *ps, win *w); finish_map_win(session_t *ps, win *w);
@ -195,26 +182,12 @@ destroy_callback(session_t *ps, win *w);
static void static void
destroy_win(session_t *ps, Window id); destroy_win(session_t *ps, Window id);
static void
damage_win(session_t *ps, XDamageNotifyEvent *de);
static int static int
xerror(Display *dpy, XErrorEvent *ev); xerror(Display *dpy, XErrorEvent *ev);
static void static void
expose_root(session_t *ps, XRectangle *rects, int nrects); expose_root(session_t *ps, XRectangle *rects, int nrects);
#ifdef DEBUG_EVENTS
static int
ev_serial(XEvent *ev);
static const char *
ev_name(session_t *ps, XEvent *ev);
static Window
ev_window(session_t *ps, XEvent *ev);
#endif
static void __attribute__ ((noreturn)) static void __attribute__ ((noreturn))
usage(int ret); usage(int ret);
@ -254,15 +227,6 @@ ev_expose(session_t *ps, XExposeEvent *ev);
static void static void
update_ewmh_active_win(session_t *ps); update_ewmh_active_win(session_t *ps);
inline static void
ev_property_notify(session_t *ps, XPropertyEvent *ev);
inline static void
ev_damage_notify(session_t *ps, XDamageNotifyEvent *ev);
inline static void
ev_shape_notify(session_t *ps, XShapeEvent *ev);
// === Global constants === // === Global constants ===
/// Name strings for window types. /// Name strings for window types.
@ -346,6 +310,54 @@ static const char *background_props_str[] = {
/// have a pointer to current session passed in. /// have a pointer to current session passed in.
session_t *ps_g = NULL; session_t *ps_g = NULL;
void add_damage(session_t *ps, XserverRegion damage) {
// Ignore damage when screen isn't redirected
if (!ps->redirected)
free_region(ps, &damage);
if (!damage) return;
if (ps->all_damage) {
XFixesUnionRegion(ps->dpy, ps->all_damage, ps->all_damage, damage);
XFixesDestroyRegion(ps->dpy, damage);
} else {
ps->all_damage = damage;
}
}
#define CPY_FDS(key) \
fd_set * key = NULL; \
if (ps->key) { \
key = malloc(sizeof(fd_set)); \
memcpy(key, ps->key, sizeof(fd_set)); \
if (!key) { \
fprintf(stderr, "Failed to allocate memory for copying select() fdset.\n"); \
exit(1); \
} \
} \
/**
* Poll for changes.
*
* poll() is much better than select(), but ppoll() does not exist on
* *BSD.
*/
static inline int
fds_poll(session_t *ps, struct timeval *ptv) {
// Copy fds
CPY_FDS(pfds_read);
CPY_FDS(pfds_write);
CPY_FDS(pfds_except);
int ret = select(ps->nfds_max, pfds_read, pfds_write, pfds_except, ptv);
free(pfds_read);
free(pfds_write);
free(pfds_except);
return ret;
}
#undef CPY_FDS
// === Fading === // === Fading ===
/** /**
@ -812,7 +824,7 @@ solid_picture(session_t *ps, bool argb, double a,
static void static void
discard_ignore(session_t *ps, unsigned long sequence) { discard_ignore(session_t *ps, unsigned long sequence) {
while (ps->ignore_head) { while (ps->ignore_head) {
if ((long) (sequence - ps->ignore_head->sequence) > 0) { if (sequence > ps->ignore_head->sequence) {
ignore_t *next = ps->ignore_head->next; ignore_t *next = ps->ignore_head->next;
free(ps->ignore_head); free(ps->ignore_head);
ps->ignore_head = next; ps->ignore_head = next;
@ -1121,7 +1133,7 @@ paint_preprocess(session_t *ps, win *list) {
// Give up if it's not damaged or invisible, or it's unmapped and its // Give up if it's not damaged or invisible, or it's unmapped and its
// pixmap is gone (for example due to a ConfigureNotify), or when it's // pixmap is gone (for example due to a ConfigureNotify), or when it's
// excluded // excluded
if (!w->damaged if (!w->ever_damaged
|| w->a.x + w->a.width < 1 || w->a.y + w->a.height < 1 || w->a.x + w->a.width < 1 || w->a.y + w->a.height < 1
|| w->a.x >= ps->root_width || w->a.y >= ps->root_height || w->a.x >= ps->root_width || w->a.y >= ps->root_height
|| ((IsUnmapped == w->a.map_state || w->destroyed) && !w->paint.pixmap) || ((IsUnmapped == w->a.map_state || w->destroyed) && !w->paint.pixmap)
@ -1731,6 +1743,33 @@ rebuild_shadow_exclude_reg(session_t *ps) {
ps->shadow_exclude_reg = rect_to_reg(ps, &rect); ps->shadow_exclude_reg = rect_to_reg(ps, &rect);
} }
/**
* Check if a region is empty.
*
* Keith Packard said this is slow:
* http://lists.freedesktop.org/archives/xorg/2007-November/030467.html
*
* @param ps current session
* @param region region to check for
* @param pcache_rects a place to cache the dumped rectangles
* @param ncache_nrects a place to cache the number of dumped rectangles
*/
static inline bool
is_region_empty(const session_t *ps, XserverRegion region,
reg_data_t *pcache_reg) {
int nrects = 0;
XRectangle *rects = XFixesFetchRegion(ps->dpy, region, &nrects);
if (pcache_reg) {
pcache_reg->rects = rects;
pcache_reg->nrects = nrects;
}
else
cxfree(rects);
return !nrects;
}
static void static void
paint_all(session_t *ps, XserverRegion region, XserverRegion region_real, win *t) { paint_all(session_t *ps, XserverRegion region, XserverRegion region_real, win *t) {
if (!region_real) if (!region_real)
@ -2056,7 +2095,7 @@ repair_win(session_t *ps, win *w) {
XserverRegion parts; XserverRegion parts;
if (!w->damaged) { if (!w->ever_damaged) {
parts = win_extents(ps, w); parts = win_extents(ps, w);
set_ignore_next(ps); set_ignore_next(ps);
XDamageSubtract(ps->dpy, w->damage, None, None); XDamageSubtract(ps->dpy, w->damage, None, None);
@ -2069,7 +2108,7 @@ repair_win(session_t *ps, win *w) {
w->a.y + w->a.border_width); w->a.y + w->a.border_width);
} }
w->damaged = true; w->ever_damaged = true;
w->pixmap_damaged = true; w->pixmap_damaged = true;
// Why care about damage when screen is unredirected? // Why care about damage when screen is unredirected?
@ -2173,7 +2212,7 @@ map_win(session_t *ps, Window id) {
win_determine_blur_background(ps, w); win_determine_blur_background(ps, w);
w->damaged = false; w->ever_damaged = false;
/* if any configure events happened while /* if any configure events happened while
the window was unmapped, then configure the window was unmapped, then configure
@ -2200,7 +2239,7 @@ finish_map_win(session_t *ps, win *w) {
static void static void
finish_unmap_win(session_t *ps, win *w) { finish_unmap_win(session_t *ps, win *w) {
w->damaged = false; w->ever_damaged = false;
w->in_openclose = false; w->in_openclose = false;
@ -2555,21 +2594,6 @@ root_damaged(session_t *ps) {
force_repaint(ps); force_repaint(ps);
} }
static void
damage_win(session_t *ps, XDamageNotifyEvent *de) {
/*
if (ps->root == de->drawable) {
root_damaged();
return;
} */
win *w = find_win(ps, de->drawable);
if (!w) return;
repair_win(ps, w);
}
/** /**
* Xlib error handler function. * Xlib error handler function.
*/ */
@ -2785,8 +2809,7 @@ opts_set_no_fading_openclose(session_t *ps, bool newval) {
//!@} //!@}
#endif #endif
#ifdef DEBUG_EVENTS static inline int
static int
ev_serial(XEvent *ev) { ev_serial(XEvent *ev) {
if ((ev->type & 0x7f) != KeymapNotify) { if ((ev->type & 0x7f) != KeymapNotify) {
return ev->xany.serial; return ev->xany.serial;
@ -2794,7 +2817,7 @@ ev_serial(XEvent *ev) {
return NextRequest(ev->xany.display); return NextRequest(ev->xany.display);
} }
static const char * static inline const char *
ev_name(session_t *ps, XEvent *ev) { ev_name(session_t *ps, XEvent *ev) {
static char buf[128]; static char buf[128];
switch (ev->type & 0x7f) { switch (ev->type & 0x7f) {
@ -2833,7 +2856,7 @@ ev_name(session_t *ps, XEvent *ev) {
return buf; return buf;
} }
static Window static inline Window
ev_window(session_t *ps, XEvent *ev) { ev_window(session_t *ps, XEvent *ev) {
switch (ev->type) { switch (ev->type) {
case FocusIn: case FocusIn:
@ -2906,8 +2929,6 @@ ev_focus_report(XFocusChangeEvent* ev) {
ev_focus_detail_name(ev)); ev_focus_detail_name(ev));
} }
#endif
// === Events === // === Events ===
/** /**
@ -3197,8 +3218,18 @@ ev_property_notify(session_t *ps, XPropertyEvent *ev) {
} }
inline static void inline static void
ev_damage_notify(session_t *ps, XDamageNotifyEvent *ev) { ev_damage_notify(session_t *ps, XDamageNotifyEvent *de) {
damage_win(ps, ev); /*
if (ps->root == de->drawable) {
root_damaged();
return;
} */
win *w = find_win(ps, de->drawable);
if (!w) return;
repair_win(ps, w, de);
} }
inline static void inline static void
@ -3257,14 +3288,11 @@ ev_selection_clear(session_t *ps,
exit(1); exit(1);
} }
#if defined(DEBUG_EVENTS) || defined(DEBUG_RESTACK)
/** /**
* Get a window's name from window ID. * Get a window's name from window ID.
*/ */
static bool static inline void
ev_window_name(session_t *ps, Window wid, char **name) { ev_window_name(session_t *ps, Window wid, char **name) {
bool to_free = false;
*name = ""; *name = "";
if (wid) { if (wid) {
*name = "(Failed to get title)"; *name = "(Failed to get title)";
@ -3277,17 +3305,15 @@ ev_window_name(session_t *ps, Window wid, char **name) {
if (!w) if (!w)
w = find_toplevel(ps, wid); w = find_toplevel(ps, wid);
if (w)
win_get_name(ps, w);
if (w && w->name) if (w && w->name)
*name = w->name; *name = w->name;
else if (!(w && w->client_win else
&& (to_free = wid_get_name(ps, w->client_win, name)))) *name = "unknown";
to_free = wid_get_name(ps, wid, name);
} }
} }
return to_free;
} }
#endif
static void static void
ev_handle(session_t *ps, XEvent *ev) { ev_handle(session_t *ps, XEvent *ev) {
@ -3299,20 +3325,12 @@ ev_handle(session_t *ps, XEvent *ev) {
if (!isdamagenotify(ps, ev)) { if (!isdamagenotify(ps, ev)) {
Window wid = ev_window(ps, ev); Window wid = ev_window(ps, ev);
char *window_name = NULL; char *window_name = NULL;
bool to_free = false; ev_window_name(ps, wid, &window_name);
to_free = ev_window_name(ps, wid, &window_name);
print_timestamp(ps); print_timestamp(ps);
printf("event %10.10s serial %#010x window %#010lx \"%s\"\n", printf_errf(" event %10.10s serial %#010x window %#010lx \"%s\"\n",
ev_name(ps, ev), ev_serial(ev), wid, window_name); ev_name(ps, ev), ev_serial(ev), wid, window_name);
if (to_free) {
cxfree(window_name);
window_name = NULL;
} }
}
#endif #endif
switch (ev->type) { switch (ev->type) {

29
src/compton.h
View File

@ -35,6 +35,8 @@
// inline functions must be made static to compile correctly under clang: // inline functions must be made static to compile correctly under clang:
// http://clang.llvm.org/compatibility.html#inline // http://clang.llvm.org/compatibility.html#inline
void add_damage(session_t *ps, XserverRegion damage);
long determine_evmask(session_t *ps, Window wid, win_evmode_t mode); long determine_evmask(session_t *ps, Window wid, win_evmode_t mode);
Window Window
@ -654,33 +656,6 @@ dump_region(const session_t *ps, XserverRegion region) {
cxfree(rects); cxfree(rects);
} }
/**
* Check if a region is empty.
*
* Keith Packard said this is slow:
* http://lists.freedesktop.org/archives/xorg/2007-November/030467.html
*
* @param ps current session
* @param region region to check for
* @param pcache_rects a place to cache the dumped rectangles
* @param ncache_nrects a place to cache the number of dumped rectangles
*/
static inline bool
is_region_empty(const session_t *ps, XserverRegion region,
reg_data_t *pcache_reg) {
int nrects = 0;
XRectangle *rects = XFixesFetchRegion(ps->dpy, region, &nrects);
if (pcache_reg) {
pcache_reg->rects = rects;
pcache_reg->nrects = nrects;
}
else
cxfree(rects);
return !nrects;
}
#ifdef CONFIG_OPENGL #ifdef CONFIG_OPENGL
/** /**
* Ensure we have a GLX context. * Ensure we have a GLX context.

2
src/dbus.c
View File

@ -697,7 +697,7 @@ cdbus_process_win_get(session_t *ps, DBusMessage *msg) {
cdbus_m_win_get_do(mode, cdbus_reply_enum); cdbus_m_win_get_do(mode, cdbus_reply_enum);
cdbus_m_win_get_do(client_win, cdbus_reply_wid); cdbus_m_win_get_do(client_win, cdbus_reply_wid);
cdbus_m_win_get_do(damaged, cdbus_reply_bool); cdbus_m_win_get_do(ever_damaged, cdbus_reply_bool);
cdbus_m_win_get_do(destroyed, cdbus_reply_bool); cdbus_m_win_get_do(destroyed, cdbus_reply_bool);
cdbus_m_win_get_do(window_type, cdbus_reply_enum); cdbus_m_win_get_do(window_type, cdbus_reply_enum);
cdbus_m_win_get_do(wmwin, cdbus_reply_bool); cdbus_m_win_get_do(wmwin, cdbus_reply_bool);

2
src/win.c
View File

@ -754,7 +754,7 @@ bool add_win(session_t *ps, Window id, Window prev) {
#endif #endif
.pictfmt = NULL, .pictfmt = NULL,
.mode = WMODE_TRANS, .mode = WMODE_TRANS,
.damaged = false, .ever_damaged = false,
.damage = None, .damage = None,
.pixmap_damaged = false, .pixmap_damaged = false,
.paint = PAINT_INIT, .paint = PAINT_INIT,