diff --git a/CHANGELOG.md b/CHANGELOG.md index ee69791..b9a6b50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 0.3.0 +* macOS: 解像度の追加 + # 0.2.0 * Manjaroのロゴの追加 * OpenSUSEのロゴの追加 diff --git a/main.c b/main.c index c3a4a1e..5f63550 100644 --- a/main.c +++ b/main.c @@ -27,7 +27,7 @@ #include "src/config.h" const char *sofname = "farfetch"; -const char *version = "0.2.0"; +const char *version = "0.3.0"; #if defined(__linux__) || defined(__sun) const char *avalopt = "ls"; #else diff --git a/src/logo/macos.c b/src/logo/macos.c index d7a465a..c2f98da 100644 --- a/src/logo/macos.c +++ b/src/logo/macos.c @@ -1,6 +1,5 @@ #if defined(__APPLE__) #include "macos.h" -#include "../resolution.h" #include "../packages.h" #include @@ -16,9 +15,6 @@ int minsize = MIN_SIZE; void getOS() { color = YELLOW; titlecolor = GREEN; - const char *res = display_resolution(); - if (!res) minsize--; - else free((void *)res); const char *pac = display_packages(); if (!pac) minsize--; else free((void *)pac); diff --git a/src/resolution.c b/src/resolution.c index eaf6c94..b2602e3 100644 --- a/src/resolution.c +++ b/src/resolution.c @@ -10,6 +10,9 @@ const char *display_resolution() { #if defined(__HAIKU__) return run_command_s("screenmode | sed 's/Resolution: //' | sed 's/,.*$//' | " "sed 's/ /x/'"); +#elif defined(__APPLE__) + return run_command_s("system_profiler SPDisplaysDataType | grep Resolution | " + "sed 's/^.*: //' | sed 's/ Retina//' | sed 's/ //g'"); #else const char *display = run_command_s("echo $DISPLAY"); if (display == NULL || strlen(display) == 0) return NULL;