tGet rid of getkbdevice - surf - customized build of surf, the suckless webkit … | |
git clone git://src.adamsgaard.dk/surf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit f9714ab838e362a74e02916317cf22ef0ebdcdb6 | |
parent 8682a4dffb33b37ba9d3e42b40f25fac3f92e510 | |
Author: Quentin Rameau <[email protected]> | |
Date: Tue, 5 Jul 2016 12:33:23 +0200 | |
Get rid of getkbdevice | |
The GTK guys nicely took in account our request and pushed in a | |
convenience function to get default keyboard device. | |
Diffstat: | |
M surf.c | 22 +++------------------- | |
1 file changed, 3 insertions(+), 19 deletions(-) | |
--- | |
diff --git a/surf.c b/surf.c | |
t@@ -170,7 +170,6 @@ static void destroyclient(Client *c); | |
static void cleanup(void); | |
/* GTK/WebKit */ | |
-static GdkDevice *getkbdevice(void); | |
static WebKitWebView *newview(Client *c, WebKitWebView *rv); | |
static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a, | |
Client *c); | |
t@@ -259,13 +258,14 @@ die(const char *errstr, ...) | |
void | |
setup(void) | |
{ | |
+ GdkDisplay *gdpy = gdk_display_get_default(); | |
int i, j; | |
/* clean up any zombies immediately */ | |
sigchld(0); | |
gtk_init(NULL, NULL); | |
- dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); | |
+ dpy = GDK_DISPLAY_XDISPLAY(gdpy); | |
curconfig = defconfig; | |
t@@ -279,7 +279,7 @@ setup(void) | |
scriptfile = buildfile(scriptfile); | |
cachedir = buildpath(cachedir); | |
- gdkkb = getkbdevice(); | |
+ gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy)); | |
if (!stylefile) { | |
styledir = buildpath(styledir); | |
t@@ -875,22 +875,6 @@ cleanup(void) | |
g_free(cachedir); | |
} | |
-static GdkDevice * | |
-getkbdevice(void) | |
-{ | |
- GList *l, *gdl = gdk_device_manager_list_devices( | |
- gdk_display_get_device_manager(gdk_display_get_default()), | |
- GDK_DEVICE_TYPE_MASTER); | |
- GdkDevice *gd = NULL; | |
- | |
- for (l = gdl; l != NULL; l = l->next) | |
- if (gdk_device_get_source(l->data) == GDK_SOURCE_KEYBOARD) | |
- gd = l->data; | |
- | |
- g_list_free(gdl); | |
- return gd; | |
-} | |
- | |
WebKitWebView * | |
newview(Client *c, WebKitWebView *rv) | |
{ |