Remove window hints settings

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 610aff2..bacf78f 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -130,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,
@@ -394,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;
 }
@@ -406,8 +406,8 @@ setatom(Client *c, int a, const char *v)
 {
        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 *
@@ -813,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;
@@ -906,7 +905,6 @@ winevent(GtkWidget *w, GdkEvent *e, Client *c)
 void
 showview(WebKitWebView *v, Client *c)
 {
-       GdkGeometry hints = { 1, 1 };
        GdkRGBA bgcolor = { 0 };
        GdkWindow *gwin;
 
@@ -917,8 +915,6 @@ showview(WebKitWebView *v, Client *c)
        c->win = createwindow(c);
 
        gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view));
-       gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints,
-                                     GDK_HINT_MIN_SIZE);
        gtk_widget_show_all(c->win);
        gtk_widget_grab_focus(GTK_WIDGET(c->view));