Image loading error now just warns.

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index 9aa3fb6..f910d0c 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -142,7 +142,7 @@ main(int argc, char *argv[])
 
        /* open connection to server and set X variables */
        if ((dpy = XOpenDisplay(NULL)) == NULL)
 
        /* open connection to server and set X variables */
        if ((dpy = XOpenDisplay(NULL)) == NULL)

-               errx(1, "cannot open display");
+               errx(1, "could not open display");

        screen = DefaultScreen(dpy);
        visual = DefaultVisual(dpy, screen);
        rootwin = RootWindow(dpy, screen);
        screen = DefaultScreen(dpy);
        visual = DefaultVisual(dpy, screen);
        rootwin = RootWindow(dpy, screen);


@@ -256,9 +256,8 @@ parsefonts(const char *s)
                i = 0;
                while (isspace(*p))
                        p++;
                i = 0;
                while (isspace(*p))
                        p++;

-               while (i < sizeof buf && *p != '\0' && *p != ',') {
+               while (i < sizeof buf && *p != '\0' && *p != ',')

                        buf[i++] = *p++;
                        buf[i++] = *p++;

-               }

                if (i >= sizeof buf)
                        errx(1, "font name too long");
                if (*p == ',')
                if (i >= sizeof buf)
                        errx(1, "font name too long");
                if (*p == ',')


@@ -268,7 +267,7 @@ parsefonts(const char *s)
                        if ((dc.pattern = FcNameParse((FcChar8 *)buf)) == NULL)
                                errx(1, "the first font in the cache must be loaded from a font string");
                if ((dc.fonts[nfont++] = XftFontOpenName(dpy, screen, buf)) == NULL)
                        if ((dc.pattern = FcNameParse((FcChar8 *)buf)) == NULL)
                                errx(1, "the first font in the cache must be loaded from a font string");
                if ((dc.fonts[nfont++] = XftFontOpenName(dpy, screen, buf)) == NULL)

-                       errx(1, "cannot load font");
+                       errx(1, "could not load font");

        }
 }
 
        }
 }
 


@@ -277,7 +276,7 @@ static void
 ealloccolor(const char *s, XftColor *color)
 {
        if(!XftColorAllocName(dpy, visual, colormap, s, color))
 ealloccolor(const char *s, XftColor *color)
 {
        if(!XftColorAllocName(dpy, visual, colormap, s, color))

-               errx(1, "cannot allocate color: %s", s);
+               errx(1, "could not allocate color: %s", s);

 }
 
 /* query monitor information and cursor position */
 }
 
 /* query monitor information and cursor position */


@@ -301,7 +300,7 @@ initmonitor(void)
        if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) {
                int selmon = 0;
 
        if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) {
                int selmon = 0;
 

-               if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) {
+               if (!mflag || config.monitor < 0 || config.monitor >= nmons) {

                        for (i = 0; i < nmons; i++) {
                                if (BETWEEN(cursx, info[i].x_org, info[i].x_org + info[i].width) &&
                                    BETWEEN(cursy, info[i].y_org, info[i].y_org + info[i].height)) {
                        for (i = 0; i < nmons; i++) {
                                if (BETWEEN(cursx, info[i].x_org, info[i].x_org + info[i].width) &&
                                    BETWEEN(cursy, info[i].y_org, info[i].y_org + info[i].height)) {


@@ -515,7 +514,7 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file)
                          menu = menu->parent, i++)
                        ;
                if (menu == NULL)
                          menu = menu->parent, i++)
                        ;
                if (menu == NULL)

-                       errx(1, "reached NULL menu");
+                       errx(1, "improper indentation detected");

 
                /* find last item in the new menu */
                for (item = menu->list; item->next != NULL; item = item->next)
 
                /* find last item in the new menu */
                for (item = menu->list; item->next != NULL; item = item->next)


@@ -865,7 +864,7 @@ grabpointer(void)
                        return;
                nanosleep(&ts, NULL);
        }
                        return;
                nanosleep(&ts, NULL);
        }

-       errx(1, "cannot grab keyboard");
+       errx(1, "could not grab pointer");

 }
 
 /* try to grab keyboard, we may have to wait for another process to ungrab */
 }
 
 /* try to grab keyboard, we may have to wait for another process to ungrab */


@@ -881,7 +880,7 @@ grabkeyboard(void)
                        return;
                nanosleep(&ts, NULL);
        }
                        return;
                nanosleep(&ts, NULL);
        }

-       errx(1, "cannot grab keyboard");
+       errx(1, "could not grab keyboard");

 }
 
 /* load and scale icon */
 }
 
 /* load and scale icon */


@@ -889,13 +888,55 @@ static Imlib_Image
 loadicon(const char *file)
 {
        Imlib_Image icon;
 loadicon(const char *file)
 {
        Imlib_Image icon;

+       Imlib_Load_Error errcode;
+       const char *errstr;

        int width;
        int height;
        int imgsize;
 
        int width;
        int height;
        int imgsize;
 

-       icon = imlib_load_image(file);
-       if (icon == NULL)
-               errx(1, "cannot load icon %s", file);
+       icon = imlib_load_image_with_error_return(file, &errcode);
+       if (*file == '\0') {
+               warnx("could not load icon (file name is blank)");
+               return NULL;
+       } else if (icon == NULL) {
+               switch (errcode) {
+               case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
+                       errstr = "file does not exist";
+                       break;
+               case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY:
+                       errstr = "file is directory";
+                       break;
+               case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ:
+               case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE:
+                       errstr = "permission denied";
+                       break;
+               case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT:
+                       errstr = "unknown file format";
+                       break;
+               case IMLIB_LOAD_ERROR_PATH_TOO_LONG:
+                       errstr = "path too long";
+                       break;
+               case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT:
+               case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY:
+               case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE:
+                       errstr = "improper path";
+                       break;
+               case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS:
+                       errstr = "too many symbolic links";
+                       break;
+               case IMLIB_LOAD_ERROR_OUT_OF_MEMORY:
+                       errstr = "out of memory";
+                       break;
+               case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS:
+                       errstr = "out of file descriptors";
+                       break;
+               default:
+                       errstr = "unknown error";
+                       break;
+               }
+               warnx("could not load icon (%s): %s", errstr, file);
+               return NULL;
+       }

 
        imlib_context_set_image(icon);
 
 
        imlib_context_set_image(icon);
 


@@ -973,9 +1014,10 @@ drawitems(struct Menu *menu)
                        }
 
                        /* draw icon */
                        }
 
                        /* draw icon */

-                       if (item->file != NULL && !iflag) {
+                       if (item->file && !iflag)

                                item->icon = loadicon(item->file);
 
                                item->icon = loadicon(item->file);
 

+                       if (item->icon) {

                                imlib_context_set_image(item->icon);
                                imlib_context_set_drawable(item->sel);
                                imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);
                                imlib_context_set_image(item->icon);
                                imlib_context_set_drawable(item->sel);
                                imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);