From 1b4a5a6bc4712468b4b5bfedc584f0e03728fe11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= Date: Fri, 21 Jun 2024 21:02:43 +0900 Subject: =?UTF-8?q?WM=E6=83=85=E5=A0=B1=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/logo/colors.h | 4 ++-- src/logo/freebsd.c | 4 ++++ src/logo/linux.c | 4 ++++ src/logo/netbsd.c | 4 ++++ src/logo/openbsd.c | 4 ++++ src/logo/sunos.c | 4 ++++ 6 files changed, 22 insertions(+), 2 deletions(-) (limited to 'src/logo') diff --git a/src/logo/colors.h b/src/logo/colors.h index 7d421f5..6d72d83 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 12 +#define MIN_SIZE 13 #else -#define MIN_SIZE 11 +#define MIN_SIZE 12 #endif #define LOGO_SIZE 24 diff --git a/src/logo/freebsd.c b/src/logo/freebsd.c index ec3926d..72ba962 100644 --- a/src/logo/freebsd.c +++ b/src/logo/freebsd.c @@ -1,6 +1,7 @@ #if defined(__FreeBSD__) #include "freebsd.h" #include "../resolution.h" +#include "../wm.h" #include #include @@ -18,6 +19,9 @@ void getOS() { const char *res = display_resolution(); if (!res) minsize--; else free((void *)res); + const char *wm = display_wm(); + if (!wm) minsize--; + else free((void *)wm); LOGO[0] = WHITE "``` " RED "` " RESET; LOGO[1] = WHITE " ` `.....---..." RED "....--.``` -/ " RESET; diff --git a/src/logo/linux.c b/src/logo/linux.c index 6a58f7e..16931cc 100644 --- a/src/logo/linux.c +++ b/src/logo/linux.c @@ -1,6 +1,7 @@ #if defined(__linux__) #include "linux.h" #include "../resolution.h" +#include "../wm.h" #include #include @@ -17,6 +18,9 @@ void getDistro(const char *distroname) { const char *res = display_resolution(); if (!res) minsize--; else free((void *)res); + const char *wm = display_wm(); + if (!wm) minsize--; + else free((void *)wm); if (strncmp((char *)distroname, "alpine", strlen("alpine")) == 0) { color = MAGENTA; diff --git a/src/logo/netbsd.c b/src/logo/netbsd.c index 18066a5..72c8246 100644 --- a/src/logo/netbsd.c +++ b/src/logo/netbsd.c @@ -1,6 +1,7 @@ #if defined(__NetBSD__) #include "netbsd.h" #include "../resolution.h" +#include "../wm.h" #include #include @@ -18,6 +19,9 @@ void getOS() { const char *res = display_resolution(); if (!res) minsize--; else free((void *)res); + const char *wm = display_wm(); + if (!wm) minsize--; + else free((void *)wm); LOGO[0] = MAGENTA " `-/oshdmNMNdhyo+:-` " RESET; LOGO[1] = WHITE "y" MAGENTA "/s+:-`` `.-:+oydNMMMMNhs/-`` " RESET; diff --git a/src/logo/openbsd.c b/src/logo/openbsd.c index fa59bba..8badce0 100644 --- a/src/logo/openbsd.c +++ b/src/logo/openbsd.c @@ -1,6 +1,7 @@ #if defined(__OpenBSD__) #include "openbsd.h" #include "../resolution.h" +#include "../wm.h" #include #include @@ -18,6 +19,9 @@ void getOS() { const char *res = display_resolution(); if (!res) minsize--; else free((void *)res); + const char *wm = display_wm(); + if (!wm) minsize--; + else free((void *)wm); for (int i = 0; i < LOGO_SIZE; i++) { LOGO[i] = NULL; diff --git a/src/logo/sunos.c b/src/logo/sunos.c index de04d3a..d57825e 100644 --- a/src/logo/sunos.c +++ b/src/logo/sunos.c @@ -1,6 +1,7 @@ #if defined(__sun) #include "sunos.h" #include "../resolution.h" +#include "../wm.h" #include #include @@ -17,6 +18,9 @@ void getDistro(const char *distroname) { const char *res = display_resolution(); if (!res) minsize--; else free((void *)res); + const char *wm = display_wm(); + if (!wm) minsize--; + else free((void *)wm); if (strncmp((char *)distroname, "omnios", strlen("omnios")) == 0) { color = YELLOW; -- cgit v1.2.3