X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=deb916fcc70c87ff39fd65428b5de69d11f25b70;hb=9708b64eed9c51ebbec702d92bc97645ccbb0be6;hp=3520684dbeab984a7a99b5858ec7f447e2e2d774;hpb=277d11037f1d5e6fafae65dcf38e5822fdef2338;p=surf.git

diff --git a/surf.c b/surf.c
index 3520684..deb916f 100644
--- a/surf.c
+++ b/surf.c
@@ -17,14 +17,14 @@
 #include <glib/gstdio.h>
 
 #define LENGTH(x) (sizeof x / sizeof x[0])
+#define CLEANMASK(mask)         (mask & ~(GDK_MOD2_MASK))
 
 Display *dpy;
 Atom urlprop;
 typedef union Arg Arg;
 union Arg {
 	const gboolean b;
-	const int i;
-	const unsigned int ui;
+	const gint i;
 	const void *v;
 } ;
 
@@ -68,7 +68,7 @@ gboolean embed = FALSE;
 gboolean showxid = FALSE;
 gboolean ignore_once = FALSE;
 extern char *optarg;
-extern int optind;
+extern gint optind;
 
 static void cleanup(void);
 static void proccookies(SoupMessage *m, Client *c);
@@ -177,30 +177,24 @@ die(char *str) {
 
 void
 drawindicator(Client *c) {
-	GtkWidget *w;
 	gint width;
-	GdkGC *gc;
 	gchar *uri;
-
+	GtkWidget *w;
+	GdkGC *gc;
+	GdkColor fg;
 
 	uri = geturi(c);
 	w = c->indicator;
 	width = c->progress * w->allocation.width / 100;
-
 	gc = gdk_gc_new(w->window);
-
-	if(strstr(uri, "https://") == uri)
-		gdk_gc_set_rgb_fg_color(gc, &progress_trust);
-	else
-		gdk_gc_set_rgb_fg_color(gc, &progress);
+	gdk_color_parse(strstr(uri, "https://") == uri ?
+			progress_trust : progress, &fg);
+	gdk_gc_set_rgb_fg_color(gc, &fg);
 	gdk_draw_rectangle(w->window,
 			w->style->bg_gc[GTK_WIDGET_STATE(w)],
-			TRUE,
-			0, 0, w->allocation.width, w->allocation.height);
-	gdk_draw_rectangle(w->window,
-			gc,
-			TRUE,
-			0, 0, width, w->allocation.height);
+			TRUE, 0, 0, w->allocation.width, w->allocation.height);
+	gdk_draw_rectangle(w->window, gc, TRUE, 0, 0, width,
+			w->allocation.height);
 	g_object_unref(gc);/*g_free(gc);*/
 }
 
@@ -216,7 +210,7 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 
 	status = webkit_download_get_status(c->download);
 	if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
-		c->progress = (int)(webkit_download_get_progress(c->download)*100);
+		c->progress = (gint)(webkit_download_get_progress(c->download)*100);
 	}
 	update(c, NULL);
 }
@@ -270,7 +264,7 @@ hideurl(Client *c, const Arg *arg) {
 
 gboolean
 keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
-	unsigned int i, focus;
+	guint i, focus;
 	gboolean processed = FALSE;
 
 	if(ev->type != GDK_KEY_PRESS)
@@ -283,7 +277,8 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 		focus = BROWSER;
 	for(i = 0; i < LENGTH(keys); i++) {
 		if(focus & keys[i].focus && ev->keyval == keys[i].keyval &&
-				(ev->state == keys[i].mod || ev->state & keys[i].mod)
+				(CLEANMASK(ev->state) == keys[i].mod ||
+				 CLEANMASK(ev->state) & keys[i].mod)
 				&& keys[i].func) {
 			keys[i].func(c, &(keys[i].arg));
 			processed = TRUE;
@@ -449,8 +444,11 @@ newclient(void) {
 	c->title = NULL;
 	c->next = clients;
 	clients = c;
-	if(showxid)
-		printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+	if(showxid) {
+		gdk_display_sync(gtk_widget_get_display(c->win));
+		printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+		fflush(NULL);
+	}
 	return c;
 }
 
@@ -473,7 +471,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 	Client *c = (Client *)d;
 	XPropertyEvent *ev;
 	Atom adummy;
-	int idummy;
+	gint idummy;
 	unsigned long ldummy;
 	unsigned char *buf = NULL;
 	Arg arg;
@@ -622,7 +620,7 @@ zoom(Client *c, const Arg *arg) {
 int main(int argc, char *argv[]) {
 	SoupSession *s;
 	Client *c;
-	int o;
+	gint o;
 	const gchar *home, *filename;
 	Arg arg;
 
@@ -661,8 +659,6 @@ int main(int argc, char *argv[]) {
 
 	/* make dirs */
 	home = g_get_home_dir();
-	filename = g_build_filename(home, ".surf", NULL);
-	g_mkdir_with_parents(filename, 0711);
 	filename = g_build_filename(home, ".surf", "dl", NULL);
 	g_mkdir_with_parents(filename, 0755);