Mercurial > geeqie

changeset 580:e27c374460d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vficon_release_cb(): use switch() and cleanup.
author zas_
date Sun, 04 May 2008 23:57:20 +0000
parents 2ef88100cee2
children 9b43b8256afe
files src/view_file_icon.c
diffstat 1 files changed, 41 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/src/view_file_icon.c	Sun May 04 23:20:43 2008 +0000
+++ b/src/view_file_icon.c	Sun May 04 23:57:20 2008 +0000
@@ -1479,11 +1479,11 @@
 	ViewFile *vf = data;
 	GtkTreeIter iter;
 	IconData *id = NULL;
-	gint was_selected = FALSE;
+	gint was_selected;
 
 	tip_schedule(vf);
 
-	if ((gint)bevent->x != 0 || (gint) bevent->y != 0)
+	if ((gint)bevent->x != 0 || (gint)bevent->y != 0)
 		{
 		id = vficon_find_data_by_coord(vf, (gint)bevent->x, (gint)bevent->y, &iter);
 		}
@@ -1493,51 +1493,56 @@
 		vficon_selection_remove(vf, VFICON_INFO(vf, click_id), SELECTION_PRELIGHT, NULL);
 		}
 
-	if (id) was_selected = (id->selected & SELECTION_SELECTED);
-
-	if (bevent->button == MOUSE_BUTTON_LEFT &&
-	    id && VFICON_INFO(vf, click_id) == id)
+	if (!id || VFICON_INFO(vf, click_id) != id) return TRUE;
+
+	was_selected = (id->selected & SELECTION_SELECTED);
+
+	switch (bevent->button)
 		{
-		vficon_set_focus(vf, id);
-
-		if (bevent->state & GDK_CONTROL_MASK)
+		case MOUSE_BUTTON_LEFT:
 			{
-			gint select;
-
-			select = !(id->selected & SELECTION_SELECTED);
-			if ((bevent->state & GDK_SHIFT_MASK) && VFICON_INFO(vf, prev_selection))
+			vficon_set_focus(vf, id);
+
+			if (bevent->state & GDK_CONTROL_MASK)
 				{
-				vficon_select_region_util(vf, VFICON_INFO(vf, prev_selection), id, select);
+				gint select;
+
+				select = !(id->selected & SELECTION_SELECTED);
+				if ((bevent->state & GDK_SHIFT_MASK) && VFICON_INFO(vf, prev_selection))
+					{
+					vficon_select_region_util(vf, VFICON_INFO(vf, prev_selection), id, select);
+					}
+				else
+					{
+					vficon_select_util(vf, id, select);
+					}
 				}
 			else
 				{
-				vficon_select_util(vf, id, select);
+				vficon_select_none(vf);
+
+				if ((bevent->state & GDK_SHIFT_MASK) && VFICON_INFO(vf, prev_selection))
+					{
+					vficon_select_region_util(vf, VFICON_INFO(vf, prev_selection), id, TRUE);
+					}
+				else
+					{
+					vficon_select_util(vf, id, TRUE);
+					was_selected = FALSE;
+					}
 				}
 			}
-		else
+			break;
+		case MOUSE_BUTTON_MIDDLE:
 			{
-			vficon_select_none(vf);
-
-			if ((bevent->state & GDK_SHIFT_MASK) &&
-			    VFICON_INFO(vf, prev_selection))
-				{
-				vficon_select_region_util(vf, VFICON_INFO(vf, prev_selection), id, TRUE);
-				}
-			else
-				{
-				vficon_select_util(vf, id, TRUE);
-				was_selected = FALSE;
-				}
+			vficon_select_util(vf, id, !(id->selected & SELECTION_SELECTED));
 			}
+			break;
+		default:
+			break;
 		}
-	else if (bevent->button == MOUSE_BUTTON_MIDDLE &&
-		 id && VFICON_INFO(vf, click_id) == id)
-		{
-		vficon_select_util(vf, id, !(id->selected & SELECTION_SELECTED));
-		}
-
-	if (id && !was_selected &&
-	    (id->selected & SELECTION_SELECTED))
+
+	if (!was_selected && (id->selected & SELECTION_SELECTED))
 		{
 		vficon_send_layout_select(vf, id);
 		}