Cross-platform install

fix: return type warning

README.md

@@ -22,23 +22,43 @@ $ paru -S lavat-git
 ```
 Usage: lavat [OPTIONS]
 OPTIONS:
-  -c <COLOR>          Set color. Available colours: red, blue, yellow, green, cyan and magenta.
-                      Besides those colors the default one is the normal foreground of your terminal.
+  -c <COLOR>          Set color. Available colours: red, blue, yellow, green, cyan, magenta, white and black.
   -s <SPEED>          Set the speed, from 1 to 10. (default 5)
   -r <RADIUS>         Set the radius of the metaballs, from 1 to 10. (default: 5)
   -R <RIM>            Set a rim for each metaball, sizes from 1 to 5.(default: none)
-                      This option does not work with the default color.
-  -k <COLOR>          Set the color of the rim if there is one. Available colours: red, blue, yellow, green, cyan and magenta.
-  -b <NBALLS>         Set the number of metaballs in the simulation, from 2 to 20. (default: 10)
+                      This option does not work with the default color
+                      If you use Kitty or Alacritty you must use it with the -k option to see the rim.
+  -k <COLOR>          Set the color of the rim if there is one. Available colours: red, blue, yellow, green, cyan, magenta, white and black.
+  -b <NBALLS>         Set the number of metaballs in the simulation, from 5 to 20. (default: 10)
   -F <CHARS>          Allows for a custom set of chars to be used
-                      Only ascii symbols are supported for now, wide/unicode characters may appear broken.
+                      Only ascii symbols are supported for now, wide/unicode chars may appear broken.
   -C                  Retain the entire lava inside the terminal.
                       It may not work well with a lot of balls or with a bigger radius than the default one.
+  -p <MODE>           PARTY!! THREE MODES AVAILABLE (p1, p2 and p3).
   -h                  Print help.
+RUNTIME CONTROLS:
+  i                   Increase radius of the metaballs.
+  d                   Decrease radius of the metaballs.
+  shift i             Increase rim of the metaballs.
+  shift d             Decrease rim of the metaballs.
+  m                   Increase the number of metaballs.
+  l                   Decrease the number metaballs.
+  c                   Change the color of the metaballs.
+  k                   Change the rim color of the metaballs.
+  +                   Increase speed.
+  -                   Decrease speed.
+  p                   TURN ON THE PARTY AND CYCLE THROUGH THE PARTY MODES (it can also turns off the party).
+(Tip: Zoom out in your terminal before running the program to get a better resolution of the lava).
 ```
 
 ## Demo
 
+`lavat -p3`
+
+![demo 1](https://github.com/AngelJumbo/demos/blob/main/lavat/6.gif?raw=true)
+
+PARTY MODE!!!
+
 `lavat -c red -R 1`
 
 ![demo 1](https://github.com/AngelJumbo/demos/blob/main/lavat/1.gif?raw=true)

lavat.c

@@ -19,38 +19,39 @@ typedef struct {
 
 static char *custom = NULL;
 static char *custom2 = NULL;
-static short color = TB_DEFAULT;
-static short color2 = TB_DEFAULT;
+static short color = TB_WHITE;
+static short color2 = TB_WHITE;
+static short party = 0;
 static int nballs = 10;
 static short speedMult = 5;
-static short rim = 0;
+static short rim = 1;
 static short contained = 0;
 static float radiusIn = 100;
 static float radius;
 static int margin;
 static float sumConst;
 static float sumConst2;
-static int maxX,maxY;
+static int maxX, maxY;
 static int speed;
 static Ball balls[MAX_NBALLS] = {0};
 static struct tb_event event = {0};
+static short colors[]={TB_WHITE, TB_RED, TB_YELLOW, TB_BLUE, TB_GREEN, TB_MAGENTA, TB_CYAN, TB_BLACK };
 
 void init_params();
 void event_handler();
 int parse_options(int argc, char *argv[]);
 void print_help();
+short next_color(short current);
+void fix_rim_color();
+void set_random_colors(short level);
 
 int main(int argc, char *argv[]) {
 
   if (!parse_options(argc, argv))
     return 0;
 
-  if (color == TB_DEFAULT && !custom)
-    rim = 0;
-
   time_t t;
-  //Ball *balls = malloc(sizeof(Ball) * nballs);
-
+  // Ball *balls = malloc(sizeof(Ball) * nballs);
 
   srand((unsigned)time(&t));
 
@@ -128,6 +129,9 @@ int main(int argc, char *argv[]) {
         }
       }
     }
+    if (party>0){
+      set_random_colors(party);
+    }
     tb_present();
     usleep(speed);
     tb_clear();
@@ -135,28 +139,27 @@ int main(int argc, char *argv[]) {
     tb_peek_event(&event, 10);
 
     event_handler();
-
   }
 
   tb_shutdown();
 
-  //free(balls);
+  // free(balls);
 }
 
-void event_handler(){
-  if (event.type == TB_EVENT_RESIZE){
+void event_handler() {
+  if (event.type == TB_EVENT_RESIZE) {
     do
       tb_peek_event(&event, 10);
-    while(event.type == TB_EVENT_RESIZE);
-    
+    while (event.type == TB_EVENT_RESIZE);
+
     init_params();
-  }else if(event.type == TB_EVENT_KEY){
-    
-    if (event.key == TB_KEY_CTRL_C || event.key == TB_KEY_ESC){
+  } else if (event.type == TB_EVENT_KEY) {
+
+    if (event.key == TB_KEY_CTRL_C || event.key == TB_KEY_ESC) {
       tb_shutdown();
       exit(0);
     }
-      
+
     switch (event.ch) {
     case '-':
     case '_':
@@ -174,49 +177,57 @@ void event_handler(){
       break;
     case 'm':
     case 'M':
-      if(nballs+1<=MAX_NBALLS){
+      if (nballs + 1 <= MAX_NBALLS) {
         nballs++;
       }
       break;
     case 'l':
     case 'L':
-      if(nballs-1>=MIN_NBALLS){
+      if (nballs - 1 >= MIN_NBALLS) {
         nballs--;
       }
       break;
     case 'i':
-      if(radiusIn+10<=150){
-        radiusIn+=10;
+      if (radiusIn + 10 <= 150) {
+        radiusIn += 10;
         radius = (radiusIn * radiusIn + (float)(maxX * maxY)) / 15000;
         margin = contained ? radius * 10 : 0;
       }
       break;
     case 'd':
-      if(radiusIn-10>=50){
-        radiusIn-=10;
+      if (radiusIn - 10 >= 50) {
+        radiusIn -= 10;
         radius = (radiusIn * radiusIn + (float)(maxX * maxY)) / 15000;
         margin = contained ? radius * 10 : 0;
       }
       break;
     case 'I':
 
-      if (color != TB_DEFAULT || custom)
-        if(rim+1<=5){
-            rim++;
-            sumConst2 = sumConst * (1 + (float)(0.25 * rim));
-
-          }
+      if (color != TB_WHITE || custom)
+        if (rim + 1 <= 5) {
+          rim++;
+          sumConst2 = sumConst * (1 + (float)(0.25 * rim));
+        }
       break;
     case 'D':
 
-      if (color != TB_DEFAULT || custom)
-        if(rim-1>=0){
-            rim--;
-            sumConst2 = sumConst * (1 + (float)(0.25 * rim));
-
-          }
+      if (color != TB_WHITE || custom)
+        if (rim - 1 >= 0) {
+          rim--;
+          sumConst2 = sumConst * (1 + (float)(0.25 * rim));
+        }
+      break;
+    case 'c':
+      color = next_color(color);
+      fix_rim_color();
+      break;
+    case 'k':
+      color2 = next_color(color2);
+      fix_rim_color();
+      break;
+    case 'p':
+      party = (party+1)%4;
       break;
-
     case 'q':
     case 'Q':
       tb_shutdown();
@@ -226,8 +237,7 @@ void event_handler(){
   }
 }
 
-
-void init_params(){
+void init_params() {
 
   maxX = tb_width();
   maxY = tb_height() * 2;
@@ -242,7 +252,7 @@ void init_params(){
 
   custom2 = custom;
 
-  if (color2 == TB_DEFAULT || !rim)
+  if (color2 == TB_WHITE || !rim)
     color2 = color | TB_BOLD;
 
   if (custom && strlen(custom) > 1 && rim) {
@@ -257,6 +267,27 @@ void init_params(){
   }
 }
 
+short next_color(short current){
+  for(int i = 0; i<8; i++){
+    if((current == colors[i])||(current == (colors[i] | TB_BOLD ))){
+      return colors[(i+1)%8];
+    }
+  }
+  return colors[0];
+}
+
+void fix_rim_color(){
+  if(color2 == color){
+    color2 = color2 | TB_BOLD;
+  }
+}
+
+void set_random_colors( short level){
+  if(level==1 || level==3) color = colors[ rand() % 7];
+  if(level==2 || level==3) color2 = colors[ rand() % 7];
+  fix_rim_color();
+}
+
 int set_color(short *var, char *optarg) {
 
   if (strcmp(optarg, "red") == 0) {
@@ -271,6 +302,10 @@ int set_color(short *var, char *optarg) {
     *var = TB_MAGENTA;
   } else if (strcmp(optarg, "cyan") == 0) {
     *var = TB_CYAN;
+  } else if (strcmp(optarg, "black") == 0) {
+    *var = TB_BLACK;
+  } else if (strcmp(optarg, "white") == 0) {
+    *var = TB_WHITE;
   } else {
     printf("Unknown color: %s\n", optarg);
     return 0;
@@ -282,7 +317,7 @@ int parse_options(int argc, char *argv[]) {
   if (argc == 1)
     return 1;
   int c;
-  while ((c = getopt(argc, argv, ":c:k:s:r:R:b:F:Ch")) != -1) {
+  while ((c = getopt(argc, argv, ":c:k:s:r:R:b:F:Cp:h")) != -1) {
     switch (c) {
     case 'c':
       if (!set_color(&color, optarg))
@@ -319,7 +354,8 @@ int parse_options(int argc, char *argv[]) {
       if (nballs > MAX_NBALLS || nballs < MIN_NBALLS) {
 
         printf("Invalid number of metaballs, only values between %i and %i are"
-               "allowed\n", MIN_NBALLS,MAX_NBALLS);
+               "allowed\n",
+               MIN_NBALLS, MAX_NBALLS);
         return 0;
       }
       break;
@@ -329,11 +365,18 @@ int parse_options(int argc, char *argv[]) {
     case 'C':
       contained = 1;
       break;
+    case 'p':
+      party = atoi(optarg);
+      if (party < 0 || party > 3 ) {
+        printf("Invalid party mode, only values between 1 and 3 are allowed\n");
+        return 0;
+      }
+      break;
     case 'h':
       print_help();
       return 0;
       break;
-    case ':': /* -f or -o without operand */
+    case ':':
       fprintf(stderr, "Option -%c requires an operand\n", optopt);
       return 0;
       break;
@@ -350,39 +393,42 @@ void print_help() {
       "Usage: lavat [OPTIONS]\n"
       "OPTIONS:\n"
       "  -c <COLOR>          Set color. Available colours: red, blue, yellow, "
-      "green, cyan and magenta. \n"
-      "                      Besides those colors the default one is the normal"
-      " foreground of your terminal.\n"
+      "green, cyan, magenta, white and black. \n"
       "  -s <SPEED>          Set the speed, from 1 to 10. (default 5)\n"
-      "                      Change the speed while the program runs "
-      "with the - and + keys.\n"
       "  -r <RADIUS>         Set the radius of the metaballs, from 1 to 10. "
       "(default: 5)\n"
-      "                      Increase and decrease the radius in runtime with"
-      "the i and d keys.\n"
       "  -R <RIM>            Set a rim for each metaball, sizes from 1 to 5."
       "(default: none)\n"
       "                      This option does not work with the default "
       "color\n"
-
       "                      If you use Kitty or Alacritty you must use it "
       "with the -k option to see the rim.\n"
-      "                      Increase and decrease the rim in runtime with "
-      "shift+i and shift+d."
       "  -k <COLOR>          Set the color of the rim if there is one."
-      " Available colours: red, blue, yellow, green, cyan and magenta. \n"
+      " Available colours: red, blue, yellow, green, cyan, magenta, white and black. \n"
       "  -b <NBALLS>         Set the number of metaballs in the simulation, "
       "from %i to %i. (default: 10)\n"
-      "                      Increase or decrease the number of balls in run"
-
-      "time with the m and l keys.\n"
       "  -F <CHARS>          Allows for a custom set of chars to be used\n"
       "                      Only ascii symbols are supported for now, "
       "wide/unicode chars may appear broken.\n"
       "  -C                  Retain the entire lava inside the terminal.\n"
       "                      It may not work well with a lot of balls or with"
       " a bigger radius than the default one.\n"
+      "  -p <MODE>           PARTY!! THREE MODES AVAILABLE (p1, p2 and p3).\n"
       "  -h                  Print help.\n"
+      "RUNTIME CONTROLS:\n"
+      "  i                   Increase radius of the metaballs.\n"
+      "  d                   Decrease radius of the metaballs.\n"
+      "  shift i             Increase rim of the metaballs.\n"
+      "  shift d             Decrease rim of the metaballs.\n"
+      "  m                   Increase the number of metaballs.\n"
+      "  l                   Decrease the number metaballs.\n"
+      "  c                   Change the color of the metaballs.\n"
+      "  k                   Change the rim color of the metaballs.\n"
+      "  +                   Increase speed.\n"
+      "  -                   Decrease speed.\n"
+      "  p                   TURN ON THE PARTY AND CYCLE THROUGH THE PARTY MODES "
+      "(it can also turns off the party).\n"
       "(Tip: Zoom out in your terminal before running the program to get a "
-      "better resolution of the lava).\n",MIN_NBALLS,MAX_NBALLS);
+      "better resolution of the lava).\n",
+      MIN_NBALLS, MAX_NBALLS);
 }

makefile

@@ -9,8 +9,10 @@ clean:
 
 .PHONY: install
 install: lavat
-	install 				-D lavat 		$(DESTDIR)$(PREFIX)/bin/lavat
+	mkdir -p $(PREFIX)/bin
+	install lavat $(PREFIX)/bin/lavat
+
+.PHONY: uninstall
+uninstall:
+	$(RM) $(PREFIX)/bin/lavat
 
-.PHONY: unistall
-unistall:
-	$(RM) $(DESTDIR)$(PREFIX)/bin/lavat