comparison src/pixbuf-renderer.c @ 1684:51820482c7e5

improved scroll on slower machines patch by Stanislav Brabec
author nadvornik
date Tue, 28 Jul 2009 22:27:24 +0000
parents 704ab52b3ac5
children 760e8d68290c
comparison
equal deleted inserted replaced
1683:30eb78c26e9b 1684:51820482c7e5
3744 static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) 3744 static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
3745 { 3745 {
3746 PixbufRenderer *pr; 3746 PixbufRenderer *pr;
3747 gint accel; 3747 gint accel;
3748 3748
3749 /* This is a hack, but work far the best, at least for single pointer systems.
3750 * See http://bugzilla.gnome.org/show_bug.cgi?id=587714 for more. */
3751 gint x, y;
3752 gdk_window_get_pointer (bevent->window, &x, &y, NULL);
3753 bevent->x = x;
3754 bevent->y = y;
3755
3749 pr = PIXBUF_RENDERER(widget); 3756 pr = PIXBUF_RENDERER(widget);
3750 3757
3751 if (pr->scroller_id) 3758 if (pr->scroller_id)
3752 { 3759 {
3753 pr->scroller_xpos = bevent->x; 3760 pr->scroller_xpos = bevent->x;
3785 pr_drag_signal(pr, bevent); 3792 pr_drag_signal(pr, bevent);
3786 3793
3787 pr->drag_last_x = bevent->x; 3794 pr->drag_last_x = bevent->x;
3788 pr->drag_last_y = bevent->y; 3795 pr->drag_last_y = bevent->y;
3789 3796
3797 /* This is recommended by the GTK+ documentation, but does not work properly.
3798 * Use deprecated way until GTK+ gets a solution for correct motion hint handling:
3799 * http://bugzilla.gnome.org/show_bug.cgi?id=587714
3800 */
3801 /* gdk_event_request_motions (bevent); */
3790 return FALSE; 3802 return FALSE;
3791 } 3803 }
3792 3804
3793 static gboolean pr_mouse_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) 3805 static gboolean pr_mouse_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
3794 { 3806 {
3805 pr->in_drag = TRUE; 3817 pr->in_drag = TRUE;
3806 pr->drag_last_x = bevent->x; 3818 pr->drag_last_x = bevent->x;
3807 pr->drag_last_y = bevent->y; 3819 pr->drag_last_y = bevent->y;
3808 pr->drag_moved = 0; 3820 pr->drag_moved = 0;
3809 gdk_pointer_grab(widget->window, FALSE, 3821 gdk_pointer_grab(widget->window, FALSE,
3810 GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, 3822 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK,
3811 NULL, NULL, bevent->time); 3823 NULL, NULL, bevent->time);
3812 gtk_grab_add(widget); 3824 gtk_grab_add(widget);
3813 break; 3825 break;
3814 case MOUSE_BUTTON_MIDDLE: 3826 case MOUSE_BUTTON_MIDDLE:
3815 pr->drag_moved = 0; 3827 pr->drag_moved = 0;
3903 g_signal_connect(G_OBJECT(pr), "leave_notify_event", 3915 g_signal_connect(G_OBJECT(pr), "leave_notify_event",
3904 G_CALLBACK(pr_mouse_leave_cb), pr); 3916 G_CALLBACK(pr_mouse_leave_cb), pr);
3905 g_signal_connect(G_OBJECT(pr), "hierarchy-changed", 3917 g_signal_connect(G_OBJECT(pr), "hierarchy-changed",
3906 G_CALLBACK(pr_hierarchy_changed_cb), pr); 3918 G_CALLBACK(pr_hierarchy_changed_cb), pr);
3907 3919
3908 gtk_widget_set_events(GTK_WIDGET(pr), GDK_POINTER_MOTION_MASK | 3920 gtk_widget_set_events(GTK_WIDGET(pr), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
3909 GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | 3921 GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK |
3910 GDK_LEAVE_NOTIFY_MASK); 3922 GDK_LEAVE_NOTIFY_MASK);
3911 3923
3912 g_signal_connect(G_OBJECT(pr), "drag_begin", 3924 g_signal_connect(G_OBJECT(pr), "drag_begin",
3913 G_CALLBACK(pr_mouse_drag_cb), pr); 3925 G_CALLBACK(pr_mouse_drag_cb), pr);