koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assume xcb_cursor_context_new never fails (#3955)

Browse Source 
According to libxcb-cursor code, the only condition in which
xcb_cursor_context_new() returns a non-zero result is a memory
allocation failure[1].  Thus, it is safe to assume that
xcursor_supported is always true, and remove dead code.

[1]: https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor/blob/0.1.3/cursor/cursor.c#L131-132
This commit is contained in:
xzfc
2020-02-24 07:48:58 +00:00
committed by GitHub
parent 0ba325c5f3
commit 47be36410c
10 changed files with 17 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/i3.h
View File

@ -71,7 +71,7 @@ extern uint8_t root_depth;
extern xcb_visualid_t visual_id;
extern xcb_colormap_t colormap;
extern bool xcursor_supported, xkb_supported, shape_supported;
extern bool xkb_supported, shape_supported;
extern xcb_window_t root;
extern struct ev_loop *main_loop;
extern bool only_check_config;

15
include/xcb.h
View File

@ -18,13 +18,6 @@
#define _NET_WM_STATE_ADD 1
#define _NET_WM_STATE_TOGGLE 2
/** This is the equivalent of XC_left_ptr. I’m not sure why xcb doesn’t have a
* constant for that. */
#define XCB_CURSOR_LEFT_PTR 68
#define XCB_CURSOR_SB_H_DOUBLE_ARROW 108
#define XCB_CURSOR_SB_V_DOUBLE_ARROW 116
#define XCB_CURSOR_WATCH 150
/* from X11/keysymdef.h */
#define XCB_NUM_LOCK 0xff7f
@ -101,14 +94,6 @@ xcb_atom_t xcb_get_preferred_window_type(xcb_get_property_reply_t *reply);
*/
bool xcb_reply_contains_atom(xcb_get_property_reply_t *prop, xcb_atom_t atom);
/**
* Set the cursor of the root window to the given cursor id.
* This function should only be used if xcursor_supported == false.
* Otherwise, use xcursor_set_root_cursor().
*
*/
void xcb_set_root_cursor(int cursor);
/**
* Get depth of visual specified by visualid
*

1
include/xcursor.h
View File

@ -28,7 +28,6 @@ enum xcursor_cursor_t {
void xcursor_load_cursors(void);
xcb_cursor_t xcursor_get_cursor(enum xcursor_cursor_t c);
int xcursor_get_xcb_cursor(enum xcursor_cursor_t c);
/**
* Sets the cursor of the root window to the 'pointer' cursor.