Merge branch 'master' of https://deathstation9000.org.uk/git/shell-binHEADmaster

4 files changed, 12 insertions, 7 deletions

diff --git a/TERM b/TERM
index 4afb207..03ca6b7 100755
--- a/TERM
+++ b/TERM
@@ -3,17 +3,17 @@ if [ "$(xlsatoms -name AMIWM_SCREEN 2> /dev/null)" ] ; then
     BG=gray75
     TITLE=Terminal
     SIZE=80x35
-    #FONT="-commodore-topaz2 double 1h-medium-r-normal--16--96-96-m-70-winsys-1"
-    FONT="-commodore-topaz2 normal-medium-r-normal--18--96-96-m-70-winsys-1"
+    #FONT="-fn -commodore-topaz2 double 1h-medium-r-normal--16--96-96-m-70-winsys-1"
+    FONT="-fn -commodore-topaz2 normal-medium-r-normal--18--96-96-m-70-winsys-1"
 
 else
     FG=white
     BG=black
     TITLE=xterm
-    SIZE=80x45
-    #FONT="-misc-proggysquarettsz-medium-r-normal--0-0-0-0-c-0-ascii-0"
-    FONT="xft:ProggyClean:size=16"
+    SIZE=80x40
+    #FONT="-fn -misc-proggysquarettsz-medium-r-normal--0-0-0-0-c-0-ascii-0"
+    FONT=""
 fi
 
 xterm -vb -bg $BG -fg $FG -cr red -sb -sl 10000 -sk -si -geom $SIZE \
-	-fn "$FONT" -n "$TITLE" -title "$TITLE" &
+	$FONT -n "$TITLE" -title "$TITLE" &
diff --git a/dotrc/.Xdefaults.dpi b/dotrc/.Xdefaults.dpi
new file mode 100644
index 0000000..707cebf
--- /dev/null
+++ b/dotrc/.Xdefaults.dpi
@@ -0,0 +1,3 @@
+xterm.*faceName: Incololata Regular
+xterm.*faceSize:15
+Xft.dpi: 140
diff --git a/dotrc/.Xdefaults.nodpi b/dotrc/.Xdefaults.nodpi
new file mode 100644
index 0000000..9aab2c8
--- /dev/null
+++ b/dotrc/.Xdefaults.nodpi
@@ -0,0 +1,2 @@
+xterm.*faceName: Incololata Regular
+xterm.*faceSize:15
diff --git a/strlen.c b/strlen.c
index a7fead6..7659779 100644
--- a/strlen.c
+++ b/strlen.c
@@ -10,7 +10,7 @@ int main(int argc, char *argv[])
     for(f = 1; argv[f]; f++)
     {
     	len = strlen(argv[f]);
-	printf("strlen(%s) = %d\n", argv[f], len);
+	printf("strlen(\"%s\") = %d\n", argv[f], len);
     }
 
     return EXIT_SUCCESS;