diff options
author | Nicholas Noll <nnoll523@gmail.com> | 2020-06-26 16:11:15 +0200 |
---|---|---|
committer | Nicholas Noll <nnoll523@gmail.com> | 2020-06-26 16:11:15 +0200 |
commit | 63424e9709751108c564f884cb4fdffab77c933d (patch) | |
tree | 6d9eb9e94e2fc553852ffce39f43201c005151c1 | |
parent | 641ea1557ccc0099ef5471a16503938bd00924af (diff) |
patched term to allow for arbitrary sizes
-rw-r--r-- | compile_commands.json | 654 | ||||
-rw-r--r-- | sys/cmd/dwm/dwm.c | 4 | ||||
-rw-r--r-- | sys/cmd/term/config.h | 6 | ||||
-rw-r--r-- | sys/cmd/term/term.h | 13 | ||||
-rw-r--r-- | sys/cmd/term/x.c | 65 |
5 files changed, 573 insertions, 169 deletions
diff --git a/compile_commands.json b/compile_commands.json index 02f4556..5b04cc3 100644 --- a/compile_commands.json +++ b/compile_commands.json @@ -13,11 +13,11 @@ "-isystem", "include/vendor/libc", "-o", - "build/libbio/io/newick.o", - "sys/libbio/io/newick.c" + "build/libn/random.o", + "sys/libn/random.c" ], "directory": "/home/nolln/root", - "file": "sys/libbio/io/newick.c" + "file": "sys/libn/random.c" }, { "arguments": [ @@ -33,11 +33,39 @@ "-isystem", "include/vendor/libc", "-o", - "build/libbio/io/fasta.o", - "sys/libbio/io/fasta.c" + "build/cmd/rc/parse.o", + "sys/cmd/rc/parse.c" ], "directory": "/home/nolln/root", - "file": "sys/libbio/io/fasta.c" + "file": "sys/cmd/rc/parse.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-I/usr/include/freetype2", + "-I/usr/include/libpng16", + "-I/usr/include/harfbuzz", + "-I/usr/include/glib-2.0", + "-I/usr/lib/glib-2.0/include", + "-I/usr/include/freetype2", + "-I/usr/include/libpng16", + "-I/usr/include/harfbuzz", + "-I/usr/include/glib-2.0", + "-I/usr/lib/glib-2.0/include", + "-o", + "build/cmd/menu/drw.o", + "sys/cmd/menu/drw.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/menu/drw.c" }, { "arguments": [ @@ -73,11 +101,11 @@ "-isystem", "include/vendor/libc", "-o", - "build/libn/string.o", - "sys/libn/string.c" + "build/libn/coro.o", + "sys/libn/coro.c" ], "directory": "/home/nolln/root", - "file": "sys/libn/string.c" + "file": "sys/libn/coro.c" }, { "arguments": [ @@ -93,11 +121,11 @@ "-isystem", "include/vendor/libc", "-o", - "build/cmd/filter/filter.o", - "sys/cmd/filter/filter.c" + "build/libn/os.o", + "sys/libn/os.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/filter/filter.c" + "file": "sys/libn/os.c" }, { "arguments": [ @@ -113,11 +141,11 @@ "-isystem", "include/vendor/libc", "-o", - "build/libn/sort.o", - "sys/libn/sort.c" + "build/cmd/ic/ic.o", + "sys/cmd/ic/ic.c" ], "directory": "/home/nolln/root", - "file": "sys/libn/sort.c" + "file": "sys/cmd/ic/ic.c" }, { "arguments": [ @@ -133,11 +161,67 @@ "-isystem", "include/vendor/libc", "-o", - "build/libn/mmap.o", - "sys/libn/mmap.c" + "build/cmd/rc/word.o", + "sys/cmd/rc/word.c" ], "directory": "/home/nolln/root", - "file": "sys/libn/mmap.c" + "file": "sys/cmd/rc/word.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I/usr/include/freetype2", + "-I/usr/include/libpng16", + "-I/usr/include/harfbuzz", + "-I/usr/include/glib-2.0", + "-I/usr/lib/glib-2.0/include", + "-I/usr/include/freetype2", + "-I/usr/include/libpng16", + "-I/usr/include/harfbuzz", + "-I/usr/include/glib-2.0", + "-I/usr/lib/glib-2.0/include", + "-I", + "include", + "-o", + "build/cmd/term/term.o", + "sys/cmd/term/term.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/term/term.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I/usr/include/freetype2", + "-I/usr/include/libpng16", + "-I/usr/include/harfbuzz", + "-I/usr/include/glib-2.0", + "-I/usr/lib/glib-2.0/include", + "-I/usr/include/freetype2", + "-I/usr/include/libpng16", + "-I/usr/include/harfbuzz", + "-I/usr/include/glib-2.0", + "-I/usr/lib/glib-2.0/include", + "-I", + "include", + "-o", + "build/cmd/dwm/dwm.o", + "sys/cmd/dwm/dwm.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/dwm/dwm.c" }, { "arguments": [ @@ -153,11 +237,51 @@ "-isystem", "include/vendor/libc", "-o", - "build/libmath/basic.o", - "sys/libmath/basic.c" + "build/cmd/rc/main.o", + "sys/cmd/rc/main.c" ], "directory": "/home/nolln/root", - "file": "sys/libmath/basic.c" + "file": "sys/cmd/rc/main.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/cmd/rc/tree.o", + "sys/cmd/rc/tree.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/rc/tree.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/libmath/blas2.o", + "sys/libmath/blas2.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libmath/blas2.c" }, { "arguments": [ @@ -188,16 +312,17 @@ "-fno-strict-aliasing", "-fwrapv", "-fms-extensions", + "-D_GNU_SOURCE", "-I", "include", "-isystem", "include/vendor/libc", "-o", - "build/libn/random.o", - "sys/libn/random.c" + "build/libmath/blas.o", + "sys/libmath/blas.c" ], "directory": "/home/nolln/root", - "file": "sys/libn/random.c" + "file": "sys/libmath/blas.c" }, { "arguments": [ @@ -213,11 +338,51 @@ "-isystem", "include/vendor/libc", "-o", - "build/libmath/blas1.o", - "sys/libmath/blas1.c" + "build/libbio/test.o", + "sys/libbio/test.c" ], "directory": "/home/nolln/root", - "file": "sys/libmath/blas1.c" + "file": "sys/libbio/test.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/libmath/blas3.o", + "sys/libmath/blas3.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libmath/blas3.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/cmd/walk/walk.o", + "sys/cmd/walk/walk.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/walk/walk.c" }, { "arguments": [ @@ -261,11 +426,51 @@ "-isystem", "include/vendor/libc", "-o", - "build/libmath/blas2.o", - "sys/libmath/blas2.c" + "build/cmd/ic/strlcpy.o", + "sys/cmd/ic/strlcpy.c" ], "directory": "/home/nolln/root", - "file": "sys/libmath/blas2.c" + "file": "sys/cmd/ic/strlcpy.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/libbio/io/fasta.o", + "sys/libbio/io/fasta.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libbio/io/fasta.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/cmd/rc/var.o", + "sys/cmd/rc/var.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/rc/var.c" }, { "arguments": [ @@ -276,6 +481,28 @@ "-fno-strict-aliasing", "-fwrapv", "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/libn/string.o", + "sys/libn/string.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libn/string.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", "-I/usr/include/freetype2", "-I/usr/include/libpng16", "-I/usr/include/harfbuzz", @@ -286,14 +513,12 @@ "-I/usr/include/harfbuzz", "-I/usr/include/glib-2.0", "-I/usr/lib/glib-2.0/include", - "-I", - "include", "-o", - "build/cmd/dwm/drw.o", - "sys/cmd/dwm/drw.c" + "build/cmd/menu/util.o", + "sys/cmd/menu/util.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/dwm/drw.c" + "file": "sys/cmd/menu/util.c" }, { "arguments": [ @@ -304,8 +529,6 @@ "-fno-strict-aliasing", "-fwrapv", "-fms-extensions", - "-I", - "include", "-I/usr/include/freetype2", "-I/usr/include/libpng16", "-I/usr/include/harfbuzz", @@ -316,12 +539,94 @@ "-I/usr/include/harfbuzz", "-I/usr/include/glib-2.0", "-I/usr/lib/glib-2.0/include", + "-I", + "include", "-o", - "build/cmd/menu/drw.o", - "sys/cmd/menu/drw.c" + "build/cmd/term/x.o", + "sys/cmd/term/x.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/menu/drw.c" + "file": "sys/cmd/term/x.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/cmd/rc/glob.o", + "sys/cmd/rc/glob.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/rc/glob.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/libn/io.o", + "sys/libn/io.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libn/io.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/cmd/rc/io.o", + "sys/cmd/rc/io.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/rc/io.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/libn/sort.o", + "sys/libn/sort.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libn/sort.c" }, { "arguments": [ @@ -365,6 +670,46 @@ "-isystem", "include/vendor/libc", "-o", + "build/libmath/blas1.o", + "sys/libmath/blas1.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libmath/blas1.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/libn/test.o", + "sys/libn/test.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libn/test.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", "build/libn/memory.o", "sys/libn/memory.c" ], @@ -393,6 +738,54 @@ "-I", "include", "-o", + "build/cmd/dwm/client.o", + "sys/cmd/dwm/client.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/dwm/client.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/cmd/filter/filter.o", + "sys/cmd/filter/filter.c" + ], + "directory": "/home/nolln/root", + "file": "sys/cmd/filter/filter.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I/usr/include/freetype2", + "-I/usr/include/libpng16", + "-I/usr/include/harfbuzz", + "-I/usr/include/glib-2.0", + "-I/usr/lib/glib-2.0/include", + "-I/usr/include/freetype2", + "-I/usr/include/libpng16", + "-I/usr/include/harfbuzz", + "-I/usr/include/glib-2.0", + "-I/usr/lib/glib-2.0/include", + "-I", + "include", + "-o", "build/cmd/dwm/hook.o", "sys/cmd/dwm/hook.c" ], @@ -408,17 +801,16 @@ "-fno-strict-aliasing", "-fwrapv", "-fms-extensions", - "-D_GNU_SOURCE", "-I", "include", "-isystem", "include/vendor/libc", "-o", - "build/libmath/blas.o", - "sys/libmath/blas.c" + "build/libn/arg.o", + "sys/libn/arg.c" ], "directory": "/home/nolln/root", - "file": "sys/libmath/blas.c" + "file": "sys/libn/arg.c" }, { "arguments": [ @@ -434,11 +826,11 @@ "-isystem", "include/vendor/libc", "-o", - "build/libbio/simulate.o", - "sys/libbio/simulate.c" + "build/libn/gz.o", + "sys/libn/gz.c" ], "directory": "/home/nolln/root", - "file": "sys/libbio/simulate.c" + "file": "sys/libn/gz.c" }, { "arguments": [ @@ -454,11 +846,11 @@ "-isystem", "include/vendor/libc", "-o", - "build/libmath/blas3.o", - "sys/libmath/blas3.c" + "build/libn/mmap.o", + "sys/libn/mmap.c" ], "directory": "/home/nolln/root", - "file": "sys/libmath/blas3.c" + "file": "sys/libn/mmap.c" }, { "arguments": [ @@ -471,22 +863,14 @@ "-fms-extensions", "-I", "include", - "-I/usr/include/freetype2", - "-I/usr/include/libpng16", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/glib-2.0/include", - "-I/usr/include/freetype2", - "-I/usr/include/libpng16", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/glib-2.0/include", + "-isystem", + "include/vendor/libc", "-o", - "build/cmd/menu/util.o", - "sys/cmd/menu/util.c" + "build/cmd/rc/lex.o", + "sys/cmd/rc/lex.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/menu/util.c" + "file": "sys/cmd/rc/lex.c" }, { "arguments": [ @@ -497,16 +881,17 @@ "-fno-strict-aliasing", "-fwrapv", "-fms-extensions", + "-D_GNU_SOURCE", "-I", "include", "-isystem", "include/vendor/libc", "-o", - "build/libbio/align.o", - "sys/libbio/align.c" + "build/libmath/test.o", + "sys/libmath/test.c" ], "directory": "/home/nolln/root", - "file": "sys/libbio/align.c" + "file": "sys/libmath/test.c" }, { "arguments": [ @@ -522,11 +907,31 @@ "-isystem", "include/vendor/libc", "-o", - "build/libbio/test.o", - "sys/libbio/test.c" + "build/cmd/cat/cat.o", + "sys/cmd/cat/cat.c" ], "directory": "/home/nolln/root", - "file": "sys/libbio/test.c" + "file": "sys/cmd/cat/cat.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/libn/fs.o", + "sys/libn/fs.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libn/fs.c" }, { "arguments": [ @@ -550,11 +955,11 @@ "-I", "include", "-o", - "build/cmd/dwm/client.o", - "sys/cmd/dwm/client.c" + "build/cmd/dwm/drw.o", + "sys/cmd/dwm/drw.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/dwm/client.c" + "file": "sys/cmd/dwm/drw.c" }, { "arguments": [ @@ -565,17 +970,16 @@ "-fno-strict-aliasing", "-fwrapv", "-fms-extensions", - "-D_GNU_SOURCE", "-I", "include", "-isystem", "include/vendor/libc", "-o", - "build/libmath/test.o", - "sys/libmath/test.c" + "build/libbio/align.o", + "sys/libbio/align.c" ], "directory": "/home/nolln/root", - "file": "sys/libmath/test.c" + "file": "sys/libbio/align.c" }, { "arguments": [ @@ -591,11 +995,11 @@ "-isystem", "include/vendor/libc", "-o", - "build/libn/test.o", - "sys/libn/test.c" + "build/libmath/basic.o", + "sys/libmath/basic.c" ], "directory": "/home/nolln/root", - "file": "sys/libn/test.c" + "file": "sys/libmath/basic.c" }, { "arguments": [ @@ -606,24 +1010,16 @@ "-fno-strict-aliasing", "-fwrapv", "-fms-extensions", - "-I/usr/include/freetype2", - "-I/usr/include/libpng16", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/glib-2.0/include", - "-I/usr/include/freetype2", - "-I/usr/include/libpng16", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/glib-2.0/include", "-I", "include", + "-isystem", + "include/vendor/libc", "-o", - "build/cmd/term/x.o", - "sys/cmd/term/x.c" + "build/libbio/simulate.o", + "sys/libbio/simulate.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/term/x.c" + "file": "sys/libbio/simulate.c" }, { "arguments": [ @@ -639,11 +1035,11 @@ "-isystem", "include/vendor/libc", "-o", - "build/libn/fs.o", - "sys/libn/fs.c" + "build/libn/error.o", + "sys/libn/error.c" ], "directory": "/home/nolln/root", - "file": "sys/libn/fs.c" + "file": "sys/libn/error.c" }, { "arguments": [ @@ -654,24 +1050,16 @@ "-fno-strict-aliasing", "-fwrapv", "-fms-extensions", - "-I/usr/include/freetype2", - "-I/usr/include/libpng16", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/glib-2.0/include", - "-I/usr/include/freetype2", - "-I/usr/include/libpng16", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/glib-2.0/include", "-I", "include", + "-isystem", + "include/vendor/libc", "-o", - "build/cmd/dwm/dwm.o", - "sys/cmd/dwm/dwm.c" + "build/cmd/rc/util.o", + "sys/cmd/rc/util.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/dwm/dwm.c" + "file": "sys/cmd/rc/util.c" }, { "arguments": [ @@ -687,11 +1075,11 @@ "-isystem", "include/vendor/libc", "-o", - "build/cmd/cat/cat.o", - "sys/cmd/cat/cat.c" + "build/libn/flate.o", + "sys/libn/flate.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/cat/cat.c" + "file": "sys/libn/flate.c" }, { "arguments": [ @@ -702,24 +1090,16 @@ "-fno-strict-aliasing", "-fwrapv", "-fms-extensions", - "-I/usr/include/freetype2", - "-I/usr/include/libpng16", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/glib-2.0/include", - "-I/usr/include/freetype2", - "-I/usr/include/libpng16", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/glib-2.0/include", "-I", "include", + "-isystem", + "include/vendor/libc", "-o", - "build/cmd/term/term.o", - "sys/cmd/term/term.c" + "build/libn/bufio.o", + "sys/libn/bufio.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/term/term.c" + "file": "sys/libn/bufio.c" }, { "arguments": [ @@ -735,10 +1115,30 @@ "-isystem", "include/vendor/libc", "-o", - "build/cmd/ic/ic.o", - "sys/cmd/ic/ic.c" + "build/cmd/mv/mv.o", + "sys/cmd/mv/mv.c" ], "directory": "/home/nolln/root", - "file": "sys/cmd/ic/ic.c" + "file": "sys/cmd/mv/mv.c" + }, + { + "arguments": [ + "gcc", + "-c", + "-g", + "-march=native", + "-fno-strict-aliasing", + "-fwrapv", + "-fms-extensions", + "-I", + "include", + "-isystem", + "include/vendor/libc", + "-o", + "build/libbio/io/newick.o", + "sys/libbio/io/newick.c" + ], + "directory": "/home/nolln/root", + "file": "sys/libbio/io/newick.c" } ]
\ No newline at end of file diff --git a/sys/cmd/dwm/dwm.c b/sys/cmd/dwm/dwm.c index 7033d65..afc7e30 100644 --- a/sys/cmd/dwm/dwm.c +++ b/sys/cmd/dwm/dwm.c @@ -854,7 +854,9 @@ tile(Monitor *m) uint i, n, h, r, mw, my, ty; Client *c; - for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) + ; + if (n == 0) return; diff --git a/sys/cmd/term/config.h b/sys/cmd/term/config.h index 1002e17..4cd1a09 100644 --- a/sys/cmd/term/config.h +++ b/sys/cmd/term/config.h @@ -95,7 +95,7 @@ char *termname = "term-256color"; uint tabspaces = 4; /* bg opacity */ -float alpha = 0.95; +float alpha = 0.98; /* Terminal colors (16 first used in escape sequence) */ static char *colorname[] = { @@ -196,8 +196,8 @@ static Shortcut shortcuts[] = { { ControlMask, XK_Print, toggleprinter, {.i = 0} }, { ShiftMask, XK_Print, printscreen, {.i = 0} }, { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, - { TERMMOD, XK_Prior, zoom, {.f = +1} }, - { TERMMOD, XK_Next, zoom, {.f = -1} }, + { TERMMOD, XK_plus, zoom, {.f = +1} }, + { ControlMask, XK_minus, zoom, {.f = -1} }, { TERMMOD, XK_Home, zoomreset, {.f = 0} }, { TERMMOD, XK_C, clipcopy, {.i = 0} }, { TERMMOD, XK_V, clippaste, {.i = 0} }, diff --git a/sys/cmd/term/term.h b/sys/cmd/term/term.h index 3c7e3ca..11c28c7 100644 --- a/sys/cmd/term/term.h +++ b/sys/cmd/term/term.h @@ -228,12 +228,13 @@ typedef struct { typedef struct TermWindow TermWindow; struct TermWindow { - int tw, th; /* tty width and height */ - int w, h; /* window width and height */ - int ch; /* char height */ - int cw; /* char width */ - int mode; /* window state/mode flags */ - int cursor; /* cursor style */ + int tw, th; /* tty width and height */ + int w, h; /* window width and height */ + int hb, vb; /* horizontal and vertical border (in pix) */ + int ch; /* char height */ + int cw; /* char width */ + int mode; /* window state/mode flags */ + int cursor; /* cursor style */ }; /* used for user hooks */ diff --git a/sys/cmd/term/x.c b/sys/cmd/term/x.c index d6ec1bb..cdf82d7 100644 --- a/sys/cmd/term/x.c +++ b/sys/cmd/term/x.c @@ -315,7 +315,7 @@ ttysend(Arg *arg) int evcol(XEvent *e) { - int x = e->xbutton.x - borderpx; + int x = e->xbutton.x - win.hb; LIMIT(x, 0, win.tw - 1); return x / win.cw; } @@ -323,7 +323,7 @@ evcol(XEvent *e) int evrow(XEvent *e) { - int y = e->xbutton.y - borderpx; + int y = e->xbutton.y - win.vb; LIMIT(y, 0, win.th - 1); return y / win.ch; } @@ -705,6 +705,9 @@ cresize(int width, int height) col = MAX(1, col); row = MAX(1, row); + win.hb = (win.w - col*win.cw)/2; + win.vb = (win.h - col*win.ch)/2; + tresize(col, row); xresize(col, row); ttyresize(win.tw, win.th); @@ -824,14 +827,13 @@ xhints(void) sizeh = XAllocSizeHints(); 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 = win.h, sizeh->width = win.w; + sizeh->height_inc = 1; + sizeh->width_inc = 1; sizeh->base_height = 2 * borderpx; - sizeh->base_width = 2 * borderpx; + sizeh->base_width = 2 * borderpx; sizeh->min_height = win.ch + 2 * borderpx; - sizeh->min_width = win.cw + 2 * borderpx; + sizeh->min_width = win.cw + 2 * borderpx; if (xw.isfixed) { sizeh->flags |= PMaxSize; sizeh->min_width = sizeh->max_width = win.w; @@ -1121,8 +1123,8 @@ xinit(int cols, int rows) xloadcols(); /* adjust fixed window geometry */ - win.w = 2 * borderpx + cols * win.cw; - win.h = 2 * borderpx + rows * win.ch; + win.w = 2 * win.hb + cols * win.cw; + win.h = 2 * win.vb + rows * win.ch; if (xw.gm & XNegative) xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2; if (xw.gm & YNegative) @@ -1207,7 +1209,7 @@ xinit(int cols, int rows) int xmakeglyphfontspecs(XftGlyphFontSpec *specs, Letter *glyphs, int len, int x, int y) { - float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp; + float winx = win.hb + x * win.cw, winy = win.vb + y * win.ch, xp, yp; ushort mode, prevmode = USHRT_MAX; Font *font = &dc.font; int frcflags = FRC_NORMAL; @@ -1340,8 +1342,7 @@ void xdrawglyphfontspecs(XftGlyphFontSpec *specs, Letter base, int len, int x, int y) { int charlen = len * ((base.mode & Gwide) ? 2 : 1); - int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, - width = charlen * win.cw; + int winx = win.hb + x * win.cw, winy = win.vb + y * win.ch, width = charlen * win.cw; Color *fg, *bg, *temp, revfg, revbg, truefg, truebg; XRenderColor colfg, colbg; XRectangle r; @@ -1425,17 +1426,17 @@ xdrawglyphfontspecs(XftGlyphFontSpec *specs, Letter base, int len, int x, int y) /* Intelligent cleaning up of the borders. */ if (x == 0) { - xclear(0, (y == 0)? 0 : winy, borderpx, + xclear(0, (y == 0)? 0 : winy, win.vb, winy + win.ch + - ((winy + win.ch >= borderpx + win.th)? win.h : 0)); + ((winy + win.ch >= win.vb + win.th)? win.h : 0)); } - if (winx + width >= borderpx + win.tw) { + if (winx + width >= win.hb + win.tw) { xclear(winx + width, (y == 0)? 0 : winy, win.w, - ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch))); + ((winy + win.ch >= win.vb + win.th)? win.h : (winy + win.ch))); } if (y == 0) - xclear(winx, 0, winx + width, borderpx); - if (winy + win.ch >= borderpx + win.th) + xclear(winx, 0, winx + width, win.hb); + if (winy + win.ch >= win.hb + win.th) xclear(winx, winy + win.ch, winx + width, win.h); /* Clean up the region we want to draw to. */ @@ -1530,35 +1531,35 @@ drawnew: break; case 3: /* Blinking Underline */ case 4: /* Steady Underline */ - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + (cy + 1) * win.ch - cursorthickness, + XftDrawRect(xw.draw, &drawcol, + win.hb + cx * win.cw, + win.vb + (cy + 1) * win.ch - cursorthickness, win.cw, cursorthickness); break; case 5: /* Blinking bar */ case 6: /* Steady bar */ XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, + win.hb + cx * win.cw, + win.vb + cy * win.ch, cursorthickness, win.ch); break; } } else { XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, + win.hb + cx * win.cw, + win.vb + cy * win.ch, win.cw - 1, 1); XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, + win.hb + cx * win.cw, + win.vb + cy * win.ch, 1, win.ch - 1); XftDrawRect(xw.draw, &drawcol, - borderpx + (cx + 1) * win.cw - 1, - borderpx + cy * win.ch, + win.hb + (cx + 1) * win.cw - 1, + win.vb + cy * win.ch, 1, win.ch - 1); XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + (cy + 1) * win.ch - 1, + win.hb + cx * win.cw, + win.vb + (cy + 1) * win.ch - 1, win.cw, 1); } } |