summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/logo/colors.h4
-rw-r--r--src/resolution.c48
-rw-r--r--src/resolution.h6
3 files changed, 56 insertions, 2 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/resolution.c b/src/resolution.c
new file mode 100644
index 0000000..17a6ac3
--- /dev/null
+++ b/src/resolution.c
@@ -0,0 +1,48 @@
+#include "gpu.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+const char *run_res_command(const char *command) {
+ char buf[128];
+ char *out = NULL;
+ size_t outsize = 0;
+
+ FILE *p = popen(command, "r");
+ if (!p) {
+ fprintf(stderr, "解像度コマンドを実効に失敗: %s", command);
+ return NULL;
+ }
+
+ while (fgets(buf, sizeof(buf), p) != NULL) {
+ buf[strcspn(buf, "\n")] = '\0';
+
+ size_t len = strlen(buf);
+ char *nout = realloc(out, outsize + len + 1);
+ if (nout == NULL) {
+ perror("メモリの役割に失敗");
+ free(out);
+ pclose(p);
+ return NULL;
+ }
+
+ out = nout;
+
+ memccpy(out + outsize, buf, sizeof(buf), len);
+ outsize += len;
+ out[outsize] = '\0';
+ }
+
+ pclose(p);
+
+ return out;
+}
+
+const char *display_resolution() {
+ return run_res_command("xrandr --nograb --current | "
+ "awk -F 'connected |\\\\+|\\\\(' '/ "
+ "connected.*[0-9]+x[0-9]+\\+/ && $2 {printf $2 "
+ "\", \"}' | sed 's/primary //' | sed 's/,//'");
+}
diff --git a/src/resolution.h b/src/resolution.h
new file mode 100644
index 0000000..68dff4f
--- /dev/null
+++ b/src/resolution.h
@@ -0,0 +1,6 @@
+#ifndef RESOLUTION_H
+#define RESOLUTION_H
+
+const char *display_resolution();
+
+#endif