Merge branch 'asyncinfo'
This commit is contained in:
Bert Münnich
commit
447bc1c784
|
|
@ -33,6 +33,7 @@
|
|||
void cleanup(void);
|
||||
void remove_file(int, bool);
|
||||
void load_image(int);
|
||||
void open_info(void);
|
||||
void redraw(void);
|
||||
void reset_cursor(void);
|
||||
void animate(void);
|
||||
|
|
@ -92,10 +93,13 @@ bool it_toggle_fullscreen(arg_t a)
|
|||
bool it_toggle_bar(arg_t a)
|
||||
{
|
||||
win_toggle_bar(&win);
|
||||
if (mode == MODE_IMAGE)
|
||||
if (mode == MODE_IMAGE) {
|
||||
img.checkpan = img.dirty = true;
|
||||
else
|
||||
if (win.bar.h > 0)
|
||||
open_info();
|
||||
} else {
|
||||
tns.dirty = true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,15 @@
|
|||
# with the name of the image file as its first argument.
|
||||
# The output is displayed in sxiv's status bar.
|
||||
|
||||
s=" | " # field separator
|
||||
|
||||
filename=$(basename "$1")
|
||||
filesize=$(du -h "$1" | cut -f 1)
|
||||
|
||||
geometry=$(identify -format '%wx%h' "$1[0]")
|
||||
|
||||
tags=$(exiv2 -q pr -pi "$1" | awk '$1~"Keywords" { printf("%s,", $4); }')
|
||||
tags=${tags:+|}${tags%,}
|
||||
tags=${tags%,}
|
||||
|
||||
echo "[$filesize|$geometry$tags] $filename"
|
||||
echo "${filesize}${s}${geometry}${tags:+$s}${tags}${s}${filename}"
|
||||
|
||||
|
|
|
|||
167
main.c
167
main.c
|
|
@ -22,10 +22,14 @@
|
|||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <sys/select.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/wait.h>
|
||||
#include <X11/keysym.h>
|
||||
|
||||
#include "types.h"
|
||||
|
|
@ -38,8 +42,6 @@
|
|||
#include "config.h"
|
||||
|
||||
enum {
|
||||
BAR_L_LEN = 512,
|
||||
BAR_R_LEN = 64,
|
||||
FILENAME_CNT = 1024,
|
||||
TITLE_LEN = 256
|
||||
};
|
||||
|
|
@ -70,12 +72,12 @@ int prefix;
|
|||
bool resized = false;
|
||||
|
||||
const char * const INFO_SCRIPT = ".sxiv/exec/image-info";
|
||||
char *info_script;
|
||||
|
||||
struct {
|
||||
char l[BAR_L_LEN];
|
||||
char r[BAR_R_LEN];
|
||||
} bar;
|
||||
char *script;
|
||||
int fd;
|
||||
unsigned int i, lastsep;
|
||||
bool open;
|
||||
} info;
|
||||
|
||||
timeout_t timeouts[] = {
|
||||
{ { 0, 0 }, false, redraw },
|
||||
|
|
@ -212,35 +214,69 @@ bool check_timeouts(struct timeval *t)
|
|||
return tmin > 0;
|
||||
}
|
||||
|
||||
void open_info(void)
|
||||
{
|
||||
static pid_t pid;
|
||||
int pfd[2];
|
||||
|
||||
if (info.script == NULL || info.open || win.bar.h == 0)
|
||||
return;
|
||||
if (info.fd != -1) {
|
||||
close(info.fd);
|
||||
kill(pid, SIGTERM);
|
||||
info.fd = -1;
|
||||
}
|
||||
win.bar.l[0] = '\0';
|
||||
|
||||
if (pipe(pfd) < 0)
|
||||
return;
|
||||
pid = fork();
|
||||
if (pid > 0) {
|
||||
close(pfd[1]);
|
||||
fcntl(pfd[0], F_SETFL, O_NONBLOCK);
|
||||
info.fd = pfd[0];
|
||||
info.i = info.lastsep = 0;
|
||||
info.open = true;
|
||||
} else if (pid == 0) {
|
||||
close(pfd[0]);
|
||||
dup2(pfd[1], 1);
|
||||
execl(info.script, info.script, files[fileidx].name, NULL);
|
||||
warn("could not exec: %s", info.script);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
void read_info(void)
|
||||
{
|
||||
char cmd[4096];
|
||||
FILE *outp;
|
||||
int c, i = 0, n = sizeof(bar.l) - 1;
|
||||
bool lastsep = false;
|
||||
|
||||
if (info_script != NULL) {
|
||||
snprintf(cmd, sizeof(cmd), "%s \"%s\"", info_script, files[fileidx].name);
|
||||
outp = popen(cmd, "r");
|
||||
if (outp == NULL)
|
||||
ssize_t i, n;
|
||||
char buf[BAR_L_LEN];
|
||||
|
||||
while (true) {
|
||||
n = read(info.fd, buf, sizeof(buf));
|
||||
if (n < 0 && errno == EAGAIN)
|
||||
return;
|
||||
else if (n == 0)
|
||||
goto end;
|
||||
while (i < n && (c = fgetc(outp)) != EOF) {
|
||||
if (c == '\n') {
|
||||
if (!lastsep) {
|
||||
bar.l[i++] = ' ';
|
||||
lastsep = true;
|
||||
for (i = 0; i < n; i++) {
|
||||
if (buf[i] == '\n') {
|
||||
if (info.lastsep == 0) {
|
||||
win.bar.l[info.i++] = ' ';
|
||||
info.lastsep = 1;
|
||||
}
|
||||
} else {
|
||||
bar.l[i++] = c;
|
||||
lastsep = false;
|
||||
win.bar.l[info.i++] = buf[i];
|
||||
info.lastsep = 0;
|
||||
}
|
||||
if (info.i + 1 == sizeof(win.bar.l))
|
||||
goto end;
|
||||
}
|
||||
pclose(outp);
|
||||
}
|
||||
end:
|
||||
if (lastsep)
|
||||
i--;
|
||||
bar.l[i] = '\0';
|
||||
info.i -= info.lastsep;
|
||||
win.bar.l[info.i] = '\0';
|
||||
win_update_bar(&win);
|
||||
info.fd = -1;
|
||||
while (waitpid(-1, NULL, WNOHANG) > 0);
|
||||
}
|
||||
|
||||
void load_image(int new)
|
||||
|
|
@ -261,7 +297,8 @@ void load_image(int new)
|
|||
alternate = fileidx;
|
||||
fileidx = new;
|
||||
|
||||
read_info();
|
||||
info.open = false;
|
||||
open_info();
|
||||
|
||||
if (img.multi.cnt > 0 && img.multi.animate)
|
||||
set_timeout(animate, img.multi.frames[img.multi.sel].delay, true);
|
||||
|
|
@ -271,51 +308,56 @@ void load_image(int new)
|
|||
|
||||
void update_info(void)
|
||||
{
|
||||
unsigned int i, fn, fw, n, len = sizeof(bar.r);
|
||||
int sel;
|
||||
char *t = bar.r, title[TITLE_LEN];
|
||||
unsigned int i, fn, fw, n;
|
||||
unsigned int llen = sizeof(win.bar.l), rlen = sizeof(win.bar.r);
|
||||
char *lt = win.bar.l, *rt = win.bar.r, title[TITLE_LEN];
|
||||
bool ow_info;
|
||||
|
||||
for (fw = 0, i = filecnt; i > 0; fw++, i /= 10);
|
||||
sel = mode == MODE_IMAGE ? fileidx : tns.sel;
|
||||
|
||||
/* update window title */
|
||||
if (mode == MODE_THUMB) {
|
||||
win_set_title(&win, "sxiv");
|
||||
|
||||
if (tns.cnt == filecnt) {
|
||||
n = snprintf(t, len, "%0*d/%d", fw, sel + 1, filecnt);
|
||||
ow_info = true;
|
||||
} else {
|
||||
snprintf(bar.l, sizeof(bar.l), "Loading... %0*d/%d",
|
||||
fw, tns.cnt, filecnt);
|
||||
bar.r[0] = '\0';
|
||||
ow_info = false;
|
||||
}
|
||||
} else {
|
||||
snprintf(title, sizeof(title), "sxiv - %s", files[sel].name);
|
||||
win_set_title(&win, title);
|
||||
}
|
||||
|
||||
n = snprintf(t, len, "%3d%% ", (int) (img.zoom * 100.0));
|
||||
/* update bar contents */
|
||||
if (win.bar.h == 0)
|
||||
return;
|
||||
if (mode == MODE_THUMB) {
|
||||
if (tns.cnt == filecnt) {
|
||||
n = snprintf(rt, rlen, "%0*d/%d", fw, sel + 1, filecnt);
|
||||
ow_info = true;
|
||||
} else {
|
||||
snprintf(lt, llen, "Loading... %0*d/%d", fw, tns.cnt, filecnt);
|
||||
rt[0] = '\0';
|
||||
ow_info = false;
|
||||
}
|
||||
} else {
|
||||
n = snprintf(rt, rlen, "%3d%% | ", (int) (img.zoom * 100.0));
|
||||
if (img.multi.cnt > 0) {
|
||||
for (fn = 0, i = img.multi.cnt; i > 0; fn++, i /= 10);
|
||||
n += snprintf(t + n, len - n, "(%0*d/%d) ",
|
||||
n += snprintf(rt + n, rlen - n, "%0*d/%d | ",
|
||||
fn, img.multi.sel + 1, img.multi.cnt);
|
||||
}
|
||||
n += snprintf(t + n, len - n, "%0*d/%d", fw, sel + 1, filecnt);
|
||||
ow_info = bar.l[0] == '\0';
|
||||
n += snprintf(rt + n, rlen - n, "%0*d/%d", fw, sel + 1, filecnt);
|
||||
ow_info = info.script == NULL;
|
||||
}
|
||||
if (ow_info) {
|
||||
fn = strlen(files[sel].name);
|
||||
if (fn < sizeof(bar.l) &&
|
||||
if (fn < llen &&
|
||||
win_textwidth(files[sel].name, fn, true) +
|
||||
win_textwidth(bar.r, n, true) < win.w)
|
||||
win_textwidth(rt, n, true) < win.w)
|
||||
{
|
||||
strncpy(bar.l, files[sel].name, sizeof(bar.l));
|
||||
strncpy(lt, files[sel].name, llen);
|
||||
} else {
|
||||
strncpy(bar.l, files[sel].base, sizeof(bar.l));
|
||||
strncpy(lt, files[sel].base, llen);
|
||||
}
|
||||
}
|
||||
win_set_bar_info(&win, bar.l, bar.r);
|
||||
}
|
||||
|
||||
void redraw(void)
|
||||
|
|
@ -458,8 +500,8 @@ void run(void)
|
|||
int xfd;
|
||||
fd_set fds;
|
||||
struct timeval timeout;
|
||||
bool discard, to_set;
|
||||
XEvent ev, nextev;
|
||||
bool discard;
|
||||
|
||||
redraw();
|
||||
|
||||
|
|
@ -482,12 +524,20 @@ void run(void)
|
|||
check_timeouts(NULL);
|
||||
}
|
||||
|
||||
while (XPending(win.env.dpy) == 0 && check_timeouts(&timeout)) {
|
||||
/* wait for timeouts */
|
||||
while (XPending(win.env.dpy) == 0
|
||||
&& ((to_set = check_timeouts(&timeout)) || info.fd != -1))
|
||||
{
|
||||
/* check for timeouts & input */
|
||||
xfd = ConnectionNumber(win.env.dpy);
|
||||
FD_ZERO(&fds);
|
||||
FD_SET(xfd, &fds);
|
||||
select(xfd + 1, &fds, 0, 0, &timeout);
|
||||
if (info.fd != -1) {
|
||||
FD_SET(info.fd, &fds);
|
||||
xfd = MAX(xfd, info.fd);
|
||||
}
|
||||
select(xfd + 1, &fds, 0, 0, to_set ? &timeout : NULL);
|
||||
if (FD_ISSET(info.fd, &fds))
|
||||
read_info();
|
||||
}
|
||||
|
||||
do {
|
||||
|
|
@ -641,13 +691,14 @@ int main(int argc, char **argv)
|
|||
warn("could not locate home directory");
|
||||
} else {
|
||||
len = strlen(homedir) + strlen(INFO_SCRIPT) + 2;
|
||||
info_script = (char*) s_malloc(len);
|
||||
snprintf(info_script, len, "%s/%s", homedir, INFO_SCRIPT);
|
||||
if (access(info_script, X_OK) != 0) {
|
||||
free(info_script);
|
||||
info_script = NULL;
|
||||
info.script = (char*) s_malloc(len);
|
||||
snprintf(info.script, len, "%s/%s", homedir, INFO_SCRIPT);
|
||||
if (access(info.script, X_OK) != 0) {
|
||||
free(info.script);
|
||||
info.script = NULL;
|
||||
}
|
||||
}
|
||||
info.fd = -1;
|
||||
|
||||
if (options->thumb_mode) {
|
||||
mode = MODE_THUMB;
|
||||
|
|
|
|||
64
window.c
64
window.c
|
|
@ -119,12 +119,15 @@ void win_init(win_t *win)
|
|||
e->cmap = DefaultColormap(e->dpy, e->scr);
|
||||
e->depth = DefaultDepth(e->dpy, e->scr);
|
||||
|
||||
win_init_font(e->dpy, BAR_FONT);
|
||||
|
||||
win->white = WhitePixel(e->dpy, e->scr);
|
||||
win->bgcol = win_alloc_color(win, WIN_BG_COLOR);
|
||||
win->fscol = win_alloc_color(win, WIN_FS_COLOR);
|
||||
win->selcol = win_alloc_color(win, SEL_COLOR);
|
||||
win->bar.bgcol = win_alloc_color(win, BAR_BG_COLOR);
|
||||
win->bar.fgcol = win_alloc_color(win, BAR_FG_COLOR);
|
||||
win->bar.h = options->hide_bar ? 0 : barheight;
|
||||
|
||||
win->sizehints.flags = PWinGravity;
|
||||
win->sizehints.win_gravity = NorthWestGravity;
|
||||
|
|
@ -135,8 +138,6 @@ void win_init(win_t *win)
|
|||
if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0)
|
||||
warn("no locale support");
|
||||
|
||||
win_init_font(e->dpy, BAR_FONT);
|
||||
|
||||
wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False);
|
||||
}
|
||||
|
||||
|
|
@ -414,31 +415,28 @@ void win_draw_bar(win_t *win)
|
|||
XSetForeground(e->dpy, gc, win->bar.fgcol);
|
||||
XSetBackground(e->dpy, gc, win->bar.bgcol);
|
||||
|
||||
if (win->bar.r != NULL) {
|
||||
len = strlen(win->bar.r);
|
||||
if (len > 0) {
|
||||
if ((tw = win_textwidth(win->bar.r, len, true)) > w)
|
||||
return;
|
||||
x = win->w - tw + H_TEXT_PAD;
|
||||
w -= tw;
|
||||
if (font.set)
|
||||
XmbDrawString(e->dpy, win->pm, font.set, gc, x, y, win->bar.r, len);
|
||||
else
|
||||
XDrawString(e->dpy, win->pm, gc, x, y, win->bar.r, len);
|
||||
}
|
||||
if ((len = strlen(win->bar.r)) > 0) {
|
||||
if ((tw = win_textwidth(win->bar.r, len, true)) > w)
|
||||
return;
|
||||
x = win->w - tw + H_TEXT_PAD;
|
||||
w -= tw;
|
||||
if (font.set)
|
||||
XmbDrawString(e->dpy, win->pm, font.set, gc, x, y, win->bar.r, len);
|
||||
else
|
||||
XDrawString(e->dpy, win->pm, gc, x, y, win->bar.r, len);
|
||||
}
|
||||
if (win->bar.l != NULL) {
|
||||
olen = len = strlen(win->bar.l);
|
||||
if ((len = strlen(win->bar.l)) > 0) {
|
||||
olen = len;
|
||||
while (len > 0 && (tw = win_textwidth(win->bar.l, len, true)) > w)
|
||||
len--;
|
||||
if (len > 0) {
|
||||
if (len != olen) {
|
||||
w = strlen(dots);
|
||||
if (len <= w)
|
||||
return;
|
||||
memcpy(rest, win->bar.l + len - w, w);
|
||||
memcpy(win->bar.l + len - w, dots, w);
|
||||
}
|
||||
if (len != olen) {
|
||||
w = strlen(dots);
|
||||
if (len <= w)
|
||||
return;
|
||||
memcpy(rest, win->bar.l + len - w, w);
|
||||
memcpy(win->bar.l + len - w, dots, w);
|
||||
}
|
||||
x = H_TEXT_PAD;
|
||||
if (font.set)
|
||||
XmbDrawString(e->dpy, win->pm, font.set, gc, x, y, win->bar.l, len);
|
||||
|
|
@ -480,6 +478,18 @@ void win_draw_rect(win_t *win, Pixmap pm, int x, int y, int w, int h,
|
|||
XDrawRectangle(win->env.dpy, pm, gc, x, y, w, h);
|
||||
}
|
||||
|
||||
void win_update_bar(win_t *win)
|
||||
{
|
||||
if (win == NULL || win->xwin == None || win->pm == None)
|
||||
return;
|
||||
|
||||
if (win->bar.h > 0) {
|
||||
win_draw_bar(win);
|
||||
XCopyArea(win->env.dpy, win->pm, win->xwin, gc,
|
||||
0, win->h, win->w, win->bar.h, 0, win->h);
|
||||
}
|
||||
}
|
||||
|
||||
int win_textwidth(const char *text, unsigned int len, bool with_padding)
|
||||
{
|
||||
XRectangle r;
|
||||
|
|
@ -514,14 +524,6 @@ void win_set_title(win_t *win, const char *title)
|
|||
PropModeReplace, (unsigned char *) title, strlen(title));
|
||||
}
|
||||
|
||||
void win_set_bar_info(win_t *win, char *linfo, char *rinfo)
|
||||
{
|
||||
if (win != NULL) {
|
||||
win->bar.l = linfo;
|
||||
win->bar.r = rinfo;
|
||||
}
|
||||
}
|
||||
|
||||
void win_set_cursor(win_t *win, cursor_t cursor)
|
||||
{
|
||||
if (win == NULL || win->xwin == None)
|
||||
|
|
|
|||
12
window.h
12
window.h
|
|
@ -24,6 +24,11 @@
|
|||
|
||||
#include "types.h"
|
||||
|
||||
enum {
|
||||
BAR_L_LEN = 512,
|
||||
BAR_R_LEN = 64
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
Display *dpy;
|
||||
int scr;
|
||||
|
|
@ -55,8 +60,8 @@ typedef struct {
|
|||
|
||||
struct {
|
||||
unsigned int h;
|
||||
char *l;
|
||||
char *r;
|
||||
char l[BAR_L_LEN];
|
||||
char r[BAR_R_LEN];
|
||||
unsigned long bgcol;
|
||||
unsigned long fgcol;
|
||||
} bar;
|
||||
|
|
@ -80,10 +85,11 @@ void win_draw(win_t*);
|
|||
void win_draw_rect(win_t*, Pixmap, int, int, int, int, bool, int,
|
||||
unsigned long);
|
||||
|
||||
void win_update_bar(win_t*);
|
||||
|
||||
int win_textwidth(const char*, unsigned int, bool);
|
||||
|
||||
void win_set_title(win_t*, const char*);
|
||||
void win_set_bar_info(win_t*, char*, char*);
|
||||
void win_set_cursor(win_t*, cursor_t);
|
||||
|
||||
#endif /* WINDOW_H */
|
||||
|
|
|
|||
Loading…
Reference in New Issue