From 86a10e053154cb52ab7d051b98a6366c6165c02b Mon Sep 17 00:00:00 2001 From: katalx Date: Wed, 28 Jan 2026 19:07:23 -0500 Subject: cleanly separate xlib and menu code --- ui.c | 211 ++++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 107 insertions(+), 104 deletions(-) (limited to 'ui.c') diff --git a/ui.c b/ui.c index 542cb8b..aa3bad6 100644 --- a/ui.c +++ b/ui.c @@ -7,34 +7,34 @@ #include #include +#include "ui.h" #include "dynarr.h" -typedef DYNARR(char) DynStr; +static Display *dsp; +static Window win; +static int scr; +static unsigned long fg, bg; +static XSizeHints szhint; +static GC gc; -int -umod(int a, int b) -{ - if (a < 0) { - return b + a % b; - } else { - return a % b; - } -} +static Font freg, fital; -int -main(int argc, char **argv) +/* TODO: center menu on screen */ + +void +ui_init(int argc, char **argv) { - Display *dsp = XOpenDisplay(""); - int scr = DefaultScreen(dsp); - unsigned long fg = BlackPixel(dsp, scr); - unsigned long bg = WhitePixel(dsp, scr); + dsp = XOpenDisplay(""); + scr = DefaultScreen(dsp); + fg = BlackPixel(dsp, scr); + bg = WhitePixel(dsp, scr); - XSizeHints szhint = { 0 }; + szhint = (XSizeHints) { 0 }; szhint.width = 350; szhint.height = 250; szhint.flags = PSize; - Window win = XCreateSimpleWindow( + win = XCreateSimpleWindow( dsp, DefaultRootWindow(dsp), szhint.x, szhint.y, @@ -42,108 +42,111 @@ main(int argc, char **argv) 5 /* border width */, fg, bg); + /* TODO: replace with modern XSetWMProperties */ char title[] = "xmenu"; XSetStandardProperties(dsp, win, title, title, None, argv, argc, &szhint); - GC gc = XCreateGC(dsp, win, 0, 0); + gc = XCreateGC(dsp, win, 0, 0); XSetBackground(dsp, gc, bg); XSetForeground(dsp, gc, fg); XSelectInput(dsp, win, ButtonPressMask | KeyPressMask | ExposureMask); XMapRaised(dsp, win); - Font freg = XLoadFont(dsp, "-*-new century schoolbook-medium-r-*-*-24-*-*-*-*-*-*-*"); - Font fital = XLoadFont(dsp, "-*-new century schoolbook-medium-i-*-*-24-*-*-*-*-*-*-*"); - - /* see Xft(3) */ - - DynStr input = { 0 }; - - int seli = 0; - - const char *optv[] = { "she shit on my thang until i vomit", "what", "who are you", "why are you", "where'd you come from" }; - int optc = sizeof optv / sizeof *optv; - - for (;;) { - XEvent ev; - KeySym key; - XNextEvent(dsp, &ev); - switch (ev.type) { - case KeyPress: { - char kbuf[32]; - KeyCode kc = ev.xkey.keycode; - KeySym sym = XkbKeycodeToKeysym(dsp, kc, 0, - !!(ev.xkey.state & ShiftMask)); - int rune = ksym_to_unicode(sym); - switch (sym) { - case XK_Escape: - goto done; - case XK_BackSpace: - if (input.n > 0) input.n--; - goto draw; - case XK_Return: - input.n = 0; - goto draw; - case XK_Down: - seli = umod(seli + 1, optc); - goto draw; - case XK_Up: - seli = umod(seli - 1, optc); - goto draw; - default: { - int n = XLookupString(&ev.xkey, kbuf, 10, &key, 0); - if (!n) break; - DA_PUSH_MULT(&input, kbuf, n); - seli = 0; - goto draw; - } break; - } - } break; - case Expose: { - draw:; - XWindowAttributes attr; - XClearWindow(dsp, win); - XGetWindowAttributes(dsp, win, &attr); - //XGetSizeHints(dsp, win, &szhint); - XSetFont(dsp, gc, fital); - int w = XTextWidth(XQueryFont(dsp, XGContextFromGC(gc)), input.v, input.n); - DA_PUSH(&input, '_'); - XDrawString(dsp, win, gc, 16, 24, input.v, input.n); - input.n--; - XSetFont(dsp, gc, freg); - for (int i = 0; i < optc; i++) { - if (i == seli) { - int w = XTextWidth(XQueryFont(dsp, - XGContextFromGC(gc)), - optv[i], strlen(optv[i])); - XFillRectangle(dsp, win, gc, - 16, 28 + i * 24 + 8, - w, 24); - XSetForeground(dsp, gc, bg); - XDrawString(dsp, win, gc, - 16, 48 + i * 24 + 8, - optv[i], strlen(optv[i])); - XSetForeground(dsp, gc, fg); - } else { - XDrawString(dsp, win, gc, - 16, 48 + i * 24 + 8, - optv[i], strlen(optv[i])); - } - - } - } break; - /* TODO: figure out quit events */ - } + freg = XLoadFont(dsp, "-*-new century schoolbook-medium-r-*-*-24-*-*-*-*-*-*-*"); + fital = XLoadFont(dsp, "-*-new century schoolbook-medium-i-*-*-24-*-*-*-*-*-*-*"); +} + +UiKey +xksym_to_uik(KeySym sym) +{ + switch (sym) { + case XK_Escape: return UIK_ESCAPE; + case XK_BackSpace: return UIK_BACKSPACE; + case XK_Up: return UIK_UP; + case XK_Down: return UIK_DOWN; + case XK_Left: return UIK_LEFT; + case XK_Right: return UIK_RIGHT; + case XK_Return: return UIK_RETURN; + case XK_Home: return UIK_HOME; + case XK_End: return UIK_END; + case XK_Page_Down: return UIK_PGDN; + case XK_Page_Up: return UIK_PGUP; + default: return UIK_UNKNOWN; + } +} + +int +ui_wait_event(UiEvent *e) +{ + XEvent ev; + KeySym sym; + XNextEvent(dsp, &ev); + switch (ev.type) { + case KeyPress: + e->type = UI_KEY_DOWN; + e->key.strn = XLookupString(&ev.xkey, e->key.str, 10, &sym, 0); + e->key.key = xksym_to_uik(sym); + return 1; + case KeyRelease: + e->type = UI_KEY_UP; + e->key.strn = XLookupString(&ev.xkey, e->key.str, 10, &sym, 0); + e->key.key = xksym_to_uik(sym); + return 1; + case Expose: + e->type = UI_REDRAW; + return 1; } + fprintf(stderr, "[Unknown event %d]\n", ev.type); + return 0; +} -done: ; +void +ui_draw(Str input, int inpi, int seli, Str *optv, int optc) +{ + XWindowAttributes attr; + XClearWindow(dsp, win); + XGetWindowAttributes(dsp, win, &attr); + + /* draw input */ + + XSetFont(dsp, gc, fital); + XDrawString(dsp, win, gc, 16, 24, input.s, input.n); + XFontStruct *f = XQueryFont(dsp, XGContextFromGC(gc)); + int w = XTextWidth(f, input.s, inpi); + XDrawLine(dsp, win, gc, 16 + w, 24 - f->ascent, 16 + w, 24 + f->descent); + + /* draw options */ + + XSetFont(dsp, gc, freg); + for (int i = 0; i < optc; i++) { + if (i == seli) { + int w = XTextWidth(XQueryFont(dsp, + XGContextFromGC(gc)), + optv[i].s, optv[i].n); + XFillRectangle(dsp, win, gc, + 16, 28 + i * 24 + 8, + w, 24); + XSetForeground(dsp, gc, bg); + XDrawString(dsp, win, gc, + 16, 48 + i * 24 + 8, + optv[i].s, optv[i].n); + XSetForeground(dsp, gc, fg); + } else { + XDrawString(dsp, win, gc, + 16, 48 + i * 24 + 8, + optv[i].s, optv[i].n); + } + } +} +void +ui_fini(void) +{ XUnloadFont(dsp, freg); XUnloadFont(dsp, fital); XFreeGC(dsp, gc); XDestroyWindow(dsp, win); XCloseDisplay(dsp); - - return 0; } -- cgit v1.2.3