geeqie.yaz: src/view_file_icon.c comparison

comparison src/view_file_icon.c @ 633:fe700864cb5a

Use vf_* functions where possible.

author	zas_
date	Sun, 11 May 2008 21:11:54 +0000
parents	6e9413e92be5
children	92208e71673b

comparison

equal deleted inserted replaced

-:6e9413e92be5
+:fe700864cb5a
 #include "utilops.h"
 #include "ui_bookmark.h"
 #include "ui_fileops.h"
 #include "ui_menu.h"
 #include "ui_tree_edit.h"
+#include "view_file.h"
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 #define VFICON_INFO_POINTER(_vf_) ((ViewFileInfoIcon *)(_vf_->info))
 #define VFICON_INFO(_vf_, _part_) (VFICON_INFO_POINTER(_vf_)->_part_)
 {
 	IconData *ida = a;
 	IconData *idb = b;
 	return filelist_sort_compare_filedata(ida->fd, idb->fd);
 }
 GList *iconlist_sort(GList *list, SortType method, gint ascend)
 {
 	return filelist_sort_full(list, method, ascend, (GCompareFunc) iconlist_sort_file_cb);
 }
 {
 	if (!VFICON_INFO(vf, click_id)) return NULL;
 	if (VFICON_INFO(vf, click_id)->selected & SELECTION_SELECTED)
 		{
-		return vficon_selection_get_list(vf);
+		return vf_selection_get_list(vf);
 		}
 	return g_list_append(NULL, file_data_ref(VFICON_INFO(vf, click_id)->fd));
 }
 	if (VFICON_INFO(vf, click_id)->selected & SELECTION_SELECTED)
 		{
 		GList *list;
-		list = vficon_selection_get_list(vf);
+		list = vf_selection_get_list(vf);
 		view_window_new_from_list(list);
 		filelist_free(list);
 		}
 	else
 		{
 		{
 		layout_sort_set(vf->layout, type, vf->sort_ascend);
 		}
 	else
 		{
-		vficon_sort_set(vf, type, vf->sort_ascend);
+		vf_sort_set(vf, type, vf->sort_ascend);
 		}
 }
 static void vficon_pop_menu_sort_ascend_cb(GtkWidget *widget, gpointer data)
 {
 		{
 		layout_sort_set(vf->layout, vf->sort_method, !vf->sort_ascend);
 		}
 	else
 		{
-		vficon_sort_set(vf, vf->sort_method, !vf->sort_ascend);
+		vf_sort_set(vf, vf->sort_method, !vf->sort_ascend);
 		}
 }
 static void vficon_pop_menu_list_cb(GtkWidget *widget, gpointer data)
 {
 static void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
 {
 	ViewFile *vf = data;
-	vficon_refresh(vf);
+	vf_refresh(vf);
 }
 static void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data)
 {
 	ViewFile *vf = data;
 *-------------------------------------------------------------------
 * signals
 *-------------------------------------------------------------------
 */
-static void vficon_send_update(ViewFile *vf)
-{
-	if (vf->func_status) vf->func_status(vf, vf->data_status);
-}
 static void vficon_send_layout_select(ViewFile *vf, IconData *id)
 {
 	FileData *read_ahead_fd = NULL;
 	FileData *sel_fd;
 	FileData *cur_fd;
 		{
 		gint row;
 		row = g_list_index(vf->list, id);
 		if (row > vficon_index_by_fd(vf, cur_fd) &&
-		    row + 1 < vficon_count(vf, NULL))
+		    row + 1 < vf_count(vf, NULL))
 			{
-			read_ahead_fd = vficon_index_get_data(vf, row + 1);
+			read_ahead_fd = vf_index_get_data(vf, row + 1);
 			}
 		else if (row > 0)
 			{
-			read_ahead_fd = vficon_index_get_data(vf, row - 1);
+			read_ahead_fd = vf_index_get_data(vf, row - 1);
 			}
 		}
 	layout_image_set_with_ahead(vf->layout, sel_fd, read_ahead_fd);
 }
 	if (!VFICON_INFO(vf, click_id)) return;
 	if (VFICON_INFO(vf, click_id)->selected & SELECTION_SELECTED)
 		{
-		list = vficon_selection_get_list(vf);
+		list = vf_selection_get_list(vf);
 		}
 	else
 		{
 		list = g_list_append(NULL, file_data_ref(VFICON_INFO(vf, click_id)->fd));
 		}
 	vficon_selection_remove(vf, VFICON_INFO(vf, click_id), SELECTION_PRELIGHT, NULL);
 	if (context->action == GDK_ACTION_MOVE)
 		{
-		vficon_refresh(vf);
+		vf_refresh(vf);
 		}
 	tip_unschedule(vf);
 }
 		VFICON_INFO(vf, selection) = g_list_append(VFICON_INFO(vf, selection), id);
 		vficon_selection_add(vf, id, SELECTION_SELECTED, NULL);
 		}
-	vficon_send_update(vf);
+	vf_send_update(vf);
 }
 void vficon_select_none(ViewFile *vf)
 {
 	GList *work;
 		}
 	g_list_free(VFICON_INFO(vf, selection));
 	VFICON_INFO(vf, selection) = NULL;
-	vficon_send_update(vf);
+	vf_send_update(vf);
 }
 void vficon_select_invert(ViewFile *vf)
 {
 	GList *work;
 			VFICON_INFO(vf, selection) = g_list_append(VFICON_INFO(vf, selection), id);
 			vficon_selection_add(vf, id, SELECTION_SELECTED, NULL);
 			}
 		}
-	vficon_send_update(vf);
+	vf_send_update(vf);
 }
 static void vficon_select(ViewFile *vf, IconData *id)
 {
 	VFICON_INFO(vf, prev_selection) = id;
 	if (!id || id->selected & SELECTION_SELECTED) return;
 	VFICON_INFO(vf, selection) = g_list_append(VFICON_INFO(vf, selection), id);
 	vficon_selection_add(vf, id, SELECTION_SELECTED, NULL);
-	vficon_send_update(vf);
+	vf_send_update(vf);
 }
 static void vficon_unselect(ViewFile *vf, IconData *id)
 {
 	VFICON_INFO(vf, prev_selection) = id;
 	if (!id || !(id->selected & SELECTION_SELECTED) ) return;
 	VFICON_INFO(vf, selection) = g_list_remove(VFICON_INFO(vf, selection), id);
 	vficon_selection_remove(vf, id, SELECTION_SELECTED, NULL);
-	vficon_send_update(vf);
+	vf_send_update(vf);
 }
 static void vficon_select_util(ViewFile *vf, IconData *id, gint select)
 {
 	if (select)
 {
 	if (!id) return;
 	if (!(id->selected & SELECTION_SELECTED))
 		{
-		vficon_select_none(vf);
+		vf_select_none(vf);
 		vficon_select(vf, id);
 		}
 	vficon_set_focus(vf, id);
 }
 	GList *slist;
 	GList *work;
 	g_assert(mark >= 0 && mark < FILEDATA_MARKS_SIZE);
-	slist = vficon_selection_get_list(vf);
+	slist = vf_selection_get_list(vf);
 	work = slist;
 	while (work)
 		{
 		FileData *fd = work->data;
 						vficon_send_layout_select(vf, id);
 						}
 					}
 				else
 					{
-					vficon_select_none(vf);
+					vf_select_none(vf);
 					vficon_select(vf, id);
 					vficon_send_layout_select(vf, id);
 					}
 				}
 			break;
 				VFICON_INFO(vf, click_id) = new_id;
 				}
 			else
 				{
 				VFICON_INFO(vf, click_id) = new_id;
-				vficon_select_none(vf);
+				vf_select_none(vf);
 				vficon_select(vf, new_id);
 				vficon_send_layout_select(vf, new_id);
 				}
 			}
 		}
 					vficon_select_util(vf, id, select);
 					}
 				}
 			else
 				{
-				vficon_select_none(vf);
+				vf_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);
 					}
 			}
 		}
 	VFICON_INFO(vf, rows) = row + 1;
-	vficon_send_update(vf);
+	vf_send_update(vf);
 	vficon_thumb_update(vf);
 }
 static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gint force)
 {
 		if (!VFICON_INFO(vf, selection))
 			{
 			gint n;
-			n = vficon_count(vf, NULL);
+			n = vf_count(vf, NULL);
 			if (ignore_list)
 				{
 				new_row = vficon_maint_find_closest(vf, row, n, ignore_list);
 				DEBUG_1("row = %d, closest is %d", row, new_row);
 				}
 				}
 			if (new_row == -1)
 				{
 				/* selection all ignored, use closest */
-				new_row = vficon_maint_find_closest(vf, row, vficon_count(vf, NULL), ignore_list);
+				new_row = vficon_maint_find_closest(vf, row, vf_count(vf, NULL), ignore_list);
 				}
 			}
 		else
 			{
 			new_row = g_list_index(vf->list, VFICON_INFO(vf, selection)->data);
 	vf->list = g_list_remove(vf->list, id);
 	file_data_unref(fd);
 	g_free(id);
 	vficon_sync_idle(vf);
-	vficon_send_update(vf);
+	vf_send_update(vf);
 	return TRUE;
 }
 gint vficon_maint_moved(ViewFile *vf, FileData *fd, GList *ignore_list)

Mercurial > geeqie.yaz

comparison src/view_file_icon.c @ 633:fe700864cb5a