Mercurial > geeqie
annotate src/view_dir_list.c @ 1811:f405ec9b696b default tip
Some small logic mistakes
Use boolean operators for booleans and bitwise otherwise only.
author | mow |
---|---|
date | Mon, 10 May 2010 11:33:13 +0000 |
parents | c416d099a3dc |
children |
rev | line source |
---|---|
9 | 1 /* |
196 | 2 * Geeqie |
9 | 3 * (C) 2004 John Ellis |
1802 | 4 * Copyright (C) 2008 - 2010 The Geeqie Team |
9 | 5 * |
6 * Author: John Ellis | |
7 * | |
8 * This software is released under the GNU General Public License (GNU GPL). | |
9 * Please read the included file COPYING for more information. | |
10 * This software comes with no warranty of any kind, use at your own risk! | |
11 */ | |
12 | |
281 | 13 #include "main.h" |
9 | 14 #include "view_dir_list.h" |
15 | |
16 #include "dnd.h" | |
17 #include "dupe.h" | |
586 | 18 #include "filedata.h" |
9 | 19 #include "layout.h" |
20 #include "layout_image.h" | |
21 #include "layout_util.h" | |
22 #include "utilops.h" | |
23 #include "ui_fileops.h" | |
24 #include "ui_menu.h" | |
25 #include "ui_tree_edit.h" | |
380
5afe77bb563a
Introduce a new struct ViewDir to handle directory views common
zas_
parents:
373
diff
changeset
|
26 #include "view_dir.h" |
9 | 27 |
28 #include <gdk/gdkkeysyms.h> /* for keyboard values */ | |
29 | |
30 | |
979 | 31 #define VDLIST(_vd_) ((ViewDirInfoList *)(_vd_->info)) |
9 | 32 |
33 | |
34 /* | |
35 *----------------------------------------------------------------------------- | |
36 * misc | |
37 *----------------------------------------------------------------------------- | |
38 */ | |
39 | |
1452 | 40 gboolean vdlist_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter) |
9 | 41 { |
42 GtkTreeModel *store; | |
1452 | 43 gboolean valid; |
9 | 44 |
381 | 45 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)); |
9 | 46 valid = gtk_tree_model_get_iter_first(store, iter); |
47 while (valid) | |
48 { | |
49 FileData *fd_n; | |
50 gtk_tree_model_get(GTK_TREE_MODEL(store), iter, DIR_COLUMN_POINTER, &fd_n, -1); | |
1501 | 51 if (fd_n == fd) return TRUE; |
9 | 52 |
53 valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), iter); | |
54 } | |
55 | |
1501 | 56 return FALSE; |
9 | 57 } |
58 | |
59 | |
388
5186f8e38cb8
Make directory view popup menu common and move it to view_dir.{c,h}.
zas_
parents:
385
diff
changeset
|
60 FileData *vdlist_row_by_path(ViewDir *vd, const gchar *path, gint *row) |
9 | 61 { |
62 GList *work; | |
63 gint n; | |
64 | |
65 if (!path) | |
66 { | |
67 if (row) *row = -1; | |
68 return NULL; | |
69 } | |
70 | |
71 n = 0; | |
978
9ff64efe11eb
Replace macros VDLIST_INFO() and VDTREE_INFO() by shorter VDLIST() and VDTREE(). VDLIST_INFO(vd, part) becomes VDLIST(vd)->part.
zas_
parents:
973
diff
changeset
|
72 work = VDLIST(vd)->list; |
9 | 73 while (work) |
74 { | |
75 FileData *fd = work->data; | |
76 if (strcmp(fd->path, path) == 0) | |
77 { | |
78 if (row) *row = n; | |
79 return fd; | |
80 } | |
81 work = work->next; | |
82 n++; | |
83 } | |
84 | |
85 if (row) *row = -1; | |
86 return NULL; | |
87 } | |
88 | |
89 /* | |
90 *----------------------------------------------------------------------------- | |
91 * dnd | |
92 *----------------------------------------------------------------------------- | |
93 */ | |
94 | |
381 | 95 static void vdlist_scroll_to_row(ViewDir *vd, FileData *fd, gfloat y_align) |
9 | 96 { |
97 GtkTreeIter iter; | |
98 | |
1810 | 99 #if GTK_CHECK_VERSION(2,20,0) |
100 if (gtk_widget_get_realized(vd->view) && vd_find_row(vd, fd, &iter)) | |
101 #else | |
1553 | 102 if (GTK_WIDGET_REALIZED(vd->view) && vd_find_row(vd, fd, &iter)) |
1810 | 103 #endif |
9 | 104 { |
105 GtkTreeModel *store; | |
106 GtkTreePath *tpath; | |
107 | |
381 | 108 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)); |
9 | 109 tpath = gtk_tree_model_get_path(store, &iter); |
381 | 110 gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(vd->view), tpath, NULL, TRUE, y_align, 0.0); |
111 gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, NULL, FALSE); | |
9 | 112 gtk_tree_path_free(tpath); |
113 | |
1810 | 114 #if GTK_CHECK_VERSION(2,20,0) |
115 if (!gtk_widget_has_focus(vd->view)) gtk_widget_grab_focus(vd->view); | |
116 #else | |
381 | 117 if (!GTK_WIDGET_HAS_FOCUS(vd->view)) gtk_widget_grab_focus(vd->view); |
1810 | 118 #endif |
9 | 119 } |
120 } | |
121 | |
122 /* | |
123 *----------------------------------------------------------------------------- | |
124 * main | |
125 *----------------------------------------------------------------------------- | |
442 | 126 */ |
9 | 127 |
381 | 128 const gchar *vdlist_row_get_path(ViewDir *vd, gint row) |
9 | 129 { |
130 FileData *fd; | |
131 | |
978
9ff64efe11eb
Replace macros VDLIST_INFO() and VDTREE_INFO() by shorter VDLIST() and VDTREE(). VDLIST_INFO(vd, part) becomes VDLIST(vd)->part.
zas_
parents:
973
diff
changeset
|
132 fd = g_list_nth_data(VDLIST(vd)->list, row); |
9 | 133 |
134 if (fd) return fd->path; | |
135 | |
136 return NULL; | |
137 } | |
138 | |
1452 | 139 static gboolean vdlist_populate(ViewDir *vd, gboolean clear) |
9 | 140 { |
141 GtkListStore *store; | |
142 GList *work; | |
973 | 143 GtkTreeIter iter; |
1452 | 144 gboolean valid; |
973 | 145 gchar *filepath; |
146 GList *old_list; | |
1452 | 147 gboolean ret; |
973 | 148 FileData *fd; |
1780 | 149 SortType sort_type = SORT_NAME; |
150 gboolean sort_ascend = TRUE; | |
973 | 151 |
978
9ff64efe11eb
Replace macros VDLIST_INFO() and VDTREE_INFO() by shorter VDLIST() and VDTREE(). VDLIST_INFO(vd, part) becomes VDLIST(vd)->part.
zas_
parents:
973
diff
changeset
|
152 old_list = VDLIST(vd)->list; |
973 | 153 |
978
9ff64efe11eb
Replace macros VDLIST_INFO() and VDTREE_INFO() by shorter VDLIST() and VDTREE(). VDLIST_INFO(vd, part) becomes VDLIST(vd)->part.
zas_
parents:
973
diff
changeset
|
154 ret = filelist_read(vd->dir_fd, NULL, &VDLIST(vd)->list); |
1780 | 155 VDLIST(vd)->list = filelist_sort(VDLIST(vd)->list, sort_type, sort_ascend); |
973 | 156 |
157 /* add . and .. */ | |
158 | |
159 if (strcmp(vd->dir_fd->path, G_DIR_SEPARATOR_S) != 0) | |
160 { | |
161 filepath = g_build_filename(vd->dir_fd->path, "..", NULL); | |
162 fd = file_data_new_simple(filepath); | |
978
9ff64efe11eb
Replace macros VDLIST_INFO() and VDTREE_INFO() by shorter VDLIST() and VDTREE(). VDLIST_INFO(vd, part) becomes VDLIST(vd)->part.
zas_
parents:
973
diff
changeset
|
163 VDLIST(vd)->list = g_list_prepend(VDLIST(vd)->list, fd); |
973 | 164 g_free(filepath); |
165 } | |
166 | |
167 if (options->file_filter.show_dot_directory) | |
168 { | |
169 filepath = g_build_filename(vd->dir_fd->path, ".", NULL); | |
170 fd = file_data_new_simple(filepath); | |
978
9ff64efe11eb
Replace macros VDLIST_INFO() and VDTREE_INFO() by shorter VDLIST() and VDTREE(). VDLIST_INFO(vd, part) becomes VDLIST(vd)->part.
zas_
parents:
973
diff
changeset
|
171 VDLIST(vd)->list = g_list_prepend(VDLIST(vd)->list, fd); |
973 | 172 g_free(filepath); |
173 } | |
9 | 174 |
381 | 175 store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view))); |
973 | 176 if (clear) gtk_list_store_clear(store); |
177 | |
178 valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(store), &iter, NULL); | |
9 | 179 |
978
9ff64efe11eb
Replace macros VDLIST_INFO() and VDTREE_INFO() by shorter VDLIST() and VDTREE(). VDLIST_INFO(vd, part) becomes VDLIST(vd)->part.
zas_
parents:
973
diff
changeset
|
180 work = VDLIST(vd)->list; |
9 | 181 while (work) |
182 { | |
973 | 183 gint match; |
9 | 184 GdkPixbuf *pixbuf; |
825 | 185 const gchar *date = ""; |
1452 | 186 gboolean done = FALSE; |
187 | |
9 | 188 fd = work->data; |
189 | |
190 if (access_file(fd->path, R_OK | X_OK) && fd->name) | |
191 { | |
192 if (fd->name[0] == '.' && fd->name[1] == '\0') | |
193 { | |
381 | 194 pixbuf = vd->pf->open; |
9 | 195 } |
196 else if (fd->name[0] == '.' && fd->name[1] == '.' && fd->name[2] == '\0') | |
197 { | |
381 | 198 pixbuf = vd->pf->parent; |
9 | 199 } |
200 else | |
201 { | |
381 | 202 pixbuf = vd->pf->close; |
1436
d7a6fb7a90dd
completely separated global and layout window options
nadvornik
parents:
1365
diff
changeset
|
203 if (vd->layout && vd->layout->options.show_directory_date) |
825 | 204 date = text_from_time(fd->date); |
9 | 205 } |
206 } | |
207 else | |
208 { | |
381 | 209 pixbuf = vd->pf->deny; |
9 | 210 } |
211 | |
973 | 212 while (!done) |
213 { | |
214 FileData *old_fd = NULL; | |
215 | |
216 if (valid) | |
217 { | |
218 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, | |
219 DIR_COLUMN_POINTER, &old_fd, | |
220 -1); | |
221 | |
222 if (fd == old_fd) | |
223 { | |
224 match = 0; | |
225 } | |
226 else | |
227 { | |
1780 | 228 match = filelist_sort_compare_filedata_full(fd, old_fd, sort_type, sort_ascend); |
973 | 229 |
230 if (match == 0) g_warning("multiple fd for the same path"); | |
231 } | |
232 | |
233 } | |
234 else | |
235 { | |
236 match = -1; | |
237 } | |
238 | |
239 if (match < 0) | |
240 { | |
241 GtkTreeIter new; | |
9 | 242 |
973 | 243 if (valid) |
244 { | |
245 gtk_list_store_insert_before(store, &new, &iter); | |
246 } | |
247 else | |
248 { | |
249 gtk_list_store_append(store, &new); | |
250 } | |
251 | |
252 gtk_list_store_set(store, &new, | |
253 DIR_COLUMN_POINTER, fd, | |
254 DIR_COLUMN_ICON, pixbuf, | |
255 DIR_COLUMN_NAME, fd->name, | |
256 DIR_COLUMN_DATE, date, | |
257 -1); | |
258 | |
259 done = TRUE; | |
260 } | |
261 else if (match > 0) | |
262 { | |
263 valid = gtk_list_store_remove(store, &iter); | |
264 } | |
265 else | |
266 { | |
267 gtk_list_store_set(store, &iter, | |
268 DIR_COLUMN_ICON, pixbuf, | |
269 DIR_COLUMN_NAME, fd->name, | |
270 DIR_COLUMN_DATE, date, | |
271 -1); | |
272 | |
273 if (valid) valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); | |
274 | |
275 done = TRUE; | |
276 } | |
277 } | |
9 | 278 work = work->next; |
279 } | |
280 | |
973 | 281 while (valid) |
282 { | |
283 FileData *old_fd; | |
284 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, DIR_COLUMN_POINTER, &old_fd, -1); | |
285 | |
286 valid = gtk_list_store_remove(store, &iter); | |
287 } | |
288 | |
289 | |
381 | 290 vd->click_fd = NULL; |
291 vd->drop_fd = NULL; | |
973 | 292 |
293 filelist_free(old_list); | |
294 return ret; | |
9 | 295 } |
296 | |
1452 | 297 gboolean vdlist_set_fd(ViewDir *vd, FileData *dir_fd) |
9 | 298 { |
1452 | 299 gboolean ret; |
9 | 300 gchar *old_path = NULL; |
301 | |
783 | 302 if (!dir_fd) return FALSE; |
303 if (vd->dir_fd == dir_fd) return TRUE; | |
9 | 304 |
783 | 305 if (vd->dir_fd) |
9 | 306 { |
307 gchar *base; | |
308 | |
783 | 309 base = remove_level_from_path(vd->dir_fd->path); |
310 if (strcmp(base, dir_fd->path) == 0) | |
9 | 311 { |
783 | 312 old_path = g_strdup(vd->dir_fd->name); |
9 | 313 } |
314 g_free(base); | |
315 } | |
316 | |
783 | 317 file_data_unref(vd->dir_fd); |
318 vd->dir_fd = file_data_ref(dir_fd); | |
9 | 319 |
973 | 320 ret = vdlist_populate(vd, TRUE); |
9 | 321 |
322 if (old_path) | |
323 { | |
324 /* scroll to make last path visible */ | |
325 FileData *found = NULL; | |
326 GList *work; | |
327 | |
978
9ff64efe11eb
Replace macros VDLIST_INFO() and VDTREE_INFO() by shorter VDLIST() and VDTREE(). VDLIST_INFO(vd, part) becomes VDLIST(vd)->part.
zas_
parents:
973
diff
changeset
|
328 work = VDLIST(vd)->list; |
9 | 329 while (work && !found) |
330 { | |
331 FileData *fd = work->data; | |
332 if (strcmp(old_path, fd->name) == 0) found = fd; | |
333 work = work->next; | |
334 } | |
335 | |
381 | 336 if (found) vdlist_scroll_to_row(vd, found, 0.5); |
9 | 337 |
338 g_free(old_path); | |
339 return ret; | |
340 } | |
341 | |
1810 | 342 #if GTK_CHECK_VERSION(2,20,0) |
343 if (gtk_widget_get_realized(vd->view)) | |
344 #else | |
381 | 345 if (GTK_WIDGET_REALIZED(vd->view)) |
1810 | 346 #endif |
9 | 347 { |
381 | 348 gtk_tree_view_scroll_to_point(GTK_TREE_VIEW(vd->view), 0, 0); |
9 | 349 } |
350 | |
351 return ret; | |
352 } | |
353 | |
381 | 354 void vdlist_refresh(ViewDir *vd) |
9 | 355 { |
973 | 356 vdlist_populate(vd, FALSE); |
9 | 357 } |
358 | |
1452 | 359 gboolean vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) |
9 | 360 { |
381 | 361 ViewDir *vd = data; |
9 | 362 GtkTreePath *tpath; |
442 | 363 |
9 | 364 if (event->keyval != GDK_Menu) return FALSE; |
365 | |
381 | 366 gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &tpath, NULL); |
9 | 367 if (tpath) |
368 { | |
369 GtkTreeModel *store; | |
370 GtkTreeIter iter; | |
371 | |
372 store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); | |
373 gtk_tree_model_get_iter(store, &iter, tpath); | |
381 | 374 gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &vd->click_fd, -1); |
442 | 375 |
9 | 376 gtk_tree_path_free(tpath); |
377 } | |
378 else | |
379 { | |
381 | 380 vd->click_fd = NULL; |
9 | 381 } |
382 | |
383
499d7ba62261
Move some dnd common code from view_dir_list.c and view_dir_tree.c
zas_
parents:
381
diff
changeset
|
383 vd_color_set(vd, vd->click_fd, TRUE); |
9 | 384 |
388
5186f8e38cb8
Make directory view popup menu common and move it to view_dir.{c,h}.
zas_
parents:
385
diff
changeset
|
385 vd->popup = vd_pop_menu(vd, vd->click_fd); |
9 | 386 |
395 | 387 gtk_menu_popup(GTK_MENU(vd->popup), NULL, NULL, vd_menu_position_cb, vd, 0, GDK_CURRENT_TIME); |
9 | 388 |
389 return TRUE; | |
390 } | |
391 | |
1452 | 392 gboolean vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) |
9 | 393 { |
381 | 394 ViewDir *vd = data; |
9 | 395 GtkTreePath *tpath; |
396 GtkTreeIter iter; | |
397 FileData *fd = NULL; | |
398 | |
399 if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y, | |
400 &tpath, NULL, NULL, NULL)) | |
401 { | |
402 GtkTreeModel *store; | |
403 | |
404 store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); | |
405 gtk_tree_model_get_iter(store, &iter, tpath); | |
406 gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &fd, -1); | |
407 gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE); | |
408 gtk_tree_path_free(tpath); | |
409 } | |
410 | |
381 | 411 vd->click_fd = fd; |
383
499d7ba62261
Move some dnd common code from view_dir_list.c and view_dir_tree.c
zas_
parents:
381
diff
changeset
|
412 vd_color_set(vd, vd->click_fd, TRUE); |
9 | 413 |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
442
diff
changeset
|
414 if (bevent->button == MOUSE_BUTTON_RIGHT) |
9 | 415 { |
388
5186f8e38cb8
Make directory view popup menu common and move it to view_dir.{c,h}.
zas_
parents:
385
diff
changeset
|
416 vd->popup = vd_pop_menu(vd, vd->click_fd); |
381 | 417 gtk_menu_popup(GTK_MENU(vd->popup), NULL, NULL, NULL, NULL, |
9 | 418 bevent->button, bevent->time); |
419 } | |
420 | |
421 return TRUE; | |
422 } | |
423 | |
401
0a2e1b130a25
Add some wrappers in view_dir.c and simplify even more.
zas_
parents:
397
diff
changeset
|
424 void vdlist_destroy_cb(GtkWidget *widget, gpointer data) |
9 | 425 { |
381 | 426 ViewDir *vd = data; |
9 | 427 |
394 | 428 vd_dnd_drop_scroll_cancel(vd); |
381 | 429 widget_auto_scroll_stop(vd->view); |
9 | 430 |
978
9ff64efe11eb
Replace macros VDLIST_INFO() and VDTREE_INFO() by shorter VDLIST() and VDTREE(). VDLIST_INFO(vd, part) becomes VDLIST(vd)->part.
zas_
parents:
973
diff
changeset
|
431 filelist_free(VDLIST(vd)->list); |
9 | 432 } |
433 | |
783 | 434 ViewDir *vdlist_new(ViewDir *vd, FileData *dir_fd) |
9 | 435 { |
436 GtkListStore *store; | |
437 GtkTreeSelection *selection; | |
438 GtkTreeViewColumn *column; | |
439 GtkCellRenderer *renderer; | |
440 | |
381 | 441 vd->info = g_new0(ViewDirInfoList, 1); |
1365
249bf204004a
When g_new0() is used, drop redundant initializations to NULL, FALSE or 0.
zas_
parents:
1284
diff
changeset
|
442 |
381 | 443 vd->type = DIRVIEW_LIST; |
9 | 444 |
825 | 445 store = gtk_list_store_new(5, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING); |
381 | 446 vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); |
9 | 447 g_object_unref(store); |
448 | |
381 | 449 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(vd->view), FALSE); |
450 gtk_tree_view_set_enable_search(GTK_TREE_VIEW(vd->view), FALSE); | |
9 | 451 |
381 | 452 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vd->view)); |
9 | 453 gtk_tree_selection_set_mode(selection, GTK_SELECTION_NONE); |
454 | |
455 column = gtk_tree_view_column_new(); | |
456 gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); | |
457 | |
458 renderer = gtk_cell_renderer_pixbuf_new(); | |
459 gtk_tree_view_column_pack_start(column, renderer, FALSE); | |
460 gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", DIR_COLUMN_ICON); | |
396 | 461 gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, NULL); |
9 | 462 |
463 renderer = gtk_cell_renderer_text_new(); | |
464 gtk_tree_view_column_pack_start(column, renderer, TRUE); | |
465 gtk_tree_view_column_add_attribute(column, renderer, "text", DIR_COLUMN_NAME); | |
396 | 466 gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, NULL); |
9 | 467 |
825 | 468 renderer = gtk_cell_renderer_text_new(); |
469 gtk_tree_view_column_pack_start(column, renderer, TRUE); | |
470 gtk_tree_view_column_add_attribute(column, renderer, "text", DIR_COLUMN_DATE); | |
471 gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, NULL); | |
472 | |
381 | 473 gtk_tree_view_append_column(GTK_TREE_VIEW(vd->view), column); |
9 | 474 |
381 | 475 return vd; |
9 | 476 } |
1055
1646720364cf
Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents:
995
diff
changeset
|
477 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |