Mercurial > hg > forks > geeqie
changeset 2452:8bcdac2603d3
Fix #473: Parameter type fix for "motion-notify-event" signal handlers
The "motion-notify-event" signal "event" parameter is a GdkEventMotion
structure, not GdkEventButton.
Patch created by Maciej S. Szmigiero
| author | Colin Clark <cclark@mcb.net> |
|---|---|
| date | Sat, 25 Feb 2017 11:11:45 +0000 |
| parents | 4dcee0e5155a |
| children | 7cdaa31d3b45 1981e764e760 7f65373166e7 |
| files | src/collect-table.c src/fullscreen.c src/image.c src/image.h src/layout_image.c src/pixbuf-renderer.c src/pixbuf-renderer.h src/typedefs.h src/ui_misc.c src/view_file_icon.c |
| diffstat | 10 files changed, 36 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/src/collect-table.c Fri Feb 24 20:09:35 2017 +0000 +++ b/src/collect-table.c Sat Feb 25 11:11:45 2017 +0000 @@ -1593,11 +1593,11 @@ *------------------------------------------------------------------- */ -static gboolean collection_table_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean collection_table_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data) { CollectTable *ct = data; - collection_table_motion_update(ct, (gint)bevent->x, (gint)bevent->y, FALSE); + collection_table_motion_update(ct, (gint)event->x, (gint)event->y, FALSE); return FALSE; }
--- a/src/fullscreen.c Fri Feb 24 20:09:35 2017 +0000 +++ b/src/fullscreen.c Sat Feb 25 11:11:45 2017 +0000 @@ -99,7 +99,7 @@ fs->hide_mouse_id = g_timeout_add(FULL_SCREEN_HIDE_MOUSE_DELAY, fullscreen_hide_mouse_cb, fs); } -static gboolean fullscreen_mouse_moved(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean fullscreen_mouse_moved(GtkWidget *widget, GdkEventMotion *event, gpointer data) { FullScreenData *fs = data;
--- a/src/image.c Fri Feb 24 20:09:35 2017 +0000 +++ b/src/image.c Sat Feb 25 11:11:45 2017 +0000 @@ -63,7 +63,7 @@ } } -static void image_drag_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data) +static void image_drag_cb(PixbufRenderer *pr, GdkEventMotion *event, gpointer data) { ImageWindow *imd = data; gint width, height; @@ -993,7 +993,7 @@ } void image_set_drag_func(ImageWindow *imd, - void (*func)(ImageWindow *, GdkEventButton *event, gdouble dx, gdouble dy, gpointer), + void (*func)(ImageWindow *, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer), gpointer data) { imd->func_drag = func;
--- a/src/image.h Fri Feb 24 20:09:35 2017 +0000 +++ b/src/image.h Sat Feb 25 11:11:45 2017 +0000 @@ -36,7 +36,7 @@ void (*func)(ImageWindow *, GdkEventButton *event, gpointer), gpointer data); void image_set_drag_func(ImageWindow *imd, - void (*func)(ImageWindow *, GdkEventButton *event, gdouble dx, gdouble dy, gpointer), + void (*func)(ImageWindow *, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer), gpointer data); void image_set_scroll_func(ImageWindow *imd, void (*func)(ImageWindow *, GdkEventScroll *event, gpointer),
--- a/src/layout_image.c Fri Feb 24 20:09:35 2017 +0000 +++ b/src/layout_image.c Sat Feb 25 11:11:45 2017 +0000 @@ -1722,7 +1722,7 @@ } } -static void layout_image_drag_cb(ImageWindow *imd, GdkEventButton *event, gdouble dx, gdouble dy, gpointer data) +static void layout_image_drag_cb(ImageWindow *imd, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer data) { gint i; LayoutWindow *lw = data; @@ -1793,7 +1793,7 @@ } -static void layout_image_drag_inactive_cb(ImageWindow *imd, GdkEventButton *event, gdouble dx, gdouble dy, gpointer data) +static void layout_image_drag_inactive_cb(ImageWindow *imd, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer data) { LayoutWindow *lw = data; gint i = image_idx(lw, imd);
--- a/src/pixbuf-renderer.c Fri Feb 24 20:09:35 2017 +0000 +++ b/src/pixbuf-renderer.c Sat Feb 25 11:11:45 2017 +0000 @@ -1303,9 +1303,9 @@ } } -static void pr_drag_signal(PixbufRenderer *pr, GdkEventButton *bevent) +static void pr_drag_signal(PixbufRenderer *pr, GdkEventMotion *event) { - g_signal_emit(pr, signals[SIGNAL_DRAG], 0, bevent); + g_signal_emit(pr, signals[SIGNAL_DRAG], 0, event); } static void pr_update_pixel_signal(PixbufRenderer *pr) @@ -1954,7 +1954,7 @@ *------------------------------------------------------------------- */ -static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data) { PixbufRenderer *pr; gint accel; @@ -1967,25 +1967,25 @@ * See http://bugzilla.gnome.org/show_bug.cgi?id=587714 for more. */ gint x, y; #if GTK_CHECK_VERSION(3,0,0) - device_manager = gdk_display_get_device_manager(gdk_window_get_display(bevent->window)); + device_manager = gdk_display_get_device_manager(gdk_window_get_display(event->window)); device = gdk_device_manager_get_client_pointer(device_manager); - gdk_window_get_device_position(bevent->window, device, &x, &y, NULL); + gdk_window_get_device_position(event->window, device, &x, &y, NULL); #else - gdk_window_get_pointer (bevent->window, &x, &y, NULL); + gdk_window_get_pointer (event->window, &x, &y, NULL); #endif - bevent->x = x; - bevent->y = y; + event->x = x; + event->y = y; pr = PIXBUF_RENDERER(widget); if (pr->scroller_id) { - pr->scroller_xpos = bevent->x; - pr->scroller_ypos = bevent->y; + pr->scroller_xpos = event->x; + pr->scroller_ypos = event->y; } - pr->x_mouse = bevent->x; - pr->y_mouse = bevent->y; + pr->x_mouse = event->x; + pr->y_mouse = event->y; pr_update_pixel_signal(pr); if (!pr->in_drag || !gdk_pointer_is_grabbed()) return FALSE; @@ -1999,7 +1999,7 @@ widget_set_cursor(widget, GDK_FLEUR); } - if (bevent->state & GDK_CONTROL_MASK) + if (event->state & GDK_CONTROL_MASK) { accel = PR_PAN_SHIFT_MULTIPLIER; } @@ -2009,19 +2009,19 @@ } /* do the scroll */ - pixbuf_renderer_scroll(pr, (pr->drag_last_x - bevent->x) * accel, - (pr->drag_last_y - bevent->y) * accel); - - pr_drag_signal(pr, bevent); - - pr->drag_last_x = bevent->x; - pr->drag_last_y = bevent->y; + pixbuf_renderer_scroll(pr, (pr->drag_last_x - event->x) * accel, + (pr->drag_last_y - event->y) * accel); + + pr_drag_signal(pr, event); + + pr->drag_last_x = event->x; + pr->drag_last_y = event->y; /* This is recommended by the GTK+ documentation, but does not work properly. * Use deprecated way until GTK+ gets a solution for correct motion hint handling: * http://bugzilla.gnome.org/show_bug.cgi?id=587714 */ - /* gdk_event_request_motions (bevent); */ + /* gdk_event_request_motions (event); */ return FALSE; }
--- a/src/pixbuf-renderer.h Fri Feb 24 20:09:35 2017 +0000 +++ b/src/pixbuf-renderer.h Sat Feb 25 11:11:45 2017 +0000 @@ -226,7 +226,7 @@ void (*update_pixel)(PixbufRenderer *pr); void (*render_complete)(PixbufRenderer *pr); - void (*drag)(PixbufRenderer *pr, GdkEventButton *event); + void (*drag)(PixbufRenderer *pr, GdkEventMotion *event); };
--- a/src/typedefs.h Fri Feb 24 20:09:35 2017 +0000 +++ b/src/typedefs.h Sat Feb 25 11:11:45 2017 +0000 @@ -479,7 +479,7 @@ /* button, scroll functions */ void (*func_button)(ImageWindow *, GdkEventButton *event, gpointer); - void (*func_drag)(ImageWindow *, GdkEventButton *event, gdouble dx, gdouble dy, gpointer); + void (*func_drag)(ImageWindow *, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer); void (*func_scroll)(ImageWindow *, GdkEventScroll *event, gpointer); void (*func_focus_in)(ImageWindow *, gpointer);
--- a/src/ui_misc.c Fri Feb 24 20:09:35 2017 +0000 +++ b/src/ui_misc.c Sat Feb 25 11:11:45 2017 +0000 @@ -1201,7 +1201,7 @@ return handle_size; } -static gboolean sizer_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean sizer_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data) { SizerData *sd = data; gint x, y; @@ -1210,8 +1210,8 @@ if (!sd->in_drag) return FALSE; - x = sd->press_x - bevent->x_root; - y = sd->press_y - bevent->y_root; + x = sd->press_x - event->x_root; + y = sd->press_y - event->y_root; w = sd->press_width; h = sd->press_height;
--- a/src/view_file_icon.c Fri Feb 24 20:09:35 2017 +0000 +++ b/src/view_file_icon.c Sat Feb 25 11:11:45 2017 +0000 @@ -1372,12 +1372,12 @@ *------------------------------------------------------------------- */ -static gboolean vficon_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean vficon_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data) { ViewFile *vf = data; IconData *id; - id = vficon_find_data_by_coord(vf, (gint)bevent->x, (gint)bevent->y, NULL); + id = vficon_find_data_by_coord(vf, (gint)event->x, (gint)event->y, NULL); tip_update(vf, id); return FALSE;