1 files changed, 14 insertions, 38 deletions

diff --git a/sys/cmd/dvtm/dvtm.h b/sys/cmd/dvtm/dvtm.h
index 18669fb..c36cb87 100644
--- a/sys/cmd/dvtm/dvtm.h
+++ b/sys/cmd/dvtm/dvtm.h
@@ -1,44 +1,18 @@
+ /* See LICENSE for details. */
 #pragma once
-
-/*
- * The initial "port" of dwm to curses was done by
- *
- * © 2007-2016 Marc André Tanner <mat at brain-dump dot org>
- * © 2020-???? Nicholas Noll <nbnoll at eml.cc>
- *
- * It is highly inspired by the original X11 dwm and
- * reuses some code of it which is mostly
- *
- * © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- *
- * See LICENSE for details.
- */
-
 #include <u.h>
+#include <libn.h>
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <wchar.h>
-#include <limits.h>
+#include <locale.h>
 #include <libgen.h>
+
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <fcntl.h>
-#include <curses.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <locale.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdbool.h>
-#include <errno.h>
-#include <pwd.h>
+
 #include <termios.h>
 
 #include "vt.h"
@@ -48,12 +22,12 @@ int ESCDELAY;
 #endif
 
 #ifndef NCURSES_REENTRANT
-# define set_escdelay(d) (ESCDELAY = (d))
+#define set_escdelay(d) (ESCDELAY = (d))
 #endif
 
 typedef struct {
 	float mfact;
-	unsigned int nmaster;
+	uint nmaster;
 	int history;
 	int w;
 	int h;
@@ -88,7 +62,7 @@ struct Client {
 	Client *next;
 	Client *prev;
 	Client *snext;
-	unsigned int tags;
+	uint tags;
 };
 
 typedef struct {
@@ -106,11 +80,13 @@ typedef struct {
 } ColorRule;
 
 #define ALT(k)      ((k) + (161 - 'a'))
+
 #if defined CTRL && defined _AIX
-  #undef CTRL
+#undef CTRL
 #endif
+
 #ifndef CTRL
-  #define CTRL(k)   ((k) & 0x1F)
+#define CTRL(k)   ((k) & 0x1F)
 #endif
 #define CTRL_ALT(k) ((k) + (129 - 'a'))
 
@@ -123,7 +99,7 @@ typedef struct {
 
 #define MAX_KEYS 3
 
-typedef unsigned int KeyCombo[MAX_KEYS];
+typedef uint KeyCombo[MAX_KEYS];
 
 typedef struct {
 	KeyCombo keys;
@@ -228,7 +204,7 @@ void focus(Client *c);
 void resize(Client *c, int x, int y, int w, int h);
 
 extern Screen screen;
-extern unsigned int waw, wah, wax, way;
+extern uint waw, wah, wax, way;
 extern Client *clients;
 extern char *title;