Mercurial > geeqie.yaz
comparison src/layout_image.c @ 318:b16b9b8979e5
Add a new struct ConfOptions to handle options.
Changes were made among the code to use only one global var
named "options" of type ConfOptions *.
Initialization takes place in new init_options().
author | zas_ |
---|---|
date | Fri, 11 Apr 2008 22:14:36 +0000 |
parents | c1f75ee307ec |
children | c74af1cbd61a |
comparison
equal
deleted
inserted
replaced
317:46169c246c51 | 318:b16b9b8979e5 |
---|---|
1109 gdouble sx, sy; | 1109 gdouble sx, sy; |
1110 if (!layout_valid(&lw)) return; | 1110 if (!layout_valid(&lw)) return; |
1111 | 1111 |
1112 image_get_scroll_center(lw->image, &sx, &sy); | 1112 image_get_scroll_center(lw->image, &sx, &sy); |
1113 | 1113 |
1114 image_change_fd(lw->image, fd, image_zoom_get_default(lw->image, zoom_mode)); | 1114 image_change_fd(lw->image, fd, image_zoom_get_default(lw->image, options->zoom_mode)); |
1115 | 1115 |
1116 image_set_scroll_center(lw->image, sx, sy); | 1116 image_set_scroll_center(lw->image, sx, sy); |
1117 | 1117 |
1118 layout_list_sync_fd(lw, fd); | 1118 layout_list_sync_fd(lw, fd); |
1119 layout_image_slideshow_continue_check(lw); | 1119 layout_image_slideshow_continue_check(lw); |
1133 old_path = layout_image_get_path(lw); | 1133 old_path = layout_image_get_path(lw); |
1134 if (old_path && strcmp(path, old_path) == 0) return; | 1134 if (old_path && strcmp(path, old_path) == 0) return; |
1135 } | 1135 } |
1136 */ | 1136 */ |
1137 layout_image_set_fd(lw, fd); | 1137 layout_image_set_fd(lw, fd); |
1138 if (enable_read_ahead) image_prebuffer_set(lw->image, read_ahead_fd); | 1138 if (options->enable_read_ahead) image_prebuffer_set(lw->image, read_ahead_fd); |
1139 } | 1139 } |
1140 | 1140 |
1141 void layout_image_set_index(LayoutWindow *lw, gint index) | 1141 void layout_image_set_index(LayoutWindow *lw, gint index) |
1142 { | 1142 { |
1143 FileData *fd; | 1143 FileData *fd; |
1201 | 1201 |
1202 static void layout_image_set_collection_real(LayoutWindow *lw, CollectionData *cd, CollectInfo *info, gint forward) | 1202 static void layout_image_set_collection_real(LayoutWindow *lw, CollectionData *cd, CollectInfo *info, gint forward) |
1203 { | 1203 { |
1204 if (!layout_valid(&lw)) return; | 1204 if (!layout_valid(&lw)) return; |
1205 | 1205 |
1206 image_change_from_collection(lw->image, cd, info, image_zoom_get_default(lw->image, zoom_mode)); | 1206 image_change_from_collection(lw->image, cd, info, image_zoom_get_default(lw->image, options->zoom_mode)); |
1207 if (enable_read_ahead) | 1207 if (options->enable_read_ahead) |
1208 { | 1208 { |
1209 CollectInfo *r_info; | 1209 CollectInfo *r_info; |
1210 if (forward) | 1210 if (forward) |
1211 { | 1211 { |
1212 r_info = collection_next_by_info(cd, info); | 1212 r_info = collection_next_by_info(cd, info); |
1554 break; | 1554 break; |
1555 default: | 1555 default: |
1556 break; | 1556 break; |
1557 } | 1557 } |
1558 } | 1558 } |
1559 else if ( (state & GDK_SHIFT_MASK) != (mousewheel_scrolls)) | 1559 else if ( (state & GDK_SHIFT_MASK) != (options->mousewheel_scrolls)) |
1560 { | 1560 { |
1561 switch (direction) | 1561 switch (direction) |
1562 { | 1562 { |
1563 case GDK_SCROLL_UP: | 1563 case GDK_SCROLL_UP: |
1564 image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE); | 1564 image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE); |
1696 { | 1696 { |
1697 lw->split_images[i] = image_new(TRUE); | 1697 lw->split_images[i] = image_new(TRUE); |
1698 | 1698 |
1699 gtk_widget_ref(lw->split_images[i]->widget); | 1699 gtk_widget_ref(lw->split_images[i]->widget); |
1700 | 1700 |
1701 image_background_set_color(lw->split_images[i], user_specified_window_background ? &window_background_color : NULL); | 1701 image_background_set_color(lw->split_images[i], options->user_specified_window_background ? &options->window_background_color : NULL); |
1702 | 1702 |
1703 image_auto_refresh(lw->split_images[i], 0); | 1703 image_auto_refresh(lw->split_images[i], 0); |
1704 | 1704 |
1705 layout_image_dnd_init(lw, i); | 1705 layout_image_dnd_init(lw, i); |
1706 image_color_profile_set(lw->split_images[i], | 1706 image_color_profile_set(lw->split_images[i], |