From c1e643e7db0b083c4bade9e69bc155346d51d450 Mon Sep 17 00:00:00 2001
From: Michael Chalupiak <mikec@mchalupiak.com>
Date: Thu, 5 Sep 2024 19:50:13 -0400
Subject: [PATCH] changes

---
 config.h | 81 ++++++++++++++++++++++++++++++++++++++------------------
 x.c      |  4 +--
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/config.h b/config.h
index c86daa3..69a3b6c 100644
--- a/config.h
+++ b/config.h
@@ -5,8 +5,8 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "mono:pixelsize=12:antialias=true:autohint=true";
-static char *font2[] = { "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
+static char *font = "Cascadia Code:pixelsize=16:antialias=true:autohint=true";
+static char *font2[] = { "NotoColorEmoji:pixelsize=18:antialias=true:autohint=true" };
 static int borderpx = 2;
 
 /*
@@ -17,7 +17,7 @@ static int borderpx = 2;
  * 4: value of shell in /etc/passwd
  * 5: value of shell in config.h
  */
-static char *shell = "/bin/sh";
+static char *shell = "/bin/bash";
 char *utmp = NULL;
 /* scroll program: to enable use a string like "scroll" */
 char *scroll = NULL;
@@ -112,32 +112,61 @@ float alphaOffset = 0.0;
 float alphaUnfocus;
 
 /* Terminal colors (16 first used in escape sequence) */
+// static const char *colorname[] = {
+// 	"#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
+// 	"#cc241d",
+// 	"#98971a",
+// 	"#d79921",
+// 	"#458588",
+// 	"#b16286",
+// 	"#689d6a",
+// 	"#a89984",
+// 	"#928374",
+// 	"#fb4934",
+// 	"#b8bb26",
+// 	"#fabd2f",
+// 	"#83a598",
+// 	"#d3869b",
+// 	"#8ec07c",
+// 	"#ebdbb2",
+// 	[255] = 0,
+// 	/* more colors can be added after 255 to use with DefaultXX */
+// 	"#add8e6", /* 256 -> cursor */
+// 	"#555555", /* 257 -> rev cursor*/
+// 	"#282828", /* 258 -> bg */
+// 	"#ebdbb2", /* 259 -> fg */
+// };
 static const char *colorname[] = {
-	"#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
-	"#cc241d",
-	"#98971a",
-	"#d79921",
-	"#458588",
-	"#b16286",
-	"#689d6a",
-	"#a89984",
-	"#928374",
-	"#fb4934",
-	"#b8bb26",
-	"#fabd2f",
-	"#83a598",
-	"#d3869b",
-	"#8ec07c",
-	"#ebdbb2",
-	[255] = 0,
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#add8e6", /* 256 -> cursor */
-	"#555555", /* 257 -> rev cursor*/
-	"#282828", /* 258 -> bg */
-	"#ebdbb2", /* 259 -> fg */
+    /* 8 normal colors */
+    "black",
+    "red3",
+    "green3",
+    "yellow3",
+    "blue2",
+    "magenta3",
+    "cyan3",
+    "grey90",
+
+    /* 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",
+    "gray90", /* default foreground color */
+    "black", /* default background color */
 };
 
-
+        
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
diff --git a/x.c b/x.c
index e2ec9db..d00aa52 100644
--- a/x.c
+++ b/x.c
@@ -918,8 +918,8 @@ xhints(void)
 	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->height_inc = 1;
+	sizeh->width_inc = 1;
 	sizeh->base_height = 2 * borderpx;
 	sizeh->base_width = 2 * borderpx;
 	sizeh->min_height = win.ch + 2 * borderpx;