summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/nyancat.c61
1 files changed, 49 insertions, 12 deletions
diff --git a/src/nyancat.c b/src/nyancat.c
index 1a9362a..189da54 100644
--- a/src/nyancat.c
+++ b/src/nyancat.c
@@ -112,6 +112,17 @@ int show_counter = 1;
int frame_count = 0;
/*
+ * Clear the screen between frames (as opposed to reseting
+ * the cursor position)
+ */
+int clear_screen = 1;
+
+/*
+ * Force-set the terminal title.
+ */
+int set_title = 1;
+
+/*
* Environment to use for setjmp/longjmp
* when breaking out of options handler
*/
@@ -146,7 +157,11 @@ int max_col = 50;
* and exit the application.
*/
void finish() {
- printf("\033[?25h\033[0m\033[H\033[2J");
+ if (clear_screen) {
+ printf("\033[?25h\033[0m\033[H\033[2J");
+ } else {
+ printf("\033[0m\n");
+ }
exit(0);
}
@@ -311,13 +326,19 @@ int main(int argc, char ** argv) {
/* Process arguments */
int index, c;
- while ((c = getopt_long(argc, argv, "hitnf:r:R:c:C:W:H:", long_opts, &index)) != -1) {
+ while ((c = getopt_long(argc, argv, "eshitnf:r:R:c:C:W:H:", long_opts, &index)) != -1) {
if (!c) {
if (long_opts[index].flag == 0) {
c = long_opts[index].val;
}
}
switch (c) {
+ case 'e':
+ clear_screen = 0;
+ break;
+ case 's':
+ set_title = 0;
+ break;
case 'i': /* Show introduction */
show_intro = 1;
break;
@@ -654,12 +675,18 @@ int main(int argc, char ** argv) {
}
/* Attempt to set terminal title */
- printf("\033kNyanyanyanyanyanyanya...\033\134");
- printf("\033]1;Nyanyanyanyanyanyanya...\007");
- printf("\033]2;Nyanyanyanyanyanyanya...\007");
+ if (set_title) {
+ printf("\033kNyanyanyanyanyanyanya...\033\134");
+ printf("\033]1;Nyanyanyanyanyanyanya...\007");
+ printf("\033]2;Nyanyanyanyanyanyanya...\007");
+ }
- /* Clear the screen */
- printf("\033[H\033[2J\033[?25l");
+ if (clear_screen) {
+ /* Clear the screen */
+ printf("\033[H\033[2J\033[?25l");
+ } else {
+ printf("\033[s");
+ }
if (show_intro) {
/* Display the MOTD */
@@ -690,11 +717,17 @@ int main(int argc, char ** argv) {
fflush(stdout);
usleep(400000);
- printf("\033[H"); /* Reset cursor */
+ if (clear_screen) {
+ printf("\033[H"); /* Reset cursor */
+ } else {
+ printf("\033[u");
+ }
}
- /* Clear the screen again */
- printf("\033[H\033[2J\033[?25l");
+ if (clear_screen) {
+ /* Clear the screen again */
+ printf("\033[H\033[2J\033[?25l");
+ }
}
/* Store the start time */
@@ -707,6 +740,12 @@ int main(int argc, char ** argv) {
char last = 0; /* Last color index rendered */
size_t y, x; /* x/y coordinates of what we're drawing */
while (playing) {
+ /* Reset cursor */
+ if (clear_screen) {
+ printf("\033[H");
+ } else {
+ printf("\033[u");
+ }
/* Render the frame */
for (y = min_row; y < max_row; ++y) {
for (x = min_col; x < max_col; ++x) {
@@ -765,8 +804,6 @@ int main(int argc, char ** argv) {
/* Loop animation */
i = 0;
}
- /* Reset cursor */
- printf("\033[H");
/* Wait */
usleep(90000);
}
>-882/+474 2004-06-07[lcd4linux @ 2004-06-07 07:02:13 by reinelt]reinelt1-0/+33 2004-06-07[lcd4linux @ 2004-06-07 06:56:55 by reinelt]reinelt5-7/+149 2004-06-06[lcd4linux @ 2004-06-06 06:51:59 by reinelt]reinelt16-52/+135 2004-06-05[lcd4linux @ 2004-06-05 14:56:48 by reinelt]reinelt3-24/+37 2004-06-05[lcd4linux @ 2004-06-05 06:41:39 by reinelt]reinelt11-42/+87 2004-06-05[lcd4linux @ 2004-06-05 06:13:11 by reinelt]reinelt9-69/+327 2004-06-02[lcd4linux @ 2004-06-02 10:09:22 by reinelt]reinelt4-180/+183 2004-06-02[lcd4linux @ 2004-06-02 09:41:19 by reinelt]reinelt18-114/+211 2004-06-02[lcd4linux @ 2004-06-02 05:56:25 by reinelt]reinelt1-2/+6 2004-06-02[lcd4linux @ 2004-06-02 05:35:55 by reinelt]reinelt1-0/+20 2004-06-02[lcd4linux @ 2004-06-02 05:27:59 by reinelt]reinelt26-0/+2405 2004-06-02[lcd4linux @ 2004-06-02 05:14:16 by reinelt]reinelt2-17/+31 2004-06-01[lcd4linux @ 2004-06-01 06:45:28 by reinelt]reinelt18-71/+241 2004-06-01[lcd4linux @ 2004-06-01 06:04:25 by reinelt]reinelt2-25/+25 2004-05-31[lcd4linux @ 2004-05-31 21:23:16 by reinelt]reinelt1-37/+49 2004-05-31[lcd4linux @ 2004-05-31 21:05:13 by reinelt]reinelt5-77/+111 2004-05-31[lcd4linux @ 2004-05-31 16:39:05 by reinelt]reinelt11-180/+535 2004-05-31[lcd4linux @ 2004-05-31 06:27:34 by reinelt]reinelt1-0/+40 2004-05-31[lcd4linux @ 2004-05-31 06:24:42 by reinelt]reinelt2-7/+29 2004-05-31[lcd4linux @ 2004-05-31 05:38:02 by reinelt]reinelt8-42/+94 2004-05-31[lcd4linux @ 2004-05-31 01:31:01 by andy-b]andy-b1-10/+12 2004-05-30[lcd4linux @ 2004-05-30 08:25:50 by reinelt]reinelt2-30/+92 2004-05-29[lcd4linux @ 2004-05-29 23:30:20 by reinelt]reinelt1-1/+9 2004-05-29[lcd4linux @ 2004-05-29 15:53:28 by reinelt]reinelt3-9/+25 2004-05-29[lcd4linux @ 2004-05-29 01:07:56 by reinelt]reinelt2-21/+25 2004-05-29[lcd4linux @ 2004-05-29 00:27:14 by reinelt]reinelt8-11/+214 2004-05-28[lcd4linux @ 2004-05-28 14:38:10 by reinelt]reinelt2-1/+41