summaryrefslogtreecommitdiff
path: root/surf.c
diff options
context:
space:
mode:
authorQuentin Rameau <quinq@fifth.space>2016-07-05 12:33:23 +0200
committerQuentin Rameau <quinq@fifth.space>2016-07-05 13:01:56 +0200
commitf9714ab838e362a74e02916317cf22ef0ebdcdb6 (patch)
tree9090a3d3e4f7a2a68745b37b96e6f7182a25325a /surf.c
parent8682a4dffb33b37ba9d3e42b40f25fac3f92e510 (diff)
downloadsurf-f9714ab838e362a74e02916317cf22ef0ebdcdb6.tar.gz
surf-f9714ab838e362a74e02916317cf22ef0ebdcdb6.tar.bz2
surf-f9714ab838e362a74e02916317cf22ef0ebdcdb6.zip
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 (limited to 'surf.c')
-rw-r--r--surf.c22
1 files changed, 3 insertions, 19 deletions
diff --git a/surf.c b/surf.c
index 9851bba..f6b5a47 100644
--- a/surf.c
+++ b/surf.c
@@ -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);
@@ -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;
@@ -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);
@@ -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)
{