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

x: use xcb constants in _x_strerror as mush as possible 

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2020-03-31 05:46:28 +01:00
parent 9332cba8df
commit bdf3aabb75
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
3 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/event.c
View File

@ -100,6 +100,9 @@ static inline xcb_window_t attr_pure ev_window(session_t *ps, xcb_generic_event_
} }
} }
#define CASESTRRET(s) \
case s: return #s;
static inline const char *ev_name(session_t *ps, xcb_generic_event_t *ev) { static inline const char *ev_name(session_t *ps, xcb_generic_event_t *ev) {
static char buf[128]; static char buf[128];
switch (ev->response_type & 0x7f) { switch (ev->response_type & 0x7f) {
@ -162,6 +165,8 @@ static inline const char *attr_pure ev_focus_detail_name(xcb_focus_in_event_t *e
return "Unknown"; return "Unknown";
} }
#undef CASESTRRET
static inline void ev_focus_in(session_t *ps, xcb_focus_in_event_t *ev) { static inline void ev_focus_in(session_t *ps, xcb_focus_in_event_t *ev) {
log_debug("{ mode: %s, detail: %s }\n", ev_focus_mode_name(ev), log_debug("{ mode: %s, detail: %s }\n", ev_focus_mode_name(ev),
ev_focus_detail_name(ev)); ev_focus_detail_name(ev));

3
src/utils.h
View File

@ -33,9 +33,6 @@ safe_isnan(double a) {
return __builtin_isnan(a); return __builtin_isnan(a);
} }
#define CASESTRRET(s) \
case s: return #s
/// Same as assert(false), but make sure we abort _even in release builds_. /// Same as assert(false), but make sure we abort _even in release builds_.
/// Silence compiler warning caused by release builds making some code paths reachable. /// Silence compiler warning caused by release builds making some code paths reachable.
#define BUG() \ #define BUG() \

76
src/x.c
View File

@ -337,36 +337,41 @@ _x_strerror(unsigned long serial, uint8_t major, uint16_t minor, uint8_t error_c
int o = 0; int o = 0;
const char *name = "Unknown"; const char *name = "Unknown";
#define CASESTRRET(s) \
case s: \
name = #s; \
break
#define CASESTRRET2(s) \ #define CASESTRRET2(s) \
case s: name = #s; break case XCB_##s: name = #s; break
// TODO separate error code out from session_t // TODO separate error code out from session_t
o = error_code - ps->xfixes_error; o = error_code - ps->xfixes_error;
switch (o) { CASESTRRET2(XCB_XFIXES_BAD_REGION); } switch (o) { CASESTRRET2(XFIXES_BAD_REGION); }
o = error_code - ps->damage_error; o = error_code - ps->damage_error;
switch (o) { CASESTRRET2(XCB_DAMAGE_BAD_DAMAGE); } switch (o) { CASESTRRET2(DAMAGE_BAD_DAMAGE); }
o = error_code - ps->render_error; o = error_code - ps->render_error;
switch (o) { switch (o) {
CASESTRRET2(XCB_RENDER_PICT_FORMAT); CASESTRRET2(RENDER_PICT_FORMAT);
CASESTRRET2(XCB_RENDER_PICTURE); CASESTRRET2(RENDER_PICTURE);
CASESTRRET2(XCB_RENDER_PICT_OP); CASESTRRET2(RENDER_PICT_OP);
CASESTRRET2(XCB_RENDER_GLYPH_SET); CASESTRRET2(RENDER_GLYPH_SET);
CASESTRRET2(XCB_RENDER_GLYPH); CASESTRRET2(RENDER_GLYPH);
} }
#ifdef CONFIG_OPENGL #ifdef CONFIG_OPENGL
if (ps->glx_exists) { if (ps->glx_exists) {
o = error_code - ps->glx_error; o = error_code - ps->glx_error;
switch (o) { switch (o) {
CASESTRRET2(GLX_BAD_SCREEN); CASESTRRET(GLX_BAD_SCREEN);
CASESTRRET2(GLX_BAD_ATTRIBUTE); CASESTRRET(GLX_BAD_ATTRIBUTE);
CASESTRRET2(GLX_NO_EXTENSION); CASESTRRET(GLX_NO_EXTENSION);
CASESTRRET2(GLX_BAD_VISUAL); CASESTRRET(GLX_BAD_VISUAL);
CASESTRRET2(GLX_BAD_CONTEXT); CASESTRRET(GLX_BAD_CONTEXT);
CASESTRRET2(GLX_BAD_VALUE); CASESTRRET(GLX_BAD_VALUE);
CASESTRRET2(GLX_BAD_ENUM); CASESTRRET(GLX_BAD_ENUM);
} }
} }
#endif #endif
@ -374,32 +379,33 @@ _x_strerror(unsigned long serial, uint8_t major, uint16_t minor, uint8_t error_c
if (ps->xsync_exists) { if (ps->xsync_exists) {
o = error_code - ps->xsync_error; o = error_code - ps->xsync_error;
switch (o) { switch (o) {
CASESTRRET2(XSyncBadCounter); CASESTRRET(XSyncBadCounter);
CASESTRRET2(XSyncBadAlarm); CASESTRRET(XSyncBadAlarm);
CASESTRRET2(XSyncBadFence); CASESTRRET(XSyncBadFence);
} }
} }
switch (error_code) { switch (error_code) {
CASESTRRET2(BadAccess); CASESTRRET2(ACCESS);
CASESTRRET2(BadAlloc); CASESTRRET2(ALLOC);
CASESTRRET2(BadAtom); CASESTRRET2(ATOM);
CASESTRRET2(BadColor); CASESTRRET2(COLORMAP);
CASESTRRET2(BadCursor); CASESTRRET2(CURSOR);
CASESTRRET2(BadDrawable); CASESTRRET2(DRAWABLE);
CASESTRRET2(BadFont); CASESTRRET2(FONT);
CASESTRRET2(BadGC); CASESTRRET2(G_CONTEXT);
CASESTRRET2(BadIDChoice); CASESTRRET2(ID_CHOICE);
CASESTRRET2(BadImplementation); CASESTRRET2(IMPLEMENTATION);
CASESTRRET2(BadLength); CASESTRRET2(LENGTH);
CASESTRRET2(BadMatch); CASESTRRET2(MATCH);
CASESTRRET2(BadName); CASESTRRET2(NAME);
CASESTRRET2(BadPixmap); CASESTRRET2(PIXMAP);
CASESTRRET2(BadRequest); CASESTRRET2(REQUEST);
CASESTRRET2(BadValue); CASESTRRET2(VALUE);
CASESTRRET2(BadWindow); CASESTRRET2(WINDOW);
} }
#undef CASESTRRET
#undef CASESTRRET2 #undef CASESTRRET2
thread_local static char buffer[256]; thread_local static char buffer[256];