pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied patch from pancake
[surf.git]
/
surf.c
diff --git
a/surf.c
b/surf.c
index
3b09f06
..
deb916f
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-17,6
+17,7
@@
#include <glib/gstdio.h>
#define LENGTH(x) (sizeof x / sizeof x[0])
#include <glib/gstdio.h>
#define LENGTH(x) (sizeof x / sizeof x[0])
+#define CLEANMASK(mask) (mask & ~(GDK_MOD2_MASK))
Display *dpy;
Atom urlprop;
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 &&
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;
&& 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;
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));
printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+ fflush(NULL);
+ }
return c;
}
return c;
}
@@
-654,8
+659,6
@@
int main(int argc, char *argv[]) {
/* make dirs */
home = g_get_home_dir();
/* 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);
filename = g_build_filename(home, ".surf", "dl", NULL);
g_mkdir_with_parents(filename, 0755);