From: <enl...@li...> - 2004-07-24 13:54:04
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: collage.c events.c feh.h getopt.c imlib.c main.c menu.c options.c support.c utils.c utils.h winwidget.h Log Message: Sat Jul 24 14:52:19 BST 2004 Tom Gilbert <to...@li...> * Various warning fixes from Claes Nasten <pe...@pe...> =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/collage.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- collage.c 4 Jan 2004 00:14:13 -0000 1.31 +++ collage.c 24 Jul 2004 13:53:56 -0000 1.32 @@ -216,7 +216,7 @@ { char output_buf[1024]; if (opt.output_dir) - snprintf(output_buf,1024,"%s/%S", opt.output_dir, opt.output_file); + snprintf(output_buf,1024,"%s/%s", opt.output_dir, opt.output_file); else strncpy(output_buf,opt.output_file, 1024); gib_imlib_save_image(im_main, output_buf); =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/events.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- events.c 2 Jul 2004 21:06:14 -0000 1.69 +++ events.c 24 Jul 2004 13:53:57 -0000 1.70 @@ -527,7 +527,7 @@ winwid = winwidget_get_from_window(ev->xmotion.window); if (winwid) { - if (opt.mode = MODE_NEXT) + if (opt.mode == MODE_NEXT) { opt.mode = MODE_PAN; winwid->mode = MODE_PAN; =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/feh.h,v retrieving revision 1.127 retrieving revision 1.128 diff -u -3 -r1.127 -r1.128 --- feh.h 23 Feb 2003 16:35:45 -0000 1.127 +++ feh.h 24 Jul 2004 13:53:57 -0000 1.128 @@ -136,6 +136,7 @@ char *feh_http_load_image(char *url); int feh_load_image_char(Imlib_Image * im, char *filename); void feh_draw_filename(winwidget w); +void feh_draw_caption(winwidget w); void feh_display_status(char stat); void real_loadables_mode(int loadable); void feh_reload_image(winwidget w, int resize); =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/getopt.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- getopt.c 12 May 2000 22:59:01 -0000 1.5 +++ getopt.c 24 Jul 2004 13:53:57 -0000 1.6 @@ -692,6 +692,7 @@ else { if (opterr) + { if (argv[optind - 1][1] == '-') /* --option */ fprintf(stderr, @@ -704,6 +705,7 @@ _ ("%s: option `%c%s' doesn't allow an argument\n"), argv[0], argv[optind - 1][0], pfound->name); + } nextchar += strlen(nextchar); =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/imlib.c,v retrieving revision 1.150 retrieving revision 1.151 diff -u -3 -r1.150 -r1.151 --- imlib.c 23 Feb 2003 16:35:45 -0000 1.150 +++ imlib.c 24 Jul 2004 13:53:57 -0000 1.151 @@ -254,16 +254,12 @@ char * feh_http_load_image(char *url) { - char *tmp; char *tmpname; char *tmpname_timestamper = NULL; char *basename; - char cppid[10]; - static long int i = 1; char *newurl = NULL; char randnum[20]; int rnum; - pid_t ppid; char *path = NULL; D_ENTER(4); @@ -287,7 +283,7 @@ pid_t ppid; ppid = getpid(); - snprintf(cppid, sizeof(cppid), "%06ld", ppid); + snprintf(cppid, sizeof(cppid), "%06ld", (long)ppid); tmpname_timestamper = estrjoin("", "/tmp/feh_", cppid, "_", basename, NULL); } @@ -545,12 +541,12 @@ if (opt.wget_timestamp) { execlp("wget", "wget", "-N", "-O", tmpname_timestamper, newurl, - quiet, NULL); + quiet, (char*) NULL); } else { execlp("wget", "wget", "--cache", "0", newurl, "-O", tmpname, - quiet, NULL); + quiet, (char*) NULL); } eprintf("url: exec failed: wget:"); } @@ -760,7 +756,6 @@ int x, y; Imlib_Image im = NULL; static DATA8 atab[256]; - struct stat st; char *p; gib_list *lines, *l; static gib_style *caption_style = NULL; @@ -932,8 +927,8 @@ } void feh_edit_inplace_orient(winwidget w, int orientation) { - int orient, ret; - Imlib_Image old, new; + int ret; + Imlib_Image old; D_ENTER(4); if(!w->file || !w->file->data =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/main.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -3 -r1.80 -r1.81 --- main.c 23 Feb 2003 16:35:46 -0000 1.80 +++ main.c 24 Jul 2004 13:53:57 -0000 1.81 @@ -29,6 +29,7 @@ #include "timers.h" #include "options.h" #include "events.h" +#include "support.h" char **cmdargv = NULL; int cmdargc = 0; =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/menu.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -3 -r1.60 -r1.61 --- menu.c 2 Jul 2004 21:06:15 -0000 1.60 +++ menu.c 24 Jul 2004 13:53:57 -0000 1.61 @@ -302,10 +302,10 @@ D_RETURN(4, i); } else if (i->submenu) { mm = feh_menu_find(i->submenu); - if (mm) + if (mm) { ii = feh_menu_find_selected_r(mm, parent); - if (ii) { - D_RETURN(4, ii); + if (ii) + D_RETURN(4, ii); } } } @@ -1053,8 +1053,6 @@ int oy, int on) { - int xc, yc; - D_ENTER(5); x -= ox; y -= oy; @@ -1251,7 +1249,6 @@ int num_desks, i; char buf[30]; feh_menu *m; - feh_menu_item *mi; D_ENTER(4); @@ -1839,7 +1836,6 @@ data = NULL; } - static feh_menu * feh_menu_func_gen_jump(feh_menu * m, feh_menu_item * i, =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/options.c,v retrieving revision 1.154 retrieving revision 1.155 diff -u -3 -r1.154 -r1.155 --- options.c 2 Jul 2004 21:06:15 -0000 1.154 +++ options.c 24 Jul 2004 13:53:57 -0000 1.155 @@ -1045,7 +1045,7 @@ " <KEYPAD RIGHT> Move the image to the right\n" " <KEYPAD +> Zoom in\n" " <KEYPAD -> Zoom out\n" - " <KEYPAD *> Zoom to 100%\n" + " <KEYPAD *> Zoom to 100%%\n" " <KEYPAD /> Zoom to fit the window\n" "\n" " MOUSE ACTIONS\n" " When viewing an image, a click of mouse button 1 moves to the next image\n" =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/support.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- support.c 23 Feb 2003 16:35:47 -0000 1.24 +++ support.c 24 Jul 2004 13:53:57 -0000 1.25 @@ -161,7 +161,6 @@ XGCValues gcvalues; GC gc; int w, h; - XImage *xi; D(3, ("Falling back to XSetRootWindowPixmap\n")); =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/utils.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- utils.c 23 Feb 2003 16:35:47 -0000 1.16 +++ utils.c 24 Jul 2004 13:53:57 -0000 1.17 @@ -172,13 +172,10 @@ /* free the result please */ char *feh_unique_filename(char *path, char *basename) { - char *tmp; char *tmpname; - char *tmpname_timestamper = NULL; char num[10]; char cppid[10]; static long int i = 1; - int rnum; struct stat st; pid_t ppid; @@ -188,7 +185,7 @@ i = 1; ppid = getpid(); - snprintf(cppid, sizeof(cppid), "%06ld", ppid); + snprintf(cppid, sizeof(cppid), "%06ld", (long)ppid); /* make sure file doesn't exist */ do =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/utils.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- utils.h 23 Feb 2003 16:35:47 -0000 1.15 +++ utils.h 24 Jul 2004 13:53:57 -0000 1.16 @@ -39,7 +39,7 @@ char *stroflen(char, int); char *feh_unique_filename(char *path, char *basename); char *ereadfile(char *path); -char *feh_get_tmpdir(void); +char *feh_get_tmp_dir(void); char *feh_get_user_name(void); #define ESTRAPPEND(a,b) \ =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/winwidget.h,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- winwidget.h 23 Feb 2003 16:35:47 -0000 1.44 +++ winwidget.h 24 Jul 2004 13:53:57 -0000 1.45 @@ -115,6 +115,7 @@ int winwidget_loadimage(winwidget winwid, feh_file * filename); void winwidget_show(winwidget winwid); +void winwidget_show_menu(winwidget winwid); void winwidget_hide(winwidget winwid); void winwidget_destroy_all(void); void winwidget_free_image(winwidget w); |