pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing the .hgtags file.
[surf.git]
/
surf.c
diff --git
a/surf.c
b/surf.c
index
214b9c7
..
1ad5ace
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-577,12
+577,13
@@
loaduri(Client *c, const Arg *arg) {
char *u, *rp;
const char *uri = (char *)arg->v;
Arg a = { .b = FALSE };
char *u, *rp;
const char *uri = (char *)arg->v;
Arg a = { .b = FALSE };
+ struct stat st;
if(strcmp(uri, "") == 0)
return;
/* In case it's a file path. */
if(strcmp(uri, "") == 0)
return;
/* In case it's a file path. */
- if(
uri[0] == '/'
) {
+ if(
stat(uri, &st) == 0
) {
rp = realpath(uri, NULL);
u = g_strdup_printf("file://%s", rp);
free(rp);
rp = realpath(uri, NULL);
u = g_strdup_printf("file://%s", rp);
free(rp);
@@
-644,9
+645,11
@@
newclient(void) {
g_signal_connect(G_OBJECT(c->win),
"destroy",
G_CALLBACK(destroywin), c);
g_signal_connect(G_OBJECT(c->win),
"destroy",
G_CALLBACK(destroywin), c);
- g_signal_connect(G_OBJECT(c->win),
- "key-press-event",
- G_CALLBACK(keypress), c);
+ if(!kioskmode) {
+ g_signal_connect(G_OBJECT(c->win),
+ "key-press-event",
+ G_CALLBACK(keypress), c);
+ }
/* Pane */
c->pane = gtk_vpaned_new();
/* Pane */
c->pane = gtk_vpaned_new();
@@
-748,6
+751,10
@@
newclient(void) {
enablespatialbrowsing, NULL);
g_object_set(G_OBJECT(settings), "enable-developer-extras",
enableinspector, NULL);
enablespatialbrowsing, NULL);
g_object_set(G_OBJECT(settings), "enable-developer-extras",
enableinspector, NULL);
+ g_object_set(G_OBJECT(settings), "enable-default-context-menu",
+ kioskmode ^ 1, NULL);
+ g_object_set(G_OBJECT(settings), "default-font-size",
+ defaultfontsize, NULL);
if(enableinspector) {
c->inspector = WEBKIT_WEB_INSPECTOR(
if(enableinspector) {
c->inspector = WEBKIT_WEB_INSPECTOR(
@@
-790,7
+797,7
@@
newclient(void) {
static void
newwindow(Client *c, const Arg *arg, gboolean noembed) {
guint i = 0;
static void
newwindow(Client *c, const Arg *arg, gboolean noembed) {
guint i = 0;
- const char *cmd[1
1
], *uri;
+ const char *cmd[1
2
], *uri;
const Arg a = { .v = (void *)cmd };
char tmp[64];
const Arg a = { .v = (void *)cmd };
char tmp[64];
@@
-804,6
+811,8
@@
newwindow(Client *c, const Arg *arg, gboolean noembed) {
}
if(!loadimages)
cmd[i++] = "-i";
}
if(!loadimages)
cmd[i++] = "-i";
+ if(kioskmode)
+ cmd[i++] = "-k";
if(!enableplugins)
cmd[i++] = "-p";
if(!enablescripts)
if(!enableplugins)
cmd[i++] = "-p";
if(!enablescripts)
@@
-881,11
+890,12
@@
processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
if(ev->atom == atoms[AtomFind]) {
arg.b = TRUE;
find(c, &arg);
if(ev->atom == atoms[AtomFind]) {
arg.b = TRUE;
find(c, &arg);
+
return GDK_FILTER_REMOVE;
return GDK_FILTER_REMOVE;
- }
- else if(ev->atom == atoms[AtomGo]) {
+ } else if(ev->atom == atoms[AtomGo]) {
arg.v = getatom(c, AtomGo);
loaduri(c, &arg);
arg.v = getatom(c, AtomGo);
loaduri(c, &arg);
+
return GDK_FILTER_REMOVE;
}
}
return GDK_FILTER_REMOVE;
}
}
@@
-1180,7
+1190,7
@@
updatewinid(Client *c) {
static void
usage(void) {
static void
usage(void) {
- die("usage: %s [-binpsvx] [-c cookiefile] [-e xid] [-r scriptfile]"
+ die("usage: %s [-bi
k
npsvx] [-c cookiefile] [-e xid] [-r scriptfile]"
" [-t stylefile] [-u useragent] [uri]\n", basename(argv0));
}
" [-t stylefile] [-u useragent] [uri]\n", basename(argv0));
}
@@
-1226,6
+1236,9
@@
main(int argc, char *argv[]) {
case 'i':
loadimages = 0;
break;
case 'i':
loadimages = 0;
break;
+ case 'k':
+ kioskmode = 1;
+ break;
case 'n':
enableinspector = 0;
break;
case 'n':
enableinspector = 0;
break;