Use Alacritty as terminal

config/2-conditionals-bsd.mk

@@ -3,12 +3,15 @@ CPPFLAGS += -DENABLE_XINERAMA
 PKGS += xinerama
 .endif
 
-.if "$(WITH_TERMINAL)" == "ptterm"
-CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_PTTERM
-.endif
-.if "$(WITH_TERMINAL)" == "xterm"
-CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_XTERM
+.if "$(WITH_TERMINAL)" == "alacritty"
+CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_ALACRITTY
 .endif
 .if "$(WITH_TERMINAL)" == "gnome"
 CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_GNOME
 .endif
+.if "$(WITH_TERMINAL)" == "st"
+CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_ST
+.endif
+.if "$(WITH_TERMINAL)" == "xterm"
+CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_XTERM
+.endif

config/2-conditionals-gnu.mk

@@ -3,12 +3,15 @@ CPPFLAGS += -DENABLE_XINERAMA
 PKGS += xinerama
 endif
 
-ifeq (ptterm,$(WITH_TERMINAL))
-CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_PTTERM
-endif
-ifeq (xterm,$(WITH_TERMINAL))
-CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_XTERM
+ifeq (alacritty,$(WITH_TERMINAL))
+CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_ALACRITTY
 endif
 ifeq (gnome,$(WITH_TERMINAL))
 CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_GNOME
 endif
+ifeq (st,$(WITH_TERMINAL))
+CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_ST
+endif
+ifeq (xterm,$(WITH_TERMINAL))
+CPPFLAGS += -DWITH_TERMINAL -DWITH_TERMINAL_XTERM
+endif

configure

@@ -40,14 +40,13 @@ File tuning of the installation directories:
   --mandir DIR            man documentation [DATAROOTDIR/man]
 
 Optional Features:
-  --enable-gnome-terminal use GNOME Terminal instead of ptterm
   --disable-xinerama      disable Xinerama
 
 Optional Packages:
   --with-PACKAGE[ ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE no)
-  --with-terminal [ptterm|xterm|gnome]
-                          use ARG as terminal [ptterm]
+  --with-terminal [alacritty|gnome|st|xterm]
+                          use ARG as terminal [alacritty]
   --without-terminal      do not use terminal at all
 HELP
 	exit
@@ -116,17 +115,10 @@ while [ $# -gt 0 ]; do
 						usage
 					fi
 					;;
-				ptterm)
+				alacritty)
 					if [ "$with_terminal" = '' ]; then
-						with_terminal='ptterm'
-					elif [ "$with_terminal" != 'ptterm' ]; then
-						usage
-					fi
-					;;
-				xterm)
-					if [ "$with_terminal" = '' ]; then
-						with_terminal='xterm'
-					elif [ "$with_terminal" != 'xterm' ]; then
+						with_terminal='alacritty'
+					elif [ "$with_terminal" != 'alacritty' ]; then
 						usage
 					fi
 					;;
@@ -137,6 +129,20 @@ while [ $# -gt 0 ]; do
 						usage
 					fi
 					;;
+				st)
+					if [ "$with_terminal" = '' ]; then
+						with_terminal='st'
+					elif [ "$with_terminal" != 'st' ]; then
+						usage
+					fi
+					;;
+				xterm)
+					if [ "$with_terminal" = '' ]; then
+						with_terminal='xterm'
+					elif [ "$with_terminal" != 'xterm' ]; then
+						usage
+					fi
+					;;
 				*)
 					do_shift='no'
 					;;
@@ -171,7 +177,7 @@ if [ "$enable_xinerama" = '' ]; then
 fi
 
 if [ "$with_terminal" = '' -o "$with_terminal" = 'yes' ]; then
-	with_terminal='ptterm'
+	with_terminal='alacritty'
 fi
 
 echo "PREFIX          = $prefix"

polytreewm.1

@@ -62,8 +62,7 @@ Spawn
 for launching other programs.
 .TP
 .B Mod1\-Shift\-/
-Start
-.BR ptterm(1).
+Start terminal.
 .TP
 .B Mod1\-,
 Focus previous screen, if any.
@@ -165,8 +164,7 @@ Resize focused window while dragging. Tiled windows will be toggled to the float
 PolytreeWM is customized by creating a custom config.h and (re)compiling the
 source code. This keeps it fast, secure and simple.
 .SH SEE ALSO
-.BR rofi (1),
-.BR ptterm (1)
+.BR rofi (1)
 .SH ISSUES
 Java applications which use the XToolkit/XAWT backend may draw grey windows
 only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early

src/config.def.h

@@ -27,9 +27,9 @@ static const Rule rules[] = {
 	 *	WM_CLASS(STRING) = instance, class
 	 *	WM_NAME(STRING) = title
 	 */
-	/* class,   instance, title,          tags mask, isfloating, isterminal, noswallow, monitor */
-	{ "ptterm", NULL,     NULL,           0,         0,          1,          0,         -1      },
-	{ NULL,     NULL,     "Event Tester", 0,         0,          0,          1,         -1      }, // xev
+	/* class,      instance, title,          tags mask, isfloating, isterminal, noswallow, monitor */
+	{ "alacritty", NULL,     NULL,           0,         0,          1,          0,         -1      },
+	{ NULL,        NULL,     "Event Tester", 0,         0,          0,          1,         -1      }, // xev
 };
 
 /* layout(s) */

src/spawn.c

@@ -41,14 +41,17 @@ static struct Command commands[] = {
 	{
 		.name = "term",
 		.monitor_arg_index = 0,
-#ifdef WITH_TERMINAL_PTTERM
-		.args = { "ptterm", NULL },
-#endif
-#ifdef WITH_TERMINAL_XTERM
-		.args = { "xterm", NULL },
+#ifdef WITH_TERMINAL_ALACRITTY
+		.args = { "alacritty", NULL },
 #endif
 #ifdef WITH_TERMINAL_GNOME
 		.args = { "gnome-terminal", "--wait", NULL },
+#endif
+#ifdef WITH_TERMINAL_ST
+		.args = { "st", NULL },
+#endif
+#ifdef WITH_TERMINAL_XTERM
+		.args = { "xterm", NULL },
 #endif
 	},
 #endif