X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=faf712fd42f80ac16a4fb396809abf15a2c2e115;hp=23fd4520c9c96bf4d6d607d49a7c3b09ccbcea3b;hb=2fb122c01202e7b8f2b31f964daee19b86f4d433;hpb=6124176b896b528d57aeab7e0eaa46271bcb59c5

diff --git a/surf.c b/surf.c
index 23fd452..faf712f 100644
--- a/surf.c
+++ b/surf.c
@@ -56,8 +56,8 @@ enum {
 };
 
 typedef union {
-	gboolean b;
-	gint i;
+	int b;
+	int i;
 	const void *v;
 } Arg;
 
@@ -69,8 +69,7 @@ typedef struct Client {
 	WebKitHitTestResult *mousepos;
 	GTlsCertificateFlags tlsflags;
 	Window xid;
-	gint progress;
-	gboolean fullscreen;
+	int progress, fullscreen;
 	const char *title, *targeturi;
 	const char *needle;
 	struct Client *next;
@@ -122,7 +121,7 @@ static void runscript(Client *c);
 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);
@@ -131,7 +130,7 @@ 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,
@@ -185,7 +184,7 @@ static char togglestats[10];
 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;
@@ -395,9 +394,9 @@ loaduri(Client *c, const Arg *a)
 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;
 }
@@ -814,18 +813,17 @@ createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
 }
 
 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;
@@ -1235,8 +1233,7 @@ pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
 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);
@@ -1542,7 +1539,7 @@ main(int argc, char *argv[])
 		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);