Mercurial > geeqie

comparison src/img-view.c @ 885:ad420f2eb789

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use a specific enum for image.zoom_mode values (ZoomMode) and simplify calls to image_zoom_get_default(), dropping last parameter which was always options->image.zoom_mode.
author zas_
date Tue, 15 Jul 2008 12:52:02 +0000
parents db6977f8b0f1
children d8e1e820cee7
comparison
equal deleted inserted replaced
884:ff16ed0d2c8a 885:ad420f2eb789
133 } 133 }
134 } 134 }
135 135
136 if (info) 136 if (info)
137 { 137 {
138 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode)); 138 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
139 139
140 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd); 140 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
141 } 141 }
142 142
143 } 143 }
164 if (options->image.enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info); 164 if (options->image.enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info);
165 } 165 }
166 166
167 if (info) 167 if (info)
168 { 168 {
169 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode)); 169 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
170 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd); 170 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
171 } 171 }
172 } 172 }
173 173
174 static void view_list_step(ViewWindow *vw, gint next) 174 static void view_list_step(ViewWindow *vw, gint next)
224 224
225 if (!work) return; 225 if (!work) return;
226 226
227 vw->list_pointer = work; 227 vw->list_pointer = work;
228 fd = work->data; 228 fd = work->data;
229 image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode)); 229 image_change_fd(imd, fd, image_zoom_get_default(imd));
230 230
231 if (options->image.enable_read_ahead && work_ahead) 231 if (options->image.enable_read_ahead && work_ahead)
232 { 232 {
233 FileData *next_fd = work_ahead->data; 233 FileData *next_fd = work_ahead->data;
234 image_prebuffer_set(imd, next_fd); 234 image_prebuffer_set(imd, next_fd);
255 work_ahead = work->next; 255 work_ahead = work->next;
256 } 256 }
257 257
258 vw->list_pointer = work; 258 vw->list_pointer = work;
259 fd = work->data; 259 fd = work->data;
260 image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode)); 260 image_change_fd(imd, fd, image_zoom_get_default(imd));
261 261
262 if (options->image.enable_read_ahead && work_ahead) 262 if (options->image.enable_read_ahead && work_ahead)
263 { 263 {
264 FileData *next_fd = work_ahead->data; 264 FileData *next_fd = work_ahead->data;
265 image_prebuffer_set(imd, next_fd); 265 image_prebuffer_set(imd, next_fd);
870 G_CALLBACK(view_window_delete_cb), vw); 870 G_CALLBACK(view_window_delete_cb), vw);
871 g_signal_connect(G_OBJECT(vw->window), "key_press_event", 871 g_signal_connect(G_OBJECT(vw->window), "key_press_event",
872 G_CALLBACK(view_window_key_press_cb), vw); 872 G_CALLBACK(view_window_key_press_cb), vw);
873 if (cd && info) 873 if (cd && info)
874 { 874 {
875 image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL, options->image.zoom_mode)); 875 image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL));
876 if (options->image.enable_read_ahead) 876 if (options->image.enable_read_ahead)
877 { 877 {
878 CollectInfo * r_info = collection_next_by_info(cd, info); 878 CollectInfo * r_info = collection_next_by_info(cd, info);
879 if (!r_info) r_info = collection_prev_by_info(cd, info); 879 if (!r_info) r_info = collection_prev_by_info(cd, info);
880 if (r_info) image_prebuffer_set(vw->imd, r_info->fd); 880 if (r_info) image_prebuffer_set(vw->imd, r_info->fd);
882 } 882 }
883 else if (list) 883 else if (list)
884 { 884 {
885 view_window_set_list(vw, list); 885 view_window_set_list(vw, list);
886 vw->list_pointer = vw->list; 886 vw->list_pointer = vw->list;
887 image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL, options->image.zoom_mode)); 887 image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL));
888 888
889 if (options->image.enable_read_ahead) 889 if (options->image.enable_read_ahead)
890 { 890 {
891 GList *work = vw->list->next; 891 GList *work = vw->list->next;
892 if (work) image_prebuffer_set(vw->imd, (FileData *)work->data); 892 if (work) image_prebuffer_set(vw->imd, (FileData *)work->data);
893 } 893 }
894 } 894 }
895 else 895 else
896 { 896 {
897 image_change_fd(vw->imd, fd, image_zoom_get_default(NULL, options->image.zoom_mode)); 897 image_change_fd(vw->imd, fd, image_zoom_get_default(NULL));
898 } 898 }
899 899
900 if (image_zoom_get(vw->imd) == 0.0) 900 if (image_zoom_get(vw->imd) == 0.0)
901 { 901 {
902 image_get_image_size(vw->imd, &w, &h); 902 image_get_image_size(vw->imd, &w, &h);
1384 { 1384 {
1385 FileData *fd; 1385 FileData *fd;
1386 1386
1387 vw->list_pointer = vw->list; 1387 vw->list_pointer = vw->list;
1388 fd = vw->list->data; 1388 fd = vw->list->data;
1389 image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd, options->image.zoom_mode)); 1389 image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd));
1390 1390
1391 work = vw->list->next; 1391 work = vw->list->next;
1392 if (options->image.enable_read_ahead && work) 1392 if (options->image.enable_read_ahead && work)
1393 { 1393 {
1394 fd = work->data; 1394 fd = work->data;
1395 image_prebuffer_set(vw->imd, fd); 1395 image_prebuffer_set(vw->imd, fd);
1396 } 1396 }
1397 } 1397 }
1398 else 1398 else
1399 { 1399 {
1400 image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd, options->image.zoom_mode)); 1400 image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd));
1401 } 1401 }
1402 } 1402 }
1403 1403
1404 static void view_dir_list_add(GtkWidget *widget, gpointer data) 1404 static void view_dir_list_add(GtkWidget *widget, gpointer data)
1405 { 1405 {
1514 view_slideshow_stop(vw); 1514 view_slideshow_stop(vw);
1515 view_window_set_list(vw, NULL); 1515 view_window_set_list(vw, NULL);
1516 1516
1517 if (source && info_list) 1517 if (source && info_list)
1518 { 1518 {
1519 image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd, options->image.zoom_mode)); 1519 image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd));
1520 } 1520 }
1521 else 1521 else
1522 { 1522 {
1523 if (list->next) 1523 if (list->next)
1524 { 1524 {
1525 vw->list = list; 1525 vw->list = list;
1526 list = NULL; 1526 list = NULL;
1527 1527
1528 vw->list_pointer = vw->list; 1528 vw->list_pointer = vw->list;
1529 } 1529 }
1530 image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode)); 1530 image_change_fd(imd, fd, image_zoom_get_default(imd));
1531 } 1531 }
1532 } 1532 }
1533 } 1533 }
1534 filelist_free(list); 1534 filelist_free(list);
1535 g_list_free(info_list); 1535 g_list_free(info_list);
1631 view_collection_step(vw, FALSE); 1631 view_collection_step(vw, FALSE);
1632 } 1632 }
1633 } 1633 }
1634 if (image_get_fd(imd) == image_fd) 1634 if (image_get_fd(imd) == image_fd)
1635 { 1635 {
1636 image_change_fd(imd, NULL, image_zoom_get_default(imd, options->image.zoom_mode)); 1636 image_change_fd(imd, NULL, image_zoom_get_default(imd));
1637 } 1637 }
1638 } 1638 }
1639 1639
1640 if (vw->list) 1640 if (vw->list)
1641 { 1641 {
1677 else 1677 else
1678 { 1678 {
1679 fd = NULL; 1679 fd = NULL;
1680 } 1680 }
1681 1681
1682 image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode)); 1682 image_change_fd(imd, fd, image_zoom_get_default(imd));
1683 } 1683 }
1684 } 1684 }
1685 1685
1686 image_osd_update(imd); 1686 image_osd_update(imd);
1687 } 1687 }