X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=0f7e049fe1f9bb56f727777f9bb7aa5bf1fb3e5b;hp=105b28e69b61305e384bcf9bd673e922fbcb336e;hb=2355c20e92d6f47100323e3394d565f8e8bf70dc;hpb=cee8f0186ce3277add9b6a8ac07588be40f0f080

diff --git a/surf.c b/surf.c
index 105b28e..0f7e049 100644
--- a/surf.c
+++ b/surf.c
@@ -58,6 +58,7 @@ enum {
 };
 
 typedef enum {
+	AcceleratedCanvas,
 	CaretBrowsing,
 	CookiePolicies,
 	DiskCache,
@@ -70,11 +71,13 @@ typedef enum {
 	JavaScript,
 	KioskMode,
 	LoadImages,
+	MediaManualPlay,
 	Plugins,
 	PreferredLanguages,
 	RunInFullscreen,
 	ScrollBars,
 	ShowIndicators,
+	SiteQuirks,
 	SpellChecking,
 	SpellLanguages,
 	StrictSSL,
@@ -142,8 +145,11 @@ static void usage(void);
 static void die(const char *errstr, ...);
 static void setup(void);
 static void sigchld(int unused);
+static void sighup(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,8 +174,8 @@ static void destroyclient(Client *c);
 static void cleanup(void);
 
 /* GTK/WebKit */
-static GdkDevice *getkbdevice(void);
 static WebKitWebView *newview(Client *c, WebKitWebView *rv);
+static void initwebextensions(WebKitWebContext *wc, Client *c);
 static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
                              Client *c);
 static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c);
@@ -257,27 +263,34 @@ 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());
+	if (signal(SIGHUP, sighup) == SIG_ERR)
+		die("Can't install SIGHUP handler");
 
-	curconfig = defconfig;
+	if (!(dpy = XOpenDisplay(NULL)))
+		die("Can't open default display");
 
 	/* atoms */
 	atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
 	atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
 	atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
 
+	gtk_init(NULL, NULL);
+
+	gdpy = gdk_display_get_default();
+
+	curconfig = defconfig;
+
 	/* dirs and files */
 	cookiefile = buildfile(cookiefile);
 	scriptfile = buildfile(scriptfile);
 	cachedir   = buildpath(cachedir);
 
-	gdkkb = getkbdevice();
+	gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
 
 	if (!stylefile) {
 		styledir = buildpath(styledir);
@@ -325,6 +338,16 @@ sigchld(int unused)
 		;
 }
 
+void
+sighup(int unused)
+{
+	Arg a = { .b = 0 };
+	Client *c;
+
+	for (c = clients; c; c = c->next)
+		reload(c, &a);
+}
+
 char *
 buildfile(const char *path)
 {
@@ -351,34 +374,35 @@ buildfile(const char *path)
 }
 
 static const char*
-get_user_homedir(const char *user) {
+getuserhomedir(const char *user)
+{
 	struct passwd *pw = getpwnam(user);
-	if (!pw) {
-		die("Can't get user `%s' home directory.\n", user);
-	}
+
+	if (!pw)
+		die("Can't get user %s login information.\n", user);
+
 	return pw->pw_dir;
 }
 
 static const char*
-get_current_user_homedir() {
+getcurrentuserhomedir(void)
+{
 	const char *homedir;
 	const char *user;
 	struct passwd *pw;
 
 	homedir = getenv("HOME");
-	if (homedir) {
+	if (homedir)
 		return homedir;
-	}
 
 	user = getenv("USER");
-	if (user) {
-		return get_user_homedir(user);
-	}
+	if (user)
+		return getuserhomedir(user);
 
 	pw = getpwuid(getuid());
-	if (!pw) {
+	if (!pw)
 		die("Can't get current user home directory\n");
-	}
+
 	return pw->pw_dir;
 }
 
@@ -386,19 +410,19 @@ char *
 buildpath(const char *path)
 {
 	char *apath, *name, *p, *fpath;
+	const char *homedir;
 
 	if (path[0] == '~') {
-		const char *homedir;
 		if (path[1] == '/' || path[1] == '\0') {
 			p = (char *)&path[1];
-			homedir = get_current_user_homedir();
+			homedir = getcurrentuserhomedir();
 		} else {
 			if ((p = strchr(path, '/')))
 				name = g_strndup(&path[1], --p - path);
 			else
 				name = g_strdup(&path[1]);
 
-			homedir = get_user_homedir(name);
+			homedir = getuserhomedir(name);
 			g_free(name);
 		}
 		apath = g_build_filename(homedir, p, NULL);
@@ -607,6 +631,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
 	WebKitSettings *s = webkit_web_view_get_settings(c->view);
 
 	switch (p) {
+	case AcceleratedCanvas:
+		webkit_settings_set_enable_accelerated_2d_canvas(s, a->b);
+		break;
 	case CaretBrowsing:
 		webkit_settings_set_enable_caret_browsing(s, a->b);
 		refresh = 0;
@@ -651,6 +678,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
 	case LoadImages:
 		webkit_settings_set_auto_load_images(s, a->b);
 		break;
+	case MediaManualPlay:
+		webkit_settings_set_media_playback_requires_user_gesture(s, a->b);
+		break;
 	case Plugins:
 		webkit_settings_set_enable_plugins(s, a->b);
 		break;
@@ -668,6 +698,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
 		return; /* do not update */
 	case ShowIndicators:
 		break;
+	case SiteQuirks:
+		webkit_settings_set_enable_site_specific_quirks(s, a->b);
+		break;
 	case SpellChecking:
 		webkit_web_context_set_spell_checking_enabled(
 		    webkit_web_view_get_context(c->view), a->b);
@@ -870,22 +903,7 @@ cleanup(void)
 	g_free(scriptfile);
 	g_free(stylefile);
 	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;
+	XCloseDisplay(dpy);
 }
 
 WebKitWebView *
@@ -903,7 +921,7 @@ newview(Client *c, WebKitWebView *rv)
 	} else {
 		settings = webkit_settings_new_with_settings(
 		   "auto-load-images", curconfig[LoadImages].val.b,
-		   "default-font-size", curconfig[FontSize].val.f,
+		   "default-font-size", curconfig[FontSize].val.i,
 		   "enable-caret-browsing", curconfig[CaretBrowsing].val.b,
 		   "enable-developer-extras", curconfig[Inspector].val.b,
 		   "enable-dns-prefetching", curconfig[DNSPrefetch].val.b,
@@ -912,6 +930,9 @@ newview(Client *c, WebKitWebView *rv)
 		   "enable-html5-local-storage", curconfig[DiskCache].val.b,
 		   "enable-javascript", curconfig[JavaScript].val.b,
 		   "enable-plugins", curconfig[Plugins].val.b,
+		   "enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas].val.b,
+		   "enable-site-specific-quirks", curconfig[SiteQuirks].val.b,
+		   "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.b,
 		   NULL);
 /* For mor interesting settings, have a look at
  * http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */
@@ -963,6 +984,8 @@ newview(Client *c, WebKitWebView *rv)
 
 		g_signal_connect(G_OBJECT(context), "download-started",
 		                 G_CALLBACK(downloadstarted), c);
+		g_signal_connect(G_OBJECT(context), "initialize-web-extensions",
+		                 G_CALLBACK(initwebextensions), c);
 
 		v = g_object_new(WEBKIT_TYPE_WEB_VIEW,
 		    "settings", settings,
@@ -995,6 +1018,12 @@ newview(Client *c, WebKitWebView *rv)
 	return v;
 }
 
+void
+initwebextensions(WebKitWebContext *wc, Client *c)
+{
+	webkit_web_context_set_web_extensions_directory(wc, WEBEXTDIR);
+}
+
 GtkWidget *
 createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
 {
@@ -1171,7 +1200,7 @@ createwindow(Client *c)
 		gtk_window_set_role(GTK_WINDOW(w), wmstr);
 		g_free(wmstr);
 
-		gtk_window_set_default_size(GTK_WINDOW(w), 800, 600);
+		gtk_window_set_default_size(GTK_WINDOW(w), winsize[0], winsize[1]);
 	}
 
 	g_signal_connect(G_OBJECT(w), "destroy",