#define LENGTH(x) (sizeof(x) / sizeof(x[0]))
#define CLEANMASK(mask) (mask & (MODKEY|GDK_SHIFT_MASK))
-#define SETB(p, s) [p] = (Parameter){ { .b = s }, }
-#define SETI(p, s) [p] = (Parameter){ { .i = s }, }
-#define SETV(p, s) [p] = (Parameter){ { .v = s }, }
-#define SETF(p, s) [p] = (Parameter){ { .f = s }, }
-#define FSETB(p, s) [p] = (Parameter){ { .b = s }, 1 }
-#define FSETI(p, s) [p] = (Parameter){ { .i = s }, 1 }
-#define FSETV(p, s) [p] = (Parameter){ { .v = s }, 1 }
-#define FSETF(p, s) [p] = (Parameter){ { .f = s }, 1 }
+#define SETB(p, s) [p] = { { .b = s }, }
+#define SETI(p, s) [p] = { { .i = s }, }
+#define SETV(p, s) [p] = { { .v = s }, }
+#define SETF(p, s) [p] = { { .f = s }, }
+#define FSETB(p, s) [p] = { { .b = s }, 1 }
+#define FSETI(p, s) [p] = { { .i = s }, 1 }
+#define FSETV(p, s) [p] = { { .v = s }, 1 }
+#define FSETF(p, s) [p] = { { .f = s }, 1 }
+#define CSETB(p, s) [p] = (Parameter){ { .b = s }, 1 }
+#define CSETI(p, s) [p] = (Parameter){ { .i = s }, 1 }
+#define CSETV(p, s) [p] = (Parameter){ { .v = s }, 1 }
+#define CSETF(p, s) [p] = (Parameter){ { .f = s }, 1 }
enum { AtomFind, AtomGo, AtomUri, AtomLast };
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);
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);
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;
scriptfile = buildfile(scriptfile);
cachedir = buildpath(cachedir);
- gdkkb = getkbdevice();
+ gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
if (!stylefile) {
styledir = buildpath(styledir);
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);
}
if (g_strcmp0(uri, "") == 0)
return;
- if (g_strrstr(uri, "://") || g_str_has_prefix(uri, "about:")) {
+ if (g_str_has_prefix(uri, "http://") ||
+ g_str_has_prefix(uri, "https://") ||
+ g_str_has_prefix(uri, "file://") ||
+ g_str_has_prefix(uri, "about:")) {
url = g_strdup(uri);
} else if (!stat(uri, &st) && (path = realpath(uri, NULL))) {
url = g_strdup_printf("file://%s", path);
void
setparameter(Client *c, int refresh, ParamName p, const Arg *a)
{
+ GdkRGBA bgcolor = { 0 };
WebKitSettings *s = webkit_web_view_get_settings(c->view);
switch (p) {
break;
case DiskCache:
webkit_web_context_set_cache_model(
- webkit_web_view_get_context(c->view),
- curconfig[DiskCache].val.b ?
+ webkit_web_view_get_context(c->view), a->b ?
WEBKIT_CACHE_MODEL_WEB_BROWSER :
WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
- break;
+ return; /* do not update */
case DNSPrefetch:
- refresh = 0;
- break;
+ webkit_settings_set_enable_dns_prefetching(s, a->b);
+ return; /* do not update */
case FontSize:
- webkit_settings_set_default_font_size(
- webkit_web_view_get_settings(c->view),
- curconfig[FontSize].val.i);
- break;
+ webkit_settings_set_default_font_size(s, a->i);
+ return; /* do not update */
case FrameFlattening:
webkit_settings_set_enable_frame_flattening(s, a->b);
break;
case Geolocation:
+ refresh = 0;
break;
case HideBackground:
- return; /* do nothing */
+ if (a->b)
+ webkit_web_view_set_background_color(c->view, &bgcolor);
+ return; /* do not update */
case Inspector:
- return; /* do nothing */
+ webkit_settings_set_enable_developer_extras(s, a->b);
+ return; /* do not update */
case JavaScript:
webkit_settings_set_enable_javascript(s, a->b);
break;
evalscript(c, "document.documentElement.style.overflow = '%s'",
enablescrollbars ? "auto" : "hidden");
*/
- refresh = 0;
- break;
+ return; /* do not update */
case ShowIndicators:
- return; /* do nothing */
+ break;
case SpellChecking:
webkit_web_context_set_spell_checking_enabled(
- webkit_web_view_get_context(c->view),
- curconfig[SpellChecking].val.b);
- return; /* do nothing */
+ webkit_web_view_get_context(c->view), a->b);
+ return; /* do not update */
case SpellLanguages:
return; /* do nothing */
case StrictSSL:
webkit_web_context_set_tls_errors_policy(
- webkit_web_view_get_context(c->view),
- curconfig[StrictSSL].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
+ webkit_web_view_get_context(c->view), a->b ?
+ WEBKIT_TLS_ERRORS_POLICY_FAIL :
WEBKIT_TLS_ERRORS_POLICY_IGNORE);
- return; /* do nothing */
+ return; /* do not update */
case Style:
- if (curconfig[Style].val.b)
+ if (a->b)
setstyle(c, getstyle(geturi(c)));
else
webkit_user_content_manager_remove_all_style_sheets(
refresh = 0;
break;
case ZoomLevel:
- return; /* do nothing */
+ webkit_web_view_set_zoom_level(c->view, a->f);
+ return; /* do not update */
default:
return; /* do nothing */
}
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)
{
GdkWindow *gwin;
c->finder = webkit_web_view_get_find_controller(c->view);
- if (curconfig[Inspector].val.b)
- c->inspector = webkit_web_view_get_inspector(c->view);
+ c->inspector = webkit_web_view_get_inspector(c->view);
c->win = createwindow(c);
setatom(c, AtomUri, title);
c->title = title;
c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+ seturiparameters(c, geturi(c));
break;
case WEBKIT_LOAD_REDIRECTED:
setatom(c, AtomUri, title);
c->title = title;
+ seturiparameters(c, geturi(c));
break;
case WEBKIT_LOAD_COMMITTED:
- setatom(c, AtomUri, title);
- c->title = title;
if (!webkit_web_view_get_tls_info(c->view, NULL,
&(c->tlsflags)))
c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
- setatom(c, AtomUri, geturi(c));
- seturiparameters(c, geturi(c));
break;
case WEBKIT_LOAD_FINISHED:
/* Disabled until we write some WebKitWebExtension for
GdkEvent *ev = gdk_event_new(GDK_KEY_PRESS);
gdk_event_set_device(ev, gdkkb);
-// gdk_event_set_screen(ev, gdk_screen_get_default());
ev->key.window = gtk_widget_get_window(GTK_WIDGET(c->win));
ev->key.state = GDK_CONTROL_MASK;
ev->key.time = GDK_CURRENT_TIME;
void
toggleinspector(Client *c, const Arg *a)
{
- if (curconfig[Inspector].val.b) {
- if (webkit_web_inspector_is_attached(c->inspector))
- webkit_web_inspector_close(c->inspector);
- else
- webkit_web_inspector_show(c->inspector);
- }
+ if (webkit_web_inspector_is_attached(c->inspector))
+ webkit_web_inspector_close(c->inspector);
+ else if (curconfig[Inspector].val.b)
+ webkit_web_inspector_show(c->inspector);
}
void
/* command line args */
ARGBEGIN {
case 'a':
- defconfig FSETV(CookiePolicies, EARGF(usage()));
+ defconfig CSETV(CookiePolicies, EARGF(usage()));
break;
case 'b':
- defconfig FSETB(ScrollBars, 0);
+ defconfig CSETB(ScrollBars, 0);
break;
case 'B':
- defconfig FSETB(ScrollBars, 1);
+ defconfig CSETB(ScrollBars, 1);
break;
case 'c':
cookiefile = EARGF(usage());
break;
case 'd':
- defconfig FSETB(DiskCache, 0);
+ defconfig CSETB(DiskCache, 0);
break;
case 'D':
- defconfig FSETB(DiskCache, 1);
+ defconfig CSETB(DiskCache, 1);
break;
case 'e':
embed = strtol(EARGF(usage()), NULL, 0);
break;
case 'f':
- defconfig FSETB(RunInFullscreen, 0);
+ defconfig CSETB(RunInFullscreen, 0);
break;
case 'F':
- defconfig FSETB(RunInFullscreen, 1);
+ defconfig CSETB(RunInFullscreen, 1);
break;
case 'g':
- defconfig FSETB(Geolocation, 0);
+ defconfig CSETB(Geolocation, 0);
break;
case 'G':
- defconfig FSETB(Geolocation, 1);
+ defconfig CSETB(Geolocation, 1);
break;
case 'i':
- defconfig FSETB(LoadImages, 0);
+ defconfig CSETB(LoadImages, 0);
break;
case 'I':
- defconfig FSETB(LoadImages, 1);
+ defconfig CSETB(LoadImages, 1);
break;
case 'k':
- defconfig FSETB(KioskMode, 0);
+ defconfig CSETB(KioskMode, 0);
break;
case 'K':
- defconfig FSETB(KioskMode, 1);
+ defconfig CSETB(KioskMode, 1);
break;
case 'm':
- defconfig FSETB(Style, 0);
+ defconfig CSETB(Style, 0);
break;
case 'M':
- defconfig FSETB(Style, 1);
+ defconfig CSETB(Style, 1);
break;
case 'n':
- defconfig FSETB(Inspector, 0);
+ defconfig CSETB(Inspector, 0);
break;
case 'N':
- defconfig FSETB(Inspector, 1);
+ defconfig CSETB(Inspector, 1);
break;
case 'p':
- defconfig FSETB(Plugins, 0);
+ defconfig CSETB(Plugins, 0);
break;
case 'P':
- defconfig FSETB(Plugins, 1);
+ defconfig CSETB(Plugins, 1);
break;
case 'r':
scriptfile = EARGF(usage());
break;
case 's':
- defconfig FSETB(JavaScript, 0);
+ defconfig CSETB(JavaScript, 0);
break;
case 'S':
- defconfig FSETB(JavaScript, 1);
+ defconfig CSETB(JavaScript, 1);
break;
case 't':
stylefile = EARGF(usage());
showxid = 1;
break;
case 'z':
- defconfig FSETF(ZoomLevel, strtof(EARGF(usage()), NULL));
+ defconfig CSETF(ZoomLevel, strtof(EARGF(usage()), NULL));
break;
default:
usage();