femsci/toilet
femsci/toilet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3 from thekbb/rename-gay-filter-to-rainbow

Browse source 
Change name of gay filter to rainbow.
This commit is contained in:
Sam Hocevar 2015-05-08 10:57:06 +02:00
commit 2c99c8ef1b
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/toilet.1.in
View file

@ -93,17 +93,17 @@ Set the output width to the terminal width.
.TP .TP
.B \-F, \-\-filter list .B \-F, \-\-filter list
.TP .TP
.B \-\-gay, \-\-metal .B \-\-rainbow, \-\-metal
.PD .PD
Specify a list of filters to be applied to the output. Specify a list of filters to be applied to the output.
.I <filters> .I <filters>
is a colon-separated list of filters such as is a colon-separated list of filters such as
.I crop:rotate:gay .I crop:rotate:rainbow
and the special argument and the special argument
.I list .I list
outputs a list of available filters. outputs a list of available filters.
.B \-\-gay .B \-\-rainbow
and and
.B \-\-metal .B \-\-metal
are shortcuts to commonly used filters that are guaranteed to exist. Several are shortcuts to commonly used filters that are guaranteed to exist. Several
@ -153,7 +153,7 @@ toilet Hello World
toilet Hello | toilet toilet Hello | toilet
tail -f /var/log/messages | toilet -f term --gay tail -f /var/log/messages | toilet -f term --rainbow
.RI .RI
.SH BUGS .SH BUGS
.B FIGlet .B FIGlet

6
src/filter.c
View file

@ -28,7 +28,7 @@
#include "filter.h" #include "filter.h"
static void filter_crop(context_t *); static void filter_crop(context_t *);
static void filter_gay(context_t *); static void filter_rainbow(context_t *);
static void filter_metal(context_t *); static void filter_metal(context_t *);
static void filter_flip(context_t *); static void filter_flip(context_t *);
static void filter_flop(context_t *); static void filter_flop(context_t *);
@ -46,7 +46,7 @@ struct
const lookup[] = const lookup[] =
{ {
{ "crop", filter_crop, "crop unused blanks" }, { "crop", filter_crop, "crop unused blanks" },
{ "gay", filter_gay, "add a rainbow colour effect" }, { "rainbow", filter_rainbow, "add a rainbow colour effect" },
{ "metal", filter_metal, "add a metallic colour effect" }, { "metal", filter_metal, "add a metallic colour effect" },
{ "flip", filter_flip, "flip horizontally" }, { "flip", filter_flip, "flip horizontally" },
{ "flop", filter_flop, "flip vertically" }, { "flop", filter_flop, "flip vertically" },
@ -185,7 +185,7 @@ static void filter_metal(context_t *cx)
} }
} }
static void filter_gay(context_t *cx) static void filter_rainbow(context_t *cx)
{ {
static unsigned char const rainbow[] = static unsigned char const rainbow[] =
{ {

10
src/main.c
View file

@ -67,6 +67,7 @@ int main(int argc, char *argv[])
{ "filter", 1, NULL, 'F' }, { "filter", 1, NULL, 'F' },
{ "gay", 0, NULL, 130 }, { "gay", 0, NULL, 130 },
{ "metal", 0, NULL, 131 }, { "metal", 0, NULL, 131 },
{ "rainbow", 0, NULL, 132 },
{ "export", 1, NULL, 'E' }, { "export", 1, NULL, 'E' },
{ "irc", 0, NULL, 140 }, { "irc", 0, NULL, 140 },
{ "html", 0, NULL, 141 }, { "html", 0, NULL, 141 },
@ -104,12 +105,15 @@ int main(int argc, char *argv[])
if(filter_add(cx, caca_optarg) < 0) if(filter_add(cx, caca_optarg) < 0)
return -1; return -1;
break; break;
case 130: /* --gay */ case 130: /* --gay (alias to rainbow)*/
filter_add(cx, "gay"); filter_add(cx, "rainbow");
break; break;
case 131: /* --metal */ case 131: /* --metal */
filter_add(cx, "metal"); filter_add(cx, "metal");
break; break;
case 132: /* --rainbow */
filter_add(cx, "rainbow");
break;
case 'w': /* --width */ case 'w': /* --width */
cx->term_width = atoi(caca_optarg); cx->term_width = atoi(caca_optarg);
break; break;
@ -213,7 +217,7 @@ int main(int argc, char *argv[])
" -t, --termwidth adapt to terminal's width\n" \ " -t, --termwidth adapt to terminal's width\n" \
" -F, --filter <filters> apply one or several filters to the text\n" \ " -F, --filter <filters> apply one or several filters to the text\n" \
" -F, --filter list list available filters\n" \ " -F, --filter list list available filters\n" \
" --gay rainbow filter (same as -F gay)\n" \ " --rainbow rainbow filter (same as -F rainbow)\n" \
" --metal metal filter (same as -F metal)\n" \ " --metal metal filter (same as -F metal)\n" \
" -E, --export <format> select export format\n" \ " -E, --export <format> select export format\n" \
" -E, --export list list available export formats\n" \ " -E, --export list list available export formats\n" \