--- glslideshow.c.orig 2017-03-28 19:49:15.730481140 -0500 +++ glslideshow.c 2017-03-29 20:46:39.786631068 -0500 @@ -67,55 +67,62 @@ * Perhaps it's easier for them because their OpenGL libraries have * thread support at a lower level? */ #define DEFAULTS "*delay: 20000 \n" \ "*wireframe: False \n" \ "*showFPS: False \n" \ "*fpsSolid: True \n" \ "*useSHM: True \n" \ "*titleFont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n" \ + "*commentFont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n" \ "*desktopGrabber: xscreensaver-getimage -no-desktop %s\n" \ "*grabDesktopImages: False \n" \ "*chooseRandomImages: True \n" # define refresh_slideshow 0 # define release_slideshow 0 # include "xlockmore.h" #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) #ifdef USE_GL # define DEF_FADE_DURATION "2" # define DEF_PAN_DURATION "6" # define DEF_IMAGE_DURATION "30" # define DEF_ZOOM "75" # define DEF_FPS_CUTOFF "5" # define DEF_TITLES "False" +# define DEF_COMMENTS "True" # define DEF_LETTERBOX "True" # define DEF_DEBUG "False" # define DEF_MIPMAP "True" +#define TEXT_OPACITY 0.6 + #include "grab-ximage.h" #include "texfont.h" +#include +#include typedef struct { double x, y, w, h; } rect; typedef struct { ModeInfo *mi; int id; /* unique number for debugging */ char *title; /* the filename of this image */ + char *comment; /* the comment for this image */ int w, h; /* size in pixels of the image */ int tw, th; /* size in pixels of the texture */ XRectangle geom; /* where in the image the bits are */ Bool loaded_p; /* whether the image has finished loading */ Bool used_p; /* whether the image has yet appeared on screen */ GLuint texid; /* which texture contains the image */ int refcount; /* how many sprites refer to this image */ } image; @@ -153,21 +160,22 @@ re-painting. Tick this if a redisplay is required. */ Bool change_now_p; /* Set when the user clicks to ask for a new image right now. */ GLfloat fps; /* approximate frame rate we're achieving */ GLfloat theoretical_fps; /* maximum frame rate that might be possible */ Bool checked_fps_p; /* Whether we have checked for a low frame rate. */ - texture_font_data *font_data; /* for printing image file names */ + texture_font_data *font_data_title; /* for printing image file names */ + texture_font_data *font_data_comment; /* for printing image comments */ int sprite_id, image_id; /* debugging id counters */ double time_elapsed; int frames_elapsed; } slideshow_state; static slideshow_state *sss = NULL; @@ -183,48 +191,51 @@ the way in, 75% of the image will be visible." */ static int fps_cutoff; /* If the frame-rate falls below this, turn off zooming.*/ static Bool letterbox_p; /* When a loaded image is not the same aspect ratio as the window, whether to display black bars. */ static Bool mipmap_p; /* Use mipmaps instead of single textures. */ static Bool do_titles; /* Display image titles. */ +static Bool do_comments; /* Display image comments. */ static Bool debug_p; /* Be loud and do weird things. */ static XrmOptionDescRec opts[] = { {"-fade", ".fadeDuration", XrmoptionSepArg, 0 }, {"-pan", ".panDuration", XrmoptionSepArg, 0 }, {"-duration", ".imageDuration", XrmoptionSepArg, 0 }, {"-zoom", ".zoom", XrmoptionSepArg, 0 }, {"-cutoff", ".FPScutoff", XrmoptionSepArg, 0 }, {"-titles", ".titles", XrmoptionNoArg, "True" }, + {"-comments", ".comments", XrmoptionNoArg, "True" }, {"-letterbox", ".letterbox", XrmoptionNoArg, "True" }, {"-no-letterbox", ".letterbox", XrmoptionNoArg, "False" }, {"-clip", ".letterbox", XrmoptionNoArg, "False" }, {"-mipmaps", ".mipmap", XrmoptionNoArg, "True" }, {"-no-mipmaps", ".mipmap", XrmoptionNoArg, "False" }, {"-debug", ".debug", XrmoptionNoArg, "True" }, }; static argtype vars[] = { { &fade_seconds, "fadeDuration", "FadeDuration", DEF_FADE_DURATION, t_Int}, { &pan_seconds, "panDuration", "PanDuration", DEF_PAN_DURATION, t_Int}, { &image_seconds, "imageDuration","ImageDuration",DEF_IMAGE_DURATION, t_Int}, { &zoom, "zoom", "Zoom", DEF_ZOOM, t_Int}, { &mipmap_p, "mipmap", "Mipmap", DEF_MIPMAP, t_Bool}, { &letterbox_p, "letterbox", "Letterbox", DEF_LETTERBOX, t_Bool}, { &fps_cutoff, "FPScutoff", "FPSCutoff", DEF_FPS_CUTOFF, t_Int}, { &debug_p, "debug", "Debug", DEF_DEBUG, t_Bool}, { &do_titles, "titles", "Titles", DEF_TITLES, t_Bool}, + { &do_comments, "comments", "Comments", DEF_COMMENTS, t_Bool}, }; ENTRYPOINT ModeSpecOpt slideshow_opts = {countof(opts), opts, countof(vars), vars, NULL}; static const char * blurb (void) { # ifdef HAVE_JWXYZ return "GLSlideshow"; @@ -331,20 +342,95 @@ glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); img->w = image_width; img->h = image_height; img->tw = texture_width; img->th = texture_height; img->geom = *geom; img->title = (filename ? strdup (filename) : 0); + /* Only load the comment if requested, since it adds a little overhead. */ + if (do_comments) + { + char lineBuffer[16384]; + FILE* exifOutput; + char* tempComment = NULL; + char* commandLine = (char*) malloc(sizeof(char) * (sizeof("exiftool -UserComment \"") + strlen("/home/gregstoll/images/allgallerypictures/") + strlen(filename) + strlen("\"") + 1)); + if (debug_p) + fprintf(stderr, "looking for comment\n"); + memset(lineBuffer, 0, sizeof(lineBuffer)/sizeof(char)); + strcpy(commandLine, "exiftool -UserComment \""); + /* TODO - sigh, don't know how to get this from the fn params */ + strcat(commandLine, "/home/gregstoll/images/allgallerypictures/"); + strcat(commandLine, filename); + strcat(commandLine, "\""); + if (debug_p) + fprintf(stderr, "exiftool command line: %s\n", commandLine); + exifOutput = popen(commandLine, "r"); + img->comment = NULL; + while (fgets(lineBuffer, sizeof(lineBuffer)/sizeof(char), exifOutput) != NULL) + { + /* Make sure the line begins with spaces and "User Comment " */ + int i = 0; + int lineBufferLength = strlen(lineBuffer); + int beginPos = -1; + while (i < lineBufferLength) + { + if (lineBuffer[i] == 'U') + { + if (strncmp(&lineBuffer[i], "User Comment ", strlen("User Comment ")) == 0) + { + /* Found it! */ + /* Skip past the colon */ + beginPos = i + strlen("User Comment "); + while (beginPos < sizeof(lineBuffer)/sizeof(char) && lineBuffer[beginPos] != ':') + { + ++beginPos; + } + if (beginPos >= sizeof(lineBuffer)/sizeof(char) - 2) + { + img->comment = malloc(10); + img->comment[0] = '~'; + img->comment[1] = '!'; + img->comment[2] = '\0'; + beginPos = -1; + } + else + { + ++beginPos; + ++beginPos; + } + /* Either way, we can stop. */ + break; + } + } + ++i; + } + if (beginPos != -1) + { + tempComment = (char*)malloc(sizeof(char) * (strlen(&lineBuffer[beginPos]) + 1)); + strcpy(tempComment, &lineBuffer[beginPos]); + img->comment = tempComment; + pclose(exifOutput); + free(commandLine); + break; + } + } + if (debug_p) + { + if (img->comment) + fprintf(stderr, "comment is %s\n", img->comment); + else + fprintf(stderr, "comment is null\n"); + } + } /* If the image's width doesn't come back as the width of the screen, then the image must have been scaled down (due to insufficient texture memory.) Scale up the coordinates to stretch the image to fill the window. */ if (img->w != MI_WIDTH(mi)) { double scale = (double) MI_WIDTH(mi) / img->w; img->w *= scale; @@ -406,20 +492,21 @@ break; } if (!freed_p) abort(); if (debug_p) fprintf (stderr, "%s: unloaded img %2d: \"%s\"\n", blurb(), img->id, (img->title ? img->title : "(null)")); if (img->title) free (img->title); + if (img->comment) free (img->comment); glDeleteTextures (1, &img->texid); free (img); } /* Return an image to use for a sprite. If it's time for a new one, get a new one. Otherwise, use an old one. Might return 0 if the machine is really slow. */ @@ -802,25 +889,90 @@ if (!wire) glEnable (GL_TEXTURE_2D); } } if (do_titles && img->title && *img->title && (sp->state == IN || sp->state == FULL)) { - glColor4f (1, 1, 1, sp->opacity); - print_texture_label (mi->dpy, ss->font_data, + glColor4f (1, 1, 1, TEXT_OPACITY); + print_texture_label (mi->dpy, ss->font_data_title, mi->xgwa.width, mi->xgwa.height, 1, img->title); } + + if (do_comments && + img->comment && *img->comment && + (sp->state == IN || sp->state == FULL)) + { + /* Break up comment by line */ + /* It would be nice if we could measure the font and tell exactly + * how big it's going to be - maybe we could use string_to_texture()? */ + int y = 50; + char tempChar = '\0'; + int commentPos = 0; + /* See where we have to break the line. */ + while(commentPos < strlen(img->comment)) + { + int whereToBreak, origWhereToBreak, len; + + whereToBreak = mi->xgwa.width / 16; /* 12; */ + len = strlen(&img->comment[commentPos]); + if (whereToBreak > len) + { + if (len > 0 && img->comment[commentPos+len-1] == '\n') + { + img->comment[commentPos+len-1] = '\0'; + } + /* No need to break. */ + } + else + { + /* Find a friendly spot to break, if possible. */ + origWhereToBreak = whereToBreak; + whereToBreak = commentPos + origWhereToBreak; + while (img->comment[whereToBreak] != ' ' && img->comment[whereToBreak] != '\t' && img->comment[whereToBreak] != '\n' && whereToBreak > commentPos) + { + --whereToBreak; + } + /* If we found nothing, too bad. */ + if (whereToBreak == commentPos) + { + whereToBreak = commentPos + origWhereToBreak; + } + tempChar = img->comment[whereToBreak]; + img->comment[whereToBreak] = '\0'; + } + glColor4f (1, 1, 1, TEXT_OPACITY); + print_texture_label_with_offset (mi->dpy, ss->font_data_comment, + mi->xgwa.width, mi->xgwa.height, + 1, &img->comment[commentPos], + 0, -1 * y); + + if (tempChar != '\0') + { + img->comment[whereToBreak] = tempChar; + commentPos = whereToBreak + 1; + if (tempChar != ' ' && tempChar != '\t' && tempChar != '\n') + { + --commentPos; + } + tempChar = '\0'; + y += 25; + } else { + commentPos = strlen(img->comment); + } + } + } + } glPopMatrix(); if (debug_p) { if (!wire) glDisable (GL_TEXTURE_2D); if (sp->id & 1) glColor4f (1, 0, 0, 1); else @@ -1111,21 +1263,22 @@ if (! wire) { glEnable (GL_TEXTURE_2D); glShadeModel (GL_SMOOTH); glEnable (GL_BLEND); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } if (debug_p) glLineWidth (3); - ss->font_data = load_texture_font (mi->dpy, "titleFont"); + ss->font_data_title = load_texture_font (mi->dpy, "titleFont"); + ss->font_data_comment = load_texture_font (mi->dpy, "commentFont"); if (debug_p) hack_resources(); ss->now = double_time(); ss->dawn_of_time = ss->now; ss->prev_frame_time = ss->now; ss->awaiting_first_image_p = True; alloc_image (mi);