dots
/
surf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of getkbdevice 

The GTK guys nicely took in account our request and pushed in a
convenience function to get default keyboard device.
This commit is contained in:
Quentin Rameau 2016-07-05 12:33:23 +02:00
parent 8682a4dffb
commit f9714ab838
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
surf.c
View File

@ -170,7 +170,6 @@ static void destroyclient(Client *c);
static void cleanup(void); static void cleanup(void);
/* GTK/WebKit */ /* GTK/WebKit */
static GdkDevice *getkbdevice(void);
static WebKitWebView *newview(Client *c, WebKitWebView *rv); static WebKitWebView *newview(Client *c, WebKitWebView *rv);
static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a, static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
Client *c); Client *c);
@ -259,13 +258,14 @@ die(const char *errstr, ...)
void void
setup(void) setup(void)
{ {
GdkDisplay *gdpy = gdk_display_get_default();
int i, j; int i, j;
/* clean up any zombies immediately */ /* clean up any zombies immediately */
sigchld(0); sigchld(0);
gtk_init(NULL, NULL); gtk_init(NULL, NULL);
dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); dpy = GDK_DISPLAY_XDISPLAY(gdpy);
curconfig = defconfig; curconfig = defconfig;
@ -279,7 +279,7 @@ setup(void)
scriptfile = buildfile(scriptfile); scriptfile = buildfile(scriptfile);
cachedir = buildpath(cachedir); cachedir = buildpath(cachedir);
gdkkb = getkbdevice(); gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
if (!stylefile) { if (!stylefile) {
styledir = buildpath(styledir); styledir = buildpath(styledir);
@ -875,22 +875,6 @@ cleanup(void)
g_free(cachedir); 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 * WebKitWebView *
newview(Client *c, WebKitWebView *rv) newview(Client *c, WebKitWebView *rv)
{ {