Add progress bar

This commit is contained in:
Lucien Cartier-Tilet 2020-09-13 17:08:07 +02:00
parent d964adba95
commit 3b0e9ae607
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
4 changed files with 467 additions and 461 deletions

View File

@ -14,14 +14,11 @@ options:
@echo "LDFLAGS = ${LDFLAGS}" @echo "LDFLAGS = ${LDFLAGS}"
@echo "CC = ${CC}" @echo "CC = ${CC}"
config.h:
cp config.def.h config.h
.c.o: .c.o:
@echo CC $< @echo CC $<
@${CC} -c ${CFLAGS} $< @${CC} -c ${CFLAGS} $<
${OBJ}: config.h config.mk ${OBJ}: config.mk
sent: ${OBJ} sent: ${OBJ}
@echo CC -o $@ @echo CC -o $@
@ -38,7 +35,7 @@ clean:
dist: clean dist: clean
@echo creating dist tarball @echo creating dist tarball
@mkdir -p sent-${VERSION} @mkdir -p sent-${VERSION}
@cp -R LICENSE Makefile config.mk config.def.h ${SRC} sent-${VERSION} @cp -R LICENSE Makefile config.mk config.h ${SRC} sent-${VERSION}
@tar -cf sent-${VERSION}.tar sent-${VERSION} @tar -cf sent-${VERSION}.tar sent-${VERSION}
@gzip sent-${VERSION}.tar @gzip sent-${VERSION}.tar
@rm -rf sent-${VERSION} @rm -rf sent-${VERSION}

View File

@ -1,9 +1,8 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
static char *fontfallbacks[] = { static char *fontfallbacks[] = {
"dejavu sans", "mono",
"roboto", "JoyPixels",
"ubuntu",
}; };
#define NUMFONTSCALES 42 #define NUMFONTSCALES 42
#define FONTSZ(x) ((int)(10.0 * powf(1.1288, (x)))) /* x in [0, NUMFONTSCALES-1] */ #define FONTSZ(x) ((int)(10.0 * powf(1.1288, (x)))) /* x in [0, NUMFONTSCALES-1] */
@ -19,6 +18,9 @@ static const float linespacing = 1.4;
static const float usablewidth = 0.75; static const float usablewidth = 0.75;
static const float usableheight = 0.75; static const float usableheight = 0.75;
/* height of the presentation progress bar */
static const int progressheight = 5;
static Mousekey mshortcuts[] = { static Mousekey mshortcuts[] = {
/* button function argument */ /* button function argument */
{ Button1, advance, {.i = +1} }, { Button1, advance, {.i = +1} },

View File

@ -1,3 +1,4 @@
// -*- mode: c
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
static char *fontfallbacks[] = { static char *fontfallbacks[] = {

6
sent.c
View File

@ -541,6 +541,12 @@ xdraw()
0, 0,
slides[idx].lines[i], slides[idx].lines[i],
0); 0);
if (idx != 0 && progressheight != 0) {
drw_rect(d,
0, xw.h - progressheight,
(xw.w * idx)/(slidecount - 1), progressheight,
1, 0);
}
drw_map(d, xw.win, 0, 0, xw.w, xw.h); drw_map(d, xw.win, 0, 0, xw.w, xw.h);
} else { } else {
if (!(im->state & SCALED)) if (!(im->state & SCALED))