};
typedef union {
- gboolean b;
- gint i;
+ int b;
+ int i;
const void *v;
} Arg;
WebKitHitTestResult *mousepos;
GTlsCertificateFlags tlsflags;
Window xid;
- gint progress;
- gboolean fullscreen;
+ int progress, fullscreen;
const char *title, *targeturi;
const char *needle;
struct Client *next;
static void evalscript(Client *c, const char *jsstr, ...);
static void updatewinid(Client *c);
static void handleplumb(Client *c, const char *uri);
-static void newwindow(Client *c, const Arg *a, gboolean noembed);
+static void newwindow(Client *c, const Arg *a, int noembed);
static void spawn(Client *c, const Arg *a);
static void destroyclient(Client *c);
static void cleanup(void);
static WebKitWebView *newview(Client *c, WebKitWebView *rv);
static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
Client *c);
-static gboolean buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c);
+static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c);
static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key,
GdkModifierType mods, Client *c);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
static char pagestats[2];
static Atom atoms[AtomLast];
static Window embed;
-static gboolean showxid = FALSE;
+static int showxid;
static int cookiepolicy;
static Display *dpy;
static Client *clients;
const char *
geturi(Client *c)
{
- char *uri;
+ const char *uri;
- if (!(uri = (char *)webkit_web_view_get_uri(c->view)))
+ if (!(uri = webkit_web_view_get_uri(c->view)))
uri = "about:blank";
return uri;
}
{
XSync(dpy, False);
XChangeProperty(dpy, c->xid,
- atoms[a], XA_STRING, 8, PropModeReplace,
- (unsigned char *)v, strlen(v) + 1);
+ atoms[a], XA_STRING, 8, PropModeReplace,
+ (unsigned char *)v, strlen(v) + 1);
}
const char *
}
gboolean
-buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c)
+buttonreleased(GtkWidget *w, GdkEvent *e, Client *c)
{
WebKitHitTestResultContext element;
- GdkEventButton *eb = (GdkEventButton*)e;
int i;
element = webkit_hit_test_result_get_context(c->mousepos);
for (i = 0; i < LENGTH(buttons); ++i) {
if (element & buttons[i].target &&
- eb->button == buttons[i].button &&
- CLEANMASK(eb->state) == CLEANMASK(buttons[i].mask) &&
+ e->button.button == buttons[i].button &&
+ CLEANMASK(e->button.state) == CLEANMASK(buttons[i].mask) &&
buttons[i].func) {
buttons[i].func(c, &buttons[i].arg, c->mousepos);
return buttons[i].stopevent;
void
reload(Client *c, const Arg *a)
{
- gboolean nocache = *(gboolean *)a;
- if (nocache)
+ if (a->b)
webkit_web_view_reload_bypass_cache(c->view);
else
webkit_web_view_reload(c->view);
die("surf-"VERSION", ©2009-2015 surf engineers, "
"see LICENSE for details\n");
case 'x':
- showxid = TRUE;
+ showxid = 1;
break;
case 'z':
zoomlevel = strtof(EARGF(usage()), NULL);