X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=surf.c;h=deb916fcc70c87ff39fd65428b5de69d11f25b70;hb=9708b64eed9c51ebbec702d92bc97645ccbb0be6;hp=3b09f06d5f743c65f52f24083b4d623a429df3fb;hpb=4dbf90e0d7846bfdfa93564b6ec85068367f2008;p=surf.git

diff --git a/surf.c b/surf.c
index 3b09f06..deb916f 100644
--- a/surf.c
+++ b/surf.c
@@ -17,6 +17,7 @@
 #include <glib/gstdio.h>
 
 #define LENGTH(x) (sizeof x / sizeof x[0])
+#define CLEANMASK(mask)         (mask & ~(GDK_MOD2_MASK))
 
 Display *dpy;
 Atom urlprop;
@@ -276,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;
@@ -442,8 +444,11 @@ newclient(void) {
 	c->title = NULL;
 	c->next = clients;
 	clients = c;
-	if(showxid)
+	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;
 }
 
@@ -654,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);