そっか

7 files changed, 32 insertions, 16 deletions

diff --git a/src/logo/colors.h b/src/logo/colors.h
index a6d5a2f..7d421f5 100644
--- a/src/logo/colors.h
+++ b/src/logo/colors.h
@@ -2,9 +2,9 @@
 #define LOGO_COLORS_H
 
 #if defined(__OpenBSD__) || defined(__linux__)
-#define MIN_SIZE 11
+#define MIN_SIZE 12
 #else
-#define MIN_SIZE 10
+#define MIN_SIZE 11
 #endif
 
 #define LOGO_SIZE 24
diff --git a/src/logo/freebsd.c b/src/logo/freebsd.c
index f1c6386..685deb5 100644
--- a/src/logo/freebsd.c
+++ b/src/logo/freebsd.c
@@ -1,5 +1,6 @@
 #if defined(__FreeBSD__)
 #include "freebsd.h"
+#include "../resolution.h"
 
 #include <string.h>
 
@@ -8,10 +9,12 @@ char *LOGO_SMALL[23];
 const char *color;
 const char *titlecolor;
 size_t logosize = 16;
+int minsize = MIN_SIZE;
 
 void getOS() {
   color = RED;
   titlecolor = RED;
+  if (!display_resolution()) minsize--;
 
   LOGO[0]  = WHITE "```                        " RED "`       " RESET;
   LOGO[1]  = WHITE "  ` `.....---..." RED "....--.```   -/    " RESET;
@@ -36,7 +39,7 @@ void getOS() {
   LOGO_SMALL[3] = RED "|           |  " RESET;
   LOGO_SMALL[4] = RED " ;         ;   " RESET;
   LOGO_SMALL[5] = RED "  '-_____-'    " RESET;
-  for (int i = 6; i < MIN_SIZE; i++) {
+  for (int i = 6; i < minsize; i++) {
     LOGO_SMALL[i]  = RED "               " RESET;
   }
 }
diff --git a/src/logo/linux.c b/src/logo/linux.c
index d979c9e..604130c 100644
--- a/src/logo/linux.c
+++ b/src/logo/linux.c
@@ -1,5 +1,6 @@
 #if defined(__linux__)
 #include "linux.h"
+#include "../resolution.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -9,8 +10,11 @@ char *LOGO_SMALL[23];
 const char *color;
 const char *titlecolor;
 size_t logosize;
+int minsize = MIN_SIZE;
 
 void getDistro(const char *distroname) {
+  if (!display_resolution()) minsize--;
+
   if (strncmp((char *)distroname, "alpine", strlen("alpine")) == 0) {
     color = MAGENTA;
     titlecolor = BLUE;
@@ -44,7 +48,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[3] = BLUE  "/" WHITE "//    " BLUE "\\  \\   " RESET;
     LOGO_SMALL[4] = WHITE "//      " BLUE "\\  \\  " RESET;
     LOGO_SMALL[5] = BLUE  "         \\    " RESET;
-    for (int i = 6; i < MIN_SIZE; i++) {
+    for (int i = 6; i < minsize; i++) {
       LOGO_SMALL[i]  = BLUE "              " RESET;
     }
   } else if (strncmp((char *)distroname, "artix", strlen("artix")) == 0) {
@@ -80,7 +84,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[4] = WHITE "  /   ,,   \\    " RESET;
     LOGO_SMALL[5] = WHITE " /   |  |  -\\   " RESET;
     LOGO_SMALL[6] = WHITE "/_-''    ''-_\\  " RESET;
-    for (int i = 7; i < MIN_SIZE; i++) {
+    for (int i = 7; i < minsize; i++) {
       LOGO_SMALL[i]  = CYAN "                " RESET;
     }
   } else if (strncmp((char *)distroname, "arch", strlen("arch")) == 0) {
@@ -117,7 +121,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[4] = CYAN "  /      ,`\\    " RESET;
     LOGO_SMALL[5] = CYAN " /   ,.'`.  \\   " RESET;
     LOGO_SMALL[6] = CYAN "/.,'`     `'.\\  " RESET;
-    for (int i = 7; i < MIN_SIZE; i++) {
+    for (int i = 7; i < minsize; i++) {
       LOGO_SMALL[i]  = CYAN "                " RESET;
     }
   } else if (strncmp((char *)distroname, "crux", strlen("crux")) == 0) {
@@ -152,7 +156,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[4] = BLUE    " ( " WHITE "/  \\" BLUE " /|  " RESET;
     LOGO_SMALL[5] = MAGENTA "_" BLUE "/\\ "WHITE "__)" BLUE "/" MAGENTA "_" BLUE ")  " RESET;
     LOGO_SMALL[6] = MAGENTA "\\/" BLUE "-____" MAGENTA "\\/   " RESET;
-    for (int i = 7; i < MIN_SIZE; i++) {
+    for (int i = 7; i < minsize; i++) {
       LOGO_SMALL[i]  = BLUE "                 " RESET;
     }
   } else if (strncmp((char *)distroname, "debian", strlen("debian")) == 0) {
@@ -185,7 +189,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[3] = RED "|  \\___-   " RESET;
     LOGO_SMALL[4] = RED "-_         " RESET;
     LOGO_SMALL[5] = RED "  --_      " RESET;
-    for (int i = 6; i < MIN_SIZE; i++) {
+    for (int i = 6; i < minsize; i++) {
       LOGO_SMALL[i]  = RED "           " RESET;
     }
   } else if (strncmp((char *)distroname, "devuan", strlen("devuan")) == 0) {
@@ -213,7 +217,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[0] = MAGENTA "__   " RESET;
     LOGO_SMALL[1] = MAGENTA "  \\  " RESET;
     LOGO_SMALL[2] = MAGENTA " _/  " RESET;
-    for (int i = 3; i < MIN_SIZE; i++) {
+    for (int i = 3; i < minsize; i++) {
       LOGO_SMALL[i]  = MAGENTA "     " RESET;
     }
   } else if (strncmp((char *)distroname, "gentoo", strlen("gentoo")) == 0) {
@@ -248,7 +252,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[4] = WHITE   " /      _/   " RESET;
     LOGO_SMALL[5] = WHITE   "(     _-     " RESET;
     LOGO_SMALL[6] = WHITE   "\\____-       " RESET;
-    for (int i = 7; i < MIN_SIZE; i++) {
+    for (int i = 7; i < minsize; i++) {
       LOGO_SMALL[i]  = MAGENTA "             " RESET;
     }
   } else if (
@@ -290,7 +294,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[6] = GREEN "  /   / ____/  \\    " RESET;
     LOGO_SMALL[7] = GREEN " /    \\ \\       \\   " RESET;
     LOGO_SMALL[8] = GREEN "/_____/ /________\\  " RESET;
-    for (int i = 9; i < MIN_SIZE; i++) {
+    for (int i = 9; i < minsize; i++) {
       LOGO_SMALL[i]  = GREEN "                    " RESET;
     }
   } else if (strncmp((char *)distroname, "void", strlen("void")) == 0) {
@@ -325,7 +329,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[4] = GREEN "| | \\___/ | |  " RESET;
     LOGO_SMALL[5] = GREEN "| \\______ \\_|  " RESET;
     LOGO_SMALL[6] = GREEN " -_______\\     " RESET;
-    for (int i = 7; i < MIN_SIZE; i++) {
+    for (int i = 7; i < minsize; i++) {
       LOGO_SMALL[i]  = GREEN "               " RESET;
     }
   } else {
@@ -355,7 +359,7 @@ void getDistro(const char *distroname) {
     LOGO_SMALL[5] = GREY   " | " WHITE "\\_/" GREY " |   " RESET;
     LOGO_SMALL[6] = YELLOW "/ " GREY "_____" YELLOW " \\  " RESET;
     LOGO_SMALL[7] = YELLOW "\\/     \\/  " RESET;
-    for (int i = 8; i < MIN_SIZE; i++) {
+    for (int i = 8; i < minsize; i++) {
       LOGO_SMALL[i]  = GREY "           " RESET;
     }
   }
diff --git a/src/logo/netbsd.c b/src/logo/netbsd.c
index 0a8d81c..9726f2e 100644
--- a/src/logo/netbsd.c
+++ b/src/logo/netbsd.c
@@ -1,5 +1,6 @@
 #if defined(__NetBSD__)
 #include "netbsd.h"
+#include "../resolution.h"
 
 #include <string.h>
 
@@ -8,10 +9,12 @@ char *LOGO_SMALL[23];
 const char *color;
 const char *titlecolor;
 size_t logosize = 18;
+int minsize = MIN_SIZE;
 
 void getOS() {
   color = MAGENTA;
   titlecolor = MAGENTA;
+  if (!display_resolution()) minsize--;
 
   LOGO[0]  = MAGENTA "                     `-/oshdmNMNdhyo+:-`   " RESET;
   LOGO[1]  = WHITE   "y" MAGENTA "/s+:-``    `.-:+oydNMMMMNhs/-``           " RESET;
@@ -39,7 +42,7 @@ void getOS() {
   LOGO_SMALL[4] = "    \\\\                " RESET;
   LOGO_SMALL[5] = "     \\\\               " RESET;
   LOGO_SMALL[6] = "      \\\\              " RESET;
-  for (int i = 7; i < MIN_SIZE; i++) {
+  for (int i = 7; i < minsize; i++) {
     LOGO_SMALL[i]  = MAGENTA "                      " RESET;
   }
 }
diff --git a/src/logo/openbsd.c b/src/logo/openbsd.c
index ebc44f2..c33835f 100644
--- a/src/logo/openbsd.c
+++ b/src/logo/openbsd.c
@@ -1,5 +1,6 @@
 #if defined(__OpenBSD__)
 #include "openbsd.h"
+#include "../resolution.h"
 
 #include <string.h>
 
@@ -8,10 +9,12 @@ char *LOGO_SMALL[23];
 const char *color;
 const char *titlecolor;
 size_t logosize = 23;
+int minsize = MIN_SIZE;
 
 void getOS() {
   color = YELLOW;
   titlecolor = YELLOW;
+  if (!display_resolution()) minsize--;
 
   for (int i = 0; i < LOGO_SIZE; i++) {
     LOGO[i] = NULL;
@@ -50,7 +53,7 @@ void getOS() {
   LOGO_SMALL[4] = YELLOW " |_  <   )  3 )  " RESET;
   LOGO_SMALL[5] = YELLOW " / \\         /   " RESET;
   LOGO_SMALL[6] = YELLOW "    /-_____-\\    " RESET;
-  for (int i = 7; i < MIN_SIZE; i++) {
+  for (int i = 7; i < minsize; i++) {
     LOGO_SMALL[i] = YELLOW "                 " RESET;
   }
 }
diff --git a/src/logo/openindiana.c b/src/logo/openindiana.c
index 1e8a811..2989078 100644
--- a/src/logo/openindiana.c
+++ b/src/logo/openindiana.c
@@ -1,5 +1,6 @@
 #if defined(__sun)
 #include "openindiana.h"
+#include "../resolution.h"
 
 #include <string.h>
 
@@ -8,10 +9,12 @@ char *LOGO_SMALL[23];
 const char *color;
 const char *titlecolor;
 size_t logosize = 17;
+int minsize = MIN_SIZE;
 
 void getOS() {
   color = BLUE;
   titlecolor = BLUE;
+  if (!display_resolution()) minsize--;
 
   LOGO[0] = WHITE "                         .sy/              " RESET;
   LOGO[1]  = WHITE "                         .yh+              " RESET;
diff --git a/src/resolution.c b/src/resolution.c
index 635bab6..ae2136f 100644
--- a/src/resolution.c
+++ b/src/resolution.c
@@ -9,7 +9,7 @@ const char *display_resolution() {
   if (
       isexist == NULL ||
       strlen(isexist) == 0 ||
-      strncmp(isexist, "xrandr not found", strlen("xrandr not found"))
+      strncmp(isexist, "xrandr not found", strlen("xrandr not found")) == 0
   ) return NULL;
 
   return run_command_s("xrandr --nograb --current | "