Use explicit names for mouse buttons instead of numbers.

MOUSE_BUTTON_LEFT   = 1
MOUSE_BUTTON_MIDDLE = 2
MOUSE_BUTTON_RIGHT  = 3
It makes the code easier to read.

diff --git a/src/collect-table.c b/src/collect-table.c
index ebfc64f..6cae8b0 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -1427,7 +1427,7 @@ static gint collection_table_press_cb(GtkWidget *widget, GdkEventButton *bevent,
 
        switch (bevent->button)
                {
-               case 1:
+               case MOUSE_BUTTON_LEFT:
                        if (bevent->type == GDK_2BUTTON_PRESS)
                                {
                                if (info)
@@ -1440,7 +1440,7 @@ static gint collection_table_press_cb(GtkWidget *widget, GdkEventButton *bevent,
                                gtk_widget_grab_focus(ct->listview);
                                }
                        break;
-               case 3:
+               case MOUSE_BUTTON_RIGHT:
                        ct->popup = collection_table_popup_menu(ct, (info != NULL));
                        gtk_menu_popup(GTK_MENU(ct->popup), NULL, NULL, NULL, NULL, bevent->button, bevent->time);
                        break;
@@ -1469,7 +1469,7 @@ static gint collection_table_release_cb(GtkWidget *widget, GdkEventButton *beven
                collection_table_selection_remove(ct, ct->click_info, SELECTION_PRELIGHT, NULL);
                }
 
-       if (bevent->button == 1 &&
+       if (bevent->button == MOUSE_BUTTON_LEFT &&
            info && ct->click_info == info)
                {
                collection_table_set_focus(ct, info);
@@ -1503,7 +1503,7 @@ static gint collection_table_release_cb(GtkWidget *widget, GdkEventButton *beven
                                }
                        }
                }
-       else if (bevent->button == 2 &&
+       else if (bevent->button == MOUSE_BUTTON_MIDDLE &&
                 info && ct->click_info == info)
                {
                collection_table_select_util(ct, info, !INFO_SELECTED(info));

diff --git a/src/dupe.c b/src/dupe.c
index a402e4d..201c812 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -2289,7 +2289,7 @@ static gint dupe_listview_press_cb(GtkWidget *widget, GdkEventButton *bevent, gp
 
        dw->click_item = di;
 
-       if (bevent->button == 3)
+       if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
                /* right click menu */
                GtkWidget *menu;
@@ -2312,14 +2312,15 @@ static gint dupe_listview_press_cb(GtkWidget *widget, GdkEventButton *bevent, gp
 
        if (!di) return FALSE;
 
-       if (bevent->button == 1 && bevent->type == GDK_2BUTTON_PRESS)
+       if (bevent->button == MOUSE_BUTTON_LEFT &&
+           bevent->type == GDK_2BUTTON_PRESS)
                {
                dupe_menu_view(dw, di, widget, FALSE);
                }
 
-       if (bevent->button == 2) return TRUE;
+       if (bevent->button == MOUSE_BUTTON_MIDDLE) return TRUE;
 
-       if (bevent->button == 3)
+       if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
                if (!dupe_listview_item_is_selected(dw, di, widget))
                        {
@@ -2337,7 +2338,8 @@ static gint dupe_listview_press_cb(GtkWidget *widget, GdkEventButton *bevent, gp
                return TRUE;
                }
 
-       if (bevent->button == 1 && bevent->type == GDK_BUTTON_PRESS &&
+       if (bevent->button == MOUSE_BUTTON_LEFT &&
+           bevent->type == GDK_BUTTON_PRESS &&
            !(bevent->state & GDK_SHIFT_MASK ) &&
            !(bevent->state & GDK_CONTROL_MASK ) &&
            dupe_listview_item_is_selected(dw, di, widget))
@@ -2358,7 +2360,7 @@ static gint dupe_listview_release_cb(GtkWidget *widget, GdkEventButton *bevent,
        GtkTreeIter iter;
        DupeItem *di = NULL;
 
-       if (bevent->button != 1 && bevent->button != 2) return TRUE;
+       if (bevent->button != MOUSE_BUTTON_LEFT && bevent->button != MOUSE_BUTTON_MIDDLE) return TRUE;
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
 
@@ -2371,7 +2373,7 @@ static gint dupe_listview_release_cb(GtkWidget *widget, GdkEventButton *bevent,
                gtk_tree_path_free(tpath);
                }
 
-       if (bevent->button == 2)
+       if (bevent->button == MOUSE_BUTTON_MIDDLE)
                {
                if (di && dw->click_item == di)
                        {

diff --git a/src/img-view.c b/src/img-view.c
index 877b6d1..dd2c56f 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -603,13 +603,13 @@ static void button_cb(ImageWindow *imd, gint button, guint32 time,
 
        switch (button)
                {
-               case 1:
+               case MOUSE_BUTTON_LEFT:
                        view_step_next(vw);
                        break;
-               case 2:
+               case MOUSE_BUTTON_MIDDLE:
                        view_step_prev(vw);
                        break;
-               case 3:
+               case MOUSE_BUTTON_RIGHT:
                        menu = view_popup_menu(vw);
                        gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, time);
                        break;

diff --git a/src/info.c b/src/info.c
index 31d9a5d..96b3535 100644 (file)
--- a/src/info.c
+++ b/src/info.c
@@ -696,11 +696,11 @@ static void info_window_next_cb(GtkWidget *widget, gpointer data)
 static void info_window_image_button_cb(ImageWindow *imd, gint button, guint32 time,
                                        gdouble x, gdouble y, guint state, gpointer data)
 {
-       if (button == 1)
+       if (button == MOUSE_BUTTON_LEFT)
                {
                info_window_next_cb(NULL, data);
                }
-       else if (button == 2 || button == 3)
+       else if (button == MOUSE_BUTTON_MIDDLE || button == MOUSE_BUTTON_RIGHT)
                {
                info_window_back_cb(NULL, data);
                }

diff --git a/src/layout_image.c b/src/layout_image.c
index de257ed..1e0e624 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1544,13 +1544,13 @@ static void layout_image_button_cb(ImageWindow *imd, gint button, guint32 time,
 
        switch (button)
                {
-               case 1:
+               case MOUSE_BUTTON_LEFT:
                        layout_image_next(lw);
                        break;
-               case 2:
+               case MOUSE_BUTTON_MIDDLE:
                        layout_image_prev(lw);
                        break;
-               case 3:
+               case MOUSE_BUTTON_RIGHT:
                        menu = layout_image_pop_menu(lw);
                        if (imd == lw->image)
                                {
@@ -1669,7 +1669,7 @@ static void layout_image_button_inactive_cb(ImageWindow *imd, gint button, guint
 
        switch (button)
                {
-               case 3:
+               case MOUSE_BUTTON_RIGHT:
                        menu = layout_image_pop_menu(lw);
                        if (imd == lw->image)
                                {

diff --git a/src/pan-view.c b/src/pan-view.c
index 722cda3..37317c3 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -2026,7 +2026,7 @@ static void button_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
                }
 
        pi = pan_item_find_by_coord(pw, PAN_ITEM_BOX, rx, ry, "info");
-       if (pi && event->button == 1)
+       if (pi && event->button == MOUSE_BUTTON_LEFT)
                {
                pan_info_update(pw, NULL);
                return;
@@ -2037,7 +2037,7 @@ static void button_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
 
        switch (event->button)
                {
-               case 1:
+               case MOUSE_BUTTON_LEFT:
                        pan_info_update(pw, pi);
 
                        if (!pi && pw->layout == PAN_LAYOUT_CALENDAR)
@@ -2046,9 +2046,9 @@ static void button_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
                                pan_calendar_update(pw, pi);
                                }
                        break;
-               case 2:
+               case MOUSE_BUTTON_MIDDLE:
                        break;
-               case 3:
+               case MOUSE_BUTTON_RIGHT:
                        pan_info_update(pw, pi);
                        menu = pan_popup_menu(pw);
                        gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time);

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index a88777a..56a4427 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -3593,7 +3593,7 @@ static gint pr_mouse_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointe
 
        switch (bevent->button)
                {
-               case 1:
+               case MOUSE_BUTTON_LEFT:
                        pr->in_drag = TRUE;
                        pr->drag_last_x = bevent->x;
                        pr->drag_last_y = bevent->y;
@@ -3603,10 +3603,10 @@ static gint pr_mouse_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointe
                                         NULL, NULL, bevent->time);
                        gtk_grab_add(widget);
                        break;
-               case 2:
+               case MOUSE_BUTTON_MIDDLE:
                        pr->drag_moved = 0;
                        break;
-               case 3:
+               case MOUSE_BUTTON_RIGHT:
                        pr_clicked_signal(pr, bevent);
                        break;
                default:
@@ -3643,11 +3643,11 @@ static gint pr_mouse_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpoin
 
        if (pr->drag_moved < PR_DRAG_SCROLL_THRESHHOLD)
                {
-               if (bevent->button == 1 && (bevent->state & GDK_SHIFT_MASK))
+               if (bevent->button == MOUSE_BUTTON_LEFT && (bevent->state & GDK_SHIFT_MASK))
                        {
                        pr_scroller_start(pr, bevent->x, bevent->y);
                        }
-               else if (bevent->button == 1 || bevent->button == 2)
+               else if (bevent->button == MOUSE_BUTTON_LEFT || bevent->button == MOUSE_BUTTON_MIDDLE)
                        {
                        pr_clicked_signal(pr, bevent);
                        }

diff --git a/src/search.c b/src/search.c
index 04eae38..d2745ca 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1045,7 +1045,7 @@ static gint search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gp
 
        sd->click_fd = mfd ? mfd->fd : NULL;
 
-       if (bevent->button == 3)
+       if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
                GtkWidget *menu;
 
@@ -1055,14 +1055,14 @@ static gint search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gp
 
        if (!mfd) return FALSE;
 
-       if (bevent->button == 1 && bevent->type == GDK_2BUTTON_PRESS)
+       if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_2BUTTON_PRESS)
                {
                layout_image_set_fd(NULL, mfd->fd);
                }
 
-       if (bevent->button == 2) return TRUE;
+       if (bevent->button == MOUSE_BUTTON_MIDDLE) return TRUE;
 
-       if (bevent->button == 3)
+       if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
                if (!search_result_row_selected(sd, mfd->fd))
                        {
@@ -1079,7 +1079,7 @@ static gint search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gp
                return TRUE;
                }
 
-       if (bevent->button == 1 && bevent->type == GDK_BUTTON_PRESS &&
+       if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_BUTTON_PRESS &&
            !(bevent->state & GDK_SHIFT_MASK ) &&
            !(bevent->state & GDK_CONTROL_MASK ) &&
            search_result_row_selected(sd, mfd->fd))
@@ -1101,7 +1101,7 @@ static gint search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent,
 
        MatchFileData *mfd = NULL;
 
-       if (bevent->button != 1 && bevent->button != 2) return TRUE;
+       if (bevent->button != MOUSE_BUTTON_LEFT && bevent->button != MOUSE_BUTTON_MIDDLE) return TRUE;
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
 
@@ -1114,7 +1114,7 @@ static gint search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent,
                gtk_tree_path_free(tpath);
                }
 
-       if (bevent->button == 2)
+       if (bevent->button == MOUSE_BUTTON_MIDDLE)
                {
                if (mfd && sd->click_fd == mfd->fd)
                        {

diff --git a/src/typedefs.h b/src/typedefs.h
index a2734d0..c7707f8 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -13,6 +13,14 @@
 #ifndef TYPEDEFS_H
 #define TYPEDEFS_H
 
+typedef enum {
+       MOUSE_BUTTON_LEFT       = 1,
+       MOUSE_BUTTON_MIDDLE     = 2,
+       MOUSE_BUTTON_RIGHT      = 3,
+       MOUSE_BUTTON_WHEEL_UP   = 4,
+       MOUSE_BUTTON_WHEEL_DOWN = 5
+} MouseButton;
+
 typedef enum {
        DIRVIEW_LIST,
        DIRVIEW_TREE

diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index e07d227..8b0485e 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -735,7 +735,7 @@ static gint bookmark_press_cb(GtkWidget *button, GdkEventButton *event, gpointer
 {
        BookMarkData *bm = data;
 
-       if (event->button != 3) return FALSE;
+       if (event->button != MOUSE_BUTTON_RIGHT) return FALSE;
 
        bookmark_menu_popup(bm, button, event->button, event->time, FALSE);
 

diff --git a/src/ui_misc.c b/src/ui_misc.c
index 6d43e02..43d3613 100644 (file)
--- a/src/ui_misc.c
+++ b/src/ui_misc.c
@@ -21,6 +21,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "main.h"
 #include "ui_misc.h"
 
 #include "ui_bookmark.h"
@@ -1249,7 +1250,7 @@ static gint sizer_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer d
 {
        SizerData *sd = data;
 
-       if (bevent->button != 1) return FALSE;
+       if (bevent->button != MOUSE_BUTTON_LEFT) return FALSE;
 
        sd->in_drag = TRUE;
        sd->press_x = bevent->x_root;
@@ -1270,7 +1271,7 @@ static gint sizer_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
 {
        SizerData *sd = data;
 
-       if (bevent->button != 1) return FALSE;
+       if (bevent->button != MOUSE_BUTTON_LEFT) return FALSE;
 
        if (gdk_pointer_is_grabbed() && GTK_WIDGET_HAS_GRAB(sd->sizer))
                {

diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c
index 90cdcc3..66a4ab7 100644 (file)
--- a/src/ui_pathsel.c
+++ b/src/ui_pathsel.c
@@ -669,7 +669,7 @@ static gint dest_press_cb(GtkWidget *view, GdkEventButton *event, gpointer data)
        GtkTreeIter iter;
        GtkTreeSelection *selection;
 
-       if (event->button != 3 ||
+       if (event->button != MOUSE_BUTTON_RIGHT ||
            !gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(view), event->x, event->y,
                                           &tpath, &column, &cell_x, &cell_y))
                {

diff --git a/src/utilops.c b/src/utilops.c
index 40e7257..14b7d77 100644 (file)
--- a/src/utilops.c
+++ b/src/utilops.c
@@ -1721,11 +1721,11 @@ static void file_util_delete_multiple_review_next(GtkWidget *button, gpointer da
 static void file_util_delete_multiple_review_button_cb(ImageWindow *imd, gint button, guint32 time,
                                                       gdouble x, gdouble y, guint state, gpointer data)
 {
-       if (button == 1)
+       if (button == MOUSE_BUTTON_LEFT)
                {
                file_util_delete_multiple_review_next(NULL, data);
                }
-       else if (button == 2 || button == 3)
+       else if (button == MOUSE_BUTTON_MIDDLE || button == MOUSE_BUTTON_RIGHT)
                {
                file_util_delete_multiple_review_back(NULL, data);
                }

diff --git a/src/view_dir.c b/src/view_dir.c
index 591383b..ee6ea0a 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -929,7 +929,7 @@ gint vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
        if (!vd->click_fd) return FALSE;
        vd_color_set(vd, vd->click_fd, FALSE);
 
-       if (bevent->button != 1) return TRUE;
+       if (bevent->button != MOUSE_BUTTON_LEFT) return TRUE;
 
        if ((bevent->x != 0 || bevent->y != 0) &&
            gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,

diff --git a/src/view_dir_list.c b/src/view_dir_list.c
index 592369a..9c85d0e 100644 (file)
--- a/src/view_dir_list.c
+++ b/src/view_dir_list.c
@@ -337,7 +337,7 @@ gint vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
        vd->click_fd = fd;
        vd_color_set(vd, vd->click_fd, TRUE);
 
-       if (bevent->button == 3)
+       if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
                vd->popup = vd_pop_menu(vd, vd->click_fd);
                gtk_menu_popup(GTK_MENU(vd->popup), NULL, NULL, NULL, NULL,

diff --git a/src/view_dir_tree.c b/src/view_dir_tree.c
index fea8d4f..4a555d7 100644 (file)
--- a/src/view_dir_tree.c
+++ b/src/view_dir_tree.c
@@ -832,7 +832,7 @@ gint vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
                        /* clicking this region should automatically reveal an expander, if necessary
                         * treeview bug: the expander will not expand until a button_motion_event highlights it.
                         */
-                       if (bevent->button == 1 &&
+                       if (bevent->button == MOUSE_BUTTON_LEFT &&
                            !left_of_expander &&
                            !gtk_tree_view_row_expanded(GTK_TREE_VIEW(vd->view), tpath))
                                {
@@ -850,14 +850,14 @@ gint vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
        vd->click_fd = (nd) ? nd->fd : NULL;
        vd_color_set(vd, vd->click_fd, TRUE);
 
-       if (bevent->button == 3)
+       if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
                vd->popup = vd_pop_menu(vd, vd->click_fd);
                gtk_menu_popup(GTK_MENU(vd->popup), NULL, NULL, NULL, NULL,
                               bevent->button, bevent->time);
                }
 
-       return (bevent->button != 1);
+       return (bevent->button != MOUSE_BUTTON_LEFT);
 }
 
 static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index fc36234..0082a9c 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -1450,7 +1450,7 @@ static gint vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
 
        switch (bevent->button)
                {
-               case 1:
+               case MOUSE_BUTTON_LEFT:
                        if (!GTK_WIDGET_HAS_FOCUS(vfi->listview))
                                {
                                gtk_widget_grab_focus(vfi->listview);
@@ -1464,7 +1464,7 @@ static gint vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
                                }
 #endif
                        break;
-               case 3:
+               case MOUSE_BUTTON_RIGHT:
                        vfi->popup = vficon_pop_menu(vfi, (id != NULL));
                        gtk_menu_popup(GTK_MENU(vfi->popup), NULL, NULL, NULL, NULL, bevent->button, bevent->time);
                        break;
@@ -1496,7 +1496,7 @@ static gint vficon_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointe
 
        if (id) was_selected = (id->selected & SELECTION_SELECTED);
 
-       if (bevent->button == 1 &&
+       if (bevent->button == MOUSE_BUTTON_LEFT &&
            id && vfi->click_id == id)
                {
                vficon_set_focus(vfi, id);
@@ -1531,7 +1531,7 @@ static gint vficon_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointe
                                }
                        }
                }
-       else if (bevent->button == 2 &&
+       else if (bevent->button == MOUSE_BUTTON_MIDDLE &&
                 id && vfi->click_id == id)
                {
                vficon_select_util(vfi, id, !(id->selected & SELECTION_SELECTED));

diff --git a/src/view_file_list.c b/src/view_file_list.c
index 076bbc4..82a5f6c 100644 (file)
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -715,7 +715,7 @@ static gint vflist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
                GtkTreeModel *store;
                col_idx = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(column), "column_store_idx"));
 
-               if (bevent->button == 1 &&
+               if (bevent->button == MOUSE_BUTTON_LEFT &&
                    col_idx >= FILE_COLUMN_MARKS && col_idx <= FILE_COLUMN_MARKS_LAST)
                        return FALSE;
 
@@ -731,7 +731,7 @@ static gint vflist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
 
        vfl->click_fd = fd;
 
-       if (bevent->button == 3)
+       if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
                vfl->popup = vflist_pop_menu(vfl, vfl->click_fd, col_idx);
                gtk_menu_popup(GTK_MENU(vfl->popup), NULL, NULL, NULL, NULL,
@@ -741,7 +741,7 @@ static gint vflist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
 
        if (!fd) return FALSE;
 
-       if (bevent->button == 2)
+       if (bevent->button == MOUSE_BUTTON_MIDDLE)
                {
                if (!vflist_row_is_selected(vfl, fd))
                        {
@@ -751,7 +751,7 @@ static gint vflist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
                }
 
 
-       if (bevent->button == 1 && bevent->type == GDK_BUTTON_PRESS &&
+       if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_BUTTON_PRESS &&
            !(bevent->state & GDK_SHIFT_MASK ) &&
            !(bevent->state & GDK_CONTROL_MASK ) &&
            vflist_row_is_selected(vfl, fd))
@@ -761,7 +761,7 @@ static gint vflist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
                }
 
 #if 0
-       if (bevent->button == 1 && bevent->type == GDK_2BUTTON_PRESS)
+       if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_2BUTTON_PRESS)
                {
                if (vfl->layout) layout_image_full_screen_start(vfl->layout);
                }
@@ -777,12 +777,12 @@ static gint vflist_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointe
        GtkTreeIter iter;
        FileData *fd = NULL;
 
-       if (bevent->button == 2)
+       if (bevent->button == MOUSE_BUTTON_MIDDLE)
                {
                vflist_color_set(vfl, vfl->click_fd, FALSE);
                }
 
-       if (bevent->button != 1 && bevent->button != 2)
+       if (bevent->button != MOUSE_BUTTON_LEFT && bevent->button != MOUSE_BUTTON_MIDDLE)
                {
                return TRUE;
                }
@@ -799,7 +799,7 @@ static gint vflist_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointe
                gtk_tree_path_free(tpath);
                }
 
-       if (bevent->button == 2)
+       if (bevent->button == MOUSE_BUTTON_MIDDLE)
                {
                if (fd && vfl->click_fd == fd)
                        {