karx/surf
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Correct and simplify buttonreleased() gdk event

Browse source 
The passed event is a GdkEvent (or GdkEventButton), but not a
GdkEventKey.
Access the struct directly.
This commit is contained in:
Quentin Rameau 2015-11-22 02:10:18 +01:00
parent fef80cd56c
commit 6e68af115d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
surf.c
View file

@ -130,7 +130,7 @@ static void cleanup(void);
static WebKitWebView *newview(Client *c, WebKitWebView *rv); static WebKitWebView *newview(Client *c, WebKitWebView *rv);
static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a, static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
Client *c); 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, static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key,
GdkModifierType mods, Client *c); GdkModifierType mods, Client *c);
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
@ -813,18 +813,17 @@ createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
} }
gboolean gboolean
buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c) buttonreleased(GtkWidget *w, GdkEvent *e, Client *c)
{ {
WebKitHitTestResultContext element; WebKitHitTestResultContext element;
GdkEventButton *eb = (GdkEventButton*)e;
int i; int i;
element = webkit_hit_test_result_get_context(c->mousepos); element = webkit_hit_test_result_get_context(c->mousepos);
for (i = 0; i < LENGTH(buttons); ++i) { for (i = 0; i < LENGTH(buttons); ++i) {
if (element & buttons[i].target && if (element & buttons[i].target &&
eb->button == buttons[i].button && e->button.button == buttons[i].button &&
CLEANMASK(eb->state) == CLEANMASK(buttons[i].mask) && CLEANMASK(e->button.state) == CLEANMASK(buttons[i].mask) &&
buttons[i].func) { buttons[i].func) {
buttons[i].func(c, &buttons[i].arg, c->mousepos); buttons[i].func(c, &buttons[i].arg, c->mousepos);
return buttons[i].stopevent; return buttons[i].stopevent;