From 425098cd34c74beb38ccb3a13a78ec74f342bc22 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Thu, 11 Jun 2020 22:18:45 +0200 Subject: Optimized sent --- .repos/sent/config.def.h | 56 --------------------------------------- .repos/sent/example | 69 ------------------------------------------------ .repos/sent/example.sent | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ .repos/sent/sent.1 | 3 +++ .repos/sent/sent.c | 24 ++++++++++++++++- 5 files changed, 95 insertions(+), 126 deletions(-) delete mode 100644 .repos/sent/config.def.h delete mode 100644 .repos/sent/example create mode 100644 .repos/sent/example.sent (limited to '.repos/sent') diff --git a/.repos/sent/config.def.h b/.repos/sent/config.def.h deleted file mode 100644 index 60eb376..0000000 --- a/.repos/sent/config.def.h +++ /dev/null @@ -1,56 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -static char *fontfallbacks[] = { - "dejavu sans", - "roboto", - "ubuntu", -}; -#define NUMFONTSCALES 42 -#define FONTSZ(x) ((int)(10.0 * powf(1.1288, (x)))) /* x in [0, NUMFONTSCALES-1] */ - -static const char *colors[] = { - "#000000", /* foreground color */ - "#FFFFFF", /* background color */ -}; - -static const float linespacing = 1.4; - -/* how much screen estate is to be used at max for the content */ -static const float usablewidth = 0.75; -static const float usableheight = 0.75; - -static Mousekey mshortcuts[] = { - /* button function argument */ - { Button1, advance, {.i = +1} }, - { Button3, advance, {.i = -1} }, - { Button4, advance, {.i = -1} }, - { Button5, advance, {.i = +1} }, -}; - -static Shortcut shortcuts[] = { - /* keysym function argument */ - { XK_Escape, quit, {0} }, - { XK_q, quit, {0} }, - { XK_Right, advance, {.i = +1} }, - { XK_Left, advance, {.i = -1} }, - { XK_Return, advance, {.i = +1} }, - { XK_space, advance, {.i = +1} }, - { XK_BackSpace, advance, {.i = -1} }, - { XK_l, advance, {.i = +1} }, - { XK_h, advance, {.i = -1} }, - { XK_j, advance, {.i = +1} }, - { XK_k, advance, {.i = -1} }, - { XK_Down, advance, {.i = +1} }, - { XK_Up, advance, {.i = -1} }, - { XK_Next, advance, {.i = +1} }, - { XK_Prior, advance, {.i = -1} }, - { XK_n, advance, {.i = +1} }, - { XK_p, advance, {.i = -1} }, - { XK_r, reload, {0} }, -}; - -static Filter filters[] = { - { "\\.ff$", "cat" }, - { "\\.ff.bz2$", "bunzip2" }, - { "\\.[a-z0-9]+$", "2ff" }, -}; diff --git a/.repos/sent/example b/.repos/sent/example deleted file mode 100644 index 300577a..0000000 --- a/.repos/sent/example +++ /dev/null @@ -1,69 +0,0 @@ -sent - -Origin: - Takahashi - -Why? -• PPTX sucks -• LATEX sucks -• PDF sucks - -also: -terminal presentations -don't support images… - -@nyan.png -this text will not be displayed, since the @ at the start of the first line -makes this paragraph an image slide. - -easy to use - -depends on -♽ Xlib -☢ Xft -☃ farbfeld - -~1000 lines of code - -usage: -$ sent FILE1 [FILE2 …] - -▸ one slide per paragraph -▸ lines starting with # are ignored -▸ image slide: paragraph containing @FILENAME -▸ empty slide: just use a \ as a paragraph - -# This is a comment and will not be part of the presentation - -# multiple empty lines between paragraphs are also ignored - - -# The following lines should produce -# one empty slide - - - -\ -\ - -\@this_line_actually_started_with_a_\.png -\#This line as well -⇒ Prepend a backslash to kill behaviour of special characters - -Images are handled in the -http://tools.suckless.org/farbfeld/ -format internally. - -sent also supports transparent images. -Try changing the background in config.h -and rebuild. - -@transparent_test.ff - -😀😁😂😃😄😅😆😇😈😉😊😋😌😍😎😏 -😐😑😒😓😔😕😖😗😘😙😚😛😜😝😞😟 -😠😡😢😣😥😦😧😨😩😪😫😭😮😯😰😱 -😲😳😴😵😶😷😸😹😺😻😼😽😾😿🙀☠ - -thanks. -questions? diff --git a/.repos/sent/example.sent b/.repos/sent/example.sent new file mode 100644 index 0000000..300577a --- /dev/null +++ b/.repos/sent/example.sent @@ -0,0 +1,69 @@ +sent + +Origin: + Takahashi + +Why? +• PPTX sucks +• LATEX sucks +• PDF sucks + +also: +terminal presentations +don't support images… + +@nyan.png +this text will not be displayed, since the @ at the start of the first line +makes this paragraph an image slide. + +easy to use + +depends on +♽ Xlib +☢ Xft +☃ farbfeld + +~1000 lines of code + +usage: +$ sent FILE1 [FILE2 …] + +▸ one slide per paragraph +▸ lines starting with # are ignored +▸ image slide: paragraph containing @FILENAME +▸ empty slide: just use a \ as a paragraph + +# This is a comment and will not be part of the presentation + +# multiple empty lines between paragraphs are also ignored + + +# The following lines should produce +# one empty slide + + + +\ +\ + +\@this_line_actually_started_with_a_\.png +\#This line as well +⇒ Prepend a backslash to kill behaviour of special characters + +Images are handled in the +http://tools.suckless.org/farbfeld/ +format internally. + +sent also supports transparent images. +Try changing the background in config.h +and rebuild. + +@transparent_test.ff + +😀😁😂😃😄😅😆😇😈😉😊😋😌😍😎😏 +😐😑😒😓😔😕😖😗😘😙😚😛😜😝😞😟 +😠😡😢😣😥😦😧😨😩😪😫😭😮😯😰😱 +😲😳😴😵😶😷😸😹😺😻😼😽😾😿🙀☠ + +thanks. +questions? diff --git a/.repos/sent/sent.1 b/.repos/sent/sent.1 index fabc614..e2bec40 100644 --- a/.repos/sent/sent.1 +++ b/.repos/sent/sent.1 @@ -6,6 +6,7 @@ .Sh SYNOPSIS .Nm .Op Fl v +.Op Fl d .Op Ar file .Sh DESCRIPTION .Nm @@ -21,6 +22,8 @@ few minutes. .Bl -tag -width Ds .It Fl v Print version information to stdout and exit. +.It Fl d +Use the colors from the dark colors array. .El .Sh USAGE .Bl -tag -width Ds diff --git a/.repos/sent/sent.c b/.repos/sent/sent.c index 9534fca..eb7b503 100644 --- a/.repos/sent/sent.c +++ b/.repos/sent/sent.c @@ -25,6 +25,8 @@ char *argv0; +int use_dark_scheme = 0; + /* macros */ #define LEN(a) (sizeof(a) / sizeof(a)[0]) #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) @@ -97,6 +99,7 @@ static void cleanup(int slidesonly); static void reload(const Arg *arg); static void load(FILE *fp); static void advance(const Arg *arg); +static void toggle_theme(const Arg *arg); static void quit(const Arg *arg); static void resize(int width, int height); static void run(); @@ -479,6 +482,18 @@ advance(const Arg *arg) } } +void +toggle_theme(const Arg *arg) +{ + use_dark_scheme ^= 1; + if (use_dark_scheme) + sc = drw_scm_create(d, dark_colors, 2); + else + sc = drw_scm_create(d, colors, 2); + drw_setscheme(d, sc); + reload(NULL); +} + void quit(const Arg *arg) { @@ -590,7 +605,11 @@ xinit() if (!(d = drw_create(xw.dpy, xw.scr, xw.win, xw.w, xw.h))) die("sent: Unable to create drawing context"); - sc = drw_scm_create(d, colors, 2); + + if (use_dark_scheme) + sc = drw_scm_create(d, dark_colors, 2); + else + sc = drw_scm_create(d, colors, 2); drw_setscheme(d, sc); XSetWindowBackground(xw.dpy, xw.win, sc[ColBg].pixel); @@ -691,6 +710,9 @@ main(int argc, char *argv[]) case 'v': fprintf(stderr, "sent-"VERSION"\n"); return 0; + case 'd': + use_dark_scheme = 1; + break; default: usage(); } ARGEND -- cgit v1.2.3