From: <enl...@li...> - 2001-08-11 00:42:01
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: imlib.c menu.c Log Message: Sat Aug 11 01:41:21 2001 Tom Gilbert <gil...@li...> * Add image and filelist saving to context menus. * Tidy menus. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/imlib.c,v retrieving revision 1.122 retrieving revision 1.123 diff -u -3 -r1.122 -r1.123 --- imlib.c 2001/08/11 00:26:57 1.122 +++ imlib.c 2001/08/11 00:42:00 1.123 @@ -263,7 +263,6 @@ basename = strrchr(url, '/') + 1; tmpname = feh_unique_filename(path, basename); - printf("using %s\n", tmpname); if (opt.wget_timestamp) { =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/menu.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- menu.c 2001/08/09 22:18:23 1.37 +++ menu.c 2001/08/11 00:42:00 1.38 @@ -90,6 +90,10 @@ static feh_menu *feh_menu_func_gen_info(feh_menu * m, feh_menu_item * i, void *data); static void feh_menu_func_free_info(feh_menu * m, void *data); +static void feh_menu_cb_save_image(feh_menu * m, feh_menu_item * i, + void *data); +static void feh_menu_cb_save_filelist(feh_menu * m, feh_menu_item * i, + void *data); feh_menu * @@ -946,10 +950,15 @@ feh_menu_add_entry(m, "Reset", NULL, NULL, feh_menu_cb_reset, NULL, NULL); feh_menu_add_entry(m, "Reload", NULL, NULL, feh_menu_cb_reload, NULL, NULL); - feh_menu_add_entry(m, "Remove from filelist", NULL, NULL, + feh_menu_add_entry(m, "Save Image", NULL, NULL, feh_menu_cb_save_image, + NULL, NULL); + feh_menu_add_entry(m, "Save Filelist", NULL, NULL, + feh_menu_cb_save_filelist, NULL, NULL); + feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL); + feh_menu_add_entry(m, NULL, NULL, NULL, NULL, NULL, NULL); + feh_menu_add_entry(m, "Hide", NULL, NULL, feh_menu_cb_remove, NULL, NULL); feh_menu_add_entry(m, "Delete", NULL, "CONFIRM", NULL, NULL, NULL); - feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL); D_RETURN_(4); } @@ -1122,13 +1131,18 @@ feh_menu_add_entry(m, "Reset", NULL, NULL, feh_menu_cb_reset, NULL, NULL); feh_menu_add_entry(m, "Reload", NULL, NULL, feh_menu_cb_reload, NULL, NULL); + feh_menu_add_entry(m, "Save Image", NULL, NULL, feh_menu_cb_save_image, + NULL, NULL); + feh_menu_add_entry(m, "Save Filelist", NULL, NULL, + feh_menu_cb_save_filelist, NULL, NULL); + feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL); if (opt.multiwindow || opt.slideshow) { - feh_menu_add_entry(m, "Remove from filelist", NULL, NULL, + feh_menu_add_entry(m, NULL, NULL, NULL, NULL, NULL, NULL); + feh_menu_add_entry(m, "Hide", NULL, NULL, feh_menu_cb_remove, NULL, NULL); feh_menu_add_entry(m, "Delete", NULL, "CONFIRM", NULL, NULL, NULL); } - feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL); mi = feh_menu_add_entry(menu_single_win, "Image Info", NULL, "INFO", NULL, @@ -1162,6 +1176,10 @@ m = feh_menu_new(); m->name = estrdup("THUMBWIN_FILE"); feh_menu_add_entry(m, "Reset", NULL, NULL, feh_menu_cb_reset, NULL, NULL); + feh_menu_add_entry(m, "Save Image", NULL, NULL, feh_menu_cb_save_image, + NULL, NULL); + feh_menu_add_entry(m, "Save Filelist", NULL, NULL, + feh_menu_cb_save_filelist, NULL, NULL); feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL); feh_menu_add_entry(menu_thumbnail_win, NULL, NULL, NULL, NULL, NULL, NULL); feh_menu_add_entry(menu_thumbnail_win, "About " PACKAGE, NULL, NULL, @@ -1194,12 +1212,16 @@ feh_menu_add_entry(m, "Reset", NULL, NULL, feh_menu_cb_reset, NULL, NULL); feh_menu_add_entry(m, "Reload", NULL, NULL, feh_menu_cb_reload, NULL, NULL); - feh_menu_add_entry(m, "Remove from filelist", NULL, NULL, + feh_menu_add_entry(m, "Save Image", NULL, NULL, feh_menu_cb_save_image, + NULL, NULL); + feh_menu_add_entry(m, "Save Filelist", NULL, NULL, + feh_menu_cb_save_filelist, NULL, NULL); + feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL); + feh_menu_add_entry(m, NULL, NULL, NULL, NULL, NULL, NULL); + feh_menu_add_entry(m, "Hide", NULL, NULL, feh_menu_cb_remove_thumb, NULL, NULL); feh_menu_add_entry(m, "Delete", NULL, "THUMBVIEW_CONFIRM", NULL, NULL, NULL); - feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL); - mi = feh_menu_add_entry(menu_thumbnail_viewer, "Image Info", NULL, "INFO", NULL, NULL, NULL); @@ -1212,12 +1234,10 @@ feh_menu_cb_close, NULL, NULL); feh_menu_add_entry(menu_thumbnail_viewer, "Exit", NULL, NULL, feh_menu_cb_exit, NULL, NULL); - m = feh_menu_new(); m->name = estrdup("THUMBVIEW_CONFIRM"); feh_menu_add_entry(m, "Confirm", NULL, NULL, feh_menu_cb_delete_thumb, NULL, NULL); - D_RETURN_(4); } @@ -1227,11 +1247,9 @@ char *path; D_ENTER(4); - path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename); feh_wm_set_bg(path, m->fehwin->im, 0, 0, (int) data, 1); free(path); - D_RETURN_(4); i = NULL; } @@ -1243,7 +1261,6 @@ Imlib_Image im; D_ENTER(4); - im = feh_imlib_clone_image(m->fehwin->im); feh_imlib_image_tile(im); feh_wm_set_bg(NULL, im, 0, 0, (int) data, 1); @@ -1258,11 +1275,9 @@ char *path; D_ENTER(4); - path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename); feh_wm_set_bg(path, m->fehwin->im, 0, 1, (int) data, 1); free(path); - D_RETURN_(4); i = NULL; } @@ -1274,11 +1289,9 @@ char *path; D_ENTER(4); - path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename); feh_wm_set_bg(path, m->fehwin->im, 1, 0, (int) data, 1); free(path); - D_RETURN_(4); i = NULL; } @@ -1288,9 +1301,7 @@ void *data) { D_ENTER(4); - feh_wm_set_bg(NULL, m->fehwin->im, 0, 0, (int) data, 1); - D_RETURN_(4); i = NULL; } @@ -1300,9 +1311,7 @@ void *data) { D_ENTER(4); - feh_wm_set_bg(NULL, m->fehwin->im, 0, 1, (int) data, 1); - D_RETURN_(4); i = NULL; } @@ -1312,9 +1321,7 @@ void *data) { D_ENTER(4); - feh_wm_set_bg(NULL, m->fehwin->im, 1, 0, (int) data, 1); - D_RETURN_(4); i = NULL; } @@ -1326,7 +1333,6 @@ winwidget winwid; D_ENTER(4); - if (feh_load_image_char(&im, PREFIX "/share/feh/images/about.png") != 0) { winwid = @@ -1487,10 +1493,8 @@ feh_list *l; D_ENTER(4); - mm = feh_menu_new(); mm->name = estrdup("JUMP"); - for (l = filelist; l; l = l->next) { feh_menu_add_entry(mm, FEH_FILE(l->data)->name, NULL, NULL, @@ -1511,39 +1515,30 @@ char buffer[400]; D_ENTER(4); - if (!m->fehwin->file) D_RETURN(4, NULL); - file = FEH_FILE(m->fehwin->file->data); im = m->fehwin->im; if (!im) D_RETURN(4, NULL); - mm = feh_menu_new(); mm->name = estrdup("INFO"); - snprintf(buffer, sizeof(buffer), "Filename: %s", file->name); feh_menu_add_entry(mm, buffer, NULL, NULL, NULL, NULL, NULL); - if (!file->info) feh_file_info_load(file, im); - if (file->info) { snprintf(buffer, sizeof(buffer), "Size: %dKb", file->info->size / 1024); feh_menu_add_entry(mm, buffer, NULL, NULL, NULL, NULL, NULL); - snprintf(buffer, sizeof(buffer), "Dimensions: %dx%d", file->info->width, file->info->height); feh_menu_add_entry(mm, buffer, NULL, NULL, NULL, NULL, NULL); - snprintf(buffer, sizeof(buffer), "Type: %s", file->info->format); feh_menu_add_entry(mm, buffer, NULL, NULL, NULL, NULL, NULL); } mm->func_free = feh_menu_func_free_info; - D_RETURN(4, mm); i = NULL; data = NULL; @@ -1580,4 +1575,16 @@ D_RETURN_(4); i = NULL; m = NULL; +} + +static void +feh_menu_cb_save_image(feh_menu * m, feh_menu_item * i, void *data) +{ + slideshow_save_image(m->fehwin); +} + +static void +feh_menu_cb_save_filelist(feh_menu * m, feh_menu_item * i, void *data) +{ + feh_save_filelist(); } |
From: <enl...@li...> - 2001-08-11 22:21:12
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: events.c options.c options.h winwidget.c Log Message: Sat Aug 11 23:20:09 2001 Tom Gilbert <gil...@li...> * Added -g, --geometry setting to fix feh's geometry. Stops repeated resizing when browsing lots of pics. Please test this for me as I want to get 1.0 out soon :)p =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/events.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -3 -r1.50 -r1.51 --- events.c 2000/10/22 01:02:23 1.50 +++ events.c 2001/08/11 22:21:11 1.51 @@ -239,6 +239,11 @@ winwid->im_x = (scr->width - winwid->im_w) >> 1; winwid->im_y = (scr->height - winwid->im_h) >> 1; } + else if(opt.geom) + { + winwid->im_x = (opt.geom_w - winwid->im_w) >> 1; + winwid->im_y = (opt.geom_h - winwid->im_h) >> 1; + } else { winwid->im_x = 0; @@ -530,7 +535,7 @@ winwid->im_w = feh_imlib_image_get_width(temp); winwid->im_h = feh_imlib_image_get_height(temp); feh_imlib_free_image_and_decache(temp); - if (!opt.full_screen) + if (!opt.full_screen && !opt.geom) winwidget_resize(winwid, winwid->im_w, winwid->im_h); winwid->has_rotated = 1; } =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/options.c,v retrieving revision 1.123 retrieving revision 1.124 diff -u -3 -r1.123 -r1.124 --- options.c 2001/08/11 00:26:57 1.123 +++ options.c 2001/08/11 22:21:11 1.124 @@ -346,9 +346,10 @@ {"theme", 1, 0, 'T'}, /* okay */ {"filelist", 1, 0, 'f'}, /* okay */ {"customlist", 1, 0, 'L'}, /* okay */ + {"geometry", 1, 0, 'g'}, /* okay */ {"menu-font", 1, 0, 'M'}, {"thumb-width", 1, 0, 'y'}, - {"thumb-height", 1, 0, 'g'}, + {"thumb-height", 1, 0, 'E'}, {"slideshow-delay", 1, 0, 'D'}, {"font", 1, 0, 'e'}, {"title-font", 1, 0, '@'}, @@ -373,7 +374,7 @@ {"output-dir", 1, 0, 'j'}, {0, 0, 0, 0} }; - int optch = 0, cmdx = 0; + int optch = 0, cmdx = 0, i = 0; D_ENTER(4); @@ -438,6 +439,11 @@ case 'n': opt.reverse = 1; break; + case 'g': + XParseGeometry(optarg, &i, &i, &opt.geom_w, &opt.geom_h); + if((opt.geom_w > 1) && (opt.geom_h > 1)) + opt.geom = 1; + break; case 'N': opt.no_menus = 1; break; @@ -556,7 +562,7 @@ case 'y': opt.thumb_w = atoi(optarg); break; - case 'g': + case 'E': opt.thumb_h = atoi(optarg); break; case ')': @@ -736,6 +742,8 @@ " the content of those directories. (Take it easy)\n" " -z, --randomize When viewing multiple files in a slideshow,\n" " randomise the file list before displaying\n" + " -g, --geometry STRING Limit (and don't change) the window size. Takes\n" + " an X-style geometry string like 640x480.\n" " -f, --filelist FILE This option is similar to the playlists used by\n" " music software. If FILE exists, it will be read\n" " for a list of files to load, in the order they\n" @@ -890,7 +898,7 @@ " the thumbnail size. (Aspect ratio will be maintained\n" " unless --ignore-aspect is specified)\n" " -y, --thumb-width NUM Set thumbnail width in pixels\n" - " -g, --thumb-height NUM Set thumbnail height in pixels\n" + " -E, --thumb-height NUM Set thumbnail height in pixels\n" " Thumbnails default to 20x20 pixels\n" " -W, --limit-width NUM Limit the width of the montage in pixels\n" " -H, --limit-height NUM Limit the height of the montage in pixels\n" =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/options.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- options.h 2001/08/09 22:18:23 1.29 +++ options.h 2001/08/11 22:21:11 1.30 @@ -90,6 +90,7 @@ unsigned char no_rotate_ctrl_mask; unsigned char no_blur_ctrl_mask; unsigned char no_pan_ctrl_mask; + unsigned char geom; int thumb_w; int thumb_h; @@ -98,6 +99,8 @@ int reload; int sort; int debug_level; + int geom_w; + int geom_h; unsigned char adjust_reload; unsigned int start_list_at; =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/winwidget.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -3 -r1.93 -r1.94 --- winwidget.c 2001/08/09 22:37:38 1.93 +++ winwidget.c 2001/08/11 22:21:11 1.94 @@ -158,6 +158,11 @@ w = scr->width; h = scr->height; } + else if(opt.geom) + { + w = opt.geom_w; + h = opt.geom_h; + } else { if (w > scr->width) @@ -338,12 +343,23 @@ winwid->im_h * winwid->zoom); } - if (resize && opt.full_screen) + if (resize && (opt.full_screen || opt.geom)) { int smaller; /* Is the image smaller than screen? */ + int max_w, max_h; + if(opt.full_screen) + { + max_w = scr->width; + max_h = scr->height; + } + else if(opt.geom) + { + max_w = opt.geom_w; + max_h = opt.geom_h; + } - D(4, ("Calculating for fullscreen render\n")); - smaller = ((winwid->im_w < scr->width) && (winwid->im_h < scr->height)); + D(4, ("Calculating for fullscreen/fixed geom render\n")); + smaller = ((winwid->im_w < max_w) && (winwid->im_h < max_h)); if (!smaller || opt.auto_zoom) { @@ -353,28 +369,28 @@ smaller but wants expanding to fill it */ ratio = feh_calc_needed_zoom(&(winwid->zoom), winwid->im_w, winwid->im_h, - scr->width, scr->height); + max_w, max_h); if (ratio > 1.0) { /* height is the factor */ winwid->im_x = 0; winwid->im_y = - ((int) (scr->height - (winwid->im_h * winwid->zoom))) >> 1; + ((int) (max_h - (winwid->im_h * winwid->zoom))) >> 1; } else { /* width is the factor */ winwid->im_x = - ((int) (scr->width - (winwid->im_w * winwid->zoom))) >> 1; + ((int) (max_w - (winwid->im_w * winwid->zoom))) >> 1; winwid->im_y = 0; } } else { - /* Just center the image in the fullscreen window */ + /* Just center the image in the window */ winwid->zoom = 1.0; - winwid->im_x = (scr->width - winwid->im_w) >> 1; - winwid->im_y = (scr->height - winwid->im_h) >> 1; + winwid->im_x = (max_w - winwid->im_w) >> 1; + winwid->im_y = (max_h - winwid->im_h) >> 1; } } @@ -605,13 +621,19 @@ winwidget_resize(winwidget winwid, int w, int h) { D_ENTER(4); + if(opt.geom) + { + winwidget_clear_background(winwid); + winwid->had_resize = 1; + return; + } if (winwid && ((winwid->w != w) || (winwid->h != h))) { D(4, ("Really doing a resize\n")); /* winwidget_clear_background(winwid); */ XResizeWindow(disp, winwid->win, w, h); - winwid->w = (winwid->im_w > scr->width) ? scr->width : w; - winwid->h = (winwid->im_h > scr->height) ? scr->height : h; + winwid->w = (w > scr->width) ? scr->width : w; + winwid->h = (h > scr->height) ? scr->height : h; winwid->had_resize = 1; } else |
From: <enl...@li...> - 2001-08-11 22:21:41
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: ChangeLog feh.1 Log Message: Sat Aug 11 23:20:09 2001 Tom Gilbert <gil...@li...> * Added -g, --geometry setting to fix feh's geometry. Stops repeated resizing when browsing lots of pics. Please test this for me as I want to get 1.0 out soon :)p =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/ChangeLog,v retrieving revision 1.210 retrieving revision 1.211 diff -u -3 -r1.210 -r1.211 --- ChangeLog 2001/08/11 00:42:00 1.210 +++ ChangeLog 2001/08/11 22:21:11 1.211 @@ -1,3 +1,9 @@ +Sat Aug 11 23:20:09 2001 Tom Gilbert <gil...@li...> + + * Added -g, --geometry setting to fix feh's geometry. Stops + repeated resizing when browsing lots of pics. Please test this for + me as I want to get 1.0 out soon :)p + Sat Aug 11 01:41:21 2001 Tom Gilbert <gil...@li...> * Add image and filelist saving to context menus. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/feh.1,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- feh.1 2001/08/11 00:26:57 1.36 +++ feh.1 2001/08/11 22:21:11 1.37 @@ -127,6 +127,10 @@ .B -F, --full-screen Make the window fullscreen .TP 5 +.B -g, --geometry STRING +Limit (and don't change) the window size. Takes +an X-style geometry string like 640x480. +.TP 5 .B -Z, --auto-zoom Zoom picture to screen size in fullscreen (affected by --stretch and --ignore-aspect). @@ -323,7 +327,7 @@ .B -y, --thumb-width NUM Set thumbnail width in pixels .TP 5 -.B -g, --thumb-height NUM +.B -E, --thumb-height NUM Set thumbnail height in pixels Thumbnails default to 20x20 pixels .TP 5 |
From: <enl...@li...> - 2001-08-11 22:30:45
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: winwidget.c Log Message: Sat Aug 11 23:29:32 2001 Tom Gilbert <gil...@li...> * Fixed annoying bug where feh would limit window size to desktop size only on the first image. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/winwidget.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -3 -r1.94 -r1.95 --- winwidget.c 2001/08/11 22:21:11 1.94 +++ winwidget.c 2001/08/11 22:30:45 1.95 @@ -631,9 +631,9 @@ { D(4, ("Really doing a resize\n")); /* winwidget_clear_background(winwid); */ - XResizeWindow(disp, winwid->win, w, h); winwid->w = (w > scr->width) ? scr->width : w; winwid->h = (h > scr->height) ? scr->height : h; + XResizeWindow(disp, winwid->win, winwid->w, winwid->h); winwid->had_resize = 1; } else |
From: <enl...@li...> - 2001-08-11 22:31:15
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: ChangeLog Log Message: Sat Aug 11 23:29:32 2001 Tom Gilbert <gil...@li...> * Fixed annoying bug where feh would limit window size to desktop size only on the first image. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/ChangeLog,v retrieving revision 1.211 retrieving revision 1.212 diff -u -3 -r1.211 -r1.212 --- ChangeLog 2001/08/11 22:21:11 1.211 +++ ChangeLog 2001/08/11 22:30:45 1.212 @@ -1,3 +1,8 @@ +Sat Aug 11 23:29:32 2001 Tom Gilbert <gil...@li...> + + * Fixed annoying bug where feh would limit window size to desktop + size only on the first image. + Sat Aug 11 23:20:09 2001 Tom Gilbert <gil...@li...> * Added -g, --geometry setting to fix feh's geometry. Stops |
From: <enl...@li...> - 2001-08-11 22:33:58
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: configure.ac Log Message: ewps =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.ac 2001/08/08 23:01:37 1.2 +++ configure.ac 2001/08/11 22:33:57 1.3 @@ -2,8 +2,8 @@ AC_INIT AC_CONFIG_SRCDIR([src/main.c]) -AC_CONFIG_HEADERS([src/config.h]) AM_INIT_AUTOMAKE(feh, 0.9.9) +AM_CONFIG_HEADER(src/config.h) AC_PROG_CC AM_PROG_CC_STDC |
From: <enl...@li...> - 2001-08-11 23:15:57
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: events.c feh.h options.c options.h winwidget.c Log Message: Sun Aug 12 00:15:06 2001 Tom Gilbert <gil...@li...> * Oops. Fixed bug with zooming out larger images when -g is used. * Other fixes. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/events.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- events.c 2001/08/11 22:21:11 1.51 +++ events.c 2001/08/11 23:15:56 1.52 @@ -160,60 +160,11 @@ { D(3, ("Next Button Press event\n")); winwid = winwidget_get_from_window(ev->xbutton.window); - if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW)) - { - slideshow_change_image(winwid, SLIDE_NEXT); - } - else if ((winwid != NULL) && (winwid->type == WIN_TYPE_THUMBNAIL)) - { - feh_file *thumbfile; - winwidget thumbwin = NULL; - int x, y; - char *s; - - x = ev->xbutton.x; - y = ev->xbutton.y; - x -= winwid->im_x; - y -= winwid->im_y; - x /= winwid->zoom; - y /= winwid->zoom; - thumbfile = feh_thumbnail_get_file_from_coords(x, y); - if (thumbfile) - { - if (!opt.thumb_title) - s = thumbfile->name; - else - s = feh_printf(opt.thumb_title, thumbfile); - thumbwin = - winwidget_get_first_window_of_type(WIN_TYPE_THUMBNAIL_VIEWER); - if (!thumbwin) - { - thumbwin = - winwidget_create_from_file(feh_list_add_front - (NULL, thumbfile), s, - WIN_TYPE_THUMBNAIL_VIEWER); - winwidget_show(thumbwin); - } - else if (FEH_FILE(thumbwin->file->data) != thumbfile) - { - free(thumbwin->file); - thumbwin->file = feh_list_add_front(NULL, thumbfile); - winwidget_rename(thumbwin, s); - feh_reload_image(thumbwin, 1); - } - } - } - } - else if (ev->xbutton.button == opt.pan_button - && ((opt.no_pan_ctrl_mask) || (ev->xbutton.state & ControlMask))) - { - D(3, ("Pan Button Press event\n")); - winwid = winwidget_get_from_window(ev->xbutton.window); if (winwid != NULL) { - D(3, ("Pan mode baby!\n")); - opt.mode = MODE_PAN; - winwid->mode = MODE_PAN; + D(3, ("Next button, but could be pan mode\n")); + opt.mode = MODE_NEXT; + winwid->mode = MODE_NEXT; D(3, ("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y)); winwid->click_offset_x = ev->xbutton.x - winwid->im_x; winwid->click_offset_y = ev->xbutton.y - winwid->im_y; @@ -239,7 +190,7 @@ winwid->im_x = (scr->width - winwid->im_w) >> 1; winwid->im_y = (scr->height - winwid->im_h) >> 1; } - else if(opt.geom) + else if (opt.geom) { winwid->im_x = (opt.geom_w - winwid->im_w) >> 1; winwid->im_y = (opt.geom_h - winwid->im_h) >> 1; @@ -331,11 +282,78 @@ D_RETURN_(4); } - if ((ev->xbutton.button == opt.menu_button) && - (((!opt.menu_ctrl_mask) && ((!(ev->xbutton.state & ControlMask)) || ((ev->xbutton.state & ControlMask) && (opt.menu_ctrl_mask))))) && (opt.no_menus)) + if ((ev->xbutton.button == opt.menu_button) + && + (((!opt.menu_ctrl_mask) + && ((!(ev->xbutton.state & ControlMask)) + || ((ev->xbutton.state & ControlMask) && (opt.menu_ctrl_mask))))) + && (opt.no_menus)) winwidget_destroy_all(); - else if ((ev->xbutton.button == opt.pan_button) - || (ev->xbutton.button == opt.rotate_button) + else if (ev->xbutton.button == opt.next_button) + { + winwid = winwidget_get_from_window(ev->xbutton.window); + if (opt.mode == MODE_PAN) + { + if (winwid != NULL) + { + D(3, ("Disabling pan mode\n")); + opt.mode = MODE_NORMAL; + winwid->mode = MODE_NORMAL; + winwidget_sanitise_offsets(winwid); + winwidget_render_image(winwid, 0, 1); + } + } + else + { + opt.mode = MODE_NORMAL; + winwid->mode = MODE_NORMAL; + if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW)) + { + slideshow_change_image(winwid, SLIDE_NEXT); + } + else if ((winwid != NULL) && (winwid->type == WIN_TYPE_THUMBNAIL)) + { + feh_file *thumbfile; + winwidget thumbwin = NULL; + int x, y; + char *s; + + x = ev->xbutton.x; + y = ev->xbutton.y; + x -= winwid->im_x; + y -= winwid->im_y; + x /= winwid->zoom; + y /= winwid->zoom; + thumbfile = feh_thumbnail_get_file_from_coords(x, y); + if (thumbfile) + { + if (!opt.thumb_title) + s = thumbfile->name; + else + s = feh_printf(opt.thumb_title, thumbfile); + thumbwin = + winwidget_get_first_window_of_type + (WIN_TYPE_THUMBNAIL_VIEWER); + if (!thumbwin) + { + thumbwin = + winwidget_create_from_file(feh_list_add_front + (NULL, thumbfile), s, + WIN_TYPE_THUMBNAIL_VIEWER); + winwidget_show(thumbwin); + } + else if (FEH_FILE(thumbwin->file->data) != thumbfile) + { + free(thumbwin->file); + thumbwin->file = feh_list_add_front(NULL, thumbfile); + winwidget_rename(thumbwin, s); + feh_reload_image(thumbwin, 1); + } + } + } + } + } + else if ((ev->xbutton.button == opt.rotate_button) || (ev->xbutton.button == opt.zoom_button)) { D(3, ("Mode-based Button Release event\n")); @@ -497,7 +515,7 @@ winwidget_render_image(winwid, 0, 0); } } - else if (opt.mode == MODE_PAN) + else if ((opt.mode == MODE_PAN) || (opt.mode == MODE_NEXT)) { int orig_x, orig_y; @@ -506,6 +524,11 @@ winwid = winwidget_get_from_window(ev->xmotion.window); if (winwid) { + if (opt.mode = MODE_NEXT) + { + opt.mode = MODE_PAN; + winwid->mode = MODE_PAN; + } D(5, ("Panning\n")); orig_x = winwid->im_x; orig_y = winwid->im_y; =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/feh.h,v retrieving revision 1.110 retrieving revision 1.111 diff -u -3 -r1.110 -r1.111 --- feh.h 2001/08/11 00:26:57 1.110 +++ feh.h 2001/08/11 23:15:56 1.111 @@ -71,7 +71,7 @@ enum mode_type -{ MODE_NORMAL = 0, MODE_PAN, MODE_ZOOM, MODE_ROTATE, MODE_BLUR }; +{ MODE_NORMAL = 0, MODE_PAN, MODE_ZOOM, MODE_ROTATE, MODE_BLUR, MODE_NEXT }; enum slide_change { SLIDE_NEXT, SLIDE_PREV, SLIDE_FIRST, SLIDE_LAST, SLIDE_JUMP_FWD, =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/options.c,v retrieving revision 1.124 retrieving revision 1.125 diff -u -3 -r1.124 -r1.125 --- options.c 2001/08/11 22:21:11 1.124 +++ options.c 2001/08/11 23:15:56 1.125 @@ -58,8 +58,6 @@ opt.menu_bg = estrdup(PREFIX "/share/feh/images/menubg.png"); opt.next_button = 1; opt.zoom_button = 2; - opt.pan_button = 3; - opt.no_pan_ctrl_mask = 0; opt.menu_button = 3; opt.menu_ctrl_mask = 0; opt.reload_button = 0; @@ -301,7 +299,7 @@ { static char stropts[] = - "a:A:b:BcC:dD:e:f:Fg:GhH:iIj:klL:mM:nNo:O:pqQrR:sS:tT:uUvVwW:xXy:zZ1:2:3:4:56:78:90:"; + "a:A:b:BcC:dD:e:f:Fg:GhH:iIj:klL:mM:nNo:O:pqQrR:sS:tT:uUvVwW:xXy:zZ1:2:4:56:78:90:"; static struct option lopts[] = { /* actions */ {"help", 0, 0, 'h'}, /* okay */ @@ -360,13 +358,11 @@ {"menu-bg", 1, 0, ')'}, {"next-button", 1, 0, '1'}, {"zoom-button", 1, 0, '2'}, - {"pan-button", 1, 0, '3'}, {"menu-button", 1, 0, '4'}, {"rotate-button", 1, 0, '6'}, {"no-rotate-ctrl-mask", 0, 0, '7'}, {"blur-button", 1, 0, '8'}, {"no-blur-ctrl-mask", 0, 0, '9'}, - {"no-pan-ctrl-mask", 0, 0, '$'}, {"reload-button", 1, 0, '0'}, {"start-at", 1, 0, '|'}, {"rcfile", 1, 0, '_'}, @@ -588,9 +584,6 @@ case '2': opt.zoom_button = atoi(optarg); break; - case '3': - opt.pan_button = atoi(optarg); - break; case '4': opt.menu_button = atoi(optarg); break; @@ -609,9 +602,6 @@ case '9': opt.no_blur_ctrl_mask = 1; break; - case '$': - opt.no_pan_ctrl_mask = 1; - break; case '|': opt.start_list_at = atoi(optarg); break; @@ -744,6 +734,9 @@ " randomise the file list before displaying\n" " -g, --geometry STRING Limit (and don't change) the window size. Takes\n" " an X-style geometry string like 640x480.\n" + " Note that larger images will be zoomed out to fit\n" + " but you can see them at 1:1 by clicking the zoom\n" + " button.\n" " -f, --filelist FILE This option is similar to the playlists used by\n" " music software. If FILE exists, it will be read\n" " for a list of files to load, in the order they\n" @@ -852,10 +845,6 @@ " mode (defaults to 1, usually the left button).\n" " -2, --zoom-button B Use button B to zoom the current image in any\n" " mode (defaults to 2, usually the middle button).\n" - " -3, --pan-button B Use button B to pan the current image in any\n" - " mode (defaults to 3, usually the right button).\n" - " --no-pan-ctrl-mask Don't require CTRL+Button for panning in\n" - " any mode -- just use the button (default=off).\n" " -4, --menu-button B Use CTRL+Button B to activate the menu in any\n" " mode. Set to 0 for any button. This option\n" " is disabled if the -N or --no-menus option is set\n" @@ -943,12 +932,14 @@ " from the filelist\n" " q, Q Quit the slideshow\n" "\n" " MOUSE ACTIONS\n" - " When viewing an image, mouse button 1 moves to the next image (slideshow\n" - " mode only), button 2 zooms (click and drag left->right to zoom in, right->\n" - " left to zoom out, click once to restore 1x zoom), and mouse button 3 pans.\n" + " When viewing an image, a click of mouse button 1 moves to the next image\n" + " (slideshow mode only), a drag of mouse button 1 pans the image, if the\n" + " viewable window is smaller than the image, button 2 zooms (click and drag\n" + " left->right to zoom in, right->left to zoom out, click once to restore\n" + " 1x zoom), and mouse button 3 pans.\n" " Ctrl+button 1 blurs or sharpens the image (drag left to blur and right to\n" - " sharpen). Ctrl+button 2 rotates the image around the center point. Ctrl+\n" - " button 3 activates the context-sensitive menu. Buttons can be redefined\n" + " sharpen). Ctrl+button 2 rotates the image around the center point.\n" + " Button 3 activates the context-sensitive menu. Buttons can be redefined\n" " with the -1 through -9 (or --*-button) cmdline flags. All you people\n" " with million button mice can remove the ctrl mask with the --no-*-ctrl-mask\n" " options.\n" "\n" "See 'man feh' for more detailed information\n" =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/options.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- options.h 2001/08/11 22:21:11 1.30 +++ options.h 2001/08/11 23:15:56 1.31 @@ -80,7 +80,6 @@ unsigned char next_button; unsigned char zoom_button; - unsigned char pan_button; unsigned char menu_button; unsigned char menu_ctrl_mask; =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/winwidget.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -3 -r1.95 -r1.96 --- winwidget.c 2001/08/11 22:30:45 1.95 +++ winwidget.c 2001/08/11 23:15:56 1.96 @@ -326,12 +326,11 @@ if (!opt.full_screen && ((feh_imlib_image_has_alpha(winwid->im)) - || (winwid->im_x || winwid->im_y) || (winwid->zoom != 1.0) + || (opt.geom) || (winwid->im_x || winwid->im_y) || (winwid->zoom != 1.0) || (winwid->w > winwid->im_w || winwid->h > winwid->im_h) || (winwid->has_rotated))) feh_draw_checks(winwid); - if (!opt.full_screen && opt.scale_down && ((winwid->w < winwid->im_w) || (winwid->h < winwid->im_h))) { @@ -365,7 +364,7 @@ { double ratio = 0.0; - /* Image is larger than the screen (so want's shrinking), or it's + /* Image is larger than the screen (so wants shrinking), or it's smaller but wants expanding to fill it */ ratio = feh_calc_needed_zoom(&(winwid->zoom), winwid->im_w, winwid->im_h, @@ -521,6 +520,7 @@ { D_ENTER(4); XSetWindowBackgroundPixmap(disp, w->win, feh_create_checks()); + /* XClearWindow(disp, w->win); */ D_RETURN_(4); } @@ -623,7 +623,6 @@ D_ENTER(4); if(opt.geom) { - winwidget_clear_background(winwid); winwid->had_resize = 1; return; } |
From: <enl...@li...> - 2001-08-11 23:16:27
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: ChangeLog feh.1 Log Message: Sun Aug 12 00:15:06 2001 Tom Gilbert <gil...@li...> * Oops. Fixed bug with zooming out larger images when -g is used. * Other fixes. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/ChangeLog,v retrieving revision 1.212 retrieving revision 1.213 diff -u -3 -r1.212 -r1.213 --- ChangeLog 2001/08/11 22:30:45 1.212 +++ ChangeLog 2001/08/11 23:15:56 1.213 @@ -1,3 +1,8 @@ +Sun Aug 12 00:15:06 2001 Tom Gilbert <gil...@li...> + + * Oops. Fixed bug with zooming out larger images when -g is used. + * Other fixes. + Sat Aug 11 23:29:32 2001 Tom Gilbert <gil...@li...> * Fixed annoying bug where feh would limit window size to desktop =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/feh.1,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- feh.1 2001/08/11 22:21:11 1.37 +++ feh.1 2001/08/11 23:15:56 1.38 @@ -130,6 +130,9 @@ .B -g, --geometry STRING Limit (and don't change) the window size. Takes an X-style geometry string like 640x480. +Note that larger images will be zoomed out to fit +but you can see them at 1:1 by clicking the zoom +button. .TP 5 .B -Z, --auto-zoom Zoom picture to screen size in fullscreen (affected by --stretch and |
From: <enl...@li...> - 2001-08-11 23:24:10
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/cam Modified Files: cam Log Message: correct that =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/cam/cam,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- cam 2001/07/31 17:59:46 1.17 +++ cam 2001/08/11 23:24:10 1.18 @@ -169,7 +169,7 @@ cam [-f|--full-screen] keys Start feh in full-screen mode (aka -g and --giblets-mom \"viewing\" mode). cam [-k|--keep-images] keys - Keep the images in /tmp/ (aka --save-pr0n). + Save each image in the current directory (aka --save-pr0n). cam [-v|--verbose] options Start feh in verbose mode (feh -V). cam <-h|-?|--help> |
From: <enl...@li...> - 2001-08-11 23:26:53
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: ChangeLog Log Message: Sun Aug 12 00:24:38 2001 Tom Gilbert <gil...@li...> * Uh that's not all I changed in the last commit. * Panning is different now. It used to be ctrl+button 3, but this was redefinable using cmdline/theme options. Now, instead, it's combined with the next image button. * ie. by default a single click of button 1 will change images, if there is more than one image in the slideshow. Clicking and dragging button 1 will pan, if the image is bigger than its window. I find this more convenient, but let me know. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/ChangeLog,v retrieving revision 1.213 retrieving revision 1.214 diff -u -3 -r1.213 -r1.214 --- ChangeLog 2001/08/11 23:15:56 1.213 +++ ChangeLog 2001/08/11 23:26:53 1.214 @@ -1,3 +1,14 @@ +Sun Aug 12 00:24:38 2001 Tom Gilbert <gil...@li...> + + * Uh that's not all I changed in the last commit. + * Panning is different now. It used to be ctrl+button 3, but this + was redefinable using cmdline/theme options. Now, instead, it's + combined with the next image button. + * ie. by default a single click of button 1 will change images, if + there is more than one image in the slideshow. Clicking and + dragging button 1 will pan, if the image is bigger than its + window. I find this more convenient, but let me know. + Sun Aug 12 00:15:06 2001 Tom Gilbert <gil...@li...> * Oops. Fixed bug with zooming out larger images when -g is used. |
From: <enl...@li...> - 2001-08-13 20:47:01
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/cam Modified Files: cam Log Message: let cam do geometry =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/cam/cam,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- cam 2001/08/11 23:24:10 1.18 +++ cam 2001/08/13 20:47:00 1.19 @@ -17,6 +17,7 @@ # Options my $help = ''; my $fullscreen = ''; +my $geometry = ''; my $list = ''; my $verbose = ''; my $add = ''; @@ -36,8 +37,9 @@ my %bms = (); GetOptions('help|?|h' => \$help, - 'full-screen|f|giblets-mom|g' => \$fullscreen, + 'full-screen|f|giblets-mom' => \$fullscreen, 'list|l' => \$list, + 'geometry|g' => \$geometry, 'verbose|v' => \$verbose, 'add|a' => \$add, 'keep-images|k|save-pr0n' => \$keep, @@ -59,6 +61,10 @@ $PRE .= " --full-screen --auto-zoom "; } +if ($geometry) { + $PRE .= " --geometry $geometry "; +} + # if requested, add a key/url pair to bookmarks file if ($add) { my $mytitle = ''; @@ -170,6 +176,8 @@ Start feh in full-screen mode (aka -g and --giblets-mom \"viewing\" mode). cam [-k|--keep-images] keys Save each image in the current directory (aka --save-pr0n). + cam [-g|--geometry] xxx + Use window geometry xxx (e.g. 640x480). cam [-v|--verbose] options Start feh in verbose mode (feh -V). cam <-h|-?|--help> |
From: <enl...@li...> - 2001-08-13 20:48:53
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/cam Modified Files: cam Log Message: ewps! =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/cam/cam,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- cam 2001/08/13 20:47:00 1.19 +++ cam 2001/08/13 20:48:53 1.20 @@ -39,7 +39,7 @@ GetOptions('help|?|h' => \$help, 'full-screen|f|giblets-mom' => \$fullscreen, 'list|l' => \$list, - 'geometry|g' => \$geometry, + 'geometry|g=s' => \$geometry, 'verbose|v' => \$verbose, 'add|a' => \$add, 'keep-images|k|save-pr0n' => \$keep, |
From: <enl...@li...> - 2001-08-13 21:22:19
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: winwidget.c Log Message: Mon Aug 13 22:21:44 2001 Tom Gilbert <gil...@li...> * Fixed bug when using -g to reduce image proportionally, calculated zoom was incorrect because I am a dick. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/winwidget.c,v retrieving revision 1.96 retrieving revision 1.97 diff -u -3 -r1.96 -r1.97 --- winwidget.c 2001/08/11 23:15:56 1.96 +++ winwidget.c 2001/08/13 21:22:18 1.97 @@ -472,7 +472,7 @@ else if (ratio != 1.0) *zoom = ((double) dest_h / orig_h); else - *zoom = 1.0; + *zoom = ((double) dest_h / orig_h); D_RETURN(4, ratio); } |
From: <enl...@li...> - 2001-08-13 21:22:49
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: ChangeLog Log Message: Mon Aug 13 22:21:44 2001 Tom Gilbert <gil...@li...> * Fixed bug when using -g to reduce image proportionally, calculated zoom was incorrect because I am a dick. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/ChangeLog,v retrieving revision 1.215 retrieving revision 1.216 diff -u -3 -r1.215 -r1.216 --- ChangeLog 2001/08/12 16:13:20 1.215 +++ ChangeLog 2001/08/13 21:22:18 1.216 @@ -1,3 +1,8 @@ +Mon Aug 13 22:21:44 2001 Tom Gilbert <gil...@li...> + + * Fixed bug when using -g to reduce image proportionally, + calculated zoom was incorrect because I am a dick. + Sun Aug 12 18:13:39 2001 Till Adam <ti...@ad...> * slide menus to the left and/or up if they are off the screen and the |
From: <enl...@li...> - 2001-08-13 21:27:01
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: winwidget.c Log Message: haha that was pointless ;) =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/winwidget.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -3 -r1.97 -r1.98 --- winwidget.c 2001/08/13 21:22:18 1.97 +++ winwidget.c 2001/08/13 21:27:01 1.98 @@ -469,8 +469,6 @@ if (ratio > 1.0) *zoom = ((double) dest_w / orig_w); - else if (ratio != 1.0) - *zoom = ((double) dest_h / orig_h); else *zoom = ((double) dest_h / orig_h); |
From: <enl...@li...> - 2001-08-13 21:40:40
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/cam Modified Files: cam Log Message: thanks Ted =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/cam/cam,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- cam 2001/08/13 20:48:53 1.20 +++ cam 2001/08/13 21:40:39 1.21 @@ -173,7 +173,7 @@ cam <-l|--list> List each url key in the bookmarks file (\"$bp\"). cam [-f|--full-screen] keys - Start feh in full-screen mode (aka -g and --giblets-mom \"viewing\" mode). + Start feh in full-screen mode (aka --giblets-mom \"viewing\" mode). cam [-k|--keep-images] keys Save each image in the current directory (aka --save-pr0n). cam [-g|--geometry] xxx |
From: <enl...@li...> - 2001-08-13 21:46:07
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: configure.in Log Message: coming soon =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/configure.in,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- configure.in 2001/08/10 17:42:17 1.34 +++ configure.in 2001/08/13 21:46:06 1.35 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to create configure. AC_INIT(src/main.c) -AM_INIT_AUTOMAKE(feh, 0.9.9) +AM_INIT_AUTOMAKE(feh, 0.1.0) AM_CONFIG_HEADER(src/config.h) AC_PROG_CC |
From: <enl...@li...> - 2001-08-13 21:50:17
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: configure.in Log Message: bwahaha. I should be shot =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/configure.in,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- configure.in 2001/08/13 21:46:06 1.35 +++ configure.in 2001/08/13 21:50:16 1.36 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to create configure. AC_INIT(src/main.c) -AM_INIT_AUTOMAKE(feh, 0.1.0) +AM_INIT_AUTOMAKE(feh, 1.0.0) AM_CONFIG_HEADER(src/config.h) AC_PROG_CC |
From: <enl...@li...> - 2001-08-13 21:54:48
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: support.c Log Message: I _think_ this will stop E dying on filenames with spaces, I _think_ it supports that. I also hope this will be my first commit of the night with no fuckups in it. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/support.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- support.c 2000/10/29 23:41:39 1.10 +++ support.c 2001/08/13 21:54:45 1.11 @@ -56,7 +56,7 @@ if (feh_wm_get_wm_is_e() && (enl_ipc_get_win() != None)) { - snprintf(sendbuf, sizeof(sendbuf), "background %s bg.file %s", bgname, + snprintf(sendbuf, sizeof(sendbuf), "background %s bg.file \"%s\"", bgname, fil); enl_ipc_send(sendbuf); |
From: <enl...@li...> - 2001-08-14 19:43:31
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: configure.ac feh.1 Log Message: 1.0.0 =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.ac 2001/08/11 22:33:57 1.3 +++ configure.ac 2001/08/14 19:43:30 1.4 @@ -2,7 +2,7 @@ AC_INIT AC_CONFIG_SRCDIR([src/main.c]) -AM_INIT_AUTOMAKE(feh, 0.9.9) +AM_INIT_AUTOMAKE(feh, 1.0.0) AM_CONFIG_HEADER(src/config.h) AC_PROG_CC =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/feh.1,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- feh.1 2001/08/11 23:15:56 1.38 +++ feh.1 2001/08/14 19:43:30 1.39 @@ -1,4 +1,4 @@ -.TH feh 1 "March 22, 2000" +.TH feh 1 "August 14, 2001" .SH NAME feh - image viewer and cataloguer .SH SYNOPSIS |
From: <enl...@li...> - 2001-08-15 19:08:02
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/cam Modified Files: cam Log Message: debian doesn't call it cam =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/cam/cam,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- cam 2001/08/13 21:40:39 1.21 +++ cam 2001/08/15 19:07:59 1.22 @@ -154,7 +154,7 @@ sub print_usage_and_exit() { print <<END_USAGE; -Cam 0.4 +$0 0.4 by Paul Duncan <pabs\@pablotron.org>, and Richard Lowe <richlowe\@btinternet.com> @@ -162,25 +162,25 @@ A convenient webcam wrapper for feh. Usage: - cam <keys> + $0 <keys> Load the urls specified by the given keys. key : a url key stored in the bookmarks file (\"$bp\"). - cam <-a|--add> key url refresh + $0 <-a|--add> key url refresh Add a key to the bookmarks file. key : short key (ex \"jenni\"), url : url (ex \"http://www.jennicam.org/webcam/cam.jpg\"), refresh : refresh, in seconds (ex 120) - cam <-l|--list> + $0 <-l|--list> List each url key in the bookmarks file (\"$bp\"). - cam [-f|--full-screen] keys + $0 [-f|--full-screen] keys Start feh in full-screen mode (aka --giblets-mom \"viewing\" mode). - cam [-k|--keep-images] keys + $0 [-k|--keep-images] keys Save each image in the current directory (aka --save-pr0n). - cam [-g|--geometry] xxx + $0 [-g|--geometry] xxx Use window geometry xxx (e.g. 640x480). - cam [-v|--verbose] options + $0 [-v|--verbose] options Start feh in verbose mode (feh -V). - cam <-h|-?|--help> + $0 <-h|-?|--help> Display usage information (this screen). Notes: |
From: <enl...@li...> - 2001-08-15 23:26:43
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: feh.h imlib.c main.c menu.c options.c options.h support.c support.h Log Message: Thu Aug 16 00:23:26 2001 Tom Gilbert <gil...@li...> * Fook. Broke backgrounding in E for 1.0, enlightenment IPC does NOT support "filename with a space" at all. You can't do it. ARGH. Okay, so back that out. * Add setting bg from commandline, quite useful because it'll use E if it's there or fallback to X, i.e. it should always do the right thing (hopes). * FYI, it's --bg-scale, --bg-center, --bg-seamless, --bg-tile. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/feh.h,v retrieving revision 1.111 retrieving revision 1.112 diff -u -3 -r1.111 -r1.112 --- feh.h 2001/08/11 23:15:56 1.111 +++ feh.h 2001/08/15 23:26:41 1.112 @@ -73,6 +73,9 @@ enum mode_type { MODE_NORMAL = 0, MODE_PAN, MODE_ZOOM, MODE_ROTATE, MODE_BLUR, MODE_NEXT }; +enum bgmode_type +{ BG_MODE_NONE = 0, BG_MODE_TILE, BG_MODE_CENTER, BG_MODE_SEAMLESS, BG_MODE_SCALE }; + enum slide_change { SLIDE_NEXT, SLIDE_PREV, SLIDE_FIRST, SLIDE_LAST, SLIDE_JUMP_FWD, SLIDE_JUMP_BACK =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/imlib.c,v retrieving revision 1.123 retrieving revision 1.124 diff -u -3 -r1.123 -r1.124 --- imlib.c 2001/08/11 00:42:00 1.123 +++ imlib.c 2001/08/15 23:26:41 1.124 @@ -76,12 +76,6 @@ imlib_add_path_to_font_path(PREFIX "/share/feh/fonts"); imlib_add_path_to_font_path("./ttfonts"); - opt.menu_fn = imlib_load_font(opt.menu_font); - if (!opt.menu_fn) - eprintf - ("couldn't load menu font %s, did you make install?\nAre you specifying a nonexistant font?\nDid you tell feh where to find it with --fontpath?", - opt.menu_font); - D_RETURN_(4); } =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/main.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -3 -r1.77 -r1.78 --- main.c 2001/08/09 21:46:41 1.77 +++ main.c 2001/08/15 23:26:41 1.78 @@ -61,6 +61,11 @@ init_unloadables_mode(); else if (opt.thumbs) init_thumbnail_mode(); + else if(opt.bgmode) + { + feh_wm_set_bg_file(opt.output_file, opt.bgmode); + exit(0); + } else { /* Slideshow mode is the default. Because it's spiffy */ =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/menu.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- menu.c 2001/08/12 16:13:20 1.39 +++ menu.c 2001/08/15 23:26:41 1.40 @@ -396,26 +396,26 @@ double vector_len = 0; int stepx = 0; int stepy = 0; - + D_ENTER(4); - vector_len = sqrt( dx*dx + dy*dy ); + vector_len = sqrt(dx * dx + dy * dy); if (vector_len) { if (dx) - stepx = rint(dx / vector_len); - + stepx = rint(dx / vector_len); + if (dy) - stepy = rint(dy / vector_len); + stepy = rint(dy / vector_len); } - for (i=0; i< vector_len; i++) + for (i = 0; i < vector_len; i++) { - for (m=menus;m;m=m->next) + for (m = menus; m; m = m->next) { - if (m->menu->visible) - feh_menu_move(m->menu, m->menu->x + stepx, m->menu->y + stepy); + if (m->menu->visible) + feh_menu_move(m->menu, m->menu->x + stepx, m->menu->y + stepy); - } + } XWarpPointer(disp, None, None, 0, 0, 0, 0, stepx, stepy); } D_RETURN_(4); @@ -990,8 +990,7 @@ feh_menu_cb_save_filelist, NULL, NULL); feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL); feh_menu_add_entry(m, NULL, NULL, NULL, NULL, NULL, NULL); - feh_menu_add_entry(m, "Hide", NULL, NULL, - feh_menu_cb_remove, NULL, NULL); + feh_menu_add_entry(m, "Hide", NULL, NULL, feh_menu_cb_remove, NULL, NULL); feh_menu_add_entry(m, "Delete", NULL, "CONFIRM", NULL, NULL, NULL); D_RETURN_(4); @@ -1006,6 +1005,15 @@ D_ENTER(4); + if (!opt.menu_fn) + { + opt.menu_fn = imlib_load_font(opt.menu_font); + if (!opt.menu_fn) + eprintf + ("couldn't load menu font %s, did you make install?\nAre you specifying a nonexistant font?\nDid you tell feh where to find it with --fontpath?", + opt.menu_font); + } + m = feh_menu_new(); m->name = estrdup("SORT"); @@ -1173,8 +1181,8 @@ if (opt.multiwindow || opt.slideshow) { feh_menu_add_entry(m, NULL, NULL, NULL, NULL, NULL, NULL); - feh_menu_add_entry(m, "Hide", NULL, NULL, - feh_menu_cb_remove, NULL, NULL); + feh_menu_add_entry(m, "Hide", NULL, NULL, feh_menu_cb_remove, NULL, + NULL); feh_menu_add_entry(m, "Delete", NULL, "CONFIRM", NULL, NULL, NULL); } @@ -1252,8 +1260,8 @@ feh_menu_cb_save_filelist, NULL, NULL); feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL); feh_menu_add_entry(m, NULL, NULL, NULL, NULL, NULL, NULL); - feh_menu_add_entry(m, "Hide", NULL, NULL, - feh_menu_cb_remove_thumb, NULL, NULL); + feh_menu_add_entry(m, "Hide", NULL, NULL, feh_menu_cb_remove_thumb, NULL, + NULL); feh_menu_add_entry(m, "Delete", NULL, "THUMBVIEW_CONFIRM", NULL, NULL, NULL); mi = =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/options.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -3 -r1.125 -r1.126 --- options.c 2001/08/11 23:15:56 1.125 +++ options.c 2001/08/15 23:26:41 1.126 @@ -92,6 +92,9 @@ D(4, ("Options parsed\n")); + if(opt.bgmode) + D_RETURN_(4); + if (feh_list_length(filelist) == 0) show_mini_usage(); @@ -298,7 +301,6 @@ feh_parse_option_array(int argc, char **argv) { static char stropts[] = - "a:A:b:BcC:dD:e:f:Fg:GhH:iIj:klL:mM:nNo:O:pqQrR:sS:tT:uUvVwW:xXy:zZ1:2:4:56:78:90:"; static struct option lopts[] = { /* actions */ @@ -368,6 +370,10 @@ {"rcfile", 1, 0, '_'}, {"debug-level", 1, 0, '+'}, {"output-dir", 1, 0, 'j'}, + {"bg-tile", 1, 0, 200}, + {"bg-center", 1, 0, 201}, + {"bg-scale", 1, 0, 202}, + {"bg-seamless", 1, 0, 203}, {0, 0, 0, 0} }; int optch = 0, cmdx = 0, i = 0; @@ -375,8 +381,7 @@ D_ENTER(4); /* Now to pass some optionarinos */ - while ((optch = getopt_long(argc, argv, stropts, lopts, &cmdx)) != - EOF) + while ((optch = getopt_long(argc, argv, stropts, lopts, &cmdx)) != EOF) { D(5, ("Got option, getopt calls it %d, or %c\n", optch, optch)); switch (optch) @@ -437,7 +442,7 @@ break; case 'g': XParseGeometry(optarg, &i, &i, &opt.geom_w, &opt.geom_h); - if((opt.geom_w > 1) && (opt.geom_h > 1)) + if ((opt.geom_w > 1) && (opt.geom_h > 1)) opt.geom = 1; break; case 'N': @@ -617,6 +622,22 @@ case 'j': opt.output_dir = estrdup(optarg); break; + case 200: + opt.bgmode = BG_MODE_TILE; + opt.output_file = estrdup(optarg); + break; + case 201: + opt.bgmode = BG_MODE_CENTER; + opt.output_file = estrdup(optarg); + break; + case 202: + opt.bgmode = BG_MODE_SCALE; + opt.output_file = estrdup(optarg); + break; + case 203: + opt.bgmode = BG_MODE_SEAMLESS; + opt.output_file = estrdup(optarg); + break; default: break; } @@ -836,6 +857,12 @@ " a new viewing window\n" " -I, --fullindex Same as index mode, but below each thumbnail you\n" " get image name, size and dimensions\n" + " --bg-tile FILE\n" + " --bg-center FILE\n" + " --bg-scale FILE\n" + " --bg-seamless FILE Set your desktop background to FILE\n" + " can use enlightenment IPC if you are running\n" + " it, or will fall back to X methods.\n" " --fontpath PATH Specify an extra directory to look in for fonts,\n" " can be used multiple times to add multiple paths.\n" " -M, --menu-font FONT Use FONT for the font in menus.\n" @@ -918,11 +945,11 @@ " When viewing a slideshow, the following keys may be used:\n" " p, P, <BACKSPACE>, <LEFT> Goto previous slide\n" " n, N, <SPACE>, <RIGHT> Goto next slide\n" - " r, R Reload image (good for webcams)\n" - " h, H Pause the slideshow (only useful when using\n" + " r, R Reload image (good for webcams)\n" + " h, H Pause the slideshow (only useful when using\n" " s, S Save current image to unique filename\n" " f, F Save current filelist to unique filename\n" - " timed reloading or image changes)\n" + " timed reloading or image changes)\n" " <HOME> Goto first slide\n" " <END> Goto last slide\n" " +, = Increase reload delay\n" @@ -998,15 +1025,15 @@ "# Add <img> tags to your html with ease :-)\n" "newimg -q -L \"<img src=\\\"%%f\\\" alt=\\\"feh\\\" border=\\\"0\\\" width=\\\"%%w\\\" height=\\\"%%h\\\">\"\n" "\n" "# Different menus\n" "chrome --menu-bg " PREFIX - "/share/feh/images/menubg_chrome.png\n" "brushed --menu-bg " - PREFIX "/share/feh/images/menubg_brushed.png\n" "pastel --menu-bg " - PREFIX "/share/feh/images/menubg_pastel.png\n" "aluminium --menu-bg " + "/share/feh/images/menubg_chrome.png\n" "brushed --menu-bg " PREFIX + "/share/feh/images/menubg_brushed.png\n" "pastel --menu-bg " PREFIX + "/share/feh/images/menubg_pastel.png\n" "aluminium --menu-bg " PREFIX "/share/feh/images/menubg_aluminium.png\n" "wood --menu-bg " - PREFIX "/share/feh/images/menubg_wood.png\n" - "aqua --menu-bg " PREFIX "/share/feh/images/menubg_aqua.png\n" - "orange --menu-bg " PREFIX "/share/feh/images/menubg_orange.png\n" - "light --menu-bg " PREFIX "/share/feh/images/menubg_light.png\n" - "britney --menu-bg " PREFIX "/share/feh/images/menubg_britney.png\n"); + PREFIX "/share/feh/images/menubg_wood.png\n" "aqua --menu-bg " + PREFIX "/share/feh/images/menubg_aqua.png\n" "orange --menu-bg " + PREFIX "/share/feh/images/menubg_orange.png\n" "light --menu-bg " + PREFIX "/share/feh/images/menubg_light.png\n" "britney --menu-bg " + PREFIX "/share/feh/images/menubg_britney.png\n"); fclose(fp); D_RETURN_(4); =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/options.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- options.h 2001/08/11 23:15:56 1.31 +++ options.h 2001/08/15 23:26:41 1.32 @@ -62,6 +62,7 @@ unsigned char scale_down; unsigned char builtin_http; unsigned char wget_timestamp; + unsigned char bgmode; char *output_file; char *output_dir; =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/support.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- support.c 2001/08/13 21:54:45 1.11 +++ support.c 2001/08/15 23:26:41 1.12 @@ -24,6 +24,7 @@ */ #include "feh.h" +#include "filelist.h" #include "options.h" #include "support.h" Window ipc_win = None, my_ipc_win = None; @@ -31,6 +32,37 @@ static unsigned char timeout = 0; void +feh_wm_set_bg_file(char *file, unsigned char bgmode) +{ + Imlib_Image im; + feh_file *fil; + fil = feh_file_new(file); + if (fil) + { + if (feh_load_image(&im, fil) == 0) + eprintf("Couldn't load image in order to set bg"); + switch(bgmode) + { + case BG_MODE_SEAMLESS: + feh_imlib_image_tile(im); + feh_wm_set_bg(NULL, im, 0, 0, 0, 1); + break; + case BG_MODE_TILE: + feh_wm_set_bg(NULL, im, 0, 0, 0, 1); + break; + case BG_MODE_SCALE: + feh_wm_set_bg(NULL, im, 0, 1, 0, 1); + break; + default: + feh_wm_set_bg(NULL, im, 1, 0, 0, 1); + break; + } + feh_imlib_free_image_and_decache(im); + feh_file_free(fil); + } +} + +void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled, int desktop, int set) { @@ -43,21 +75,21 @@ snprintf(bgname, sizeof(bgname), "FEHBG_%d", num); - if (fil == NULL) + if (!fil) { snprintf(bgfil, sizeof(bgfil), "%s/.%s.png", getenv("HOME"), bgname); imlib_context_set_image(im); imlib_image_set_format("png"); feh_imlib_save_image(im, bgfil); - D(3,("bg saved as %s\n", bgfil)); + D(3, ("bg saved as %s\n", bgfil)); fil = bgfil; } - D(3,("Setting bg %s\n", fil)); + D(3, ("Setting bg %s\n", fil)); if (feh_wm_get_wm_is_e() && (enl_ipc_get_win() != None)) { - snprintf(sendbuf, sizeof(sendbuf), "background %s bg.file \"%s\"", bgname, - fil); + snprintf(sendbuf, sizeof(sendbuf), "background %s bg.file %s", + bgname, fil); enl_ipc_send(sendbuf); if (scaled) @@ -114,7 +146,7 @@ { Pixmap tmppmap; - D(3,("Falling back to XSetRootWindowPixmap\n")); + D(3, ("Falling back to XSetRootWindowPixmap\n")); if (scaled) { tmppmap = XCreatePixmap(disp, root, scr->width, scr->height, depth); @@ -129,7 +161,7 @@ GC gc; int x, y; - D(3,("centering\n")); + D(3, ("centering\n")); tmppmap = XCreatePixmap(disp, root, scr->width, scr->height, depth); gcval.foreground = BlackPixel(disp, DefaultScreen(disp)); gc = XCreateGC(disp, root, GCForeground, &gcval); @@ -166,16 +198,16 @@ { if (XInternAtom(disp, "ENLIGHTENMENT_COMMS", True) != None) { - D(3,("Enlightenment detected.\n")); + D(3, ("Enlightenment detected.\n")); e = 1; } else { - D(3,("Enlightenment not detected.\n")); + D(3, ("Enlightenment not detected.\n")); e = 0; } } - D_RETURN(4,e); + D_RETURN(4, e); } int @@ -187,16 +219,16 @@ D_ENTER(4); if (!feh_wm_get_wm_is_e()) - D_RETURN(4,-1); + D_RETURN(4, -1); buf = enl_send_and_wait("num_desks ?"); - D(3,("Got from E IPC: %s\n", buf)); + D(3, ("Got from E IPC: %s\n", buf)); ptr = buf; while (ptr && !isdigit(*ptr)) ptr++; desks = atoi(ptr); -D_RETURN(4,desks)} +D_RETURN(4, desks)} Window enl_ipc_get_win(void) @@ -212,13 +244,13 @@ D_ENTER(4); - D(3,("Searching for IPC window.\n")); + D(3, ("Searching for IPC window.\n")); prop = XInternAtom(disp, "ENLIGHTENMENT_COMMS", True); if (prop == None) { - D(3,("Enlightenment is not running.\n")); - D_RETURN(4,None); + D(3, ("Enlightenment is not running.\n")); + D_RETURN(4, None); } XGetWindowProperty(disp, root, prop, 0, 14, False, AnyPropertyType, &prop2, &format, &num, &after, &str); @@ -272,7 +304,7 @@ { my_ipc_win = XCreateSimpleWindow(disp, root, -2, -2, 1, 1, 0, 0, 0); } - D_RETURN(4,ipc_win); + D_RETURN(4, ipc_win); } void @@ -292,7 +324,7 @@ if (last_msg == NULL) eprintf("eeek"); str = last_msg; - D(4,("Resending last message \"%s\" to Enlightenment.\n", str)); + D(4, ("Resending last message \"%s\" to Enlightenment.\n", str)); } else { @@ -301,7 +333,7 @@ free(last_msg); } last_msg = estrdup(str); - D(4,("Sending \"%s\" to Enlightenment.\n", str)); + D(4, ("Sending \"%s\" to Enlightenment.\n", str)); } if (ipc_win == None) { @@ -316,7 +348,7 @@ ipc_atom = XInternAtom(disp, "ENL_MSG", False); if (ipc_atom == None) { - D(3,("IPC error: Unable to find/create ENL_MSG atom.\n")); + D(3, ("IPC error: Unable to find/create ENL_MSG atom.\n")); D_RETURN_(4); } for (; XCheckTypedWindowEvent(disp, my_ipc_win, ClientMessage, &ev);); /* Discard any out-of-sync messages */ @@ -352,7 +384,7 @@ enl_ipc_timeout(int sig) { timeout = 1; - D_RETURN(4,(sighandler_t *) sig); + D_RETURN(4, (sighandler_t *) sig); sig = 0; } @@ -373,13 +405,13 @@ alarm(0); if (ev.xany.type != ClientMessage) { - D_RETURN(4,IPC_TIMEOUT); + D_RETURN(4, IPC_TIMEOUT); } for (i = 0; i < 20; i++) { msg_buffer[i] = ev.xclient.data.b[i]; } - D_RETURN(4,msg_buffer + 8); + D_RETURN(4, msg_buffer + 8); } char * @@ -396,7 +428,7 @@ if (msg_data == IPC_TIMEOUT) { - D_RETURN(4,IPC_TIMEOUT); + D_RETURN(4, IPC_TIMEOUT); } for (i = 0; i < 12; i++) { @@ -420,9 +452,9 @@ { ret_msg = message; message = NULL; - D(4,("Received complete reply: \"%s\"\n", ret_msg)); + D(4, ("Received complete reply: \"%s\"\n", ret_msg)); } - D_RETURN(4,ret_msg); + D_RETURN(4, ret_msg); } char * @@ -451,11 +483,11 @@ if (reply == IPC_TIMEOUT) { /* We timed out. The IPC window must be AWOL. Reset and resend message. */ - D(3,("IPC timed out. IPC window has gone. Clearing ipc_win.\n")); + D(3, ("IPC timed out. IPC window has gone. Clearing ipc_win.\n")); XSelectInput(disp, ipc_win, None); ipc_win = None; } } signal(SIGALRM, old_alrm); - D_RETURN(4,reply); + D_RETURN(4, reply); } =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/support.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- support.h 2000/09/24 16:08:22 1.3 +++ support.h 2001/08/15 23:26:41 1.4 @@ -45,6 +45,8 @@ int desktop, int set); extern int feh_wm_get_num_desks(void); extern signed char feh_wm_get_wm_is_e(void); +void +feh_wm_set_bg_file(char *file, unsigned char bgmode); _XFUNCPROTOEND #endif |
From: <enl...@li...> - 2001-08-15 23:27:11
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: ChangeLog feh.1 Log Message: Thu Aug 16 00:23:26 2001 Tom Gilbert <gil...@li...> * Fook. Broke backgrounding in E for 1.0, enlightenment IPC does NOT support "filename with a space" at all. You can't do it. ARGH. Okay, so back that out. * Add setting bg from commandline, quite useful because it'll use E if it's there or fallback to X, i.e. it should always do the right thing (hopes). * FYI, it's --bg-scale, --bg-center, --bg-seamless, --bg-tile. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/ChangeLog,v retrieving revision 1.216 retrieving revision 1.217 diff -u -3 -r1.216 -r1.217 --- ChangeLog 2001/08/13 21:22:18 1.216 +++ ChangeLog 2001/08/15 23:26:41 1.217 @@ -1,3 +1,13 @@ +Thu Aug 16 00:23:26 2001 Tom Gilbert <gil...@li...> + + * Fook. Broke backgrounding in E for 1.0, enlightenment IPC does + NOT support "filename with a space" at all. You can't do + it. ARGH. Okay, so back that out. + * Add setting bg from commandline, quite useful because it'll use + E if it's there or fallback to X, i.e. it should always do the + right thing (hopes). + * FYI, it's --bg-scale, --bg-center, --bg-seamless, --bg-tile. + Mon Aug 13 22:21:44 2001 Tom Gilbert <gil...@li...> * Fixed bug when using -g to reduce image proportionally, =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/feh.1,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- feh.1 2001/08/14 19:43:30 1.39 +++ feh.1 2001/08/15 23:26:41 1.40 @@ -229,6 +229,14 @@ .B -t, --thumbnails Same as Index mode, but the thumbnails are clickable image launchers. .TP 5 +.B --bg-tile FILE +.B --bg-center FILE +.B --bg-scale FILE +.B --bg-seamless FILE +Set your desktop background to FILE +can use enlightenment IPC if you are running +it, or will fall back to X methods. +.TP 5 .B -M, --menu-font FONT Use FONT for the font in menus. .TP 5 |
From: <enl...@li...> - 2001-08-15 23:44:06
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: support.c Log Message: DAMMIT. Fixed scaling =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/support.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- support.c 2001/08/15 23:26:41 1.12 +++ support.c 2001/08/15 23:44:05 1.13 @@ -109,7 +109,7 @@ snprintf(sendbuf, sizeof(sendbuf), "background %s bg.xperc 1024", bgname); enl_ipc_send(sendbuf); - snprintf(sendbuf, sizeof(sendbuf), "background %s bg.xperc 1024", + snprintf(sendbuf, sizeof(sendbuf), "background %s bg.yperc 1024", bgname); enl_ipc_send(sendbuf); } |
From: <enl...@li...> - 2001-08-15 23:44:36
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh Modified Files: configure.ac configure.in feh.spec.in Log Message: DAMMIT. Fixed scaling =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- configure.ac 2001/08/14 19:43:30 1.4 +++ configure.ac 2001/08/15 23:44:05 1.5 @@ -2,7 +2,7 @@ AC_INIT AC_CONFIG_SRCDIR([src/main.c]) -AM_INIT_AUTOMAKE(feh, 1.0.0) +AM_INIT_AUTOMAKE(feh, 1.0.1) AM_CONFIG_HEADER(src/config.h) AC_PROG_CC =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/configure.in,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- configure.in 2001/08/13 21:50:16 1.36 +++ configure.in 2001/08/15 23:44:05 1.37 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to create configure. AC_INIT(src/main.c) -AM_INIT_AUTOMAKE(feh, 1.0.0) +AM_INIT_AUTOMAKE(feh, 1.0.1) AM_CONFIG_HEADER(src/config.h) AC_PROG_CC =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/feh.spec.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- feh.spec.in 2001/08/13 21:46:40 1.11 +++ feh.spec.in 2001/08/15 23:44:05 1.12 @@ -1,7 +1,7 @@ Summary: Image viewer using Imlib 2 Name: @PACKAGE@ Version: @VERSION@ -Release: 4 +Release: 1 Copyright: BSD Group: Amusements/Graphics Source: %{name}-%{version}.tar.gz |