aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Becker <ampernand@gmail.com>2016-10-17 10:05:29 -0400
committerJeff Becker <ampernand@gmail.com>2016-10-17 10:05:29 -0400
commitce1da9219745261f04610cd1846c6438d7ab8c4d (patch)
tree39b309ca99ca3b9843eb1aeb3e40ec9f7a062f9f
parentc7364b21084917e6dc4b166a8a2e9896fda6573d (diff)
downloadwterm-ce1da9219745261f04610cd1846c6438d7ab8c4d.zip
wterm-ce1da9219745261f04610cd1846c6438d7ab8c4d.tar.gz
wterm-ce1da9219745261f04610cd1846c6438d7ab8c4d.tar.bz2
make it compile
-rw-r--r--.gitignore2
-rw-r--r--Makefile30
-rw-r--r--config.def.h400
-rw-r--r--config.mk5
-rw-r--r--include/arg.h63
-rw-r--r--include/config.h400
-rw-r--r--include/wld/drm-private.h (renamed from src/wld/drm-private.h)0
-rw-r--r--include/wld/drm.h (renamed from src/wld/drm.h)0
-rw-r--r--include/wld/pixman.h (renamed from src/wld/pixman.h)0
-rw-r--r--include/wld/wayland-private.h (renamed from src/wld/wayland-private.h)0
-rw-r--r--include/wld/wayland.h (renamed from src/wld/wayland.h)0
-rw-r--r--include/wld/wld-private.h (renamed from src/wld/wld-private.h)0
-rw-r--r--include/wld/wld.h (renamed from src/wld/wld.h)0
-rw-r--r--src/st.c7
-rw-r--r--src/wld/buffer.c2
-rw-r--r--src/wld/buffered_surface.c2
-rw-r--r--src/wld/color.c2
-rw-r--r--src/wld/context.c2
-rw-r--r--src/wld/drm.c4
-rw-r--r--src/wld/dumb.c6
-rw-r--r--src/wld/font.c2
-rw-r--r--src/wld/intel/intel.c (renamed from src/wld/intel.c)18
-rw-r--r--src/wld/nouveau/nouveau.c14
-rw-r--r--src/wld/pixman.c4
-rw-r--r--src/wld/renderer.c2
-rw-r--r--src/wld/surface.c2
-rw-r--r--src/wld/wayland-drm.c10
-rw-r--r--src/wld/wayland-shm.c8
-rw-r--r--src/wld/wayland.c6
29 files changed, 936 insertions, 55 deletions
diff --git a/.gitignore b/.gitignore
index 6dc28a4..4d37905 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@
*\#*
*.o
*-client-protocol.h
+.gdb_history
+*.log
wterm
diff --git a/Makefile b/Makefile
index 86847e8..887c079 100644
--- a/Makefile
+++ b/Makefile
@@ -12,32 +12,42 @@ SOURCES += $(wildcard $(SRC)/*.c)
ifeq ($(ENABLE_INTEL),1)
PKGS += libdrm_intel
SOURCES += $(wildcard $(WLDSRC)/intel/*.c)
+CFLAGS += -DWITH_INTEL_DRM
endif
ifeq ($(ENABLE_NOUVEAU),1)
PKGS += libdrm_nouveau
SOURCES += $(wildcard $(WLDSRC)/nouveau/*.c)
+CFLAGS += -DWITH_NOUVEAU_DRM
endif
-CFLAGS = -std=c99 -Wall -Wextra
-CFLAGS += $(shell pkg-config --cflags $(PKGS)) -I include -I $(WLDSRC)
-LDFLAGS = $(shell pkg-config --libs $(PKGS))
-
-
-OBJECTS = $(SOURCES:.c=.o)
+CFLAGS += -std=c99 -Wall -g
+CFLAGS += $(shell pkg-config --cflags $(PKGS)) -I include
+LDFLAGS = $(shell pkg-config --libs $(PKGS)) -lm -lutil
WAYLAND_HEADERS = $(wildcard include/*.xml)
HDRS = $(WAYLAND_HEADERS:.xml=-client-protocol.h)
+WAYLAND_SRC = $(HDRS:.h=.c)
+SOURCES += $(WAYLAND_SRC)
+
+OBJECTS = $(SOURCES:.c=.o)
+
all: wterm
-$(HDRS): $(WAYLAND_HEADERS)
- wayland-scanner client-header < $< > $@
+include/config.h:
+ cp config.def.h include/config.h
+
+include/%-client-protocol.c: include/%.xml
+ wayland-scanner code < $? > $@
+
+include/%-client-protocol.h: include/%.xml
+ wayland-scanner client-header < $? > $@
-$(OBJECTS): $(HDRS)
+$(OBJECTS): $(HDRS) include/config.h
wterm: $(OBJECTS)
$(CC) -o wterm $(OBJECTS) $(LDFLAGS)
clean:
- rm -f $(OBJECTS) $(HDRS)
+ rm -f $(OBJECTS) $(HDRS) $(WAYLAND_SRC)
diff --git a/config.def.h b/config.def.h
new file mode 100644
index 0000000..4e3c1da
--- /dev/null
+++ b/config.def.h
@@ -0,0 +1,400 @@
+/* See LICENSE file for copyright and license details. */
+
+/*
+ * appearance
+ *
+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
+ */
+static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static int borderpx = 2;
+
+/*
+ * terminal transparency
+ */
+static uint8_t term_alpha = 0xaa;
+
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: utmp option
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
+static char shell[] = "/bin/sh";
+static char *utmp = NULL;
+static char stty_args[] = "stty raw -echo -iexten echonl";
+
+/* identification sequence returned in DA and DECID */
+static char vtiden[] = "\033[?6c";
+
+/* Kerning / character bounding-box multipliers */
+static float cwscale = 1.0;
+static float chscale = 1.0;
+
+/*
+ * word delimiter string
+ *
+ * More advanced example: " `'\"()[]{}"
+ */
+static char worddelimiters[] = " ";
+
+/* selection timeouts (in milliseconds) */
+static unsigned int doubleclicktimeout = 300;
+static unsigned int tripleclicktimeout = 600;
+
+/* key repeat timeouts (in milliseconds) */
+static unsigned int keyrepeatdelay = 500;
+static unsigned int keyrepeatinterval = 25;
+
+/* alt screens */
+static int allowaltscreen = 1;
+
+/*
+ * 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
+ */
+/* XXX: Wayland does not have a bell.
+ * static int bellvolume = 0;
+ */
+
+/* TERM value */
+static char termname[] = "st-256color";
+
+static unsigned int tabspaces = 8;
+
+
+/* Terminal colors (16 first used in escape sequence) */
+static const char *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 */
+};
+
+
+/*
+ * Default colors (colorname index)
+ * foreground, background, cursor
+ */
+static unsigned int defaultfg = 7;
+static unsigned int defaultbg = 0;
+static unsigned int defaultcs = 255;
+
+
+/*
+ * Default shape of the mouse cursor
+ */
+static char mouseshape[] = "xterm";
+
+/*
+ * Colors used, when the specific fg == defaultfg. So in reverse mode this
+ * will reverse too. Another logic would only make the simple feature too
+ * complex.
+ */
+static unsigned int defaultitalic = 11;
+static unsigned int defaultunderline = 7;
+
+/* Internal mouse shortcuts. */
+/* Beware that overloading Button1 will disable the selection. */
+static Mousekey mshortcuts[] = {
+ /* button mask string */
+ { -1, MOD_MASK_NONE, "" }
+};
+
+static Axiskey ashortcuts[] = {
+ /* axis direction mask string */
+ { AXIS_VERTICAL, +1, MOD_MASK_ANY, "\031"},
+ { AXIS_VERTICAL, -1, MOD_MASK_ANY, "\005"},
+};
+
+/* Internal keyboard shortcuts. */
+#define MODKEY MOD_MASK_ALT
+
+static Shortcut shortcuts[] = {
+ /* modifier key function argument */
+ { MOD_MASK_CTRL, XKB_KEY_Print, toggleprinter, {.i = 0} },
+ { MOD_MASK_SHIFT, XKB_KEY_Print, printscreen, {.i = 0} },
+ { MOD_MASK_ANY, XKB_KEY_Print, printsel, {.i = 0} },
+ { MODKEY|MOD_MASK_SHIFT, XKB_KEY_Prior, wlzoom, {.f = +1} },
+ { MODKEY|MOD_MASK_SHIFT, XKB_KEY_Next, wlzoom, {.f = -1} },
+ { MODKEY|MOD_MASK_SHIFT, XKB_KEY_Home, wlzoomreset, {.f = 0} },
+ { MOD_MASK_SHIFT, XKB_KEY_Insert, selpaste, {.i = 0} },
+ { MODKEY, XKB_KEY_Num_Lock, numlock, {.i = 0} },
+};
+
+/*
+ * Special keys (change & recompile st.info accordingly)
+ *
+ * Mask value:
+ * * Use MOD_MASK_ANY to match the key no matter modifiers state
+ * * Use MOD_MASK_NONE 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
+ * crlf value
+ * * 0: no value
+ * * > 0: crlf mode is enabled
+ * * < 0: crlf mode is disabled
+ *
+ * Be careful with the order of the definitions because st searches in
+ * this table sequentially, so any MOD_MASK_ANY 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 xkb_keysym_t mappedkeys[] = { -1 };
+
+/* State bits to ignore when matching key or button events. */
+static uint ignoremod = 0;
+
+/* Override mouse-select while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use MOD_MASK_SHIFT with selmasks, set this to an
+ * other modifier, set to 0 to not use it. */
+static uint forceselmod = MOD_MASK_SHIFT;
+
+static Key key[] = {
+ /* keysym mask string appkey appcursor crlf */
+ { XKB_KEY_KP_Home, MOD_MASK_SHIFT, "\033[2J", 0, -1, 0},
+ { XKB_KEY_KP_Home, MOD_MASK_SHIFT, "\033[1;2H", 0, +1, 0},
+ { XKB_KEY_KP_Home, MOD_MASK_ANY, "\033[H", 0, -1, 0},
+ { XKB_KEY_KP_Home, MOD_MASK_ANY, "\033[1~", 0, +1, 0},
+ { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033Ox", +1, 0, 0},
+ { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033[A", 0, -1, 0},
+ { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033OA", 0, +1, 0},
+ { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033Or", +1, 0, 0},
+ { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033[B", 0, -1, 0},
+ { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033OB", 0, +1, 0},
+ { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033Ot", +1, 0, 0},
+ { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033[D", 0, -1, 0},
+ { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033OD", 0, +1, 0},
+ { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033Ov", +1, 0, 0},
+ { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033[C", 0, -1, 0},
+ { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033OC", 0, +1, 0},
+ { XKB_KEY_KP_Prior, MOD_MASK_SHIFT, "\033[5;2~", 0, 0, 0},
+ { XKB_KEY_KP_Prior, MOD_MASK_ANY, "\033[5~", 0, 0, 0},
+ { XKB_KEY_KP_Begin, MOD_MASK_ANY, "\033[E", 0, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_CTRL, "\033[J", -1, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_CTRL, "\033[1;5F", +1, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_SHIFT, "\033[K", -1, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_SHIFT, "\033[1;2F", +1, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_ANY, "\033[4~", 0, 0, 0},
+ { XKB_KEY_KP_Next, MOD_MASK_SHIFT, "\033[6;2~", 0, 0, 0},
+ { XKB_KEY_KP_Next, MOD_MASK_ANY, "\033[6~", 0, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_SHIFT, "\033[2;2~", +1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_SHIFT, "\033[4l", -1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_CTRL, "\033[L", -1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_CTRL, "\033[2;5~", +1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_ANY, "\033[4h", -1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_ANY, "\033[2~", +1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_CTRL, "\033[M", -1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_CTRL, "\033[3;5~", +1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_SHIFT, "\033[2K", -1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_SHIFT, "\033[3;2~", +1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_ANY, "\033[P", -1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_ANY, "\033[3~", +1, 0, 0},
+ { XKB_KEY_KP_Multiply, MOD_MASK_ANY, "\033Oj", +2, 0, 0},
+ { XKB_KEY_KP_Add, MOD_MASK_ANY, "\033Ok", +2, 0, 0},
+ { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\033OM", +2, 0, 0},
+ { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\r", -1, 0, -1},
+ { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\r\n", -1, 0, +1},
+ { XKB_KEY_KP_Subtract, MOD_MASK_ANY, "\033Om", +2, 0, 0},
+ { XKB_KEY_KP_Decimal, MOD_MASK_ANY, "\033On", +2, 0, 0},
+ { XKB_KEY_KP_Divide, MOD_MASK_ANY, "\033Oo", +2, 0, 0},
+ { XKB_KEY_KP_0, MOD_MASK_ANY, "\033Op", +2, 0, 0},
+ { XKB_KEY_KP_1, MOD_MASK_ANY, "\033Oq", +2, 0, 0},
+ { XKB_KEY_KP_2, MOD_MASK_ANY, "\033Or", +2, 0, 0},
+ { XKB_KEY_KP_3, MOD_MASK_ANY, "\033Os", +2, 0, 0},
+ { XKB_KEY_KP_4, MOD_MASK_ANY, "\033Ot", +2, 0, 0},
+ { XKB_KEY_KP_5, MOD_MASK_ANY, "\033Ou", +2, 0, 0},
+ { XKB_KEY_KP_6, MOD_MASK_ANY, "\033Ov", +2, 0, 0},
+ { XKB_KEY_KP_7, MOD_MASK_ANY, "\033Ow", +2, 0, 0},
+ { XKB_KEY_KP_8, MOD_MASK_ANY, "\033Ox", +2, 0, 0},
+ { XKB_KEY_KP_9, MOD_MASK_ANY, "\033Oy", +2, 0, 0},
+ { XKB_KEY_Up, MOD_MASK_SHIFT, "\033[1;2A", 0, 0, 0},
+ { XKB_KEY_Up, MOD_MASK_CTRL, "\033[1;5A", 0, 0, 0},
+ { XKB_KEY_Up, MOD_MASK_ALT, "\033[1;3A", 0, 0, 0},
+ { XKB_KEY_Up, MOD_MASK_ANY, "\033[A", 0, -1, 0},
+ { XKB_KEY_Up, MOD_MASK_ANY, "\033OA", 0, +1, 0},
+ { XKB_KEY_Down, MOD_MASK_SHIFT, "\033[1;2B", 0, 0, 0},
+ { XKB_KEY_Down, MOD_MASK_CTRL, "\033[1;5B", 0, 0, 0},
+ { XKB_KEY_Down, MOD_MASK_ALT, "\033[1;3B", 0, 0, 0},
+ { XKB_KEY_Down, MOD_MASK_ANY, "\033[B", 0, -1, 0},
+ { XKB_KEY_Down, MOD_MASK_ANY, "\033OB", 0, +1, 0},
+ { XKB_KEY_Left, MOD_MASK_SHIFT, "\033[1;2D", 0, 0, 0},
+ { XKB_KEY_Left, MOD_MASK_CTRL, "\033[1;5D", 0, 0, 0},
+ { XKB_KEY_Left, MOD_MASK_ALT, "\033[1;3D", 0, 0, 0},
+ { XKB_KEY_Left, MOD_MASK_ANY, "\033[D", 0, -1, 0},
+ { XKB_KEY_Left, MOD_MASK_ANY, "\033OD", 0, +1, 0},
+ { XKB_KEY_Right, MOD_MASK_SHIFT, "\033[1;2C", 0, 0, 0},
+ { XKB_KEY_Right, MOD_MASK_CTRL, "\033[1;5C", 0, 0, 0},
+ { XKB_KEY_Right, MOD_MASK_ALT, "\033[1;3C", 0, 0, 0},
+ { XKB_KEY_Right, MOD_MASK_ANY, "\033[C", 0, -1, 0},
+ { XKB_KEY_Right, MOD_MASK_ANY, "\033OC", 0, +1, 0},
+ { XKB_KEY_ISO_Left_Tab, MOD_MASK_SHIFT, "\033[Z", 0, 0, 0},
+ { XKB_KEY_Return, MOD_MASK_ALT, "\033\r", 0, 0, -1},
+ { XKB_KEY_Return, MOD_MASK_ALT, "\033\r\n", 0, 0, +1},
+ { XKB_KEY_Return, MOD_MASK_ANY, "\r", 0, 0, -1},
+ { XKB_KEY_Return, MOD_MASK_ANY, "\r\n", 0, 0, +1},
+ { XKB_KEY_Insert, MOD_MASK_SHIFT, "\033[4l", -1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_SHIFT, "\033[2;2~", +1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_CTRL, "\033[L", -1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_CTRL, "\033[2;5~", +1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_ANY, "\033[4h", -1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_ANY, "\033[2~", +1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_CTRL, "\033[M", -1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_CTRL, "\033[3;5~", +1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_SHIFT, "\033[2K", -1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_SHIFT, "\033[3;2~", +1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_ANY, "\033[P", -1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_ANY, "\033[3~", +1, 0, 0},
+ { XKB_KEY_BackSpace, MOD_MASK_NONE, "\177", 0, 0, 0},
+ { XKB_KEY_Home, MOD_MASK_SHIFT, "\033[2J", 0, -1, 0},
+ { XKB_KEY_Home, MOD_MASK_SHIFT, "\033[1;2H", 0, +1, 0},
+ { XKB_KEY_Home, MOD_MASK_ANY, "\033[H", 0, -1, 0},
+ { XKB_KEY_Home, MOD_MASK_ANY, "\033[1~", 0, +1, 0},
+ { XKB_KEY_End, MOD_MASK_CTRL, "\033[J", -1, 0, 0},
+ { XKB_KEY_End, MOD_MASK_CTRL, "\033[1;5F", +1, 0, 0},
+ { XKB_KEY_End, MOD_MASK_SHIFT, "\033[K", -1, 0, 0},
+ { XKB_KEY_End, MOD_MASK_SHIFT, "\033[1;2F", +1, 0, 0},
+ { XKB_KEY_End, MOD_MASK_ANY, "\033[4~", 0, 0, 0},
+ { XKB_KEY_Prior, MOD_MASK_CTRL, "\033[5;5~", 0, 0, 0},
+ { XKB_KEY_Prior, MOD_MASK_SHIFT, "\033[5;2~", 0, 0, 0},
+ { XKB_KEY_Prior, MOD_MASK_ANY, "\033[5~", 0, 0, 0},
+ { XKB_KEY_Next, MOD_MASK_CTRL, "\033[6;5~", 0, 0, 0},
+ { XKB_KEY_Next, MOD_MASK_SHIFT, "\033[6;2~", 0, 0, 0},
+ { XKB_KEY_Next, MOD_MASK_ANY, "\033[6~", 0, 0, 0},
+ { XKB_KEY_F1, MOD_MASK_NONE, "\033OP" , 0, 0, 0},
+ { XKB_KEY_F1, /* F13 */ MOD_MASK_SHIFT, "\033[1;2P", 0, 0, 0},
+ { XKB_KEY_F1, /* F25 */ MOD_MASK_CTRL, "\033[1;5P", 0, 0, 0},
+ { XKB_KEY_F1, /* F37 */ MOD_MASK_LOGO, "\033[1;6P", 0, 0, 0},
+ { XKB_KEY_F1, /* F49 */ MOD_MASK_ALT, "\033[1;3P", 0, 0, 0},
+ { XKB_KEY_F2, MOD_MASK_NONE, "\033OQ" , 0, 0, 0},
+ { XKB_KEY_F2, /* F14 */ MOD_MASK_SHIFT, "\033[1;2Q", 0, 0, 0},
+ { XKB_KEY_F2, /* F26 */ MOD_MASK_CTRL, "\033[1;5Q", 0, 0, 0},
+ { XKB_KEY_F2, /* F38 */ MOD_MASK_LOGO, "\033[1;6Q", 0, 0, 0},
+ { XKB_KEY_F2, /* F50 */ MOD_MASK_ALT, "\033[1;3Q", 0, 0, 0},
+ { XKB_KEY_F3, MOD_MASK_NONE, "\033OR" , 0, 0, 0},
+ { XKB_KEY_F3, /* F15 */ MOD_MASK_SHIFT, "\033[1;2R", 0, 0, 0},
+ { XKB_KEY_F3, /* F27 */ MOD_MASK_CTRL, "\033[1;5R", 0, 0, 0},
+ { XKB_KEY_F3, /* F39 */ MOD_MASK_LOGO, "\033[1;6R", 0, 0, 0},
+ { XKB_KEY_F3, /* F51 */ MOD_MASK_ALT, "\033[1;3R", 0, 0, 0},
+ { XKB_KEY_F4, MOD_MASK_NONE, "\033OS" , 0, 0, 0},
+ { XKB_KEY_F4, /* F16 */ MOD_MASK_SHIFT, "\033[1;2S", 0, 0, 0},
+ { XKB_KEY_F4, /* F28 */ MOD_MASK_CTRL, "\033[1;5S", 0, 0, 0},
+ { XKB_KEY_F4, /* F40 */ MOD_MASK_LOGO, "\033[1;6S", 0, 0, 0},
+ { XKB_KEY_F4, /* F52 */ MOD_MASK_ALT, "\033[1;3S", 0, 0, 0},
+ { XKB_KEY_F5, MOD_MASK_NONE, "\033[15~", 0, 0, 0},
+ { XKB_KEY_F5, /* F17 */ MOD_MASK_SHIFT, "\033[15;2~", 0, 0, 0},
+ { XKB_KEY_F5, /* F29 */ MOD_MASK_CTRL, "\033[15;5~", 0, 0, 0},
+ { XKB_KEY_F5, /* F41 */ MOD_MASK_LOGO, "\033[15;6~", 0, 0, 0},
+ { XKB_KEY_F5, /* F53 */ MOD_MASK_ALT, "\033[15;3~", 0, 0, 0},
+ { XKB_KEY_F6, MOD_MASK_NONE, "\033[17~", 0, 0, 0},
+ { XKB_KEY_F6, /* F18 */ MOD_MASK_SHIFT, "\033[17;2~", 0, 0, 0},
+ { XKB_KEY_F6, /* F30 */ MOD_MASK_CTRL, "\033[17;5~", 0, 0, 0},
+ { XKB_KEY_F6, /* F42 */ MOD_MASK_LOGO, "\033[17;6~", 0, 0, 0},
+ { XKB_KEY_F6, /* F54 */ MOD_MASK_ALT, "\033[17;3~", 0, 0, 0},
+ { XKB_KEY_F7, MOD_MASK_NONE, "\033[18~", 0, 0, 0},
+ { XKB_KEY_F7, /* F19 */ MOD_MASK_SHIFT, "\033[18;2~", 0, 0, 0},
+ { XKB_KEY_F7, /* F31 */ MOD_MASK_CTRL, "\033[18;5~", 0, 0, 0},
+ { XKB_KEY_F7, /* F43 */ MOD_MASK_LOGO, "\033[18;6~", 0, 0, 0},
+ { XKB_KEY_F7, /* F55 */ MOD_MASK_ALT, "\033[18;3~", 0, 0, 0},
+ { XKB_KEY_F8, MOD_MASK_NONE, "\033[19~", 0, 0, 0},
+ { XKB_KEY_F8, /* F20 */ MOD_MASK_SHIFT, "\033[19;2~", 0, 0, 0},
+ { XKB_KEY_F8, /* F32 */ MOD_MASK_CTRL, "\033[19;5~", 0, 0, 0},
+ { XKB_KEY_F8, /* F44 */ MOD_MASK_LOGO, "\033[19;6~", 0, 0, 0},
+ { XKB_KEY_F8, /* F56 */ MOD_MASK_ALT, "\033[19;3~", 0, 0, 0},
+ { XKB_KEY_F9, MOD_MASK_NONE, "\033[20~", 0, 0, 0},
+ { XKB_KEY_F9, /* F21 */ MOD_MASK_SHIFT, "\033[20;2~", 0, 0, 0},
+ { XKB_KEY_F9, /* F33 */ MOD_MASK_CTRL, "\033[20;5~", 0, 0, 0},
+ { XKB_KEY_F9, /* F45 */ MOD_MASK_LOGO, "\033[20;6~", 0, 0, 0},
+ { XKB_KEY_F9, /* F57 */ MOD_MASK_ALT, "\033[20;3~", 0, 0, 0},
+ { XKB_KEY_F10, MOD_MASK_NONE, "\033[21~", 0, 0, 0},
+ { XKB_KEY_F10, /* F22 */ MOD_MASK_SHIFT, "\033[21;2~", 0, 0, 0},
+ { XKB_KEY_F10, /* F34 */ MOD_MASK_CTRL, "\033[21;5~", 0, 0, 0},
+ { XKB_KEY_F10, /* F46 */ MOD_MASK_LOGO, "\033[21;6~", 0, 0, 0},
+ { XKB_KEY_F10, /* F58 */ MOD_MASK_ALT, "\033[21;3~", 0, 0, 0},
+ { XKB_KEY_F11, MOD_MASK_NONE, "\033[23~", 0, 0, 0},
+ { XKB_KEY_F11, /* F23 */ MOD_MASK_SHIFT, "\033[23;2~", 0, 0, 0},
+ { XKB_KEY_F11, /* F35 */ MOD_MASK_CTRL, "\033[23;5~", 0, 0, 0},
+ { XKB_KEY_F11, /* F47 */ MOD_MASK_LOGO, "\033[23;6~", 0, 0, 0},
+ { XKB_KEY_F11, /* F59 */ MOD_MASK_ALT, "\033[23;3~", 0, 0, 0},
+ { XKB_KEY_F12, MOD_MASK_NONE, "\033[24~", 0, 0, 0},
+ { XKB_KEY_F12, /* F24 */ MOD_MASK_SHIFT, "\033[24;2~", 0, 0, 0},
+ { XKB_KEY_F12, /* F36 */ MOD_MASK_CTRL, "\033[24;5~", 0, 0, 0},
+ { XKB_KEY_F12, /* F48 */ MOD_MASK_LOGO, "\033[24;6~", 0, 0, 0},
+ { XKB_KEY_F12, /* F60 */ MOD_MASK_ALT, "\033[24;3~", 0, 0, 0},
+ { XKB_KEY_F13, MOD_MASK_NONE, "\033[1;2P", 0, 0, 0},
+ { XKB_KEY_F14, MOD_MASK_NONE, "\033[1;2Q", 0, 0, 0},
+ { XKB_KEY_F15, MOD_MASK_NONE, "\033[1;2R", 0, 0, 0},
+ { XKB_KEY_F16, MOD_MASK_NONE, "\033[1;2S", 0, 0, 0},
+ { XKB_KEY_F17, MOD_MASK_NONE, "\033[15;2~", 0, 0, 0},
+ { XKB_KEY_F18, MOD_MASK_NONE, "\033[17;2~", 0, 0, 0},
+ { XKB_KEY_F19, MOD_MASK_NONE, "\033[18;2~", 0, 0, 0},
+ { XKB_KEY_F20, MOD_MASK_NONE, "\033[19;2~", 0, 0, 0},
+ { XKB_KEY_F21, MOD_MASK_NONE, "\033[20;2~", 0, 0, 0},
+ { XKB_KEY_F22, MOD_MASK_NONE, "\033[21;2~", 0, 0, 0},
+ { XKB_KEY_F23, MOD_MASK_NONE, "\033[23;2~", 0, 0, 0},
+ { XKB_KEY_F24, MOD_MASK_NONE, "\033[24;2~", 0, 0, 0},
+ { XKB_KEY_F25, MOD_MASK_NONE, "\033[1;5P", 0, 0, 0},
+ { XKB_KEY_F26, MOD_MASK_NONE, "\033[1;5Q", 0, 0, 0},
+ { XKB_KEY_F27, MOD_MASK_NONE, "\033[1;5R", 0, 0, 0},
+ { XKB_KEY_F28, MOD_MASK_NONE, "\033[1;5S", 0, 0, 0},
+ { XKB_KEY_F29, MOD_MASK_NONE, "\033[15;5~", 0, 0, 0},
+ { XKB_KEY_F30, MOD_MASK_NONE, "\033[17;5~", 0, 0, 0},
+ { XKB_KEY_F31, MOD_MASK_NONE, "\033[18;5~", 0, 0, 0},
+ { XKB_KEY_F32, MOD_MASK_NONE, "\033[19;5~", 0, 0, 0},
+ { XKB_KEY_F33, MOD_MASK_NONE, "\033[20;5~", 0, 0, 0},
+ { XKB_KEY_F34, MOD_MASK_NONE, "\033[21;5~", 0, 0, 0},
+ { XKB_KEY_F35, MOD_MASK_NONE, "\033[23;5~", 0, 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] = MOD_MASK_ALT,
+};
+
diff --git a/config.mk b/config.mk
index 56a640d..49d722b 100644
--- a/config.mk
+++ b/config.mk
@@ -1,4 +1,7 @@
+VERSION = 0.7
ENABLE_INTEL = 1
-ENABLE_NOUVEAU = 0
+ENABLE_NOUVEAU = 1
+
+CFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=700
diff --git a/include/arg.h b/include/arg.h
new file mode 100644
index 0000000..4df77a7
--- /dev/null
+++ b/include/arg.h
@@ -0,0 +1,63 @@
+/*
+ * Copy me if you can.
+ * by 20h
+ */
+
+#ifndef ARG_H__
+#define ARG_H__
+
+extern char *argv0;
+
+/* use main(int argc, char *argv[]) */
+#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
+ argv[0] && argv[0][1]\
+ && argv[0][0] == '-';\
+ argc--, argv++) {\
+ char argc_;\
+ char **argv_;\
+ int brk_;\
+ if (argv[0][1] == '-' && argv[0][2] == '\0') {\
+ argv++;\
+ argc--;\
+ break;\
+ }\
+ for (brk_ = 0, argv[0]++, argv_ = argv;\
+ argv[0][0] && !brk_;\
+ argv[0]++) {\
+ if (argv_ != argv)\
+ break;\
+ argc_ = argv[0][0];\
+ switch (argc_)
+
+/* Handles obsolete -NUM syntax */
+#define ARGNUM case '0':\
+ case '1':\
+ case '2':\
+ case '3':\
+ case '4':\
+ case '5':\
+ case '6':\
+ case '7':\
+ case '8':\
+ case '9'
+
+#define ARGEND }\
+ }
+
+#define ARGC() argc_
+
+#define ARGNUMF(base) (brk_ = 1, estrtol(argv[0], (base)))
+
+#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\
+ ((x), abort(), (char *)0) :\
+ (brk_ = 1, (argv[0][1] != '\0')?\
+ (&argv[0][1]) :\
+ (argc--, argv++, argv[0])))
+
+#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\
+ (char *)0 :\
+ (brk_ = 1, (argv[0][1] != '\0')?\
+ (&argv[0][1]) :\
+ (argc--, argv++, argv[0])))
+
+#endif
diff --git a/include/config.h b/include/config.h
index e69de29..4e3c1da 100644
--- a/include/config.h
+++ b/include/config.h
@@ -0,0 +1,400 @@
+/* See LICENSE file for copyright and license details. */
+
+/*
+ * appearance
+ *
+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
+ */
+static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static int borderpx = 2;
+
+/*
+ * terminal transparency
+ */
+static uint8_t term_alpha = 0xaa;
+
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: utmp option
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
+static char shell[] = "/bin/sh";
+static char *utmp = NULL;
+static char stty_args[] = "stty raw -echo -iexten echonl";
+
+/* identification sequence returned in DA and DECID */
+static char vtiden[] = "\033[?6c";
+
+/* Kerning / character bounding-box multipliers */
+static float cwscale = 1.0;
+static float chscale = 1.0;
+
+/*
+ * word delimiter string
+ *
+ * More advanced example: " `'\"()[]{}"
+ */
+static char worddelimiters[] = " ";
+
+/* selection timeouts (in milliseconds) */
+static unsigned int doubleclicktimeout = 300;
+static unsigned int tripleclicktimeout = 600;
+
+/* key repeat timeouts (in milliseconds) */
+static unsigned int keyrepeatdelay = 500;
+static unsigned int keyrepeatinterval = 25;
+
+/* alt screens */
+static int allowaltscreen = 1;
+
+/*
+ * 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
+ */
+/* XXX: Wayland does not have a bell.
+ * static int bellvolume = 0;
+ */
+
+/* TERM value */
+static char termname[] = "st-256color";
+
+static unsigned int tabspaces = 8;
+
+
+/* Terminal colors (16 first used in escape sequence) */
+static const char *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 */
+};
+
+
+/*
+ * Default colors (colorname index)
+ * foreground, background, cursor
+ */
+static unsigned int defaultfg = 7;
+static unsigned int defaultbg = 0;
+static unsigned int defaultcs = 255;
+
+
+/*
+ * Default shape of the mouse cursor
+ */
+static char mouseshape[] = "xterm";
+
+/*
+ * Colors used, when the specific fg == defaultfg. So in reverse mode this
+ * will reverse too. Another logic would only make the simple feature too
+ * complex.
+ */
+static unsigned int defaultitalic = 11;
+static unsigned int defaultunderline = 7;
+
+/* Internal mouse shortcuts. */
+/* Beware that overloading Button1 will disable the selection. */
+static Mousekey mshortcuts[] = {
+ /* button mask string */
+ { -1, MOD_MASK_NONE, "" }
+};
+
+static Axiskey ashortcuts[] = {
+ /* axis direction mask string */
+ { AXIS_VERTICAL, +1, MOD_MASK_ANY, "\031"},
+ { AXIS_VERTICAL, -1, MOD_MASK_ANY, "\005"},
+};
+
+/* Internal keyboard shortcuts. */
+#define MODKEY MOD_MASK_ALT
+
+static Shortcut shortcuts[] = {
+ /* modifier key function argument */
+ { MOD_MASK_CTRL, XKB_KEY_Print, toggleprinter, {.i = 0} },
+ { MOD_MASK_SHIFT, XKB_KEY_Print, printscreen, {.i = 0} },
+ { MOD_MASK_ANY, XKB_KEY_Print, printsel, {.i = 0} },
+ { MODKEY|MOD_MASK_SHIFT, XKB_KEY_Prior, wlzoom, {.f = +1} },
+ { MODKEY|MOD_MASK_SHIFT, XKB_KEY_Next, wlzoom, {.f = -1} },
+ { MODKEY|MOD_MASK_SHIFT, XKB_KEY_Home, wlzoomreset, {.f = 0} },
+ { MOD_MASK_SHIFT, XKB_KEY_Insert, selpaste, {.i = 0} },
+ { MODKEY, XKB_KEY_Num_Lock, numlock, {.i = 0} },
+};
+
+/*
+ * Special keys (change & recompile st.info accordingly)
+ *
+ * Mask value:
+ * * Use MOD_MASK_ANY to match the key no matter modifiers state
+ * * Use MOD_MASK_NONE 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
+ * crlf value
+ * * 0: no value
+ * * > 0: crlf mode is enabled
+ * * < 0: crlf mode is disabled
+ *
+ * Be careful with the order of the definitions because st searches in
+ * this table sequentially, so any MOD_MASK_ANY 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 xkb_keysym_t mappedkeys[] = { -1 };
+
+/* State bits to ignore when matching key or button events. */
+static uint ignoremod = 0;
+
+/* Override mouse-select while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use MOD_MASK_SHIFT with selmasks, set this to an
+ * other modifier, set to 0 to not use it. */
+static uint forceselmod = MOD_MASK_SHIFT;
+
+static Key key[] = {
+ /* keysym mask string appkey appcursor crlf */
+ { XKB_KEY_KP_Home, MOD_MASK_SHIFT, "\033[2J", 0, -1, 0},
+ { XKB_KEY_KP_Home, MOD_MASK_SHIFT, "\033[1;2H", 0, +1, 0},
+ { XKB_KEY_KP_Home, MOD_MASK_ANY, "\033[H", 0, -1, 0},
+ { XKB_KEY_KP_Home, MOD_MASK_ANY, "\033[1~", 0, +1, 0},
+ { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033Ox", +1, 0, 0},
+ { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033[A", 0, -1, 0},
+ { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033OA", 0, +1, 0},
+ { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033Or", +1, 0, 0},
+ { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033[B", 0, -1, 0},
+ { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033OB", 0, +1, 0},
+ { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033Ot", +1, 0, 0},
+ { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033[D", 0, -1, 0},
+ { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033OD", 0, +1, 0},
+ { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033Ov", +1, 0, 0},
+ { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033[C", 0, -1, 0},
+ { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033OC", 0, +1, 0},
+ { XKB_KEY_KP_Prior, MOD_MASK_SHIFT, "\033[5;2~", 0, 0, 0},
+ { XKB_KEY_KP_Prior, MOD_MASK_ANY, "\033[5~", 0, 0, 0},
+ { XKB_KEY_KP_Begin, MOD_MASK_ANY, "\033[E", 0, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_CTRL, "\033[J", -1, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_CTRL, "\033[1;5F", +1, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_SHIFT, "\033[K", -1, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_SHIFT, "\033[1;2F", +1, 0, 0},
+ { XKB_KEY_KP_End, MOD_MASK_ANY, "\033[4~", 0, 0, 0},
+ { XKB_KEY_KP_Next, MOD_MASK_SHIFT, "\033[6;2~", 0, 0, 0},
+ { XKB_KEY_KP_Next, MOD_MASK_ANY, "\033[6~", 0, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_SHIFT, "\033[2;2~", +1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_SHIFT, "\033[4l", -1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_CTRL, "\033[L", -1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_CTRL, "\033[2;5~", +1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_ANY, "\033[4h", -1, 0, 0},
+ { XKB_KEY_KP_Insert, MOD_MASK_ANY, "\033[2~", +1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_CTRL, "\033[M", -1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_CTRL, "\033[3;5~", +1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_SHIFT, "\033[2K", -1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_SHIFT, "\033[3;2~", +1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_ANY, "\033[P", -1, 0, 0},
+ { XKB_KEY_KP_Delete, MOD_MASK_ANY, "\033[3~", +1, 0, 0},
+ { XKB_KEY_KP_Multiply, MOD_MASK_ANY, "\033Oj", +2, 0, 0},
+ { XKB_KEY_KP_Add, MOD_MASK_ANY, "\033Ok", +2, 0, 0},
+ { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\033OM", +2, 0, 0},
+ { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\r", -1, 0, -1},
+ { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\r\n", -1, 0, +1},
+ { XKB_KEY_KP_Subtract, MOD_MASK_ANY, "\033Om", +2, 0, 0},
+ { XKB_KEY_KP_Decimal, MOD_MASK_ANY, "\033On", +2, 0, 0},
+ { XKB_KEY_KP_Divide, MOD_MASK_ANY, "\033Oo", +2, 0, 0},
+ { XKB_KEY_KP_0, MOD_MASK_ANY, "\033Op", +2, 0, 0},
+ { XKB_KEY_KP_1, MOD_MASK_ANY, "\033Oq", +2, 0, 0},
+ { XKB_KEY_KP_2, MOD_MASK_ANY, "\033Or", +2, 0, 0},
+ { XKB_KEY_KP_3, MOD_MASK_ANY, "\033Os", +2, 0, 0},
+ { XKB_KEY_KP_4, MOD_MASK_ANY, "\033Ot", +2, 0, 0},
+ { XKB_KEY_KP_5, MOD_MASK_ANY, "\033Ou", +2, 0, 0},
+ { XKB_KEY_KP_6, MOD_MASK_ANY, "\033Ov", +2, 0, 0},
+ { XKB_KEY_KP_7, MOD_MASK_ANY, "\033Ow", +2, 0, 0},
+ { XKB_KEY_KP_8, MOD_MASK_ANY, "\033Ox", +2, 0, 0},
+ { XKB_KEY_KP_9, MOD_MASK_ANY, "\033Oy", +2, 0, 0},
+ { XKB_KEY_Up, MOD_MASK_SHIFT, "\033[1;2A", 0, 0, 0},
+ { XKB_KEY_Up, MOD_MASK_CTRL, "\033[1;5A", 0, 0, 0},
+ { XKB_KEY_Up, MOD_MASK_ALT, "\033[1;3A", 0, 0, 0},
+ { XKB_KEY_Up, MOD_MASK_ANY, "\033[A", 0, -1, 0},
+ { XKB_KEY_Up, MOD_MASK_ANY, "\033OA", 0, +1, 0},
+ { XKB_KEY_Down, MOD_MASK_SHIFT, "\033[1;2B", 0, 0, 0},
+ { XKB_KEY_Down, MOD_MASK_CTRL, "\033[1;5B", 0, 0, 0},
+ { XKB_KEY_Down, MOD_MASK_ALT, "\033[1;3B", 0, 0, 0},
+ { XKB_KEY_Down, MOD_MASK_ANY, "\033[B", 0, -1, 0},
+ { XKB_KEY_Down, MOD_MASK_ANY, "\033OB", 0, +1, 0},
+ { XKB_KEY_Left, MOD_MASK_SHIFT, "\033[1;2D", 0, 0, 0},
+ { XKB_KEY_Left, MOD_MASK_CTRL, "\033[1;5D", 0, 0, 0},
+ { XKB_KEY_Left, MOD_MASK_ALT, "\033[1;3D", 0, 0, 0},
+ { XKB_KEY_Left, MOD_MASK_ANY, "\033[D", 0, -1, 0},
+ { XKB_KEY_Left, MOD_MASK_ANY, "\033OD", 0, +1, 0},
+ { XKB_KEY_Right, MOD_MASK_SHIFT, "\033[1;2C", 0, 0, 0},
+ { XKB_KEY_Right, MOD_MASK_CTRL, "\033[1;5C", 0, 0, 0},
+ { XKB_KEY_Right, MOD_MASK_ALT, "\033[1;3C", 0, 0, 0},
+ { XKB_KEY_Right, MOD_MASK_ANY, "\033[C", 0, -1, 0},
+ { XKB_KEY_Right, MOD_MASK_ANY, "\033OC", 0, +1, 0},
+ { XKB_KEY_ISO_Left_Tab, MOD_MASK_SHIFT, "\033[Z", 0, 0, 0},
+ { XKB_KEY_Return, MOD_MASK_ALT, "\033\r", 0, 0, -1},
+ { XKB_KEY_Return, MOD_MASK_ALT, "\033\r\n", 0, 0, +1},
+ { XKB_KEY_Return, MOD_MASK_ANY, "\r", 0, 0, -1},
+ { XKB_KEY_Return, MOD_MASK_ANY, "\r\n", 0, 0, +1},
+ { XKB_KEY_Insert, MOD_MASK_SHIFT, "\033[4l", -1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_SHIFT, "\033[2;2~", +1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_CTRL, "\033[L", -1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_CTRL, "\033[2;5~", +1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_ANY, "\033[4h", -1, 0, 0},
+ { XKB_KEY_Insert, MOD_MASK_ANY, "\033[2~", +1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_CTRL, "\033[M", -1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_CTRL, "\033[3;5~", +1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_SHIFT, "\033[2K", -1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_SHIFT, "\033[3;2~", +1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_ANY, "\033[P", -1, 0, 0},
+ { XKB_KEY_Delete, MOD_MASK_ANY, "\033[3~", +1, 0, 0},
+ { XKB_KEY_BackSpace, MOD_MASK_NONE, "\177", 0, 0, 0},
+ { XKB_KEY_Home, MOD_MASK_SHIFT, "\033[2J", 0, -1, 0},
+ { XKB_KEY_Home, MOD_MASK_SHIFT, "\033[1;2H", 0, +1, 0},
+ { XKB_KEY_Home, MOD_MASK_ANY, "\033[H", 0, -1, 0},
+ { XKB_KEY_Home, MOD_MASK_ANY, "\033[1~", 0, +1, 0},
+ { XKB_KEY_End, MOD_MASK_CTRL, "\033[J", -1, 0, 0},
+ { XKB_KEY_End, MOD_MASK_CTRL, "\033[1;5F", +1, 0, 0},
+ { XKB_KEY_End, MOD_MASK_SHIFT, "\033[K", -1, 0, 0},
+ { XKB_KEY_End, MOD_MASK_SHIFT, "\033[1;2F", +1, 0, 0},
+ { XKB_KEY_End, MOD_MASK_ANY, "\033[4~", 0, 0, 0},
+ { XKB_KEY_Prior, MOD_MASK_CTRL, "\033[5;5~", 0, 0, 0},
+ { XKB_KEY_Prior, MOD_MASK_SHIFT, "\033[5;2~", 0, 0, 0},
+ { XKB_KEY_Prior, MOD_MASK_ANY, "\033[5~", 0, 0, 0},
+ { XKB_KEY_Next, MOD_MASK_CTRL, "\033[6;5~", 0, 0, 0},
+ { XKB_KEY_Next, MOD_MASK_SHIFT, "\033[6;2~", 0, 0, 0},
+ { XKB_KEY_Next, MOD_MASK_ANY, "\033[6~", 0, 0, 0},
+ { XKB_KEY_F1, MOD_MASK_NONE, "\033OP" , 0, 0, 0},
+ { XKB_KEY_F1, /* F13 */ MOD_MASK_SHIFT, "\033[1;2P", 0, 0, 0},
+ { XKB_KEY_F1, /* F25 */ MOD_MASK_CTRL, "\033[1;5P", 0, 0, 0},
+ { XKB_KEY_F1, /* F37 */ MOD_MASK_LOGO, "\033[1;6P", 0, 0, 0},
+ { XKB_KEY_F1, /* F49 */ MOD_MASK_ALT, "\033[1;3P", 0, 0, 0},
+ { XKB_KEY_F2, MOD_MASK_NONE, "\033OQ" , 0, 0, 0},
+ { XKB_KEY_F2, /* F14 */ MOD_MASK_SHIFT, "\033[1;2Q", 0, 0, 0},
+ { XKB_KEY_F2, /* F26 */ MOD_MASK_CTRL, "\033[1;5Q", 0, 0, 0},
+ { XKB_KEY_F2, /* F38 */ MOD_MASK_LOGO, "\033[1;6Q", 0, 0, 0},
+ { XKB_KEY_F2, /* F50 */ MOD_MASK_ALT, "\033[1;3Q", 0, 0, 0},
+ { XKB_KEY_F3, MOD_MASK_NONE, "\033OR" , 0, 0, 0},
+ { XKB_KEY_F3, /* F15 */ MOD_MASK_SHIFT, "\033[1;2R", 0, 0, 0},
+ { XKB_KEY_F3, /* F27 */ MOD_MASK_CTRL, "\033[1;5R", 0, 0, 0},
+ { XKB_KEY_F3, /* F39 */ MOD_MASK_LOGO, "\033[1;6R", 0, 0, 0},
+ { XKB_KEY_F3, /* F51 */ MOD_MASK_ALT, "\033[1;3R", 0, 0, 0},
+ { XKB_KEY_F4, MOD_MASK_NONE, "\033OS" , 0, 0, 0},
+ { XKB_KEY_F4, /* F16 */ MOD_MASK_SHIFT, "\033[1;2S", 0, 0, 0},
+ { XKB_KEY_F4, /* F28 */ MOD_MASK_CTRL, "\033[1;5S", 0, 0, 0},
+ { XKB_KEY_F4, /* F40 */ MOD_MASK_LOGO, "\033[1;6S", 0, 0, 0},
+ { XKB_KEY_F4, /* F52 */ MOD_MASK_ALT, "\033[1;3S", 0, 0, 0},
+ { XKB_KEY_F5, MOD_MASK_NONE, "\033[15~", 0, 0, 0},
+ { XKB_KEY_F5, /* F17 */ MOD_MASK_SHIFT, "\033[15;2~", 0, 0, 0},
+ { XKB_KEY_F5, /* F29 */ MOD_MASK_CTRL, "\033[15;5~", 0, 0, 0},
+ { XKB_KEY_F5, /* F41 */ MOD_MASK_LOGO, "\033[15;6~", 0, 0, 0},
+ { XKB_KEY_F5, /* F53 */ MOD_MASK_ALT, "\033[15;3~", 0, 0, 0},
+ { XKB_KEY_F6, MOD_MASK_NONE, "\033[17~", 0, 0, 0},
+ { XKB_KEY_F6, /* F18 */ MOD_MASK_SHIFT, "\033[17;2~", 0, 0, 0},
+ { XKB_KEY_F6, /* F30 */ MOD_MASK_CTRL, "\033[17;5~", 0, 0, 0},
+ { XKB_KEY_F6, /* F42 */ MOD_MASK_LOGO, "\033[17;6~", 0, 0, 0},
+ { XKB_KEY_F6, /* F54 */ MOD_MASK_ALT, "\033[17;3~", 0, 0, 0},
+ { XKB_KEY_F7, MOD_MASK_NONE, "\033[18~", 0, 0, 0},
+ { XKB_KEY_F7, /* F19 */ MOD_MASK_SHIFT, "\033[18;2~", 0, 0, 0},
+ { XKB_KEY_F7, /* F31 */ MOD_MASK_CTRL, "\033[18;5~", 0, 0, 0},
+ { XKB_KEY_F7, /* F43 */ MOD_MASK_LOGO, "\033[18;6~", 0, 0, 0},
+ { XKB_KEY_F7, /* F55 */ MOD_MASK_ALT, "\033[18;3~", 0, 0, 0},
+ { XKB_KEY_F8, MOD_MASK_NONE, "\033[19~", 0, 0, 0},
+ { XKB_KEY_F8, /* F20 */ MOD_MASK_SHIFT, "\033[19;2~", 0, 0, 0},
+ { XKB_KEY_F8, /* F32 */ MOD_MASK_CTRL, "\033[19;5~", 0, 0, 0},
+ { XKB_KEY_F8, /* F44 */ MOD_MASK_LOGO, "\033[19;6~", 0, 0, 0},
+ { XKB_KEY_F8, /* F56 */ MOD_MASK_ALT, "\033[19;3~", 0, 0, 0},
+ { XKB_KEY_F9, MOD_MASK_NONE, "\033[20~", 0, 0, 0},
+ { XKB_KEY_F9, /* F21 */ MOD_MASK_SHIFT, "\033[20;2~", 0, 0, 0},
+ { XKB_KEY_F9, /* F33 */ MOD_MASK_CTRL, "\033[20;5~", 0, 0, 0},
+ { XKB_KEY_F9, /* F45 */ MOD_MASK_LOGO, "\033[20;6~", 0, 0, 0},
+ { XKB_KEY_F9, /* F57 */ MOD_MASK_ALT, "\033[20;3~", 0, 0, 0},
+ { XKB_KEY_F10, MOD_MASK_NONE, "\033[21~", 0, 0, 0},
+ { XKB_KEY_F10, /* F22 */ MOD_MASK_SHIFT, "\033[21;2~", 0, 0, 0},
+ { XKB_KEY_F10, /* F34 */ MOD_MASK_CTRL, "\033[21;5~", 0, 0, 0},
+ { XKB_KEY_F10, /* F46 */ MOD_MASK_LOGO, "\033[21;6~", 0, 0, 0},
+ { XKB_KEY_F10, /* F58 */ MOD_MASK_ALT, "\033[21;3~", 0, 0, 0},
+ { XKB_KEY_F11, MOD_MASK_NONE, "\033[23~", 0, 0, 0},
+ { XKB_KEY_F11, /* F23 */ MOD_MASK_SHIFT, "\033[23;2~", 0, 0, 0},
+ { XKB_KEY_F11, /* F35 */ MOD_MASK_CTRL, "\033[23;5~", 0, 0, 0},
+ { XKB_KEY_F11, /* F47 */ MOD_MASK_LOGO, "\033[23;6~", 0, 0, 0},
+ { XKB_KEY_F11, /* F59 */ MOD_MASK_ALT, "\033[23;3~", 0, 0, 0},
+ { XKB_KEY_F12, MOD_MASK_NONE, "\033[24~", 0, 0, 0},
+ { XKB_KEY_F12, /* F24 */ MOD_MASK_SHIFT, "\033[24;2~", 0, 0, 0},
+ { XKB_KEY_F12, /* F36 */ MOD_MASK_CTRL, "\033[24;5~", 0, 0, 0},
+ { XKB_KEY_F12, /* F48 */ MOD_MASK_LOGO, "\033[24;6~", 0, 0, 0},
+ { XKB_KEY_F12, /* F60 */ MOD_MASK_ALT, "\033[24;3~", 0, 0, 0},
+ { XKB_KEY_F13, MOD_MASK_NONE, "\033[1;2P", 0, 0, 0},
+ { XKB_KEY_F14, MOD_MASK_NONE, "\033[1;2Q", 0, 0, 0},
+ { XKB_KEY_F15, MOD_MASK_NONE, "\033[1;2R", 0, 0, 0},
+ { XKB_KEY_F16, MOD_MASK_NONE, "\033[1;2S", 0, 0, 0},
+ { XKB_KEY_F17, MOD_MASK_NONE, "\033[15;2~", 0, 0, 0},
+ { XKB_KEY_F18, MOD_MASK_NONE, "\033[17;2~", 0, 0, 0},
+ { XKB_KEY_F19, MOD_MASK_NONE, "\033[18;2~", 0, 0, 0},
+ { XKB_KEY_F20, MOD_MASK_NONE, "\033[19;2~", 0, 0, 0},
+ { XKB_KEY_F21, MOD_MASK_NONE, "\033[20;2~", 0, 0, 0},
+ { XKB_KEY_F22, MOD_MASK_NONE, "\033[21;2~", 0, 0, 0},
+ { XKB_KEY_F23, MOD_MASK_NONE, "\033[23;2~", 0, 0, 0},
+ { XKB_KEY_F24, MOD_MASK_NONE, "\033[24;2~", 0, 0, 0},
+ { XKB_KEY_F25, MOD_MASK_NONE, "\033[1;5P", 0, 0, 0},
+ { XKB_KEY_F26, MOD_MASK_NONE, "\033[1;5Q", 0, 0, 0},
+ { XKB_KEY_F27, MOD_MASK_NONE, "\033[1;5R", 0, 0, 0},
+ { XKB_KEY_F28, MOD_MASK_NONE, "\033[1;5S", 0, 0, 0},
+ { XKB_KEY_F29, MOD_MASK_NONE, "\033[15;5~", 0, 0, 0},
+ { XKB_KEY_F30, MOD_MASK_NONE, "\033[17;5~", 0, 0, 0},
+ { XKB_KEY_F31, MOD_MASK_NONE, "\033[18;5~", 0, 0, 0},
+ { XKB_KEY_F32, MOD_MASK_NONE, "\033[19;5~", 0, 0, 0},
+ { XKB_KEY_F33, MOD_MASK_NONE, "\033[20;5~", 0, 0, 0},
+ { XKB_KEY_F34, MOD_MASK_NONE, "\033[21;5~", 0, 0, 0},
+ { XKB_KEY_F35, MOD_MASK_NONE, "\033[23;5~", 0, 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] = MOD_MASK_ALT,
+};
+
diff --git a/src/wld/drm-private.h b/include/wld/drm-private.h
index 6c36088..6c36088 100644
--- a/src/wld/drm-private.h
+++ b/include/wld/drm-private.h
diff --git a/src/wld/drm.h b/include/wld/drm.h
index 20ee3e8..20ee3e8 100644
--- a/src/wld/drm.h
+++ b/include/wld/drm.h
diff --git a/src/wld/pixman.h b/include/wld/pixman.h
index c864385..c864385 100644
--- a/src/wld/pixman.h
+++ b/include/wld/pixman.h
diff --git a/src/wld/wayland-private.h b/include/wld/wayland-private.h
index f52e3ae..f52e3ae 100644
--- a/src/wld/wayland-private.h
+++ b/include/wld/wayland-private.h
diff --git a/src/wld/wayland.h b/include/wld/wayland.h
index 3127ee6..3127ee6 100644
--- a/src/wld/wayland.h
+++ b/include/wld/wayland.h
diff --git a/src/wld/wld-private.h b/include/wld/wld-private.h
index e812b11..e812b11 100644
--- a/src/wld/wld-private.h
+++ b/include/wld/wld-private.h
diff --git a/src/wld/wld.h b/include/wld/wld.h
index c36081c..c36081c 100644
--- a/src/wld/wld.h
+++ b/include/wld/wld.h
diff --git a/src/st.c b/src/st.c
index 871b0de..abad585 100644
--- a/src/st.c
+++ b/src/st.c
@@ -44,7 +44,6 @@ char *argv0;
#include <libutil.h>
#endif
-
/* Arbitrary sizes */
#define UTF_INVALID 0xFFFD
#define UTF_SIZ 4
@@ -3203,8 +3202,12 @@ wlinit(void)
registry = wl_display_get_registry(wl.dpy);
wl_registry_add_listener(registry, &reglistener, NULL);
- wld.ctx = wld_wayland_create_context(wl.dpy, WLD_SHM);
+ wld.ctx = wld_wayland_create_context(wl.dpy, WLD_ANY);
+ if(!wld.ctx)
+ die("could not create wayland context");
wld.renderer = wld_create_renderer(wld.ctx);
+ if(!wld.renderer)
+ die("could not create wayland rendering context");
wl_display_roundtrip(wl.dpy);
if (!wl.shm)
diff --git a/src/wld/buffer.c b/src/wld/buffer.c
index 46b1b3b..2426037 100644
--- a/src/wld/buffer.c
+++ b/src/wld/buffer.c
@@ -21,7 +21,7 @@
* SOFTWARE.
*/
-#include "wld-private.h"
+#include "wld/wld-private.h"
void buffer_initialize(struct buffer * buffer,
const struct wld_buffer_impl * impl,
diff --git a/src/wld/buffered_surface.c b/src/wld/buffered_surface.c
index e3d9133..4687554 100644
--- a/src/wld/buffered_surface.c
+++ b/src/wld/buffered_surface.c
@@ -21,7 +21,7 @@
* SOFTWARE.
*/
-#include "wld-private.h"
+#include "wld/wld-private.h"
#include "interface/surface.h"
IMPL(buffered_surface, wld_surface)
diff --git a/src/wld/color.c b/src/wld/color.c
index 88e791a..94785f8 100644
--- a/src/wld/color.c
+++ b/src/wld/color.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-#include "wld-private.h"
+#include "wld/wld-private.h"
#include <strings.h>
diff --git a/src/wld/context.c b/src/wld/context.c
index a735d40..af2d5bd 100644
--- a/src/wld/context.c
+++ b/src/wld/context.c
@@ -21,7 +21,7 @@
* SOFTWARE.
*/
-#include "wld-private.h"
+#include "wld/wld-private.h"
void context_initialize(struct wld_context * context,
const struct wld_context_impl * impl)
diff --git a/src/wld/drm.c b/src/wld/drm.c
index 2768640..e2f6180 100644
--- a/src/wld/drm.c
+++ b/src/wld/drm.c
@@ -21,8 +21,8 @@
* SOFTWARE.
*/
-#include "drm.h"
-#include "drm-private.h"
+#include "wld/drm.h"
+#include "wld/drm-private.h"
#include <sys/sysmacros.h>
diff --git a/src/wld/dumb.c b/src/wld/dumb.c
index b08d098..340ba16 100644
--- a/src/wld/dumb.c
+++ b/src/wld/dumb.c
@@ -21,9 +21,9 @@
* SOFTWARE.
*/
-#include "drm-private.h"
-#include "drm.h"
-#include "pixman.h"
+#include "wld/drm-private.h"
+#include "wld/drm.h"
+#include "wld/pixman.h"
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/wld/font.c b/src/wld/font.c
index 36b8a07..a43c3e6 100644
--- a/src/wld/font.c
+++ b/src/wld/font.c
@@ -21,7 +21,7 @@
* SOFTWARE.
*/
-#include "wld-private.h"
+#include "wld/wld-private.h"
#include <fontconfig/fcfreetype.h>
diff --git a/src/wld/intel.c b/src/wld/intel/intel.c
index 78c3c0f..4ee2c2e 100644
--- a/src/wld/intel.c
+++ b/src/wld/intel/intel.c
@@ -21,11 +21,11 @@
* SOFTWARE.
*/
-#include "drm-private.h"
-#include "drm.h"
-#include "intel/batch.h"
-#include "intel/blt.h"
-#include "wld-private.h"
+#include "wld/drm-private.h"
+#include "wld/drm.h"
+#include "batch.h"
+#include "blt.h"
+#include "wld/wld-private.h"
#include <unistd.h>
#include <intel_bufmgr.h>
@@ -51,11 +51,11 @@ struct intel_buffer
drm_intel_bo * bo;
};
-#include "interface/context.h"
-#include "interface/renderer.h"
-#include "interface/buffer.h"
+#include "../interface/context.h"
+#include "../interface/renderer.h"
+#include "../interface/buffer.h"
#define DRM_DRIVER_NAME intel
-#include "interface/drm.h"
+#include "../interface/drm.h"
IMPL(intel_context, wld_context)
IMPL(intel_renderer, wld_renderer)
IMPL(intel_buffer, wld_buffer)
diff --git a/src/wld/nouveau/nouveau.c b/src/wld/nouveau/nouveau.c
index 34829eb..7d2e364 100644
--- a/src/wld/nouveau/nouveau.c
+++ b/src/wld/nouveau/nouveau.c
@@ -26,9 +26,9 @@
* SOFTWARE.
*/
-#include "drm-private.h"
-#include "drm.h"
-#include "pixman.h"
+#include "wld/drm-private.h"
+#include "wld/drm.h"
+#include "wld/pixman.h"
#include "nv_object.xml.h"
#include "g80_2d.xml.h"
#include "g80_defs.xml.h"
@@ -70,11 +70,11 @@ struct nouveau_buffer
struct nouveau_bo * bo;
};
-#include "interface/context.h"
-#include "interface/renderer.h"
-#include "interface/buffer.h"
+#include "../interface/context.h"
+#include "../interface/renderer.h"
+#include "../interface/buffer.h"
#define DRM_DRIVER_NAME nouveau
-#include "interface/drm.h"
+#include "../interface/drm.h"
IMPL(nouveau_context, wld_context)
IMPL(nouveau_renderer, wld_renderer)
IMPL(nouveau_buffer, wld_buffer)
diff --git a/src/wld/pixman.c b/src/wld/pixman.c
index 5f14a7b..50a10ec 100644
--- a/src/wld/pixman.c
+++ b/src/wld/pixman.c
@@ -21,8 +21,8 @@
* SOFTWARE.
*/
-#include "pixman.h"
-#include "wld-private.h"
+#include "wld/pixman.h"
+#include "wld/wld-private.h"
#define PIXMAN_COLOR(c) { \
.alpha = ((c >> 24) & 0xff) * 0x101, \
diff --git a/src/wld/renderer.c b/src/wld/renderer.c
index a038095..b014eae 100644
--- a/src/wld/renderer.c
+++ b/src/wld/renderer.c
@@ -21,7 +21,7 @@
* SOFTWARE.
*/
-#include "wld-private.h"
+#include "wld/wld-private.h"
void default_fill_region(struct wld_renderer * renderer, uint32_t color,
pixman_region32_t * region)
diff --git a/src/wld/surface.c b/src/wld/surface.c
index 3f936bd..9e678de 100644
--- a/src/wld/surface.c
+++ b/src/wld/surface.c
@@ -21,7 +21,7 @@
* SOFTWARE.
*/
-#include "wld-private.h"
+#include "wld/wld-private.h"
struct wld_surface * default_create_surface(struct wld_context * context,
uint32_t width, uint32_t height,
diff --git a/src/wld/wayland-drm.c b/src/wld/wayland-drm.c
index 7e7fe4c..43695a3 100644
--- a/src/wld/wayland-drm.c
+++ b/src/wld/wayland-drm.c
@@ -21,12 +21,12 @@
* SOFTWARE.
*/
-#include "wayland.h"
-#include "drm.h"
+#include "wld/wayland.h"
+#include "wld/drm.h"
#include "wayland-drm-client-protocol.h"
-#include "wayland-private.h"
-#include "wld-private.h"
-#include "drm-private.h"
+#include "wld/wayland-private.h"
+#include "wld/wld-private.h"
+#include "wld/drm-private.h"
#include <stdlib.h>
#include <string.h>
diff --git a/src/wld/wayland-shm.c b/src/wld/wayland-shm.c
index 520eb2c..19840f6 100644
--- a/src/wld/wayland-shm.c
+++ b/src/wld/wayland-shm.c
@@ -23,10 +23,10 @@
#define _GNU_SOURCE /* Required for mkostemp */
-#include "wayland.h"
-#include "wayland-private.h"
-#include "wld-private.h"
-#include "pixman.h"
+#include "wld/wayland.h"
+#include "wld/wayland-private.h"
+#include "wld/wld-private.h"
+#include "wld/pixman.h"
#include <fcntl.h>
#include <stdlib.h>
diff --git a/src/wld/wayland.c b/src/wld/wayland.c
index 40a4b34..b6a0d3c 100644
--- a/src/wld/wayland.c
+++ b/src/wld/wayland.c
@@ -21,9 +21,9 @@
* SOFTWARE.
*/
-#include "wayland.h"
-#include "wayland-private.h"
-#include "wld-private.h"
+#include "wld/wayland.h"
+#include "wld/wayland-private.h"
+#include "wld/wld-private.h"
#include <stdlib.h>
#include <wayland-client.h>