aboutsummaryrefslogtreecommitdiff
path: root/sys/cmd
diff options
context:
space:
mode:
authorNicholas Noll <nbnoll@eml.cc>2020-06-06 11:04:36 -0700
committerNicholas Noll <nbnoll@eml.cc>2020-06-06 11:04:36 -0700
commiteeb5831bb4d62c35eca6db333137a9b8bf682e6e (patch)
treeb4092fcd664633b6ad8a781e1a156226e723e999 /sys/cmd
parent0a8f62d8c7116be9e344f351df679599908fb29c (diff)
deprecated wayland
Diffstat (limited to 'sys/cmd')
-rw-r--r--sys/cmd/dwm/client.c254
-rw-r--r--sys/cmd/dwm/config.h91
-rw-r--r--sys/cmd/dwm/decoration.c52
-rw-r--r--sys/cmd/dwm/dwm.c184
-rw-r--r--sys/cmd/dwm/dwm.h346
-rw-r--r--sys/cmd/dwm/func.c217
-rw-r--r--sys/cmd/dwm/input.c333
-rw-r--r--sys/cmd/dwm/layer.c329
-rw-r--r--sys/cmd/dwm/layout.c37
-rw-r--r--sys/cmd/dwm/output.c257
-rw-r--r--sys/cmd/dwm/rules.mk50
-rw-r--r--sys/cmd/dwm/util.c22
-rw-r--r--sys/cmd/term/LICENSE34
-rw-r--r--sys/cmd/term/config.h490
-rw-r--r--sys/cmd/term/rules.mk25
-rw-r--r--sys/cmd/term/term.c2590
-rw-r--r--sys/cmd/term/term.h123
-rw-r--r--sys/cmd/term/win.h39
-rw-r--r--sys/cmd/term/x.c2041
19 files changed, 0 insertions, 7514 deletions
diff --git a/sys/cmd/dwm/client.c b/sys/cmd/dwm/client.c
deleted file mode 100644
index cc9730b..0000000
--- a/sys/cmd/dwm/client.c
+++ /dev/null
@@ -1,254 +0,0 @@
-#include "dwm.h"
-
-#define WLR_EDGE_ALL WLR_EDGE_TOP|WLR_EDGE_BOTTOM|WLR_EDGE_LEFT|WLR_EDGE_RIGHT
-
-
-/* local callbacks */
-static void map(struct wl_listener *ev, void *arg);
-static void unmap(struct wl_listener *ev, void *arg);
-static void delete(struct wl_listener *ev, void *arg);
-
-/* globals */
-static char *broken = "<broken>";
-
-// -----------------------------------------------------------------------
-// methods
-
-void
-applybounds(Client *c, struct wlr_box *bbox)
-{
- c->dim.width = MAX(1, c->dim.width);
- c->dim.height = MAX(1, c->dim.height);
-
- if (c->dim.x >= bbox->x + bbox->width)
- c->dim.x = bbox->x + bbox->width - c->dim.width;
- if (c->dim.y >= bbox->y + bbox->height)
- c->dim.y = bbox->y + bbox->height - c->dim.height;
- if (c->dim.x + c->dim.width + 2 * c->bw <= bbox->x)
- c->dim.x = bbox->x;
- if (c->dim.y + c->dim.height + 2 * c->bw <= bbox->y)
- c->dim.y = bbox->y;
-}
-
-void
-applyrules(Client *c)
-{
- char *id, *title;
- uint i, newtags = 0;
- const Rule *r;
- Monitor *m, *it;
-
- m = monitor;
- /* rule matching */
- c->floating = 0;
- if (!(id = c->surf->toplevel->app_id))
- id = broken;
- if (!(title = c->surf->toplevel->title))
- title = broken;
-
- for (r = apprules; r < arrend(apprules); r++) {
- if ((!r->title || strstr(title, r->title))
- && (!r->id || strstr(id, r->id)))
- {
- c->floating = r->floating;
- newtags |= r->tags;
- i = 0;
- wl_list_for_each(it, &dwm.odevs, link)
- if (r->monitor == i++)
- m = it;
- }
- }
- setmonitor(c, m, newtags);
-}
-
-void
-resize(Client *c, int x, int y, int w, int h, int interact)
-{
- struct wlr_box *bbox;
-
- bbox = interact ? &dwm.dim : &c->m->area.win;
- c->dim.x = x;
- c->dim.y = y;
- c->dim.width = w;
- c->dim.height = h;
-
- applybounds(c, bbox);
- /* wlroots makes this a no-op if size hasn't changed */
- wlr_xdg_toplevel_set_size(c->surf, c->dim.width - 2*c->bw - gapwidth, c->dim.height - 2*c->bw - gapwidth);
-}
-
-Client *
-getclient(void)
-{
- Client *c;
-
- c = wl_container_of(dwm.focus.next, c, link.focus);
- if (wl_list_empty(&dwm.focus) || !VISIBLEON(c, monitor))
- return nil;
-
- return c;
-}
-
-Client *
-clientat(double x, double y)
-{
- Client *c;
- wl_list_for_each(c, &dwm.stack, link.stack)
- if (VISIBLEON(c, c->m) && wlr_box_contains_point(&c->dim, x, y))
- return c;
- return nil;
-}
-
-
-Client *
-lastfocus(void)
-{
- Client *c;
- wl_list_for_each(c, &dwm.focus, link.focus)
- if (VISIBLEON(c, monitor))
- return c;
-
- return nil;
-}
-
-void
-setfocus(Client *c, struct wlr_surface *surf, int lift)
-{
- struct wlr_surface *prev_surface;
- struct wlr_xdg_surface *prev;
- struct wlr_keyboard *kb;
-
- if (c) {
- if (!surf)
- surf = c->surf->surface;
- monitor = c->m;
- }
-
- prev_surface = dwm.seat->keyboard_state.focused_surface;
- if (prev_surface == surf)
- return;
-
- if (prev_surface) {
- prev = wlr_xdg_surface_from_wlr_surface(dwm.seat->keyboard_state.focused_surface);
- wlr_xdg_toplevel_set_activated(prev, 0);
- }
-
- kb = wlr_seat_get_keyboard(dwm.seat);
- wlr_seat_keyboard_notify_enter(dwm.seat, surf, kb->keycodes, kb->num_keycodes, &kb->modifiers);
-
- if (c) {
- wl_list_remove(&c->link.focus);
- wl_list_insert(&dwm.focus, &c->link.focus);
- if (lift) {
- wl_list_remove(&c->link.stack);
- wl_list_insert(&dwm.stack, &c->link.stack);
- }
- wlr_xdg_toplevel_set_activated(c->surf, 1);
- }
-}
-
-void
-setfloating(Client *c, int f)
-{
- if (c->floating == f)
- return;
-
- c->floating = f;
- arrange(c->m);
-}
-
-void
-pointerfocus(Client *c, struct wlr_surface *surf, double sx, double sy, uint32 time)
-{
- if (c && !surf)
- surf = c->surf->surface;
-
- if (surf && surf == dwm.seat->pointer_state.focused_surface) {
- wlr_seat_pointer_notify_motion(dwm.seat, time, sx, sy);
- return;
- }
-
- wlr_seat_pointer_notify_enter(dwm.seat, surf, sx, sy);
- /* If keyboard focus follows mouse, enforce that */
- if (sloppyfocus && surf)
- setfocus(c, surf, 0);
-}
-
-
-// -----------------------------------------------------------------------
-// callback function implementations
-
-/* xdg-surfaces */
-void
-ev·newclient(struct wl_listener *ev, void *arg)
-{
- Client *c;
- struct wlr_xdg_surface *surf;
-
- surf = arg;
- if (surf->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL)
- return;
-
- c = surf->data = calloc(1, sizeof(*c));
- c->surf = surf;
- c->bw = borderwidth;
-
- wlr_xdg_toplevel_set_tiled(surf, WLR_EDGE_ALL);
-
- /* install callbacks */
- c->ev.map.notify = map;
- c->ev.unmap.notify = unmap;
- c->ev.free.notify = delete;
-
- wl_signal_add(&surf->events.map, &c->ev.map);
- wl_signal_add(&surf->events.unmap, &c->ev.unmap);
- wl_signal_add(&surf->events.destroy, &c->ev.free);
-}
-
-static
-void
-map(struct wl_listener *ev, void *arg)
-{
- Client *c;
-
- c = wl_container_of(ev, c, ev.map);
-
- wl_list_insert(&dwm.tiles, &c->link.tiles);
- wl_list_insert(&dwm.focus, &c->link.focus);
- wl_list_insert(&dwm.stack, &c->link.stack);
-
- wlr_xdg_surface_get_geometry(c->surf, &c->dim);
-
- c->dim.width += 2 * c->bw;
- c->dim.height += 2 * c->bw;
-
- applyrules(c);
-}
-
-static
-void
-unmap(struct wl_listener *ev, void *arg)
-{
- Monitor *m;
- Client *c;
-
- c = wl_container_of(ev, c, ev.unmap);
- m = c->m;
- setmonitor(c, nil, 0);
-
- wl_list_remove(&c->link.tiles);
- wl_list_remove(&c->link.stack);
- wl_list_remove(&c->link.focus);
-
- c->surf = nil;
- arrange(m);
-}
-
-static
-void
-delete(struct wl_listener *ev, void *arg)
-{
- Client *c;
- c = wl_container_of(ev, c, ev.free);
- free(c);
-}
diff --git a/sys/cmd/dwm/config.h b/sys/cmd/dwm/config.h
deleted file mode 100644
index c0e142c..0000000
--- a/sys/cmd/dwm/config.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* global appearance */
-
-static const int sloppyfocus = 1; /* focus follows mouse */
-static const uint borderwidth = 1; /* width window borders (pixel) */
-static const uint gapwidth = 4; /* width of gaps(pixel) */
-static const float rootcolor[] = {0.3, 0.3, 0.3, 1.0};
-static const float bordercolor[] = {0.5, 0.5, 0.5, 1.0};
-
-/* tagging */
-static const byte *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-static const Rule apprules[] = {
- /* app_id title tags mask isfloating monitor */
-};
-
-static const Layout layouts[] = {
- /* symbol arrange function */
- { "[]=", tile },
- { "><>", nil }, /* no layout function means floating behavior */
-};
-
-/* monitors */
-static const MonitorRule monitorrules[] = {
- /* name mfact nmaster scale layout rotate/reflect */
- /* example of a HiDPI laptop monitor:
- { "eDP-1", 0.5, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL },
- */
- { nil, 0.55, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL },
-};
-
-/* keyboard */
-static const struct xkb_rule_names xkb_rules = {
- /* can specify fields: rules, model, layout, variant, options */
- /* example:
- .options = "ctrl:nocaps",
- */
-};
-
-#define MODKEY WLR_MODIFIER_LOGO
-#define TAGKEYS(KEY,SKEY,TAG) \
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
- { MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \
- { MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \
- { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
-
-/* commands */
-static const byte *termcmd[] = { "alacritty", 0 };
-static const byte *menucmd[] = { "waybar", 0 };
-
-/* keymaps */
-static const Key keys[] = {
- /* modifier key function argument */
- { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} },
- { MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
- { MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
- { MODKEY, XKB_KEY_i, incmaster, {.i = +1} },
- { MODKEY, XKB_KEY_d, incmaster, {.i = -1} },
- { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05} },
- { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05} },
- { MODKEY, XKB_KEY_Tab, view, {0} },
- { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
- { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
- { MODKEY, XKB_KEY_0, view, {.ui = ~0} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
- { MODKEY, XKB_KEY_comma, focusmonitor, {.i = -1} },
- { MODKEY, XKB_KEY_period, focusmonitor, {.i = +1} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmonitor, {.i = -1} },
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmonitor, {.i = +1} },
- TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
- TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
- TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
- TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3),
- TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4),
- TAGKEYS( XKB_KEY_6, XKB_KEY_caret, 5),
- TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6),
- TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7),
- TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8),
- { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} },
- { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
-#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
- CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
- CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
-};
-
-static const Button buttons[] = {
- { MODKEY, BTN_LEFT, moveresize, {.ui = MouseMove} },
- { MODKEY, BTN_MIDDLE, togglefloating, {0} },
- { MODKEY, BTN_RIGHT, moveresize, {.ui = MouseResize} },
-};
diff --git a/sys/cmd/dwm/decoration.c b/sys/cmd/dwm/decoration.c
deleted file mode 100644
index af0dc5f..0000000
--- a/sys/cmd/dwm/decoration.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "dwm.h"
-
-/* internal callbacks */
-static void mode(struct wl_listener *ev, void *arg);
-static void delete(struct wl_listener *ev, void *arg);
-
-// -----------------------------------------------------------------------
-// implementations
-
-void
-ev·newdecoration(struct wl_listener *ev, void *arg)
-{
- struct wlr_server_decoration *wlr;
- Deco *deco;
-
- wlr = arg;
-
- deco = calloc(1, sizeof(*deco));
- if (!deco)
- return;
-
- deco->wlr = wlr;
-
- wl_signal_add(&wlr->events.destroy, &deco->ev.free);
- deco->ev.free.notify = delete;
-
- wl_signal_add(&wlr->events.mode, &deco->ev.mode);
- deco->ev.mode.notify = mode;
-
- wl_list_insert(&dwm.decos, &deco->link);
-}
-
-static
-void
-delete(struct wl_listener *ev, void *arg)
-{
- Deco *deco;
-
- deco = wl_container_of(ev, deco, ev.free);
-
- wl_list_remove(&deco->ev.free.link);
- wl_list_remove(&deco->ev.mode.link);
- wl_list_remove(&deco->link);
- free(deco);
-}
-
-static
-void
-mode(struct wl_listener *ev, void *arg)
-{
- /* no op */
-}
diff --git a/sys/cmd/dwm/dwm.c b/sys/cmd/dwm/dwm.c
deleted file mode 100644
index a915cde..0000000
--- a/sys/cmd/dwm/dwm.c
+++ /dev/null
@@ -1,184 +0,0 @@
-#include "dwm.h"
-
-/* globals */
-WindowManager dwm = {
- 0,
- .ev = {
- .loop = nil,
- .output = {.notify=ev·newmonitor},
- .input = {.notify=ev·newinput},
- .client = {.notify=ev·newclient},
- .layer = {.notify=ev·newlayershell},
- .deco = {.notify=ev·newdecoration},
- },
-};
-
-void
-setup(void)
-{
- /* wayland boilerplate */
- dwm.display = wl_display_create();
- if (!dwm.display)
- fatal("failed to initialize display");
-
- dwm.backend = wlr_backend_autocreate(dwm.display, nil);
- if (!dwm.backend)
- fatal("failed to create backend");
-
- dwm.draw = wlr_backend_get_renderer(dwm.backend);
- if (!dwm.draw)
- fatal("failed to initialize renderer");
- wlr_renderer_init_wl_display(dwm.draw, dwm.display);
-
- /* intialize the compositor and some automated handlers */
- dwm.compositor = wlr_compositor_create(dwm.display, dwm.draw);
-
- wlr_data_device_manager_create(dwm.display);
- wlr_gamma_control_manager_v1_create(dwm.display);
- wlr_gtk_primary_selection_device_manager_create(dwm.display);
-
- /* middle management */
- wlr_export_dmabuf_manager_v1_create(dwm.display);
- wlr_screencopy_manager_v1_create(dwm.display);
- wlr_data_control_manager_v1_create(dwm.display);
- wlr_primary_selection_v1_device_manager_create(dwm.display);
-
- dwm.ev.loop = wl_display_get_event_loop(dwm.display);
- if (!dwm.ev.loop)
- fatal("failed to initialize event loop");
-
- dwm.layout = wlr_output_layout_create();
- wlr_xdg_output_manager_v1_create(dwm.display, dwm.layout);
-
- /* grab output devices */
- wl_list_init(&dwm.odevs);
- wl_signal_add(&dwm.backend->events.new_output, &dwm.ev.output);
-
- /* initialize window structures */
- wl_list_init(&dwm.tiles);
- wl_list_init(&dwm.stack);
- wl_list_init(&dwm.focus);
- wl_list_init(&dwm.decos);
-
- /* layer shell */
- dwm.laysh = wlr_layer_shell_v1_create(dwm.display);
- wl_signal_add(&dwm.laysh->events.new_surface, &dwm.ev.layer);
-
- /* xdg shell */
- dwm.xdgsh = wlr_xdg_shell_create(dwm.display);
- wl_signal_add(&dwm.xdgsh->events.new_surface, &dwm.ev.client);
-
- /* decorations */
- dwm.mngr.deco = wlr_server_decoration_manager_create(dwm.display);
- wlr_server_decoration_manager_set_default_mode(dwm.mngr.deco, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER);
- wl_signal_add(&dwm.mngr.deco->events.new_decoration, &dwm.ev.deco);
- wl_list_init(&dwm.decos);
-
- dwm.mngr.deco = wlr_server_decoration_manager_create(dwm.display);
-
- /* grab input devices and install callbacks */
- mouse.cursor = wlr_cursor_create();
- if (!mouse.cursor)
- fatal("no mouse found");
- wlr_cursor_attach_output_layout(mouse.cursor, dwm.layout);
- mouse.manager = wlr_xcursor_manager_create(nil, 24);
-
- /* attach the static cursor object to event handlers */
- wl_signal_add(&mouse.cursor->events.axis, &mouse.ev.axis);
- wl_signal_add(&mouse.cursor->events.frame, &mouse.ev.frame);
- wl_signal_add(&mouse.cursor->events.button, &mouse.ev.button);
- wl_signal_add(&mouse.cursor->events.motion, &mouse.ev.motion);
- wl_signal_add(&mouse.cursor->events.motion_absolute, &mouse.ev.absmotion);
-
- wl_list_init(&dwm.idevs);
- wl_list_init(&dwm.keyboards);
-
- wl_signal_add(&dwm.backend->events.new_input, &dwm.ev.input);
-
- dwm.seat = wlr_seat_create(dwm.display, "seat0");
-
- wl_signal_add(&dwm.seat->events.request_set_cursor, &mouse.ev.cursor);
- wl_signal_add(&dwm.seat->events.request_set_selection, &mouse.ev.sel);
- wl_signal_add(&dwm.seat->events.request_set_primary_selection, &mouse.ev.psel);
-}
-
-void
-run(void)
-{
- byte *socket;
- pid_t start = -1;
-
- socket = (byte*)wl_display_add_socket_auto(dwm.display);
- if (!socket) {
- wlr_backend_destroy(dwm.backend);
- fatal("could not open socket");
- }
-
- if (!wlr_backend_start(dwm.backend)) {
- wlr_backend_destroy(dwm.backend);
- wl_display_destroy(dwm.display);
- fatal("failed to start backend");
- }
-
- monitor = monitorat(mouse.cursor->x, mouse.cursor->y);
- if (!monitor)
- fatal("no monitor found");
-
- wlr_cursor_warp_closest(mouse.cursor, nil, mouse.cursor->x, mouse.cursor->y);
- wlr_xcursor_manager_set_cursor_image(mouse.manager, "left_ptr", mouse.cursor);
-
- setenv("WAYLAND_DISPLAY", socket, 1);
-
- wlr_log(WLR_INFO, "running dwm on WAYLAND_DISPLAY\n");
- wl_display_run(dwm.display);
-}
-
-void
-cleanup(void)
-{
- wl_display_destroy_clients(dwm.display);
- wl_display_destroy(dwm.display);
- wlr_backend_destroy(dwm.backend);
-}
-
-void
-usage(void)
-{
- printf("usage: %s [-qvd] [-s startup_cmd]\n", argv0);
- exit(1);
-}
-
-int
-main(int argc, byte *argv[])
-{
- byte *cmd;
- enum wlr_log_importance lvl;
-
- cmd = nil;
- lvl = WLR_ERROR;
-
- ARGBEGIN {
- case 'q':
- lvl = WLR_SILENT;
- break;
- case 'v':
- lvl = WLR_INFO;
- break;
- case 'd':
- lvl = WLR_DEBUG;
- break;
- case 's':
- cmd = EARGF(usage());
- break;
- default:
- usage();
- } ARGEND;
-
- wlr_log_init(lvl, nil);
-
- setup();
- run();
- cleanup();
-
- return 0;
-}
diff --git a/sys/cmd/dwm/dwm.h b/sys/cmd/dwm/dwm.h
deleted file mode 100644
index 148ca89..0000000
--- a/sys/cmd/dwm/dwm.h
+++ /dev/null
@@ -1,346 +0,0 @@
-#pragma once
-
-#include <u.h>
-#include <libn.h>
-
-#include <wayland-server-core.h>
-
-#define WLR_USE_UNSTABLE
-#include <wlr/backend.h>
-#include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_compositor.h>
-#include <wlr/types/wlr_cursor.h>
-#include <wlr/types/wlr_data_control_v1.h>
-#include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_export_dmabuf_v1.h>
-#include <wlr/types/wlr_gamma_control_v1.h>
-#include <wlr/types/wlr_gtk_primary_selection.h>
-#include <wlr/types/wlr_idle.h>
-#include <wlr/types/wlr_input_device.h>
-#include <wlr/types/wlr_keyboard.h>
-#include <wlr/types/wlr_layer_shell_v1.h>
-#include <wlr/types/wlr_matrix.h>
-#include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_output_damage.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_pointer.h>
-#include <wlr/types/wlr_primary_selection.h>
-#include <wlr/types/wlr_primary_selection_v1.h>
-#include <wlr/types/wlr_screencopy_v1.h>
-#include <wlr/types/wlr_seat.h>
-#include <wlr/types/wlr_server_decoration.h>
-#include <wlr/types/wlr_xcursor_manager.h>
-#include <wlr/types/wlr_xdg_decoration_v1.h>
-#include <wlr/types/wlr_xdg_shell.h>
-#include <wlr/types/wlr_xdg_output_v1.h>
-#include <wlr/util/log.h>
-
-#include "xdg-shell.h"
-#include "wlr-layer-shell.h"
-
-#include <signal.h>
-#include <wait.h>
-#include <xkbcommon/xkbcommon.h>
-#include <linux/input-event-codes.h>
-
-
-/* global macros */
-#define VISIBLEON(C, M) ((C)->m == (M) && ((C)->tags & (M)->tagset[(M)->seltags]))
-#define CLEANMASK(mask) (mask & ~WLR_MODIFIER_CAPS)
-#define TAGMASK ((1 << arrlen(tags)) - 1)
-
-/* main types */
-
-typedef union Arg Arg;
-typedef struct Button Button;
-typedef struct Mouse Mouse;
-typedef struct Grab Grab;
-typedef struct Key Key;
-typedef struct Keyboard Keyboard;
-typedef struct Monitor Monitor;
-typedef struct Layout Layout;
-typedef struct Client Client;
-typedef struct Deco Deco;
-typedef struct Layer Layer;
-typedef struct Payload Payload;
-
-typedef struct Rule Rule;
-typedef struct MonitorRule MonitorRule;
-
-typedef struct WindowManager WindowManager;
-
-union Arg
-{
- int i;
- uint ui;
- float f;
- const void *v;
-};
-
-struct Button
-{
- uint mod;
- uint kind;
- void (*func)(const Arg *);
- Arg arg;
-};
-
-enum
-{
- MouseNormal=0, MouseMove, MouseResize,
-};
-
-struct Mouse
-{
- uint mode;
- struct wlr_xcursor_manager *manager;
- struct wlr_cursor *cursor;
- struct {
- struct wl_listener axis;
- struct wl_listener frame;
- struct wl_listener button;
- struct wl_listener motion;
- struct wl_listener absmotion;
- struct wl_listener cursor;
- struct wl_listener sel;
- struct wl_listener psel;
- } ev;
-};
-
-struct Grab
-{
- Client *c;
- int x, y;
-};
-
-struct Key
-{
- uint32 mod;
- xkb_keysym_t sym;
- void (*func)(const Arg *);
- Arg arg;
-};
-
-struct Keyboard
-{
- struct wl_list link;
- struct wlr_input_device *dev;
- struct {
- struct wl_listener modifier;
- struct wl_listener keypress;
- } ev;
-};
-
-struct Layer
-{
- struct wl_list link;
- struct wlr_layer_surface_v1 *surf;
-
- struct {
- struct wl_listener map;
- struct wl_listener unmap;
- struct wl_listener free;
- struct wl_listener commit;
- struct wl_listener detach;
- /* struct wl_listener popup; */
- } ev;
-
- struct wlr_box dim;
- enum zwlr_layer_shell_v1_layer z;
-};
-struct Monitor {
- struct wl_list link;
- struct wlr_output *dev;
- struct {
- struct wl_listener draw;
- struct wl_listener free;
- } ev;
- struct {
- struct wl_signal kill;
- } sig;
- struct {
- struct wlr_box all;
- struct wlr_box win;
- } area;
-
- struct wl_list layers[4];
- struct wlr_output_damage damage;
-
- const Layout *lt[2];
- uint seltags;
- uint sellt;
- uint tagset[2];
- double mfact;
- int nmaster;
-};
-
-struct Layout
-{
- char *sym;
- void (*arrange)(Monitor *);
-};
-
-struct MonitorRule {
- char *name;
- float mfact;
- int nmaster;
- float scale;
- const Layout *lt;
- enum wl_output_transform rr;
-};
-
-struct Rule {
- char *id;
- char *title;
- uint tags;
- int floating;
- int monitor;
-};
-
-struct Client
-{
- struct wlr_xdg_surface *surf;
- struct wlr_box dim;
- struct {
- struct wl_list tiles;
- struct wl_list stack;
- struct wl_list focus;
- } link;
- struct {
- struct wl_listener map;
- struct wl_listener unmap;
- struct wl_listener free;
- } ev;
- int bw;
- uint tags;
- int floating;
- Monitor *m;
-};
-
-struct Deco
-{
- struct wl_list link;
- struct wlr_server_decoration *wlr;
-
- struct {
- struct wl_listener free;
- struct wl_listener mode;
- } ev;
-};
-
-struct Payload
-{
- struct wlr_output *dev;
- struct timespec *now;
- int x, y;
-};
-
-struct WindowManager
-{
- struct wl_display *display;
- struct wlr_backend *backend;
- struct wlr_renderer *draw;
- struct wlr_compositor *compositor;
- struct wlr_xdg_shell *xdgsh;
- struct wlr_layer_shell_v1 *laysh;
- struct wlr_output_layout *layout;
- struct wlr_idle *idle;
- struct wlr_seat *seat;
-
- struct {
- struct wlr_server_decoration_manager *deco;
- struct wlr_xdg_decoration_manager *xdeco;
- } mngr;
-
- struct {
- struct wl_event_loop *loop;
- /* i/o devices */
- struct wl_listener input;
- struct wl_listener output;
- struct wl_listener client;
- /* shells */
- struct wl_listener layer;
- struct wl_listener deco;
- } ev;
-
- struct {
- struct wl_list odevs;
- struct wl_list idevs;
- struct wl_list tiles; /* order of tiles */
- struct wl_list stack; /* order w/in stack */
- struct wl_list focus; /* order of focus */
- struct wl_list keyboards;
- struct wl_list decos;
- };
-
- /* geometry of union of output devices */
- struct wlr_box dim;
-};
-
-/* funcs.c */
-void chvt(const Arg *arg);
-void incmaster(const Arg *arg);
-void focusmonitor(const Arg *arg);
-void focusstack(const Arg *arg);
-void moveresize(const Arg *arg);
-void quit(const Arg *arg);
-void setlayout(const Arg *arg);
-void setmfact(const Arg *arg);
-void spawn(const Arg *arg);
-void tag(const Arg *arg);
-void tagmonitor(const Arg *arg);
-void togglefloating(const Arg *arg);
-void toggletag(const Arg *arg);
-void toggleview(const Arg *arg);
-void view(const Arg *arg);
-
-/* layouts */
-void tile(Monitor *m);
-
-#include "config.h"
-
-// -----------------------------------------------------------------------
-// global variables
-
-extern Mouse mouse;
-extern Grab grab;
-extern Monitor *monitor; /* currently focused */
-extern WindowManager dwm;
-
-// -----------------------------------------------------------------------
-// global functions
-
-/* util.c */
-void fatal(byte *fmt, ...);
-void scale(struct wlr_box *box, float by);
-
-/* input.c */
-void ev·newinput(struct wl_listener *ev, void *arg);
-
-/* client.c */
-void ev·newclient(struct wl_listener *ev, void *arg);
-
-void applybounds(Client *c, struct wlr_box *bbox);
-void applyrules(Client *c);
-Client *clientat(double x, double y);
-Client *getclient(void);
-Client *lastfocus(void);
-void resize(Client *c, int x, int y, int w, int h, int interact);
-void setfocus(Client *c, struct wlr_surface *surf, int lift);
-void setfloating(Client *c, int f);
-void pointerfocus(Client *c, struct wlr_surface *surf, double sx, double sy, uint32 time);
-
-/* output.c */
-void ev·newmonitor(struct wl_listener *ev, void *arg);
-
-void arrange(Monitor *m);
-void setmonitor(Client *c, Monitor *m, uint newtags);
-Monitor *getmonitor(int dir);
-Monitor *monitorat(double x, double y);
-
-/* layer.c */
-void ev·newlayershell(struct wl_listener *ev, void *arg);
-void arrangelayers(Monitor *m);
-
-/* decoration.c */
-void ev·newdecoration(struct wl_listener *ev, void *arg);
diff --git a/sys/cmd/dwm/func.c b/sys/cmd/dwm/func.c
deleted file mode 100644
index 5b0df24..0000000
--- a/sys/cmd/dwm/func.c
+++ /dev/null
@@ -1,217 +0,0 @@
-#include "dwm.h"
-
-void
-chvt(const Arg *arg)
-{
- struct wlr_session *s;
-
- s = wlr_backend_get_session(dwm.backend);
- if (!s)
- return;
-
- wlr_session_change_vt(s, arg->ui);
-}
-
-void
-incmaster(const Arg *arg)
-{
- monitor->nmaster = MAX(monitor->nmaster + arg->i, 0);
- arrange(monitor);
-}
-
-void
-focusmonitor(const Arg *arg)
-{
- Monitor *m;
-
- m = getmonitor(arg->i);
-
- if (m == monitor)
- return;
-
- monitor = m;
- setfocus(lastfocus(), nil, 1);
-}
-
-void
-focusstack(const Arg *arg)
-{
- Client *c, *sel;
-
- sel = getclient();
- if (!sel)
- return;
-
- if (arg->i > 0) {
- wl_list_for_each(c, &sel->link.tiles, link.tiles) {
- if (&c->link.tiles == &dwm.tiles)
- continue;
- if (VISIBLEON(c, monitor))
- break;
- }
- } else {
- wl_list_for_each_reverse(c, &sel->link.tiles, link.tiles) {
- if (&c->link.tiles == &dwm.tiles)
- continue; /* wrap past the sentinel node */
- if (VISIBLEON(c, monitor))
- break; /* found it */
- }
- }
- /* If only one client is visible on selmon, then c == sel */
- setfocus(c, nil, 1);
-}
-
-void
-moveresize(const Arg *arg)
-{
- grab.c = clientat(mouse.cursor->x, mouse.cursor->y);
- if (!grab.c)
- return;
-
- /* Float the window and tell motionnotify to grab it */
- setfloating(grab.c, 1);
- switch (mouse.mode = arg->ui) {
- case MouseMove:
- grab.x = mouse.cursor->x - grab.c->dim.x;
- grab.y = mouse.cursor->y - grab.c->dim.y;
- wlr_xcursor_manager_set_cursor_image(mouse.manager, "fleur", mouse.cursor);
- break;
- case MouseResize:
- wlr_cursor_warp_closest(mouse.cursor, nil,
- grab.c->dim.x + grab.c->dim.width,
- grab.c->dim.y + grab.c->dim.height);
- wlr_xcursor_manager_set_cursor_image(mouse.manager, "bottom_right_corner", mouse.cursor);
- break;
- }
-}
-
-void
-quit(const Arg *arg)
-{
- wl_display_terminate(dwm.display);
-}
-
-void
-setlayout(const Arg *arg)
-{
- if (!arg || !arg->v || arg->v != monitor->lt[monitor->sellt])
- monitor->sellt ^= 1;
- if (arg && arg->v)
- monitor->lt[monitor->sellt] = (Layout *)arg->v;
-
- arrange(monitor);
-}
-
-void
-setmfact(const Arg *arg)
-{
- float f;
-
- if (!arg || !monitor->lt[monitor->sellt]->arrange)
- return;
- f = arg->f < 1.0 ? arg->f + monitor->mfact : arg->f - 1.0;
- if (f < 0.1 || f > 0.9)
- return;
- monitor->mfact = f;
- arrange(monitor);
-}
-
-void
-spawn(const Arg *arg)
-{
- pid_t pid;
- if ((pid=fork()) == 0) {
- setsid();
-
- printf("running %s\n", ((char**)arg->v)[0]);
- execvp(((char **)arg->v)[0], (char **)arg->v);
-
- fprintf(stderr, "dwl: execvp %s", ((char **)arg->v)[0]);
- perror(" failed");
- exit(EXIT_FAILURE);
- } else if (pid < 0)
- fatal("failed to fork");
-}
-
-void
-tag(const Arg *arg)
-{
- Client *c;
-
- c = getclient();
- if (c && arg->ui & TAGMASK) {
- c->tags = arg->ui & TAGMASK;
- setfocus(lastfocus(), nil, 1);
- arrange(monitor);
- }
-}
-
-void
-tagmonitor(const Arg *arg)
-{
- Client *c;
-
- c = getclient();
- if (!c)
- return;
- setmonitor(c, getmonitor(arg->i), 0);
-}
-
-void
-togglefloating(const Arg *arg)
-{
- Client *c;
-
- c = getclient();
- if (!c)
- return;
-
- setfloating(c, !c->floating);
-}
-
-void
-toggletag(const Arg *arg)
-{
- Client *c;
- uint newtags;
-
- c = getclient();
- if (!c)
- return;
- newtags = c->tags ^ (arg->ui & TAGMASK);
- if (newtags) {
- c->tags = newtags;
- setfocus(lastfocus(), nil, 1);
- arrange(monitor);
- }
-}
-
-void
-toggleview(const Arg *arg)
-{
- uint newtagset;
-
- newtagset = monitor->tagset[monitor->seltags] ^ (arg->ui & TAGMASK);
-
- if (newtagset) {
- monitor->tagset[monitor->seltags] = newtagset;
- setfocus(lastfocus(), nil, 1);
- arrange(monitor);
- }
-}
-
-void
-view(const Arg *arg)
-{
- if ((arg->ui & TAGMASK) == monitor->tagset[monitor->seltags])
- return;
-
- monitor->seltags ^= 1; /* toggle sel tagset */
- if (arg->ui & TAGMASK)
- monitor->tagset[monitor->seltags] = arg->ui & TAGMASK;
- setfocus(lastfocus(), nil, 1);
-
- arrange(monitor);
-}
-
-
diff --git a/sys/cmd/dwm/input.c b/sys/cmd/dwm/input.c
deleted file mode 100644
index b035e9a..0000000
--- a/sys/cmd/dwm/input.c
+++ /dev/null
@@ -1,333 +0,0 @@
-#include "dwm.h"
-
-/* local callbacks */
-static void scroll(struct wl_listener *ev, void *arg);
-static void frame(struct wl_listener *ev, void *arg);
-static void click(struct wl_listener *ev, void *arg);
-static void relmove(struct wl_listener *ev, void *arg);
-static void absmove(struct wl_listener *ev, void *arg);
-
-static void setcursor(struct wl_listener *ev, void *arg);
-static void setsel(struct wl_listener *ev, void *arg);
-static void setpsel(struct wl_listener *ev, void *arg);
-
-static void keypress(struct wl_listener *ev, void *arg);
-static void modifier(struct wl_listener *ev, void *arg);
-
-/* global variables */
-Mouse mouse = {
- .mode = 0,
- .manager = nil,
- .cursor = nil,
- .ev = {
- .axis = {.notify=scroll},
- .button = {.notify=click},
- .frame = {.notify=frame},
- .motion = {.notify=relmove},
- .absmotion = {.notify=absmove},
- .cursor = {.notify=setcursor},
- .sel = {.notify=setsel},
- .psel = {.notify=setpsel},
- },
-};
-
-Grab grab = { 0 };
-
-// -----------------------------------------------------------------------
-// callback function implementations
-
-/* input devices */
-static
-void
-newkeyboard(struct wlr_input_device *dev)
-{
- Keyboard *kb;
- struct xkb_context *ctx;
- struct xkb_keymap *map;
-
- kb = dev->data = calloc(1, sizeof(*kb));
- kb->dev = dev;
-
- ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
- map = xkb_map_new_from_names(ctx, &xkb_rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
-
- wlr_keyboard_set_keymap(dev->keyboard, map);
- xkb_keymap_unref(map);
- xkb_context_unref(ctx);
-
- wlr_keyboard_set_repeat_info(dev->keyboard, 25, 600);
-
- /* install callbacks */
- kb->ev.modifier.notify = modifier;
- kb->ev.keypress.notify = keypress;
-
- wl_signal_add(&dev->keyboard->events.modifiers, &kb->ev.modifier);
- wl_signal_add(&dev->keyboard->events.key, &kb->ev.keypress);
-
- /* NOTE: we only look at the last keyboard given right now */
- wlr_seat_set_keyboard(dwm.seat, dev);
-
- wl_list_insert(&dwm.keyboards, &kb->link);
-}
-
-static
-void
-newmouse(struct wlr_input_device *dev)
-{
- /* NOTE: we only look at one mouse right now */
- wlr_cursor_attach_input_device(mouse.cursor, dev);
-}
-
-void
-ev·newinput(struct wl_listener *ev, void *arg)
-{
- uint32 c;
- struct wlr_input_device *dev;
-
- dev = arg;
- switch (dev->type) {
- case WLR_INPUT_DEVICE_KEYBOARD:
- newkeyboard(dev);
- break;
- case WLR_INPUT_DEVICE_POINTER:
- newmouse(dev);
- break;
- default:
- ;
- }
-
- c = WL_SEAT_CAPABILITY_POINTER;
- if (!wl_list_empty(&dwm.keyboards))
- c |= WL_SEAT_CAPABILITY_KEYBOARD;
- wlr_seat_set_capabilities(dwm.seat, c);
-}
-
-/* mouse input */
-
-static
-void
-scroll(struct wl_listener *ev, void *arg)
-{
- struct wlr_event_pointer_axis *axis;
-
- axis = arg;
- wlr_seat_pointer_notify_axis(dwm.seat,
- axis->time_msec,
- axis->orientation,
- axis->delta,
- axis->delta_discrete,
- axis->source);
-}
-
-void
-click(struct wl_listener *ev, void *arg)
-{
- uint32 mods;
- Client *c;
- const Button *b;
- struct wlr_surface *surf;
- struct wlr_keyboard *keyb;
- struct wlr_event_pointer_button *button;
-
- button = arg;
- switch (button->state) {
- case WLR_BUTTON_PRESSED:
- if ((c = clientat(mouse.cursor->x, mouse.cursor->y))) {
- surf = wlr_xdg_surface_surface_at(c->surf,
- mouse.cursor->x - c->dim.x - c->bw,
- mouse.cursor->y - c->dim.y - c->bw,
- nil, nil
- );
- setfocus(c, surf, 1);
- }
-
- keyb = wlr_seat_get_keyboard(dwm.seat);
- mods = wlr_keyboard_get_modifiers(keyb);
- for (b = buttons; b < arrend(buttons); b++) {
- if (CLEANMASK(mods) == CLEANMASK(b->mod) &&
- button->button == b->kind && b->func) {
- b->func(&b->arg);
- return;
- }
- }
- break;
-
- case WLR_BUTTON_RELEASED:
- if (mouse.mode != MouseNormal) {
- wlr_xcursor_manager_set_cursor_image(mouse.manager, "left_ptr", mouse.cursor);
- mouse.mode = MouseNormal;
- monitor = monitorat(mouse.cursor->x, mouse.cursor->y);
- setmonitor(grab.c, monitor, 0);
- }
- }
-
- wlr_seat_pointer_notify_button(dwm.seat, button->time_msec, button->button, button->state);
-}
-
-static
-void
-frame(struct wl_listener *ev, void *arg)
-{
- wlr_seat_pointer_notify_frame(dwm.seat);
-}
-
-static
-void
-notify(uint32 time)
-{
- Client *c;
- double sx, sy;
- struct wlr_surface *surf;
-
- if (sloppyfocus)
- monitor = monitorat(mouse.cursor->x, mouse.cursor->y);
-
- switch (mouse.mode) {
- case MouseMove:
- resize(grab.c,
- mouse.cursor->x - grab.x,
- mouse.cursor->y - grab.y,
- grab.c->dim.width, grab.c->dim.height, 1);
- return;
-
- case MouseResize:
- resize(grab.c,
- grab.c->dim.x, grab.c->dim.y,
- mouse.cursor->x - grab.c->dim.x,
- mouse.cursor->y - grab.c->dim.y, 1);
- return;
-
- case MouseNormal:
- default:
- ;
- }
-
- surf = nil;
- if ((c = clientat(mouse.cursor->x, mouse.cursor->y)))
- surf = wlr_xdg_surface_surface_at(c->surf,
- mouse.cursor->x - c->dim.x - c->bw,
- mouse.cursor->y - c->dim.y - c->bw,
- &sx, &sy);
-
- if (!surf)
- wlr_xcursor_manager_set_cursor_image(mouse.manager, "left_ptr", mouse.cursor);
-
- pointerfocus(c, surf, sx, sy, time);
-}
-
-static
-void
-relmove(struct wl_listener *ev, void *arg)
-{
- struct wlr_event_pointer_motion *mv;
-
- mv = arg;
- wlr_cursor_move(mouse.cursor, mv->device, mv->delta_x, mv->delta_y);
- notify(mv->time_msec);
-}
-
-static
-void
-absmove(struct wl_listener *ev, void *arg)
-{
- struct wlr_event_pointer_motion_absolute *mv;
-
- mv = arg;
- wlr_cursor_warp_absolute(mouse.cursor, mv->device, mv->x, mv->y);
- notify(mv->time_msec);
-}
-
-/* cursor images */
-static
-void
-setcursor(struct wl_listener *ev, void *arg)
-{
- struct wlr_seat_pointer_request_set_cursor_event *cur;
-
- cur = arg;
- if (mouse.mode != MouseNormal)
- return;
-
- if (cur->seat_client == dwm.seat->pointer_state.focused_client)
- wlr_cursor_set_surface(mouse.cursor, cur->surface, cur->hotspot_x, cur->hotspot_y);
-}
-
-static
-void
-setpsel(struct wl_listener *ev, void *arg)
-{
- struct wlr_seat_request_set_primary_selection_event *psel;
-
- psel = arg;
- wlr_seat_set_primary_selection(dwm.seat, psel->source, psel->serial);
-}
-
-static
-void
-setsel(struct wl_listener *ev, void *arg)
-{
- struct wlr_seat_request_set_selection_event *sel;
-
- sel = arg;
- wlr_seat_set_selection(dwm.seat, sel->source, sel->serial);
-}
-
-/* keyboards */
-
-static
-int
-dokey(uint32 mods, xkb_keysym_t sym)
-{
- int h;
- const Key *k, *e;
-
- h = 0;
- for (k = keys, e = arrend(keys); k < e; k++)
- if (CLEANMASK(mods) == CLEANMASK(k->mod) && sym == k->sym && k->func) {
- k->func(&k->arg);
- h = 1;
- }
-
- return h;
-}
-
-static
-void
-modifier(struct wl_listener *ev, void *arg)
-{
- Keyboard *kb;
-
- kb = wl_container_of(ev, kb, ev.modifier);
- wlr_seat_set_keyboard(dwm.seat, kb->dev);
-
- wlr_seat_keyboard_notify_modifiers(dwm.seat, &kb->dev->keyboard->modifiers);
-}
-
-static
-void
-keypress(struct wl_listener *ev, void *arg)
-{
- Keyboard *kb;
- int i, n, hit;
- uint32 code, mods;
- const xkb_keysym_t *syms;
- struct wlr_event_keyboard_key *key;
-
- key = arg;
- kb = wl_container_of(ev, kb, ev.keypress);
-
- code = key->keycode + 8;
- n = xkb_state_key_get_syms(kb->dev->keyboard->xkb_state, code, &syms);
- mods = wlr_keyboard_get_modifiers(kb->dev->keyboard);
-
- hit = 0;
- if (key->state == WLR_KEY_PRESSED)
- for (i = 0; i < n; i++)
- hit += dokey(mods, syms[i]);
-
- /* if no binding found, pass the event to the client */
- if (!hit) {
- wlr_seat_set_keyboard(dwm.seat, kb->dev);
- wlr_seat_keyboard_notify_key(dwm.seat, key->time_msec, key->keycode, key->state);
- }
-}
diff --git a/sys/cmd/dwm/layer.c b/sys/cmd/dwm/layer.c
deleted file mode 100644
index 4c1ddcb..0000000
--- a/sys/cmd/dwm/layer.c
+++ /dev/null
@@ -1,329 +0,0 @@
-#include "dwm.h"
-
-/* local callbacks */
-static void delete(struct wl_listener *ev, void *arg);
-static void map(struct wl_listener *ev, void *arg);
-static void unmap(struct wl_listener *ev, void *arg);
-static void commit(struct wl_listener *ev, void *arg);
-static void detach(struct wl_listener *ev, void *arg);
-
-// -----------------------------------------------------------------------
-// methods
-
-static
-void
-applyexclusive(struct wlr_box *area, uint32 anchor, int ex, int32 mt, int32 mr, int32 mb, int32 ml)
-{
- if (ex <= 0)
- return;
- struct {
- uint32 singular_anchor;
- uint32 anchor_triplet;
- int *positive_axis;
- int *negative_axis;
- int margin;
- } edges[] = {
- // Top
- {
- .singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
- .anchor_triplet =
- ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
- .positive_axis = &area->y,
- .negative_axis = &area->height,
- .margin = mt,
- },
- // Bottom
- {
- .singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
- .anchor_triplet =
- ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
- .positive_axis = NULL,
- .negative_axis = &area->height,
- .margin = mb,
- },
- // Left
- {
- .singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT,
- .anchor_triplet =
- ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
- .positive_axis = &area->x,
- .negative_axis = &area->width,
- .margin = ml,
- },
- // Right
- {
- .singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT,
- .anchor_triplet =
- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
- ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
- .positive_axis = NULL,
- .negative_axis = &area->width,
- .margin = mr,
- },
- };
- for (size_t i = 0; i < sizeof(edges) / sizeof(edges[0]); ++i) {
- if ((anchor == edges[i].singular_anchor || anchor == edges[i].anchor_triplet)
- && ex + edges[i].margin > 0) {
- if (edges[i].positive_axis) {
- *edges[i].positive_axis += ex + edges[i].margin;
- }
- if (edges[i].negative_axis) {
- *edges[i].negative_axis -= ex + edges[i].margin;
- }
- break;
- }
- }
-}
-
-static
-void
-arrangelayer(Monitor *m, struct wl_list *layers, struct wlr_box *area, int ex)
-{
- Layer *l;
- uint32 horiz, vert;
- struct wlr_box fullarea;
- struct wlr_box box;
- struct wlr_layer_surface_v1 *layer;
- struct wlr_layer_surface_v1_state *state;
-
- wlr_output_effective_resolution(m->dev, &fullarea.width, &fullarea.height);
- wl_list_for_each(l, layers, link) {
- layer = l->surf;
- state = &layer->current;
-
- if (ex != (state->exclusive_zone > 0))
- continue;
-
- struct wlr_box bounds;
- if (state->exclusive_zone == -1)
- bounds = fullarea;
- else
- bounds = *area;
-
- box = (struct wlr_box){
- .width = state->desired_width,
- .height = state->desired_height
- };
-
- // Horizontal axis
- horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
- | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
- if ((state->anchor & horiz) && box.width == 0) {
- box.x = bounds.x;
- box.width = bounds.width;
- } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
- box.x = bounds.x;
- } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
- box.x = bounds.x + (bounds.width - box.width);
- } else {
- box.x = bounds.x + ((bounds.width / 2) - (box.width / 2));
- }
- // Vertical axis
- vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
- | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
- if ((state->anchor & vert) && box.height == 0) {
- box.y = bounds.y;
- box.height = bounds.height;
- } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
- box.y = bounds.y;
- } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
- box.y = bounds.y + (bounds.height - box.height);
- } else {
- box.y = bounds.y + ((bounds.height / 2) - (box.height / 2));
- }
- // Margin
- if ((state->anchor & horiz) == horiz) {
- box.x += state->margin.left;
- box.width -= state->margin.left + state->margin.right;
- } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
- box.x += state->margin.left;
- } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
- box.x -= state->margin.right;
- }
- if ((state->anchor & vert) == vert) {
- box.y += state->margin.top;
- box.height -= state->margin.top + state->margin.bottom;
- } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
- box.y += state->margin.top;
- } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
- box.y -= state->margin.bottom;
- }
- if (box.width < 0 || box.height < 0) {
- // TODO: Bubble up a protocol error?
- wlr_layer_surface_v1_close(layer);
- continue;
- }
- l->dim= box;
- applyexclusive(area, state->anchor, state->exclusive_zone,
- state->margin.top, state->margin.right, state->margin.bottom, state->margin.left);
-
- wlr_layer_surface_v1_configure(layer, box.width, box.height);
- }
-}
-
-void
-arrangelayers(Monitor *m)
-{
- int i;
- Layer *it, *top;
- struct wlr_box area;
-
- wlr_output_effective_resolution(m->dev, &area.width, &area.height);
-
- arrangelayer(m, &m->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], &area, 1);
- arrangelayer(m, &m->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP], &area, 1);
- arrangelayer(m, &m->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM], &area, 1);
- arrangelayer(m, &m->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND], &area, 1);
-
- if (memcmp(&area, &m->area.win, sizeof(struct wlr_box)) != 0) {
- memcpy(&m->area.win, &area, sizeof(struct wlr_box));
- arrange(m);
- }
-
- arrangelayer(m, &m->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], &area, 0);
- arrangelayer(m, &m->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP], &area, 0);
- arrangelayer(m, &m->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM], &area, 0);
- arrangelayer(m, &m->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND], &area, 0);
-
- uint32 layers[] = {
- ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY,
- ZWLR_LAYER_SHELL_V1_LAYER_TOP,
- };
-
- top = nil;
- for (i = 0; i < arrlen(layers); i++) {
- wl_list_for_each_reverse(it, &m->layers[layers[i]], link) {
- if (it->surf->current.keyboard_interactive && it->surf->mapped) {
- top = it;
- break;
- }
- }
- if (top)
- break;
- }
- /* TODO: set focus here? */
-}
-
-
-// -----------------------------------------------------------------------
-// implementations
-
-void
-ev·newlayershell(struct wl_listener *ev, void *arg)
-{
- Monitor *m;
- Layer *layer;
- struct wlr_layer_surface_v1 *surf;
- struct wlr_layer_surface_v1_state old;
-
- surf = arg;
- if (!surf->output)
- surf->output = monitor->dev;
-
- layer = surf->data = calloc(1, sizeof(*layer));
- layer->surf = surf;
-
- /* install callbacks */
- layer->ev.free.notify = delete;
- layer->ev.map.notify = map;
- layer->ev.unmap.notify = unmap;
- layer->ev.commit.notify = commit;
- layer->ev.detach.notify = detach;
-
- wl_signal_add(&surf->events.destroy, &layer->ev.free);
- wl_signal_add(&surf->events.map, &layer->ev.map);
- wl_signal_add(&surf->events.unmap, &layer->ev.unmap);
- wl_signal_add(&surf->surface->events.commit, &layer->ev.commit);
- wl_signal_add(&monitor->sig.kill, &layer->ev.detach);
-
- m = surf->output->data;
- wl_list_insert(&m->layers[surf->client_pending.layer], &layer->link);
-
- /* song and dance: set as pending, arrange, then reset */
- old = surf->current;
- surf->current = surf->client_pending;
- arrangelayers(m);
-}
-
-static
-void
-delete(struct wl_listener *ev, void *arg)
-{
- Layer *l;
-
- l = wl_container_of(ev, l, ev.map);
-
- wl_list_remove(&l->link);
- wl_list_remove(&l->ev.free.link);
- wl_list_remove(&l->ev.map.link);
- wl_list_remove(&l->ev.unmap.link);
- wl_list_remove(&l->ev.detach.link);
- wl_list_remove(&l->ev.commit.link);
-
- free(l);
-}
-
-static
-void
-detach(struct wl_listener *ev, void *arg)
-{
- /* no op */
-}
-
-
-static
-void
-map(struct wl_listener *ev, void *arg)
-{
- Layer *l;
- Monitor *m;
-
- l = wl_container_of(ev, l, ev.map);
- m = l->surf->output->data;
- /* TODO: damage */
- wlr_surface_send_enter(l->surf->surface, l->surf->output);
- /* TODO: cursor */
-}
-
-static
-void
-unmap(struct wl_listener *ev, void *arg)
-{
- /* TODO: fill in */
-}
-
-static
-void
-commit(struct wl_listener *ev, void *arg)
-{
- Layer *l;
- Monitor *m;
- char newdim, newlayer;
- struct wlr_box old;
- struct wlr_layer_surface_v1 *surf;
- struct wlr_output *dev;
-
- l = wl_container_of(ev, l, ev.commit);
- surf = l->surf;
- dev = surf->output;
-
- m = dev->data;
- old = l->dim;
- arrangelayers(m);
-
- newdim = memcmp(&old, &l->dim, sizeof(struct wlr_box)) != 0;
- newlayer = l->z != surf->current.layer;
-
- if (newdim) {
- wl_list_remove(&l->link);
- wl_list_insert(&m->layers[surf->current.layer], &l->link);
- l->z = surf->current.layer;
- }
-}
diff --git a/sys/cmd/dwm/layout.c b/sys/cmd/dwm/layout.c
deleted file mode 100644
index f7a2c60..0000000
--- a/sys/cmd/dwm/layout.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "dwm.h"
-
-void
-tile(Monitor *m)
-{
- Client *c;
- uint i, n, h, mw, my, ty;
-
- n = 0;
- wl_list_for_each(c, &dwm.tiles, link.tiles)
- if (VISIBLEON(c, m) && !c->floating)
- n++;
-
- if (n == 0)
- return;
-
- if (n > m->nmaster)
- mw = m->nmaster ? m->area.win.width * m->mfact : 0;
- else
- mw = m->area.win.width;
-
- i = my = ty = 0;
- wl_list_for_each(c, &dwm.tiles, link.tiles) {
- if (!VISIBLEON(c, m) || c->floating)
- continue;
- if (i < m->nmaster) {
- h = (m->area.win.height - my) / (MIN(n, m->nmaster) - i);
- resize(c, m->area.win.x, m->area.win.y + my, mw, h, 0);
- my += c->dim.height;
- } else {
- h = (m->area.win.height - ty) / (n - i);
- resize(c, m->area.win.x + mw, m->area.win.y + ty, m->area.win.width - mw, h, 0);
- ty += c->dim.height;
- }
- i++;
- }
-}
diff --git a/sys/cmd/dwm/output.c b/sys/cmd/dwm/output.c
deleted file mode 100644
index 918d9a6..0000000
--- a/sys/cmd/dwm/output.c
+++ /dev/null
@@ -1,257 +0,0 @@
-#include "dwm.h"
-
-/* local callbacks */
-static void delete(struct wl_listener *ev, void *arg);
-static void draw(struct wl_listener *ev, void *arg);
-
-/* global variables */
-Monitor *monitor = nil;
-
-// -----------------------------------------------------------------------
-// methods
-
-void
-damageat(Monitor* m, double x, double y)
-{
- /* TODO: don't damage the whole screen */
- wlr_output_damage_add_whole(&m->damage);
-}
-
-void
-arrange(Monitor *m)
-{
- m->area.all = *wlr_output_layout_get_box(dwm.layout, m->dev);
- m->area.win = m->area.all;
- if (m->lt[m->sellt]->arrange)
- m->lt[m->sellt]->arrange(m);
-}
-
-void
-setmonitor(Client *c, Monitor *m, uint newtags)
-{
- int hadfocus;
- Monitor *old;
-
- old = c->m;
- if (old == m)
- return;
-
- hadfocus = (c == getclient());
-
- c->m = m;
- if (old) {
- wlr_surface_send_leave(c->surf->surface, old->dev);
- arrange(old);
- }
-
- if (m) {
- applybounds(c, &m->area.all);
- wlr_surface_send_enter(c->surf->surface, m->dev);
- c->tags = newtags ? newtags : m->tagset[m->seltags];
- arrange(m);
- }
-
- if (hadfocus || (c == getclient()))
- setfocus(lastfocus(), nil, 1);
-}
-
-Monitor*
-getmonitor(int dir)
-{
- Monitor *m;
-
- if (dir > 0) {
- if (monitor->link.next == &dwm.odevs)
- return wl_container_of(dwm.odevs.next, m, link);
- return wl_container_of(monitor->link.next, m, link);
- }
- if (monitor->link.prev == &dwm.odevs)
- return wl_container_of(dwm.odevs.prev, m, link);
- return wl_container_of(monitor->link.prev, m, link);
-}
-
-Monitor *
-monitorat(double x, double y)
-{
- struct wlr_output *dev;
-
- dev = wlr_output_layout_output_at(dwm.layout, x, y);
- return dev ? dev->data : nil;
-}
-
-// -----------------------------------------------------------------------
-// callback function implementations
-void
-ev·newmonitor(struct wl_listener *ev, void *arg)
-{
- Monitor *m;
- const MonitorRule *r;
- struct wlr_output *dev;
- struct wlr_output_mode *mode;
-
- dev = arg;
- wlr_output_set_mode(dev, wlr_output_preferred_mode(dev));
-
- m = dev->data = calloc(1, sizeof(*m));
- m->dev = dev;
- m->tagset[0] = m->tagset[1] = 1;
- /* look for rules to apply */
- for (r = monitorrules; r < arrend(monitorrules); r++) {
- if (!r->name || strstr(dev->name, r->name)) {
- m->mfact = r->mfact;
- m->nmaster = r->nmaster;
- wlr_output_set_scale(dev, r->scale);
- wlr_xcursor_manager_load(mouse.manager, r->scale);
- m->lt[0] = m->lt[1] = r->lt;
- wlr_output_set_transform(dev, r->rr);
- break;
- }
- }
-
- /* install callbacks */
- m->ev.draw.notify = draw;
- m->ev.free.notify = delete;
-
- wl_signal_add(&dev->events.frame, &m->ev.draw);
- wl_signal_add(&dev->events.destroy, &m->ev.free);
-
- wl_list_insert(&dwm.odevs, &m->link);
-
- wl_list_init(&m->layers[0]);
- wl_list_init(&m->layers[1]);
- wl_list_init(&m->layers[2]);
- wl_list_init(&m->layers[3]);
-
- wlr_output_enable(dev, 1);
- if (!wlr_output_commit(dev))
- return;
-
- wl_signal_init(&m->sig.kill);
-
- wlr_output_layout_add_auto(dwm.layout, dev);
- dwm.dim = *wlr_output_layout_get_box(dwm.layout, nil);
-}
-
-static
-void
-delete(struct wl_listener *ev, void *arg)
-{
- Monitor *m;
-
- m = wl_container_of(ev, m, ev.free);
- wl_signal_emit(&m->sig.kill, m);
-
- wl_list_remove(&m->link);
- wl_list_remove(&m->ev.draw.link);
- wl_list_remove(&m->ev.free.link);
-
- free(m);
-}
-
-static
-void
-render(struct wlr_surface *surf, int sx, int sy, void *arg)
-{
- Payload *data;
- double x, y;
- float mtx[9];
- struct wlr_box box;
- struct wlr_output *dev;
- struct wlr_texture *tex;
- enum wl_output_transform transform;
-
- data = arg;
- dev = data->dev;
-
- tex = wlr_surface_get_texture(surf);
- if (!tex)
- return;
-
- /* convert to device local coord */
- wlr_output_layout_output_coords(dwm.layout, dev, &x, &y);
-
- box.x = x + data->x + sx;
- box.y = y + data->y + sy;
- box.width = surf->current.width;
- box.height = surf->current.height;
- scale(&box, dev->scale);
-
- /* orthographic projection */
- transform = wlr_output_transform_invert(surf->current.transform);
- wlr_matrix_project_box(mtx, &box, transform, 0, dev->transform_matrix);
-
- /* render with GPU */
- wlr_render_texture_with_matrix(dwm.draw, tex, mtx, 1);
-
- /* notify the client we are done */
- wlr_surface_send_frame_done(surf, data->now);
-}
-
-static
-void
-renderclients(Monitor *m, struct timespec *now)
-{
- Client *c;
- double x, y;
- int i, w, h;
- Payload data;
- struct wlr_box *borders;
-
- wl_list_for_each_reverse(c, &dwm.stack, link.stack) {
- if (!VISIBLEON(c, c->m) || !wlr_output_layout_intersects(dwm.layout, m->dev, &c->dim))
- continue;
-
- x = c->dim.x;
- y = c->dim.y;
-
- wlr_output_layout_output_coords(dwm.layout, m->dev, &x, &y);
-
- w = c->surf->surface->current.width;
- h = c->surf->surface->current.height;
-
- borders = (struct wlr_box[4]) {
- {x, y, w + 2 * c->bw, c->bw}, /* top */
- {x, y + c->bw, c->bw, h}, /* left */
- {x + c->bw + w, y + c->bw, c->bw, h}, /* right */
- {x, y + c->bw + h, w + 2 * c->bw, c->bw}, /* bottom */
- };
- for (i = 0; i < 4; i++) {
- scale(&borders[i], m->dev->scale);
- wlr_render_rect(dwm.draw, &borders[i], bordercolor, m->dev->transform_matrix);
- }
-
- data.dev = m->dev;
- data.now = now;
- data.x = c->dim.x + c->bw;
- data.y = c->dim.y + c->bw;
-
- wlr_xdg_surface_for_each_surface(c->surf, render, &data);
- }
-}
-
-static
-void
-draw(struct wl_listener *ev, void *arg)
-{
- int w, h;
- Monitor *m;
- struct timespec now;
-
- m = wl_container_of(ev, m, ev.draw);
-
- if (!wlr_output_attach_render(m->dev, nil))
- return;
-
- clock_gettime(CLOCK_MONOTONIC, &now);
- wlr_output_effective_resolution(m->dev, &w, &h);
-
- wlr_renderer_begin(dwm.draw, w, h);
- wlr_renderer_clear(dwm.draw, rootcolor);
-
- renderclients(m, &now);
-
- wlr_output_render_software_cursors(m->dev, nil);
-
- wlr_renderer_end(dwm.draw);
- wlr_output_commit(m->dev);
-}
diff --git a/sys/cmd/dwm/rules.mk b/sys/cmd/dwm/rules.mk
deleted file mode 100644
index 610987a..0000000
--- a/sys/cmd/dwm/rules.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-include share/push.mk
-
-WL_DIR = $(shell pkg-config --variable=pkgdatadir wayland-protocols)
-WL_SCAN = $(shell pkg-config --variable=wayland_scanner wayland-scanner)
-PROTO_DIR := $(d)/protocols
-
-# Local sources
-SRCS_$(d) := \
- $(d)/xdg-shell.c \
- $(d)/wlr-layer-shell.c \
- $(d)/util.c \
- $(d)/output.c \
- $(d)/input.c \
- $(d)/client.c \
- $(d)/decoration.c \
- $(d)/layer.c \
- $(d)/layout.c \
- $(d)/func.c \
- $(d)/dwm.c
-
-BINS_$(d) := $(d)/dwm
-
-include share/paths.mk
-
-# Local rules
-$(d)/xdg-shell.h:
- $(WL_SCAN) server-header $(WL_DIR)/stable/xdg-shell/xdg-shell.xml $@
-
-$(d)/xdg-shell.c: $(d)/xdg-shell.h
- $(WL_SCAN) private-code $(WL_DIR)/stable/xdg-shell/xdg-shell.xml $@
-
-# could make this a patterned rule...
-$(d)/wlr-layer-shell.h: $(PROTO_DIR)/wlr-layer-shell-unstable-v1.xml
- $(WL_SCAN) server-header $(PROTO_DIR)/wlr-layer-shell-unstable-v1.xml $@
-
-$(d)/wlr-layer-shell.c: $(d)/wlr-layer-shell.h
- $(WL_SCAN) private-code $(PROTO_DIR)/wlr-layer-shell-unstable-v1.xml $@
-
-include share/dynamic.mk
-$(BINS_$(d)): TCFLAGS := $(shell pkg-config --cflags xkbcommon) \
- $(shell pkg-config --cflags wlroots) \
- $(shell pkg-config --cflags wayland-server)
-$(BINS_$(d)): TCLIBS := $(shell pkg-config --libs xkbcommon) \
- $(shell pkg-config --libs wlroots) \
- $(shell pkg-config --libs wayland-server)
-
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libn/libn.a
- $(COMPLINK)
-
-include share/pop.mk
diff --git a/sys/cmd/dwm/util.c b/sys/cmd/dwm/util.c
deleted file mode 100644
index 1875d89..0000000
--- a/sys/cmd/dwm/util.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "dwm.h"
-
-void
-fatal(byte *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
-
- verrorf(fmt, args);
-
- va_end(args);
- exit(1);
-}
-
-void
-scale(struct wlr_box *box, float by)
-{
- box->x *= by;
- box->y *= by;
- box->height *= by;
- box->width *= by;
-}
diff --git a/sys/cmd/term/LICENSE b/sys/cmd/term/LICENSE
deleted file mode 100644
index c356c39..0000000
--- a/sys/cmd/term/LICENSE
+++ /dev/null
@@ -1,34 +0,0 @@
-MIT/X Consortium License
-
-© 2014-2018 Hiltjo Posthuma <hiltjo at codemadness dot org>
-© 2018 Devin J. Pohly <djpohly at gmail dot com>
-© 2014-2017 Quentin Rameau <quinq at fifth dot space>
-© 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com>
-© 2008-2017 Anselm R Garbe <garbeam at gmail dot com>
-© 2012-2017 Roberto E. Vargas Caballero <k0ga at shike2 dot com>
-© 2012-2016 Christoph Lohmann <20h at r-36 dot net>
-© 2013 Eon S. Jeon <esjeon at hyunmu dot am>
-© 2013 Alexander Sedov <alex0player at gmail dot com>
-© 2013 Mark Edgar <medgar123 at gmail dot com>
-© 2013-2014 Eric Pruitt <eric.pruitt at gmail dot com>
-© 2013 Michael Forney <mforney at mforney dot org>
-© 2013-2014 Markus Teich <markus dot teich at stusta dot mhn dot de>
-© 2014-2015 Laslo Hunhold <dev at frign dot de>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/sys/cmd/term/config.h b/sys/cmd/term/config.h
deleted file mode 100644
index 5a57641..0000000
--- a/sys/cmd/term/config.h
+++ /dev/null
@@ -1,490 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* temporary macros until we can remove X dependency */
-#define XKB_NO_MOD 1U
-#define ShiftMask (1U<<0)
-#define LockMask (1U<<1)
-#define ControlMask (1U<<2)
-#define Mod1Mask (1U<<3)
-#define Mod2Mask (1U<<4)
-#define Mod3Mask (1U<<5)
-#define Mod4Mask (1U<<6)
-#define Mod5Mask (1U<<7)
-#define XKB_ANY_MOD 1U
-
-#define Button1 1
-#define Button2 2
-#define Button3 3
-#define Button4 4
-#define Button5 5
-
-/*
- * appearance
- *
- * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
- */
-static byte *font = "Inconsolata:pixelsize=12:antialias=true:autohint=true";
-static int borderpx = 2;
-
-/*
- * What program is execed by st depends of these precedence rules:
- * 1: program passed with -e
- * 2: scroll and/or utmp
- * 3: SHELL environment variable
- * 4: value of shell in /etc/passwd
- * 5: value of shell in config.h
- */
-static byte *shell = "/bin/sh";
-byte *utmp = nil;
-/* scroll program: to enable use a string like "scroll" */
-byte *scroll = nil;
-byte *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
-
-/* identification sequence returned in DA and DECID */
-byte *vtiden = "\033[?6c";
-
-/* Kerning / character bounding-box multipliers */
-static float cwscale = 1.0;
-static float chscale = 1.0;
-
-/*
- * word delimiter string
- *
- * More advanced example: L" `'\"()[]{}"
- */
-wchar_t *worddelimiters = L" ";
-
-/* selection timeouts (in milliseconds) */
-static unsigned int doubleclicktimeout = 300;
-static unsigned int tripleclicktimeout = 600;
-
-/* alt screens */
-int allowaltscreen = 1;
-
-/* allow certain non-interactive (insecure) window operations such as:
- setting the clipboard text */
-int allowwindowops = 0;
-
-/*
- * draw latency range in ms - from new content/keypress/etc until drawing.
- * within this range, st draws when content stops arriving (idle). mostly it's
- * near minlatency, but it waits longer for slow updates to avoid partial draw.
- * low minlatency will tear/flicker more, as it can "detect" idle too early.
- */
-static double minlatency = 8;
-static double maxlatency = 33;
-
-/*
- * blinking timeout (set to 0 to disable blinking) for the terminal blinking
- * attribute.
- */
-static unsigned int blinktimeout = 800;
-
-/*
- * thickness of underline and bar cursors
- */
-static unsigned int cursorthickness = 2;
-
-/*
- * bell volume. It must be a value between -100 and 100. Use 0 for disabling
- * it
- */
-static int bellvolume = 0;
-
-/* default TERM value */
-byte *termname = "term-256color";
-
-/*
- * spaces per tab
- *
- * When you are changing this value, don't forget to adapt the »it« value in
- * the st.info and appropriately install the st.info in the environment where
- * you use this st version.
- *
- * it#$tabspaces,
- *
- * Secondly make sure your kernel is not expanding tabs. When running `stty
- * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
- * running following command:
- *
- * stty tabs
- */
-unsigned int tabspaces = 8;
-
-/* Terminal colors (16 first used in escape sequence) */
-static const byte *colorname[] = {
- /* 8 normal colors */
- "black",
- "red3",
- "green3",
- "yellow3",
- "blue2",
- "magenta3",
- "cyan3",
- "gray90",
-
- /* 8 bright colors */
- "gray50",
- "red",
- "green",
- "yellow",
- "#5c5cff",
- "magenta",
- "cyan",
- "white",
-
- [255] = 0,
-
- /* more colors can be added after 255 to use with DefaultXX */
- "#cccccc",
- "#555555",
-};
-
-
-/*
- * Default colors (colorname index)
- * foreground, background, cursor, reverse cursor
- */
-unsigned int defaultfg = 7;
-unsigned int defaultbg = 0;
-static unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
-
-/*
- * Default shape of cursor
- * 2: Block ("█")
- * 4: Underline ("_")
- * 6: Bar ("|")
- * 7: Snowman ("☃")
- */
-static unsigned int cursorshape = 2;
-
-/*
- * Default columns and rows numbers
- */
-
-static unsigned int cols = 80;
-static unsigned int rows = 24;
-
-/*
- * Default colour and shape of the mouse cursor
- */
-static unsigned int mouseshape = 1;
-static unsigned int mousefg = 7;
-static unsigned int mousebg = 0;
-
-/*
- * Color used to display font attributes when fontconfig selected a font which
- * doesn't match the ones requested.
- */
-static unsigned int defaultattr = 11;
-
-/*
- * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
- * Note that if you want to use ShiftMask with selmasks, set this to an other
- * modifier, set to 0 to not use it.
- */
-static uint forcemousemod = ShiftMask;
-
-/*
- * Internal mouse shortcuts.
- * Beware that overloading Button1 will disable the selection.
- */
-static MouseShortcut mshortcuts[] = {
- /* mask button function argument release */
- { XKB_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
- { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
- { XKB_ANY_MOD, Button4, ttysend, {.s = "\031"} },
- { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
- { XKB_ANY_MOD, Button5, ttysend, {.s = "\005"} },
-};
-
-/* Internal keyboard shortcuts. */
-#define MODKEY Mod1Mask
-#define TERMMOD (ControlMask|ShiftMask)
-
-static Shortcut shortcuts[] = {
- /* mask keysym function argument */
- { XKB_ANY_MOD, XKB_KEY_Break, sendbreak, {.i = 0} },
- { ControlMask, XKB_KEY_Print, toggleprinter, {.i = 0} },
- { ShiftMask, XKB_KEY_Print, printscreen, {.i = 0} },
- { XKB_ANY_MOD, XKB_KEY_Print, printsel, {.i = 0} },
- { TERMMOD, XKB_KEY_Prior, zoom, {.f = +1} },
- { TERMMOD, XKB_KEY_Next, zoom, {.f = -1} },
- { TERMMOD, XKB_KEY_Home, zoomreset, {.f = 0} },
- { TERMMOD, XKB_KEY_C, clipcopy, {.i = 0} },
- { TERMMOD, XKB_KEY_V, clippaste, {.i = 0} },
- { TERMMOD, XKB_KEY_Y, selpaste, {.i = 0} },
- { ShiftMask, XKB_KEY_Insert, selpaste, {.i = 0} },
- { TERMMOD, XKB_KEY_Num_Lock, numlock, {.i = 0} },
-};
-
-/*
- * Special keys (change & recompile st.info accordingly)
- *
- * Mask value:
- * * Use XKB_ANY_MOD to match the key no matter modifiers state
- * * Use XK_NO_MOD to match the key alone (no modifiers)
- * appkey value:
- * * 0: no value
- * * > 0: keypad application mode enabled
- * * = 2: term.numlock = 1
- * * < 0: keypad application mode disabled
- * appcursor value:
- * * 0: no value
- * * > 0: cursor application mode enabled
- * * < 0: cursor application mode disabled
- *
- * Be careful with the order of the definitions because st searches in
- * this table sequentially, so any XKB_ANY_MOD must be in the last
- * position for a key.
- */
-
-/*
- * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
- * to be mapped below, add them to this array.
- */
-static ulong mappedkeys[] = { -1 };
-
-/*
- * State bits to ignore when matching key or button events. By default,
- * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
- */
-static uint ignoremod = Mod2Mask;//|XK_SWITCH_MOD;
-
-/*
- * This is the huge key array which defines all compatibility to the Linux
- * world. Please decide about changes wisely.
- */
-static Key key[] = {
- /* keysym mask string appkey appcursor */
- { XKB_KEY_KP_Home, ShiftMask, "\033[2J", 0, -1},
- { XKB_KEY_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
- { XKB_KEY_KP_Home, XKB_ANY_MOD, "\033[H", 0, -1},
- { XKB_KEY_KP_Home, XKB_ANY_MOD, "\033[1~", 0, +1},
- { XKB_KEY_KP_Up, XKB_ANY_MOD, "\033Ox", +1, 0},
- { XKB_KEY_KP_Up, XKB_ANY_MOD, "\033[A", 0, -1},
- { XKB_KEY_KP_Up, XKB_ANY_MOD, "\033OA", 0, +1},
- { XKB_KEY_KP_Down, XKB_ANY_MOD, "\033Or", +1, 0},
- { XKB_KEY_KP_Down, XKB_ANY_MOD, "\033[B", 0, -1},
- { XKB_KEY_KP_Down, XKB_ANY_MOD, "\033OB", 0, +1},
- { XKB_KEY_KP_Left, XKB_ANY_MOD, "\033Ot", +1, 0},
- { XKB_KEY_KP_Left, XKB_ANY_MOD, "\033[D", 0, -1},
- { XKB_KEY_KP_Left, XKB_ANY_MOD, "\033OD", 0, +1},
- { XKB_KEY_KP_Right, XKB_ANY_MOD, "\033Ov", +1, 0},
- { XKB_KEY_KP_Right, XKB_ANY_MOD, "\033[C", 0, -1},
- { XKB_KEY_KP_Right, XKB_ANY_MOD, "\033OC", 0, +1},
- { XKB_KEY_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
- { XKB_KEY_KP_Prior, XKB_ANY_MOD, "\033[5~", 0, 0},
- { XKB_KEY_KP_Begin, XKB_ANY_MOD, "\033[E", 0, 0},
- { XKB_KEY_KP_End, ControlMask, "\033[J", -1, 0},
- { XKB_KEY_KP_End, ControlMask, "\033[1;5F", +1, 0},
- { XKB_KEY_KP_End, ShiftMask, "\033[K", -1, 0},
- { XKB_KEY_KP_End, ShiftMask, "\033[1;2F", +1, 0},
- { XKB_KEY_KP_End, XKB_ANY_MOD, "\033[4~", 0, 0},
- { XKB_KEY_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
- { XKB_KEY_KP_Next, XKB_ANY_MOD, "\033[6~", 0, 0},
- { XKB_KEY_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
- { XKB_KEY_KP_Insert, ShiftMask, "\033[4l", -1, 0},
- { XKB_KEY_KP_Insert, ControlMask, "\033[L", -1, 0},
- { XKB_KEY_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
- { XKB_KEY_KP_Insert, XKB_ANY_MOD, "\033[4h", -1, 0},
- { XKB_KEY_KP_Insert, XKB_ANY_MOD, "\033[2~", +1, 0},
- { XKB_KEY_KP_Delete, ControlMask, "\033[M", -1, 0},
- { XKB_KEY_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
- { XKB_KEY_KP_Delete, ShiftMask, "\033[2K", -1, 0},
- { XKB_KEY_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
- { XKB_KEY_KP_Delete, XKB_ANY_MOD, "\033[P", -1, 0},
- { XKB_KEY_KP_Delete, XKB_ANY_MOD, "\033[3~", +1, 0},
- { XKB_KEY_KP_Multiply, XKB_ANY_MOD, "\033Oj", +2, 0},
- { XKB_KEY_KP_Add, XKB_ANY_MOD, "\033Ok", +2, 0},
- { XKB_KEY_KP_Enter, XKB_ANY_MOD, "\033OM", +2, 0},
- { XKB_KEY_KP_Enter, XKB_ANY_MOD, "\r", -1, 0},
- { XKB_KEY_KP_Subtract, XKB_ANY_MOD, "\033Om", +2, 0},
- { XKB_KEY_KP_Decimal, XKB_ANY_MOD, "\033On", +2, 0},
- { XKB_KEY_KP_Divide, XKB_ANY_MOD, "\033Oo", +2, 0},
- { XKB_KEY_KP_0, XKB_ANY_MOD, "\033Op", +2, 0},
- { XKB_KEY_KP_1, XKB_ANY_MOD, "\033Oq", +2, 0},
- { XKB_KEY_KP_2, XKB_ANY_MOD, "\033Or", +2, 0},
- { XKB_KEY_KP_3, XKB_ANY_MOD, "\033Os", +2, 0},
- { XKB_KEY_KP_4, XKB_ANY_MOD, "\033Ot", +2, 0},
- { XKB_KEY_KP_5, XKB_ANY_MOD, "\033Ou", +2, 0},
- { XKB_KEY_KP_6, XKB_ANY_MOD, "\033Ov", +2, 0},
- { XKB_KEY_KP_7, XKB_ANY_MOD, "\033Ow", +2, 0},
- { XKB_KEY_KP_8, XKB_ANY_MOD, "\033Ox", +2, 0},
- { XKB_KEY_KP_9, XKB_ANY_MOD, "\033Oy", +2, 0},
- { XKB_KEY_Up, ShiftMask, "\033[1;2A", 0, 0},
- { XKB_KEY_Up, Mod1Mask, "\033[1;3A", 0, 0},
- { XKB_KEY_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0},
- { XKB_KEY_Up, ControlMask, "\033[1;5A", 0, 0},
- { XKB_KEY_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0},
- { XKB_KEY_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0},
- { XKB_KEY_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0},
- { XKB_KEY_Up, XKB_ANY_MOD, "\033[A", 0, -1},
- { XKB_KEY_Up, XKB_ANY_MOD, "\033OA", 0, +1},
- { XKB_KEY_Down, ShiftMask, "\033[1;2B", 0, 0},
- { XKB_KEY_Down, Mod1Mask, "\033[1;3B", 0, 0},
- { XKB_KEY_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0},
- { XKB_KEY_Down, ControlMask, "\033[1;5B", 0, 0},
- { XKB_KEY_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0},
- { XKB_KEY_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0},
- { XKB_KEY_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0},
- { XKB_KEY_Down, XKB_ANY_MOD, "\033[B", 0, -1},
- { XKB_KEY_Down, XKB_ANY_MOD, "\033OB", 0, +1},
- { XKB_KEY_Left, ShiftMask, "\033[1;2D", 0, 0},
- { XKB_KEY_Left, Mod1Mask, "\033[1;3D", 0, 0},
- { XKB_KEY_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0},
- { XKB_KEY_Left, ControlMask, "\033[1;5D", 0, 0},
- { XKB_KEY_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0},
- { XKB_KEY_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0},
- { XKB_KEY_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0},
- { XKB_KEY_Left, XKB_ANY_MOD, "\033[D", 0, -1},
- { XKB_KEY_Left, XKB_ANY_MOD, "\033OD", 0, +1},
- { XKB_KEY_Right, ShiftMask, "\033[1;2C", 0, 0},
- { XKB_KEY_Right, Mod1Mask, "\033[1;3C", 0, 0},
- { XKB_KEY_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0},
- { XKB_KEY_Right, ControlMask, "\033[1;5C", 0, 0},
- { XKB_KEY_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0},
- { XKB_KEY_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0},
- { XKB_KEY_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0},
- { XKB_KEY_Right, XKB_ANY_MOD, "\033[C", 0, -1},
- { XKB_KEY_Right, XKB_ANY_MOD, "\033OC", 0, +1},
- { XKB_KEY_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
- { XKB_KEY_Return, Mod1Mask, "\033\r", 0, 0},
- { XKB_KEY_Return, XKB_ANY_MOD, "\r", 0, 0},
- { XKB_KEY_Insert, ShiftMask, "\033[4l", -1, 0},
- { XKB_KEY_Insert, ShiftMask, "\033[2;2~", +1, 0},
- { XKB_KEY_Insert, ControlMask, "\033[L", -1, 0},
- { XKB_KEY_Insert, ControlMask, "\033[2;5~", +1, 0},
- { XKB_KEY_Insert, XKB_ANY_MOD, "\033[4h", -1, 0},
- { XKB_KEY_Insert, XKB_ANY_MOD, "\033[2~", +1, 0},
- { XKB_KEY_Delete, ControlMask, "\033[M", -1, 0},
- { XKB_KEY_Delete, ControlMask, "\033[3;5~", +1, 0},
- { XKB_KEY_Delete, ShiftMask, "\033[2K", -1, 0},
- { XKB_KEY_Delete, ShiftMask, "\033[3;2~", +1, 0},
- { XKB_KEY_Delete, XKB_ANY_MOD, "\033[P", -1, 0},
- { XKB_KEY_Delete, XKB_ANY_MOD, "\033[3~", +1, 0},
- { XKB_KEY_BackSpace, XKB_NO_MOD, "\177", 0, 0},
- { XKB_KEY_BackSpace, Mod1Mask, "\033\177", 0, 0},
- { XKB_KEY_Home, ShiftMask, "\033[2J", 0, -1},
- { XKB_KEY_Home, ShiftMask, "\033[1;2H", 0, +1},
- { XKB_KEY_Home, XKB_ANY_MOD, "\033[H", 0, -1},
- { XKB_KEY_Home, XKB_ANY_MOD, "\033[1~", 0, +1},
- { XKB_KEY_End, ControlMask, "\033[J", -1, 0},
- { XKB_KEY_End, ControlMask, "\033[1;5F", +1, 0},
- { XKB_KEY_End, ShiftMask, "\033[K", -1, 0},
- { XKB_KEY_End, ShiftMask, "\033[1;2F", +1, 0},
- { XKB_KEY_End, XKB_ANY_MOD, "\033[4~", 0, 0},
- { XKB_KEY_Prior, ControlMask, "\033[5;5~", 0, 0},
- { XKB_KEY_Prior, ShiftMask, "\033[5;2~", 0, 0},
- { XKB_KEY_Prior, XKB_ANY_MOD, "\033[5~", 0, 0},
- { XKB_KEY_Next, ControlMask, "\033[6;5~", 0, 0},
- { XKB_KEY_Next, ShiftMask, "\033[6;2~", 0, 0},
- { XKB_KEY_Next, XKB_ANY_MOD, "\033[6~", 0, 0},
- { XKB_KEY_F1, XKB_NO_MOD, "\033OP" , 0, 0},
- { XKB_KEY_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
- { XKB_KEY_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
- { XKB_KEY_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
- { XKB_KEY_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
- { XKB_KEY_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
- { XKB_KEY_F2, XKB_NO_MOD, "\033OQ" , 0, 0},
- { XKB_KEY_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
- { XKB_KEY_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
- { XKB_KEY_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
- { XKB_KEY_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
- { XKB_KEY_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
- { XKB_KEY_F3, XKB_NO_MOD, "\033OR" , 0, 0},
- { XKB_KEY_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
- { XKB_KEY_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
- { XKB_KEY_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
- { XKB_KEY_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
- { XKB_KEY_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
- { XKB_KEY_F4, XKB_NO_MOD, "\033OS" , 0, 0},
- { XKB_KEY_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
- { XKB_KEY_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
- { XKB_KEY_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
- { XKB_KEY_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
- { XKB_KEY_F5, XKB_NO_MOD, "\033[15~", 0, 0},
- { XKB_KEY_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
- { XKB_KEY_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
- { XKB_KEY_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
- { XKB_KEY_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
- { XKB_KEY_F6, XKB_NO_MOD, "\033[17~", 0, 0},
- { XKB_KEY_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
- { XKB_KEY_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
- { XKB_KEY_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
- { XKB_KEY_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
- { XKB_KEY_F7, XKB_NO_MOD, "\033[18~", 0, 0},
- { XKB_KEY_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
- { XKB_KEY_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
- { XKB_KEY_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
- { XKB_KEY_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
- { XKB_KEY_F8, XKB_NO_MOD, "\033[19~", 0, 0},
- { XKB_KEY_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
- { XKB_KEY_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
- { XKB_KEY_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
- { XKB_KEY_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
- { XKB_KEY_F9, XKB_NO_MOD, "\033[20~", 0, 0},
- { XKB_KEY_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
- { XKB_KEY_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
- { XKB_KEY_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
- { XKB_KEY_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
- { XKB_KEY_F10, XKB_NO_MOD, "\033[21~", 0, 0},
- { XKB_KEY_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
- { XKB_KEY_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
- { XKB_KEY_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
- { XKB_KEY_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
- { XKB_KEY_F11, XKB_NO_MOD, "\033[23~", 0, 0},
- { XKB_KEY_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
- { XKB_KEY_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
- { XKB_KEY_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
- { XKB_KEY_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
- { XKB_KEY_F12, XKB_NO_MOD, "\033[24~", 0, 0},
- { XKB_KEY_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
- { XKB_KEY_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
- { XKB_KEY_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
- { XKB_KEY_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
- { XKB_KEY_F13, XKB_NO_MOD, "\033[1;2P", 0, 0},
- { XKB_KEY_F14, XKB_NO_MOD, "\033[1;2Q", 0, 0},
- { XKB_KEY_F15, XKB_NO_MOD, "\033[1;2R", 0, 0},
- { XKB_KEY_F16, XKB_NO_MOD, "\033[1;2S", 0, 0},
- { XKB_KEY_F17, XKB_NO_MOD, "\033[15;2~", 0, 0},
- { XKB_KEY_F18, XKB_NO_MOD, "\033[17;2~", 0, 0},
- { XKB_KEY_F19, XKB_NO_MOD, "\033[18;2~", 0, 0},
- { XKB_KEY_F20, XKB_NO_MOD, "\033[19;2~", 0, 0},
- { XKB_KEY_F21, XKB_NO_MOD, "\033[20;2~", 0, 0},
- { XKB_KEY_F22, XKB_NO_MOD, "\033[21;2~", 0, 0},
- { XKB_KEY_F23, XKB_NO_MOD, "\033[23;2~", 0, 0},
- { XKB_KEY_F24, XKB_NO_MOD, "\033[24;2~", 0, 0},
- { XKB_KEY_F25, XKB_NO_MOD, "\033[1;5P", 0, 0},
- { XKB_KEY_F26, XKB_NO_MOD, "\033[1;5Q", 0, 0},
- { XKB_KEY_F27, XKB_NO_MOD, "\033[1;5R", 0, 0},
- { XKB_KEY_F28, XKB_NO_MOD, "\033[1;5S", 0, 0},
- { XKB_KEY_F29, XKB_NO_MOD, "\033[15;5~", 0, 0},
- { XKB_KEY_F30, XKB_NO_MOD, "\033[17;5~", 0, 0},
- { XKB_KEY_F31, XKB_NO_MOD, "\033[18;5~", 0, 0},
- { XKB_KEY_F32, XKB_NO_MOD, "\033[19;5~", 0, 0},
- { XKB_KEY_F33, XKB_NO_MOD, "\033[20;5~", 0, 0},
- { XKB_KEY_F34, XKB_NO_MOD, "\033[21;5~", 0, 0},
- { XKB_KEY_F35, XKB_NO_MOD, "\033[23;5~", 0, 0},
-};
-
-/*
- * Selection types' masks.
- * Use the same masks as usual.
- * Button1Mask is always unset, to make masks match between ButtonPress.
- * ButtonRelease and MotionNotify.
- * If no match is found, regular selection is used.
- */
-static uint selmasks[] = {
- [SEL_RECTANGULAR] = Mod1Mask,
-};
-
-/*
- * Printable characters in ASCII, used to estimate the advance width
- * of single wide characters.
- */
-static byte ascii_printable[] =
- " !\"#$%&'()*+,-./0123456789:;<=>?"
- "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
- "`abcdefghijklmnopqrstuvwxyz{|}~";
diff --git a/sys/cmd/term/rules.mk b/sys/cmd/term/rules.mk
deleted file mode 100644
index 17043a1..0000000
--- a/sys/cmd/term/rules.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-include share/push.mk
-# Iterate through subdirectory tree
-
-# Local sources
-SRCS_$(d) := $(d)/term.c $(d)/wl.c $(d)/xdg-shell.c #$(d)/x.c
-BINS_$(d) := $(d)/term
-
-include share/paths.mk
-
-# Local rules
-
-include share/dynamic.mk
-$(BINS_$(d)): TCINCS := `pkg-config --cflags wayland-client` \
- `pkg-config --cflags fontconfig` \
- `pkg-config --cflags freetype2`
-$(BINS_$(d)): TCLIBS := -L/usr/lib -lm -lrt -lutil \
- `pkg-config --libs wayland-client` \
- `pkg-config --libs fontconfig`\
- `pkg-config --libs freetype2`\
- $(OBJ_DIR)/libn/libn.a
-
-$(BINS_$(d)): $(OBJS_$(d)) $(TCLIBS)
- $(COMPLINK)
-
-include share/pop.mk
diff --git a/sys/cmd/term/term.c b/sys/cmd/term/term.c
deleted file mode 100644
index 7bac567..0000000
--- a/sys/cmd/term/term.c
+++ /dev/null
@@ -1,2590 +0,0 @@
-/* See LICENSE for license details. */
-#include <u.h>
-#include <libn.h>
-
-#include "term.h"
-#include "win.h"
-
-#if defined(__linux)
- #include <pty.h>
-#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
- #include <util.h>
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #include <libutil.h>
-#endif
-
-/* arbitrary sizes */
-#define ESC_BUF_SIZ (128*UTFmax)
-#define ESC_ARG_SIZ 16
-#define STR_BUF_SIZ ESC_BUF_SIZ
-#define STR_ARG_SIZ ESC_ARG_SIZ
-
-/* macros */
-#define IS_SET(flag) ((term.mode & (flag)) != 0)
-#define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == 0x7f)
-#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
-#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
-#define ISDELIM(u) (u && wcschr(worddelimiters, u))
-
-enum term_mode
-{
- MODE_WRAP = 1 << 0,
- MODE_INSERT = 1 << 1,
- MODE_ALTSCREEN = 1 << 2,
- MODE_CRLF = 1 << 3,
- MODE_ECHO = 1 << 4,
- MODE_PRINT = 1 << 5,
- MODE_UTF8 = 1 << 6,
- MODE_SIXEL = 1 << 7,
-};
-
-enum cursor_movement
-{
- CURSOR_SAVE,
- CURSOR_LOAD
-};
-
-enum cursor_state
-{
- CURSOR_DEFAULT = 0,
- CURSOR_WRAPNEXT = 1,
- CURSOR_ORIGIN = 2
-};
-
-enum charset
-{
- CS_GRAPHIC0,
- CS_GRAPHIC1,
- CS_UK,
- CS_USA,
- CS_MULTI,
- CS_GER,
- CS_FIN
-};
-
-enum escape_state
-{
- ESC_START = 1,
- ESC_CSI = 2,
- ESC_STR = 4, /* OSC, PM, APC */
- ESC_ALTCHARSET = 8,
- ESC_STR_END = 16, /* a final string was encountered */
- ESC_TEST = 32, /* Enter in test mode */
- ESC_UTF8 = 64,
- ESC_DCS =128,
-};
-
-typedef struct {
- Glyph attr; /* current char attributes */
- int x;
- int y;
- char state;
-} TCursor;
-
-typedef struct {
- int mode;
- int type;
- int snap;
- /*
- * Selection variables:
- * nb – normalized coordinates of the beginning of the selection
- * ne – normalized coordinates of the end of the selection
- * ob – original coordinates of the beginning of the selection
- * oe – original coordinates of the end of the selection
- */
- struct {
- int x, y;
- } nb, ne, ob, oe;
-
- int alt;
-} Selection;
-
-/* Internal representation of the screen */
-typedef struct {
- int row; /* nb row */
- int col; /* nb col */
- Line *line; /* screen */
- Line *alt; /* alternate screen */
- int *dirty; /* dirtyness of lines */
- TCursor c; /* cursor */
- int ocx; /* old cursor col */
- int ocy; /* old cursor row */
- int top; /* top scroll limit */
- int bot; /* bottom scroll limit */
- int mode; /* terminal mode flags */
- int esc; /* escape state flags */
- char trantbl[4]; /* charset table translation */
- int charset; /* current charset */
- int icharset; /* selected charset for sequence */
- int *tabs;
- rune lastc; /* last printed char outside of sequence, 0 if control */
-} Term;
-
-/* CSI Escape sequence structs */
-/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
-typedef struct {
- char buf[ESC_BUF_SIZ]; /* raw string */
- size_t len; /* raw string length */
- char priv;
- int arg[ESC_ARG_SIZ];
- int narg; /* nb of args */
- char mode[2];
-} CSIEscape;
-
-/* STR Escape sequence structs */
-/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
-typedef struct {
- char type; /* ESC type ... */
- char *buf; /* allocated raw string */
- size_t siz; /* allocation size */
- size_t len; /* raw string length */
- char *args[STR_ARG_SIZ];
- int narg; /* nb of args */
-} STREscape;
-
-static void execsh(char *, char **);
-static void stty(char **);
-static void sigchld(int);
-static void ttywriteraw(const char *, size_t);
-
-static void csidump(void);
-static void csihandle(void);
-static void csiparse(void);
-static void csireset(void);
-static int eschandle(ubyte);
-static void strdump(void);
-static void strhandle(void);
-static void strparse(void);
-static void strreset(void);
-
-static void tprinter(char *, size_t);
-static void tdumpsel(void);
-static void tdumpline(int);
-static void tdump(void);
-static void tclearregion(int, int, int, int);
-static void tcursor(int);
-static void tdeletechar(int);
-static void tdeleteline(int);
-static void tinsertblank(int);
-static void tinsertblankline(int);
-static int tlinelen(int);
-static void tmoveto(int, int);
-static void tmoveato(int, int);
-static void tnewline(int);
-static void tputtab(int);
-static void tputc(rune);
-static void treset(void);
-static void tscrollup(int, int);
-static void tscrolldown(int, int);
-static void tsetattr(int *, int);
-static void tsetchar(rune, Glyph *, int, int);
-static void tsetdirt(int, int);
-static void tsetscroll(int, int);
-static void tswapscreen(void);
-static void tsetmode(int, int, int *, int);
-static int twrite(const char *, int, int);
-static void tfulldirt(void);
-static void tcontrolcode(ubyte);
-static void tdectest(char );
-static void tdefutf8(char);
-static int32_t tdefcolor(int *, int *, int);
-static void tdeftran(char);
-static void tstrsequence(ubyte);
-
-static void drawregion(int, int, int, int);
-
-static void selnormalize(void);
-static void selscroll(int, int);
-static void selsnap(int *, int *, int);
-
-static size_t utf8decode(const char *, rune *, size_t);
-static rune utf8decodebyte(char, size_t *);
-static char utf8encodebyte(rune, size_t);
-static size_t utf8validate(rune *, size_t);
-
-static char *base64dec(const char *);
-static char base64dec_getc(const char **);
-
-static ssize_t xwrite(int, const char *, size_t);
-
-/* Globals */
-static Term term;
-static Selection sel;
-static CSIEscape csiescseq;
-static STREscape strescseq;
-static int iofd = 1;
-static int cmdfd;
-static pid_t pid;
-
-static ubyte utfbyte[UTFmax + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
-static ubyte utfmask[UTFmax + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static rune utfmin[UTFmax + 1] = { 0, 0, 0x80, 0x800, 0x10000};
-static rune utfmax[UTFmax + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
-
-ssize_t
-xwrite(int fd, const char *s, size_t len)
-{
- size_t aux = len;
- ssize_t r;
-
- while (len > 0) {
- r = write(fd, s, len);
- if (r < 0)
- return r;
- len -= r;
- s += r;
- }
-
- return aux;
-}
-
-void *
-xmalloc(size_t len)
-{
- void *p;
-
- if (!(p = malloc(len)))
- panicf("malloc failure");
-
- return p;
-}
-
-void *
-xrealloc(void *p, size_t len)
-{
- if ((p = realloc(p, len)) == nil)
- panicf("realloc failure");
-
- return p;
-}
-
-char *
-xstrdup(char *s)
-{
- if ((s = strdup(s)) == nil)
- panicf("strdup failure");
-
- return s;
-}
-
-size_t
-utf8decode(const char *c, rune *u, size_t clen)
-{
- size_t i, j, len, type;
- rune udecoded;
-
- *u = RuneErr;
- if (!clen)
- return 0;
- udecoded = utf8decodebyte(c[0], &len);
- if (!BETWEEN(len, 1, UTFmax))
- return 1;
- for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
- udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
- if (type != 0)
- return j;
- }
- if (j < len)
- return 0;
- *u = udecoded;
- utf8validate(u, len);
-
- return len;
-}
-
-rune
-utf8decodebyte(char c, size_t *i)
-{
- for (*i = 0; *i < arrlen(utfmask); ++(*i))
- if (((ubyte)c & utfmask[*i]) == utfbyte[*i])
- return (ubyte)c & ~utfmask[*i];
-
- return 0;
-}
-
-size_t
-utf8encode(rune u, char *c)
-{
- size_t len, i;
-
- len = utf8validate(&u, 0);
- if (len > UTFmax)
- return 0;
-
- for (i = len - 1; i != 0; --i) {
- c[i] = utf8encodebyte(u, 0);
- u >>= 6;
- }
- c[0] = utf8encodebyte(u, len);
-
- return len;
-}
-
-char
-utf8encodebyte(rune u, size_t i)
-{
- return utfbyte[i] | (u & ~utfmask[i]);
-}
-
-size_t
-utf8validate(rune *u, size_t i)
-{
- if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
- *u = RuneErr;
- for (i = 1; *u > utfmax[i]; ++i)
- ;
-
- return i;
-}
-
-static const char base64_digits[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0,
- 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, 0, -1, 0, 0, 0, 0, 1,
- 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 0, 0, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-char
-base64dec_getc(const char **src)
-{
- while (**src && !isprint(**src))
- (*src)++;
- return **src ? *((*src)++) : '='; /* emulate padding if string ends */
-}
-
-char *
-base64dec(const char *src)
-{
- size_t in_len = strlen(src);
- char *result, *dst;
-
- if (in_len % 4)
- in_len += 4 - (in_len % 4);
- result = dst = xmalloc(in_len / 4 * 3 + 1);
- while (*src) {
- int a = base64_digits[(unsigned char) base64dec_getc(&src)];
- int b = base64_digits[(unsigned char) base64dec_getc(&src)];
- int c = base64_digits[(unsigned char) base64dec_getc(&src)];
- int d = base64_digits[(unsigned char) base64dec_getc(&src)];
-
- /* invalid input. 'a' can be -1, e.g. if src is "\n" (c-str) */
- if (a == -1 || b == -1)
- break;
-
- *dst++ = (a << 2) | ((b & 0x30) >> 4);
- if (c == -1)
- break;
- *dst++ = ((b & 0x0f) << 4) | ((c & 0x3c) >> 2);
- if (d == -1)
- break;
- *dst++ = ((c & 0x03) << 6) | d;
- }
- *dst = '\0';
- return result;
-}
-
-void
-selinit(void)
-{
- sel.mode = SEL_IDLE;
- sel.snap = 0;
- sel.ob.x = -1;
-}
-
-int
-tlinelen(int y)
-{
- int i = term.col;
-
- if (term.line[y][i - 1].mode & ATTR_WRAP)
- return i;
-
- while (i > 0 && term.line[y][i - 1].u == ' ')
- --i;
-
- return i;
-}
-
-void
-selstart(int col, int row, int snap)
-{
- selclear();
- sel.mode = SEL_EMPTY;
- sel.type = SEL_REGULAR;
- sel.alt = IS_SET(MODE_ALTSCREEN);
- sel.snap = snap;
- sel.oe.x = sel.ob.x = col;
- sel.oe.y = sel.ob.y = row;
- selnormalize();
-
- if (sel.snap != 0)
- sel.mode = SEL_READY;
- tsetdirt(sel.nb.y, sel.ne.y);
-}
-
-void
-selextend(int col, int row, int type, int done)
-{
- int oldey, oldex, oldsby, oldsey, oldtype;
-
- if (sel.mode == SEL_IDLE)
- return;
- if (done && sel.mode == SEL_EMPTY) {
- selclear();
- return;
- }
-
- oldey = sel.oe.y;
- oldex = sel.oe.x;
- oldsby = sel.nb.y;
- oldsey = sel.ne.y;
- oldtype = sel.type;
-
- sel.oe.x = col;
- sel.oe.y = row;
- selnormalize();
- sel.type = type;
-
- if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type || sel.mode == SEL_EMPTY)
- tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
-
- sel.mode = done ? SEL_IDLE : SEL_READY;
-}
-
-void
-selnormalize(void)
-{
- int i;
-
- if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
- sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
- sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
- } else {
- sel.nb.x = MIN(sel.ob.x, sel.oe.x);
- sel.ne.x = MAX(sel.ob.x, sel.oe.x);
- }
- sel.nb.y = MIN(sel.ob.y, sel.oe.y);
- sel.ne.y = MAX(sel.ob.y, sel.oe.y);
-
- selsnap(&sel.nb.x, &sel.nb.y, -1);
- selsnap(&sel.ne.x, &sel.ne.y, +1);
-
- /* expand selection over line breaks */
- if (sel.type == SEL_RECTANGULAR)
- return;
- i = tlinelen(sel.nb.y);
- if (i < sel.nb.x)
- sel.nb.x = i;
- if (tlinelen(sel.ne.y) <= sel.ne.x)
- sel.ne.x = term.col - 1;
-}
-
-int
-selected(int x, int y)
-{
- if (sel.mode == SEL_EMPTY || sel.ob.x == -1 ||
- sel.alt != IS_SET(MODE_ALTSCREEN))
- return 0;
-
- if (sel.type == SEL_RECTANGULAR)
- return BETWEEN(y, sel.nb.y, sel.ne.y)
- && BETWEEN(x, sel.nb.x, sel.ne.x);
-
- return BETWEEN(y, sel.nb.y, sel.ne.y)
- && (y != sel.nb.y || x >= sel.nb.x)
- && (y != sel.ne.y || x <= sel.ne.x);
-}
-
-void
-selsnap(int *x, int *y, int direction)
-{
- int newx, newy, xt, yt;
- int delim, prevdelim;
- Glyph *gp, *prevgp;
-
- switch (sel.snap) {
- case SNAP_WORD:
- /*
- * Snap around if the word wraps around at the end or
- * beginning of a line.
- */
- prevgp = &term.line[*y][*x];
- prevdelim = ISDELIM(prevgp->u);
- for (;;) {
- newx = *x + direction;
- newy = *y;
- if (!BETWEEN(newx, 0, term.col - 1)) {
- newy += direction;
- newx = (newx + term.col) % term.col;
- if (!BETWEEN(newy, 0, term.row - 1))
- break;
-
- if (direction > 0)
- yt = *y, xt = *x;
- else
- yt = newy, xt = newx;
- if (!(term.line[yt][xt].mode & ATTR_WRAP))
- break;
- }
-
- if (newx >= tlinelen(newy))
- break;
-
- gp = &term.line[newy][newx];
- delim = ISDELIM(gp->u);
- if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
- || (delim && gp->u != prevgp->u)))
- break;
-
- *x = newx;
- *y = newy;
- prevgp = gp;
- prevdelim = delim;
- }
- break;
- case SNAP_LINE:
- /*
- * Snap around if the the previous line or the current one
- * has set ATTR_WRAP at its end. Then the whole next or
- * previous line will be selected.
- */
- *x = (direction < 0) ? 0 : term.col - 1;
- if (direction < 0) {
- for (; *y > 0; *y += direction) {
- if (!(term.line[*y-1][term.col-1].mode
- & ATTR_WRAP)) {
- break;
- }
- }
- } else if (direction > 0) {
- for (; *y < term.row-1; *y += direction) {
- if (!(term.line[*y][term.col-1].mode
- & ATTR_WRAP)) {
- break;
- }
- }
- }
- break;
- }
-}
-
-char *
-getsel(void)
-{
- char *str, *ptr;
- int y, bufsize, lastx, linelen;
- Glyph *gp, *last;
-
- if (sel.ob.x == -1)
- return nil;
-
- bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTFmax;
- ptr = str = xmalloc(bufsize);
-
- /* append every set & selected glyph to the selection */
- for (y = sel.nb.y; y <= sel.ne.y; y++) {
- if ((linelen = tlinelen(y)) == 0) {
- *ptr++ = '\n';
- continue;
- }
-
- if (sel.type == SEL_RECTANGULAR) {
- gp = &term.line[y][sel.nb.x];
- lastx = sel.ne.x;
- } else {
- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
- lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
- }
- last = &term.line[y][MIN(lastx, linelen-1)];
- while (last >= gp && last->u == ' ')
- --last;
-
- for ( ; gp <= last; ++gp) {
- if (gp->mode & ATTR_WDUMMY)
- continue;
-
- ptr += utf8encode(gp->u, ptr);
- }
-
- /*
- * Copy and pasting of line endings is inconsistent
- * in the inconsistent terminal and GUI world.
- * The best solution seems like to produce '\n' when
- * something is copied from st and convert '\n' to
- * '\r', when something to be pasted is received by
- * st.
- * FIXME: Fix the computer world.
- */
- if ((y < sel.ne.y || lastx >= linelen) &&
- (!(last->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR))
- *ptr++ = '\n';
- }
- *ptr = 0;
- return str;
-}
-
-void
-selclear(void)
-{
- if (sel.ob.x == -1)
- return;
- sel.mode = SEL_IDLE;
- sel.ob.x = -1;
- tsetdirt(sel.nb.y, sel.ne.y);
-}
-
-void
-execsh(char *cmd, char **args)
-{
- char *sh, *prog, *arg;
- const struct passwd *pw;
-
- errno = 0;
- if ((pw = getpwuid(getuid())) == nil) {
- if (errno)
- panicf("getpwuid");
- else
- panicf("who are you");
- }
-
- if ((sh = getenv("SHELL")) == nil)
- sh = (pw->pw_shell[0]) ? pw->pw_shell : cmd;
-
- if (args) {
- prog = args[0];
- arg = nil;
- } else if (scroll) {
- prog = scroll;
- arg = utmp ? utmp : sh;
- } else if (utmp) {
- prog = utmp;
- arg = nil;
- } else {
- prog = sh;
- arg = nil;
- }
- DEFAULT(args, ((char *[]) {prog, arg, nil}));
-
- unsetenv("COLUMNS");
- unsetenv("LINES");
- unsetenv("TERMCAP");
- setenv("LOGNAME", pw->pw_name, 1);
- setenv("USER", pw->pw_name, 1);
- setenv("SHELL", sh, 1);
- setenv("HOME", pw->pw_dir, 1);
- setenv("TERM", termname, 1);
-
- signal(SIGCHLD, SIG_DFL);
- signal(SIGHUP, SIG_DFL);
- signal(SIGINT, SIG_DFL);
- signal(SIGQUIT, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
- signal(SIGALRM, SIG_DFL);
-
- execvp(prog, args);
- _exit(1);
-}
-
-void
-sigchld(int a)
-{
- int stat;
- pid_t p;
-
- if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
- panicf("waiting for pid %hd failed", pid);
-
- if (pid != p)
- return;
-
- if (WIFEXITED(stat) && WEXITSTATUS(stat))
- panicf("child exited with status %d", WEXITSTATUS(stat));
- else if (WIFSIGNALED(stat))
- panicf("child terminated due to signal %d", WTERMSIG(stat));
- _exit(0);
-}
-
-void
-stty(char **args)
-{
- char cmd[_POSIX_ARG_MAX], **p, *q, *s;
- size_t n, siz;
-
- if ((n = strlen(stty_args)) > sizeof(cmd)-1)
- panicf("incorrect stty parameters");
- memcpy(cmd, stty_args, n);
- q = cmd + n;
- siz = sizeof(cmd) - n;
- for (p = args; p && (s = *p); ++p) {
- if ((n = strlen(s)) > siz-1)
- panicf("stty parameter length too long");
- *q++ = ' ';
- memcpy(q, s, n);
- q += n;
- siz -= n + 1;
- }
- *q = '\0';
- if (system(cmd) != 0)
- perror("Couldn't call stty");
-}
-
-int
-ttynew(char *line, char *cmd, char *out, char **args)
-{
- int m, s;
-
- if (out) {
- term.mode |= MODE_PRINT;
- iofd = (!strcmp(out, "-")) ?
- 1 : open(out, O_WRONLY | O_CREAT, 0666);
- if (iofd < 0) {
- fprintf(stderr, "Error opening %s:%s\n",
- out, strerror(errno));
- }
- }
-
- if (line) {
- if ((cmdfd = open(line, O_RDWR)) < 0)
- panicf("open line '%s' failed", line);
- dup2(cmdfd, 0);
- stty(args);
- return cmdfd;
- }
-
- /* seems to work fine on linux, openbsd and freebsd */
- if (openpty(&m, &s, nil, nil, nil) < 0)
- panicf("openpty failed");
-
- switch (pid = fork()) {
- case -1:
- panicf("fork failed");
- break;
- case 0:
- close(iofd);
- setsid(); /* create a new process group */
- dup2(s, 0);
- dup2(s, 1);
- dup2(s, 2);
- if (ioctl(s, TIOCSCTTY, nil) < 0)
- panicf("ioctl TIOCSCTTY failed");
- close(s);
- close(m);
-#ifdef __OpenBSD__
- if (pledge("stdio getpw proc exec", nil) == -1)
- die("pledge\n");
-#endif
- execsh(cmd, args);
- break;
- default:
-#ifdef __OpenBSD__
- if (pledge("stdio rpath tty proc", nil) == -1)
- die("pledge\n");
-#endif
- close(s);
- cmdfd = m;
- signal(SIGCHLD, sigchld);
- break;
- }
- return cmdfd;
-}
-
-size_t
-ttyread(void)
-{
- static char buf[BUFSIZ];
- static int buflen = 0;
- int ret, written;
-
- /* append read bytes to unprocessed bytes */
- ret = read(cmdfd, buf+buflen, arrlen(buf)-buflen);
-
- switch (ret) {
- case 0:
- exit(0);
- case -1:
- panicf("couldn't read from shell");
- default:
- buflen += ret;
- written = twrite(buf, buflen, 0);
- buflen -= written;
- /* keep any incomplete UTF-8 byte sequence for the next call */
- if (buflen > 0)
- memmove(buf, buf + written, buflen);
- return ret;
- }
-}
-
-void
-ttywrite(const char *s, size_t n, int may_echo)
-{
- const char *next;
-
- if (may_echo && IS_SET(MODE_ECHO))
- twrite(s, n, 1);
-
- if (!IS_SET(MODE_CRLF)) {
- ttywriteraw(s, n);
- return;
- }
-
- /* This is similar to how the kernel handles ONLCR for ttys */
- while (n > 0) {
- if (*s == '\r') {
- next = s + 1;
- ttywriteraw("\r\n", 2);
- } else {
- next = memchr(s, '\r', n);
- DEFAULT(next, s + n);
- ttywriteraw(s, next - s);
- }
- n -= next - s;
- s = next;
- }
-}
-
-void
-ttywriteraw(const char *s, size_t n)
-{
- fd_set wfd, rfd;
- ssize_t r;
- size_t lim = 256;
-
- /*
- * Remember that we are using a pty, which might be a modem line.
- * Writing too much will clog the line. That's why we are doing this
- * dance.
- * FIXME: Migrate the world to Plan 9.
- */
- while (n > 0) {
- FD_ZERO(&wfd);
- FD_ZERO(&rfd);
- FD_SET(cmdfd, &wfd);
- FD_SET(cmdfd, &rfd);
-
- /* Check if we can write. */
- if (pselect(cmdfd+1, &rfd, &wfd, nil, nil, nil) < 0) {
- if (errno == EINTR)
- continue;
- panicf("select failed");
- }
- if (FD_ISSET(cmdfd, &wfd)) {
- /*
- * Only write the bytes written by ttywrite() or the
- * default of 256. This seems to be a reasonable value
- * for a serial line. Bigger values might clog the I/O.
- */
- if ((r = write(cmdfd, s, (n < lim)? n : lim)) < 0)
- goto write_error;
- if (r < n) {
- /*
- * We weren't able to write out everything.
- * This means the buffer is getting full
- * again. Empty it.
- */
- if (n < lim)
- lim = ttyread();
- n -= r;
- s += r;
- } else {
- /* All bytes have been written. */
- break;
- }
- }
- if (FD_ISSET(cmdfd, &rfd))
- lim = ttyread();
- }
- return;
-
-write_error:
- panicf("write error on tty");
-}
-
-void
-ttyresize(int tw, int th)
-{
- struct winsize w;
-
- w.ws_row = term.row;
- w.ws_col = term.col;
- w.ws_xpixel = tw;
- w.ws_ypixel = th;
- if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
- fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));
-}
-
-void
-ttyhangup()
-{
- /* Send SIGHUP to shell */
- kill(pid, SIGHUP);
-}
-
-int
-tattrset(int attr)
-{
- int i, j;
-
- for (i = 0; i < term.row-1; i++) {
- for (j = 0; j < term.col-1; j++) {
- if (term.line[i][j].mode & attr)
- return 1;
- }
- }
-
- return 0;
-}
-
-void
-tsetdirt(int top, int bot)
-{
- int i;
-
- LIMIT(top, 0, term.row-1);
- LIMIT(bot, 0, term.row-1);
-
- for (i = top; i <= bot; i++)
- term.dirty[i] = 1;
-}
-
-void
-tsetdirtattr(int attr)
-{
- int i, j;
-
- for (i = 0; i < term.row-1; i++) {
- for (j = 0; j < term.col-1; j++) {
- if (term.line[i][j].mode & attr) {
- tsetdirt(i, i);
- break;
- }
- }
- }
-}
-
-void
-tfulldirt(void)
-{
- tsetdirt(0, term.row-1);
-}
-
-void
-tcursor(int mode)
-{
- static TCursor c[2];
- int alt = IS_SET(MODE_ALTSCREEN);
-
- if (mode == CURSOR_SAVE) {
- c[alt] = term.c;
- } else if (mode == CURSOR_LOAD) {
- term.c = c[alt];
- tmoveto(c[alt].x, c[alt].y);
- }
-}
-
-void
-treset(void)
-{
- uint i;
-
- term.c = (TCursor){{
- .mode = ATTR_NULL,
- .fg = defaultfg,
- .bg = defaultbg
- }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
-
- memset(term.tabs, 0, term.col * sizeof(*term.tabs));
- for (i = tabspaces; i < term.col; i += tabspaces)
- term.tabs[i] = 1;
- term.top = 0;
- term.bot = term.row - 1;
- term.mode = MODE_WRAP|MODE_UTF8;
- memset(term.trantbl, CS_USA, sizeof(term.trantbl));
- term.charset = 0;
-
- for (i = 0; i < 2; i++) {
- tmoveto(0, 0);
- tcursor(CURSOR_SAVE);
- tclearregion(0, 0, term.col-1, term.row-1);
- tswapscreen();
- }
-}
-
-void
-tnew(int col, int row)
-{
- term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
- tresize(col, row);
- treset();
-}
-
-void
-tswapscreen(void)
-{
- Line *tmp = term.line;
-
- term.line = term.alt;
- term.alt = tmp;
- term.mode ^= MODE_ALTSCREEN;
- tfulldirt();
-}
-
-void
-tscrolldown(int orig, int n)
-{
- int i;
- Line temp;
-
- LIMIT(n, 0, term.bot-orig+1);
-
- tsetdirt(orig, term.bot-n);
- tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-
- for (i = term.bot; i >= orig+n; i--) {
- temp = term.line[i];
- term.line[i] = term.line[i-n];
- term.line[i-n] = temp;
- }
-
- selscroll(orig, n);
-}
-
-void
-tscrollup(int orig, int n)
-{
- int i;
- Line temp;
-
- LIMIT(n, 0, term.bot-orig+1);
-
- tclearregion(0, orig, term.col-1, orig+n-1);
- tsetdirt(orig+n, term.bot);
-
- for (i = orig; i <= term.bot-n; i++) {
- temp = term.line[i];
- term.line[i] = term.line[i+n];
- term.line[i+n] = temp;
- }
-
- selscroll(orig, -n);
-}
-
-void
-selscroll(int orig, int n)
-{
- if (sel.ob.x == -1)
- return;
-
- if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) {
- selclear();
- } else if (BETWEEN(sel.nb.y, orig, term.bot)) {
- sel.ob.y += n;
- sel.oe.y += n;
- if (sel.ob.y < term.top || sel.ob.y > term.bot ||
- sel.oe.y < term.top || sel.oe.y > term.bot) {
- selclear();
- } else {
- selnormalize();
- }
- }
-}
-
-void
-tnewline(int first_col)
-{
- int y = term.c.y;
-
- if (y == term.bot) {
- tscrollup(term.top, 1);
- } else {
- y++;
- }
- tmoveto(first_col ? 0 : term.c.x, y);
-}
-
-void
-csiparse(void)
-{
- char *p = csiescseq.buf, *np;
- long int v;
-
- csiescseq.narg = 0;
- if (*p == '?') {
- csiescseq.priv = 1;
- p++;
- }
-
- csiescseq.buf[csiescseq.len] = '\0';
- while (p < csiescseq.buf+csiescseq.len) {
- np = nil;
- v = strtol(p, &np, 10);
- if (np == p)
- v = 0;
- if (v == LONG_MAX || v == LONG_MIN)
- v = -1;
- csiescseq.arg[csiescseq.narg++] = v;
- p = np;
- if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
- break;
- p++;
- }
- csiescseq.mode[0] = *p++;
- csiescseq.mode[1] = (p < csiescseq.buf+csiescseq.len) ? *p : '\0';
-}
-
-/* for absolute user moves, when decom is set */
-void
-tmoveato(int x, int y)
-{
- tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
-}
-
-void
-tmoveto(int x, int y)
-{
- int miny, maxy;
-
- if (term.c.state & CURSOR_ORIGIN) {
- miny = term.top;
- maxy = term.bot;
- } else {
- miny = 0;
- maxy = term.row - 1;
- }
- term.c.state &= ~CURSOR_WRAPNEXT;
- term.c.x = LIMIT(x, 0, term.col-1);
- term.c.y = LIMIT(y, miny, maxy);
-}
-
-void
-tsetchar(rune u, Glyph *attr, int x, int y)
-{
- static char *vt100_0[62] = { /* 0x41 - 0x7e */
- "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
- 0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
- 0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
- 0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
- "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
- "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
- "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
- "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
- };
-
- /*
- * The table is proudly stolen from rxvt.
- */
- if (term.trantbl[term.charset] == CS_GRAPHIC0 &&
- BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
- utf8decode(vt100_0[u - 0x41], &u, UTFmax);
-
- if (term.line[y][x].mode & ATTR_WIDE) {
- if (x+1 < term.col) {
- term.line[y][x+1].u = ' ';
- term.line[y][x+1].mode &= ~ATTR_WDUMMY;
- }
- } else if (term.line[y][x].mode & ATTR_WDUMMY) {
- term.line[y][x-1].u = ' ';
- term.line[y][x-1].mode &= ~ATTR_WIDE;
- }
-
- term.dirty[y] = 1;
- term.line[y][x] = *attr;
- term.line[y][x].u = u;
-}
-
-void
-tclearregion(int x1, int y1, int x2, int y2)
-{
- int x, y, temp;
- Glyph *gp;
-
- if (x1 > x2)
- temp = x1, x1 = x2, x2 = temp;
- if (y1 > y2)
- temp = y1, y1 = y2, y2 = temp;
-
- LIMIT(x1, 0, term.col-1);
- LIMIT(x2, 0, term.col-1);
- LIMIT(y1, 0, term.row-1);
- LIMIT(y2, 0, term.row-1);
-
- for (y = y1; y <= y2; y++) {
- term.dirty[y] = 1;
- for (x = x1; x <= x2; x++) {
- gp = &term.line[y][x];
- if (selected(x, y))
- selclear();
- gp->fg = term.c.attr.fg;
- gp->bg = term.c.attr.bg;
- gp->mode = 0;
- gp->u = ' ';
- }
- }
-}
-
-void
-tdeletechar(int n)
-{
- int dst, src, size;
- Glyph *line;
-
- LIMIT(n, 0, term.col - term.c.x);
-
- dst = term.c.x;
- src = term.c.x + n;
- size = term.col - src;
- line = term.line[term.c.y];
-
- memmove(&line[dst], &line[src], size * sizeof(Glyph));
- tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
-}
-
-void
-tinsertblank(int n)
-{
- int dst, src, size;
- Glyph *line;
-
- LIMIT(n, 0, term.col - term.c.x);
-
- dst = term.c.x + n;
- src = term.c.x;
- size = term.col - dst;
- line = term.line[term.c.y];
-
- memmove(&line[dst], &line[src], size * sizeof(Glyph));
- tclearregion(src, term.c.y, dst - 1, term.c.y);
-}
-
-void
-tinsertblankline(int n)
-{
- if (BETWEEN(term.c.y, term.top, term.bot))
- tscrolldown(term.c.y, n);
-}
-
-void
-tdeleteline(int n)
-{
- if (BETWEEN(term.c.y, term.top, term.bot))
- tscrollup(term.c.y, n);
-}
-
-int32_t
-tdefcolor(int *attr, int *npar, int l)
-{
- int32_t idx = -1;
- uint r, g, b;
-
- switch (attr[*npar + 1]) {
- case 2: /* direct color in RGB space */
- if (*npar + 4 >= l) {
- fprintf(stderr,
- "erresc(38): Incorrect number of parameters (%d)\n",
- *npar);
- break;
- }
- r = attr[*npar + 2];
- g = attr[*npar + 3];
- b = attr[*npar + 4];
- *npar += 4;
- if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
- fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n",
- r, g, b);
- else
- idx = TRUECOLOR(r, g, b);
- break;
- case 5: /* indexed color */
- if (*npar + 2 >= l) {
- fprintf(stderr,
- "erresc(38): Incorrect number of parameters (%d)\n",
- *npar);
- break;
- }
- *npar += 2;
- if (!BETWEEN(attr[*npar], 0, 255))
- fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
- else
- idx = attr[*npar];
- break;
- case 0: /* implemented defined (only foreground) */
- case 1: /* transparent */
- case 3: /* direct color in CMY space */
- case 4: /* direct color in CMYK space */
- default:
- fprintf(stderr,
- "erresc(38): gfx attr %d unknown\n", attr[*npar]);
- break;
- }
-
- return idx;
-}
-
-void
-tsetattr(int *attr, int l)
-{
- int i;
- int32_t idx;
-
- for (i = 0; i < l; i++) {
- switch (attr[i]) {
- case 0:
- term.c.attr.mode &= ~(
- ATTR_BOLD |
- ATTR_FAINT |
- ATTR_ITALIC |
- ATTR_UNDERLINE |
- ATTR_BLINK |
- ATTR_REVERSE |
- ATTR_INVISIBLE |
- ATTR_STRUCK );
- term.c.attr.fg = defaultfg;
- term.c.attr.bg = defaultbg;
- break;
- case 1:
- term.c.attr.mode |= ATTR_BOLD;
- break;
- case 2:
- term.c.attr.mode |= ATTR_FAINT;
- break;
- case 3:
- term.c.attr.mode |= ATTR_ITALIC;
- break;
- case 4:
- term.c.attr.mode |= ATTR_UNDERLINE;
- break;
- case 5: /* slow blink */
- /* FALLTHROUGH */
- case 6: /* rapid blink */
- term.c.attr.mode |= ATTR_BLINK;
- break;
- case 7:
- term.c.attr.mode |= ATTR_REVERSE;
- break;
- case 8:
- term.c.attr.mode |= ATTR_INVISIBLE;
- break;
- case 9:
- term.c.attr.mode |= ATTR_STRUCK;
- break;
- case 22:
- term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT);
- break;
- case 23:
- term.c.attr.mode &= ~ATTR_ITALIC;
- break;
- case 24:
- term.c.attr.mode &= ~ATTR_UNDERLINE;
- break;
- case 25:
- term.c.attr.mode &= ~ATTR_BLINK;
- break;
- case 27:
- term.c.attr.mode &= ~ATTR_REVERSE;
- break;
- case 28:
- term.c.attr.mode &= ~ATTR_INVISIBLE;
- break;
- case 29:
- term.c.attr.mode &= ~ATTR_STRUCK;
- break;
- case 38:
- if ((idx = tdefcolor(attr, &i, l)) >= 0)
- term.c.attr.fg = idx;
- break;
- case 39:
- term.c.attr.fg = defaultfg;
- break;
- case 48:
- if ((idx = tdefcolor(attr, &i, l)) >= 0)
- term.c.attr.bg = idx;
- break;
- case 49:
- term.c.attr.bg = defaultbg;
- break;
- default:
- if (BETWEEN(attr[i], 30, 37)) {
- term.c.attr.fg = attr[i] - 30;
- } else if (BETWEEN(attr[i], 40, 47)) {
- term.c.attr.bg = attr[i] - 40;
- } else if (BETWEEN(attr[i], 90, 97)) {
- term.c.attr.fg = attr[i] - 90 + 8;
- } else if (BETWEEN(attr[i], 100, 107)) {
- term.c.attr.bg = attr[i] - 100 + 8;
- } else {
- fprintf(stderr,
- "erresc(default): gfx attr %d unknown\n",
- attr[i]);
- csidump();
- }
- break;
- }
- }
-}
-
-void
-tsetscroll(int t, int b)
-{
- int temp;
-
- LIMIT(t, 0, term.row-1);
- LIMIT(b, 0, term.row-1);
- if (t > b) {
- temp = t;
- t = b;
- b = temp;
- }
- term.top = t;
- term.bot = b;
-}
-
-void
-tsetmode(int priv, int set, int *args, int narg)
-{
- int alt, *lim;
-
- for (lim = args + narg; args < lim; ++args) {
- if (priv) {
- switch (*args) {
- case 1: /* DECCKM -- Cursor key */
- wsetmode(set, MODE_APPCURSOR);
- break;
- case 5: /* DECSCNM -- Reverse video */
- wsetmode(set, MODE_REVERSE);
- break;
- case 6: /* DECOM -- Origin */
- MODBIT(term.c.state, set, CURSOR_ORIGIN);
- tmoveato(0, 0);
- break;
- case 7: /* DECAWM -- Auto wrap */
- MODBIT(term.mode, set, MODE_WRAP);
- break;
- case 0: /* Error (IGNORED) */
- case 2: /* DECANM -- ANSI/VT52 (IGNORED) */
- case 3: /* DECCOLM -- Column (IGNORED) */
- case 4: /* DECSCLM -- Scroll (IGNORED) */
- case 8: /* DECARM -- Auto repeat (IGNORED) */
- case 18: /* DECPFF -- Printer feed (IGNORED) */
- case 19: /* DECPEX -- Printer extent (IGNORED) */
- case 42: /* DECNRCM -- National characters (IGNORED) */
- case 12: /* att610 -- Start blinking cursor (IGNORED) */
- break;
- case 25: /* DECTCEM -- Text Cursor Enable Mode */
- wsetmode(!set, MODE_HIDE);
- break;
- case 9: /* X10 mouse compatibility mode */
- wsetpointermotion(0);
- wsetmode(0, MODE_MOUSE);
- wsetmode(set, MODE_MOUSEX10);
- break;
- case 1000: /* 1000: report button press */
- wsetpointermotion(0);
- wsetmode(0, MODE_MOUSE);
- wsetmode(set, MODE_MOUSEBTN);
- break;
- case 1002: /* 1002: report motion on button press */
- wsetpointermotion(0);
- wsetmode(0, MODE_MOUSE);
- wsetmode(set, MODE_MOUSEMOTION);
- break;
- case 1003: /* 1003: enable all mouse motions */
- wsetpointermotion(set);
- wsetmode(0, MODE_MOUSE);
- wsetmode(set, MODE_MOUSEMANY);
- break;
- case 1004: /* 1004: send focus events to tty */
- wsetmode(set, MODE_FOCUS);
- break;
- case 1006: /* 1006: extended reporting mode */
- wsetmode(set, MODE_MOUSESGR);
- break;
- case 1034:
- wsetmode(set, MODE_8BIT);
- break;
- case 1049: /* swap screen & set/restore cursor as xterm */
- if (!allowaltscreen)
- break;
- tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
- /* FALLTHROUGH */
- case 47: /* swap screen */
- case 1047:
- if (!allowaltscreen)
- break;
- alt = IS_SET(MODE_ALTSCREEN);
- if (alt) {
- tclearregion(0, 0, term.col-1,
- term.row-1);
- }
- if (set ^ alt) /* set is always 1 or 0 */
- tswapscreen();
- if (*args != 1049)
- break;
- /* FALLTHROUGH */
- case 1048:
- tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
- break;
- case 2004: /* 2004: bracketed paste mode */
- wsetmode(set, MODE_BRCKTPASTE);
- break;
- /* Not implemented mouse modes. See comments there. */
- case 1001: /* mouse highlight mode; can hang the
- terminal by design when implemented. */
- case 1005: /* UTF-8 mouse mode; will confuse
- applications not supporting UTF-8
- and luit. */
- case 1015: /* urxvt mangled mouse mode; incompatible
- and can be mistaken for other control
- codes. */
- break;
- default:
- fprintf(stderr,
- "erresc: unknown private set/reset mode %d\n",
- *args);
- break;
- }
- } else {
- switch (*args) {
- case 0: /* Error (IGNORED) */
- break;
- case 2:
- wsetmode(set, MODE_KBDLOCK);
- break;
- case 4: /* IRM -- Insertion-replacement */
- MODBIT(term.mode, set, MODE_INSERT);
- break;
- case 12: /* SRM -- Send/Receive */
- MODBIT(term.mode, !set, MODE_ECHO);
- break;
- case 20: /* LNM -- Linefeed/new line */
- MODBIT(term.mode, set, MODE_CRLF);
- break;
- default:
- fprintf(stderr,
- "erresc: unknown set/reset mode %d\n",
- *args);
- break;
- }
- }
- }
-}
-
-void
-csihandle(void)
-{
- char buf[40];
- int len;
-
- switch (csiescseq.mode[0]) {
- default:
- unknown:
- fprintf(stderr, "erresc: unknown csi ");
- csidump();
- /* die(""); */
- break;
- case '@': /* ICH -- Insert <n> blank char */
- DEFAULT(csiescseq.arg[0], 1);
- tinsertblank(csiescseq.arg[0]);
- break;
- case 'A': /* CUU -- Cursor <n> Up */
- DEFAULT(csiescseq.arg[0], 1);
- tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
- break;
- case 'B': /* CUD -- Cursor <n> Down */
- case 'e': /* VPR --Cursor <n> Down */
- DEFAULT(csiescseq.arg[0], 1);
- tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
- break;
- case 'i': /* MC -- Media Copy */
- switch (csiescseq.arg[0]) {
- case 0:
- tdump();
- break;
- case 1:
- tdumpline(term.c.y);
- break;
- case 2:
- tdumpsel();
- break;
- case 4:
- term.mode &= ~MODE_PRINT;
- break;
- case 5:
- term.mode |= MODE_PRINT;
- break;
- }
- break;
- case 'c': /* DA -- Device Attributes */
- if (csiescseq.arg[0] == 0)
- ttywrite(vtiden, strlen(vtiden), 0);
- break;
- case 'b': /* REP -- if last char is printable print it <n> more times */
- DEFAULT(csiescseq.arg[0], 1);
- if (term.lastc)
- while (csiescseq.arg[0]-- > 0)
- tputc(term.lastc);
- break;
- case 'C': /* CUF -- Cursor <n> Forward */
- case 'a': /* HPR -- Cursor <n> Forward */
- DEFAULT(csiescseq.arg[0], 1);
- tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
- break;
- case 'D': /* CUB -- Cursor <n> Backward */
- DEFAULT(csiescseq.arg[0], 1);
- tmoveto(term.c.x-csiescseq.arg[0], term.c.y);
- break;
- case 'E': /* CNL -- Cursor <n> Down and first col */
- DEFAULT(csiescseq.arg[0], 1);
- tmoveto(0, term.c.y+csiescseq.arg[0]);
- break;
- case 'F': /* CPL -- Cursor <n> Up and first col */
- DEFAULT(csiescseq.arg[0], 1);
- tmoveto(0, term.c.y-csiescseq.arg[0]);
- break;
- case 'g': /* TBC -- Tabulation clear */
- switch (csiescseq.arg[0]) {
- case 0: /* clear current tab stop */
- term.tabs[term.c.x] = 0;
- break;
- case 3: /* clear all the tabs */
- memset(term.tabs, 0, term.col * sizeof(*term.tabs));
- break;
- default:
- goto unknown;
- }
- break;
- case 'G': /* CHA -- Move to <col> */
- case '`': /* HPA */
- DEFAULT(csiescseq.arg[0], 1);
- tmoveto(csiescseq.arg[0]-1, term.c.y);
- break;
- case 'H': /* CUP -- Move to <row> <col> */
- case 'f': /* HVP */
- DEFAULT(csiescseq.arg[0], 1);
- DEFAULT(csiescseq.arg[1], 1);
- tmoveato(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
- break;
- case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
- DEFAULT(csiescseq.arg[0], 1);
- tputtab(csiescseq.arg[0]);
- break;
- case 'J': /* ED -- Clear screen */
- switch (csiescseq.arg[0]) {
- case 0: /* below */
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
- if (term.c.y < term.row-1) {
- tclearregion(0, term.c.y+1, term.col-1,
- term.row-1);
- }
- break;
- case 1: /* above */
- if (term.c.y > 1)
- tclearregion(0, 0, term.col-1, term.c.y-1);
- tclearregion(0, term.c.y, term.c.x, term.c.y);
- break;
- case 2: /* all */
- tclearregion(0, 0, term.col-1, term.row-1);
- break;
- default:
- goto unknown;
- }
- break;
- case 'K': /* EL -- Clear line */
- switch (csiescseq.arg[0]) {
- case 0: /* right */
- tclearregion(term.c.x, term.c.y, term.col-1,
- term.c.y);
- break;
- case 1: /* left */
- tclearregion(0, term.c.y, term.c.x, term.c.y);
- break;
- case 2: /* all */
- tclearregion(0, term.c.y, term.col-1, term.c.y);
- break;
- }
- break;
- case 'S': /* SU -- Scroll <n> line up */
- DEFAULT(csiescseq.arg[0], 1);
- tscrollup(term.top, csiescseq.arg[0]);
- break;
- case 'T': /* SD -- Scroll <n> line down */
- DEFAULT(csiescseq.arg[0], 1);
- tscrolldown(term.top, csiescseq.arg[0]);
- break;
- case 'L': /* IL -- Insert <n> blank lines */
- DEFAULT(csiescseq.arg[0], 1);
- tinsertblankline(csiescseq.arg[0]);
- break;
- case 'l': /* RM -- Reset Mode */
- tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg);
- break;
- case 'M': /* DL -- Delete <n> lines */
- DEFAULT(csiescseq.arg[0], 1);
- tdeleteline(csiescseq.arg[0]);
- break;
- case 'X': /* ECH -- Erase <n> char */
- DEFAULT(csiescseq.arg[0], 1);
- tclearregion(term.c.x, term.c.y,
- term.c.x + csiescseq.arg[0] - 1, term.c.y);
- break;
- case 'P': /* DCH -- Delete <n> char */
- DEFAULT(csiescseq.arg[0], 1);
- tdeletechar(csiescseq.arg[0]);
- break;
- case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
- DEFAULT(csiescseq.arg[0], 1);
- tputtab(-csiescseq.arg[0]);
- break;
- case 'd': /* VPA -- Move to <row> */
- DEFAULT(csiescseq.arg[0], 1);
- tmoveato(term.c.x, csiescseq.arg[0]-1);
- break;
- case 'h': /* SM -- Set terminal mode */
- tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
- break;
- case 'm': /* SGR -- Terminal attribute (color) */
- tsetattr(csiescseq.arg, csiescseq.narg);
- break;
- case 'n': /* DSR – Device Status Report (cursor position) */
- if (csiescseq.arg[0] == 6) {
- len = snprintf(buf, sizeof(buf), "\033[%i;%iR",
- term.c.y+1, term.c.x+1);
- ttywrite(buf, len, 0);
- }
- break;
- case 'r': /* DECSTBM -- Set Scrolling Region */
- if (csiescseq.priv) {
- goto unknown;
- } else {
- DEFAULT(csiescseq.arg[0], 1);
- DEFAULT(csiescseq.arg[1], term.row);
- tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
- tmoveato(0, 0);
- }
- break;
- case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
- tcursor(CURSOR_SAVE);
- break;
- case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
- tcursor(CURSOR_LOAD);
- break;
- case ' ':
- switch (csiescseq.mode[1]) {
- case 'q': /* DECSCUSR -- Set Cursor Style */
- if (wsetcursor(csiescseq.arg[0]))
- goto unknown;
- break;
- default:
- goto unknown;
- }
- break;
- }
-}
-
-void
-csidump(void)
-{
- size_t i;
- uint c;
-
- fprintf(stderr, "ESC[");
- for (i = 0; i < csiescseq.len; i++) {
- c = csiescseq.buf[i] & 0xff;
- if (isprint(c)) {
- putc(c, stderr);
- } else if (c == '\n') {
- fprintf(stderr, "(\\n)");
- } else if (c == '\r') {
- fprintf(stderr, "(\\r)");
- } else if (c == 0x1b) {
- fprintf(stderr, "(\\e)");
- } else {
- fprintf(stderr, "(%02x)", c);
- }
- }
- putc('\n', stderr);
-}
-
-void
-csireset(void)
-{
- memset(&csiescseq, 0, sizeof(csiescseq));
-}
-
-void
-strhandle(void)
-{
- char *p = nil, *dec;
- int j, narg, par;
-
- term.esc &= ~(ESC_STR_END|ESC_STR);
- strparse();
- par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
-
- switch (strescseq.type) {
- case ']': /* OSC -- Operating System Command */
- switch (par) {
- case 0:
- case 1:
- case 2:
- if (narg > 1)
- wsettitle(strescseq.args[1]);
- return;
- case 52:
- if (narg > 2 && allowwindowops) {
- dec = base64dec(strescseq.args[2]);
- if (dec) {
- wsetsel(dec);
- wclipcopy();
- } else {
- fprintf(stderr, "erresc: invalid base64\n");
- }
- }
- return;
- case 4: /* color set */
- if (narg < 3)
- break;
- p = strescseq.args[2];
- /* FALLTHROUGH */
- case 104: /* color reset, here p = nil */
- j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
- if (wsetcolorname(j, p)) {
- if (par == 104 && narg <= 1)
- return; /* color reset without parameter */
- fprintf(stderr, "erresc: invalid color j=%d, p=%s\n",
- j, p ? p : "(null)");
- } else {
- /*
- * TODO if defaultbg color is changed, borders
- * are dirty
- */
- redraw();
- }
- return;
- }
- break;
- case 'k': /* old title set compatibility */
- wsettitle(strescseq.args[0]);
- return;
- case 'P': /* DCS -- Device Control String */
- term.mode |= ESC_DCS;
- case '_': /* APC -- Application Program Command */
- case '^': /* PM -- Privacy Message */
- return;
- }
-
- fprintf(stderr, "erresc: unknown str ");
- strdump();
-}
-
-void
-strparse(void)
-{
- int c;
- char *p = strescseq.buf;
-
- strescseq.narg = 0;
- strescseq.buf[strescseq.len] = '\0';
-
- if (*p == '\0')
- return;
-
- while (strescseq.narg < STR_ARG_SIZ) {
- strescseq.args[strescseq.narg++] = p;
- while ((c = *p) != ';' && c != '\0')
- ++p;
- if (c == '\0')
- return;
- *p++ = '\0';
- }
-}
-
-void
-strdump(void)
-{
- size_t i;
- uint c;
-
- fprintf(stderr, "ESC%c", strescseq.type);
- for (i = 0; i < strescseq.len; i++) {
- c = strescseq.buf[i] & 0xff;
- if (c == '\0') {
- putc('\n', stderr);
- return;
- } else if (isprint(c)) {
- putc(c, stderr);
- } else if (c == '\n') {
- fprintf(stderr, "(\\n)");
- } else if (c == '\r') {
- fprintf(stderr, "(\\r)");
- } else if (c == 0x1b) {
- fprintf(stderr, "(\\e)");
- } else {
- fprintf(stderr, "(%02x)", c);
- }
- }
- fprintf(stderr, "ESC\\\n");
-}
-
-void
-strreset(void)
-{
- strescseq = (STREscape){
- .buf = xrealloc(strescseq.buf, STR_BUF_SIZ),
- .siz = STR_BUF_SIZ,
- };
-}
-
-void
-sendbreak(const Arg *arg)
-{
- if (tcsendbreak(cmdfd, 0))
- perror("Error sending break");
-}
-
-void
-tprinter(char *s, size_t len)
-{
- if (iofd != -1 && xwrite(iofd, s, len) < 0) {
- perror("Error writing to output file");
- close(iofd);
- iofd = -1;
- }
-}
-
-void
-toggleprinter(const Arg *arg)
-{
- term.mode ^= MODE_PRINT;
-}
-
-void
-printscreen(const Arg *arg)
-{
- tdump();
-}
-
-void
-printsel(const Arg *arg)
-{
- tdumpsel();
-}
-
-void
-tdumpsel(void)
-{
- char *ptr;
-
- if ((ptr = getsel())) {
- tprinter(ptr, strlen(ptr));
- free(ptr);
- }
-}
-
-void
-tdumpline(int n)
-{
- char buf[UTFmax];
- Glyph *bp, *end;
-
- bp = &term.line[n][0];
- end = &bp[MIN(tlinelen(n), term.col) - 1];
- if (bp != end || bp->u != ' ') {
- for ( ; bp <= end; ++bp)
- tprinter(buf, utf8encode(bp->u, buf));
- }
- tprinter("\n", 1);
-}
-
-void
-tdump(void)
-{
- int i;
-
- for (i = 0; i < term.row; ++i)
- tdumpline(i);
-}
-
-void
-tputtab(int n)
-{
- uint x = term.c.x;
-
- if (n > 0) {
- while (x < term.col && n--)
- for (++x; x < term.col && !term.tabs[x]; ++x)
- /* nothing */ ;
- } else if (n < 0) {
- while (x > 0 && n++)
- for (--x; x > 0 && !term.tabs[x]; --x)
- /* nothing */ ;
- }
- term.c.x = LIMIT(x, 0, term.col-1);
-}
-
-void
-tdefutf8(char ascii)
-{
- if (ascii == 'G')
- term.mode |= MODE_UTF8;
- else if (ascii == '@')
- term.mode &= ~MODE_UTF8;
-}
-
-void
-tdeftran(char ascii)
-{
- static char cs[] = "0B";
- static int vcs[] = {CS_GRAPHIC0, CS_USA};
- char *p;
-
- if ((p = strchr(cs, ascii)) == nil) {
- fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
- } else {
- term.trantbl[term.icharset] = vcs[p - cs];
- }
-}
-
-void
-tdectest(char c)
-{
- int x, y;
-
- if (c == '8') { /* DEC screen alignment test. */
- for (x = 0; x < term.col; ++x) {
- for (y = 0; y < term.row; ++y)
- tsetchar('E', &term.c.attr, x, y);
- }
- }
-}
-
-void
-tstrsequence(ubyte c)
-{
- strreset();
-
- switch (c) {
- case 0x90: /* DCS -- Device Control String */
- c = 'P';
- term.esc |= ESC_DCS;
- break;
- case 0x9f: /* APC -- Application Program Command */
- c = '_';
- break;
- case 0x9e: /* PM -- Privacy Message */
- c = '^';
- break;
- case 0x9d: /* OSC -- Operating System Command */
- c = ']';
- break;
- }
- strescseq.type = c;
- term.esc |= ESC_STR;
-}
-
-void
-tcontrolcode(ubyte ascii)
-{
- switch (ascii) {
- case '\t': /* HT */
- tputtab(1);
- return;
- case '\b': /* BS */
- tmoveto(term.c.x-1, term.c.y);
- return;
- case '\r': /* CR */
- tmoveto(0, term.c.y);
- return;
- case '\f': /* LF */
- case '\v': /* VT */
- case '\n': /* LF */
- /* go to first col if the mode is set */
- tnewline(IS_SET(MODE_CRLF));
- return;
- case '\a': /* BEL */
- if (term.esc & ESC_STR_END) {
- /* backwards compatibility to xterm */
- strhandle();
- } else {
- wbell();
- }
- break;
- case '\033': /* ESC */
- csireset();
- term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
- term.esc |= ESC_START;
- return;
- case '\016': /* SO (LS1 -- Locking shift 1) */
- case '\017': /* SI (LS0 -- Locking shift 0) */
- term.charset = 1 - (ascii - '\016');
- return;
- case '\032': /* SUB */
- tsetchar('?', &term.c.attr, term.c.x, term.c.y);
- /* FALLTHROUGH */
- case '\030': /* CAN */
- csireset();
- break;
- case '\005': /* ENQ (IGNORED) */
- case '\000': /* NUL (IGNORED) */
- case '\021': /* XON (IGNORED) */
- case '\023': /* XOFF (IGNORED) */
- case 0177: /* DEL (IGNORED) */
- return;
- case 0x80: /* TODO: PAD */
- case 0x81: /* TODO: HOP */
- case 0x82: /* TODO: BPH */
- case 0x83: /* TODO: NBH */
- case 0x84: /* TODO: IND */
- break;
- case 0x85: /* NEL -- Next line */
- tnewline(1); /* always go to first col */
- break;
- case 0x86: /* TODO: SSA */
- case 0x87: /* TODO: ESA */
- break;
- case 0x88: /* HTS -- Horizontal tab stop */
- term.tabs[term.c.x] = 1;
- break;
- case 0x89: /* TODO: HTJ */
- case 0x8a: /* TODO: VTS */
- case 0x8b: /* TODO: PLD */
- case 0x8c: /* TODO: PLU */
- case 0x8d: /* TODO: RI */
- case 0x8e: /* TODO: SS2 */
- case 0x8f: /* TODO: SS3 */
- case 0x91: /* TODO: PU1 */
- case 0x92: /* TODO: PU2 */
- case 0x93: /* TODO: STS */
- case 0x94: /* TODO: CCH */
- case 0x95: /* TODO: MW */
- case 0x96: /* TODO: SPA */
- case 0x97: /* TODO: EPA */
- case 0x98: /* TODO: SOS */
- case 0x99: /* TODO: SGCI */
- break;
- case 0x9a: /* DECID -- Identify Terminal */
- ttywrite(vtiden, strlen(vtiden), 0);
- break;
- case 0x9b: /* TODO: CSI */
- case 0x9c: /* TODO: ST */
- break;
- case 0x90: /* DCS -- Device Control String */
- case 0x9d: /* OSC -- Operating System Command */
- case 0x9e: /* PM -- Privacy Message */
- case 0x9f: /* APC -- Application Program Command */
- tstrsequence(ascii);
- return;
- }
- /* only CAN, SUB, \a and C1 chars interrupt a sequence */
- term.esc &= ~(ESC_STR_END|ESC_STR);
-}
-
-/*
- * returns 1 when the sequence is finished and it hasn't to read
- * more characters for this sequence, otherwise 0
- */
-int
-eschandle(ubyte ascii)
-{
- switch (ascii) {
- case '[':
- term.esc |= ESC_CSI;
- return 0;
- case '#':
- term.esc |= ESC_TEST;
- return 0;
- case '%':
- term.esc |= ESC_UTF8;
- return 0;
- case 'P': /* DCS -- Device Control String */
- case '_': /* APC -- Application Program Command */
- case '^': /* PM -- Privacy Message */
- case ']': /* OSC -- Operating System Command */
- case 'k': /* old title set compatibility */
- tstrsequence(ascii);
- return 0;
- case 'n': /* LS2 -- Locking shift 2 */
- case 'o': /* LS3 -- Locking shift 3 */
- term.charset = 2 + (ascii - 'n');
- break;
- case '(': /* GZD4 -- set primary charset G0 */
- case ')': /* G1D4 -- set secondary charset G1 */
- case '*': /* G2D4 -- set tertiary charset G2 */
- case '+': /* G3D4 -- set quaternary charset G3 */
- term.icharset = ascii - '(';
- term.esc |= ESC_ALTCHARSET;
- return 0;
- case 'D': /* IND -- Linefeed */
- if (term.c.y == term.bot) {
- tscrollup(term.top, 1);
- } else {
- tmoveto(term.c.x, term.c.y+1);
- }
- break;
- case 'E': /* NEL -- Next line */
- tnewline(1); /* always go to first col */
- break;
- case 'H': /* HTS -- Horizontal tab stop */
- term.tabs[term.c.x] = 1;
- break;
- case 'M': /* RI -- Reverse index */
- if (term.c.y == term.top) {
- tscrolldown(term.top, 1);
- } else {
- tmoveto(term.c.x, term.c.y-1);
- }
- break;
- case 'Z': /* DECID -- Identify Terminal */
- ttywrite(vtiden, strlen(vtiden), 0);
- break;
- case 'c': /* RIS -- Reset to initial state */
- treset();
- resettitle();
- wloadcols();
- break;
- case '=': /* DECPAM -- Application keypad */
- wsetmode(1, MODE_APPKEYPAD);
- break;
- case '>': /* DECPNM -- Normal keypad */
- wsetmode(0, MODE_APPKEYPAD);
- break;
- case '7': /* DECSC -- Save Cursor */
- tcursor(CURSOR_SAVE);
- break;
- case '8': /* DECRC -- Restore Cursor */
- tcursor(CURSOR_LOAD);
- break;
- case '\\': /* ST -- String Terminator */
- if (term.esc & ESC_STR_END)
- strhandle();
- break;
- default:
- fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
- (ubyte) ascii, isprint(ascii)? ascii:'.');
- break;
- }
- return 1;
-}
-
-void
-tputc(rune u)
-{
- char c[UTFmax];
- int control;
- int width, len;
- Glyph *gp;
-
- control = ISCONTROL(u);
- if (u < 127 || !IS_SET(MODE_UTF8 | MODE_SIXEL)) {
- c[0] = u;
- width = len = 1;
- } else {
- len = utf8encode(u, c);
- if (!control && (width = wcwidth(u)) == -1)
- width = 1;
- }
-
- if (IS_SET(MODE_PRINT))
- tprinter(c, len);
-
- /*
- * STR sequence must be checked before anything else
- * because it uses all following characters until it
- * receives a ESC, a SUB, a ST or any other C1 control
- * character.
- */
- if (term.esc & ESC_STR) {
- if (u == '\a' || u == 030 || u == 032 || u == 033 ||
- ISCONTROLC1(u)) {
- term.esc &= ~(ESC_START|ESC_STR|ESC_DCS);
- if (IS_SET(MODE_SIXEL)) {
- /* TODO: render sixel */;
- term.mode &= ~MODE_SIXEL;
- return;
- }
- term.esc |= ESC_STR_END;
- goto check_control_code;
- }
-
- if (IS_SET(MODE_SIXEL)) {
- /* TODO: implement sixel mode */
- return;
- }
- if (term.esc&ESC_DCS && strescseq.len == 0 && u == 'q')
- term.mode |= MODE_SIXEL;
-
- if (strescseq.len+len >= strescseq.siz) {
- /*
- * Here is a bug in terminals. If the user never sends
- * some code to stop the str or esc command, then st
- * will stop responding. But this is better than
- * silently failing with unknown characters. At least
- * then users will report back.
- *
- * In the case users ever get fixed, here is the code:
- */
- /*
- * term.esc = 0;
- * strhandle();
- */
- if (strescseq.siz > (SIZE_MAX - UTFmax) / 2)
- return;
- strescseq.siz *= 2;
- strescseq.buf = xrealloc(strescseq.buf, strescseq.siz);
- }
-
- memmove(&strescseq.buf[strescseq.len], c, len);
- strescseq.len += len;
- return;
- }
-
-check_control_code:
- /*
- * Actions of control codes must be performed as soon they arrive
- * because they can be embedded inside a control sequence, and
- * they must not cause conflicts with sequences.
- */
- if (control) {
- tcontrolcode(u);
- /*
- * control codes are not shown ever
- */
- if (!term.esc)
- term.lastc = 0;
- return;
- } else if (term.esc & ESC_START) {
- if (term.esc & ESC_CSI) {
- csiescseq.buf[csiescseq.len++] = u;
- if (BETWEEN(u, 0x40, 0x7E)
- || csiescseq.len >= \
- sizeof(csiescseq.buf)-1) {
- term.esc = 0;
- csiparse();
- csihandle();
- }
- return;
- } else if (term.esc & ESC_UTF8) {
- tdefutf8(u);
- } else if (term.esc & ESC_ALTCHARSET) {
- tdeftran(u);
- } else if (term.esc & ESC_TEST) {
- tdectest(u);
- } else {
- if (!eschandle(u))
- return;
- /* sequence already finished */
- }
- term.esc = 0;
- /*
- * All characters which form part of a sequence are not
- * printed
- */
- return;
- }
- if (selected(term.c.x, term.c.y))
- selclear();
-
- gp = &term.line[term.c.y][term.c.x];
- if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
- gp->mode |= ATTR_WRAP;
- tnewline(1);
- gp = &term.line[term.c.y][term.c.x];
- }
-
- if (IS_SET(MODE_INSERT) && term.c.x+width < term.col)
- memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));
-
- if (term.c.x+width > term.col) {
- tnewline(1);
- gp = &term.line[term.c.y][term.c.x];
- }
-
- tsetchar(u, &term.c.attr, term.c.x, term.c.y);
- term.lastc = u;
-
- if (width == 2) {
- gp->mode |= ATTR_WIDE;
- if (term.c.x+1 < term.col) {
- gp[1].u = '\0';
- gp[1].mode = ATTR_WDUMMY;
- }
- }
- if (term.c.x+width < term.col) {
- tmoveto(term.c.x+width, term.c.y);
- } else {
- term.c.state |= CURSOR_WRAPNEXT;
- }
-}
-
-int
-twrite(const char *buf, int buflen, int show_ctrl)
-{
- int charsize;
- rune u;
- int n;
-
- for (n = 0; n < buflen; n += charsize) {
- if (IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
- /* process a complete utf8 char */
- charsize = utf8decode(buf + n, &u, buflen - n);
- if (charsize == 0)
- break;
- } else {
- u = buf[n] & 0xFF;
- charsize = 1;
- }
- if (show_ctrl && ISCONTROL(u)) {
- if (u & 0x80) {
- u &= 0x7f;
- tputc('^');
- tputc('[');
- } else if (u != '\n' && u != '\r' && u != '\t') {
- u ^= 0x40;
- tputc('^');
- }
- }
- tputc(u);
- }
- return n;
-}
-
-void
-tresize(int col, int row)
-{
- int i;
- int minrow = MIN(row, term.row);
- int mincol = MIN(col, term.col);
- int *bp;
- TCursor c;
-
- if (col < 1 || row < 1) {
- fprintf(stderr,
- "tresize: error resizing to %dx%d\n", col, row);
- return;
- }
-
- /*
- * slide screen to keep cursor where we expect it -
- * tscrollup would work here, but we can optimize to
- * memmove because we're freeing the earlier lines
- */
- for (i = 0; i <= term.c.y - row; i++) {
- free(term.line[i]);
- free(term.alt[i]);
- }
- /* ensure that both src and dst are not nil */
- if (i > 0) {
- memmove(term.line, term.line + i, row * sizeof(Line));
- memmove(term.alt, term.alt + i, row * sizeof(Line));
- }
- for (i += row; i < term.row; i++) {
- free(term.line[i]);
- free(term.alt[i]);
- }
-
- /* resize to new height */
- term.line = xrealloc(term.line, row * sizeof(Line));
- term.alt = xrealloc(term.alt, row * sizeof(Line));
- term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
- term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
-
- /* resize each row to new width, zero-pad if needed */
- for (i = 0; i < minrow; i++) {
- term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
- term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
- }
-
- /* allocate any new rows */
- for (/* i = minrow */; i < row; i++) {
- term.line[i] = xmalloc(col * sizeof(Glyph));
- term.alt[i] = xmalloc(col * sizeof(Glyph));
- }
- if (col > term.col) {
- bp = term.tabs + term.col;
-
- memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
- while (--bp > term.tabs && !*bp)
- /* nothing */ ;
- for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
- *bp = 1;
- }
- /* update terminal size */
- term.col = col;
- term.row = row;
- /* reset scrolling region */
- tsetscroll(0, row-1);
- /* make use of the LIMIT in tmoveto */
- tmoveto(term.c.x, term.c.y);
- /* Clearing both screens (it makes dirty all lines) */
- c = term.c;
- for (i = 0; i < 2; i++) {
- if (mincol < col && 0 < minrow) {
- tclearregion(mincol, 0, col - 1, minrow - 1);
- }
- if (0 < col && minrow < row) {
- tclearregion(0, minrow, col - 1, row - 1);
- }
- tswapscreen();
- tcursor(CURSOR_LOAD);
- }
- term.c = c;
-}
-
-void
-resettitle(void)
-{
- wsettitle(nil);
-}
-
-void
-drawregion(int x1, int y1, int x2, int y2)
-{
- int y;
-
- for (y = y1; y < y2; y++) {
- if (!term.dirty[y])
- continue;
-
- term.dirty[y] = 0;
- wdrawline(term.line[y], x1, y, x2);
- }
-}
-
-void
-draw(void)
-{
- int cx = term.c.x, ocx = term.ocx, ocy = term.ocy;
-
- if (!wstartdraw())
- return;
-
- /* adjust cursor position */
- LIMIT(term.ocx, 0, term.col-1);
- LIMIT(term.ocy, 0, term.row-1);
- if (term.line[term.ocy][term.ocx].mode & ATTR_WDUMMY)
- term.ocx--;
- if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
- cx--;
-
- drawregion(0, 0, term.col, term.row);
- wdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
- term.ocx = cx;
- term.ocy = term.c.y;
- wfinishdraw();
- if (ocx != term.ocx || ocy != term.ocy)
- wximspot(term.ocx, term.ocy);
-}
-
-void
-redraw(void)
-{
- tfulldirt();
- draw();
-}
diff --git a/sys/cmd/term/term.h b/sys/cmd/term/term.h
deleted file mode 100644
index 841f30c..0000000
--- a/sys/cmd/term/term.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#pragma once
-
-/* See LICENSE for license details. */
-#define __USE_XOPEN
-#include <pwd.h>
-#include <wchar.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/wait.h>
-
-/* macros */
-#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
-#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
-#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
-#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
- (a).bg != (b).bg)
-#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
- (t1.tv_nsec-t2.tv_nsec)/1E6)
-#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-
-#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
-#define IS_TRUECOL(x) (1 << 24 & (x))
-
-enum glyph_attribute
-{
- ATTR_NULL = 0,
- ATTR_BOLD = 1 << 0,
- ATTR_FAINT = 1 << 1,
- ATTR_ITALIC = 1 << 2,
- ATTR_UNDERLINE = 1 << 3,
- ATTR_BLINK = 1 << 4,
- ATTR_REVERSE = 1 << 5,
- ATTR_INVISIBLE = 1 << 6,
- ATTR_STRUCK = 1 << 7,
- ATTR_WRAP = 1 << 8,
- ATTR_WIDE = 1 << 9,
- ATTR_WDUMMY = 1 << 10,
- ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
-};
-
-enum selection_mode
-{
- SEL_IDLE = 0,
- SEL_EMPTY = 1,
- SEL_READY = 2
-};
-
-enum selection_type
-{
- SEL_REGULAR = 1,
- SEL_RECTANGULAR = 2
-};
-
-enum selection_snap
-{
- SNAP_WORD = 1,
- SNAP_LINE = 2
-};
-
-#define Glyph Glyph_
-typedef struct
-{
- rune u; /* character code */
- ushort mode; /* attribute flags */
- uint32 fg; /* foreground */
- uint32 bg; /* background */
-} Glyph;
-
-typedef Glyph *Line;
-
-typedef union
-{
- int i;
- uint ui;
- float f;
- const void *v;
- const char *s;
-} Arg;
-
-void redraw(void);
-void draw(void);
-
-void printscreen(const Arg *);
-void printsel(const Arg *);
-void sendbreak(const Arg *);
-void toggleprinter(const Arg *);
-
-int tattrset(int);
-void tnew(int, int);
-void tresize(int, int);
-void tsetdirtattr(int);
-void ttyhangup(void);
-int ttynew(char *, char *, char *, char **);
-size_t ttyread(void);
-void ttyresize(int, int);
-void ttywrite(const char *, size_t, int);
-
-void resettitle(void);
-
-void selclear(void);
-void selinit(void);
-void selstart(int, int, int);
-void selextend(int, int, int, int);
-int selected(int, int);
-char *getsel(void);
-
-void *xmalloc(size_t);
-void *xrealloc(void *, size_t);
-char *xstrdup(char *);
-
-/* config.h globals */
-extern char *utmp;
-extern char *scroll;
-extern char *stty_args;
-extern char *vtiden;
-extern wchar_t *worddelimiters;
-extern int allowaltscreen;
-extern int allowwindowops;
-extern char *termname;
-extern unsigned int tabspaces;
-extern unsigned int defaultfg;
-extern unsigned int defaultbg;
diff --git a/sys/cmd/term/win.h b/sys/cmd/term/win.h
deleted file mode 100644
index 01a12fa..0000000
--- a/sys/cmd/term/win.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* See LICENSE for license details. */
-
-enum win_mode {
- MODE_VISIBLE = 1 << 0,
- MODE_FOCUSED = 1 << 1,
- MODE_APPKEYPAD = 1 << 2,
- MODE_MOUSEBTN = 1 << 3,
- MODE_MOUSEMOTION = 1 << 4,
- MODE_REVERSE = 1 << 5,
- MODE_KBDLOCK = 1 << 6,
- MODE_HIDE = 1 << 7,
- MODE_APPCURSOR = 1 << 8,
- MODE_MOUSESGR = 1 << 9,
- MODE_8BIT = 1 << 10,
- MODE_BLINK = 1 << 11,
- MODE_FBLINK = 1 << 12,
- MODE_FOCUS = 1 << 13,
- MODE_MOUSEX10 = 1 << 14,
- MODE_MOUSEMANY = 1 << 15,
- MODE_BRCKTPASTE = 1 << 16,
- MODE_NUMLOCK = 1 << 17,
- MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
- |MODE_MOUSEMANY,
-};
-
-void wbell(void);
-void wclipcopy(void);
-void wdrawcursor(int, int, Glyph, int, int, Glyph);
-void wdrawline(Line, int, int, int);
-void wfinishdraw(void);
-void wloadcols(void);
-int wsetcolorname(int, const char *);
-void wsettitle(char *);
-int wsetcursor(int);
-void wsetmode(int, unsigned int);
-void wsetpointermotion(int);
-void wsetsel(char *);
-int wstartdraw(void);
-void wximspot(int, int);
diff --git a/sys/cmd/term/x.c b/sys/cmd/term/x.c
deleted file mode 100644
index 37fbe00..0000000
--- a/sys/cmd/term/x.c
+++ /dev/null
@@ -1,2041 +0,0 @@
-/* See LICENSE for license details. */
-#include <u.h>
-#include <libn.h>
-
-#include <time.h>
-#include <locale.h>
-
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/cursorfont.h>
-#include <X11/keysym.h>
-#include <X11/Xft/Xft.h>
-#include <X11/XKBlib.h>
-
-#include "term.h"
-#include "win.h"
-
-#define VERSION "0.1"
-
-/* types used in config.h */
-typedef struct {
- uint mod;
- KeySym keysym;
- void (*func)(const Arg *);
- const Arg arg;
-} Shortcut;
-
-typedef struct {
- uint mod;
- uint button;
- void (*func)(const Arg *);
- const Arg arg;
- uint release;
-} MouseShortcut;
-
-typedef struct {
- KeySym k;
- uint mask;
- char *s;
- /* three-valued logic variables: 0 indifferent, 1 on, -1 off */
- signed char appkey; /* application keypad */
- signed char appcursor; /* application cursor */
-} Key;
-
-/* X modifiers */
-#define XK_ANY_MOD UINT_MAX
-#define XK_NO_MOD 0
-#define XK_SWITCH_MOD (1<<13)
-
-/* function definitions used in config.h */
-static void clipcopy(const Arg *);
-static void clippaste(const Arg *);
-static void numlock(const Arg *);
-static void selpaste(const Arg *);
-static void zoom(const Arg *);
-static void zoomabs(const Arg *);
-static void zoomreset(const Arg *);
-static void ttysend(const Arg *);
-
-/* config.h for applying patches and the configuration. */
-#include "config.h"
-
-/* XEMBED messages */
-#define XEMBED_FOCUS_IN 4
-#define XEMBED_FOCUS_OUT 5
-
-/* macros */
-#define IS_SET(flag) ((win.mode & (flag)) != 0)
-#define TRUERED(x) (((x) & 0xff0000) >> 8)
-#define TRUEGREEN(x) (((x) & 0xff00))
-#define TRUEBLUE(x) (((x) & 0xff) << 8)
-
-typedef XftDraw *Draw;
-typedef XftColor Color;
-typedef XftGlyphFontSpec GlyphFontSpec;
-
-/* Purely graphic info */
-typedef struct {
- int tw, th; /* tty width and height */
- int w, h; /* window width and height */
- int ch; /* char height */
- int cw; /* char width */
- int mode; /* window state/mode flags */
- int cursor; /* cursor style */
-} TermWindow;
-
-typedef struct {
- Display *dpy;
- Colormap cmap;
- Window win;
- Drawable buf;
- GlyphFontSpec *specbuf; /* font spec buffer used for rendering */
- Atom xembed, wmdeletewin, netwmname, netwmpid;
- struct {
- XIM xim;
- XIC xic;
- XPoint spot;
- XVaNestedList spotlist;
- } ime;
- Draw draw;
- Visual *vis;
- XSetWindowAttributes attrs;
- int scr;
- int isfixed; /* is fixed geometry? */
- int l, t; /* left and top offset */
- int gm; /* geometry mask */
-} XWindow;
-
-typedef struct {
- Atom xtarget;
- char *primary, *clipboard;
- struct timespec tclick1;
- struct timespec tclick2;
-} XSelection;
-
-/* Font structure */
-#define Font Font_
-typedef struct {
- int height;
- int width;
- int ascent;
- int descent;
- int badslant;
- int badweight;
- short lbearing;
- short rbearing;
- XftFont *match;
- FcFontSet *set;
- FcPattern *pattern;
-} Font;
-
-/* Drawing Context */
-typedef struct {
- Color *col;
- size_t collen;
- Font font, bfont, ifont, ibfont;
- GC gc;
-} DC;
-
-static inline ushort sixd_to_16bit(int);
-static int wmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
-static void wdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
-static void wdrawglyph(Glyph, int, int);
-static void wclear(int, int, int, int);
-static int wgeommasktogravity(int);
-static int wimopen(Display *);
-static void wiminstantiate(Display *, XPointer, XPointer);
-static void wimdestroy(XIM, XPointer, XPointer);
-static int wicdestroy(XIC, XPointer, XPointer);
-static void winit(int, int);
-static void cresize(int, int);
-static void wresize(int, int);
-static void whints(void);
-static int wloadcolor(int, const char *, Color *);
-static int wloadfont(Font *, FcPattern *);
-static void wloadfonts(char *, double);
-static void wunloadfont(Font *);
-static void wunloadfonts(void);
-static void wsetenv(void);
-static void wseturgency(int);
-static int evcol(XEvent *);
-static int evrow(XEvent *);
-
-static void expose(XEvent *);
-static void visibility(XEvent *);
-static void unmap(XEvent *);
-static void kpress(XEvent *);
-static void cmessage(XEvent *);
-static void resize(XEvent *);
-static void focus(XEvent *);
-static uint buttonmask(uint);
-static int mouseaction(XEvent *, uint);
-static void brelease(XEvent *);
-static void bpress(XEvent *);
-static void bmotion(XEvent *);
-static void propnotify(XEvent *);
-static void selnotify(XEvent *);
-static void selrequest(XEvent *);
-static void setsel(char *, Time);
-static void mousesel(XEvent *, int);
-static void mousereport(XEvent *);
-static char *kmap(KeySym, uint);
-static int match(uint, uint);
-
-static void run(void);
-static void usage(void);
-
-static void (*handler[LASTEvent])(XEvent *) = {
- [KeyPress] = kpress,
- [ClientMessage] = cmessage,
- [ConfigureNotify] = resize,
- [VisibilityNotify] = visibility,
- [UnmapNotify] = unmap,
- [Expose] = expose,
- [FocusIn] = focus,
- [FocusOut] = focus,
- [MotionNotify] = bmotion,
- [ButtonPress] = bpress,
- [ButtonRelease] = brelease,
-/*
- * Uncomment if you want the selection to disappear when you select something
- * different in another window.
- */
-/* [SelectionClear] = selclear_, */
- [SelectionNotify] = selnotify,
-/*
- * PropertyNotify is only turned on when there is some INCR transfer happening
- * for the selection retrieval.
- */
- [PropertyNotify] = propnotify,
- [SelectionRequest] = selrequest,
-};
-
-/* Globals */
-static DC dc;
-static XWindow xw;
-static XSelection xsel;
-static TermWindow win;
-
-/* Font Ring Cache */
-enum {
- FRC_NORMAL,
- FRC_ITALIC,
- FRC_BOLD,
- FRC_ITALICBOLD
-};
-
-typedef struct {
- XftFont *font;
- int flags;
- rune unicodep;
-} Fontcache;
-
-/* Fontcache is an array now. A new font will be appended to the array. */
-static Fontcache *frc = NULL;
-static int frclen = 0;
-static int frccap = 0;
-static char *usedfont = NULL;
-static double usedfontsize = 0;
-static double defaultfontsize = 0;
-
-static char *opt_class = NULL;
-static char **opt_cmd = NULL;
-static char *opt_embed = NULL;
-static char *opt_font = NULL;
-static char *opt_io = NULL;
-static char *opt_line = NULL;
-static char *opt_name = NULL;
-static char *opt_title = NULL;
-
-static int oldbutton = 3; /* button event on startup: 3 = release */
-
-void
-clipcopy(const Arg *dummy)
-{
- Atom clipboard;
-
- free(xsel.clipboard);
- xsel.clipboard = NULL;
-
- if (xsel.primary != NULL) {
- xsel.clipboard = xstrdup(xsel.primary);
- clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
- XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
- }
-}
-
-void
-clippaste(const Arg *dummy)
-{
- Atom clipboard;
-
- clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
- XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
- xw.win, CurrentTime);
-}
-
-void
-selpaste(const Arg *dummy)
-{
- XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY,
- xw.win, CurrentTime);
-}
-
-void
-numlock(const Arg *dummy)
-{
- win.mode ^= MODE_NUMLOCK;
-}
-
-void
-zoom(const Arg *arg)
-{
- Arg larg;
-
- larg.f = usedfontsize + arg->f;
- zoomabs(&larg);
-}
-
-void
-zoomabs(const Arg *arg)
-{
- wunloadfonts();
- wloadfonts(usedfont, arg->f);
- cresize(0, 0);
- redraw();
- whints();
-}
-
-void
-zoomreset(const Arg *arg)
-{
- Arg larg;
-
- if (defaultfontsize > 0) {
- larg.f = defaultfontsize;
- zoomabs(&larg);
- }
-}
-
-void
-ttysend(const Arg *arg)
-{
- ttywrite(arg->s, strlen(arg->s), 1);
-}
-
-int
-evcol(XEvent *e)
-{
- int x = e->xbutton.x - borderpx;
- LIMIT(x, 0, win.tw - 1);
- return x / win.cw;
-}
-
-int
-evrow(XEvent *e)
-{
- int y = e->xbutton.y - borderpx;
- LIMIT(y, 0, win.th - 1);
- return y / win.ch;
-}
-
-void
-mousesel(XEvent *e, int done)
-{
- int type, seltype = SEL_REGULAR;
- uint state = e->xbutton.state & ~(Button1Mask | forcemousemod);
-
- for (type = 1; type < arrlen(selmasks); ++type) {
- if (match(selmasks[type], state)) {
- seltype = type;
- break;
- }
- }
- selextend(evcol(e), evrow(e), seltype, done);
- if (done)
- setsel(getsel(), e->xbutton.time);
-}
-
-void
-mousereport(XEvent *e)
-{
- int len, x = evcol(e), y = evrow(e),
- button = e->xbutton.button, state = e->xbutton.state;
- char buf[40];
- static int ox, oy;
-
- /* from urxvt */
- if (e->xbutton.type == MotionNotify) {
- if (x == ox && y == oy)
- return;
- if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
- return;
- /* MOUSE_MOTION: no reporting if no button is pressed */
- if (IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
- return;
-
- button = oldbutton + 32;
- ox = x;
- oy = y;
- } else {
- if (!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
- button = 3;
- } else {
- button -= Button1;
- if (button >= 3)
- button += 64 - 3;
- }
- if (e->xbutton.type == ButtonPress) {
- oldbutton = button;
- ox = x;
- oy = y;
- } else if (e->xbutton.type == ButtonRelease) {
- oldbutton = 3;
- /* MODE_MOUSEX10: no button release reporting */
- if (IS_SET(MODE_MOUSEX10))
- return;
- if (button == 64 || button == 65)
- return;
- }
- }
-
- if (!IS_SET(MODE_MOUSEX10)) {
- button += ((state & ShiftMask ) ? 4 : 0)
- + ((state & Mod4Mask ) ? 8 : 0)
- + ((state & ControlMask) ? 16 : 0);
- }
-
- if (IS_SET(MODE_MOUSESGR)) {
- len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
- button, x+1, y+1,
- e->xbutton.type == ButtonRelease ? 'm' : 'M');
- } else if (x < 223 && y < 223) {
- len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
- 32+button, 32+x+1, 32+y+1);
- } else {
- return;
- }
-
- ttywrite(buf, len, 0);
-}
-
-uint
-buttonmask(uint button)
-{
- return button == Button1 ? Button1Mask
- : button == Button2 ? Button2Mask
- : button == Button3 ? Button3Mask
- : button == Button4 ? Button4Mask
- : button == Button5 ? Button5Mask
- : 0;
-}
-
-int
-mouseaction(XEvent *e, uint release)
-{
- MouseShortcut *ms;
-
- /* ignore Button<N>mask for Button<N> - it's set on release */
- uint state = e->xbutton.state & ~buttonmask(e->xbutton.button);
-
- for (ms = mshortcuts; ms < mshortcuts + arrlen(mshortcuts); ms++) {
- if (ms->release == release &&
- ms->button == e->xbutton.button &&
- (match(ms->mod, state) || /* exact or forced */
- match(ms->mod, state & ~forcemousemod))) {
- ms->func(&(ms->arg));
- return 1;
- }
- }
-
- return 0;
-}
-
-void
-bpress(XEvent *e)
-{
- struct timespec now;
- int snap;
-
- if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
- mousereport(e);
- return;
- }
-
- if (mouseaction(e, 0))
- return;
-
- if (e->xbutton.button == Button1) {
- /*
- * If the user clicks below predefined timeouts specific
- * snapping behaviour is exposed.
- */
- clock_gettime(CLOCK_MONOTONIC, &now);
- if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) {
- snap = SNAP_LINE;
- } else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) {
- snap = SNAP_WORD;
- } else {
- snap = 0;
- }
- xsel.tclick2 = xsel.tclick1;
- xsel.tclick1 = now;
-
- selstart(evcol(e), evrow(e), snap);
- }
-}
-
-void
-propnotify(XEvent *e)
-{
- XPropertyEvent *xpev;
- Atom clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-
- xpev = &e->xproperty;
- if (xpev->state == PropertyNewValue &&
- (xpev->atom == XA_PRIMARY ||
- xpev->atom == clipboard)) {
- selnotify(e);
- }
-}
-
-void
-selnotify(XEvent *e)
-{
- ulong nitems, ofs, rem;
- int format;
- ubyte *data, *last, *repl;
- Atom type, incratom, property = None;
-
- incratom = XInternAtom(xw.dpy, "INCR", 0);
-
- ofs = 0;
- if (e->type == SelectionNotify)
- property = e->xselection.property;
- else if (e->type == PropertyNotify)
- property = e->xproperty.atom;
-
- if (property == None)
- return;
-
- do {
- if (XGetWindowProperty(xw.dpy, xw.win, property, ofs,
- BUFSIZ/4, False, AnyPropertyType,
- &type, &format, &nitems, &rem,
- &data)) {
- fprintf(stderr, "Clipboard allocation failed\n");
- return;
- }
-
- if (e->type == PropertyNotify && nitems == 0 && rem == 0) {
- /*
- * If there is some PropertyNotify with no data, then
- * this is the signal of the selection owner that all
- * data has been transferred. We won't need to receive
- * PropertyNotify events anymore.
- */
- MODBIT(xw.attrs.event_mask, 0, PropertyChangeMask);
- XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask,
- &xw.attrs);
- }
-
- if (type == incratom) {
- /*
- * Activate the PropertyNotify events so we receive
- * when the selection owner does send us the next
- * chunk of data.
- */
- MODBIT(xw.attrs.event_mask, 1, PropertyChangeMask);
- XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask,
- &xw.attrs);
-
- /*
- * Deleting the property is the transfer start signal.
- */
- XDeleteProperty(xw.dpy, xw.win, (int)property);
- continue;
- }
-
- /*
- * As seen in getsel:
- * Line endings are inconsistent in the terminal and GUI world
- * copy and pasting. When receiving some selection data,
- * replace all '\n' with '\r'.
- * FIXME: Fix the computer world.
- */
- repl = data;
- last = data + nitems * format / 8;
- while ((repl = memchr(repl, '\n', last - repl))) {
- *repl++ = '\r';
- }
-
- if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)
- ttywrite("\033[200~", 6, 0);
- ttywrite((char *)data, nitems * format / 8, 1);
- if (IS_SET(MODE_BRCKTPASTE) && rem == 0)
- ttywrite("\033[201~", 6, 0);
- XFree(data);
- /* number of 32-bit chunks returned */
- ofs += nitems * format / 32;
- } while (rem > 0);
-
- /*
- * Deleting the property again tells the selection owner to send the
- * next data chunk in the property.
- */
- XDeleteProperty(xw.dpy, xw.win, (int)property);
-}
-
-void
-wclipcopy(void)
-{
- clipcopy(NULL);
-}
-
-void
-selrequest(XEvent *e)
-{
- XSelectionRequestEvent *xsre;
- XSelectionEvent xev;
- Atom xa_targets, string, clipboard;
- char *seltext;
-
- xsre = (XSelectionRequestEvent *) e;
- xev.type = SelectionNotify;
- xev.requestor = xsre->requestor;
- xev.selection = xsre->selection;
- xev.target = xsre->target;
- xev.time = xsre->time;
- if (xsre->property == None)
- xsre->property = xsre->target;
-
- /* reject */
- xev.property = None;
-
- xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
- if (xsre->target == xa_targets) {
- /* respond with the supported type */
- string = xsel.xtarget;
- XChangeProperty(xsre->display, xsre->requestor, xsre->property,
- XA_ATOM, 32, PropModeReplace,
- (ubyte *) &string, 1);
- xev.property = xsre->property;
- } else if (xsre->target == xsel.xtarget || xsre->target == XA_STRING) {
- /*
- * xith XA_STRING non ascii characters may be incorrect in the
- * requestor. It is not our problem, use utf8.
- */
- clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
- if (xsre->selection == XA_PRIMARY) {
- seltext = xsel.primary;
- } else if (xsre->selection == clipboard) {
- seltext = xsel.clipboard;
- } else {
- fprintf(stderr,
- "Unhandled clipboard selection 0x%lx\n",
- xsre->selection);
- return;
- }
- if (seltext != NULL) {
- XChangeProperty(xsre->display, xsre->requestor,
- xsre->property, xsre->target,
- 8, PropModeReplace,
- (ubyte *)seltext, strlen(seltext));
- xev.property = xsre->property;
- }
- }
-
- /* all done, send a notification to the listener */
- if (!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev))
- fprintf(stderr, "Error sending SelectionNotify event\n");
-}
-
-void
-setsel(char *str, Time t)
-{
- if (!str)
- return;
-
- free(xsel.primary);
- xsel.primary = str;
-
- XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
- if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
- selclear();
-}
-
-void
-wsetsel(char *str)
-{
- setsel(str, CurrentTime);
-}
-
-void
-brelease(XEvent *e)
-{
- if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
- mousereport(e);
- return;
- }
-
- if (mouseaction(e, 1))
- return;
- if (e->xbutton.button == Button1)
- mousesel(e, 1);
-}
-
-void
-bmotion(XEvent *e)
-{
- if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
- mousereport(e);
- return;
- }
-
- mousesel(e, 0);
-}
-
-void
-cresize(int width, int height)
-{
- int col, row;
-
- if (width != 0)
- win.w = width;
- if (height != 0)
- win.h = height;
-
- col = (win.w - 2 * borderpx) / win.cw;
- row = (win.h - 2 * borderpx) / win.ch;
- col = MAX(1, col);
- row = MAX(1, row);
-
- tresize(col, row);
- wresize(col, row);
- ttyresize(win.tw, win.th);
-}
-
-void
-wresize(int col, int row)
-{
- win.tw = col * win.cw;
- win.th = row * win.ch;
-
- XFreePixmap(xw.dpy, xw.buf);
- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
- DefaultDepth(xw.dpy, xw.scr));
- XftDrawChange(xw.draw, xw.buf);
- wclear(0, 0, win.w, win.h);
-
- /* resize to new width */
- xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));
-}
-
-ushort
-sixd_to_16bit(int x)
-{
- return x == 0 ? 0 : 0x3737 + 0x2828 * x;
-}
-
-int
-wloadcolor(int i, const char *name, Color *ncolor)
-{
- XRenderColor color = { .alpha = 0xffff };
-
- if (!name) {
- if (BETWEEN(i, 16, 255)) { /* 256 color */
- if (i < 6*6*6+16) { /* same colors as xterm */
- color.red = sixd_to_16bit( ((i-16)/36)%6 );
- color.green = sixd_to_16bit( ((i-16)/6) %6 );
- color.blue = sixd_to_16bit( ((i-16)/1) %6 );
- } else { /* greyscale */
- color.red = 0x0808 + 0x0a0a * (i - (6*6*6+16));
- color.green = color.blue = color.red;
- }
- return XftColorAllocValue(xw.dpy, xw.vis,
- xw.cmap, &color, ncolor);
- } else
- name = colorname[i];
- }
-
- return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
-}
-
-void
-wloadcols(void)
-{
- int i;
- static int loaded;
- Color *cp;
-
- if (loaded) {
- for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
- XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
- } else {
- dc.collen = MAX(arrlen(colorname), 256);
- dc.col = xmalloc(dc.collen * sizeof(Color));
- }
-
- for (i = 0; i < dc.collen; i++)
- if (!wloadcolor(i, NULL, &dc.col[i])) {
- if (colorname[i])
- panicf("could not allocate color '%s'\n", colorname[i]);
- else
- panicf("could not allocate color %d\n", i);
- }
- loaded = 1;
-}
-
-int
-wsetcolorname(int x, const char *name)
-{
- Color ncolor;
-
- if (!BETWEEN(x, 0, dc.collen))
- return 1;
-
- if (!wloadcolor(x, name, &ncolor))
- return 1;
-
- XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
- dc.col[x] = ncolor;
-
- return 0;
-}
-
-/*
- * Absolute coordinates.
- */
-void
-wclear(int x1, int y1, int x2, int y2)
-{
- XftDrawRect(xw.draw,
- &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
- x1, y1, x2-x1, y2-y1);
-}
-
-void
-whints(void)
-{
- XClassHint class = {opt_name ? opt_name : termname,
- opt_class ? opt_class : termname};
- XWMHints wm = {.flags = InputHint, .input = 1};
- XSizeHints *sizeh;
-
- sizeh = XAllocSizeHints();
-
- sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
- sizeh->height = win.h;
- sizeh->width = win.w;
- sizeh->height_inc = win.ch;
- sizeh->width_inc = win.cw;
- sizeh->base_height = 2 * borderpx;
- sizeh->base_width = 2 * borderpx;
- sizeh->min_height = win.ch + 2 * borderpx;
- sizeh->min_width = win.cw + 2 * borderpx;
- if (xw.isfixed) {
- sizeh->flags |= PMaxSize;
- sizeh->min_width = sizeh->max_width = win.w;
- sizeh->min_height = sizeh->max_height = win.h;
- }
- if (xw.gm & (XValue|YValue)) {
- sizeh->flags |= USPosition | PWinGravity;
- sizeh->x = xw.l;
- sizeh->y = xw.t;
- sizeh->win_gravity = wgeommasktogravity(xw.gm);
- }
-
- XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm,
- &class);
- XFree(sizeh);
-}
-
-int
-wgeommasktogravity(int mask)
-{
- switch (mask & (XNegative|YNegative)) {
- case 0:
- return NorthWestGravity;
- case XNegative:
- return NorthEastGravity;
- case YNegative:
- return SouthWestGravity;
- }
-
- return SouthEastGravity;
-}
-
-int
-wloadfont(Font *f, FcPattern *pattern)
-{
- FcPattern *configured;
- FcPattern *match;
- FcResult result;
- XGlyphInfo extents;
- int wantattr, haveattr;
-
- /*
- * Manually configure instead of calling XftMatchFont
- * so that we can use the configured pattern for
- * "missing glyph" lookups.
- */
- configured = FcPatternDuplicate(pattern);
- if (!configured)
- return 1;
-
- FcConfigSubstitute(NULL, configured, FcMatchPattern);
- XftDefaultSubstitute(xw.dpy, xw.scr, configured);
-
- match = FcFontMatch(NULL, configured, &result);
- if (!match) {
- FcPatternDestroy(configured);
- return 1;
- }
-
- if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {
- FcPatternDestroy(configured);
- FcPatternDestroy(match);
- return 1;
- }
-
- if ((XftPatternGetInteger(pattern, "slant", 0, &wantattr) ==
- XftResultMatch)) {
- /*
- * Check if xft was unable to find a font with the appropriate
- * slant but gave us one anyway. Try to mitigate.
- */
- if ((XftPatternGetInteger(f->match->pattern, "slant", 0,
- &haveattr) != XftResultMatch) || haveattr < wantattr) {
- f->badslant = 1;
- fputs("font slant does not match\n", stderr);
- }
- }
-
- if ((XftPatternGetInteger(pattern, "weight", 0, &wantattr) ==
- XftResultMatch)) {
- if ((XftPatternGetInteger(f->match->pattern, "weight", 0,
- &haveattr) != XftResultMatch) || haveattr != wantattr) {
- f->badweight = 1;
- fputs("font weight does not match\n", stderr);
- }
- }
-
- XftTextExtentsUtf8(xw.dpy, f->match,
- (const FcChar8 *) ascii_printable,
- strlen(ascii_printable), &extents);
-
- f->set = NULL;
- f->pattern = configured;
-
- f->ascent = f->match->ascent;
- f->descent = f->match->descent;
- f->lbearing = 0;
- f->rbearing = f->match->max_advance_width;
-
- f->height = f->ascent + f->descent;
- f->width = DIVCEIL(extents.xOff, strlen(ascii_printable));
-
- return 0;
-}
-
-void
-wloadfonts(char *fontstr, double fontsize)
-{
- FcPattern *pattern;
- double fontval;
-
- if (fontstr[0] == '-')
- pattern = XftXlfdParse(fontstr, False, False);
- else
- pattern = FcNameParse((FcChar8 *)fontstr);
-
- if (!pattern)
- panicf("can't open font %s\n", fontstr);
-
- if (fontsize > 1) {
- FcPatternDel(pattern, FC_PIXEL_SIZE);
- FcPatternDel(pattern, FC_SIZE);
- FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
- usedfontsize = fontsize;
- } else {
- if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
- FcResultMatch) {
- usedfontsize = fontval;
- } else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
- FcResultMatch) {
- usedfontsize = -1;
- } else {
- /*
- * Default font size is 12, if none given. This is to
- * have a known usedfontsize value.
- */
- FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
- usedfontsize = 12;
- }
- defaultfontsize = usedfontsize;
- }
-
- if (wloadfont(&dc.font, pattern))
- panicf("can't open font %s\n", fontstr);
-
- if (usedfontsize < 0) {
- FcPatternGetDouble(dc.font.match->pattern,
- FC_PIXEL_SIZE, 0, &fontval);
- usedfontsize = fontval;
- if (fontsize == 0)
- defaultfontsize = fontval;
- }
-
- /* Setting character width and height. */
- win.cw = ceilf(dc.font.width * cwscale);
- win.ch = ceilf(dc.font.height * chscale);
-
- FcPatternDel(pattern, FC_SLANT);
- FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
- if (wloadfont(&dc.ifont, pattern))
- panicf("can't open font %s\n", fontstr);
-
- FcPatternDel(pattern, FC_WEIGHT);
- FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
- if (wloadfont(&dc.ibfont, pattern))
- panicf("can't open font %s\n", fontstr);
-
- FcPatternDel(pattern, FC_SLANT);
- FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
- if (wloadfont(&dc.bfont, pattern))
- panicf("can't open font %s\n", fontstr);
-
- FcPatternDestroy(pattern);
-}
-
-void
-wunloadfont(Font *f)
-{
- XftFontClose(xw.dpy, f->match);
- FcPatternDestroy(f->pattern);
- if (f->set)
- FcFontSetDestroy(f->set);
-}
-
-void
-wunloadfonts(void)
-{
- /* Free the loaded fonts in the font cache. */
- while (frclen > 0)
- XftFontClose(xw.dpy, frc[--frclen].font);
-
- wunloadfont(&dc.font);
- wunloadfont(&dc.bfont);
- wunloadfont(&dc.ifont);
- wunloadfont(&dc.ibfont);
-}
-
-int
-wimopen(Display *dpy)
-{
- XIMCallback imdestroy = { .client_data = NULL, .callback = wimdestroy };
- XICCallback icdestroy = { .client_data = NULL, .callback = wicdestroy };
-
- xw.ime.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
- if (xw.ime.xim == NULL)
- return 0;
-
- if (XSetIMValues(xw.ime.xim, XNDestroyCallback, &imdestroy, NULL))
- fprintf(stderr, "XSetIMValues: "
- "Could not set XNDestroyCallback.\n");
-
- xw.ime.spotlist = XVaCreateNestedList(0, XNSpotLocation, &xw.ime.spot,
- NULL);
-
- if (xw.ime.xic == NULL) {
- xw.ime.xic = XCreateIC(xw.ime.xim, XNInputStyle,
- XIMPreeditNothing | XIMStatusNothing,
- XNClientWindow, xw.win,
- XNDestroyCallback, &icdestroy,
- NULL);
- }
- if (xw.ime.xic == NULL)
- fprintf(stderr, "XCreateIC: Could not create input context.\n");
-
- return 1;
-}
-
-void
-wiminstantiate(Display *dpy, XPointer client, XPointer call)
-{
- if (wimopen(dpy))
- XUnregisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
- wiminstantiate, NULL);
-}
-
-void
-wimdestroy(XIM xim, XPointer client, XPointer call)
-{
- xw.ime.xim = NULL;
- XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
- wiminstantiate, NULL);
- XFree(xw.ime.spotlist);
-}
-
-int
-wicdestroy(XIC xim, XPointer client, XPointer call)
-{
- xw.ime.xic = NULL;
- return 1;
-}
-
-void
-winit(int cols, int rows)
-{
- XGCValues gcvalues;
- Cursor cursor;
- Window parent;
- pid_t thispid = getpid();
- XColor xmousefg, xmousebg;
-
- if (!(xw.dpy = XOpenDisplay(NULL)))
- panicf("can't open display\n");
- xw.scr = XDefaultScreen(xw.dpy);
- xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-
- /* font */
- if (!FcInit())
- panicf("could not init fontconfig.\n");
-
- usedfont = (opt_font == NULL)? font : opt_font;
- wloadfonts(usedfont, 0);
-
- /* colors */
- xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
- wloadcols();
-
- /* adjust fixed window geometry */
- win.w = 2 * borderpx + cols * win.cw;
- win.h = 2 * borderpx + rows * win.ch;
- if (xw.gm & XNegative)
- xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
- if (xw.gm & YNegative)
- xw.t += DisplayHeight(xw.dpy, xw.scr) - win.h - 2;
-
- /* Events */
- xw.attrs.background_pixel = dc.col[defaultbg].pixel;
- xw.attrs.border_pixel = dc.col[defaultbg].pixel;
- xw.attrs.bit_gravity = NorthWestGravity;
- xw.attrs.event_mask = FocusChangeMask | KeyPressMask | KeyReleaseMask
- | ExposureMask | VisibilityChangeMask | StructureNotifyMask
- | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
- xw.attrs.colormap = xw.cmap;
-
- if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
- parent = XRootWindow(xw.dpy, xw.scr);
- xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
- win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
- xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
- | CWEventMask | CWColormap, &xw.attrs);
-
- memset(&gcvalues, 0, sizeof(gcvalues));
- gcvalues.graphics_exposures = False;
- dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
- &gcvalues);
- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
- DefaultDepth(xw.dpy, xw.scr));
- XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
-
- /* font spec buffer */
- xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec));
-
- /* Xft rendering context */
- xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
-
- /* input methods */
- if (!wimopen(xw.dpy)) {
- XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
- wiminstantiate, NULL);
- }
-
- /* white cursor, black outline */
- cursor = XCreateFontCursor(xw.dpy, mouseshape);
- XDefineCursor(xw.dpy, xw.win, cursor);
-
- if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
- xmousefg.red = 0xffff;
- xmousefg.green = 0xffff;
- xmousefg.blue = 0xffff;
- }
-
- if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
- xmousebg.red = 0x0000;
- xmousebg.green = 0x0000;
- xmousebg.blue = 0x0000;
- }
-
- XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
-
- xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
- xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
- xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
- XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
-
- xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
- XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
- PropModeReplace, (ubyte *)&thispid, 1);
-
- win.mode = MODE_NUMLOCK;
- resettitle();
- whints();
- XMapWindow(xw.dpy, xw.win);
- XSync(xw.dpy, False);
-
- clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);
- clock_gettime(CLOCK_MONOTONIC, &xsel.tclick2);
- xsel.primary = NULL;
- xsel.clipboard = NULL;
- xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
- if (xsel.xtarget == None)
- xsel.xtarget = XA_STRING;
-}
-
-int
-wmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
-{
- float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
- ushort mode, prevmode = USHRT_MAX;
- Font *font = &dc.font;
- int frcflags = FRC_NORMAL;
- float runewidth = win.cw;
- rune rune;
- FT_UInt glyphidx;
- FcResult fcres;
- FcPattern *fcpattern, *fontpattern;
- FcFontSet *fcsets[] = { NULL };
- FcCharSet *fccharset;
- int i, f, numspecs = 0;
-
- for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
- /* Fetch rune and mode for current glyph. */
- rune = glyphs[i].u;
- mode = glyphs[i].mode;
-
- /* Skip dummy wide-character spacing. */
- if (mode == ATTR_WDUMMY)
- continue;
-
- /* Determine font for glyph if different from previous glyph. */
- if (prevmode != mode) {
- prevmode = mode;
- font = &dc.font;
- frcflags = FRC_NORMAL;
- runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f);
- if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
- font = &dc.ibfont;
- frcflags = FRC_ITALICBOLD;
- } else if (mode & ATTR_ITALIC) {
- font = &dc.ifont;
- frcflags = FRC_ITALIC;
- } else if (mode & ATTR_BOLD) {
- font = &dc.bfont;
- frcflags = FRC_BOLD;
- }
- yp = winy + font->ascent;
- }
-
- /* Lookup character index with default font. */
- glyphidx = XftCharIndex(xw.dpy, font->match, rune);
- if (glyphidx) {
- specs[numspecs].font = font->match;
- specs[numspecs].glyph = glyphidx;
- specs[numspecs].x = (short)xp;
- specs[numspecs].y = (short)yp;
- xp += runewidth;
- numspecs++;
- continue;
- }
-
- /* Fallback on font cache, search the font cache for match. */
- for (f = 0; f < frclen; f++) {
- glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
- /* Everything correct. */
- if (glyphidx && frc[f].flags == frcflags)
- break;
- /* We got a default font for a not found glyph. */
- if (!glyphidx && frc[f].flags == frcflags
- && frc[f].unicodep == rune) {
- break;
- }
- }
-
- /* Nothing was found. Use fontconfig to find matching font. */
- if (f >= frclen) {
- if (!font->set)
- font->set = FcFontSort(0, font->pattern,
- 1, 0, &fcres);
- fcsets[0] = font->set;
-
- /*
- * Nothing was found in the cache. Now use
- * some dozen of Fontconfig calls to get the
- * font for one single character.
- *
- * Xft and fontconfig are design failures.
- */
- fcpattern = FcPatternDuplicate(font->pattern);
- fccharset = FcCharSetCreate();
-
- FcCharSetAddChar(fccharset, rune);
- FcPatternAddCharSet(fcpattern, FC_CHARSET,
- fccharset);
- FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
-
- FcConfigSubstitute(0, fcpattern,
- FcMatchPattern);
- FcDefaultSubstitute(fcpattern);
-
- fontpattern = FcFontSetMatch(0, fcsets, 1,
- fcpattern, &fcres);
-
- /* Allocate memory for the new cache entry. */
- if (frclen >= frccap) {
- frccap += 16;
- frc = xrealloc(frc, frccap * sizeof(Fontcache));
- }
-
- frc[frclen].font = XftFontOpenPattern(xw.dpy,
- fontpattern);
- if (!frc[frclen].font)
- panicf("XftFontOpenPattern failed seeking fallback font: %s\n",
- strerror(errno));
- frc[frclen].flags = frcflags;
- frc[frclen].unicodep = rune;
-
- glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
-
- f = frclen;
- frclen++;
-
- FcPatternDestroy(fcpattern);
- FcCharSetDestroy(fccharset);
- }
-
- specs[numspecs].font = frc[f].font;
- specs[numspecs].glyph = glyphidx;
- specs[numspecs].x = (short)xp;
- specs[numspecs].y = (short)yp;
- xp += runewidth;
- numspecs++;
- }
-
- return numspecs;
-}
-
-void
-wdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
-{
- int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
- int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
- width = charlen * win.cw;
- Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
- XRenderColor colfg, colbg;
- XRectangle r;
-
- /* Fallback on color display for attributes not supported by the font */
- if (base.mode & ATTR_ITALIC && base.mode & ATTR_BOLD) {
- if (dc.ibfont.badslant || dc.ibfont.badweight)
- base.fg = defaultattr;
- } else if ((base.mode & ATTR_ITALIC && dc.ifont.badslant) ||
- (base.mode & ATTR_BOLD && dc.bfont.badweight)) {
- base.fg = defaultattr;
- }
-
- if (IS_TRUECOL(base.fg)) {
- colfg.alpha = 0xffff;
- colfg.red = TRUERED(base.fg);
- colfg.green = TRUEGREEN(base.fg);
- colfg.blue = TRUEBLUE(base.fg);
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &truefg);
- fg = &truefg;
- } else {
- fg = &dc.col[base.fg];
- }
-
- if (IS_TRUECOL(base.bg)) {
- colbg.alpha = 0xffff;
- colbg.green = TRUEGREEN(base.bg);
- colbg.red = TRUERED(base.bg);
- colbg.blue = TRUEBLUE(base.bg);
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &truebg);
- bg = &truebg;
- } else {
- bg = &dc.col[base.bg];
- }
-
- /* Change basic system colors [0-7] to bright system colors [8-15] */
- if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
- fg = &dc.col[base.fg + 8];
-
- if (IS_SET(MODE_REVERSE)) {
- if (fg == &dc.col[defaultfg]) {
- fg = &dc.col[defaultbg];
- } else {
- colfg.red = ~fg->color.red;
- colfg.green = ~fg->color.green;
- colfg.blue = ~fg->color.blue;
- colfg.alpha = fg->color.alpha;
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg,
- &revfg);
- fg = &revfg;
- }
-
- if (bg == &dc.col[defaultbg]) {
- bg = &dc.col[defaultfg];
- } else {
- colbg.red = ~bg->color.red;
- colbg.green = ~bg->color.green;
- colbg.blue = ~bg->color.blue;
- colbg.alpha = bg->color.alpha;
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg,
- &revbg);
- bg = &revbg;
- }
- }
-
- if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
- colfg.red = fg->color.red / 2;
- colfg.green = fg->color.green / 2;
- colfg.blue = fg->color.blue / 2;
- colfg.alpha = fg->color.alpha;
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
- fg = &revfg;
- }
-
- if (base.mode & ATTR_REVERSE) {
- temp = fg;
- fg = bg;
- bg = temp;
- }
-
- if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK)
- fg = bg;
-
- if (base.mode & ATTR_INVISIBLE)
- fg = bg;
-
- /* Intelligent cleaning up of the borders. */
- if (x == 0) {
- wclear(0, (y == 0)? 0 : winy, borderpx,
- winy + win.ch +
- ((winy + win.ch >= borderpx + win.th)? win.h : 0));
- }
- if (winx + width >= borderpx + win.tw) {
- wclear(winx + width, (y == 0)? 0 : winy, win.w,
- ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
- }
- if (y == 0)
- wclear(winx, 0, winx + width, borderpx);
- if (winy + win.ch >= borderpx + win.th)
- wclear(winx, winy + win.ch, winx + width, win.h);
-
- /* Clean up the region we want to draw to. */
- XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
-
- /* Set the clip region because Xft is sometimes dirty. */
- r.x = 0;
- r.y = 0;
- r.height = win.ch;
- r.width = width;
- XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
-
- /* Render the glyphs. */
- XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
-
- /* Render underline and strikethrough. */
- if (base.mode & ATTR_UNDERLINE) {
- XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
- width, 1);
- }
-
- if (base.mode & ATTR_STRUCK) {
- XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
- width, 1);
- }
-
- /* Reset clip to none. */
- XftDrawSetClip(xw.draw, 0);
-}
-
-void
-wdrawglyph(Glyph g, int x, int y)
-{
- int numspecs;
- XftGlyphFontSpec spec;
-
- numspecs = wmakeglyphfontspecs(&spec, &g, 1, x, y);
- wdrawglyphfontspecs(&spec, g, numspecs, x, y);
-}
-
-void
-wdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
-{
- Color drawcol;
-
- /* remove the old cursor */
- if (selected(ox, oy))
- og.mode ^= ATTR_REVERSE;
- wdrawglyph(og, ox, oy);
-
- if (IS_SET(MODE_HIDE))
- return;
-
- /*
- * Select the right color for the right mode.
- */
- g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
-
- if (IS_SET(MODE_REVERSE)) {
- g.mode |= ATTR_REVERSE;
- g.bg = defaultfg;
- if (selected(cx, cy)) {
- drawcol = dc.col[defaultcs];
- g.fg = defaultrcs;
- } else {
- drawcol = dc.col[defaultrcs];
- g.fg = defaultcs;
- }
- } else {
- if (selected(cx, cy)) {
- g.fg = defaultfg;
- g.bg = defaultrcs;
- } else {
- g.fg = defaultbg;
- g.bg = defaultcs;
- }
- drawcol = dc.col[g.bg];
- }
-
- /* draw the new one */
- if (IS_SET(MODE_FOCUSED)) {
- switch (win.cursor) {
- case 7: /* st extension */
- g.u = 0x2603; /* snowman (U+2603) */
- /* FALLTHROUGH */
- case 0: /* Blinking Block */
- case 1: /* Blinking Block (Default) */
- case 2: /* Steady Block */
- wdrawglyph(g, cx, cy);
- break;
- case 3: /* Blinking Underline */
- case 4: /* Steady Underline */
- XftDrawRect(xw.draw, &drawcol,
- borderpx + cx * win.cw,
- borderpx + (cy + 1) * win.ch - \
- cursorthickness,
- win.cw, cursorthickness);
- break;
- case 5: /* Blinking bar */
- case 6: /* Steady bar */
- XftDrawRect(xw.draw, &drawcol,
- borderpx + cx * win.cw,
- borderpx + cy * win.ch,
- cursorthickness, win.ch);
- break;
- }
- } else {
- XftDrawRect(xw.draw, &drawcol,
- borderpx + cx * win.cw,
- borderpx + cy * win.ch,
- win.cw - 1, 1);
- XftDrawRect(xw.draw, &drawcol,
- borderpx + cx * win.cw,
- borderpx + cy * win.ch,
- 1, win.ch - 1);
- XftDrawRect(xw.draw, &drawcol,
- borderpx + (cx + 1) * win.cw - 1,
- borderpx + cy * win.ch,
- 1, win.ch - 1);
- XftDrawRect(xw.draw, &drawcol,
- borderpx + cx * win.cw,
- borderpx + (cy + 1) * win.ch - 1,
- win.cw, 1);
- }
-}
-
-void
-wsetenv(void)
-{
- char buf[sizeof(long) * 8 + 1];
-
- snprintf(buf, sizeof(buf), "%lu", xw.win);
- setenv("WINDOWID", buf, 1);
-}
-
-void
-wsettitle(char *p)
-{
- XTextProperty prop;
- DEFAULT(p, opt_title);
-
- Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
- &prop);
- XSetWMName(xw.dpy, xw.win, &prop);
- XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
- XFree(prop.value);
-}
-
-int
-wstartdraw(void)
-{
- return IS_SET(MODE_VISIBLE);
-}
-
-void
-wdrawline(Line line, int x1, int y1, int x2)
-{
- int i, x, ox, numspecs;
- Glyph base, new;
- XftGlyphFontSpec *specs = xw.specbuf;
-
- numspecs = wmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
- i = ox = 0;
- for (x = x1; x < x2 && i < numspecs; x++) {
- new = line[x];
- if (new.mode == ATTR_WDUMMY)
- continue;
- if (selected(x, y1))
- new.mode ^= ATTR_REVERSE;
- if (i > 0 && ATTRCMP(base, new)) {
- wdrawglyphfontspecs(specs, base, i, ox, y1);
- specs += i;
- numspecs -= i;
- i = 0;
- }
- if (i == 0) {
- ox = x;
- base = new;
- }
- i++;
- }
- if (i > 0)
- wdrawglyphfontspecs(specs, base, i, ox, y1);
-}
-
-void
-wfinishdraw(void)
-{
- XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
- win.h, 0, 0);
- XSetForeground(xw.dpy, dc.gc,
- dc.col[IS_SET(MODE_REVERSE)?
- defaultfg : defaultbg].pixel);
-}
-
-void
-wximspot(int x, int y)
-{
- if (xw.ime.xic == NULL)
- return;
-
- xw.ime.spot.x = borderpx + x * win.cw;
- xw.ime.spot.y = borderpx + (y + 1) * win.ch;
-
- XSetICValues(xw.ime.xic, XNPreeditAttributes, xw.ime.spotlist, NULL);
-}
-
-void
-expose(XEvent *ev)
-{
- redraw();
-}
-
-void
-visibility(XEvent *ev)
-{
- XVisibilityEvent *e = &ev->xvisibility;
-
- MODBIT(win.mode, e->state != VisibilityFullyObscured, MODE_VISIBLE);
-}
-
-void
-unmap(XEvent *ev)
-{
- win.mode &= ~MODE_VISIBLE;
-}
-
-void
-wsetpointermotion(int set)
-{
- MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
- XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
-}
-
-void
-wsetmode(int set, unsigned int flags)
-{
- int mode = win.mode;
- MODBIT(win.mode, set, flags);
- if ((win.mode & MODE_REVERSE) != (mode & MODE_REVERSE))
- redraw();
-}
-
-int
-wsetcursor(int cursor)
-{
- if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */
- return 1;
- win.cursor = cursor;
- return 0;
-}
-
-void
-wseturgency(int add)
-{
- XWMHints *h = XGetWMHints(xw.dpy, xw.win);
-
- MODBIT(h->flags, add, XUrgencyHint);
- XSetWMHints(xw.dpy, xw.win, h);
- XFree(h);
-}
-
-void
-wbell(void)
-{
- if (!(IS_SET(MODE_FOCUSED)))
- wseturgency(1);
- if (bellvolume)
- XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
-}
-
-void
-focus(XEvent *ev)
-{
- XFocusChangeEvent *e = &ev->xfocus;
-
- if (e->mode == NotifyGrab)
- return;
-
- if (ev->type == FocusIn) {
- if (xw.ime.xic)
- XSetICFocus(xw.ime.xic);
- win.mode |= MODE_FOCUSED;
- wseturgency(0);
- if (IS_SET(MODE_FOCUS))
- ttywrite("\033[I", 3, 0);
- } else {
- if (xw.ime.xic)
- XUnsetICFocus(xw.ime.xic);
- win.mode &= ~MODE_FOCUSED;
- if (IS_SET(MODE_FOCUS))
- ttywrite("\033[O", 3, 0);
- }
-}
-
-int
-match(uint mask, uint state)
-{
- return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
-}
-
-char*
-kmap(KeySym k, uint state)
-{
- Key *kp;
- int i;
-
- /* Check for mapped keys out of X11 function keys. */
- for (i = 0; i < arrlen(mappedkeys); i++) {
- if (mappedkeys[i] == k)
- break;
- }
- if (i == arrlen(mappedkeys)) {
- if ((k & 0xFFFF) < 0xFD00)
- return NULL;
- }
-
- for (kp = key; kp < key + arrlen(key); kp++) {
- if (kp->k != k)
- continue;
-
- if (!match(kp->mask, state))
- continue;
-
- if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
- continue;
- if (IS_SET(MODE_NUMLOCK) && kp->appkey == 2)
- continue;
-
- if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
- continue;
-
- return kp->s;
- }
-
- return NULL;
-}
-
-void
-kpress(XEvent *ev)
-{
- XKeyEvent *e = &ev->xkey;
- KeySym ksym;
- char buf[64], *customkey;
- int len;
- rune c;
- Status status;
- Shortcut *bp;
-
- if (IS_SET(MODE_KBDLOCK))
- return;
-
- if (xw.ime.xic)
- len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status);
- else
- len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
- /* 1. shortcuts */
- for (bp = shortcuts; bp < shortcuts + arrlen(shortcuts); bp++) {
- if (ksym == bp->keysym && match(bp->mod, e->state)) {
- bp->func(&(bp->arg));
- return;
- }
- }
-
- /* 2. custom keys from config.h */
- if ((customkey = kmap(ksym, e->state))) {
- ttywrite(customkey, strlen(customkey), 1);
- return;
- }
-
- /* 3. composed string from input method */
- if (len == 0)
- return;
- if (len == 1 && e->state & Mod1Mask) {
- if (IS_SET(MODE_8BIT)) {
- if (*buf < 0177) {
- c = *buf | 0x80;
- len = utf8·bytetorune(&c, buf);
- }
- } else {
- buf[1] = buf[0];
- buf[0] = '\033';
- len = 2;
- }
- }
- ttywrite(buf, len, 1);
-}
-
-void
-cmessage(XEvent *e)
-{
- /*
- * See xembed specs
- * http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html
- */
- if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
- if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
- win.mode |= MODE_FOCUSED;
- wseturgency(0);
- } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
- win.mode &= ~MODE_FOCUSED;
- }
- } else if (e->xclient.data.l[0] == xw.wmdeletewin) {
- ttyhangup();
- exit(0);
- }
-}
-
-void
-resize(XEvent *e)
-{
- if (e->xconfigure.width == win.w && e->xconfigure.height == win.h)
- return;
-
- cresize(e->xconfigure.width, e->xconfigure.height);
-}
-
-void
-run(void)
-{
- XEvent ev;
- int w = win.w, h = win.h;
- fd_set rfd;
- int xfd = XConnectionNumber(xw.dpy), ttyfd, xev, drawing;
- struct timespec seltv, *tv, now, lastblink, trigger;
- double timeout;
-
- /* Waiting for window mapping */
- do {
- XNextEvent(xw.dpy, &ev);
- /*
- * This XFilterEvent call is required because of XOpenIM. It
- * does filter out the key event and some client message for
- * the input method too.
- */
- if (XFilterEvent(&ev, None))
- continue;
- if (ev.type == ConfigureNotify) {
- w = ev.xconfigure.width;
- h = ev.xconfigure.height;
- }
- } while (ev.type != MapNotify);
-
- ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd);
- cresize(w, h);
-
- for (timeout = -1, drawing = 0, lastblink = (struct timespec){0};;) {
- FD_ZERO(&rfd);
- FD_SET(ttyfd, &rfd);
- FD_SET(xfd, &rfd);
-
- if (XPending(xw.dpy))
- timeout = 0; /* existing events might not set xfd */
-
- seltv.tv_sec = timeout / 1E3;
- seltv.tv_nsec = 1E6 * (timeout - 1E3 * seltv.tv_sec);
- tv = timeout >= 0 ? &seltv : NULL;
-
- if (pselect(MAX(xfd, ttyfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
- if (errno == EINTR)
- continue;
- panicf("select failed");
- }
- clock_gettime(CLOCK_MONOTONIC, &now);
-
- if (FD_ISSET(ttyfd, &rfd))
- ttyread();
-
- xev = 0;
- while (XPending(xw.dpy)) {
- xev = 1;
- XNextEvent(xw.dpy, &ev);
- if (XFilterEvent(&ev, None))
- continue;
- if (handler[ev.type])
- (handler[ev.type])(&ev);
- }
-
- /*
- * To reduce flicker and tearing, when new content or event
- * triggers drawing, we first wait a bit to ensure we got
- * everything, and if nothing new arrives - we draw.
- * We start with trying to wait minlatency ms. If more content
- * arrives sooner, we retry with shorter and shorter periods,
- * and eventually draw even without idle after maxlatency ms.
- * Typically this results in low latency while interacting,
- * maximum latency intervals during `cat huge.txt`, and perfect
- * sync with periodic updates from animations/key-repeats/etc.
- */
- if (FD_ISSET(ttyfd, &rfd) || xev) {
- if (!drawing) {
- trigger = now;
- drawing = 1;
- }
- timeout = (maxlatency - TIMEDIFF(now, trigger)) \
- / maxlatency * minlatency;
- if (timeout > 0)
- continue; /* we have time, try to find idle */
- }
-
- /* idle detected or maxlatency exhausted -> draw */
- timeout = -1;
- if (blinktimeout && tattrset(ATTR_BLINK)) {
- timeout = blinktimeout - TIMEDIFF(now, lastblink);
- if (timeout <= 0) {
- if (-timeout > blinktimeout) /* start visible */
- win.mode |= MODE_BLINK;
- win.mode ^= MODE_BLINK;
- tsetdirtattr(ATTR_BLINK);
- lastblink = now;
- timeout = blinktimeout;
- }
- }
-
- draw();
- XFlush(xw.dpy);
- drawing = 0;
- }
-}
-
-void
-usage(void)
-{
- printf("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
- " [-n name] [-o file]\n"
- " [-T title] [-t title] [-w windowid]"
- " [[-e] command [args ...]]\n"
- " %s [-aiv] [-c class] [-f font] [-g geometry]"
- " [-n name] [-o file]\n"
- " [-T title] [-t title] [-w windowid] -l line"
- " [stty_args ...]\n", argv0, argv0);
- exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
- xw.l = xw.t = 0;
- xw.isfixed = False;
- wsetcursor(cursorshape);
-
- ARGBEGIN {
- case 'a':
- allowaltscreen = 0;
- break;
- case 'c':
- opt_class = EARGF(usage());
- break;
- case 'e':
- if (argc > 0)
- --argc, ++argv;
- goto run;
- case 'f':
- opt_font = EARGF(usage());
- break;
- case 'g':
- xw.gm = XParseGeometry(EARGF(usage()),
- &xw.l, &xw.t, &cols, &rows);
- break;
- case 'i':
- xw.isfixed = 1;
- break;
- case 'o':
- opt_io = EARGF(usage());
- break;
- case 'l':
- opt_line = EARGF(usage());
- break;
- case 'n':
- opt_name = EARGF(usage());
- break;
- case 't':
- case 'T':
- opt_title = EARGF(usage());
- break;
- case 'w':
- opt_embed = EARGF(usage());
- break;
- case 'v':
- printf("%s " VERSION , argv0);
- exit(1);
-
- default:
- usage();
- } ARGEND;
-
-run:
- if (argc > 0) /* eat all remaining arguments */
- opt_cmd = argv;
-
- if (!opt_title)
- opt_title = (opt_line || !opt_cmd) ? "st" : opt_cmd[0];
-
- setlocale(LC_CTYPE, "");
- XSetLocaleModifiers("");
- cols = MAX(cols, 1);
- rows = MAX(rows, 1);
- tnew(cols, rows);
- winit(cols, rows);
- wsetenv();
- selinit();
- run();
-
- return 0;
-}
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-30 14:23:15 +0000