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

Remove Xlib references (#4845)

Browse Source 
* remove Xlib import from i3bar

* remove unused Xlib declarations
This commit is contained in:
Ingo Bürk 2022-02-10 10:25:20 +01:00 committed by GitHub
parent bd5cbbb010
commit c822eff1bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
i3bar/src/config.c
View File

@ -13,7 +13,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <X11/Xlib.h>
#include <yajl/yajl_parse.h> #include <yajl/yajl_parse.h>
config_t config; config_t config;
@ -126,31 +125,31 @@ static int config_string_cb(void *params_, const unsigned char *val, size_t _len
} }
if (len == strlen("shift") && !strncmp((const char *)val, "shift", strlen("shift"))) { if (len == strlen("shift") && !strncmp((const char *)val, "shift", strlen("shift"))) {
config.modifier = ShiftMask; config.modifier = XCB_MOD_MASK_SHIFT;
return 1; return 1;
} }
if (len == strlen("ctrl") && !strncmp((const char *)val, "ctrl", strlen("ctrl"))) { if (len == strlen("ctrl") && !strncmp((const char *)val, "ctrl", strlen("ctrl"))) {
config.modifier = ControlMask; config.modifier = XCB_MOD_MASK_CONTROL;
return 1; return 1;
} }
if (len == strlen("Mod") + 1 && !strncmp((const char *)val, "Mod", strlen("Mod"))) { if (len == strlen("Mod") + 1 && !strncmp((const char *)val, "Mod", strlen("Mod"))) {
switch (val[3]) { switch (val[3]) {
case '1': case '1':
config.modifier = Mod1Mask; config.modifier = XCB_MOD_MASK_1;
return 1; return 1;
case '2': case '2':
config.modifier = Mod2Mask; config.modifier = XCB_MOD_MASK_2;
return 1; return 1;
case '3': case '3':
config.modifier = Mod3Mask; config.modifier = XCB_MOD_MASK_3;
return 1; return 1;
case '5': case '5':
config.modifier = Mod5Mask; config.modifier = XCB_MOD_MASK_5;
return 1; return 1;
} }
} }
config.modifier = Mod4Mask; config.modifier = XCB_MOD_MASK_4;
return 1; return 1;
} }

1
include/i3.h
View File

@ -56,7 +56,6 @@ extern xcb_timestamp_t last_timestamp;
extern SnDisplay *sndisplay; extern SnDisplay *sndisplay;
extern xcb_key_symbols_t *keysyms; extern xcb_key_symbols_t *keysyms;
extern char **start_argv; extern char **start_argv;
extern Display *xlibdpy, *xkbdpy;
extern int xkb_current_group; extern int xkb_current_group;
extern TAILQ_HEAD(bindings_head, Binding) *bindings; extern TAILQ_HEAD(bindings_head, Binding) *bindings;
extern const char *current_binding_mode; extern const char *current_binding_mode;