From 5f5f8248d8002419fe5fd934b46269966091323c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= <suwako@076.moe>
Date: Sat, 17 Jan 2026 23:52:07 +0900
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E9=81=A9=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile      |   6 +-
 README.md     |   6 +-
 main.c        | 119 ++++++++++++++++++++++++++++-----------
 src/control.c | 152 +++++++++++++++++++++++++-------------------------
 src/display.c |  11 ++--
 src/display.h |   1 -
 src/program.c |  12 ----
 src/program.h |  19 -------
 src/ui.h      |  50 ++++++++++++-----
 src/utils.c   |  15 ++---
 src/utils.h   |   2 +-
 11 files changed, 217 insertions(+), 176 deletions(-)
 delete mode 100644 src/program.c
 delete mode 100644 src/program.h

diff --git a/Makefile b/Makefile
index e8da90a..4ab0b3e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,11 @@ VERSION != cat main.c | grep "const char \*version" | awk '{print $$5}' |\
 
 PREFIX = /usr/local
 
+# cc | clang | gcc
 CC = cc
+# lldb | gdb
+DEBUGGER = lldb
 FILES = main.c src/*.c
-# FILES = main.c
 
 CFLAGS = -Wall -Wextra \
 	 -I./dep/include -I/usr/include -I/usr/local/include -I/usr/X11R6/include \
@@ -31,7 +33,7 @@ all: debug
 
 debug:
 	${CC} -O0 -g ${CFLAGS} -o ${NAME} ${FILES} ${LDFLAGS}
-	lldb -o run ${NAME}
+	${DEBUGGER} -o run ${NAME}
 
 develop:
 	${CC} -O3 -g ${CFLAGS} -o ${NAME} ${FILES} ${LDFLAGS} ${SLIB}
diff --git a/README.md b/README.md
index 47640db..da397bd 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,19 @@
 # Unix Calc
 
-XLibre向け電卓。
+XLibre向け電卓。\
 Xorg以外、従属ライブラリを使いません。
 
 ## インストールする方法 | Installation
 ### BSD
 ```sh
 make
-doas make install
+doas make install release
 ```
 
 ### Linux
 ```sh
 make
-doas bmake install
+doas bmake install release
 ```
 
 ![](scrot1.png)\
diff --git a/main.c b/main.c
index 6b4876f..0ecb38d 100644
--- a/main.c
+++ b/main.c
@@ -10,6 +10,9 @@ const char *disname = "Unix Calc";
 
 int main() {
   UiSystem ui;
+  ui.isrunning = 1;
+  ui.window.width = 382;
+  ui.window.height = 534;
   XEvent event;
   int screen;
   XGCValues values;
@@ -24,33 +27,36 @@ int main() {
 
   int sw = DisplayWidth(ui.display, screen);
   int sh = DisplayHeight(ui.display, screen);
-  int window_x = (sw - window_width) / 3;
-  int window_y = (sh - window_height) / 2;
+  ui.window.x = (sw - ui.window.width) / 3;
+  ui.window.y = (sh - ui.window.height) / 2;
 
-  ui.window = XCreateSimpleWindow(ui.display,
+  ui.xwindow = XCreateSimpleWindow(ui.display,
       RootWindow(ui.display, screen),
-      window_x, window_y, window_width, window_height, 1, BTCOL, BGCOL);
-  if (!ui.window) {
+      ui.window.x, ui.window.y,
+      ui.window.width, ui.window.height,
+      1, BTCOL, BGCOL);
+  if (!ui.xwindow) {
     cleanup(&ui);
     fprintf(stderr, "ウィンドウを作成に失敗。\n");
     exit(1);
   }
 
-  ui.backbuf = XCreatePixmap(ui.display, ui.window, window_width, window_height,
+  ui.backbuf = XCreatePixmap(ui.display, ui.xwindow,
+      ui.window.width, ui.window.height,
       DefaultDepth(ui.display, screen));
   ui.target = ui.backbuf;
 
   Atom net_wm_window_type = XInternAtom(ui.display, "_NET_WM_WINDOW_TYPE", False);
   Atom dialog = XInternAtom(ui.display, "_NET_WM_WINDOW_TYPE_DIALOG", False);
 
-  XChangeProperty(ui.display, ui.window, net_wm_window_type, XA_ATOM, 32,
+  XChangeProperty(ui.display, ui.xwindow, net_wm_window_type, XA_ATOM, 32,
       PropModeReplace, (unsigned char *)&dialog, 1);
 
-  XStoreName(ui.display, ui.window, disname);
+  XStoreName(ui.display, ui.xwindow, disname);
   Atom net_wm_name = XInternAtom(ui.display, "_NET_WM_NAME", False);
   char displayname[16];
   snprintf(displayname, 16, "%s %s", disname, version);
-  XChangeProperty(ui.display, ui.window, net_wm_name,
+  XChangeProperty(ui.display, ui.xwindow, net_wm_name,
       XInternAtom(ui.display, "UTF8_STRING", False), 8,
       PropModeReplace, (unsigned char *)displayname, strlen(displayname));
 
@@ -58,13 +64,13 @@ int main() {
   if (classHint) {
     classHint->res_name = "unixcalc";
     classHint->res_class = "UnixCalc";
-    XSetClassHint(ui.display, ui.window, classHint);
+    XSetClassHint(ui.display, ui.xwindow, classHint);
     XFree(classHint);
   }
 
-  XSetWindowBackground(ui.display, ui.window, BGCOL);
+  XSetWindowBackground(ui.display, ui.xwindow, BGCOL);
 
-  XSelectInput(ui.display, ui.window,
+  XSelectInput(ui.display, ui.xwindow,
       ExposureMask
     | ButtonPressMask
     | ButtonReleaseMask
@@ -74,7 +80,7 @@ int main() {
     // | StructureNotifyMask
   );
 
-  ui.gc = XCreateGC(ui.display, ui.window, 0, &values);
+  ui.gc = XCreateGC(ui.display, ui.xwindow, 0, &values);
   if (!ui.gc) {
     cleanup(&ui);
     fprintf(stderr, "GCを作成に失敗。\n");
@@ -83,13 +89,74 @@ int main() {
 
   ui.visual = *DefaultVisual(ui.display, screen);
 
-  ui.colormap = XCreateColormap(ui.display, ui.window, &ui.visual, AllocNone);
+  ui.colormap = XCreateColormap(ui.display, ui.xwindow, &ui.visual, AllocNone);
   if (ui.colormap == None) {
     cleanup(&ui);
     fprintf(stderr, "カラーマップを作成に失敗。\n");
     exit(1);
   }
 
+  XWindowAttributes attr;
+  XGetWindowAttributes(ui.display, ui.xwindow, &attr);
+  int w = attr.width;
+
+  {
+    ui.resLabel.font = XftFontOpenName(ui.display, screen, "Noto Sans CJK-72");
+    if (!ui.resLabel.font) {
+      cleanup(&ui);
+      fprintf(stderr, "解決フォントの読み込みに失敗。\n");
+      exit(1);
+    }
+
+    ui.resLabel.text[0] = '0';
+    ui.resLabel.text[1] = '\0';
+
+    const FcChar8 *text = (const FcChar8 *)ui.resLabel.text;
+    int len = strlen((const char *)text);
+
+    XGlyphInfo extents;
+    XftTextExtentsUtf8(ui.display, ui.resLabel.font, text, len, &extents);
+
+    ui.resLabel.x = w - 20 - extents.xOff;
+    ui.resLabel.y = 180;
+    if (!XftColorAllocName(ui.display,
+        DefaultVisual(ui.display, DefaultScreen(ui.display)),
+        DefaultColormap(ui.display, DefaultScreen(ui.display)),
+        "#ee4030", &ui.resLabel.fg_color)) {
+      cleanup(&ui);
+      fprintf(stderr, "色の役割に失敗。\n");
+      exit(1);
+    }
+  }
+
+  {
+    ui.problemLabel.font = XftFontOpenName(ui.display, screen, "Noto Sans CJK-24");
+    if (!ui.problemLabel.font) {
+      cleanup(&ui);
+      fprintf(stderr, "問題フォントの読み込みに失敗。\n");
+      exit(1);
+    }
+
+    ui.problemLabel.text[0] = '\0';
+
+    const FcChar8 *text = (const FcChar8 *)ui.problemLabel.text;
+    int len = strlen((const char *)text);
+
+    XGlyphInfo extents;
+    XftTextExtentsUtf8(ui.display, ui.problemLabel.font, text, len, &extents);
+
+    ui.problemLabel.x = w - 20 - extents.xOff;
+    ui.problemLabel.y = 80;
+    if (!XftColorAllocName(ui.display,
+        DefaultVisual(ui.display, DefaultScreen(ui.display)),
+        DefaultColormap(ui.display, DefaultScreen(ui.display)),
+        "#b61729", &ui.problemLabel.fg_color)) {
+      cleanup(&ui);
+      fprintf(stderr, "色の役割に失敗。\n");
+      exit(1);
+    }
+  }
+
   ui.font = XftFontOpenName(ui.display, screen, "Noto Sans CJK-12");
   if (!ui.font) {
     cleanup(&ui);
@@ -97,44 +164,30 @@ int main() {
     exit(1);
   }
 
-  ui.prbfont = XftFontOpenName(ui.display, screen, "Noto Sans CJK-24");
-  if (!ui.prbfont) {
-    cleanup(&ui);
-    fprintf(stderr, "問題フォントの読み込みに失敗。\n");
-    exit(1);
-  }
-
-  ui.disfont = XftFontOpenName(ui.display, screen, "Noto Sans CJK-72");
-  if (!ui.disfont) {
-    cleanup(&ui);
-    fprintf(stderr, "解決フォントの読み込みに失敗。\n");
-    exit(1);
-  }
-
   if (!XftColorAllocName(ui.display, &ui.visual, ui.colormap, "#232020", &ui.color)) {
     cleanup(&ui);
     fprintf(stderr, "色の役割に失敗。\n");
     exit(1);
   }
 
-  XMapWindow(ui.display, ui.window);
+  XMapWindow(ui.display, ui.xwindow);
   {
     XWindowAttributes attr;
-    XGetWindowAttributes(ui.display, ui.window, &attr);
+    XGetWindowAttributes(ui.display, ui.xwindow, &attr);
     XEvent fake = { .type = Expose };
-    fake.xexpose.window = ui.window;
+    fake.xexpose.window = ui.xwindow;
     fake.xexpose.width = attr.width;
     fake.xexpose.height = attr.height;
     control_expose(&ui, &event);
   }
 
-  while (isrunning) {
+  while (ui.isrunning) {
     XNextEvent(ui.display, &event);
 
     switch (event.type) {
       case Expose:
       case ConfigureNotify:
-        XClearWindow(ui.display, ui.window);
+        XClearWindow(ui.display, ui.xwindow);
         control_expose(&ui, &event);
         break;
       case ButtonPress:
diff --git a/src/control.c b/src/control.c
index 9e93a25..0b6a02a 100644
--- a/src/control.c
+++ b/src/control.c
@@ -4,7 +4,11 @@
 
 #include "control.h"
 #include "display.h"
-#include "program.h"
+
+char curinput[64] = {0};
+int input_pos = 0;
+int initialized = 0;
+XftColor buttonColor;
 
 static const char *btn_labels[][10] = {
   { NULL }, // 数字表示
@@ -16,7 +20,7 @@ static const char *btn_labels[][10] = {
 };
 
 #define NUM_ROWS 6
-#define NUM_COLS 6
+#define NUM_COLS 4
 
 static SuwaButton *find_button_at(int mx, int my) {
   static SuwaButton found = {0};
@@ -52,35 +56,35 @@ static SuwaButton *find_button_at(int mx, int my) {
   found.y = 224 + (row - 1) * (btn_h + padding);
   found.width = btn_w;
   found.height = btn_h;
-  found.label = btn_labels[row][col];
+  found.text = btn_labels[row][col];
   found.pressed = 1;
 
   return &found;
 }
 
-void append_to_input(char c) {
+void append_to_input(UiSystem *ui, char c) {
   if ((unsigned long)input_pos >= sizeof(curinput) - 2) return;
-  strcpy(displayprb, "");
+  strcpy(ui->problemLabel.text, "");
   curinput[input_pos++] = c;
   curinput[input_pos] = '\0';
 
-  strncpy(displaytxt, curinput, sizeof(displaytxt) - 1);
-  displaytxt[sizeof(displaytxt) - 1] = '\0';
+  strncpy(ui->resLabel.text, curinput, sizeof(ui->resLabel.text) - 1);
+  ui->resLabel.text[sizeof(ui->resLabel.text) - 1] = '\0';
 }
 
-void clear_calculator(void) {
-  strcpy(displayprb, "");
+void clear_calculator(UiSystem *ui) {
+  strcpy(ui->problemLabel.text, "");
   curinput[0] = '\0';
   input_pos = 0;
-  strcpy(displaytxt, "0");
+  strcpy(ui->resLabel.text, "0");
 }
 
-double evaluate_simple(const char *expr) {
+double evaluate_simple(UiSystem *ui, const char *expr) {
   double res = 0.0;
   double cur = 0.0;
   char op = '+';
   int i = 0;
-  snprintf(displayprb, sizeof(displayprb), "%s=", expr);
+  snprintf(ui->problemLabel.text, sizeof(ui->problemLabel.text), "%s=", expr);
 
   while (expr[i]) {
     if (expr[i] == ' ') { i++; continue; }
@@ -124,7 +128,7 @@ void control_expose(UiSystem *ui, XEvent *e) {
   if (e->type != Expose && e->type != ConfigureNotify) return;
 
   XWindowAttributes attr;
-  XGetWindowAttributes(ui->display, ui->window, &attr);
+  XGetWindowAttributes(ui->display, ui->xwindow, &attr);
   int w = attr.width;
   int h = attr.height;
 
@@ -133,12 +137,12 @@ void control_expose(UiSystem *ui, XEvent *e) {
     ui->backbuf = None;
   }
 
-  ui->backbuf = XCreatePixmap(ui->display, ui->window, w, h,
+  ui->backbuf = XCreatePixmap(ui->display, ui->xwindow, w, h,
       DefaultDepth(ui->display, DefaultScreen(ui->display)));
 
   if (ui->backbuf == None) {
     fprintf(stderr, "バックバッファ作成失敗！\n");
-    ui->backbuf = ui->window;
+    ui->backbuf = ui->xwindow;
   }
 
   ui->target = ui->backbuf;
@@ -157,80 +161,73 @@ void control_expose(UiSystem *ui, XEvent *e) {
   XFillRectangle(ui->display, ui->backbuf, ui->gc, 0, 0, w, h);
 
   // 出力
-  if (displaytxt[0] != '\0' && ui->disfont) {
-    const FcChar8 *text = (const FcChar8 *)displaytxt;
-    int len = strlen((const char *)text);
-
+  {
     XGlyphInfo extents;
-    XftTextExtentsUtf8(ui->display, ui->disfont, text, len, &extents);
+    XftTextExtentsUtf8(ui->display, ui->resLabel.font,
+        (const FcChar8 *)ui->resLabel.text,
+        strlen(ui->resLabel.text), &extents);
 
     int tx = w - 20 - extents.xOff;
-    int ty = 160;
 
-    XftColor discol;
-    XftColorAllocName(ui->display, DefaultVisual(ui->display, DefaultScreen(ui->display)),
-                      DefaultColormap(ui->display, DefaultScreen(ui->display)),
-                      "#ee4030", &discol);
-
-    XftDrawStringUtf8(backdraw, &discol, ui->disfont, tx, ty, text, len);
-
-    XftColorFree(ui->display, DefaultVisual(ui->display, DefaultScreen(ui->display)),
-                 DefaultColormap(ui->display, DefaultScreen(ui->display)), &discol);
+    XftDrawStringUtf8(
+        backdraw, &ui->resLabel.fg_color, ui->resLabel.font,
+        tx, ui->resLabel.y,
+        (const FcChar8 *)ui->resLabel.text, 32);
   }
 
-  if (displayprb[0] != '\0' && ui->prbfont) {
-    const FcChar8 *text = (const FcChar8 *)displayprb;
-    int len = strlen((const char *)text);
-
+  {
     XGlyphInfo extents;
-    XftTextExtentsUtf8(ui->display, ui->prbfont, text, len, &extents);
+    XftTextExtentsUtf8(ui->display, ui->problemLabel.font,
+        (const FcChar8 *)ui->problemLabel.text,
+        strlen(ui->problemLabel.text), &extents);
 
     int tx = w - 20 - extents.xOff;
-    int ty = 80;
 
-    XftColor discol;
-    XftColorAllocName(ui->display,
-        DefaultVisual(ui->display, DefaultScreen(ui->display)),
-        DefaultColormap(ui->display, DefaultScreen(ui->display)),
-        "#b61729", &discol);
-
-    XftDrawStringUtf8(backdraw, &discol, ui->prbfont, tx, ty, text, len);
-
-    XftColorFree(ui->display,
-        DefaultVisual(ui->display, DefaultScreen(ui->display)),
-        DefaultColormap(ui->display, DefaultScreen(ui->display)), &discol);
+    XftDrawStringUtf8(
+        backdraw, &ui->problemLabel.fg_color,
+        ui->problemLabel.font, tx, ui->problemLabel.y,
+        (const FcChar8 *)ui->problemLabel.text, 32);
   }
 
+  for (int i = 0; i < 64; ++i) ui->buttons[i] = NULL;
   int width = 93;
   int height = 60;
   int padding = 2;
   printf("ウィンドウ: (%dx%d)\n", attr.width, attr.height);
 
-  for (int row = 0; row < 6; ++row) {
+  if (initialized == 0) {
+    XftColorAllocName(ui->display,
+      DefaultVisual(ui->display, DefaultScreen(ui->display)),
+      DefaultColormap(ui->display, DefaultScreen(ui->display)),
+      "#232020", &buttonColor);
+  }
+  initialized = 1;
+
+  for (int row = 1; row < NUM_ROWS; ++row) {
     int y = 162 + row * (height + padding);
-    if (y + height > h) break;
 
-    int cols = 4;
-
-    for (int col = 0; col < cols; ++col) {
+    for (int col = 0; col < NUM_COLS; ++col) {
       const char *label = btn_labels[row][col];
       if (!label) continue;
 
       int x = padding + col * (width + padding);
 
-      SuwaButton btn;
-      btn.x = x;
-      btn.y = y;
-      btn.width = width;
-      btn.height = height;
-      btn.label = label;
-      btn.pressed = 0;
+      SuwaButton *btn = malloc(sizeof(SuwaButton));
+      btn->x = x;
+      btn->y = y;
+      btn->width = width;
+      btn->height = height;
+      btn->text = label;
+      btn->bg_color = BTCOL;
+      btn->fg_color = buttonColor;
+      btn->pressed = 0;
+      // ui->buttons[0] = btn;
 
-      drawbuttons(ui, &btn, backdraw);
+      drawbuttons(ui, btn, backdraw);
     }
   }
 
-  XCopyArea(ui->display, ui->backbuf, ui->window, ui->gc, 0, 0, w, h, 0, 0);
+  XCopyArea(ui->display, ui->backbuf, ui->xwindow, ui->gc, 0, 0, w, h, 0, 0);
   XftDrawDestroy(backdraw);
   XFlush(ui->display);
 }
@@ -275,23 +272,26 @@ void handle_button_release(UiSystem *ui, int mx, int my) {
   XftDrawDestroy(backdraw);
   XFlush(ui->display);
 
-  const char *label = btn->label;
+  const char *label = btn->text;
   if (strcmp(label, "C") == 0) {
-    clear_calculator();
+    clear_calculator(ui);
   } else if (strcmp(label, "<") == 0) {
     curinput[--input_pos] = '\0';
-    strcpy(displaytxt, curinput[0] ? curinput : "0");
+    strcpy(ui->resLabel.text, curinput[0] ? curinput : "0");
   } else if (strcmp(label, "=") == 0) {
-    double res = evaluate_simple(curinput);
+    double res = evaluate_simple(ui, curinput);
     if (isnan(res)) {
-      strncpy(displaytxt, "Error", 5);
+      strncpy(ui->resLabel.text, "Error", 5);
     } else {
-      snprintf(displaytxt, sizeof(displaytxt), "%.8g", res);
-      strncpy(curinput, displaytxt, strlen(displaytxt));
+      snprintf(ui->resLabel.text, sizeof(ui->resLabel.text), "%.8g", res);
+      strncpy(curinput, ui->resLabel.text, strlen(ui->resLabel.text));
       input_pos = strlen(curinput);
+      strcpy(curinput, "");
+      curinput[0] = '\0';
+      input_pos = 0;
     }
   } else if (strlen(label) == 1) {
-    append_to_input(label[0]);
+    append_to_input(ui, label[0]);
   }
 
   control_expose(ui, &(XEvent){.type = Expose});
@@ -307,7 +307,7 @@ void handle_key_press(UiSystem *ui, XEvent *event) {
   len = XLookupString(&event->xkey, buf, sizeof(buf), &keysym, NULL);
 
   if (keysym == XK_Q) {
-    isrunning = 0;
+    ui->isrunning = 0;
     return;
   }
 
@@ -341,16 +341,16 @@ void handle_key_press(UiSystem *ui, XEvent *event) {
   }
 
   if (keysym == XK_C) {
-    clear_calculator();
+    clear_calculator(ui);
     goto redraw;
   }
 
   if (keysym == XK_Return || keysym == XK_KP_Enter) {
-    double res = evaluate_simple(curinput);
+    double res = evaluate_simple(ui, curinput);
     if (isnan(res)) {
-      strncpy(displaytxt, "Error", 5);
+      strncpy(ui->resLabel.text, "Error", 5);
     } else {
-      snprintf(displaytxt, sizeof(displaytxt), "%.8g", res);
+      snprintf(ui->resLabel.text, sizeof(ui->resLabel.text), "%.8g", res);
     }
     goto redraw;
   }
@@ -359,7 +359,7 @@ void handle_key_press(UiSystem *ui, XEvent *event) {
   || (keysym == XK_Delete && input_pos > 0)
   || (keysym == XK_X && input_pos > 0)) {
     curinput[--input_pos] = '\0';
-    strcpy(displaytxt, curinput[0] ? curinput : "0");
+    strcpy(ui->resLabel.text, curinput[0] ? curinput : "0");
     goto redraw;
   }
 
@@ -373,7 +373,7 @@ void handle_key_press(UiSystem *ui, XEvent *event) {
   else if (keysym == XK_KP_Decimal  || keysym == XK_period)     c = '.';
 
   if (c) {
-    append_to_input(c);
+    append_to_input(ui, c);
     goto redraw;
   }
 
diff --git a/src/display.c b/src/display.c
index f21bd80..3928c02 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1,17 +1,16 @@
 #include "display.h"
-#include "program.h"
 
 #include <string.h>
 
 void drawbuttons(UiSystem *ui, SuwaButton *btn, XftDraw *xftdraw) {
-  unsigned long curbg = btn->pressed ? BTSEL : BTCOL;
+  unsigned long curbg = btn->pressed ? BTSEL : btn->bg_color;
   XSetForeground(ui->display, ui->gc, curbg);
   XFillRectangle(ui->display, ui->target, ui->gc, btn->x, btn->y,
       btn->width, btn->height);
 
   // 文字の中央に
-  if (btn->label && ui->font && xftdraw) {
-    const FcChar8 *str = (const FcChar8 *)btn->label;
+  if (btn->text && ui->font && xftdraw) {
+    const FcChar8 *str = (const FcChar8 *)btn->text;
     int len = strlen((const char *)str);
 
     XGlyphInfo extents;
@@ -23,9 +22,7 @@ void drawbuttons(UiSystem *ui, SuwaButton *btn, XftDraw *xftdraw) {
     int tx = btn->x + (btn->width - text_w) / 2;
     int ty = btn->y + (btn->height - text_h) / 2 + ui->font->ascent;
 
-    // tx -= extents.x;
-
     XftDrawStringUtf8(xftdraw, &ui->color, ui->font, tx, ty,
-        (FcChar8 *)btn->label, len);
+        (FcChar8 *)btn->text, len);
   }
 }
diff --git a/src/display.h b/src/display.h
index c67db60..c8dc5d9 100644
--- a/src/display.h
+++ b/src/display.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "program.h"
 #include "ui.h"
 
 void drawbuttons(UiSystem *ui, SuwaButton *btn, XftDraw *xftdraw);
diff --git a/src/program.c b/src/program.c
deleted file mode 100644
index 0e8805c..0000000
--- a/src/program.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "program.h"
-
-int window_width = 382;
-int window_height = 534;
-int isrunning = 1;
-char displayprb[128] = "";
-char curinput[256] = {0};
-char displaytxt[64] = "0";
-int input_pos = 0;
-Pixmap backbuf = None;
-SuwaButton *hovered_btn = NULL;
-SuwaButton *pressed_btn = NULL;
diff --git a/src/program.h b/src/program.h
deleted file mode 100644
index 9b6cf45..0000000
--- a/src/program.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "ui.h"
-
-#define FGCOL 0xfcfcfc
-#define BGCOL 0x232020
-#define BTSEL 0xb61729
-#define BTCOL 0xee4030
-#define BTHVR 0xf35869
-
-extern int window_width;
-extern int window_height;
-extern int isrunning;
-extern char displayprb[128];
-extern char curinput[256];
-extern char displaytxt[64];
-extern int input_pos;
-extern SuwaButton *hovered_btn;
-extern SuwaButton *pressed_btn;
diff --git a/src/ui.h b/src/ui.h
index 66cb489..a0695c4 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -3,21 +3,45 @@
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 
-typedef struct {
-  Display *display;
-  Window window;
-  Drawable target;
-  GC gc;
-  Visual visual;
-  XftDraw *xftdraw;
-  XftColor color, btncolor, textcolor;
-  XftFont *font, *prbfont, *disfont;
-  Colormap colormap;
-  Pixmap backbuf;
-} UiSystem;
+#define FGCOL 0xfcfcfc
+#define BGCOL 0x232020
+#define BTSEL 0xb61729
+#define BTCOL 0xee4030
+#define BTHVR 0xf35869
 
 typedef struct {
   int x, y, width, height;
-  const char *label;
+} SuwaWindow;
+
+typedef struct {
+  int x, y, width, height;
+  const char *text;
+  XftFont *font;
+  int bg_color;
+  XftColor fg_color;
   int pressed; // 0 = 普通、1 = 押している
 } SuwaButton;
+
+typedef struct {
+  int x, y, width, height;
+  char text[32];
+  XftFont *font;
+  XftColor fg_color;
+} SuwaLabel;
+
+typedef struct {
+  int isrunning;
+  Display *display;
+  Window xwindow;
+  Drawable target;
+  GC gc;
+  Visual visual;
+  XftColor color;
+  XftFont *font;
+  Colormap colormap;
+  Pixmap backbuf;
+  SuwaWindow window;
+  SuwaLabel resLabel;
+  SuwaLabel problemLabel;
+  SuwaButton *buttons[32];
+} UiSystem;
diff --git a/src/utils.c b/src/utils.c
index 8935f96..d8676c8 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,20 +1,17 @@
 #include "utils.h"
 
 void cleanup(UiSystem *ui) {
-  if (ui->textcolor.pixel != 0)
-    XftColorFree(ui->display, &ui->visual, ui->colormap, &ui->textcolor);
-  if (ui->btncolor.pixel != 0)
-    XftColorFree(ui->display, &ui->visual, ui->colormap, &ui->btncolor);
-  if (ui->color.pixel != 0)
-    XftColorFree(ui->display, &ui->visual, ui->colormap, &ui->color);
-  if (ui->disfont) XftFontClose(ui->display, ui->disfont);
-  if (ui->prbfont) XftFontClose(ui->display, ui->prbfont);
+  // フォント
+  if (ui->resLabel.font) XftFontClose(ui->display, ui->resLabel.font);
+  if (ui->problemLabel.font) XftFontClose(ui->display, ui->problemLabel.font);
   if (ui->font) XftFontClose(ui->display, ui->font);
+
+  // その他
   if (ui->gc) XFreeGC(ui->display, ui->gc);
   if (ui->backbuf) {
     XFreePixmap(ui->display, ui->backbuf);
     ui->backbuf = None;
   }
-  if (ui->window) XDestroyWindow(ui->display, ui->window);
+  if (ui->xwindow) XDestroyWindow(ui->display, ui->xwindow);
   if (ui->display) XCloseDisplay(ui->display);
 }
diff --git a/src/utils.h b/src/utils.h
index b97648f..33faf00 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "program.h"
+#include "ui.h"
 
 void cleanup(UiSystem *ui);