X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=64c5f5fb234c342ae55102a3f0307e24f2265bcf;hp=3d6cc118b1f35f784169e751050d023dbbe0eb39;hb=5a02d3e500c7b8d22f00a214eb5a4e7244e4c6f5;hpb=3530d18d8ed04710d5e5a0bfbf6af948c59549bf

diff --git a/surf.c b/surf.c
index 3d6cc11..64c5f5f 100644
--- a/surf.c
+++ b/surf.c
@@ -144,6 +144,8 @@ static void setup(void);
 static void sigchld(int unused);
 static char *buildfile(const char *path);
 static char *buildpath(const char *path);
+static const char *getuserhomedir(const char *user);
+static const char *getcurrentuserhomedir(void);
 static Client *newclient(Client *c);
 static void loaduri(Client *c, const Arg *a);
 static const char *geturi(Client *c);
@@ -168,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);
@@ -257,13 +258,15 @@ die(const char *errstr, ...)
 void
 setup(void)
 {
+	GdkDisplay *gdpy;
 	int i, j;
 
 	/* clean up any zombies immediately */
 	sigchld(0);
 	gtk_init(NULL, NULL);
 
-	dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+	gdpy = gdk_display_get_default();
+	dpy = GDK_DISPLAY_XDISPLAY(gdpy);
 
 	curconfig = defconfig;
 
@@ -277,7 +280,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);
@@ -350,29 +353,59 @@ buildfile(const char *path)
 	return fpath;
 }
 
+static const char*
+getuserhomedir(const char *user)
+{
+	struct passwd *pw = getpwnam(user);
+
+	if (!pw)
+		die("Can't get user %s login information.\n", user);
+
+	return pw->pw_dir;
+}
+
+static const char*
+getcurrentuserhomedir(void)
+{
+	const char *homedir;
+	const char *user;
+	struct passwd *pw;
+
+	homedir = getenv("HOME");
+	if (homedir)
+		return homedir;
+
+	user = getenv("USER");
+	if (user)
+		return getuserhomedir(user);
+
+	pw = getpwuid(getuid());
+	if (!pw)
+		die("Can't get current user home directory\n");
+
+	return pw->pw_dir;
+}
+
 char *
 buildpath(const char *path)
 {
-	struct passwd *pw;
 	char *apath, *name, *p, *fpath;
+	const char *homedir;
 
 	if (path[0] == '~') {
 		if (path[1] == '/' || path[1] == '\0') {
 			p = (char *)&path[1];
-			pw = getpwuid(getuid());
+			homedir = getcurrentuserhomedir();
 		} else {
 			if ((p = strchr(path, '/')))
 				name = g_strndup(&path[1], --p - path);
 			else
 				name = g_strdup(&path[1]);
 
-			if (!(pw = getpwnam(name))) {
-				die("Can't get user %s home directory: %s.\n",
-				    name, path);
-			}
+			homedir = getuserhomedir(name);
 			g_free(name);
 		}
-		apath = g_build_filename(pw->pw_dir, p, NULL);
+		apath = g_build_filename(homedir, p, NULL);
 	} else {
 		apath = g_strdup(path);
 	}
@@ -843,22 +876,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)
 {