Untrack suckless tools
parent
7254630c49
commit
d0a84d7128
|
@ -1,30 +0,0 @@
|
||||||
MIT/X Consortium License
|
|
||||||
|
|
||||||
© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
|
|
||||||
© 2006-2008 Sander van Dijk <a.h.vandijk@gmail.com>
|
|
||||||
© 2006-2007 Michał Janeczek <janeczek@gmail.com>
|
|
||||||
© 2007 Kris Maglione <jg@suckless.org>
|
|
||||||
© 2009 Gottox <gottox@s01.de>
|
|
||||||
© 2009 Markus Schnalke <meillo@marmaro.de>
|
|
||||||
© 2009 Evan Gates <evan.gates@gmail.com>
|
|
||||||
© 2010-2012 Connor Lane Smith <cls@lubutu.com>
|
|
||||||
© 2014-2019 Hiltjo Posthuma <hiltjo@codemadness.org>
|
|
||||||
© 2015-2019 Quentin Rameau <quinq@fifth.space>
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
copy of this software and associated documentation files (the "Software"),
|
|
||||||
to deal in the Software without restriction, including without limitation
|
|
||||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
||||||
and/or sell copies of the Software, and to permit persons to whom the
|
|
||||||
Software is furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
||||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
DEALINGS IN THE SOFTWARE.
|
|
|
@ -1,64 +0,0 @@
|
||||||
# dmenu - dynamic menu
|
|
||||||
# See LICENSE file for copyright and license details.
|
|
||||||
|
|
||||||
include config.mk
|
|
||||||
|
|
||||||
SRC = drw.c dmenu.c stest.c util.c
|
|
||||||
OBJ = $(SRC:.c=.o)
|
|
||||||
|
|
||||||
all: options dmenu stest
|
|
||||||
|
|
||||||
options:
|
|
||||||
@echo dmenu build options:
|
|
||||||
@echo "CFLAGS = $(CFLAGS)"
|
|
||||||
@echo "LDFLAGS = $(LDFLAGS)"
|
|
||||||
@echo "CC = $(CC)"
|
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(CC) -c $(CFLAGS) $<
|
|
||||||
|
|
||||||
config.h:
|
|
||||||
cp config.def.h $@
|
|
||||||
|
|
||||||
$(OBJ): arg.h config.h config.mk drw.h
|
|
||||||
|
|
||||||
dmenu: dmenu.o drw.o util.o
|
|
||||||
$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
|
|
||||||
|
|
||||||
stest: stest.o
|
|
||||||
$(CC) -o $@ stest.o $(LDFLAGS)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
|
|
||||||
|
|
||||||
dist: clean
|
|
||||||
mkdir -p dmenu-$(VERSION)
|
|
||||||
cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\
|
|
||||||
drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\
|
|
||||||
dmenu-$(VERSION)
|
|
||||||
tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
|
|
||||||
gzip dmenu-$(VERSION).tar
|
|
||||||
rm -rf dmenu-$(VERSION)
|
|
||||||
|
|
||||||
install: all
|
|
||||||
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
|
||||||
cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
|
|
||||||
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
|
|
||||||
sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
|
|
||||||
sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
|
|
||||||
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
|
|
||||||
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
|
|
||||||
$(DESTDIR)$(PREFIX)/bin/dmenu_path\
|
|
||||||
$(DESTDIR)$(PREFIX)/bin/dmenu_run\
|
|
||||||
$(DESTDIR)$(PREFIX)/bin/stest\
|
|
||||||
$(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
|
|
||||||
$(DESTDIR)$(MANPREFIX)/man1/stest.1
|
|
||||||
|
|
||||||
.PHONY: all options clean dist install uninstall
|
|
|
@ -1,24 +0,0 @@
|
||||||
dmenu - dynamic menu
|
|
||||||
====================
|
|
||||||
dmenu is an efficient dynamic menu for X.
|
|
||||||
|
|
||||||
|
|
||||||
Requirements
|
|
||||||
------------
|
|
||||||
In order to build dmenu you need the Xlib header files.
|
|
||||||
|
|
||||||
|
|
||||||
Installation
|
|
||||||
------------
|
|
||||||
Edit config.mk to match your local setup (dmenu is installed into
|
|
||||||
the /usr/local namespace by default).
|
|
||||||
|
|
||||||
Afterwards enter the following command to build and install dmenu
|
|
||||||
(if necessary as root):
|
|
||||||
|
|
||||||
make clean install
|
|
||||||
|
|
||||||
|
|
||||||
Running dmenu
|
|
||||||
-------------
|
|
||||||
See the man page for details.
|
|
|
@ -1,49 +0,0 @@
|
||||||
/*
|
|
||||||
* Copy me if you can.
|
|
||||||
* by 20h
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ARG_H__
|
|
||||||
#define ARG_H__
|
|
||||||
|
|
||||||
extern char *argv0;
|
|
||||||
|
|
||||||
/* use main(int argc, char *argv[]) */
|
|
||||||
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
|
|
||||||
argv[0] && argv[0][0] == '-'\
|
|
||||||
&& argv[0][1];\
|
|
||||||
argc--, argv++) {\
|
|
||||||
char argc_;\
|
|
||||||
char **argv_;\
|
|
||||||
int brk_;\
|
|
||||||
if (argv[0][1] == '-' && argv[0][2] == '\0') {\
|
|
||||||
argv++;\
|
|
||||||
argc--;\
|
|
||||||
break;\
|
|
||||||
}\
|
|
||||||
for (brk_ = 0, argv[0]++, argv_ = argv;\
|
|
||||||
argv[0][0] && !brk_;\
|
|
||||||
argv[0]++) {\
|
|
||||||
if (argv_ != argv)\
|
|
||||||
break;\
|
|
||||||
argc_ = argv[0][0];\
|
|
||||||
switch (argc_)
|
|
||||||
|
|
||||||
#define ARGEND }\
|
|
||||||
}
|
|
||||||
|
|
||||||
#define ARGC() argc_
|
|
||||||
|
|
||||||
#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\
|
|
||||||
((x), abort(), (char *)0) :\
|
|
||||||
(brk_ = 1, (argv[0][1] != '\0')?\
|
|
||||||
(&argv[0][1]) :\
|
|
||||||
(argc--, argv++, argv[0])))
|
|
||||||
|
|
||||||
#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\
|
|
||||||
(char *)0 :\
|
|
||||||
(brk_ = 1, (argv[0][1] != '\0')?\
|
|
||||||
(&argv[0][1]) :\
|
|
||||||
(argc--, argv++, argv[0])))
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,23 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
/* Default settings; can be overriden by command line. */
|
|
||||||
|
|
||||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
|
||||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
|
||||||
static const char *fonts[] = {
|
|
||||||
"monospace:size=10"
|
|
||||||
};
|
|
||||||
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
|
|
||||||
static const char *colors[SchemeLast][2] = {
|
|
||||||
/* fg bg */
|
|
||||||
[SchemeNorm] = { "#bbbbbb", "#222222" },
|
|
||||||
[SchemeSel] = { "#eeeeee", "#005577" },
|
|
||||||
[SchemeOut] = { "#000000", "#00ffff" },
|
|
||||||
};
|
|
||||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
|
||||||
static unsigned int lines = 0;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Characters not considered part of a word while deleting words
|
|
||||||
* for example: " /?\"&[]"
|
|
||||||
*/
|
|
||||||
static const char worddelimiters[] = " ";
|
|
|
@ -1,23 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
/* Default settings; can be overriden by command line. */
|
|
||||||
|
|
||||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
|
||||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
|
||||||
static const char *fonts[] = {
|
|
||||||
"monospace:size=10"
|
|
||||||
};
|
|
||||||
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
|
|
||||||
static const char *colors[SchemeLast][2] = {
|
|
||||||
/* fg bg */
|
|
||||||
[SchemeNorm] = { "#bbbbbb", "#222222" },
|
|
||||||
[SchemeSel] = { "#eeeeee", "#005577" },
|
|
||||||
[SchemeOut] = { "#000000", "#00ffff" },
|
|
||||||
};
|
|
||||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
|
||||||
static unsigned int lines = 0;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Characters not considered part of a word while deleting words
|
|
||||||
* for example: " /?\"&[]"
|
|
||||||
*/
|
|
||||||
static const char worddelimiters[] = " ";
|
|
|
@ -1,27 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
/* Default settings; can be overriden by command line. */
|
|
||||||
|
|
||||||
static int topbar = 0; /* -b option; if 0, dmenu appears at bottom */
|
|
||||||
static int centered = 0; /* -c option; centers dmenu on screen */
|
|
||||||
static int min_width = 500; /* minimum width when centered */
|
|
||||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
|
||||||
static const char *fonts[] = {
|
|
||||||
"Iosevka Term SS08:size=14"
|
|
||||||
};
|
|
||||||
static const char *prompt = "❭ "; /* -p option; prompt to the left of input field */
|
|
||||||
static const char *colors[SchemeLast][2] = {
|
|
||||||
/* fg bg */
|
|
||||||
[SchemeNorm] = { "#555555", "#111111" },
|
|
||||||
[SchemeSel] = { "#eeeeee", "#111111" },
|
|
||||||
[SchemeOut] = { "#eeeeee", "#333333" },
|
|
||||||
};
|
|
||||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
|
||||||
static unsigned int lines = 9;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Characters not considered part of a word while deleting words
|
|
||||||
* for example: " /?\"&[]"
|
|
||||||
*/
|
|
||||||
static const char worddelimiters[] = " ";
|
|
||||||
|
|
||||||
static const unsigned int border_width = 1;
|
|
|
@ -1,23 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
/* Default settings; can be overriden by command line. */
|
|
||||||
|
|
||||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
|
||||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
|
||||||
static const char *fonts[] = {
|
|
||||||
"Iosevka:size=12"
|
|
||||||
};
|
|
||||||
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
|
|
||||||
static const char *colors[SchemeLast][2] = {
|
|
||||||
/* fg bg */
|
|
||||||
[SchemeNorm] = { "#bbbbbb", "#222222" },
|
|
||||||
[SchemeSel] = { "#eeeeee", "#005577" },
|
|
||||||
[SchemeOut] = { "#000000", "#00ffff" },
|
|
||||||
};
|
|
||||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
|
||||||
static unsigned int lines = 20;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Characters not considered part of a word while deleting words
|
|
||||||
* for example: " /?\"&[]"
|
|
||||||
*/
|
|
||||||
static const char worddelimiters[] = " ";
|
|
|
@ -1,31 +0,0 @@
|
||||||
# dmenu version
|
|
||||||
VERSION = 4.9
|
|
||||||
|
|
||||||
# paths
|
|
||||||
PREFIX = /usr/local
|
|
||||||
MANPREFIX = $(PREFIX)/share/man
|
|
||||||
|
|
||||||
X11INC = /usr/X11R6/include
|
|
||||||
X11LIB = /usr/X11R6/lib
|
|
||||||
|
|
||||||
# Xinerama, comment if you don't want it
|
|
||||||
XINERAMALIBS = -lXinerama
|
|
||||||
XINERAMAFLAGS = -DXINERAMA
|
|
||||||
|
|
||||||
# freetype
|
|
||||||
FREETYPELIBS = -lfontconfig -lXft
|
|
||||||
FREETYPEINC = /usr/include/freetype2
|
|
||||||
# OpenBSD (uncomment)
|
|
||||||
#FREETYPEINC = $(X11INC)/freetype2
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
INCS = -I$(X11INC) -I$(FREETYPEINC)
|
|
||||||
LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
|
|
||||||
|
|
||||||
# flags
|
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
|
|
||||||
CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
|
|
||||||
LDFLAGS = $(LIBS)
|
|
||||||
|
|
||||||
# compiler and linker
|
|
||||||
CC = cc
|
|
Binary file not shown.
|
@ -1,197 +0,0 @@
|
||||||
.TH DMENU 1 dmenu\-VERSION
|
|
||||||
.SH NAME
|
|
||||||
dmenu \- dynamic menu
|
|
||||||
.SH SYNOPSIS
|
|
||||||
.B dmenu
|
|
||||||
.RB [ \-bfiv ]
|
|
||||||
.RB [ \-l
|
|
||||||
.IR lines ]
|
|
||||||
.RB [ \-m
|
|
||||||
.IR monitor ]
|
|
||||||
.RB [ \-p
|
|
||||||
.IR prompt ]
|
|
||||||
.RB [ \-fn
|
|
||||||
.IR font ]
|
|
||||||
.RB [ \-nb
|
|
||||||
.IR color ]
|
|
||||||
.RB [ \-nf
|
|
||||||
.IR color ]
|
|
||||||
.RB [ \-sb
|
|
||||||
.IR color ]
|
|
||||||
.RB [ \-sf
|
|
||||||
.IR color ]
|
|
||||||
.RB [ \-w
|
|
||||||
.IR windowid ]
|
|
||||||
.P
|
|
||||||
.BR dmenu_run " ..."
|
|
||||||
.SH DESCRIPTION
|
|
||||||
.B dmenu
|
|
||||||
is a dynamic menu for X, which reads a list of newline\-separated items from
|
|
||||||
stdin. When the user selects an item and presses Return, their choice is printed
|
|
||||||
to stdout and dmenu terminates. Entering text will narrow the items to those
|
|
||||||
matching the tokens in the input.
|
|
||||||
.P
|
|
||||||
.B dmenu_run
|
|
||||||
is a script used by
|
|
||||||
.IR dwm (1)
|
|
||||||
which lists programs in the user's $PATH and runs the result in their $SHELL.
|
|
||||||
.SH OPTIONS
|
|
||||||
.TP
|
|
||||||
.B \-b
|
|
||||||
dmenu appears at the bottom of the screen.
|
|
||||||
.TP
|
|
||||||
.B \-c
|
|
||||||
dmenu appears centered on the screen.
|
|
||||||
.TP
|
|
||||||
.B \-f
|
|
||||||
dmenu grabs the keyboard before reading stdin if not reading from a tty. This
|
|
||||||
is faster, but will lock up X until stdin reaches end\-of\-file.
|
|
||||||
.TP
|
|
||||||
.B \-i
|
|
||||||
dmenu matches menu items case insensitively.
|
|
||||||
.TP
|
|
||||||
.BI \-l " lines"
|
|
||||||
dmenu lists items vertically, with the given number of lines.
|
|
||||||
.TP
|
|
||||||
.BI \-m " monitor"
|
|
||||||
dmenu is displayed on the monitor number supplied. Monitor numbers are starting
|
|
||||||
from 0.
|
|
||||||
.TP
|
|
||||||
.BI \-p " prompt"
|
|
||||||
defines the prompt to be displayed to the left of the input field.
|
|
||||||
.TP
|
|
||||||
.BI \-fn " font"
|
|
||||||
defines the font or font set used.
|
|
||||||
.TP
|
|
||||||
.BI \-nb " color"
|
|
||||||
defines the normal background color.
|
|
||||||
.IR #RGB ,
|
|
||||||
.IR #RRGGBB ,
|
|
||||||
and X color names are supported.
|
|
||||||
.TP
|
|
||||||
.BI \-nf " color"
|
|
||||||
defines the normal foreground color.
|
|
||||||
.TP
|
|
||||||
.BI \-sb " color"
|
|
||||||
defines the selected background color.
|
|
||||||
.TP
|
|
||||||
.BI \-sf " color"
|
|
||||||
defines the selected foreground color.
|
|
||||||
.TP
|
|
||||||
.B \-v
|
|
||||||
prints version information to stdout, then exits.
|
|
||||||
.TP
|
|
||||||
.BI \-w " windowid"
|
|
||||||
embed into windowid.
|
|
||||||
.SH USAGE
|
|
||||||
dmenu is completely controlled by the keyboard. Items are selected using the
|
|
||||||
arrow keys, page up, page down, home, and end.
|
|
||||||
.TP
|
|
||||||
.B Tab
|
|
||||||
Copy the selected item to the input field.
|
|
||||||
.TP
|
|
||||||
.B Return
|
|
||||||
Confirm selection. Prints the selected item to stdout and exits, returning
|
|
||||||
success.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Return
|
|
||||||
Confirm selection. Prints the selected item to stdout and continues.
|
|
||||||
.TP
|
|
||||||
.B Shift\-Return
|
|
||||||
Confirm input. Prints the input text to stdout and exits, returning success.
|
|
||||||
.TP
|
|
||||||
.B Escape
|
|
||||||
Exit without selecting an item, returning failure.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Left
|
|
||||||
Move cursor to the start of the current word
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Right
|
|
||||||
Move cursor to the end of the current word
|
|
||||||
.TP
|
|
||||||
.B C\-a
|
|
||||||
Home
|
|
||||||
.TP
|
|
||||||
.B C\-b
|
|
||||||
Left
|
|
||||||
.TP
|
|
||||||
.B C\-c
|
|
||||||
Escape
|
|
||||||
.TP
|
|
||||||
.B C\-d
|
|
||||||
Delete
|
|
||||||
.TP
|
|
||||||
.B C\-e
|
|
||||||
End
|
|
||||||
.TP
|
|
||||||
.B C\-f
|
|
||||||
Right
|
|
||||||
.TP
|
|
||||||
.B C\-g
|
|
||||||
Escape
|
|
||||||
.TP
|
|
||||||
.B C\-h
|
|
||||||
Backspace
|
|
||||||
.TP
|
|
||||||
.B C\-i
|
|
||||||
Tab
|
|
||||||
.TP
|
|
||||||
.B C\-j
|
|
||||||
Return
|
|
||||||
.TP
|
|
||||||
.B C\-J
|
|
||||||
Shift-Return
|
|
||||||
.TP
|
|
||||||
.B C\-k
|
|
||||||
Delete line right
|
|
||||||
.TP
|
|
||||||
.B C\-m
|
|
||||||
Return
|
|
||||||
.TP
|
|
||||||
.B C\-M
|
|
||||||
Shift-Return
|
|
||||||
.TP
|
|
||||||
.B C\-n
|
|
||||||
Down
|
|
||||||
.TP
|
|
||||||
.B C\-p
|
|
||||||
Up
|
|
||||||
.TP
|
|
||||||
.B C\-u
|
|
||||||
Delete line left
|
|
||||||
.TP
|
|
||||||
.B C\-w
|
|
||||||
Delete word left
|
|
||||||
.TP
|
|
||||||
.B C\-y
|
|
||||||
Paste from primary X selection
|
|
||||||
.TP
|
|
||||||
.B C\-Y
|
|
||||||
Paste from X clipboard
|
|
||||||
.TP
|
|
||||||
.B M\-b
|
|
||||||
Move cursor to the start of the current word
|
|
||||||
.TP
|
|
||||||
.B M\-f
|
|
||||||
Move cursor to the end of the current word
|
|
||||||
.TP
|
|
||||||
.B M\-g
|
|
||||||
Home
|
|
||||||
.TP
|
|
||||||
.B M\-G
|
|
||||||
End
|
|
||||||
.TP
|
|
||||||
.B M\-h
|
|
||||||
Up
|
|
||||||
.TP
|
|
||||||
.B M\-j
|
|
||||||
Page down
|
|
||||||
.TP
|
|
||||||
.B M\-k
|
|
||||||
Page up
|
|
||||||
.TP
|
|
||||||
.B M\-l
|
|
||||||
Down
|
|
||||||
.SH SEE ALSO
|
|
||||||
.IR dwm (1),
|
|
||||||
.IR stest (1)
|
|
|
@ -1,797 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <locale.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <strings.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xatom.h>
|
|
||||||
#include <X11/Xutil.h>
|
|
||||||
#ifdef XINERAMA
|
|
||||||
#include <X11/extensions/Xinerama.h>
|
|
||||||
#endif
|
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
|
|
||||||
#include "drw.h"
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
/* macros */
|
|
||||||
#define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \
|
|
||||||
* MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
|
|
||||||
#define LENGTH(X) (sizeof X / sizeof X[0])
|
|
||||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
||||||
|
|
||||||
/* enums */
|
|
||||||
enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
|
|
||||||
|
|
||||||
struct item {
|
|
||||||
char *text;
|
|
||||||
struct item *left, *right;
|
|
||||||
int out;
|
|
||||||
};
|
|
||||||
|
|
||||||
static char text[BUFSIZ] = "";
|
|
||||||
static char *embed;
|
|
||||||
static int bh, mw, mh;
|
|
||||||
static int inputw = 0, promptw;
|
|
||||||
static int lrpad; /* sum of left and right padding */
|
|
||||||
static size_t cursor;
|
|
||||||
static struct item *items = NULL;
|
|
||||||
static struct item *matches, *matchend;
|
|
||||||
static struct item *prev, *curr, *next, *sel;
|
|
||||||
static int mon = -1, screen;
|
|
||||||
|
|
||||||
static Atom clip, utf8;
|
|
||||||
static Display *dpy;
|
|
||||||
static Window root, parentwin, win;
|
|
||||||
static XIC xic;
|
|
||||||
|
|
||||||
static Drw *drw;
|
|
||||||
static Clr *scheme[SchemeLast];
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
|
|
||||||
static char *(*fstrstr)(const char *, const char *) = strstr;
|
|
||||||
|
|
||||||
static void
|
|
||||||
appenditem(struct item *item, struct item **list, struct item **last)
|
|
||||||
{
|
|
||||||
if (*last)
|
|
||||||
(*last)->right = item;
|
|
||||||
else
|
|
||||||
*list = item;
|
|
||||||
|
|
||||||
item->left = *last;
|
|
||||||
item->right = NULL;
|
|
||||||
*last = item;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
calcoffsets(void)
|
|
||||||
{
|
|
||||||
int i, n;
|
|
||||||
|
|
||||||
if (lines > 0)
|
|
||||||
n = lines * bh;
|
|
||||||
else
|
|
||||||
n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
|
|
||||||
/* calculate which items will begin the next page and previous page */
|
|
||||||
for (i = 0, next = curr; next; next = next->right)
|
|
||||||
if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
|
|
||||||
break;
|
|
||||||
for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
|
|
||||||
if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
max_textw(void)
|
|
||||||
{
|
|
||||||
int len = 0;
|
|
||||||
for (struct item *item = items; item && item->text; item++)
|
|
||||||
len = MAX(TEXTW(item->text), len);
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
cleanup(void)
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
|
||||||
for (i = 0; i < SchemeLast; i++)
|
|
||||||
free(scheme[i]);
|
|
||||||
drw_free(drw);
|
|
||||||
XSync(dpy, False);
|
|
||||||
XCloseDisplay(dpy);
|
|
||||||
}
|
|
||||||
|
|
||||||
static char *
|
|
||||||
cistrstr(const char *s, const char *sub)
|
|
||||||
{
|
|
||||||
size_t len;
|
|
||||||
|
|
||||||
for (len = strlen(sub); *s; s++)
|
|
||||||
if (!strncasecmp(s, sub, len))
|
|
||||||
return (char *)s;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
drawitem(struct item *item, int x, int y, int w)
|
|
||||||
{
|
|
||||||
if (item == sel)
|
|
||||||
drw_setscheme(drw, scheme[SchemeSel]);
|
|
||||||
else if (item->out)
|
|
||||||
drw_setscheme(drw, scheme[SchemeOut]);
|
|
||||||
else
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
|
|
||||||
return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
drawmenu(void)
|
|
||||||
{
|
|
||||||
unsigned int curpos;
|
|
||||||
struct item *item;
|
|
||||||
int x = 0, y = 0, w;
|
|
||||||
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_rect(drw, 0, 0, mw, mh, 1, 1);
|
|
||||||
|
|
||||||
if (prompt && *prompt) {
|
|
||||||
drw_setscheme(drw, scheme[SchemeSel]);
|
|
||||||
x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
|
|
||||||
}
|
|
||||||
/* draw input field */
|
|
||||||
w = (lines > 0 || !matches) ? mw - x : inputw;
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
|
|
||||||
|
|
||||||
curpos = TEXTW(text) - TEXTW(&text[cursor]);
|
|
||||||
if ((curpos += lrpad / 2 - 1) < w) {
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lines > 0) {
|
|
||||||
/* draw vertical list */
|
|
||||||
for (item = curr; item != next; item = item->right)
|
|
||||||
drawitem(item, x, y += bh, mw - x);
|
|
||||||
} else if (matches) {
|
|
||||||
/* draw horizontal list */
|
|
||||||
x += inputw;
|
|
||||||
w = TEXTW("<");
|
|
||||||
if (curr->left) {
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);
|
|
||||||
}
|
|
||||||
x += w;
|
|
||||||
for (item = curr; item != next; item = item->right)
|
|
||||||
x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
|
|
||||||
if (next) {
|
|
||||||
w = TEXTW(">");
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
drw_map(drw, win, 0, 0, mw, mh);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
grabfocus(void)
|
|
||||||
{
|
|
||||||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 };
|
|
||||||
Window focuswin;
|
|
||||||
int i, revertwin;
|
|
||||||
|
|
||||||
for (i = 0; i < 100; ++i) {
|
|
||||||
XGetInputFocus(dpy, &focuswin, &revertwin);
|
|
||||||
if (focuswin == win)
|
|
||||||
return;
|
|
||||||
XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
|
|
||||||
nanosleep(&ts, NULL);
|
|
||||||
}
|
|
||||||
die("cannot grab focus");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
grabkeyboard(void)
|
|
||||||
{
|
|
||||||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 };
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (embed)
|
|
||||||
return;
|
|
||||||
/* try to grab keyboard, we may have to wait for another process to ungrab */
|
|
||||||
for (i = 0; i < 1000; i++) {
|
|
||||||
if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
|
|
||||||
GrabModeAsync, CurrentTime) == GrabSuccess)
|
|
||||||
return;
|
|
||||||
nanosleep(&ts, NULL);
|
|
||||||
}
|
|
||||||
die("cannot grab keyboard");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
match(void)
|
|
||||||
{
|
|
||||||
static char **tokv = NULL;
|
|
||||||
static int tokn = 0;
|
|
||||||
|
|
||||||
char buf[sizeof text], *s;
|
|
||||||
int i, tokc = 0;
|
|
||||||
size_t len, textsize;
|
|
||||||
struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
|
|
||||||
|
|
||||||
strcpy(buf, text);
|
|
||||||
/* separate input text into tokens to be matched individually */
|
|
||||||
for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
|
|
||||||
if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
|
|
||||||
die("cannot realloc %u bytes:", tokn * sizeof *tokv);
|
|
||||||
len = tokc ? strlen(tokv[0]) : 0;
|
|
||||||
|
|
||||||
matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
|
|
||||||
textsize = strlen(text) + 1;
|
|
||||||
for (item = items; item && item->text; item++) {
|
|
||||||
for (i = 0; i < tokc; i++)
|
|
||||||
if (!fstrstr(item->text, tokv[i]))
|
|
||||||
break;
|
|
||||||
if (i != tokc) /* not all tokens match */
|
|
||||||
continue;
|
|
||||||
/* exact matches go first, then prefixes, then substrings */
|
|
||||||
if (!tokc || !fstrncmp(text, item->text, textsize))
|
|
||||||
appenditem(item, &matches, &matchend);
|
|
||||||
else if (!fstrncmp(tokv[0], item->text, len))
|
|
||||||
appenditem(item, &lprefix, &prefixend);
|
|
||||||
else
|
|
||||||
appenditem(item, &lsubstr, &substrend);
|
|
||||||
}
|
|
||||||
if (lprefix) {
|
|
||||||
if (matches) {
|
|
||||||
matchend->right = lprefix;
|
|
||||||
lprefix->left = matchend;
|
|
||||||
} else
|
|
||||||
matches = lprefix;
|
|
||||||
matchend = prefixend;
|
|
||||||
}
|
|
||||||
if (lsubstr) {
|
|
||||||
if (matches) {
|
|
||||||
matchend->right = lsubstr;
|
|
||||||
lsubstr->left = matchend;
|
|
||||||
} else
|
|
||||||
matches = lsubstr;
|
|
||||||
matchend = substrend;
|
|
||||||
}
|
|
||||||
curr = sel = matches;
|
|
||||||
calcoffsets();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
insert(const char *str, ssize_t n)
|
|
||||||
{
|
|
||||||
if (strlen(text) + n > sizeof text - 1)
|
|
||||||
return;
|
|
||||||
/* move existing text out of the way, insert new text, and update cursor */
|
|
||||||
memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
|
|
||||||
if (n > 0)
|
|
||||||
memcpy(&text[cursor], str, n);
|
|
||||||
cursor += n;
|
|
||||||
match();
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
nextrune(int inc)
|
|
||||||
{
|
|
||||||
ssize_t n;
|
|
||||||
|
|
||||||
/* return location of next utf8 rune in the given direction (+1 or -1) */
|
|
||||||
for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
|
|
||||||
;
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
movewordedge(int dir)
|
|
||||||
{
|
|
||||||
if (dir < 0) { /* move cursor to the start of the word*/
|
|
||||||
while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
|
|
||||||
cursor = nextrune(-1);
|
|
||||||
while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
|
|
||||||
cursor = nextrune(-1);
|
|
||||||
} else { /* move cursor to the end of the word */
|
|
||||||
while (text[cursor] && strchr(worddelimiters, text[cursor]))
|
|
||||||
cursor = nextrune(+1);
|
|
||||||
while (text[cursor] && !strchr(worddelimiters, text[cursor]))
|
|
||||||
cursor = nextrune(+1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
keypress(XKeyEvent *ev)
|
|
||||||
{
|
|
||||||
char buf[32];
|
|
||||||
int len;
|
|
||||||
KeySym ksym;
|
|
||||||
Status status;
|
|
||||||
|
|
||||||
len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
|
|
||||||
switch (status) {
|
|
||||||
default: /* XLookupNone, XBufferOverflow */
|
|
||||||
return;
|
|
||||||
case XLookupChars:
|
|
||||||
goto insert;
|
|
||||||
case XLookupKeySym:
|
|
||||||
case XLookupBoth:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ev->state & ControlMask) {
|
|
||||||
switch(ksym) {
|
|
||||||
case XK_a: ksym = XK_Home; break;
|
|
||||||
case XK_b: ksym = XK_Left; break;
|
|
||||||
case XK_c: ksym = XK_Escape; break;
|
|
||||||
case XK_d: ksym = XK_Delete; break;
|
|
||||||
case XK_e: ksym = XK_End; break;
|
|
||||||
case XK_f: ksym = XK_Right; break;
|
|
||||||
case XK_g: ksym = XK_Escape; break;
|
|
||||||
case XK_h: ksym = XK_BackSpace; break;
|
|
||||||
case XK_i: ksym = XK_Tab; break;
|
|
||||||
case XK_j: /* fallthrough */
|
|
||||||
case XK_J: /* fallthrough */
|
|
||||||
case XK_m: /* fallthrough */
|
|
||||||
case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break;
|
|
||||||
case XK_n: ksym = XK_Down; break;
|
|
||||||
case XK_p: ksym = XK_Up; break;
|
|
||||||
|
|
||||||
case XK_k: /* delete right */
|
|
||||||
text[cursor] = '\0';
|
|
||||||
match();
|
|
||||||
break;
|
|
||||||
case XK_u: /* delete left */
|
|
||||||
insert(NULL, 0 - cursor);
|
|
||||||
break;
|
|
||||||
case XK_w: /* delete word */
|
|
||||||
while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
|
|
||||||
insert(NULL, nextrune(-1) - cursor);
|
|
||||||
while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
|
|
||||||
insert(NULL, nextrune(-1) - cursor);
|
|
||||||
break;
|
|
||||||
case XK_y: /* paste selection */
|
|
||||||
case XK_Y:
|
|
||||||
XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
|
|
||||||
utf8, utf8, win, CurrentTime);
|
|
||||||
return;
|
|
||||||
case XK_Left:
|
|
||||||
movewordedge(-1);
|
|
||||||
goto draw;
|
|
||||||
case XK_Right:
|
|
||||||
movewordedge(+1);
|
|
||||||
goto draw;
|
|
||||||
case XK_Return:
|
|
||||||
case XK_KP_Enter:
|
|
||||||
break;
|
|
||||||
case XK_bracketleft:
|
|
||||||
cleanup();
|
|
||||||
exit(1);
|
|
||||||
default:
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else if (ev->state & Mod1Mask) {
|
|
||||||
switch(ksym) {
|
|
||||||
case XK_b:
|
|
||||||
movewordedge(-1);
|
|
||||||
goto draw;
|
|
||||||
case XK_f:
|
|
||||||
movewordedge(+1);
|
|
||||||
goto draw;
|
|
||||||
case XK_g: ksym = XK_Home; break;
|
|
||||||
case XK_G: ksym = XK_End; break;
|
|
||||||
case XK_h: ksym = XK_Up; break;
|
|
||||||
case XK_j: ksym = XK_Next; break;
|
|
||||||
case XK_k: ksym = XK_Prior; break;
|
|
||||||
case XK_l: ksym = XK_Down; break;
|
|
||||||
default:
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch(ksym) {
|
|
||||||
default:
|
|
||||||
insert:
|
|
||||||
if (!iscntrl(*buf))
|
|
||||||
insert(buf, len);
|
|
||||||
break;
|
|
||||||
case XK_Delete:
|
|
||||||
if (text[cursor] == '\0')
|
|
||||||
return;
|
|
||||||
cursor = nextrune(+1);
|
|
||||||
/* fallthrough */
|
|
||||||
case XK_BackSpace:
|
|
||||||
if (cursor == 0)
|
|
||||||
return;
|
|
||||||
insert(NULL, nextrune(-1) - cursor);
|
|
||||||
break;
|
|
||||||
case XK_End:
|
|
||||||
if (text[cursor] != '\0') {
|
|
||||||
cursor = strlen(text);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (next) {
|
|
||||||
/* jump to end of list and position items in reverse */
|
|
||||||
curr = matchend;
|
|
||||||
calcoffsets();
|
|
||||||
curr = prev;
|
|
||||||
calcoffsets();
|
|
||||||
while (next && (curr = curr->right))
|
|
||||||
calcoffsets();
|
|
||||||
}
|
|
||||||
sel = matchend;
|
|
||||||
break;
|
|
||||||
case XK_Escape:
|
|
||||||
cleanup();
|
|
||||||
exit(1);
|
|
||||||
case XK_Home:
|
|
||||||
if (sel == matches) {
|
|
||||||
cursor = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
sel = curr = matches;
|
|
||||||
calcoffsets();
|
|
||||||
break;
|
|
||||||
case XK_Left:
|
|
||||||
if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
|
|
||||||
cursor = nextrune(-1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (lines > 0)
|
|
||||||
return;
|
|
||||||
/* fallthrough */
|
|
||||||
case XK_Up:
|
|
||||||
if (sel && sel->left && (sel = sel->left)->right == curr) {
|
|
||||||
curr = prev;
|
|
||||||
calcoffsets();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case XK_Next:
|
|
||||||
if (!next)
|
|
||||||
return;
|
|
||||||
sel = curr = next;
|
|
||||||
calcoffsets();
|
|
||||||
break;
|
|
||||||
case XK_Prior:
|
|
||||||
if (!prev)
|
|
||||||
return;
|
|
||||||
sel = curr = prev;
|
|
||||||
calcoffsets();
|
|
||||||
break;
|
|
||||||
case XK_Return:
|
|
||||||
case XK_KP_Enter:
|
|
||||||
puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
|
|
||||||
if (!(ev->state & ControlMask)) {
|
|
||||||
cleanup();
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
if (sel)
|
|
||||||
sel->out = 1;
|
|
||||||
break;
|
|
||||||
case XK_Right:
|
|
||||||
if (text[cursor] != '\0') {
|
|
||||||
cursor = nextrune(+1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (lines > 0)
|
|
||||||
return;
|
|
||||||
/* fallthrough */
|
|
||||||
case XK_Down:
|
|
||||||
if (sel && sel->right && (sel = sel->right) == next) {
|
|
||||||
curr = next;
|
|
||||||
calcoffsets();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case XK_Tab:
|
|
||||||
if (!sel)
|
|
||||||
return;
|
|
||||||
strncpy(text, sel->text, sizeof text - 1);
|
|
||||||
text[sizeof text - 1] = '\0';
|
|
||||||
cursor = strlen(text);
|
|
||||||
match();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
draw:
|
|
||||||
drawmenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
paste(void)
|
|
||||||
{
|
|
||||||
char *p, *q;
|
|
||||||
int di;
|
|
||||||
unsigned long dl;
|
|
||||||
Atom da;
|
|
||||||
|
|
||||||
/* we have been given the current selection, now insert it into input */
|
|
||||||
if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
|
|
||||||
utf8, &da, &di, &dl, &dl, (unsigned char **)&p)
|
|
||||||
== Success && p) {
|
|
||||||
insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
|
|
||||||
XFree(p);
|
|
||||||
}
|
|
||||||
drawmenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
readstdin(void)
|
|
||||||
{
|
|
||||||
char buf[sizeof text], *p;
|
|
||||||
size_t i, imax = 0, size = 0;
|
|
||||||
unsigned int tmpmax = 0;
|
|
||||||
|
|
||||||
/* read each line from stdin and add it to the item list */
|
|
||||||
for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
|
|
||||||
if (i + 1 >= size / sizeof *items)
|
|
||||||
if (!(items = realloc(items, (size += BUFSIZ))))
|
|
||||||
die("cannot realloc %u bytes:", size);
|
|
||||||
if ((p = strchr(buf, '\n')))
|
|
||||||
*p = '\0';
|
|
||||||
if (!(items[i].text = strdup(buf)))
|
|
||||||
die("cannot strdup %u bytes:", strlen(buf) + 1);
|
|
||||||
items[i].out = 0;
|
|
||||||
drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
|
|
||||||
if (tmpmax > inputw) {
|
|
||||||
inputw = tmpmax;
|
|
||||||
imax = i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (items)
|
|
||||||
items[i].text = NULL;
|
|
||||||
inputw = items ? TEXTW(items[imax].text) : 0;
|
|
||||||
lines = MIN(lines, i);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
run(void)
|
|
||||||
{
|
|
||||||
XEvent ev;
|
|
||||||
|
|
||||||
while (!XNextEvent(dpy, &ev)) {
|
|
||||||
if (XFilterEvent(&ev, win))
|
|
||||||
continue;
|
|
||||||
switch(ev.type) {
|
|
||||||
case DestroyNotify:
|
|
||||||
if (ev.xdestroywindow.window != win)
|
|
||||||
break;
|
|
||||||
cleanup();
|
|
||||||
exit(1);
|
|
||||||
case Expose:
|
|
||||||
if (ev.xexpose.count == 0)
|
|
||||||
drw_map(drw, win, 0, 0, mw, mh);
|
|
||||||
break;
|
|
||||||
case FocusIn:
|
|
||||||
/* regrab focus from parent window */
|
|
||||||
if (ev.xfocus.window != win)
|
|
||||||
grabfocus();
|
|
||||||
break;
|
|
||||||
case KeyPress:
|
|
||||||
keypress(&ev.xkey);
|
|
||||||
break;
|
|
||||||
case SelectionNotify:
|
|
||||||
if (ev.xselection.property == utf8)
|
|
||||||
paste();
|
|
||||||
break;
|
|
||||||
case VisibilityNotify:
|
|
||||||
if (ev.xvisibility.state != VisibilityUnobscured)
|
|
||||||
XRaiseWindow(dpy, win);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
setup(void)
|
|
||||||
{
|
|
||||||
int x, y, i, j;
|
|
||||||
unsigned int du;
|
|
||||||
XSetWindowAttributes swa;
|
|
||||||
XIM xim;
|
|
||||||
Window w, dw, *dws;
|
|
||||||
XWindowAttributes wa;
|
|
||||||
XClassHint ch = {"dmenu", "dmenu"};
|
|
||||||
#ifdef XINERAMA
|
|
||||||
XineramaScreenInfo *info;
|
|
||||||
Window pw;
|
|
||||||
int a, di, n, area = 0;
|
|
||||||
#endif
|
|
||||||
/* init appearance */
|
|
||||||
for (j = 0; j < SchemeLast; j++)
|
|
||||||
scheme[j] = drw_scm_create(drw, colors[j], 2);
|
|
||||||
|
|
||||||
clip = XInternAtom(dpy, "CLIPBOARD", False);
|
|
||||||
utf8 = XInternAtom(dpy, "UTF8_STRING", False);
|
|
||||||
|
|
||||||
/* calculate menu geometry */
|
|
||||||
bh = drw->fonts->h + 2;
|
|
||||||
lines = MAX(lines, 0);
|
|
||||||
mh = (lines + 1) * bh;
|
|
||||||
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
|
||||||
#ifdef XINERAMA
|
|
||||||
i = 0;
|
|
||||||
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
|
||||||
XGetInputFocus(dpy, &w, &di);
|
|
||||||
if (mon >= 0 && mon < n)
|
|
||||||
i = mon;
|
|
||||||
else if (w != root && w != PointerRoot && w != None) {
|
|
||||||
/* find top-level window containing current input focus */
|
|
||||||
do {
|
|
||||||
if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
|
|
||||||
XFree(dws);
|
|
||||||
} while (w != root && w != pw);
|
|
||||||
/* find xinerama screen with which the window intersects most */
|
|
||||||
if (XGetWindowAttributes(dpy, pw, &wa))
|
|
||||||
for (j = 0; j < n; j++)
|
|
||||||
if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
|
|
||||||
area = a;
|
|
||||||
i = j;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* no focused window is on screen, so use pointer location instead */
|
|
||||||
if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
|
|
||||||
for (i = 0; i < n; i++)
|
|
||||||
if (INTERSECT(x, y, 1, 1, info[i]))
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (centered) {
|
|
||||||
mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width);
|
|
||||||
x = info[i].x_org + ((info[i].width - mw) / 2);
|
|
||||||
y = info[i].y_org + ((info[i].height - mh) / 2);
|
|
||||||
} else {
|
|
||||||
x = info[i].x_org;
|
|
||||||
y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
|
||||||
mw = info[i].width;
|
|
||||||
}
|
|
||||||
|
|
||||||
XFree(info);
|
|
||||||
} else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
|
||||||
die("could not get embedding window attributes: 0x%lx",
|
|
||||||
parentwin);
|
|
||||||
|
|
||||||
if (centered) {
|
|
||||||
mw = MIN(MAX(max_textw() + promptw, min_width), wa.width);
|
|
||||||
x = (wa.width - mw) / 2;
|
|
||||||
y = (wa.height - mh) / 2;
|
|
||||||
} else {
|
|
||||||
x = 0;
|
|
||||||
y = topbar ? 0 : wa.height - mh;
|
|
||||||
mw = wa.width;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
inputw = MIN(inputw, mw/3);
|
|
||||||
match();
|
|
||||||
|
|
||||||
/* create menu window */
|
|
||||||
swa.override_redirect = True;
|
|
||||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
|
||||||
win = XCreateWindow(dpy, parentwin, x, y, mw - 2 * border_width, mh, border_width,
|
|
||||||
CopyFromParent, CopyFromParent, CopyFromParent,
|
|
||||||
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
|
||||||
XSetWindowBorder(dpy, win, scheme[SchemeOut][ColBg].pixel);
|
|
||||||
XSetClassHint(dpy, win, &ch);
|
|
||||||
|
|
||||||
|
|
||||||
/* input methods */
|
|
||||||
if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
|
|
||||||
die("XOpenIM failed: could not open input device");
|
|
||||||
|
|
||||||
xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
|
|
||||||
XNClientWindow, win, XNFocusWindow, win, NULL);
|
|
||||||
|
|
||||||
XMapRaised(dpy, win);
|
|
||||||
if (embed) {
|
|
||||||
XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
|
|
||||||
if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
|
|
||||||
for (i = 0; i < du && dws[i] != win; ++i)
|
|
||||||
XSelectInput(dpy, dws[i], FocusChangeMask);
|
|
||||||
XFree(dws);
|
|
||||||
}
|
|
||||||
grabfocus();
|
|
||||||
}
|
|
||||||
drw_resize(drw, mw, mh);
|
|
||||||
drawmenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
usage(void)
|
|
||||||
{
|
|
||||||
fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
|
|
||||||
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
XWindowAttributes wa;
|
|
||||||
int i, fast = 0;
|
|
||||||
|
|
||||||
for (i = 1; i < argc; i++)
|
|
||||||
/* these options take no arguments */
|
|
||||||
if (!strcmp(argv[i], "-v")) { /* prints version information */
|
|
||||||
puts("dmenu-"VERSION);
|
|
||||||
exit(0);
|
|
||||||
} else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
|
|
||||||
topbar = 0;
|
|
||||||
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
|
||||||
fast = 1;
|
|
||||||
else if (!strcmp(argv[i], "-c")) /* centers dmenu on screen */
|
|
||||||
centered = 1;
|
|
||||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
|
||||||
fstrncmp = strncasecmp;
|
|
||||||
fstrstr = cistrstr;
|
|
||||||
} else if (i + 1 == argc)
|
|
||||||
usage();
|
|
||||||
/* these options take one argument */
|
|
||||||
else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */
|
|
||||||
lines = atoi(argv[++i]);
|
|
||||||
else if (!strcmp(argv[i], "-m"))
|
|
||||||
mon = atoi(argv[++i]);
|
|
||||||
else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */
|
|
||||||
prompt = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-fn")) /* font or font set */
|
|
||||||
fonts[0] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-nb")) /* normal background color */
|
|
||||||
colors[SchemeNorm][ColBg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-nf")) /* normal foreground color */
|
|
||||||
colors[SchemeNorm][ColFg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-sb")) /* selected background color */
|
|
||||||
colors[SchemeSel][ColBg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-sf")) /* selected foreground color */
|
|
||||||
colors[SchemeSel][ColFg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-w")) /* embedding window id */
|
|
||||||
embed = argv[++i];
|
|
||||||
else
|
|
||||||
usage();
|
|
||||||
|
|
||||||
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
|
|
||||||
fputs("warning: no locale support\n", stderr);
|
|
||||||
if (!(dpy = XOpenDisplay(NULL)))
|
|
||||||
die("cannot open display");
|
|
||||||
screen = DefaultScreen(dpy);
|
|
||||||
root = RootWindow(dpy, screen);
|
|
||||||
if (!embed || !(parentwin = strtol(embed, NULL, 0)))
|
|
||||||
parentwin = root;
|
|
||||||
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
|
||||||
die("could not get embedding window attributes: 0x%lx",
|
|
||||||
parentwin);
|
|
||||||
drw = drw_create(dpy, screen, root, wa.width, wa.height);
|
|
||||||
if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
|
|
||||||
die("no fonts could be loaded.");
|
|
||||||
lrpad = drw->fonts->h;
|
|
||||||
|
|
||||||
#ifdef __OpenBSD__
|
|
||||||
if (pledge("stdio rpath", NULL) == -1)
|
|
||||||
die("pledge");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (fast && !isatty(0)) {
|
|
||||||
grabkeyboard();
|
|
||||||
readstdin();
|
|
||||||
} else {
|
|
||||||
readstdin();
|
|
||||||
grabkeyboard();
|
|
||||||
}
|
|
||||||
setup();
|
|
||||||
run();
|
|
||||||
|
|
||||||
return 1; /* unreachable */
|
|
||||||
}
|
|
|
@ -1,796 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <locale.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <strings.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xatom.h>
|
|
||||||
#include <X11/Xutil.h>
|
|
||||||
#ifdef XINERAMA
|
|
||||||
#include <X11/extensions/Xinerama.h>
|
|
||||||
#endif
|
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
|
|
||||||
#include "drw.h"
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
/* macros */
|
|
||||||
#define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \
|
|
||||||
* MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
|
|
||||||
#define LENGTH(X) (sizeof X / sizeof X[0])
|
|
||||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
||||||
|
|
||||||
/* enums */
|
|
||||||
enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
|
|
||||||
|
|
||||||
struct item {
|
|
||||||
char *text;
|
|
||||||
struct item *left, *right;
|
|
||||||
int out;
|
|
||||||
};
|
|
||||||
|
|
||||||
static char text[BUFSIZ] = "";
|
|
||||||
static char *embed;
|
|
||||||
static int bh, mw, mh;
|
|
||||||
static int inputw = 0, promptw;
|
|
||||||
static int lrpad; /* sum of left and right padding */
|
|
||||||
static size_t cursor;
|
|
||||||
static struct item *items = NULL;
|
|
||||||
static struct item *matches, *matchend;
|
|
||||||
static struct item *prev, *curr, *next, *sel;
|
|
||||||
static int mon = -1, screen;
|
|
||||||
|
|
||||||
static Atom clip, utf8;
|
|
||||||
static Display *dpy;
|
|
||||||
static Window root, parentwin, win;
|
|
||||||
static XIC xic;
|
|
||||||
|
|
||||||
static Drw *drw;
|
|
||||||
static Clr *scheme[SchemeLast];
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
|
|
||||||
static char *(*fstrstr)(const char *, const char *) = strstr;
|
|
||||||
|
|
||||||
static void
|
|
||||||
appenditem(struct item *item, struct item **list, struct item **last)
|
|
||||||
{
|
|
||||||
if (*last)
|
|
||||||
(*last)->right = item;
|
|
||||||
else
|
|
||||||
*list = item;
|
|
||||||
|
|
||||||
item->left = *last;
|
|
||||||
item->right = NULL;
|
|
||||||
*last = item;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
calcoffsets(void)
|
|
||||||
{
|
|
||||||
int i, n;
|
|
||||||
|
|
||||||
if (lines > 0)
|
|
||||||
n = lines * bh;
|
|
||||||
else
|
|
||||||
n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
|
|
||||||
/* calculate which items will begin the next page and previous page */
|
|
||||||
for (i = 0, next = curr; next; next = next->right)
|
|
||||||
if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
|
|
||||||
break;
|
|
||||||
for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
|
|
||||||
if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
max_textw(void)
|
|
||||||
{
|
|
||||||
int len = 0;
|
|
||||||
for (struct item *item = items; item && item->text; item++)
|
|
||||||
len = MAX(TEXTW(item->text), len);
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
cleanup(void)
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
|
||||||
for (i = 0; i < SchemeLast; i++)
|
|
||||||
free(scheme[i]);
|
|
||||||
drw_free(drw);
|
|
||||||
XSync(dpy, False);
|
|
||||||
XCloseDisplay(dpy);
|
|
||||||
}
|
|
||||||
|
|
||||||
static char *
|
|
||||||
cistrstr(const char *s, const char *sub)
|
|
||||||
{
|
|
||||||
size_t len;
|
|
||||||
|
|
||||||
for (len = strlen(sub); *s; s++)
|
|
||||||
if (!strncasecmp(s, sub, len))
|
|
||||||
return (char *)s;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
drawitem(struct item *item, int x, int y, int w)
|
|
||||||
{
|
|
||||||
if (item == sel)
|
|
||||||
drw_setscheme(drw, scheme[SchemeSel]);
|
|
||||||
else if (item->out)
|
|
||||||
drw_setscheme(drw, scheme[SchemeOut]);
|
|
||||||
else
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
|
|
||||||
return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
drawmenu(void)
|
|
||||||
{
|
|
||||||
unsigned int curpos;
|
|
||||||
struct item *item;
|
|
||||||
int x = 0, y = 0, w;
|
|
||||||
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_rect(drw, 0, 0, mw, mh, 1, 1);
|
|
||||||
|
|
||||||
if (prompt && *prompt) {
|
|
||||||
drw_setscheme(drw, scheme[SchemeSel]);
|
|
||||||
x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
|
|
||||||
}
|
|
||||||
/* draw input field */
|
|
||||||
w = (lines > 0 || !matches) ? mw - x : inputw;
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
|
|
||||||
|
|
||||||
curpos = TEXTW(text) - TEXTW(&text[cursor]);
|
|
||||||
if ((curpos += lrpad / 2 - 1) < w) {
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lines > 0) {
|
|
||||||
/* draw vertical list */
|
|
||||||
for (item = curr; item != next; item = item->right)
|
|
||||||
drawitem(item, x, y += bh, mw - x);
|
|
||||||
} else if (matches) {
|
|
||||||
/* draw horizontal list */
|
|
||||||
x += inputw;
|
|
||||||
w = TEXTW("<");
|
|
||||||
if (curr->left) {
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);
|
|
||||||
}
|
|
||||||
x += w;
|
|
||||||
for (item = curr; item != next; item = item->right)
|
|
||||||
x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
|
|
||||||
if (next) {
|
|
||||||
w = TEXTW(">");
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
drw_map(drw, win, 0, 0, mw, mh);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
grabfocus(void)
|
|
||||||
{
|
|
||||||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 };
|
|
||||||
Window focuswin;
|
|
||||||
int i, revertwin;
|
|
||||||
|
|
||||||
for (i = 0; i < 100; ++i) {
|
|
||||||
XGetInputFocus(dpy, &focuswin, &revertwin);
|
|
||||||
if (focuswin == win)
|
|
||||||
return;
|
|
||||||
XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
|
|
||||||
nanosleep(&ts, NULL);
|
|
||||||
}
|
|
||||||
die("cannot grab focus");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
grabkeyboard(void)
|
|
||||||
{
|
|
||||||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 };
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (embed)
|
|
||||||
return;
|
|
||||||
/* try to grab keyboard, we may have to wait for another process to ungrab */
|
|
||||||
for (i = 0; i < 1000; i++) {
|
|
||||||
if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
|
|
||||||
GrabModeAsync, CurrentTime) == GrabSuccess)
|
|
||||||
return;
|
|
||||||
nanosleep(&ts, NULL);
|
|
||||||
}
|
|
||||||
die("cannot grab keyboard");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
match(void)
|
|
||||||
{
|
|
||||||
static char **tokv = NULL;
|
|
||||||
static int tokn = 0;
|
|
||||||
|
|
||||||
char buf[sizeof text], *s;
|
|
||||||
int i, tokc = 0;
|
|
||||||
size_t len, textsize;
|
|
||||||
struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
|
|
||||||
|
|
||||||
strcpy(buf, text);
|
|
||||||
/* separate input text into tokens to be matched individually */
|
|
||||||
for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
|
|
||||||
if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
|
|
||||||
die("cannot realloc %u bytes:", tokn * sizeof *tokv);
|
|
||||||
len = tokc ? strlen(tokv[0]) : 0;
|
|
||||||
|
|
||||||
matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
|
|
||||||
textsize = strlen(text) + 1;
|
|
||||||
for (item = items; item && item->text; item++) {
|
|
||||||
for (i = 0; i < tokc; i++)
|
|
||||||
if (!fstrstr(item->text, tokv[i]))
|
|
||||||
break;
|
|
||||||
if (i != tokc) /* not all tokens match */
|
|
||||||
continue;
|
|
||||||
/* exact matches go first, then prefixes, then substrings */
|
|
||||||
if (!tokc || !fstrncmp(text, item->text, textsize))
|
|
||||||
appenditem(item, &matches, &matchend);
|
|
||||||
else if (!fstrncmp(tokv[0], item->text, len))
|
|
||||||
appenditem(item, &lprefix, &prefixend);
|
|
||||||
else
|
|
||||||
appenditem(item, &lsubstr, &substrend);
|
|
||||||
}
|
|
||||||
if (lprefix) {
|
|
||||||
if (matches) {
|
|
||||||
matchend->right = lprefix;
|
|
||||||
lprefix->left = matchend;
|
|
||||||
} else
|
|
||||||
matches = lprefix;
|
|
||||||
matchend = prefixend;
|
|
||||||
}
|
|
||||||
if (lsubstr) {
|
|
||||||
if (matches) {
|
|
||||||
matchend->right = lsubstr;
|
|
||||||
lsubstr->left = matchend;
|
|
||||||
} else
|
|
||||||
matches = lsubstr;
|
|
||||||
matchend = substrend;
|
|
||||||
}
|
|
||||||
curr = sel = matches;
|
|
||||||
calcoffsets();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
insert(const char *str, ssize_t n)
|
|
||||||
{
|
|
||||||
if (strlen(text) + n > sizeof text - 1)
|
|
||||||
return;
|
|
||||||
/* move existing text out of the way, insert new text, and update cursor */
|
|
||||||
memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
|
|
||||||
if (n > 0)
|
|
||||||
memcpy(&text[cursor], str, n);
|
|
||||||
cursor += n;
|
|
||||||
match();
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
nextrune(int inc)
|
|
||||||
{
|
|
||||||
ssize_t n;
|
|
||||||
|
|
||||||
/* return location of next utf8 rune in the given direction (+1 or -1) */
|
|
||||||
for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
|
|
||||||
;
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
movewordedge(int dir)
|
|
||||||
{
|
|
||||||
if (dir < 0) { /* move cursor to the start of the word*/
|
|
||||||
while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
|
|
||||||
cursor = nextrune(-1);
|
|
||||||
while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
|
|
||||||
cursor = nextrune(-1);
|
|
||||||
} else { /* move cursor to the end of the word */
|
|
||||||
while (text[cursor] && strchr(worddelimiters, text[cursor]))
|
|
||||||
cursor = nextrune(+1);
|
|
||||||
while (text[cursor] && !strchr(worddelimiters, text[cursor]))
|
|
||||||
cursor = nextrune(+1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
keypress(XKeyEvent *ev)
|
|
||||||
{
|
|
||||||
char buf[32];
|
|
||||||
int len;
|
|
||||||
KeySym ksym;
|
|
||||||
Status status;
|
|
||||||
|
|
||||||
len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
|
|
||||||
switch (status) {
|
|
||||||
default: /* XLookupNone, XBufferOverflow */
|
|
||||||
return;
|
|
||||||
case XLookupChars:
|
|
||||||
goto insert;
|
|
||||||
case XLookupKeySym:
|
|
||||||
case XLookupBoth:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ev->state & ControlMask) {
|
|
||||||
switch(ksym) {
|
|
||||||
case XK_a: ksym = XK_Home; break;
|
|
||||||
case XK_b: ksym = XK_Left; break;
|
|
||||||
case XK_c: ksym = XK_Escape; break;
|
|
||||||
case XK_d: ksym = XK_Delete; break;
|
|
||||||
case XK_e: ksym = XK_End; break;
|
|
||||||
case XK_f: ksym = XK_Right; break;
|
|
||||||
case XK_g: ksym = XK_Escape; break;
|
|
||||||
case XK_h: ksym = XK_BackSpace; break;
|
|
||||||
case XK_i: ksym = XK_Tab; break;
|
|
||||||
case XK_j: /* fallthrough */
|
|
||||||
case XK_J: /* fallthrough */
|
|
||||||
case XK_m: /* fallthrough */
|
|
||||||
case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break;
|
|
||||||
case XK_n: ksym = XK_Down; break;
|
|
||||||
case XK_p: ksym = XK_Up; break;
|
|
||||||
|
|
||||||
case XK_k: /* delete right */
|
|
||||||
text[cursor] = '\0';
|
|
||||||
match();
|
|
||||||
break;
|
|
||||||
case XK_u: /* delete left */
|
|
||||||
insert(NULL, 0 - cursor);
|
|
||||||
break;
|
|
||||||
case XK_w: /* delete word */
|
|
||||||
while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
|
|
||||||
insert(NULL, nextrune(-1) - cursor);
|
|
||||||
while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
|
|
||||||
insert(NULL, nextrune(-1) - cursor);
|
|
||||||
break;
|
|
||||||
case XK_y: /* paste selection */
|
|
||||||
case XK_Y:
|
|
||||||
XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
|
|
||||||
utf8, utf8, win, CurrentTime);
|
|
||||||
return;
|
|
||||||
case XK_Left:
|
|
||||||
movewordedge(-1);
|
|
||||||
goto draw;
|
|
||||||
case XK_Right:
|
|
||||||
movewordedge(+1);
|
|
||||||
goto draw;
|
|
||||||
case XK_Return:
|
|
||||||
case XK_KP_Enter:
|
|
||||||
break;
|
|
||||||
case XK_bracketleft:
|
|
||||||
cleanup();
|
|
||||||
exit(1);
|
|
||||||
default:
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else if (ev->state & Mod1Mask) {
|
|
||||||
switch(ksym) {
|
|
||||||
case XK_b:
|
|
||||||
movewordedge(-1);
|
|
||||||
goto draw;
|
|
||||||
case XK_f:
|
|
||||||
movewordedge(+1);
|
|
||||||
goto draw;
|
|
||||||
case XK_g: ksym = XK_Home; break;
|
|
||||||
case XK_G: ksym = XK_End; break;
|
|
||||||
case XK_h: ksym = XK_Up; break;
|
|
||||||
case XK_j: ksym = XK_Next; break;
|
|
||||||
case XK_k: ksym = XK_Prior; break;
|
|
||||||
case XK_l: ksym = XK_Down; break;
|
|
||||||
default:
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch(ksym) {
|
|
||||||
default:
|
|
||||||
insert:
|
|
||||||
if (!iscntrl(*buf))
|
|
||||||
insert(buf, len);
|
|
||||||
break;
|
|
||||||
case XK_Delete:
|
|
||||||
if (text[cursor] == '\0')
|
|
||||||
return;
|
|
||||||
cursor = nextrune(+1);
|
|
||||||
/* fallthrough */
|
|
||||||
case XK_BackSpace:
|
|
||||||
if (cursor == 0)
|
|
||||||
return;
|
|
||||||
insert(NULL, nextrune(-1) - cursor);
|
|
||||||
break;
|
|
||||||
case XK_End:
|
|
||||||
if (text[cursor] != '\0') {
|
|
||||||
cursor = strlen(text);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (next) {
|
|
||||||
/* jump to end of list and position items in reverse */
|
|
||||||
curr = matchend;
|
|
||||||
calcoffsets();
|
|
||||||
curr = prev;
|
|
||||||
calcoffsets();
|
|
||||||
while (next && (curr = curr->right))
|
|
||||||
calcoffsets();
|
|
||||||
}
|
|
||||||
sel = matchend;
|
|
||||||
break;
|
|
||||||
case XK_Escape:
|
|
||||||
cleanup();
|
|
||||||
exit(1);
|
|
||||||
case XK_Home:
|
|
||||||
if (sel == matches) {
|
|
||||||
cursor = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
sel = curr = matches;
|
|
||||||
calcoffsets();
|
|
||||||
break;
|
|
||||||
case XK_Left:
|
|
||||||
if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
|
|
||||||
cursor = nextrune(-1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (lines > 0)
|
|
||||||
return;
|
|
||||||
/* fallthrough */
|
|
||||||
case XK_Up:
|
|
||||||
if (sel && sel->left && (sel = sel->left)->right == curr) {
|
|
||||||
curr = prev;
|
|
||||||
calcoffsets();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case XK_Next:
|
|
||||||
if (!next)
|
|
||||||
return;
|
|
||||||
sel = curr = next;
|
|
||||||
calcoffsets();
|
|
||||||
break;
|
|
||||||
case XK_Prior:
|
|
||||||
if (!prev)
|
|
||||||
return;
|
|
||||||
sel = curr = prev;
|
|
||||||
calcoffsets();
|
|
||||||
break;
|
|
||||||
case XK_Return:
|
|
||||||
case XK_KP_Enter:
|
|
||||||
puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
|
|
||||||
if (!(ev->state & ControlMask)) {
|
|
||||||
cleanup();
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
if (sel)
|
|
||||||
sel->out = 1;
|
|
||||||
break;
|
|
||||||
case XK_Right:
|
|
||||||
if (text[cursor] != '\0') {
|
|
||||||
cursor = nextrune(+1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (lines > 0)
|
|
||||||
return;
|
|
||||||
/* fallthrough */
|
|
||||||
case XK_Down:
|
|
||||||
if (sel && sel->right && (sel = sel->right) == next) {
|
|
||||||
curr = next;
|
|
||||||
calcoffsets();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case XK_Tab:
|
|
||||||
if (!sel)
|
|
||||||
return;
|
|
||||||
strncpy(text, sel->text, sizeof text - 1);
|
|
||||||
text[sizeof text - 1] = '\0';
|
|
||||||
cursor = strlen(text);
|
|
||||||
match();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
draw:
|
|
||||||
drawmenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
paste(void)
|
|
||||||
{
|
|
||||||
char *p, *q;
|
|
||||||
int di;
|
|
||||||
unsigned long dl;
|
|
||||||
Atom da;
|
|
||||||
|
|
||||||
/* we have been given the current selection, now insert it into input */
|
|
||||||
if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
|
|
||||||
utf8, &da, &di, &dl, &dl, (unsigned char **)&p)
|
|
||||||
== Success && p) {
|
|
||||||
insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
|
|
||||||
XFree(p);
|
|
||||||
}
|
|
||||||
drawmenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
readstdin(void)
|
|
||||||
{
|
|
||||||
char buf[sizeof text], *p;
|
|
||||||
size_t i, imax = 0, size = 0;
|
|
||||||
unsigned int tmpmax = 0;
|
|
||||||
|
|
||||||
/* read each line from stdin and add it to the item list */
|
|
||||||
for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
|
|
||||||
if (i + 1 >= size / sizeof *items)
|
|
||||||
if (!(items = realloc(items, (size += BUFSIZ))))
|
|
||||||
die("cannot realloc %u bytes:", size);
|
|
||||||
if ((p = strchr(buf, '\n')))
|
|
||||||
*p = '\0';
|
|
||||||
if (!(items[i].text = strdup(buf)))
|
|
||||||
die("cannot strdup %u bytes:", strlen(buf) + 1);
|
|
||||||
items[i].out = 0;
|
|
||||||
drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
|
|
||||||
if (tmpmax > inputw) {
|
|
||||||
inputw = tmpmax;
|
|
||||||
imax = i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (items)
|
|
||||||
items[i].text = NULL;
|
|
||||||
inputw = items ? TEXTW(items[imax].text) : 0;
|
|
||||||
lines = MIN(lines, i);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
run(void)
|
|
||||||
{
|
|
||||||
XEvent ev;
|
|
||||||
|
|
||||||
while (!XNextEvent(dpy, &ev)) {
|
|
||||||
if (XFilterEvent(&ev, win))
|
|
||||||
continue;
|
|
||||||
switch(ev.type) {
|
|
||||||
case DestroyNotify:
|
|
||||||
if (ev.xdestroywindow.window != win)
|
|
||||||
break;
|
|
||||||
cleanup();
|
|
||||||
exit(1);
|
|
||||||
case Expose:
|
|
||||||
if (ev.xexpose.count == 0)
|
|
||||||
drw_map(drw, win, 0, 0, mw, mh);
|
|
||||||
break;
|
|
||||||
case FocusIn:
|
|
||||||
/* regrab focus from parent window */
|
|
||||||
if (ev.xfocus.window != win)
|
|
||||||
grabfocus();
|
|
||||||
break;
|
|
||||||
case KeyPress:
|
|
||||||
keypress(&ev.xkey);
|
|
||||||
break;
|
|
||||||
case SelectionNotify:
|
|
||||||
if (ev.xselection.property == utf8)
|
|
||||||
paste();
|
|
||||||
break;
|
|
||||||
case VisibilityNotify:
|
|
||||||
if (ev.xvisibility.state != VisibilityUnobscured)
|
|
||||||
XRaiseWindow(dpy, win);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
setup(void)
|
|
||||||
{
|
|
||||||
int x, y, i, j;
|
|
||||||
unsigned int du;
|
|
||||||
XSetWindowAttributes swa;
|
|
||||||
XIM xim;
|
|
||||||
Window w, dw, *dws;
|
|
||||||
XWindowAttributes wa;
|
|
||||||
XClassHint ch = {"dmenu", "dmenu"};
|
|
||||||
#ifdef XINERAMA
|
|
||||||
XineramaScreenInfo *info;
|
|
||||||
Window pw;
|
|
||||||
int a, di, n, area = 0;
|
|
||||||
#endif
|
|
||||||
/* init appearance */
|
|
||||||
for (j = 0; j < SchemeLast; j++)
|
|
||||||
scheme[j] = drw_scm_create(drw, colors[j], 2);
|
|
||||||
|
|
||||||
clip = XInternAtom(dpy, "CLIPBOARD", False);
|
|
||||||
utf8 = XInternAtom(dpy, "UTF8_STRING", False);
|
|
||||||
|
|
||||||
/* calculate menu geometry */
|
|
||||||
bh = drw->fonts->h + 2;
|
|
||||||
lines = MAX(lines, 0);
|
|
||||||
mh = (lines + 1) * bh;
|
|
||||||
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
|
||||||
#ifdef XINERAMA
|
|
||||||
i = 0;
|
|
||||||
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
|
||||||
XGetInputFocus(dpy, &w, &di);
|
|
||||||
if (mon >= 0 && mon < n)
|
|
||||||
i = mon;
|
|
||||||
else if (w != root && w != PointerRoot && w != None) {
|
|
||||||
/* find top-level window containing current input focus */
|
|
||||||
do {
|
|
||||||
if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
|
|
||||||
XFree(dws);
|
|
||||||
} while (w != root && w != pw);
|
|
||||||
/* find xinerama screen with which the window intersects most */
|
|
||||||
if (XGetWindowAttributes(dpy, pw, &wa))
|
|
||||||
for (j = 0; j < n; j++)
|
|
||||||
if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
|
|
||||||
area = a;
|
|
||||||
i = j;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* no focused window is on screen, so use pointer location instead */
|
|
||||||
if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
|
|
||||||
for (i = 0; i < n; i++)
|
|
||||||
if (INTERSECT(x, y, 1, 1, info[i]))
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (centered) {
|
|
||||||
mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width);
|
|
||||||
x = info[i].x_org + ((info[i].width - mw) / 2);
|
|
||||||
y = info[i].y_org + ((info[i].height - mh) / 2);
|
|
||||||
} else {
|
|
||||||
x = info[i].x_org;
|
|
||||||
y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
|
||||||
mw = info[i].width;
|
|
||||||
}
|
|
||||||
|
|
||||||
XFree(info);
|
|
||||||
} else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
|
||||||
die("could not get embedding window attributes: 0x%lx",
|
|
||||||
parentwin);
|
|
||||||
|
|
||||||
if (centered) {
|
|
||||||
mw = MIN(MAX(max_textw() + promptw, min_width), wa.width);
|
|
||||||
x = (wa.width - mw) / 2;
|
|
||||||
y = (wa.height - mh) / 2;
|
|
||||||
} else {
|
|
||||||
x = 0;
|
|
||||||
y = topbar ? 0 : wa.height - mh;
|
|
||||||
mw = wa.width;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
inputw = MIN(inputw, mw/3);
|
|
||||||
match();
|
|
||||||
|
|
||||||
/* create menu window */
|
|
||||||
swa.override_redirect = True;
|
|
||||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
|
||||||
win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width,
|
|
||||||
CopyFromParent, CopyFromParent, CopyFromParent,
|
|
||||||
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
|
||||||
XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
|
|
||||||
XSetClassHint(dpy, win, &ch);
|
|
||||||
|
|
||||||
/* input methods */
|
|
||||||
if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
|
|
||||||
die("XOpenIM failed: could not open input device");
|
|
||||||
|
|
||||||
xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
|
|
||||||
XNClientWindow, win, XNFocusWindow, win, NULL);
|
|
||||||
|
|
||||||
XMapRaised(dpy, win);
|
|
||||||
if (embed) {
|
|
||||||
XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
|
|
||||||
if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
|
|
||||||
for (i = 0; i < du && dws[i] != win; ++i)
|
|
||||||
XSelectInput(dpy, dws[i], FocusChangeMask);
|
|
||||||
XFree(dws);
|
|
||||||
}
|
|
||||||
grabfocus();
|
|
||||||
}
|
|
||||||
drw_resize(drw, mw, mh);
|
|
||||||
drawmenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
usage(void)
|
|
||||||
{
|
|
||||||
fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
|
|
||||||
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
XWindowAttributes wa;
|
|
||||||
int i, fast = 0;
|
|
||||||
|
|
||||||
for (i = 1; i < argc; i++)
|
|
||||||
/* these options take no arguments */
|
|
||||||
if (!strcmp(argv[i], "-v")) { /* prints version information */
|
|
||||||
puts("dmenu-"VERSION);
|
|
||||||
exit(0);
|
|
||||||
} else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
|
|
||||||
topbar = 0;
|
|
||||||
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
|
||||||
fast = 1;
|
|
||||||
else if (!strcmp(argv[i], "-c")) /* centers dmenu on screen */
|
|
||||||
centered = 1;
|
|
||||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
|
||||||
fstrncmp = strncasecmp;
|
|
||||||
fstrstr = cistrstr;
|
|
||||||
} else if (i + 1 == argc)
|
|
||||||
usage();
|
|
||||||
/* these options take one argument */
|
|
||||||
else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */
|
|
||||||
lines = atoi(argv[++i]);
|
|
||||||
else if (!strcmp(argv[i], "-m"))
|
|
||||||
mon = atoi(argv[++i]);
|
|
||||||
else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */
|
|
||||||
prompt = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-fn")) /* font or font set */
|
|
||||||
fonts[0] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-nb")) /* normal background color */
|
|
||||||
colors[SchemeNorm][ColBg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-nf")) /* normal foreground color */
|
|
||||||
colors[SchemeNorm][ColFg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-sb")) /* selected background color */
|
|
||||||
colors[SchemeSel][ColBg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-sf")) /* selected foreground color */
|
|
||||||
colors[SchemeSel][ColFg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-w")) /* embedding window id */
|
|
||||||
embed = argv[++i];
|
|
||||||
else
|
|
||||||
usage();
|
|
||||||
|
|
||||||
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
|
|
||||||
fputs("warning: no locale support\n", stderr);
|
|
||||||
if (!(dpy = XOpenDisplay(NULL)))
|
|
||||||
die("cannot open display");
|
|
||||||
screen = DefaultScreen(dpy);
|
|
||||||
root = RootWindow(dpy, screen);
|
|
||||||
if (!embed || !(parentwin = strtol(embed, NULL, 0)))
|
|
||||||
parentwin = root;
|
|
||||||
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
|
||||||
die("could not get embedding window attributes: 0x%lx",
|
|
||||||
parentwin);
|
|
||||||
drw = drw_create(dpy, screen, root, wa.width, wa.height);
|
|
||||||
if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
|
|
||||||
die("no fonts could be loaded.");
|
|
||||||
lrpad = drw->fonts->h;
|
|
||||||
|
|
||||||
#ifdef __OpenBSD__
|
|
||||||
if (pledge("stdio rpath", NULL) == -1)
|
|
||||||
die("pledge");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (fast && !isatty(0)) {
|
|
||||||
grabkeyboard();
|
|
||||||
readstdin();
|
|
||||||
} else {
|
|
||||||
readstdin();
|
|
||||||
grabkeyboard();
|
|
||||||
}
|
|
||||||
setup();
|
|
||||||
run();
|
|
||||||
|
|
||||||
return 1; /* unreachable */
|
|
||||||
}
|
|
|
@ -1,14 +0,0 @@
|
||||||
--- dmenu.c 2019-02-02 13:55:02.000000000 +0100
|
|
||||||
+++ dmenu.c 2019-05-19 02:11:20.966710117 +0200
|
|
||||||
@@ -654,9 +654,10 @@ setup(void)
|
|
||||||
swa.override_redirect = True;
|
|
||||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
|
||||||
- win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
|
|
||||||
+ win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width,
|
|
||||||
CopyFromParent, CopyFromParent, CopyFromParent,
|
|
||||||
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
|
||||||
+ XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
|
|
||||||
XSetClassHint(dpy, win, &ch);
|
|
||||||
|
|
||||||
/* open input methods */
|
|
|
@ -1,13 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
|
|
||||||
cache="$cachedir/dmenu_run"
|
|
||||||
|
|
||||||
[ ! -e "$cachedir" ] && mkdir -p "$cachedir"
|
|
||||||
|
|
||||||
IFS=:
|
|
||||||
if stest -dqr -n "$cache" $PATH; then
|
|
||||||
stest -flx $PATH | sort -u | tee "$cache"
|
|
||||||
else
|
|
||||||
cat "$cache"
|
|
||||||
fi
|
|
|
@ -1,2 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"} &
|
|
|
@ -1,435 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
|
|
||||||
#include "drw.h"
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
#define UTF_INVALID 0xFFFD
|
|
||||||
#define UTF_SIZ 4
|
|
||||||
|
|
||||||
static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
|
|
||||||
static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
|
|
||||||
static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
|
||||||
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
|
|
||||||
|
|
||||||
static long
|
|
||||||
utf8decodebyte(const char c, size_t *i)
|
|
||||||
{
|
|
||||||
for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
|
|
||||||
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
|
|
||||||
return (unsigned char)c & ~utfmask[*i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
utf8validate(long *u, size_t i)
|
|
||||||
{
|
|
||||||
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
|
|
||||||
*u = UTF_INVALID;
|
|
||||||
for (i = 1; *u > utfmax[i]; ++i)
|
|
||||||
;
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
utf8decode(const char *c, long *u, size_t clen)
|
|
||||||
{
|
|
||||||
size_t i, j, len, type;
|
|
||||||
long udecoded;
|
|
||||||
|
|
||||||
*u = UTF_INVALID;
|
|
||||||
if (!clen)
|
|
||||||
return 0;
|
|
||||||
udecoded = utf8decodebyte(c[0], &len);
|
|
||||||
if (!BETWEEN(len, 1, UTF_SIZ))
|
|
||||||
return 1;
|
|
||||||
for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
|
|
||||||
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
|
|
||||||
if (type)
|
|
||||||
return j;
|
|
||||||
}
|
|
||||||
if (j < len)
|
|
||||||
return 0;
|
|
||||||
*u = udecoded;
|
|
||||||
utf8validate(u, len);
|
|
||||||
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
Drw *
|
|
||||||
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
|
|
||||||
{
|
|
||||||
Drw *drw = ecalloc(1, sizeof(Drw));
|
|
||||||
|
|
||||||
drw->dpy = dpy;
|
|
||||||
drw->screen = screen;
|
|
||||||
drw->root = root;
|
|
||||||
drw->w = w;
|
|
||||||
drw->h = h;
|
|
||||||
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
|
|
||||||
drw->gc = XCreateGC(dpy, root, 0, NULL);
|
|
||||||
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
|
|
||||||
|
|
||||||
return drw;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_resize(Drw *drw, unsigned int w, unsigned int h)
|
|
||||||
{
|
|
||||||
if (!drw)
|
|
||||||
return;
|
|
||||||
|
|
||||||
drw->w = w;
|
|
||||||
drw->h = h;
|
|
||||||
if (drw->drawable)
|
|
||||||
XFreePixmap(drw->dpy, drw->drawable);
|
|
||||||
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_free(Drw *drw)
|
|
||||||
{
|
|
||||||
XFreePixmap(drw->dpy, drw->drawable);
|
|
||||||
XFreeGC(drw->dpy, drw->gc);
|
|
||||||
free(drw);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* This function is an implementation detail. Library users should use
|
|
||||||
* drw_fontset_create instead.
|
|
||||||
*/
|
|
||||||
static Fnt *
|
|
||||||
xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
|
|
||||||
{
|
|
||||||
Fnt *font;
|
|
||||||
XftFont *xfont = NULL;
|
|
||||||
FcPattern *pattern = NULL;
|
|
||||||
|
|
||||||
if (fontname) {
|
|
||||||
/* Using the pattern found at font->xfont->pattern does not yield the
|
|
||||||
* same substitution results as using the pattern returned by
|
|
||||||
* FcNameParse; using the latter results in the desired fallback
|
|
||||||
* behaviour whereas the former just results in missing-character
|
|
||||||
* rectangles being drawn, at least with some fonts. */
|
|
||||||
if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
|
|
||||||
fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
|
|
||||||
fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
|
|
||||||
XftFontClose(drw->dpy, xfont);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else if (fontpattern) {
|
|
||||||
if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
|
|
||||||
fprintf(stderr, "error, cannot load font from pattern.\n");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
die("no font specified.");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Do not allow using color fonts. This is a workaround for a BadLength
|
|
||||||
* error from Xft with color glyphs. Modelled on the Xterm workaround. See
|
|
||||||
* https://bugzilla.redhat.com/show_bug.cgi?id=1498269
|
|
||||||
* https://lists.suckless.org/dev/1701/30932.html
|
|
||||||
* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
|
|
||||||
* and lots more all over the internet.
|
|
||||||
*/
|
|
||||||
FcBool iscol;
|
|
||||||
if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
|
|
||||||
XftFontClose(drw->dpy, xfont);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
font = ecalloc(1, sizeof(Fnt));
|
|
||||||
font->xfont = xfont;
|
|
||||||
font->pattern = pattern;
|
|
||||||
font->h = xfont->ascent + xfont->descent;
|
|
||||||
font->dpy = drw->dpy;
|
|
||||||
|
|
||||||
return font;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
xfont_free(Fnt *font)
|
|
||||||
{
|
|
||||||
if (!font)
|
|
||||||
return;
|
|
||||||
if (font->pattern)
|
|
||||||
FcPatternDestroy(font->pattern);
|
|
||||||
XftFontClose(font->dpy, font->xfont);
|
|
||||||
free(font);
|
|
||||||
}
|
|
||||||
|
|
||||||
Fnt*
|
|
||||||
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
|
|
||||||
{
|
|
||||||
Fnt *cur, *ret = NULL;
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
if (!drw || !fonts)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 1; i <= fontcount; i++) {
|
|
||||||
if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
|
|
||||||
cur->next = ret;
|
|
||||||
ret = cur;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return (drw->fonts = ret);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_fontset_free(Fnt *font)
|
|
||||||
{
|
|
||||||
if (font) {
|
|
||||||
drw_fontset_free(font->next);
|
|
||||||
xfont_free(font);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
|
|
||||||
{
|
|
||||||
if (!drw || !dest || !clrname)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
|
|
||||||
DefaultColormap(drw->dpy, drw->screen),
|
|
||||||
clrname, dest))
|
|
||||||
die("error, cannot allocate color '%s'", clrname);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Wrapper to create color schemes. The caller has to call free(3) on the
|
|
||||||
* returned color scheme when done using it. */
|
|
||||||
Clr *
|
|
||||||
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
Clr *ret;
|
|
||||||
|
|
||||||
/* need at least two colors for a scheme */
|
|
||||||
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 0; i < clrcount; i++)
|
|
||||||
drw_clr_create(drw, &ret[i], clrnames[i]);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_setfontset(Drw *drw, Fnt *set)
|
|
||||||
{
|
|
||||||
if (drw)
|
|
||||||
drw->fonts = set;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_setscheme(Drw *drw, Clr *scm)
|
|
||||||
{
|
|
||||||
if (drw)
|
|
||||||
drw->scheme = scm;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
|
|
||||||
{
|
|
||||||
if (!drw || !drw->scheme)
|
|
||||||
return;
|
|
||||||
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
|
|
||||||
if (filled)
|
|
||||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
|
||||||
else
|
|
||||||
XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
|
|
||||||
{
|
|
||||||
char buf[1024];
|
|
||||||
int ty;
|
|
||||||
unsigned int ew;
|
|
||||||
XftDraw *d = NULL;
|
|
||||||
Fnt *usedfont, *curfont, *nextfont;
|
|
||||||
size_t i, len;
|
|
||||||
int utf8strlen, utf8charlen, render = x || y || w || h;
|
|
||||||
long utf8codepoint = 0;
|
|
||||||
const char *utf8str;
|
|
||||||
FcCharSet *fccharset;
|
|
||||||
FcPattern *fcpattern;
|
|
||||||
FcPattern *match;
|
|
||||||
XftResult result;
|
|
||||||
int charexists = 0;
|
|
||||||
|
|
||||||
if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (!render) {
|
|
||||||
w = ~w;
|
|
||||||
} else {
|
|
||||||
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
|
|
||||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
|
||||||
d = XftDrawCreate(drw->dpy, drw->drawable,
|
|
||||||
DefaultVisual(drw->dpy, drw->screen),
|
|
||||||
DefaultColormap(drw->dpy, drw->screen));
|
|
||||||
x += lpad;
|
|
||||||
w -= lpad;
|
|
||||||
}
|
|
||||||
|
|
||||||
usedfont = drw->fonts;
|
|
||||||
while (1) {
|
|
||||||
utf8strlen = 0;
|
|
||||||
utf8str = text;
|
|
||||||
nextfont = NULL;
|
|
||||||
while (*text) {
|
|
||||||
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
|
|
||||||
for (curfont = drw->fonts; curfont; curfont = curfont->next) {
|
|
||||||
charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
|
|
||||||
if (charexists) {
|
|
||||||
if (curfont == usedfont) {
|
|
||||||
utf8strlen += utf8charlen;
|
|
||||||
text += utf8charlen;
|
|
||||||
} else {
|
|
||||||
nextfont = curfont;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!charexists || nextfont)
|
|
||||||
break;
|
|
||||||
else
|
|
||||||
charexists = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (utf8strlen) {
|
|
||||||
drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
|
|
||||||
/* shorten text if necessary */
|
|
||||||
for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--)
|
|
||||||
drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
|
|
||||||
|
|
||||||
if (len) {
|
|
||||||
memcpy(buf, utf8str, len);
|
|
||||||
buf[len] = '\0';
|
|
||||||
if (len < utf8strlen)
|
|
||||||
for (i = len; i && i > len - 3; buf[--i] = '.')
|
|
||||||
; /* NOP */
|
|
||||||
|
|
||||||
if (render) {
|
|
||||||
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
|
|
||||||
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
|
|
||||||
usedfont->xfont, x, ty, (XftChar8 *)buf, len);
|
|
||||||
}
|
|
||||||
x += ew;
|
|
||||||
w -= ew;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!*text) {
|
|
||||||
break;
|
|
||||||
} else if (nextfont) {
|
|
||||||
charexists = 0;
|
|
||||||
usedfont = nextfont;
|
|
||||||
} else {
|
|
||||||
/* Regardless of whether or not a fallback font is found, the
|
|
||||||
* character must be drawn. */
|
|
||||||
charexists = 1;
|
|
||||||
|
|
||||||
fccharset = FcCharSetCreate();
|
|
||||||
FcCharSetAddChar(fccharset, utf8codepoint);
|
|
||||||
|
|
||||||
if (!drw->fonts->pattern) {
|
|
||||||
/* Refer to the comment in xfont_create for more information. */
|
|
||||||
die("the first font in the cache must be loaded from a font string.");
|
|
||||||
}
|
|
||||||
|
|
||||||
fcpattern = FcPatternDuplicate(drw->fonts->pattern);
|
|
||||||
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
|
|
||||||
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
|
|
||||||
FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
|
|
||||||
|
|
||||||
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
|
|
||||||
FcDefaultSubstitute(fcpattern);
|
|
||||||
match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
|
|
||||||
|
|
||||||
FcCharSetDestroy(fccharset);
|
|
||||||
FcPatternDestroy(fcpattern);
|
|
||||||
|
|
||||||
if (match) {
|
|
||||||
usedfont = xfont_create(drw, NULL, match);
|
|
||||||
if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
|
|
||||||
for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
|
|
||||||
; /* NOP */
|
|
||||||
curfont->next = usedfont;
|
|
||||||
} else {
|
|
||||||
xfont_free(usedfont);
|
|
||||||
usedfont = drw->fonts;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (d)
|
|
||||||
XftDrawDestroy(d);
|
|
||||||
|
|
||||||
return x + (render ? w : 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
|
|
||||||
{
|
|
||||||
if (!drw)
|
|
||||||
return;
|
|
||||||
|
|
||||||
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
|
|
||||||
XSync(drw->dpy, False);
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int
|
|
||||||
drw_fontset_getwidth(Drw *drw, const char *text)
|
|
||||||
{
|
|
||||||
if (!drw || !drw->fonts || !text)
|
|
||||||
return 0;
|
|
||||||
return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
|
|
||||||
{
|
|
||||||
XGlyphInfo ext;
|
|
||||||
|
|
||||||
if (!font || !text)
|
|
||||||
return;
|
|
||||||
|
|
||||||
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
|
|
||||||
if (w)
|
|
||||||
*w = ext.xOff;
|
|
||||||
if (h)
|
|
||||||
*h = font->h;
|
|
||||||
}
|
|
||||||
|
|
||||||
Cur *
|
|
||||||
drw_cur_create(Drw *drw, int shape)
|
|
||||||
{
|
|
||||||
Cur *cur;
|
|
||||||
|
|
||||||
if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
cur->cursor = XCreateFontCursor(drw->dpy, shape);
|
|
||||||
|
|
||||||
return cur;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_cur_free(Drw *drw, Cur *cursor)
|
|
||||||
{
|
|
||||||
if (!cursor)
|
|
||||||
return;
|
|
||||||
|
|
||||||
XFreeCursor(drw->dpy, cursor->cursor);
|
|
||||||
free(cursor);
|
|
||||||
}
|
|
|
@ -1,57 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
Cursor cursor;
|
|
||||||
} Cur;
|
|
||||||
|
|
||||||
typedef struct Fnt {
|
|
||||||
Display *dpy;
|
|
||||||
unsigned int h;
|
|
||||||
XftFont *xfont;
|
|
||||||
FcPattern *pattern;
|
|
||||||
struct Fnt *next;
|
|
||||||
} Fnt;
|
|
||||||
|
|
||||||
enum { ColFg, ColBg }; /* Clr scheme index */
|
|
||||||
typedef XftColor Clr;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
unsigned int w, h;
|
|
||||||
Display *dpy;
|
|
||||||
int screen;
|
|
||||||
Window root;
|
|
||||||
Drawable drawable;
|
|
||||||
GC gc;
|
|
||||||
Clr *scheme;
|
|
||||||
Fnt *fonts;
|
|
||||||
} Drw;
|
|
||||||
|
|
||||||
/* Drawable abstraction */
|
|
||||||
Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
|
|
||||||
void drw_resize(Drw *drw, unsigned int w, unsigned int h);
|
|
||||||
void drw_free(Drw *drw);
|
|
||||||
|
|
||||||
/* Fnt abstraction */
|
|
||||||
Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
|
|
||||||
void drw_fontset_free(Fnt* set);
|
|
||||||
unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
|
|
||||||
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
|
|
||||||
|
|
||||||
/* Colorscheme abstraction */
|
|
||||||
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
|
|
||||||
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
|
|
||||||
|
|
||||||
/* Cursor abstraction */
|
|
||||||
Cur *drw_cur_create(Drw *drw, int shape);
|
|
||||||
void drw_cur_free(Drw *drw, Cur *cursor);
|
|
||||||
|
|
||||||
/* Drawing context manipulation */
|
|
||||||
void drw_setfontset(Drw *drw, Fnt *set);
|
|
||||||
void drw_setscheme(Drw *drw, Clr *scm);
|
|
||||||
|
|
||||||
/* Drawing functions */
|
|
||||||
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
|
|
||||||
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
|
|
||||||
|
|
||||||
/* Map functions */
|
|
||||||
void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
|
|
|
@ -1,25 +0,0 @@
|
||||||
diff -up dmenu-4.9-b/config.h dmenu-4.9-a/config.h
|
|
||||||
--- dmenu-4.9-b/config.h 2019-02-02 13:55:02.000000000 +0100
|
|
||||||
+++ dmenu-4.9-a/config.h 2019-05-19 02:10:12.740040403 +0200
|
|
||||||
@@ -21,3 +21,6 @@ static unsigned int lines = 0;
|
|
||||||
* for example: " /?\"&[]"
|
|
||||||
*/
|
|
||||||
static const char worddelimiters[] = " ";
|
|
||||||
+
|
|
||||||
+/* Size of the window border */
|
|
||||||
+static const unsigned int border_width = 5;
|
|
||||||
diff -up dmenu-4.9-b/dmenu.c dmenu-4.9-a/dmenu.c
|
|
||||||
--- dmenu-4.9-b/dmenu.c 2019-02-02 13:55:02.000000000 +0100
|
|
||||||
+++ dmenu-4.9-a/dmenu.c 2019-05-19 02:11:20.966710117 +0200
|
|
||||||
@@ -654,9 +654,10 @@ setup(void)
|
|
||||||
swa.override_redirect = True;
|
|
||||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
|
||||||
- win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
|
|
||||||
+ win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width,
|
|
||||||
CopyFromParent, CopyFromParent, CopyFromParent,
|
|
||||||
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
|
||||||
+ XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
|
|
||||||
XSetClassHint(dpy, win, &ch);
|
|
||||||
|
|
||||||
/* open input methods */
|
|
|
@ -1,120 +0,0 @@
|
||||||
From 8cd37e1ab9e7cb025224aeb3543f1a5be8bceb93 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nihal Jere <nihal@nihaljere.xyz>
|
|
||||||
Date: Sat, 11 Jan 2020 21:16:08 -0600
|
|
||||||
Subject: [PATCH] center patch now has adjustable minimum width
|
|
||||||
|
|
||||||
---
|
|
||||||
config.h | 2 ++
|
|
||||||
dmenu.1 | 3 +++
|
|
||||||
dmenu.c | 39 ++++++++++++++++++++++++++++++++-------
|
|
||||||
3 files changed, 37 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.h b/config.h
|
|
||||||
index 1edb647..88ef264 100644
|
|
||||||
--- a/config.h
|
|
||||||
+++ b/config.h
|
|
||||||
@@ -2,6 +2,8 @@
|
|
||||||
/* Default settings; can be overriden by command line. */
|
|
||||||
|
|
||||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
|
||||||
+static int centered = 0; /* -c option; centers dmenu on screen */
|
|
||||||
+static int min_width = 500; /* minimum width when centered */
|
|
||||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
|
||||||
static const char *fonts[] = {
|
|
||||||
"monospace:size=10"
|
|
||||||
diff --git a/dmenu.1 b/dmenu.1
|
|
||||||
index 323f93c..c036baa 100644
|
|
||||||
--- a/dmenu.1
|
|
||||||
+++ b/dmenu.1
|
|
||||||
@@ -40,6 +40,9 @@ which lists programs in the user's $PATH and runs the result in their $SHELL.
|
|
||||||
.B \-b
|
|
||||||
dmenu appears at the bottom of the screen.
|
|
||||||
.TP
|
|
||||||
+.B \-c
|
|
||||||
+dmenu appears centered on the screen.
|
|
||||||
+.TP
|
|
||||||
.B \-f
|
|
||||||
dmenu grabs the keyboard before reading stdin if not reading from a tty. This
|
|
||||||
is faster, but will lock up X until stdin reaches end\-of\-file.
|
|
||||||
diff --git a/dmenu.c b/dmenu.c
|
|
||||||
index 65f25ce..041c7f8 100644
|
|
||||||
--- a/dmenu.c
|
|
||||||
+++ b/dmenu.c
|
|
||||||
@@ -89,6 +89,15 @@ calcoffsets(void)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int
|
|
||||||
+max_textw(void)
|
|
||||||
+{
|
|
||||||
+ int len = 0;
|
|
||||||
+ for (struct item *item = items; item && item->text; item++)
|
|
||||||
+ len = MAX(TEXTW(item->text), len);
|
|
||||||
+ return len;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
cleanup(void)
|
|
||||||
{
|
|
||||||
@@ -611,6 +620,7 @@ setup(void)
|
|
||||||
bh = drw->fonts->h + 2;
|
|
||||||
lines = MAX(lines, 0);
|
|
||||||
mh = (lines + 1) * bh;
|
|
||||||
+ promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
|
||||||
#ifdef XINERAMA
|
|
||||||
i = 0;
|
|
||||||
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
|
||||||
@@ -637,9 +647,16 @@ setup(void)
|
|
||||||
if (INTERSECT(x, y, 1, 1, info[i]))
|
|
||||||
break;
|
|
||||||
|
|
||||||
- x = info[i].x_org;
|
|
||||||
- y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
|
||||||
- mw = info[i].width;
|
|
||||||
+ if (centered) {
|
|
||||||
+ mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width);
|
|
||||||
+ x = info[i].x_org + ((info[i].width - mw) / 2);
|
|
||||||
+ y = info[i].y_org + ((info[i].height - mh) / 2);
|
|
||||||
+ } else {
|
|
||||||
+ x = info[i].x_org;
|
|
||||||
+ y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
|
||||||
+ mw = info[i].width;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
XFree(info);
|
|
||||||
} else
|
|
||||||
#endif
|
|
||||||
@@ -647,11 +664,17 @@ setup(void)
|
|
||||||
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
|
||||||
die("could not get embedding window attributes: 0x%lx",
|
|
||||||
parentwin);
|
|
||||||
- x = 0;
|
|
||||||
- y = topbar ? 0 : wa.height - mh;
|
|
||||||
- mw = wa.width;
|
|
||||||
+
|
|
||||||
+ if (centered) {
|
|
||||||
+ mw = MIN(MAX(max_textw() + promptw, min_width), wa.width);
|
|
||||||
+ x = (wa.width - mw) / 2;
|
|
||||||
+ y = (wa.height - mh) / 2;
|
|
||||||
+ } else {
|
|
||||||
+ x = 0;
|
|
||||||
+ y = topbar ? 0 : wa.height - mh;
|
|
||||||
+ mw = wa.width;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
- promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
|
||||||
inputw = MIN(inputw, mw/3);
|
|
||||||
match();
|
|
||||||
|
|
||||||
@@ -709,6 +732,8 @@ main(int argc, char *argv[])
|
|
||||||
topbar = 0;
|
|
||||||
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
|
||||||
fast = 1;
|
|
||||||
+ else if (!strcmp(argv[i], "-c")) /* centers dmenu on screen */
|
|
||||||
+ centered = 1;
|
|
||||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
|
||||||
fstrncmp = strncasecmp;
|
|
||||||
fstrstr = cistrstr;
|
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
Binary file not shown.
|
@ -1,90 +0,0 @@
|
||||||
.TH STEST 1 dmenu\-VERSION
|
|
||||||
.SH NAME
|
|
||||||
stest \- filter a list of files by properties
|
|
||||||
.SH SYNOPSIS
|
|
||||||
.B stest
|
|
||||||
.RB [ -abcdefghlpqrsuwx ]
|
|
||||||
.RB [ -n
|
|
||||||
.IR file ]
|
|
||||||
.RB [ -o
|
|
||||||
.IR file ]
|
|
||||||
.RI [ file ...]
|
|
||||||
.SH DESCRIPTION
|
|
||||||
.B stest
|
|
||||||
takes a list of files and filters by the files' properties, analogous to
|
|
||||||
.IR test (1).
|
|
||||||
Files which pass all tests are printed to stdout. If no files are given, stest
|
|
||||||
reads files from stdin.
|
|
||||||
.SH OPTIONS
|
|
||||||
.TP
|
|
||||||
.B \-a
|
|
||||||
Test hidden files.
|
|
||||||
.TP
|
|
||||||
.B \-b
|
|
||||||
Test that files are block specials.
|
|
||||||
.TP
|
|
||||||
.B \-c
|
|
||||||
Test that files are character specials.
|
|
||||||
.TP
|
|
||||||
.B \-d
|
|
||||||
Test that files are directories.
|
|
||||||
.TP
|
|
||||||
.B \-e
|
|
||||||
Test that files exist.
|
|
||||||
.TP
|
|
||||||
.B \-f
|
|
||||||
Test that files are regular files.
|
|
||||||
.TP
|
|
||||||
.B \-g
|
|
||||||
Test that files have their set-group-ID flag set.
|
|
||||||
.TP
|
|
||||||
.B \-h
|
|
||||||
Test that files are symbolic links.
|
|
||||||
.TP
|
|
||||||
.B \-l
|
|
||||||
Test the contents of a directory given as an argument.
|
|
||||||
.TP
|
|
||||||
.BI \-n " file"
|
|
||||||
Test that files are newer than
|
|
||||||
.IR file .
|
|
||||||
.TP
|
|
||||||
.BI \-o " file"
|
|
||||||
Test that files are older than
|
|
||||||
.IR file .
|
|
||||||
.TP
|
|
||||||
.B \-p
|
|
||||||
Test that files are named pipes.
|
|
||||||
.TP
|
|
||||||
.B \-q
|
|
||||||
No files are printed, only the exit status is returned.
|
|
||||||
.TP
|
|
||||||
.B \-r
|
|
||||||
Test that files are readable.
|
|
||||||
.TP
|
|
||||||
.B \-s
|
|
||||||
Test that files are not empty.
|
|
||||||
.TP
|
|
||||||
.B \-u
|
|
||||||
Test that files have their set-user-ID flag set.
|
|
||||||
.TP
|
|
||||||
.B \-v
|
|
||||||
Invert the sense of tests, only failing files pass.
|
|
||||||
.TP
|
|
||||||
.B \-w
|
|
||||||
Test that files are writable.
|
|
||||||
.TP
|
|
||||||
.B \-x
|
|
||||||
Test that files are executable.
|
|
||||||
.SH EXIT STATUS
|
|
||||||
.TP
|
|
||||||
.B 0
|
|
||||||
At least one file passed all tests.
|
|
||||||
.TP
|
|
||||||
.B 1
|
|
||||||
No files passed all tests.
|
|
||||||
.TP
|
|
||||||
.B 2
|
|
||||||
An error occurred.
|
|
||||||
.SH SEE ALSO
|
|
||||||
.IR dmenu (1),
|
|
||||||
.IR test (1)
|
|
|
@ -1,109 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#include <dirent.h>
|
|
||||||
#include <limits.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include "arg.h"
|
|
||||||
char *argv0;
|
|
||||||
|
|
||||||
#define FLAG(x) (flag[(x)-'a'])
|
|
||||||
|
|
||||||
static void test(const char *, const char *);
|
|
||||||
static void usage(void);
|
|
||||||
|
|
||||||
static int match = 0;
|
|
||||||
static int flag[26];
|
|
||||||
static struct stat old, new;
|
|
||||||
|
|
||||||
static void
|
|
||||||
test(const char *path, const char *name)
|
|
||||||
{
|
|
||||||
struct stat st, ln;
|
|
||||||
|
|
||||||
if ((!stat(path, &st) && (FLAG('a') || name[0] != '.') /* hidden files */
|
|
||||||
&& (!FLAG('b') || S_ISBLK(st.st_mode)) /* block special */
|
|
||||||
&& (!FLAG('c') || S_ISCHR(st.st_mode)) /* character special */
|
|
||||||
&& (!FLAG('d') || S_ISDIR(st.st_mode)) /* directory */
|
|
||||||
&& (!FLAG('e') || access(path, F_OK) == 0) /* exists */
|
|
||||||
&& (!FLAG('f') || S_ISREG(st.st_mode)) /* regular file */
|
|
||||||
&& (!FLAG('g') || st.st_mode & S_ISGID) /* set-group-id flag */
|
|
||||||
&& (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link */
|
|
||||||
&& (!FLAG('n') || st.st_mtime > new.st_mtime) /* newer than file */
|
|
||||||
&& (!FLAG('o') || st.st_mtime < old.st_mtime) /* older than file */
|
|
||||||
&& (!FLAG('p') || S_ISFIFO(st.st_mode)) /* named pipe */
|
|
||||||
&& (!FLAG('r') || access(path, R_OK) == 0) /* readable */
|
|
||||||
&& (!FLAG('s') || st.st_size > 0) /* not empty */
|
|
||||||
&& (!FLAG('u') || st.st_mode & S_ISUID) /* set-user-id flag */
|
|
||||||
&& (!FLAG('w') || access(path, W_OK) == 0) /* writable */
|
|
||||||
&& (!FLAG('x') || access(path, X_OK) == 0)) != FLAG('v')) { /* executable */
|
|
||||||
if (FLAG('q'))
|
|
||||||
exit(0);
|
|
||||||
match = 1;
|
|
||||||
puts(name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
usage(void)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "usage: %s [-abcdefghlpqrsuvwx] "
|
|
||||||
"[-n file] [-o file] [file...]\n", argv0);
|
|
||||||
exit(2); /* like test(1) return > 1 on error */
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
struct dirent *d;
|
|
||||||
char path[PATH_MAX], *line = NULL, *file;
|
|
||||||
size_t linesiz = 0;
|
|
||||||
ssize_t n;
|
|
||||||
DIR *dir;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
ARGBEGIN {
|
|
||||||
case 'n': /* newer than file */
|
|
||||||
case 'o': /* older than file */
|
|
||||||
file = EARGF(usage());
|
|
||||||
if (!(FLAG(ARGC()) = !stat(file, (ARGC() == 'n' ? &new : &old))))
|
|
||||||
perror(file);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
/* miscellaneous operators */
|
|
||||||
if (strchr("abcdefghlpqrsuvwx", ARGC()))
|
|
||||||
FLAG(ARGC()) = 1;
|
|
||||||
else
|
|
||||||
usage(); /* unknown flag */
|
|
||||||
} ARGEND;
|
|
||||||
|
|
||||||
if (!argc) {
|
|
||||||
/* read list from stdin */
|
|
||||||
while ((n = getline(&line, &linesiz, stdin)) > 0) {
|
|
||||||
if (n && line[n - 1] == '\n')
|
|
||||||
line[n - 1] = '\0';
|
|
||||||
test(line, line);
|
|
||||||
}
|
|
||||||
free(line);
|
|
||||||
} else {
|
|
||||||
for (; argc; argc--, argv++) {
|
|
||||||
if (FLAG('l') && (dir = opendir(*argv))) {
|
|
||||||
/* test directory contents */
|
|
||||||
while ((d = readdir(dir))) {
|
|
||||||
r = snprintf(path, sizeof path, "%s/%s",
|
|
||||||
*argv, d->d_name);
|
|
||||||
if (r >= 0 && (size_t)r < sizeof path)
|
|
||||||
test(path, d->d_name);
|
|
||||||
}
|
|
||||||
closedir(dir);
|
|
||||||
} else {
|
|
||||||
test(*argv, *argv);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return match ? 0 : 1;
|
|
||||||
}
|
|
|
@ -1,35 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
void *
|
|
||||||
ecalloc(size_t nmemb, size_t size)
|
|
||||||
{
|
|
||||||
void *p;
|
|
||||||
|
|
||||||
if (!(p = calloc(nmemb, size)))
|
|
||||||
die("calloc:");
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
die(const char *fmt, ...) {
|
|
||||||
va_list ap;
|
|
||||||
|
|
||||||
va_start(ap, fmt);
|
|
||||||
vfprintf(stderr, fmt, ap);
|
|
||||||
va_end(ap);
|
|
||||||
|
|
||||||
if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
|
|
||||||
fputc(' ', stderr);
|
|
||||||
perror(NULL);
|
|
||||||
} else {
|
|
||||||
fputc('\n', stderr);
|
|
||||||
}
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
}
|
|
|
@ -1,8 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
#define MAX(A, B) ((A) > (B) ? (A) : (B))
|
|
||||||
#define MIN(A, B) ((A) < (B) ? (A) : (B))
|
|
||||||
#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
|
|
||||||
|
|
||||||
void die(const char *fmt, ...);
|
|
||||||
void *ecalloc(size_t nmemb, size_t size);
|
|
|
@ -1,37 +0,0 @@
|
||||||
MIT/X Consortium License
|
|
||||||
|
|
||||||
© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
|
|
||||||
© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
|
|
||||||
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
|
|
||||||
© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
|
|
||||||
© 2007-2009 Szabolcs Nagy <nszabolcs at gmail dot com>
|
|
||||||
© 2007-2009 Christof Musik <christof at sendfax dot de>
|
|
||||||
© 2007-2009 Premysl Hruby <dfenze at gmail dot com>
|
|
||||||
© 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
|
|
||||||
© 2008 Martin Hurton <martin dot hurton at gmail dot com>
|
|
||||||
© 2008 Neale Pickett <neale dot woozle dot org>
|
|
||||||
© 2009 Mate Nagy <mnagy at port70 dot net>
|
|
||||||
© 2010-2016 Hiltjo Posthuma <hiltjo@codemadness.org>
|
|
||||||
© 2010-2012 Connor Lane Smith <cls@lubutu.com>
|
|
||||||
© 2011 Christoph Lohmann <20h@r-36.net>
|
|
||||||
© 2015-2016 Quentin Rameau <quinq@fifth.space>
|
|
||||||
© 2015-2016 Eric Pruitt <eric.pruitt@gmail.com>
|
|
||||||
© 2016-2017 Markus Teich <markus.teich@stusta.mhn.de>
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
copy of this software and associated documentation files (the "Software"),
|
|
||||||
to deal in the Software without restriction, including without limitation
|
|
||||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
||||||
and/or sell copies of the Software, and to permit persons to whom the
|
|
||||||
Software is furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
||||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
DEALINGS IN THE SOFTWARE.
|
|
|
@ -1,51 +0,0 @@
|
||||||
# dwm - dynamic window manager
|
|
||||||
# See LICENSE file for copyright and license details.
|
|
||||||
|
|
||||||
include config.mk
|
|
||||||
|
|
||||||
SRC = drw.c dwm.c util.c
|
|
||||||
OBJ = ${SRC:.c=.o}
|
|
||||||
|
|
||||||
all: options dwm
|
|
||||||
|
|
||||||
options:
|
|
||||||
@echo dwm build options:
|
|
||||||
@echo "CFLAGS = ${CFLAGS}"
|
|
||||||
@echo "LDFLAGS = ${LDFLAGS}"
|
|
||||||
@echo "CC = ${CC}"
|
|
||||||
|
|
||||||
.c.o:
|
|
||||||
${CC} -c ${CFLAGS} $<
|
|
||||||
|
|
||||||
${OBJ}: config.h config.mk
|
|
||||||
|
|
||||||
config.h:
|
|
||||||
cp config.def.h $@
|
|
||||||
|
|
||||||
dwm: ${OBJ}
|
|
||||||
${CC} -o $@ ${OBJ} ${LDFLAGS}
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
|
|
||||||
|
|
||||||
dist: clean
|
|
||||||
mkdir -p dwm-${VERSION}
|
|
||||||
cp -R LICENSE Makefile README config.def.h config.mk\
|
|
||||||
dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION}
|
|
||||||
tar -cf dwm-${VERSION}.tar dwm-${VERSION}
|
|
||||||
gzip dwm-${VERSION}.tar
|
|
||||||
rm -rf dwm-${VERSION}
|
|
||||||
|
|
||||||
install: all
|
|
||||||
mkdir -p ${DESTDIR}${PREFIX}/bin
|
|
||||||
cp -f dwm ${DESTDIR}${PREFIX}/bin
|
|
||||||
chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
|
|
||||||
mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
|
||||||
sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
|
||||||
chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
rm -f ${DESTDIR}${PREFIX}/bin/dwm\
|
|
||||||
${DESTDIR}${MANPREFIX}/man1/dwm.1
|
|
||||||
|
|
||||||
.PHONY: all options clean dist install uninstall
|
|
|
@ -1,48 +0,0 @@
|
||||||
dwm - dynamic window manager
|
|
||||||
============================
|
|
||||||
dwm is an extremely fast, small, and dynamic window manager for X.
|
|
||||||
|
|
||||||
|
|
||||||
Requirements
|
|
||||||
------------
|
|
||||||
In order to build dwm you need the Xlib header files.
|
|
||||||
|
|
||||||
|
|
||||||
Installation
|
|
||||||
------------
|
|
||||||
Edit config.mk to match your local setup (dwm is installed into
|
|
||||||
the /usr/local namespace by default).
|
|
||||||
|
|
||||||
Afterwards enter the following command to build and install dwm (if
|
|
||||||
necessary as root):
|
|
||||||
|
|
||||||
make clean install
|
|
||||||
|
|
||||||
|
|
||||||
Running dwm
|
|
||||||
-----------
|
|
||||||
Add the following line to your .xinitrc to start dwm using startx:
|
|
||||||
|
|
||||||
exec dwm
|
|
||||||
|
|
||||||
In order to connect dwm to a specific display, make sure that
|
|
||||||
the DISPLAY environment variable is set correctly, e.g.:
|
|
||||||
|
|
||||||
DISPLAY=foo.bar:1 exec dwm
|
|
||||||
|
|
||||||
(This will start dwm on display :1 of the host foo.bar.)
|
|
||||||
|
|
||||||
In order to display status info in the bar, you can do something
|
|
||||||
like this in your .xinitrc:
|
|
||||||
|
|
||||||
while xsetroot -name "`date` `uptime | sed 's/.*,//'`"
|
|
||||||
do
|
|
||||||
sleep 1
|
|
||||||
done &
|
|
||||||
exec dwm
|
|
||||||
|
|
||||||
|
|
||||||
Configuration
|
|
||||||
-------------
|
|
||||||
The configuration of dwm is done by creating a custom config.h
|
|
||||||
and (re)compiling the source code.
|
|
|
@ -1,118 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
/* appearance */
|
|
||||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
|
||||||
static const unsigned int snap = 32; /* snap pixel */
|
|
||||||
static const int showbar = 1; /* 0 means no bar */
|
|
||||||
static const int topbar = 1; /* 0 means bottom bar */
|
|
||||||
static const char *fonts[] = { "monospace:size=10" };
|
|
||||||
static const char dmenufont[] = "monospace:size=10";
|
|
||||||
static const char col_gray1[] = "#222222";
|
|
||||||
static const char col_gray2[] = "#444444";
|
|
||||||
static const char col_gray3[] = "#bbbbbb";
|
|
||||||
static const char col_gray4[] = "#eeeeee";
|
|
||||||
static const char col_cyan[] = "#005577";
|
|
||||||
static const char *colors[][3] = {
|
|
||||||
/* fg bg border */
|
|
||||||
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
|
|
||||||
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* tagging */
|
|
||||||
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
|
||||||
|
|
||||||
static const Rule rules[] = {
|
|
||||||
/* xprop(1):
|
|
||||||
* WM_CLASS(STRING) = instance, class
|
|
||||||
* WM_NAME(STRING) = title
|
|
||||||
*/
|
|
||||||
/* class instance title tags mask isfloating monitor */
|
|
||||||
{ "Gimp", NULL, NULL, 0, 1, -1 },
|
|
||||||
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* layout(s) */
|
|
||||||
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
|
||||||
static const int nmaster = 1; /* number of clients in master area */
|
|
||||||
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
|
||||||
|
|
||||||
static const Layout layouts[] = {
|
|
||||||
/* symbol arrange function */
|
|
||||||
{ "[]=", tile }, /* first entry is default */
|
|
||||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
|
||||||
{ "[M]", monocle },
|
|
||||||
{ "|M|", centeredmaster },
|
|
||||||
{ ">M>", centeredfloatingmaster },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* key definitions */
|
|
||||||
#define MODKEY Mod1Mask
|
|
||||||
#define TAGKEYS(KEY,TAG) \
|
|
||||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
|
||||||
|
|
||||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
|
||||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
|
||||||
|
|
||||||
/* commands */
|
|
||||||
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
|
||||||
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
|
|
||||||
static const char *termcmd[] = { "st", NULL };
|
|
||||||
|
|
||||||
static Key keys[] = {
|
|
||||||
/* modifier key function argument */
|
|
||||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
|
||||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
|
||||||
{ MODKEY, XK_b, togglebar, {0} },
|
|
||||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
|
||||||
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
|
|
||||||
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
|
||||||
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
|
||||||
{ MODKEY, XK_Return, zoom, {0} },
|
|
||||||
{ MODKEY, XK_Tab, view, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
|
||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
|
||||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
|
||||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
|
||||||
{ MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
|
|
||||||
{ MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
|
|
||||||
{ MODKEY, XK_space, setlayout, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
|
||||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
|
|
||||||
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
|
||||||
TAGKEYS( XK_1, 0)
|
|
||||||
TAGKEYS( XK_2, 1)
|
|
||||||
TAGKEYS( XK_3, 2)
|
|
||||||
TAGKEYS( XK_4, 3)
|
|
||||||
TAGKEYS( XK_5, 4)
|
|
||||||
TAGKEYS( XK_6, 5)
|
|
||||||
TAGKEYS( XK_7, 6)
|
|
||||||
TAGKEYS( XK_8, 7)
|
|
||||||
TAGKEYS( XK_9, 8)
|
|
||||||
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* button definitions */
|
|
||||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
|
||||||
static Button buttons[] = {
|
|
||||||
/* click event mask button function argument */
|
|
||||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
|
||||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
|
||||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
|
||||||
{ ClkTagBar, 0, Button1, view, {0} },
|
|
||||||
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
|
||||||
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
|
||||||
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
|
||||||
};
|
|
||||||
|
|
|
@ -1,148 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
/* appearance */
|
|
||||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
|
||||||
static const unsigned int gappx = 16; /* gaps between windows */
|
|
||||||
static const unsigned int snap = 32; /* snap pixel */
|
|
||||||
static const int showbar = 1; /* 0 means no bar */
|
|
||||||
static const int topbar = 1; /* 0 means bottom bar */
|
|
||||||
static const char *fonts[] = { "Iosevka Term SS08:size=12" };
|
|
||||||
static const char dmenufont[] = "Iosevka Term SS08:size=14";
|
|
||||||
static const char col_gray0[] = "#0a0a0a";
|
|
||||||
static const char col_gray1[] = "#111111";
|
|
||||||
static const char col_gray2[] = "#333333";
|
|
||||||
static const char col_gray3[] = "#555555";
|
|
||||||
// Warn & urgent colors
|
|
||||||
static const char col_gray4[] = "#cccccc";
|
|
||||||
static const char col_black[] = "#000000";
|
|
||||||
static const char col_red[] = "#ff0000";
|
|
||||||
static const char col_yellow[] = "#ffff00";
|
|
||||||
static const char col_white[] = "#ffffff";
|
|
||||||
|
|
||||||
static const char *colors[][3] = {
|
|
||||||
/* fg bg border */
|
|
||||||
[SchemeNorm] = { col_gray4, col_gray0, col_gray2 },
|
|
||||||
[SchemeSel] = { col_white, col_gray0, col_gray3 },
|
|
||||||
// Extra color schemes
|
|
||||||
[SchemeWarn] = { col_black, col_yellow, col_red },
|
|
||||||
[SchemeUrgent]= { col_white, col_red, col_red },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* tagging */
|
|
||||||
static const char *tags[] = { "α", "β", "γ", "δ", "ε" };
|
|
||||||
|
|
||||||
static const Rule rules[] = {
|
|
||||||
/* xprop(1):
|
|
||||||
* WM_CLASS(STRING) = instance, class
|
|
||||||
* WM_NAME(STRING) = title
|
|
||||||
*/
|
|
||||||
/* class instance title tags mask isfloating monitor */
|
|
||||||
{ NULL, NULL, NULL, 0, False, -1 },
|
|
||||||
{ "obsidian", NULL, NULL, 1 << 0, False, -1 },
|
|
||||||
{ "Brave-browser", NULL, NULL, 1 << 1, False, -1 },
|
|
||||||
{ "Zathura", NULL, NULL, 1 << 3, False, -1 },
|
|
||||||
{ "KeePassXC", NULL, NULL, 1 << 4, False, -1 },
|
|
||||||
{ "Anki", NULL, NULL, 1 << 4, False, -1 },
|
|
||||||
{ "Goodvibes", NULL, NULL, 1 << 4, False, -1 },
|
|
||||||
{ "Com.github.xournalpp.xournalpp", NULL, NULL, 0, True, -1 },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* layout(s) */
|
|
||||||
static const float mfact = 0.62; /* factor of master area size [0.05..0.95] */
|
|
||||||
static const int nmaster = 1; /* number of clients in master area */
|
|
||||||
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
|
||||||
|
|
||||||
static const Layout layouts[] = {
|
|
||||||
/* symbol arrange function */
|
|
||||||
{ "[]=", tile }, /* first entry is default */
|
|
||||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
|
||||||
{ "[M]", monocle },
|
|
||||||
{ "|M|", centeredmaster },
|
|
||||||
{ ">M>", centeredfloatingmaster },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* key definitions */
|
|
||||||
#define MODKEY Mod4Mask
|
|
||||||
#define TAGKEYS(KEY,TAG) \
|
|
||||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
|
||||||
|
|
||||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
|
||||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
|
||||||
|
|
||||||
/* commands */
|
|
||||||
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
|
||||||
static const char *dmenucmd[] = { "dmenu-run-history", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_gray1, "-sf", col_gray4, NULL };
|
|
||||||
static const char *termcmd[] = { "st", NULL };
|
|
||||||
static const char *prtscrcmd[] = { "flameshot", "gui", NULL};
|
|
||||||
static const char *incvol[] = { "pactl", "set-sink-volume", "56", "+5%", NULL };
|
|
||||||
static const char *decvol[] = { "pactl", "set-sink-volume", "56", "-5%", NULL };
|
|
||||||
static const char *mutevol[] = { "pactl", "set-sink-mute", "56", "toggle", NULL };
|
|
||||||
static const char *incbrightness[] = { "xbacklight", "-inc", "5", NULL };
|
|
||||||
static const char *decbrightness[] = { "xbacklight", "-dec", "5", NULL };
|
|
||||||
|
|
||||||
static Key keys[] = {
|
|
||||||
/* modifier key function argument */
|
|
||||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
|
||||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
|
||||||
{ NULL, XK_Print, spawn, {.v = prtscrcmd } },
|
|
||||||
{ MODKEY, XK_b, togglebar, {0} },
|
|
||||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
|
||||||
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
|
|
||||||
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
|
||||||
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
|
||||||
{ MODKEY, XK_Return, zoom, {0} },
|
|
||||||
{ MODKEY, XK_Tab, view, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
|
||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
|
||||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
|
||||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
|
||||||
{ MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
|
|
||||||
{ MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[4]} },
|
|
||||||
{ MODKEY, XK_space, setlayout, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
|
||||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
|
|
||||||
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
|
||||||
{ MODKEY, XK_minus, setgaps, {.i = -5 } },
|
|
||||||
{ MODKEY, XK_equal, setgaps, {.i = +5 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } },
|
|
||||||
TAGKEYS( XK_1, 0)
|
|
||||||
TAGKEYS( XK_2, 1)
|
|
||||||
TAGKEYS( XK_3, 2)
|
|
||||||
TAGKEYS( XK_4, 3)
|
|
||||||
TAGKEYS( XK_5, 4)
|
|
||||||
TAGKEYS( XK_6, 5)
|
|
||||||
TAGKEYS( XK_7, 6)
|
|
||||||
TAGKEYS( XK_8, 7)
|
|
||||||
TAGKEYS( XK_9, 8)
|
|
||||||
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
|
||||||
{ NULL, XF86XK_AudioLowerVolume, spawn, {.v = decvol } },
|
|
||||||
{ NULL, XF86XK_AudioRaiseVolume, spawn, {.v = incvol } },
|
|
||||||
{ NULL, XF86XK_AudioMute, spawn, {.v = mutevol } },
|
|
||||||
{ NULL, XF86XK_MonBrightnessUp, spawn, {.v = incbrightness} },
|
|
||||||
{ NULL, XF86XK_MonBrightnessDown, spawn, {.v = decbrightness} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* button definitions */
|
|
||||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
|
||||||
static Button buttons[] = {
|
|
||||||
/* click event mask button function argument */
|
|
||||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
|
||||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
|
||||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
|
||||||
{ ClkTagBar, 0, Button1, view, {0} },
|
|
||||||
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
|
||||||
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
|
||||||
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
|
||||||
};
|
|
|
@ -1,38 +0,0 @@
|
||||||
# dwm version
|
|
||||||
VERSION = 6.2
|
|
||||||
|
|
||||||
# Customize below to fit your system
|
|
||||||
|
|
||||||
# paths
|
|
||||||
PREFIX = /usr/local
|
|
||||||
MANPREFIX = ${PREFIX}/share/man
|
|
||||||
|
|
||||||
X11INC = /usr/X11R6/include
|
|
||||||
X11LIB = /usr/X11R6/lib
|
|
||||||
|
|
||||||
# Xinerama, comment if you don't want it
|
|
||||||
XINERAMALIBS = -lXinerama
|
|
||||||
XINERAMAFLAGS = -DXINERAMA
|
|
||||||
|
|
||||||
# freetype
|
|
||||||
FREETYPELIBS = -lfontconfig -lXft
|
|
||||||
FREETYPEINC = /usr/include/freetype2
|
|
||||||
# OpenBSD (uncomment)
|
|
||||||
#FREETYPEINC = ${X11INC}/freetype2
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
INCS = -I${X11INC} -I${FREETYPEINC}
|
|
||||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
|
|
||||||
|
|
||||||
# flags
|
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
|
||||||
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
|
|
||||||
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
|
|
||||||
LDFLAGS = ${LIBS}
|
|
||||||
|
|
||||||
# Solaris
|
|
||||||
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
|
|
||||||
#LDFLAGS = ${LIBS}
|
|
||||||
|
|
||||||
# compiler and linker
|
|
||||||
CC = cc
|
|
|
@ -1,435 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
|
|
||||||
#include "drw.h"
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
#define UTF_INVALID 0xFFFD
|
|
||||||
#define UTF_SIZ 4
|
|
||||||
|
|
||||||
static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
|
|
||||||
static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
|
|
||||||
static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
|
||||||
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
|
|
||||||
|
|
||||||
static long
|
|
||||||
utf8decodebyte(const char c, size_t *i)
|
|
||||||
{
|
|
||||||
for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
|
|
||||||
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
|
|
||||||
return (unsigned char)c & ~utfmask[*i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
utf8validate(long *u, size_t i)
|
|
||||||
{
|
|
||||||
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
|
|
||||||
*u = UTF_INVALID;
|
|
||||||
for (i = 1; *u > utfmax[i]; ++i)
|
|
||||||
;
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
utf8decode(const char *c, long *u, size_t clen)
|
|
||||||
{
|
|
||||||
size_t i, j, len, type;
|
|
||||||
long udecoded;
|
|
||||||
|
|
||||||
*u = UTF_INVALID;
|
|
||||||
if (!clen)
|
|
||||||
return 0;
|
|
||||||
udecoded = utf8decodebyte(c[0], &len);
|
|
||||||
if (!BETWEEN(len, 1, UTF_SIZ))
|
|
||||||
return 1;
|
|
||||||
for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
|
|
||||||
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
|
|
||||||
if (type)
|
|
||||||
return j;
|
|
||||||
}
|
|
||||||
if (j < len)
|
|
||||||
return 0;
|
|
||||||
*u = udecoded;
|
|
||||||
utf8validate(u, len);
|
|
||||||
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
Drw *
|
|
||||||
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
|
|
||||||
{
|
|
||||||
Drw *drw = ecalloc(1, sizeof(Drw));
|
|
||||||
|
|
||||||
drw->dpy = dpy;
|
|
||||||
drw->screen = screen;
|
|
||||||
drw->root = root;
|
|
||||||
drw->w = w;
|
|
||||||
drw->h = h;
|
|
||||||
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
|
|
||||||
drw->gc = XCreateGC(dpy, root, 0, NULL);
|
|
||||||
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
|
|
||||||
|
|
||||||
return drw;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_resize(Drw *drw, unsigned int w, unsigned int h)
|
|
||||||
{
|
|
||||||
if (!drw)
|
|
||||||
return;
|
|
||||||
|
|
||||||
drw->w = w;
|
|
||||||
drw->h = h;
|
|
||||||
if (drw->drawable)
|
|
||||||
XFreePixmap(drw->dpy, drw->drawable);
|
|
||||||
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_free(Drw *drw)
|
|
||||||
{
|
|
||||||
XFreePixmap(drw->dpy, drw->drawable);
|
|
||||||
XFreeGC(drw->dpy, drw->gc);
|
|
||||||
free(drw);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* This function is an implementation detail. Library users should use
|
|
||||||
* drw_fontset_create instead.
|
|
||||||
*/
|
|
||||||
static Fnt *
|
|
||||||
xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
|
|
||||||
{
|
|
||||||
Fnt *font;
|
|
||||||
XftFont *xfont = NULL;
|
|
||||||
FcPattern *pattern = NULL;
|
|
||||||
|
|
||||||
if (fontname) {
|
|
||||||
/* Using the pattern found at font->xfont->pattern does not yield the
|
|
||||||
* same substitution results as using the pattern returned by
|
|
||||||
* FcNameParse; using the latter results in the desired fallback
|
|
||||||
* behaviour whereas the former just results in missing-character
|
|
||||||
* rectangles being drawn, at least with some fonts. */
|
|
||||||
if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
|
|
||||||
fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
|
|
||||||
fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
|
|
||||||
XftFontClose(drw->dpy, xfont);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else if (fontpattern) {
|
|
||||||
if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
|
|
||||||
fprintf(stderr, "error, cannot load font from pattern.\n");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
die("no font specified.");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Do not allow using color fonts. This is a workaround for a BadLength
|
|
||||||
* error from Xft with color glyphs. Modelled on the Xterm workaround. See
|
|
||||||
* https://bugzilla.redhat.com/show_bug.cgi?id=1498269
|
|
||||||
* https://lists.suckless.org/dev/1701/30932.html
|
|
||||||
* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
|
|
||||||
* and lots more all over the internet.
|
|
||||||
*/
|
|
||||||
FcBool iscol;
|
|
||||||
if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
|
|
||||||
XftFontClose(drw->dpy, xfont);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
font = ecalloc(1, sizeof(Fnt));
|
|
||||||
font->xfont = xfont;
|
|
||||||
font->pattern = pattern;
|
|
||||||
font->h = xfont->ascent + xfont->descent;
|
|
||||||
font->dpy = drw->dpy;
|
|
||||||
|
|
||||||
return font;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
xfont_free(Fnt *font)
|
|
||||||
{
|
|
||||||
if (!font)
|
|
||||||
return;
|
|
||||||
if (font->pattern)
|
|
||||||
FcPatternDestroy(font->pattern);
|
|
||||||
XftFontClose(font->dpy, font->xfont);
|
|
||||||
free(font);
|
|
||||||
}
|
|
||||||
|
|
||||||
Fnt*
|
|
||||||
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
|
|
||||||
{
|
|
||||||
Fnt *cur, *ret = NULL;
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
if (!drw || !fonts)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 1; i <= fontcount; i++) {
|
|
||||||
if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
|
|
||||||
cur->next = ret;
|
|
||||||
ret = cur;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return (drw->fonts = ret);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_fontset_free(Fnt *font)
|
|
||||||
{
|
|
||||||
if (font) {
|
|
||||||
drw_fontset_free(font->next);
|
|
||||||
xfont_free(font);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
|
|
||||||
{
|
|
||||||
if (!drw || !dest || !clrname)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
|
|
||||||
DefaultColormap(drw->dpy, drw->screen),
|
|
||||||
clrname, dest))
|
|
||||||
die("error, cannot allocate color '%s'", clrname);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Wrapper to create color schemes. The caller has to call free(3) on the
|
|
||||||
* returned color scheme when done using it. */
|
|
||||||
Clr *
|
|
||||||
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
Clr *ret;
|
|
||||||
|
|
||||||
/* need at least two colors for a scheme */
|
|
||||||
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 0; i < clrcount; i++)
|
|
||||||
drw_clr_create(drw, &ret[i], clrnames[i]);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_setfontset(Drw *drw, Fnt *set)
|
|
||||||
{
|
|
||||||
if (drw)
|
|
||||||
drw->fonts = set;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_setscheme(Drw *drw, Clr *scm)
|
|
||||||
{
|
|
||||||
if (drw)
|
|
||||||
drw->scheme = scm;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
|
|
||||||
{
|
|
||||||
if (!drw || !drw->scheme)
|
|
||||||
return;
|
|
||||||
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
|
|
||||||
if (filled)
|
|
||||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
|
||||||
else
|
|
||||||
XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
|
|
||||||
{
|
|
||||||
char buf[1024];
|
|
||||||
int ty;
|
|
||||||
unsigned int ew;
|
|
||||||
XftDraw *d = NULL;
|
|
||||||
Fnt *usedfont, *curfont, *nextfont;
|
|
||||||
size_t i, len;
|
|
||||||
int utf8strlen, utf8charlen, render = x || y || w || h;
|
|
||||||
long utf8codepoint = 0;
|
|
||||||
const char *utf8str;
|
|
||||||
FcCharSet *fccharset;
|
|
||||||
FcPattern *fcpattern;
|
|
||||||
FcPattern *match;
|
|
||||||
XftResult result;
|
|
||||||
int charexists = 0;
|
|
||||||
|
|
||||||
if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (!render) {
|
|
||||||
w = ~w;
|
|
||||||
} else {
|
|
||||||
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
|
|
||||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
|
||||||
d = XftDrawCreate(drw->dpy, drw->drawable,
|
|
||||||
DefaultVisual(drw->dpy, drw->screen),
|
|
||||||
DefaultColormap(drw->dpy, drw->screen));
|
|
||||||
x += lpad;
|
|
||||||
w -= lpad;
|
|
||||||
}
|
|
||||||
|
|
||||||
usedfont = drw->fonts;
|
|
||||||
while (1) {
|
|
||||||
utf8strlen = 0;
|
|
||||||
utf8str = text;
|
|
||||||
nextfont = NULL;
|
|
||||||
while (*text) {
|
|
||||||
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
|
|
||||||
for (curfont = drw->fonts; curfont; curfont = curfont->next) {
|
|
||||||
charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
|
|
||||||
if (charexists) {
|
|
||||||
if (curfont == usedfont) {
|
|
||||||
utf8strlen += utf8charlen;
|
|
||||||
text += utf8charlen;
|
|
||||||
} else {
|
|
||||||
nextfont = curfont;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!charexists || nextfont)
|
|
||||||
break;
|
|
||||||
else
|
|
||||||
charexists = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (utf8strlen) {
|
|
||||||
drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
|
|
||||||
/* shorten text if necessary */
|
|
||||||
for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--)
|
|
||||||
drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
|
|
||||||
|
|
||||||
if (len) {
|
|
||||||
memcpy(buf, utf8str, len);
|
|
||||||
buf[len] = '\0';
|
|
||||||
if (len < utf8strlen)
|
|
||||||
for (i = len; i && i > len - 3; buf[--i] = '.')
|
|
||||||
; /* NOP */
|
|
||||||
|
|
||||||
if (render) {
|
|
||||||
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
|
|
||||||
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
|
|
||||||
usedfont->xfont, x, ty, (XftChar8 *)buf, len);
|
|
||||||
}
|
|
||||||
x += ew;
|
|
||||||
w -= ew;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!*text) {
|
|
||||||
break;
|
|
||||||
} else if (nextfont) {
|
|
||||||
charexists = 0;
|
|
||||||
usedfont = nextfont;
|
|
||||||
} else {
|
|
||||||
/* Regardless of whether or not a fallback font is found, the
|
|
||||||
* character must be drawn. */
|
|
||||||
charexists = 1;
|
|
||||||
|
|
||||||
fccharset = FcCharSetCreate();
|
|
||||||
FcCharSetAddChar(fccharset, utf8codepoint);
|
|
||||||
|
|
||||||
if (!drw->fonts->pattern) {
|
|
||||||
/* Refer to the comment in xfont_create for more information. */
|
|
||||||
die("the first font in the cache must be loaded from a font string.");
|
|
||||||
}
|
|
||||||
|
|
||||||
fcpattern = FcPatternDuplicate(drw->fonts->pattern);
|
|
||||||
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
|
|
||||||
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
|
|
||||||
FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
|
|
||||||
|
|
||||||
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
|
|
||||||
FcDefaultSubstitute(fcpattern);
|
|
||||||
match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
|
|
||||||
|
|
||||||
FcCharSetDestroy(fccharset);
|
|
||||||
FcPatternDestroy(fcpattern);
|
|
||||||
|
|
||||||
if (match) {
|
|
||||||
usedfont = xfont_create(drw, NULL, match);
|
|
||||||
if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
|
|
||||||
for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
|
|
||||||
; /* NOP */
|
|
||||||
curfont->next = usedfont;
|
|
||||||
} else {
|
|
||||||
xfont_free(usedfont);
|
|
||||||
usedfont = drw->fonts;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (d)
|
|
||||||
XftDrawDestroy(d);
|
|
||||||
|
|
||||||
return x + (render ? w : 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
|
|
||||||
{
|
|
||||||
if (!drw)
|
|
||||||
return;
|
|
||||||
|
|
||||||
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
|
|
||||||
XSync(drw->dpy, False);
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int
|
|
||||||
drw_fontset_getwidth(Drw *drw, const char *text)
|
|
||||||
{
|
|
||||||
if (!drw || !drw->fonts || !text)
|
|
||||||
return 0;
|
|
||||||
return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
|
|
||||||
{
|
|
||||||
XGlyphInfo ext;
|
|
||||||
|
|
||||||
if (!font || !text)
|
|
||||||
return;
|
|
||||||
|
|
||||||
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
|
|
||||||
if (w)
|
|
||||||
*w = ext.xOff;
|
|
||||||
if (h)
|
|
||||||
*h = font->h;
|
|
||||||
}
|
|
||||||
|
|
||||||
Cur *
|
|
||||||
drw_cur_create(Drw *drw, int shape)
|
|
||||||
{
|
|
||||||
Cur *cur;
|
|
||||||
|
|
||||||
if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
cur->cursor = XCreateFontCursor(drw->dpy, shape);
|
|
||||||
|
|
||||||
return cur;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_cur_free(Drw *drw, Cur *cursor)
|
|
||||||
{
|
|
||||||
if (!cursor)
|
|
||||||
return;
|
|
||||||
|
|
||||||
XFreeCursor(drw->dpy, cursor->cursor);
|
|
||||||
free(cursor);
|
|
||||||
}
|
|
|
@ -1,57 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
Cursor cursor;
|
|
||||||
} Cur;
|
|
||||||
|
|
||||||
typedef struct Fnt {
|
|
||||||
Display *dpy;
|
|
||||||
unsigned int h;
|
|
||||||
XftFont *xfont;
|
|
||||||
FcPattern *pattern;
|
|
||||||
struct Fnt *next;
|
|
||||||
} Fnt;
|
|
||||||
|
|
||||||
enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */
|
|
||||||
typedef XftColor Clr;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
unsigned int w, h;
|
|
||||||
Display *dpy;
|
|
||||||
int screen;
|
|
||||||
Window root;
|
|
||||||
Drawable drawable;
|
|
||||||
GC gc;
|
|
||||||
Clr *scheme;
|
|
||||||
Fnt *fonts;
|
|
||||||
} Drw;
|
|
||||||
|
|
||||||
/* Drawable abstraction */
|
|
||||||
Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
|
|
||||||
void drw_resize(Drw *drw, unsigned int w, unsigned int h);
|
|
||||||
void drw_free(Drw *drw);
|
|
||||||
|
|
||||||
/* Fnt abstraction */
|
|
||||||
Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
|
|
||||||
void drw_fontset_free(Fnt* set);
|
|
||||||
unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
|
|
||||||
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
|
|
||||||
|
|
||||||
/* Colorscheme abstraction */
|
|
||||||
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
|
|
||||||
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
|
|
||||||
|
|
||||||
/* Cursor abstraction */
|
|
||||||
Cur *drw_cur_create(Drw *drw, int shape);
|
|
||||||
void drw_cur_free(Drw *drw, Cur *cursor);
|
|
||||||
|
|
||||||
/* Drawing context manipulation */
|
|
||||||
void drw_setfontset(Drw *drw, Fnt *set);
|
|
||||||
void drw_setscheme(Drw *drw, Clr *scm);
|
|
||||||
|
|
||||||
/* Drawing functions */
|
|
||||||
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
|
|
||||||
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
|
|
||||||
|
|
||||||
/* Map functions */
|
|
||||||
void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
|
|
|
@ -1,176 +0,0 @@
|
||||||
.TH DWM 1 dwm\-VERSION
|
|
||||||
.SH NAME
|
|
||||||
dwm \- dynamic window manager
|
|
||||||
.SH SYNOPSIS
|
|
||||||
.B dwm
|
|
||||||
.RB [ \-v ]
|
|
||||||
.SH DESCRIPTION
|
|
||||||
dwm is a dynamic window manager for X. It manages windows in tiled, monocle
|
|
||||||
and floating layouts. Either layout can be applied dynamically, optimising the
|
|
||||||
environment for the application in use and the task performed.
|
|
||||||
.P
|
|
||||||
In tiled layouts windows are managed in a master and stacking area. The master
|
|
||||||
area on the left contains one window by default, and the stacking area on the
|
|
||||||
right contains all other windows. The number of master area windows can be
|
|
||||||
adjusted from zero to an arbitrary number. In monocle layout all windows are
|
|
||||||
maximised to the screen size. In floating layout windows can be resized and
|
|
||||||
moved freely. Dialog windows are always managed floating, regardless of the
|
|
||||||
layout applied.
|
|
||||||
.P
|
|
||||||
Windows are grouped by tags. Each window can be tagged with one or multiple
|
|
||||||
tags. Selecting certain tags displays all windows with these tags.
|
|
||||||
.P
|
|
||||||
Each screen contains a small status bar which displays all available tags, the
|
|
||||||
layout, the title of the focused window, and the text read from the root window
|
|
||||||
name property, if the screen is focused. A floating window is indicated with an
|
|
||||||
empty square and a maximised floating window is indicated with a filled square
|
|
||||||
before the windows title. The selected tags are indicated with a different
|
|
||||||
color. The tags of the focused window are indicated with a filled square in the
|
|
||||||
top left corner. The tags which are applied to one or more windows are
|
|
||||||
indicated with an empty square in the top left corner.
|
|
||||||
.P
|
|
||||||
dwm draws a small border around windows to indicate the focus state.
|
|
||||||
.SH OPTIONS
|
|
||||||
.TP
|
|
||||||
.B \-v
|
|
||||||
prints version information to standard output, then exits.
|
|
||||||
.SH USAGE
|
|
||||||
.SS Status bar
|
|
||||||
.TP
|
|
||||||
.B X root window name
|
|
||||||
is read and displayed in the status text area. It can be set with the
|
|
||||||
.BR xsetroot (1)
|
|
||||||
command.
|
|
||||||
.TP
|
|
||||||
.B Button1
|
|
||||||
click on a tag label to display all windows with that tag, click on the layout
|
|
||||||
label toggles between tiled and floating layout.
|
|
||||||
.TP
|
|
||||||
.B Button3
|
|
||||||
click on a tag label adds/removes all windows with that tag to/from the view.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Button1
|
|
||||||
click on a tag label applies that tag to the focused window.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Button3
|
|
||||||
click on a tag label adds/removes that tag to/from the focused window.
|
|
||||||
.SS Keyboard commands
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Shift\-Return
|
|
||||||
Start
|
|
||||||
.BR st(1).
|
|
||||||
.TP
|
|
||||||
.B Mod1\-p
|
|
||||||
Spawn
|
|
||||||
.BR dmenu(1)
|
|
||||||
for launching other programs.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-,
|
|
||||||
Focus previous screen, if any.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-.
|
|
||||||
Focus next screen, if any.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Shift\-,
|
|
||||||
Send focused window to previous screen, if any.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Shift\-.
|
|
||||||
Send focused window to next screen, if any.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-b
|
|
||||||
Toggles bar on and off.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-t
|
|
||||||
Sets tiled layout.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-f
|
|
||||||
Sets floating layout.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-m
|
|
||||||
Sets monocle layout.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-space
|
|
||||||
Toggles between current and previous layout.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-j
|
|
||||||
Focus next window.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-k
|
|
||||||
Focus previous window.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-i
|
|
||||||
Increase number of windows in master area.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-d
|
|
||||||
Decrease number of windows in master area.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-l
|
|
||||||
Increase master area size.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-h
|
|
||||||
Decrease master area size.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Return
|
|
||||||
Zooms/cycles focused window to/from master area (tiled layouts only).
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Shift\-c
|
|
||||||
Close focused window.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Shift\-space
|
|
||||||
Toggle focused window between tiled and floating state.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Tab
|
|
||||||
Toggles to the previously selected tags.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Shift\-[1..n]
|
|
||||||
Apply nth tag to focused window.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Shift\-0
|
|
||||||
Apply all tags to focused window.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Control\-Shift\-[1..n]
|
|
||||||
Add/remove nth tag to/from focused window.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-[1..n]
|
|
||||||
View all windows with nth tag.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-0
|
|
||||||
View all windows with any tag.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Control\-[1..n]
|
|
||||||
Add/remove all windows with nth tag to/from the view.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Shift\-q
|
|
||||||
Quit dwm.
|
|
||||||
.SS Mouse commands
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Button1
|
|
||||||
Move focused window while dragging. Tiled windows will be toggled to the floating state.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Button2
|
|
||||||
Toggles focused window between floating and tiled state.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Button3
|
|
||||||
Resize focused window while dragging. Tiled windows will be toggled to the floating state.
|
|
||||||
.SH CUSTOMIZATION
|
|
||||||
dwm 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 dmenu (1),
|
|
||||||
.BR st (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
|
|
||||||
JDK 1.6 versions, because it assumes a reparenting window manager. Possible workarounds
|
|
||||||
are using JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or setting the
|
|
||||||
environment variable
|
|
||||||
.BR AWT_TOOLKIT=MToolkit
|
|
||||||
(to use the older Motif backend instead) or running
|
|
||||||
.B xprop -root -f _NET_WM_NAME 32a -set _NET_WM_NAME LG3D
|
|
||||||
or
|
|
||||||
.B wmname LG3D
|
|
||||||
(to pretend that a non-reparenting window manager is running that the
|
|
||||||
XToolkit/XAWT backend can recognize) or when using OpenJDK setting the environment variable
|
|
||||||
.BR _JAVA_AWT_WM_NONREPARENTING=1 .
|
|
||||||
.SH BUGS
|
|
||||||
Send all bug reports with a patch to hackers@suckless.org.
|
|
2378
.suckless/dwm/dwm.c
2378
.suckless/dwm/dwm.c
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Before Width: | Height: | Size: 373 B |
|
@ -1,142 +0,0 @@
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 7054c06..527b214 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -39,6 +39,8 @@ static const Layout layouts[] = {
|
|
||||||
{ "[]=", tile }, /* first entry is default */
|
|
||||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
|
||||||
{ "[M]", monocle },
|
|
||||||
+ { "|M|", centeredmaster },
|
|
||||||
+ { ">M>", centeredfloatingmaster },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* key definitions */
|
|
||||||
@@ -74,6 +76,8 @@ static Key keys[] = {
|
|
||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
|
||||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
|
||||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
|
||||||
+ { MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
|
|
||||||
+ { MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
|
|
||||||
{ MODKEY, XK_space, setlayout, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
|
||||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index 0362114..1e81412 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -233,6 +233,8 @@ static int xerror(Display *dpy, XErrorEvent *ee);
|
|
||||||
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
|
||||||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
|
||||||
static void zoom(const Arg *arg);
|
|
||||||
+static void centeredmaster(Monitor *m);
|
|
||||||
+static void centeredfloatingmaster(Monitor *m);
|
|
||||||
|
|
||||||
/* variables */
|
|
||||||
static const char broken[] = "broken";
|
|
||||||
@@ -2139,3 +2141,106 @@ main(int argc, char *argv[])
|
|
||||||
XCloseDisplay(dpy);
|
|
||||||
return EXIT_SUCCESS;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+centeredmaster(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n, h, mw, mx, my, oty, ety, tw;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ /* count number of clients in the selected monitor */
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ /* initialize areas */
|
|
||||||
+ mw = m->ww;
|
|
||||||
+ mx = 0;
|
|
||||||
+ my = 0;
|
|
||||||
+ tw = mw;
|
|
||||||
+
|
|
||||||
+ if (n > m->nmaster) {
|
|
||||||
+ /* go mfact box in the center if more than nmaster clients */
|
|
||||||
+ mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
||||||
+ tw = m->ww - mw;
|
|
||||||
+
|
|
||||||
+ if (n - m->nmaster > 1) {
|
|
||||||
+ /* only one client */
|
|
||||||
+ mx = (m->ww - mw) / 2;
|
|
||||||
+ tw = (m->ww - mw) / 2;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ oty = 0;
|
|
||||||
+ ety = 0;
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ /* nmaster clients are stacked vertically, in the center
|
|
||||||
+ * of the screen */
|
|
||||||
+ h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
|
||||||
+ resize(c, m->wx + mx, m->wy + my, mw - (2*c->bw),
|
|
||||||
+ h - (2*c->bw), 0);
|
|
||||||
+ my += HEIGHT(c);
|
|
||||||
+ } else {
|
|
||||||
+ /* stack clients are stacked vertically */
|
|
||||||
+ if ((i - m->nmaster) % 2 ) {
|
|
||||||
+ h = (m->wh - ety) / ( (1 + n - i) / 2);
|
|
||||||
+ resize(c, m->wx, m->wy + ety, tw - (2*c->bw),
|
|
||||||
+ h - (2*c->bw), 0);
|
|
||||||
+ ety += HEIGHT(c);
|
|
||||||
+ } else {
|
|
||||||
+ h = (m->wh - oty) / ((1 + n - i) / 2);
|
|
||||||
+ resize(c, m->wx + mx + mw, m->wy + oty,
|
|
||||||
+ tw - (2*c->bw), h - (2*c->bw), 0);
|
|
||||||
+ oty += HEIGHT(c);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+centeredfloatingmaster(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ /* count number of clients in the selected monitor */
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ /* initialize nmaster area */
|
|
||||||
+ if (n > m->nmaster) {
|
|
||||||
+ /* go mfact box in the center if more than nmaster clients */
|
|
||||||
+ if (m->ww > m->wh) {
|
|
||||||
+ mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
||||||
+ mh = m->nmaster ? m->wh * 0.9 : 0;
|
|
||||||
+ } else {
|
|
||||||
+ mh = m->nmaster ? m->wh * m->mfact : 0;
|
|
||||||
+ mw = m->nmaster ? m->ww * 0.9 : 0;
|
|
||||||
+ }
|
|
||||||
+ mx = mxo = (m->ww - mw) / 2;
|
|
||||||
+ my = myo = (m->wh - mh) / 2;
|
|
||||||
+ } else {
|
|
||||||
+ /* go fullscreen if all clients are in the master area */
|
|
||||||
+ mh = m->wh;
|
|
||||||
+ mw = m->ww;
|
|
||||||
+ mx = mxo = 0;
|
|
||||||
+ my = myo = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ for(i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ /* nmaster clients are stacked horizontally, in the center
|
|
||||||
+ * of the screen */
|
|
||||||
+ w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i);
|
|
||||||
+ resize(c, m->wx + mx, m->wy + my, w - (2*c->bw),
|
|
||||||
+ mh - (2*c->bw), 0);
|
|
||||||
+ mx += WIDTH(c);
|
|
||||||
+ } else {
|
|
||||||
+ /* stack clients are stacked horizontally */
|
|
||||||
+ w = (m->ww - tx) / (n - i);
|
|
||||||
+ resize(c, m->wx + tx, m->wy, w - (2*c->bw),
|
|
||||||
+ m->wh - (2*c->bw), 0);
|
|
||||||
+ tx += WIDTH(c);
|
|
||||||
+ }
|
|
||||||
+}
|
|
|
@ -1,81 +0,0 @@
|
||||||
From 969dbbc548f16da5d94630e3d54e9c96c5296520 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ryan Kes <alrayyes@gmail.com>
|
|
||||||
Date: Thu, 28 Mar 2019 14:36:07 +0100
|
|
||||||
Subject: [PATCH] dwm-notitle-6.2
|
|
||||||
|
|
||||||
---
|
|
||||||
config.def.h | 1 -
|
|
||||||
dwm.c | 20 ++++----------------
|
|
||||||
2 files changed, 4 insertions(+), 17 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 1c0b587..19330cd 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -102,7 +102,6 @@ static Button buttons[] = {
|
|
||||||
/* click event mask button function argument */
|
|
||||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
|
||||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
|
||||||
- { ClkWinTitle, 0, Button2, zoom, {0} },
|
|
||||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index 4465af1..bcf5cb1 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -64,8 +64,8 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
|
||||||
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
|
||||||
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
|
||||||
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
|
||||||
-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
|
||||||
- ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
|
||||||
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin,
|
|
||||||
+ ClkRootWin, ClkLast }; /* clicks */
|
|
||||||
|
|
||||||
typedef union {
|
|
||||||
int i;
|
|
||||||
@@ -439,10 +439,8 @@ buttonpress(XEvent *e)
|
|
||||||
arg.ui = 1 << i;
|
|
||||||
} else if (ev->x < x + blw)
|
|
||||||
click = ClkLtSymbol;
|
|
||||||
- else if (ev->x > selmon->ww - TEXTW(stext))
|
|
||||||
- click = ClkStatusText;
|
|
||||||
else
|
|
||||||
- click = ClkWinTitle;
|
|
||||||
+ click = ClkStatusText;
|
|
||||||
} else if ((c = wintoclient(ev->window))) {
|
|
||||||
focus(c);
|
|
||||||
restack(selmon);
|
|
||||||
@@ -729,15 +727,8 @@ drawbar(Monitor *m)
|
|
||||||
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
|
||||||
|
|
||||||
if ((w = m->ww - sw - x) > bh) {
|
|
||||||
- if (m->sel) {
|
|
||||||
- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
|
||||||
- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
|
||||||
- if (m->sel->isfloating)
|
|
||||||
- drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
|
|
||||||
- } else {
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
drw_rect(drw, x, 0, w, bh, 1, 1);
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
|
||||||
}
|
|
||||||
@@ -1235,11 +1226,8 @@ propertynotify(XEvent *e)
|
|
||||||
drawbars();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
- if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
|
|
||||||
+ if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName])
|
|
||||||
updatetitle(c);
|
|
||||||
- if (c == c->mon->sel)
|
|
||||||
- drawbar(c->mon);
|
|
||||||
- }
|
|
||||||
if (ev->atom == netatom[NetWMWindowType])
|
|
||||||
updatewindowtype(c);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
|
@ -1,177 +0,0 @@
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index a5ce993..45f1e27 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -112,6 +112,7 @@ typedef struct {
|
|
||||||
void (*arrange)(Monitor *);
|
|
||||||
} Layout;
|
|
||||||
|
|
||||||
+typedef struct Pertag Pertag;
|
|
||||||
struct Monitor {
|
|
||||||
char ltsymbol[16];
|
|
||||||
float mfact;
|
|
||||||
@@ -131,6 +132,7 @@ struct Monitor {
|
|
||||||
Monitor *next;
|
|
||||||
Window barwin;
|
|
||||||
const Layout *lt[2];
|
|
||||||
+ Pertag *pertag;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
@@ -272,6 +274,15 @@ static Window root, wmcheckwin;
|
|
||||||
/* configuration, allows nested code to access above variables */
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
+struct Pertag {
|
|
||||||
+ unsigned int curtag, prevtag; /* current and previous tag */
|
|
||||||
+ int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
|
|
||||||
+ float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
|
|
||||||
+ unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */
|
|
||||||
+ const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes */
|
|
||||||
+ int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/* compile-time check if all tags fit into an unsigned int bit array. */
|
|
||||||
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
|
|
||||||
|
|
||||||
@@ -632,6 +643,7 @@ Monitor *
|
|
||||||
createmon(void)
|
|
||||||
{
|
|
||||||
Monitor *m;
|
|
||||||
+ unsigned int i;
|
|
||||||
|
|
||||||
m = ecalloc(1, sizeof(Monitor));
|
|
||||||
m->tagset[0] = m->tagset[1] = 1;
|
|
||||||
@@ -642,6 +654,20 @@ createmon(void)
|
|
||||||
m->lt[0] = &layouts[0];
|
|
||||||
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
|
||||||
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
|
||||||
+ m->pertag = ecalloc(1, sizeof(Pertag));
|
|
||||||
+ m->pertag->curtag = m->pertag->prevtag = 1;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i <= LENGTH(tags); i++) {
|
|
||||||
+ m->pertag->nmasters[i] = m->nmaster;
|
|
||||||
+ m->pertag->mfacts[i] = m->mfact;
|
|
||||||
+
|
|
||||||
+ m->pertag->ltidxs[i][0] = m->lt[0];
|
|
||||||
+ m->pertag->ltidxs[i][1] = m->lt[1];
|
|
||||||
+ m->pertag->sellts[i] = m->sellt;
|
|
||||||
+
|
|
||||||
+ m->pertag->showbars[i] = m->showbar;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
return m;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -968,7 +994,7 @@ grabkeys(void)
|
|
||||||
void
|
|
||||||
incnmaster(const Arg *arg)
|
|
||||||
{
|
|
||||||
- selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
|
|
||||||
+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1503,9 +1529,9 @@ void
|
|
||||||
setlayout(const Arg *arg)
|
|
||||||
{
|
|
||||||
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
|
|
||||||
- selmon->sellt ^= 1;
|
|
||||||
+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
|
|
||||||
if (arg && arg->v)
|
|
||||||
- selmon->lt[selmon->sellt] = (Layout *)arg->v;
|
|
||||||
+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
|
|
||||||
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
|
|
||||||
if (selmon->sel)
|
|
||||||
arrange(selmon);
|
|
||||||
@@ -1524,7 +1550,7 @@ setmfact(const Arg *arg)
|
|
||||||
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
|
|
||||||
if (f < 0.1 || f > 0.9)
|
|
||||||
return;
|
|
||||||
- selmon->mfact = f;
|
|
||||||
+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1701,7 +1727,7 @@ tile(Monitor *m)
|
|
||||||
void
|
|
||||||
togglebar(const Arg *arg)
|
|
||||||
{
|
|
||||||
- selmon->showbar = !selmon->showbar;
|
|
||||||
+ selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
|
|
||||||
updatebarpos(selmon);
|
|
||||||
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
|
|
||||||
arrange(selmon);
|
|
||||||
@@ -1740,9 +1766,33 @@ void
|
|
||||||
toggleview(const Arg *arg)
|
|
||||||
{
|
|
||||||
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
|
|
||||||
+ int i;
|
|
||||||
|
|
||||||
if (newtagset) {
|
|
||||||
selmon->tagset[selmon->seltags] = newtagset;
|
|
||||||
+
|
|
||||||
+ if (newtagset == ~0) {
|
|
||||||
+ selmon->pertag->prevtag = selmon->pertag->curtag;
|
|
||||||
+ selmon->pertag->curtag = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* test if the user did not select the same tag */
|
|
||||||
+ if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
|
|
||||||
+ selmon->pertag->prevtag = selmon->pertag->curtag;
|
|
||||||
+ for (i = 0; !(newtagset & 1 << i); i++) ;
|
|
||||||
+ selmon->pertag->curtag = i + 1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* apply settings for this view */
|
|
||||||
+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
|
|
||||||
+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
|
|
||||||
+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
|
|
||||||
+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
|
|
||||||
+ selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
|
|
||||||
+
|
|
||||||
+ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
|
|
||||||
+ togglebar(NULL);
|
|
||||||
+
|
|
||||||
focus(NULL);
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
@@ -2036,11 +2086,37 @@ updatewmhints(Client *c)
|
|
||||||
void
|
|
||||||
view(const Arg *arg)
|
|
||||||
{
|
|
||||||
+ int i;
|
|
||||||
+ unsigned int tmptag;
|
|
||||||
+
|
|
||||||
if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
|
|
||||||
return;
|
|
||||||
selmon->seltags ^= 1; /* toggle sel tagset */
|
|
||||||
- if (arg->ui & TAGMASK)
|
|
||||||
+ if (arg->ui & TAGMASK) {
|
|
||||||
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
|
|
||||||
+ selmon->pertag->prevtag = selmon->pertag->curtag;
|
|
||||||
+
|
|
||||||
+ if (arg->ui == ~0)
|
|
||||||
+ selmon->pertag->curtag = 0;
|
|
||||||
+ else {
|
|
||||||
+ for (i = 0; !(arg->ui & 1 << i); i++) ;
|
|
||||||
+ selmon->pertag->curtag = i + 1;
|
|
||||||
+ }
|
|
||||||
+ } else {
|
|
||||||
+ tmptag = selmon->pertag->prevtag;
|
|
||||||
+ selmon->pertag->prevtag = selmon->pertag->curtag;
|
|
||||||
+ selmon->pertag->curtag = tmptag;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
|
|
||||||
+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
|
|
||||||
+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
|
|
||||||
+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
|
|
||||||
+ selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
|
|
||||||
+
|
|
||||||
+ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
|
|
||||||
+ togglebar(NULL);
|
|
||||||
+
|
|
||||||
focus(NULL);
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
|
@ -1,157 +0,0 @@
|
||||||
diff -up a/config.h b/config.h
|
|
||||||
--- a/config.h 2019-07-24 08:59:14.429282151 +0200
|
|
||||||
+++ b/config.h 2019-07-24 09:30:18.841019314 +0200
|
|
||||||
@@ -42,6 +42,8 @@ static const Layout layouts[] = {
|
|
||||||
{ "[]=", tile }, /* first entry is default */
|
|
||||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
|
||||||
{ "[M]", monocle },
|
|
||||||
+ { "|M|", centeredmaster },
|
|
||||||
+ { ">M>", centeredfloatingmaster },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* key definitions */
|
|
||||||
@@ -77,6 +79,8 @@ static Key keys[] = {
|
|
||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
|
||||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
|
||||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
|
||||||
+ { MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
|
|
||||||
+ { MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[4]} },
|
|
||||||
{ MODKEY, XK_space, setlayout, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
|
||||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
|
||||||
diff -up a/dwm.c b/dwm.c
|
|
||||||
--- a/dwm.c 2019-07-24 08:59:14.432615503 +0200
|
|
||||||
+++ b/dwm.c 2019-07-24 09:24:16.192110897 +0200
|
|
||||||
@@ -235,6 +235,8 @@ static int xerror(Display *dpy, XErrorEv
|
|
||||||
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
|
||||||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
|
||||||
static void zoom(const Arg *arg);
|
|
||||||
+static void centeredmaster(Monitor *m);
|
|
||||||
+static void centeredfloatingmaster(Monitor *m);
|
|
||||||
|
|
||||||
/* variables */
|
|
||||||
static const char broken[] = "broken";
|
|
||||||
@@ -2176,3 +2178,122 @@ main(int argc, char *argv[])
|
|
||||||
XCloseDisplay(dpy);
|
|
||||||
return EXIT_SUCCESS;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+centeredmaster(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n, h, mw, mx, my, oty, ety, tw;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ /* count number of clients in the selected monitor */
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
+
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+ if(n == 1){
|
|
||||||
+ c = nexttiled(m->clients);
|
|
||||||
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* initialize areas */
|
|
||||||
+ mw = m->ww;
|
|
||||||
+ mx = 0;
|
|
||||||
+ my = m->gappx;
|
|
||||||
+ tw = mw;
|
|
||||||
+
|
|
||||||
+ if (n > m->nmaster) {
|
|
||||||
+ /* go mfact box in the center if more than nmaster clients */
|
|
||||||
+ mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
||||||
+ tw = m->ww - mw;
|
|
||||||
+
|
|
||||||
+ if (n - m->nmaster > 1) {
|
|
||||||
+ /* only one client */
|
|
||||||
+ mx = (m->ww - mw) / 2;
|
|
||||||
+ tw = (m->ww - mw) / 2;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ oty = m->gappx;
|
|
||||||
+ ety = m->gappx;
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ /* nmaster clients are stacked vertically, in the center
|
|
||||||
+ * of the screen */
|
|
||||||
+ h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
|
||||||
+ if(m->nmaster >= n)
|
|
||||||
+ resize(c, m->wx + mx + m->gappx, m->wy + my, mw - 2*(c->bw + m->gappx),
|
|
||||||
+ h - (2*c->bw) - m->gappx, 0);
|
|
||||||
+ else if(m->nmaster + 1 < n)
|
|
||||||
+ resize(c, m->wx + mx + m->gappx/2, m->wy + my, mw - 2*c->bw - m->gappx, h - 2*c->bw - m->gappx, 0);
|
|
||||||
+ else
|
|
||||||
+ resize(c, m->wx + mx + m->gappx, m->wy + my, mw - 2*c->bw - m->gappx*3/2, h - 2*c->bw - m->gappx, 0);
|
|
||||||
+ my += HEIGHT(c) + m->gappx;
|
|
||||||
+ } else {
|
|
||||||
+ /* stack clients are stacked vertically */
|
|
||||||
+ if ((i - m->nmaster) % 2) {
|
|
||||||
+ h = (m->wh - ety) / ( (1 + n - i) / 2);
|
|
||||||
+ resize(c, m->wx + m->gappx, m->wy + ety, tw - (2*c->bw) - m->gappx*3/2, h - 2*c->bw - m->gappx, 0);
|
|
||||||
+ ety += HEIGHT(c) + m->gappx;
|
|
||||||
+ } else {
|
|
||||||
+ h = (m->wh - oty) / ((1 + n - i) / 2);
|
|
||||||
+ resize(c, m->wx + mx + mw + m->gappx/2, m->wy + oty, tw - (2*c->bw) - m->gappx*3/2, h - 2*c->bw - m->gappx, 0);
|
|
||||||
+ oty += HEIGHT(c) + m->gappx;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+centeredfloatingmaster(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ /* count number of clients in the selected monitor */
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+ if(n == 1){
|
|
||||||
+ c = nexttiled(m->clients);
|
|
||||||
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* initialize nmaster area */
|
|
||||||
+ if (n > m->nmaster) {
|
|
||||||
+ /* go mfact box in the center if more than nmaster clients */
|
|
||||||
+ if (m->ww > m->wh) {
|
|
||||||
+ mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
||||||
+ mh = m->nmaster ? m->wh * 0.9 : 0;
|
|
||||||
+ } else {
|
|
||||||
+ mh = m->nmaster ? m->wh * m->mfact : 0;
|
|
||||||
+ mw = m->nmaster ? m->ww * 0.9 : 0;
|
|
||||||
+ }
|
|
||||||
+ mx = mxo = (m->ww - mw + m->gappx) / 2;
|
|
||||||
+ my = myo = (m->wh - mh) / 2;
|
|
||||||
+ } else {
|
|
||||||
+ /* go fullscreen if all clients are in the master area */
|
|
||||||
+ mh = m->wh;
|
|
||||||
+ mw = m->ww;
|
|
||||||
+ mx = m->gappx;
|
|
||||||
+ mxo = 0;
|
|
||||||
+ my = myo = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ tx = m->gappx;
|
|
||||||
+ for(i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ /* nmaster clients are stacked horizontally, in the center
|
|
||||||
+ * of the screen */
|
|
||||||
+ w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i) + m->gappx;
|
|
||||||
+ resize(c, m->wx + mx, m->wy + my + m->gappx, w - 2*(c->bw + m->gappx),
|
|
||||||
+ mh - 2*(c->bw + m->gappx), 0);
|
|
||||||
+ mx += WIDTH(c) + m->gappx;
|
|
||||||
+ } else {
|
|
||||||
+ /* stack clients are stacked horizontally */
|
|
||||||
+ w = (m->ww - tx) / (n - i) + m->gappx;
|
|
||||||
+ resize(c, m->wx + tx, m->wy + m->gappx, w - 2*(c->bw + m->gappx),
|
|
||||||
+ m->wh - 2*(c->bw + m->gappx), 0);
|
|
||||||
+ tx += WIDTH(c) + m->gappx;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
|
|
|
@ -1,126 +0,0 @@
|
||||||
diff -up a/config.h b/config.h
|
|
||||||
--- a/config.h 2019-07-21 22:43:04.535873031 +0200
|
|
||||||
+++ b/config.h 2019-07-24 08:48:08.038433535 +0200
|
|
||||||
@@ -2,6 +2,7 @@
|
|
||||||
|
|
||||||
/* appearance */
|
|
||||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
|
||||||
+static const unsigned int gappx = 5; /* gaps between windows */
|
|
||||||
static const unsigned int snap = 32; /* snap pixel */
|
|
||||||
static const int showbar = 1; /* 0 means no bar */
|
|
||||||
static const int topbar = 0; /* 0 means bottom bar */
|
|
||||||
@@ -84,6 +85,9 @@ static Key keys[] = {
|
|
||||||
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
|
||||||
+ { MODKEY, XK_minus, setgaps, {.i = -5 } },
|
|
||||||
+ { MODKEY, XK_equal, setgaps, {.i = +5 } },
|
|
||||||
+ { MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } },
|
|
||||||
TAGKEYS( XK_1, 0)
|
|
||||||
TAGKEYS( XK_2, 1)
|
|
||||||
TAGKEYS( XK_3, 2)
|
|
||||||
diff -up a/dwm.c b/dwm.c
|
|
||||||
--- a/dwm.c 2019-07-21 22:43:04.535873031 +0200
|
|
||||||
+++ b/dwm.c 2019-07-24 08:50:44.989360476 +0200
|
|
||||||
@@ -119,6 +119,7 @@ struct Monitor {
|
|
||||||
int by; /* bar geometry */
|
|
||||||
int mx, my, mw, mh; /* screen size */
|
|
||||||
int wx, wy, ww, wh; /* window area */
|
|
||||||
+ int gappx; /* gaps between windows */
|
|
||||||
unsigned int seltags;
|
|
||||||
unsigned int sellt;
|
|
||||||
unsigned int tagset[2];
|
|
||||||
@@ -199,6 +200,7 @@ static void sendmon(Client *c, Monitor *
|
|
||||||
static void setclientstate(Client *c, long state);
|
|
||||||
static void setfocus(Client *c);
|
|
||||||
static void setfullscreen(Client *c, int fullscreen);
|
|
||||||
+static void setgaps(const Arg *arg);
|
|
||||||
static void setlayout(const Arg *arg);
|
|
||||||
static void setmfact(const Arg *arg);
|
|
||||||
static void setup(void);
|
|
||||||
@@ -638,6 +640,7 @@ createmon(void)
|
|
||||||
m->nmaster = nmaster;
|
|
||||||
m->showbar = showbar;
|
|
||||||
m->topbar = topbar;
|
|
||||||
+ m->gappx = gappx;
|
|
||||||
m->lt[0] = &layouts[0];
|
|
||||||
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
|
||||||
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
|
||||||
@@ -1282,6 +1285,13 @@ resizeclient(Client *c, int x, int y, in
|
|
||||||
c->oldw = c->w; c->w = wc.width = w;
|
|
||||||
c->oldh = c->h; c->h = wc.height = h;
|
|
||||||
wc.border_width = c->bw;
|
|
||||||
+ if (((nexttiled(c->mon->clients) == c && !nexttiled(c->next))
|
|
||||||
+ || &monocle == c->mon->lt[c->mon->sellt]->arrange))
|
|
||||||
+ {
|
|
||||||
+ c->w = wc.width += c->bw * 2;
|
|
||||||
+ c->h = wc.height += c->bw * 2;
|
|
||||||
+ wc.border_width = 0;
|
|
||||||
+ }
|
|
||||||
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
|
|
||||||
configure(c);
|
|
||||||
XSync(dpy, False);
|
|
||||||
@@ -1498,6 +1508,16 @@ setfullscreen(Client *c, int fullscreen)
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
+setgaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ if ((arg->i == 0) || (selmon->gappx + arg->i < 0))
|
|
||||||
+ selmon->gappx = 0;
|
|
||||||
+ else
|
|
||||||
+ selmon->gappx += arg->i;
|
|
||||||
+ arrange(selmon);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
setlayout(const Arg *arg)
|
|
||||||
{
|
|
||||||
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
|
|
||||||
@@ -1673,26 +1693,35 @@ tagmon(const Arg *arg)
|
|
||||||
void
|
|
||||||
tile(Monitor *m)
|
|
||||||
{
|
|
||||||
- unsigned int i, n, h, mw, my, ty;
|
|
||||||
+ unsigned int i, n, h, mw, my, ty, ns;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
+ if(n == 1){
|
|
||||||
+ c = nexttiled(m->clients);
|
|
||||||
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- if (n > m->nmaster)
|
|
||||||
+ if (n > m->nmaster){
|
|
||||||
mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
||||||
- else
|
|
||||||
- mw = m->ww;
|
|
||||||
- for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ ns = m->nmaster > 0 ? 2 : 1;
|
|
||||||
+ }
|
|
||||||
+ else{
|
|
||||||
+ mw = m->ww - m->gappx;
|
|
||||||
+ ns = 1;
|
|
||||||
+ }
|
|
||||||
+ for (i = 0, my = ty = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
- h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
|
||||||
- resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
|
|
||||||
- my += HEIGHT(c);
|
|
||||||
+ h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx;
|
|
||||||
+ resize(c, m->wx + m->gappx, m->wy + my, mw - 2*c->bw - m->gappx*(5-ns)/2, h - 2*c->bw, 0);
|
|
||||||
+ my += HEIGHT(c) + m->gappx;
|
|
||||||
} else {
|
|
||||||
- h = (m->wh - ty) / (n - i);
|
|
||||||
- resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
|
|
||||||
- ty += HEIGHT(c);
|
|
||||||
+ h = (m->wh - ty) / (n - i) - m->gappx;
|
|
||||||
+ resize(c, m->wx + mw + m->gappx/ns, m->wy + ty, m->ww - mw - (2*c->bw) - m->gappx*(5-ns)/2, h - 2*c->bw, 0);
|
|
||||||
+ ty += HEIGHT(c) + m->gappx;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
/* cc transient.c -o transient -lX11 */
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xutil.h>
|
|
||||||
|
|
||||||
int main(void) {
|
|
||||||
Display *d;
|
|
||||||
Window r, f, t = None;
|
|
||||||
XSizeHints h;
|
|
||||||
XEvent e;
|
|
||||||
|
|
||||||
d = XOpenDisplay(NULL);
|
|
||||||
if (!d)
|
|
||||||
exit(1);
|
|
||||||
r = DefaultRootWindow(d);
|
|
||||||
|
|
||||||
f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0);
|
|
||||||
h.min_width = h.max_width = h.min_height = h.max_height = 400;
|
|
||||||
h.flags = PMinSize | PMaxSize;
|
|
||||||
XSetWMNormalHints(d, f, &h);
|
|
||||||
XStoreName(d, f, "floating");
|
|
||||||
XMapWindow(d, f);
|
|
||||||
|
|
||||||
XSelectInput(d, f, ExposureMask);
|
|
||||||
while (1) {
|
|
||||||
XNextEvent(d, &e);
|
|
||||||
|
|
||||||
if (t == None) {
|
|
||||||
sleep(5);
|
|
||||||
t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0);
|
|
||||||
XSetTransientForHint(d, t, f);
|
|
||||||
XStoreName(d, t, "transient");
|
|
||||||
XMapWindow(d, t);
|
|
||||||
XSelectInput(d, t, ExposureMask);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
XCloseDisplay(d);
|
|
||||||
exit(0);
|
|
||||||
}
|
|
|
@ -1,35 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
void *
|
|
||||||
ecalloc(size_t nmemb, size_t size)
|
|
||||||
{
|
|
||||||
void *p;
|
|
||||||
|
|
||||||
if (!(p = calloc(nmemb, size)))
|
|
||||||
die("calloc:");
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
die(const char *fmt, ...) {
|
|
||||||
va_list ap;
|
|
||||||
|
|
||||||
va_start(ap, fmt);
|
|
||||||
vfprintf(stderr, fmt, ap);
|
|
||||||
va_end(ap);
|
|
||||||
|
|
||||||
if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
|
|
||||||
fputc(' ', stderr);
|
|
||||||
perror(NULL);
|
|
||||||
} else {
|
|
||||||
fputc('\n', stderr);
|
|
||||||
}
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
}
|
|
|
@ -1,8 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
#define MAX(A, B) ((A) > (B) ? (A) : (B))
|
|
||||||
#define MIN(A, B) ((A) < (B) ? (A) : (B))
|
|
||||||
#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
|
|
||||||
|
|
||||||
void die(const char *fmt, ...);
|
|
||||||
void *ecalloc(size_t nmemb, size_t size);
|
|
|
@ -1,7 +0,0 @@
|
||||||
ISC License (ISC)
|
|
||||||
|
|
||||||
Copyright 2020 torrinfail
|
|
||||||
|
|
||||||
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
@ -1,17 +0,0 @@
|
||||||
PREFIX ?= /usr/local
|
|
||||||
CC ?= cc
|
|
||||||
LDFLAGS = -lX11
|
|
||||||
|
|
||||||
output: dwmblocks.c blocks.h
|
|
||||||
${CC} dwmblocks.c $(LDFLAGS) -o dwmblocks
|
|
||||||
blocks.h:
|
|
||||||
cp blocks.h $@
|
|
||||||
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o *.gch dwmblocks
|
|
||||||
install: output
|
|
||||||
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
|
||||||
install -m 0755 dwmblocks $(DESTDIR)$(PREFIX)/bin/dwmblocks
|
|
||||||
uninstall:
|
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/dwmblocks
|
|
|
@ -1,15 +0,0 @@
|
||||||
# dwmblocks
|
|
||||||
Modular status bar for dwm written in c.
|
|
||||||
# usage
|
|
||||||
To use dwmblocks first run 'make' and then install it with 'sudo make install'.
|
|
||||||
After that you can put dwmblocks in your xinitrc or other startup script to have it start with dwm.
|
|
||||||
# modifying blocks
|
|
||||||
The statusbar is made from text output from commandline programs.
|
|
||||||
Blocks are added and removed by editing the blocks.h header file.
|
|
||||||
By default the blocks.h header file is created the first time you run make which copies the default config from blocks.def.h.
|
|
||||||
This is so you can edit your status bar commands and they will not get overwritten in a future update.
|
|
||||||
# patches
|
|
||||||
Here are some patches to dwmblocks that add features that I either don't want to merge in, or that require a dwm patch to work.
|
|
||||||
I do not maintain these but I will take pull requests to update them.
|
|
||||||
<br>
|
|
||||||
<a href=https://gist.github.com/IGeraGera/e4a5583b91b3eec2e81fdceb44dea717>dwmblocks-statuscmd-b6b0be4.diff</a>
|
|
|
@ -1,6 +0,0 @@
|
||||||
typedef struct {
|
|
||||||
char* icon;
|
|
||||||
char* command;
|
|
||||||
unsigned int interval;
|
|
||||||
unsigned int signal;
|
|
||||||
} Block;
|
|
|
@ -1,21 +0,0 @@
|
||||||
#include "block.h"
|
|
||||||
|
|
||||||
static const Block blocks[] = {
|
|
||||||
/*
|
|
||||||
* Icon
|
|
||||||
* Command
|
|
||||||
* Update interval
|
|
||||||
* Update signal
|
|
||||||
*/
|
|
||||||
{"", "sb-date", 60, 0}, // Week, time, day
|
|
||||||
{"", "sb-pomo", 1, 0}, // Pomodoro timer
|
|
||||||
{"", "sb-tasks", 5, 0}, // Tasks done
|
|
||||||
{"", "sb-anki", 5, 0}, // Reviews done
|
|
||||||
{"", "sb-internet", 5, 0}, // Ethernet & WiFi status
|
|
||||||
{"", "sb-portfolio", 600, 0}, // Stocks
|
|
||||||
{"", "sb-battery", 60, 0}, // Battery level
|
|
||||||
};
|
|
||||||
|
|
||||||
//sets delimeter between status commands. NULL character ('\0') means no delimeter.
|
|
||||||
static char delim[] = " ";
|
|
||||||
static unsigned int delimLen = 0;
|
|
|
@ -1,214 +0,0 @@
|
||||||
#include<stdlib.h>
|
|
||||||
#include<stdio.h>
|
|
||||||
#include<string.h>
|
|
||||||
#include<unistd.h>
|
|
||||||
#include<signal.h>
|
|
||||||
#ifndef NO_X
|
|
||||||
#include<X11/Xlib.h>
|
|
||||||
#endif
|
|
||||||
#ifdef __OpenBSD__
|
|
||||||
#define SIGPLUS SIGUSR1+1
|
|
||||||
#define SIGMINUS SIGUSR1-1
|
|
||||||
#else
|
|
||||||
#define SIGPLUS SIGRTMIN
|
|
||||||
#define SIGMINUS SIGRTMIN
|
|
||||||
#endif
|
|
||||||
#define LENGTH(X) (sizeof(X) / sizeof (X[0]))
|
|
||||||
#define CMDLENGTH 50
|
|
||||||
#define MIN( a, b ) ( ( a < b) ? a : b )
|
|
||||||
#define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
|
|
||||||
|
|
||||||
#ifndef __OpenBSD__
|
|
||||||
void dummysighandler(int num);
|
|
||||||
#endif
|
|
||||||
void sighandler(int num);
|
|
||||||
void getcmds(int time);
|
|
||||||
void getsigcmds(unsigned int signal);
|
|
||||||
void setupsignals();
|
|
||||||
void sighandler(int signum);
|
|
||||||
int getstatus(char *str, char *last);
|
|
||||||
void statusloop();
|
|
||||||
void termhandler();
|
|
||||||
void pstdout();
|
|
||||||
#ifndef NO_X
|
|
||||||
void setroot();
|
|
||||||
static void (*writestatus) () = setroot;
|
|
||||||
static int setupX();
|
|
||||||
static Display *dpy;
|
|
||||||
static int screen;
|
|
||||||
static Window root;
|
|
||||||
#else
|
|
||||||
static void (*writestatus) () = pstdout;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "blocks.h"
|
|
||||||
|
|
||||||
static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
|
|
||||||
static char statusstr[2][STATUSLENGTH];
|
|
||||||
static int statusContinue = 1;
|
|
||||||
static int returnStatus = 0;
|
|
||||||
|
|
||||||
//opens process *cmd and stores output in *output
|
|
||||||
void getcmd(const Block *block, char *output)
|
|
||||||
{
|
|
||||||
strcpy(output, block->icon);
|
|
||||||
FILE *cmdf = popen(block->command, "r");
|
|
||||||
if (!cmdf)
|
|
||||||
return;
|
|
||||||
int i = strlen(block->icon);
|
|
||||||
fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
|
|
||||||
i = strlen(output);
|
|
||||||
if (i == 0) {
|
|
||||||
//return if block and command output are both empty
|
|
||||||
pclose(cmdf);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Temporary workaround, I guess newlines caused replacement characters to be
|
|
||||||
* displayed. Removing this check and newlines from statusbar scripts does
|
|
||||||
* the trick for now. Might patch later.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* if (delim[0] != '\0') {
|
|
||||||
* //only chop off newline if one is present at the end
|
|
||||||
* i = output[i-1] == '\n' ? i-1 : i;
|
|
||||||
* strncpy(output+i, delim, delimLen);
|
|
||||||
* } */
|
|
||||||
|
|
||||||
else
|
|
||||||
output[i++] = '\0';
|
|
||||||
pclose(cmdf);
|
|
||||||
}
|
|
||||||
|
|
||||||
void getcmds(int time)
|
|
||||||
{
|
|
||||||
const Block* current;
|
|
||||||
for (unsigned int i = 0; i < LENGTH(blocks); i++) {
|
|
||||||
current = blocks + i;
|
|
||||||
if ((current->interval != 0 && time % current->interval == 0) || time == -1)
|
|
||||||
getcmd(current,statusbar[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void getsigcmds(unsigned int signal)
|
|
||||||
{
|
|
||||||
const Block *current;
|
|
||||||
for (unsigned int i = 0; i < LENGTH(blocks); i++) {
|
|
||||||
current = blocks + i;
|
|
||||||
if (current->signal == signal)
|
|
||||||
getcmd(current,statusbar[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setupsignals()
|
|
||||||
{
|
|
||||||
#ifndef __OpenBSD__
|
|
||||||
/* initialize all real time signals with dummy handler */
|
|
||||||
for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
|
|
||||||
signal(i, dummysighandler);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (unsigned int i = 0; i < LENGTH(blocks); i++) {
|
|
||||||
if (blocks[i].signal > 0)
|
|
||||||
signal(SIGMINUS+blocks[i].signal, sighandler);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int getstatus(char *str, char *last)
|
|
||||||
{
|
|
||||||
strcpy(last, str);
|
|
||||||
str[0] = '\0';
|
|
||||||
for (unsigned int i = 0; i < LENGTH(blocks); i++)
|
|
||||||
strcat(str, statusbar[i]);
|
|
||||||
str[strlen(str)-strlen(delim)] = '\0';
|
|
||||||
return strcmp(str, last);//0 if they are the same
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef NO_X
|
|
||||||
void setroot()
|
|
||||||
{
|
|
||||||
if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
|
|
||||||
return;
|
|
||||||
XStoreName(dpy, root, statusstr[0]);
|
|
||||||
XFlush(dpy);
|
|
||||||
}
|
|
||||||
|
|
||||||
int setupX()
|
|
||||||
{
|
|
||||||
dpy = XOpenDisplay(NULL);
|
|
||||||
if (!dpy) {
|
|
||||||
fprintf(stderr, "dwmblocks: Failed to open display\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
screen = DefaultScreen(dpy);
|
|
||||||
root = RootWindow(dpy, screen);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void pstdout()
|
|
||||||
{
|
|
||||||
if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed.
|
|
||||||
return;
|
|
||||||
printf("%s\n",statusstr[0]);
|
|
||||||
fflush(stdout);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void statusloop()
|
|
||||||
{
|
|
||||||
setupsignals();
|
|
||||||
int i = 0;
|
|
||||||
getcmds(-1);
|
|
||||||
while (1) {
|
|
||||||
getcmds(i++);
|
|
||||||
writestatus();
|
|
||||||
if (!statusContinue)
|
|
||||||
break;
|
|
||||||
sleep(1.0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef __OpenBSD__
|
|
||||||
/* this signal handler should do nothing */
|
|
||||||
void dummysighandler(int signum)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void sighandler(int signum)
|
|
||||||
{
|
|
||||||
getsigcmds(signum-SIGPLUS);
|
|
||||||
writestatus();
|
|
||||||
}
|
|
||||||
|
|
||||||
void termhandler()
|
|
||||||
{
|
|
||||||
statusContinue = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
|
||||||
{
|
|
||||||
for (int i = 0; i < argc; i++) {//Handle command line arguments
|
|
||||||
if (!strcmp("-d",argv[i]))
|
|
||||||
strncpy(delim, argv[++i], delimLen);
|
|
||||||
else if (!strcmp("-p",argv[i]))
|
|
||||||
writestatus = pstdout;
|
|
||||||
}
|
|
||||||
#ifndef NO_X
|
|
||||||
if (!setupX())
|
|
||||||
return 1;
|
|
||||||
#endif
|
|
||||||
delimLen = MIN(delimLen, strlen(delim));
|
|
||||||
delim[delimLen++] = '\0';
|
|
||||||
signal(SIGTERM, termhandler);
|
|
||||||
signal(SIGINT, termhandler);
|
|
||||||
statusloop();
|
|
||||||
#ifndef NO_X
|
|
||||||
XCloseDisplay(dpy);
|
|
||||||
#endif
|
|
||||||
return 0;
|
|
||||||
}
|
|
250
.suckless/st/FAQ
250
.suckless/st/FAQ
|
@ -1,250 +0,0 @@
|
||||||
## Why does st not handle utmp entries?
|
|
||||||
|
|
||||||
Use the excellent tool of [utmp](https://git.suckless.org/utmp/) for this task.
|
|
||||||
|
|
||||||
|
|
||||||
## Some _random program_ complains that st is unknown/not recognised/unsupported/whatever!
|
|
||||||
|
|
||||||
It means that st doesn’t have any terminfo entry on your system. Chances are
|
|
||||||
you did not `make install`. If you just want to test it without installing it,
|
|
||||||
you can manually run `tic -sx st.info`.
|
|
||||||
|
|
||||||
|
|
||||||
## Nothing works, and nothing is said about an unknown terminal!
|
|
||||||
|
|
||||||
* Some programs just assume they’re running in xterm i.e. they don’t rely on
|
|
||||||
terminfo. What you see is the current state of the “xterm compliance”.
|
|
||||||
* Some programs don’t complain about the lacking st description and default to
|
|
||||||
another terminal. In that case see the question about terminfo.
|
|
||||||
|
|
||||||
|
|
||||||
## How do I scroll back up?
|
|
||||||
|
|
||||||
* Using a terminal multiplexer.
|
|
||||||
* `st -e tmux` using C-b [
|
|
||||||
* `st -e screen` using C-a ESC
|
|
||||||
* Using the excellent tool of [scroll](https://git.suckless.org/scroll/).
|
|
||||||
* Using the scrollback [patch](https://st.suckless.org/patches/scrollback/).
|
|
||||||
|
|
||||||
|
|
||||||
## I would like to have utmp and/or scroll functionality by default
|
|
||||||
|
|
||||||
You can add the absolute patch of both programs in your config.h
|
|
||||||
file. You only have to modify the value of utmp and scroll variables.
|
|
||||||
|
|
||||||
|
|
||||||
## Why doesn't the Del key work in some programs?
|
|
||||||
|
|
||||||
Taken from the terminfo manpage:
|
|
||||||
|
|
||||||
If the terminal has a keypad that transmits codes when the keys
|
|
||||||
are pressed, this information can be given. Note that it is not
|
|
||||||
possible to handle terminals where the keypad only works in
|
|
||||||
local (this applies, for example, to the unshifted HP 2621 keys).
|
|
||||||
If the keypad can be set to transmit or not transmit, give these
|
|
||||||
codes as smkx and rmkx. Otherwise the keypad is assumed to
|
|
||||||
always transmit.
|
|
||||||
|
|
||||||
In the st case smkx=E[?1hE= and rmkx=E[?1lE>, so it is mandatory that
|
|
||||||
applications which want to test against keypad keys send these
|
|
||||||
sequences.
|
|
||||||
|
|
||||||
But buggy applications (like bash and irssi, for example) don't do this. A fast
|
|
||||||
solution for them is to use the following command:
|
|
||||||
|
|
||||||
$ printf '\033[?1h\033=' >/dev/tty
|
|
||||||
|
|
||||||
or
|
|
||||||
$ tput smkx
|
|
||||||
|
|
||||||
In the case of bash, readline is used. Readline has a different note in its
|
|
||||||
manpage about this issue:
|
|
||||||
|
|
||||||
enable-keypad (Off)
|
|
||||||
When set to On, readline will try to enable the
|
|
||||||
application keypad when it is called. Some systems
|
|
||||||
need this to enable arrow keys.
|
|
||||||
|
|
||||||
Adding this option to your .inputrc will fix the keypad problem for all
|
|
||||||
applications using readline.
|
|
||||||
|
|
||||||
If you are using zsh, then read the zsh FAQ
|
|
||||||
<http://zsh.sourceforge.net/FAQ/zshfaq03.html#l25>:
|
|
||||||
|
|
||||||
It should be noted that the O / [ confusion can occur with other keys
|
|
||||||
such as Home and End. Some systems let you query the key sequences
|
|
||||||
sent by these keys from the system's terminal database, terminfo.
|
|
||||||
Unfortunately, the key sequences given there typically apply to the
|
|
||||||
mode that is not the one zsh uses by default (it's the "application"
|
|
||||||
mode rather than the "raw" mode). Explaining the use of terminfo is
|
|
||||||
outside of the scope of this FAQ, but if you wish to use the key
|
|
||||||
sequences given there you can tell the line editor to turn on
|
|
||||||
"application" mode when it starts and turn it off when it stops:
|
|
||||||
|
|
||||||
function zle-line-init () { echoti smkx }
|
|
||||||
function zle-line-finish () { echoti rmkx }
|
|
||||||
zle -N zle-line-init
|
|
||||||
zle -N zle-line-finish
|
|
||||||
|
|
||||||
Putting these lines into your .zshrc will fix the problems.
|
|
||||||
|
|
||||||
|
|
||||||
## How can I use meta in 8bit mode?
|
|
||||||
|
|
||||||
St supports meta in 8bit mode, but the default terminfo entry doesn't
|
|
||||||
use this capability. If you want it, you have to use the 'st-meta' value
|
|
||||||
in TERM.
|
|
||||||
|
|
||||||
|
|
||||||
## I cannot compile st in OpenBSD
|
|
||||||
|
|
||||||
OpenBSD lacks librt, despite it being mandatory in POSIX
|
|
||||||
<http://pubs.opengroup.org/onlinepubs/9699919799/utilities/c99.html#tag_20_11_13>.
|
|
||||||
If you want to compile st for OpenBSD you have to remove -lrt from config.mk, and
|
|
||||||
st will compile without any loss of functionality, because all the functions are
|
|
||||||
included in libc on this platform.
|
|
||||||
|
|
||||||
|
|
||||||
## The Backspace Case
|
|
||||||
|
|
||||||
St is emulating the Linux way of handling backspace being delete and delete being
|
|
||||||
backspace.
|
|
||||||
|
|
||||||
This is an issue that was discussed in suckless mailing list
|
|
||||||
<https://lists.suckless.org/dev/1404/20697.html>. Here is why some old grumpy
|
|
||||||
terminal users wants its backspace to be how he feels it:
|
|
||||||
|
|
||||||
Well, I am going to comment why I want to change the behaviour
|
|
||||||
of this key. When ASCII was defined in 1968, communication
|
|
||||||
with computers was done using punched cards, or hardcopy
|
|
||||||
terminals (basically a typewriter machine connected with the
|
|
||||||
computer using a serial port). ASCII defines DELETE as 7F,
|
|
||||||
because, in punched-card terms, it means all the holes of the
|
|
||||||
card punched; it is thus a kind of 'physical delete'. In the
|
|
||||||
same way, the BACKSPACE key was a non-destructive backspace,
|
|
||||||
as on a typewriter. So, if you wanted to delete a character,
|
|
||||||
you had to BACKSPACE and then DELETE. Another use of BACKSPACE
|
|
||||||
was to type accented characters, for example 'a BACKSPACE `'.
|
|
||||||
The VT100 had no BACKSPACE key; it was generated using the
|
|
||||||
CONTROL key as another control character (CONTROL key sets to
|
|
||||||
0 b7 b6 b5, so it converts H (code 0x48) into BACKSPACE (code
|
|
||||||
0x08)), but it had a DELETE key in a similar position where
|
|
||||||
the BACKSPACE key is located today on common PC keyboards.
|
|
||||||
All the terminal emulators emulated the difference between
|
|
||||||
these keys correctly: the backspace key generated a BACKSPACE
|
|
||||||
(^H) and delete key generated a DELETE (^?).
|
|
||||||
|
|
||||||
But a problem arose when Linus Torvalds wrote Linux. Unlike
|
|
||||||
earlier terminals, the Linux virtual terminal (the terminal
|
|
||||||
emulator integrated in the kernel) returned a DELETE when
|
|
||||||
backspace was pressed, due to the VT100 having a DELETE key in
|
|
||||||
the same position. This created a lot of problems (see [1]
|
|
||||||
and [2]). Since Linux has become the king, a lot of terminal
|
|
||||||
emulators today generate a DELETE when the backspace key is
|
|
||||||
pressed in order to avoid problems with Linux. The result is
|
|
||||||
that the only way of generating a BACKSPACE on these systems
|
|
||||||
is by using CONTROL + H. (I also think that emacs had an
|
|
||||||
important point here because the CONTROL + H prefix is used
|
|
||||||
in emacs in some commands (help commands).)
|
|
||||||
|
|
||||||
From point of view of the kernel, you can change the key
|
|
||||||
for deleting a previous character with stty erase. When you
|
|
||||||
connect a real terminal into a machine you describe the type
|
|
||||||
of terminal, so getty configures the correct value of stty
|
|
||||||
erase for this terminal. In the case of terminal emulators,
|
|
||||||
however, you don't have any getty that can set the correct
|
|
||||||
value of stty erase, so you always get the default value.
|
|
||||||
For this reason, it is necessary to add 'stty erase ^H' to your
|
|
||||||
profile if you have changed the value of the backspace key.
|
|
||||||
Of course, another solution is for st itself to modify the
|
|
||||||
value of stty erase. I usually have the inverse problem:
|
|
||||||
when I connect to non-Unix machines, I have to press CONTROL +
|
|
||||||
h to get a BACKSPACE. The inverse problem occurs when a user
|
|
||||||
connects to my Unix machines from a different system with a
|
|
||||||
correct backspace key.
|
|
||||||
|
|
||||||
[1] http://www.ibb.net/~anne/keyboard.html
|
|
||||||
[2] http://www.tldp.org/HOWTO/Keyboard-and-Console-HOWTO-5.html
|
|
||||||
|
|
||||||
|
|
||||||
## But I really want the old grumpy behaviour of my terminal
|
|
||||||
|
|
||||||
Apply [1].
|
|
||||||
|
|
||||||
[1] https://st.suckless.org/patches/delkey
|
|
||||||
|
|
||||||
|
|
||||||
## Why do images not work in st using the w3m image hack?
|
|
||||||
|
|
||||||
w3mimg uses a hack that draws an image on top of the terminal emulator Drawable
|
|
||||||
window. The hack relies on the terminal to use a single buffer to draw its
|
|
||||||
contents directly.
|
|
||||||
|
|
||||||
st uses double-buffered drawing so the image is quickly replaced and may show a
|
|
||||||
short flicker effect.
|
|
||||||
|
|
||||||
Below is a patch example to change st double-buffering to a single Drawable
|
|
||||||
buffer.
|
|
||||||
|
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
--- a/x.c
|
|
||||||
+++ b/x.c
|
|
||||||
@@ -732,10 +732,6 @@ xresize(int col, int row)
|
|
||||||
win.tw = col * win.cw;
|
|
||||||
win.th = row * win.ch;
|
|
||||||
|
|
||||||
- XFreePixmap(xw.dpy, xw.buf);
|
|
||||||
- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
||||||
- DefaultDepth(xw.dpy, xw.scr));
|
|
||||||
- XftDrawChange(xw.draw, xw.buf);
|
|
||||||
xclear(0, 0, win.w, win.h);
|
|
||||||
|
|
||||||
/* resize to new width */
|
|
||||||
@@ -1148,8 +1144,7 @@ xinit(int cols, int rows)
|
|
||||||
gcvalues.graphics_exposures = False;
|
|
||||||
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
|
||||||
&gcvalues);
|
|
||||||
- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
||||||
- DefaultDepth(xw.dpy, xw.scr));
|
|
||||||
+ xw.buf = xw.win;
|
|
||||||
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
|
||||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
|
||||||
|
|
||||||
@@ -1632,8 +1627,6 @@ xdrawline(Line line, int x1, int y1, int x2)
|
|
||||||
void
|
|
||||||
xfinishdraw(void)
|
|
||||||
{
|
|
||||||
- XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
|
|
||||||
- win.h, 0, 0);
|
|
||||||
XSetForeground(xw.dpy, dc.gc,
|
|
||||||
dc.col[IS_SET(MODE_REVERSE)?
|
|
||||||
defaultfg : defaultbg].pixel);
|
|
||||||
|
|
||||||
|
|
||||||
## BadLength X error in Xft when trying to render emoji
|
|
||||||
|
|
||||||
Xft makes st crash when rendering color emojis with the following error:
|
|
||||||
|
|
||||||
"X Error of failed request: BadLength (poly request too large or internal Xlib length error)"
|
|
||||||
Major opcode of failed request: 139 (RENDER)
|
|
||||||
Minor opcode of failed request: 20 (RenderAddGlyphs)
|
|
||||||
Serial number of failed request: 1595
|
|
||||||
Current serial number in output stream: 1818"
|
|
||||||
|
|
||||||
This is a known bug in Xft (not st) which happens on some platforms and
|
|
||||||
combination of particular fonts and fontconfig settings.
|
|
||||||
|
|
||||||
See also:
|
|
||||||
https://gitlab.freedesktop.org/xorg/lib/libxft/issues/6
|
|
||||||
https://bugs.freedesktop.org/show_bug.cgi?id=107534
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=1498269
|
|
||||||
|
|
||||||
The solution is to remove color emoji fonts or disable this in the fontconfig
|
|
||||||
XML configuration. As an ugly workaround (which may work only on newer
|
|
||||||
fontconfig versions (FC_COLOR)), the following code can be used to mask color
|
|
||||||
fonts:
|
|
||||||
|
|
||||||
FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
|
|
||||||
|
|
||||||
Please don't bother reporting this bug to st, but notify the upstream Xft
|
|
||||||
developers about fixing this bug.
|
|
|
@ -1,17 +0,0 @@
|
||||||
A STATEMENT ON LEGACY SUPPORT
|
|
||||||
|
|
||||||
In the terminal world there is much cruft that comes from old and unsup‐
|
|
||||||
ported terminals that inherit incompatible modes and escape sequences
|
|
||||||
which noone is able to know, except when he/she comes from that time and
|
|
||||||
developed a graphical vt100 emulator at that time.
|
|
||||||
|
|
||||||
One goal of st is to only support what is really needed. When you en‐
|
|
||||||
counter a sequence which you really need, implement it. But while you
|
|
||||||
are at it, do not add the other cruft you might encounter while sneek‐
|
|
||||||
ing at other terminal emulators. History has bloated them and there is
|
|
||||||
no real evidence that most of the sequences are used today.
|
|
||||||
|
|
||||||
|
|
||||||
Christoph Lohmann <20h@r-36.net>
|
|
||||||
2012-09-13T07:00:36.081271045+02:00
|
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
MIT/X Consortium License
|
|
||||||
|
|
||||||
© 2014-2020 Hiltjo Posthuma <hiltjo at codemadness dot org>
|
|
||||||
© 2018 Devin J. Pohly <djpohly at gmail dot com>
|
|
||||||
© 2014-2017 Quentin Rameau <quinq at fifth dot space>
|
|
||||||
© 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com>
|
|
||||||
© 2008-2017 Anselm R Garbe <garbeam at gmail dot com>
|
|
||||||
© 2012-2017 Roberto E. Vargas Caballero <k0ga at shike2 dot com>
|
|
||||||
© 2012-2016 Christoph Lohmann <20h at r-36 dot net>
|
|
||||||
© 2013 Eon S. Jeon <esjeon at hyunmu dot am>
|
|
||||||
© 2013 Alexander Sedov <alex0player at gmail dot com>
|
|
||||||
© 2013 Mark Edgar <medgar123 at gmail dot com>
|
|
||||||
© 2013-2014 Eric Pruitt <eric.pruitt at gmail dot com>
|
|
||||||
© 2013 Michael Forney <mforney at mforney dot org>
|
|
||||||
© 2013-2014 Markus Teich <markus dot teich at stusta dot mhn dot de>
|
|
||||||
© 2014-2015 Laslo Hunhold <dev at frign dot de>
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
copy of this software and associated documentation files (the "Software"),
|
|
||||||
to deal in the Software without restriction, including without limitation
|
|
||||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
||||||
and/or sell copies of the Software, and to permit persons to whom the
|
|
||||||
Software is furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
||||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
DEALINGS IN THE SOFTWARE.
|
|
|
@ -1,58 +0,0 @@
|
||||||
# st - simple terminal
|
|
||||||
# See LICENSE file for copyright and license details.
|
|
||||||
.POSIX:
|
|
||||||
|
|
||||||
include config.mk
|
|
||||||
|
|
||||||
SRC = st.c x.c hb.c
|
|
||||||
OBJ = $(SRC:.c=.o)
|
|
||||||
|
|
||||||
all: options st
|
|
||||||
|
|
||||||
options:
|
|
||||||
@echo st build options:
|
|
||||||
@echo "CFLAGS = $(STCFLAGS)"
|
|
||||||
@echo "LDFLAGS = $(STLDFLAGS)"
|
|
||||||
@echo "CC = $(CC)"
|
|
||||||
|
|
||||||
config.h:
|
|
||||||
cp config.def.h config.h
|
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(CC) $(STCFLAGS) -c $<
|
|
||||||
|
|
||||||
st.o: config.h st.h win.h
|
|
||||||
x.o: arg.h config.h st.h win.h hb.h
|
|
||||||
hb.o: st.h
|
|
||||||
|
|
||||||
$(OBJ): config.h config.mk
|
|
||||||
|
|
||||||
st: $(OBJ)
|
|
||||||
$(CC) -o $@ $(OBJ) $(STLDFLAGS)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f st $(OBJ) st-$(VERSION).tar.gz
|
|
||||||
|
|
||||||
dist: clean
|
|
||||||
mkdir -p st-$(VERSION)
|
|
||||||
cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\
|
|
||||||
config.def.h st.info st.1 arg.h st.h win.h $(SRC)\
|
|
||||||
st-$(VERSION)
|
|
||||||
tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
|
|
||||||
rm -rf st-$(VERSION)
|
|
||||||
|
|
||||||
install: st
|
|
||||||
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
|
||||||
cp -f st $(DESTDIR)$(PREFIX)/bin
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/st
|
|
||||||
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
|
|
||||||
sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
|
|
||||||
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
|
|
||||||
tic -sx st.info
|
|
||||||
@echo Please see the README file regarding the terminfo entry of st.
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/st
|
|
||||||
rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
|
|
||||||
|
|
||||||
.PHONY: all options clean dist install uninstall
|
|
|
@ -1,34 +0,0 @@
|
||||||
st - simple terminal
|
|
||||||
--------------------
|
|
||||||
st is a simple terminal emulator for X which sucks less.
|
|
||||||
|
|
||||||
|
|
||||||
Requirements
|
|
||||||
------------
|
|
||||||
In order to build st you need the Xlib header files.
|
|
||||||
|
|
||||||
|
|
||||||
Installation
|
|
||||||
------------
|
|
||||||
Edit config.mk to match your local setup (st is installed into
|
|
||||||
the /usr/local namespace by default).
|
|
||||||
|
|
||||||
Afterwards enter the following command to build and install st (if
|
|
||||||
necessary as root):
|
|
||||||
|
|
||||||
make clean install
|
|
||||||
|
|
||||||
|
|
||||||
Running st
|
|
||||||
----------
|
|
||||||
If you did not install st with make clean install, you must compile
|
|
||||||
the st terminfo entry with the following command:
|
|
||||||
|
|
||||||
tic -sx st.info
|
|
||||||
|
|
||||||
See the man page for additional details.
|
|
||||||
|
|
||||||
Credits
|
|
||||||
-------
|
|
||||||
Based on Aurélien APTEL <aurelien dot aptel at gmail dot com> bt source code.
|
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
vt emulation
|
|
||||||
------------
|
|
||||||
|
|
||||||
* double-height support
|
|
||||||
|
|
||||||
code & interface
|
|
||||||
----------------
|
|
||||||
|
|
||||||
* add a simple way to do multiplexing
|
|
||||||
|
|
||||||
drawing
|
|
||||||
-------
|
|
||||||
* add diacritics support to xdraws()
|
|
||||||
* switch to a suckless font drawing library
|
|
||||||
* make the font cache simpler
|
|
||||||
* add better support for brightening of the upper colors
|
|
||||||
|
|
||||||
bugs
|
|
||||||
----
|
|
||||||
|
|
||||||
* fix shift up/down (shift selection in emacs)
|
|
||||||
* remove DEC test sequence when appropriate
|
|
||||||
|
|
||||||
misc
|
|
||||||
----
|
|
||||||
|
|
||||||
$ grep -nE 'XXX|TODO' st.c
|
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
/*
|
|
||||||
* Copy me if you can.
|
|
||||||
* by 20h
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ARG_H__
|
|
||||||
#define ARG_H__
|
|
||||||
|
|
||||||
extern char *argv0;
|
|
||||||
|
|
||||||
/* use main(int argc, char *argv[]) */
|
|
||||||
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
|
|
||||||
argv[0] && argv[0][0] == '-'\
|
|
||||||
&& argv[0][1];\
|
|
||||||
argc--, argv++) {\
|
|
||||||
char argc_;\
|
|
||||||
char **argv_;\
|
|
||||||
int brk_;\
|
|
||||||
if (argv[0][1] == '-' && argv[0][2] == '\0') {\
|
|
||||||
argv++;\
|
|
||||||
argc--;\
|
|
||||||
break;\
|
|
||||||
}\
|
|
||||||
int i_;\
|
|
||||||
for (i_ = 1, brk_ = 0, argv_ = argv;\
|
|
||||||
argv[0][i_] && !brk_;\
|
|
||||||
i_++) {\
|
|
||||||
if (argv_ != argv)\
|
|
||||||
break;\
|
|
||||||
argc_ = argv[0][i_];\
|
|
||||||
switch (argc_)
|
|
||||||
|
|
||||||
#define ARGEND }\
|
|
||||||
}
|
|
||||||
|
|
||||||
#define ARGC() argc_
|
|
||||||
|
|
||||||
#define EARGF(x) ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
|
|
||||||
((x), abort(), (char *)0) :\
|
|
||||||
(brk_ = 1, (argv[0][i_+1] != '\0')?\
|
|
||||||
(&argv[0][i_+1]) :\
|
|
||||||
(argc--, argv++, argv[0])))
|
|
||||||
|
|
||||||
#define ARGF() ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
|
|
||||||
(char *)0 :\
|
|
||||||
(brk_ = 1, (argv[0][i_+1] != '\0')?\
|
|
||||||
(&argv[0][i_+1]) :\
|
|
||||||
(argc--, argv++, argv[0])))
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,466 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
static char *font = "Iosevka Term SS08:pixelsize=20:antialias=true:autohint=true";
|
|
||||||
static int borderpx = 0;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* What program is execed by st depends of these precedence rules:
|
|
||||||
* 1: program passed with -e
|
|
||||||
* 2: scroll and/or utmp
|
|
||||||
* 3: SHELL environment variable
|
|
||||||
* 4: value of shell in /etc/passwd
|
|
||||||
* 5: value of shell in config.h
|
|
||||||
*/
|
|
||||||
static char *shell = "/bin/sh";
|
|
||||||
char *utmp = NULL;
|
|
||||||
/* scroll program: to enable use a string like "scroll" */
|
|
||||||
char *scroll = NULL;
|
|
||||||
char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
|
|
||||||
|
|
||||||
/* identification sequence returned in DA and DECID */
|
|
||||||
char *vtiden = "\033[?6c";
|
|
||||||
|
|
||||||
/* Kerning / character bounding-box multipliers */
|
|
||||||
static float cwscale = 1.0;
|
|
||||||
static float chscale = 1.0;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* word delimiter string
|
|
||||||
*
|
|
||||||
* More advanced example: L" `'\"()[]{}"
|
|
||||||
*/
|
|
||||||
wchar_t *worddelimiters = L" ";
|
|
||||||
|
|
||||||
/* selection timeouts (in milliseconds) */
|
|
||||||
static unsigned int doubleclicktimeout = 300;
|
|
||||||
static unsigned int tripleclicktimeout = 600;
|
|
||||||
|
|
||||||
/* alt screens */
|
|
||||||
int allowaltscreen = 1;
|
|
||||||
|
|
||||||
/* allow certain non-interactive (insecure) window operations such as:
|
|
||||||
setting the clipboard text */
|
|
||||||
int allowwindowops = 0;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* draw latency range in ms - from new content/keypress/etc until drawing.
|
|
||||||
* within this range, st draws when content stops arriving (idle). mostly it's
|
|
||||||
* near minlatency, but it waits longer for slow updates to avoid partial draw.
|
|
||||||
* low minlatency will tear/flicker more, as it can "detect" idle too early.
|
|
||||||
*/
|
|
||||||
static double minlatency = 8;
|
|
||||||
static double maxlatency = 33;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* blinking timeout (set to 0 to disable blinking) for the terminal blinking
|
|
||||||
* attribute.
|
|
||||||
*/
|
|
||||||
static unsigned int blinktimeout = 800;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* thickness of underline and bar cursors
|
|
||||||
*/
|
|
||||||
static unsigned int cursorthickness = 2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
|
||||||
* it
|
|
||||||
*/
|
|
||||||
static int bellvolume = 0;
|
|
||||||
|
|
||||||
/* default TERM value */
|
|
||||||
char *termname = "st-256color";
|
|
||||||
|
|
||||||
/*
|
|
||||||
* spaces per tab
|
|
||||||
*
|
|
||||||
* When you are changing this value, don't forget to adapt the »it« value in
|
|
||||||
* the st.info and appropriately install the st.info in the environment where
|
|
||||||
* you use this st version.
|
|
||||||
*
|
|
||||||
* it#$tabspaces,
|
|
||||||
*
|
|
||||||
* Secondly make sure your kernel is not expanding tabs. When running `stty
|
|
||||||
* -a` »tab0« should appear. You can tell the terminal to not expand tabs by
|
|
||||||
* running following command:
|
|
||||||
*
|
|
||||||
* stty tabs
|
|
||||||
*/
|
|
||||||
unsigned int tabspaces = 8;
|
|
||||||
|
|
||||||
/* Terminal colors (16 first used in escape sequence) */
|
|
||||||
static const char *colorname[] = {
|
|
||||||
|
|
||||||
"#111111", /*black*/
|
|
||||||
"#ac4142", /*r*/
|
|
||||||
"#90a959", /*g*/
|
|
||||||
"#f4bf75", /*y*/
|
|
||||||
"#6a9fb5", /*b*/
|
|
||||||
"#aa759f", /*m*/
|
|
||||||
"#75b5aa", /*c*/
|
|
||||||
"#ccc", /*white*/
|
|
||||||
|
|
||||||
"#111111", /*black*/
|
|
||||||
"#ac4142", /*r*/
|
|
||||||
"#90a959", /*g*/
|
|
||||||
"#f4bf75", /*y*/
|
|
||||||
"#6a9fb5", /*b*/
|
|
||||||
"#aa759f", /*m*/
|
|
||||||
"#75b5aa", /*c*/
|
|
||||||
"#ccc", /*white*/
|
|
||||||
|
|
||||||
[255] = 0,
|
|
||||||
[256] = "#111111", /* background */
|
|
||||||
[257] = "#d0d0d0", /* foreground */
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default colors (colorname index)
|
|
||||||
* foreground, background, cursor, reverse cursor
|
|
||||||
*/
|
|
||||||
unsigned int defaultfg = 257;
|
|
||||||
unsigned int defaultbg = 256;
|
|
||||||
static unsigned int defaultcs = 257;
|
|
||||||
static unsigned int defaultrcs = 257;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default shape of cursor
|
|
||||||
* 2: Block ("█")
|
|
||||||
* 4: Underline ("_")
|
|
||||||
* 6: Bar ("|")
|
|
||||||
* 7: Snowman ("☃")
|
|
||||||
*/
|
|
||||||
static unsigned int cursorshape = 2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default columns and rows numbers
|
|
||||||
*/
|
|
||||||
|
|
||||||
static unsigned int cols = 80;
|
|
||||||
static unsigned int rows = 24;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default colour and shape of the mouse cursor
|
|
||||||
*/
|
|
||||||
static unsigned int mouseshape = XC_xterm;
|
|
||||||
static unsigned int mousefg = 7;
|
|
||||||
static unsigned int mousebg = 0;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Color used to display font attributes when fontconfig selected a font which
|
|
||||||
* doesn't match the ones requested.
|
|
||||||
*/
|
|
||||||
static unsigned int defaultattr = 11;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
|
|
||||||
* Note that if you want to use ShiftMask with selmasks, set this to an other
|
|
||||||
* modifier, set to 0 to not use it.
|
|
||||||
*/
|
|
||||||
static uint forcemousemod = ShiftMask;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Internal mouse shortcuts.
|
|
||||||
* Beware that overloading Button1 will disable the selection.
|
|
||||||
*/
|
|
||||||
static MouseShortcut mshortcuts[] = {
|
|
||||||
/* mask button function argument release */
|
|
||||||
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
|
||||||
{ ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
|
|
||||||
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
|
||||||
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
|
||||||
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Internal keyboard shortcuts. */
|
|
||||||
#define MODKEY Mod1Mask
|
|
||||||
#define TERMMOD (ControlMask|ShiftMask)
|
|
||||||
|
|
||||||
static Shortcut shortcuts[] = {
|
|
||||||
/* mask keysym function argument */
|
|
||||||
{ XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} },
|
|
||||||
{ 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_Home, zoomreset, {.f = 0} },
|
|
||||||
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_V, clippaste, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_K, kscrollup, {.i = -1} },
|
|
||||||
{ MODKEY|ShiftMask, XK_J, kscrolldown, {.i = -1} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Special keys (change & recompile st.info accordingly)
|
|
||||||
*
|
|
||||||
* Mask value:
|
|
||||||
* * Use XK_ANY_MOD to match the key no matter modifiers state
|
|
||||||
* * Use XK_NO_MOD to match the key alone (no modifiers)
|
|
||||||
* appkey value:
|
|
||||||
* * 0: no value
|
|
||||||
* * > 0: keypad application mode enabled
|
|
||||||
* * = 2: term.numlock = 1
|
|
||||||
* * < 0: keypad application mode disabled
|
|
||||||
* appcursor value:
|
|
||||||
* * 0: no value
|
|
||||||
* * > 0: cursor application mode enabled
|
|
||||||
* * < 0: cursor application mode disabled
|
|
||||||
*
|
|
||||||
* Be careful with the order of the definitions because st searches in
|
|
||||||
* this table sequentially, so any XK_ANY_MOD must be in the last
|
|
||||||
* position for a key.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
|
|
||||||
* to be mapped below, add them to this array.
|
|
||||||
*/
|
|
||||||
static KeySym mappedkeys[] = { -1 };
|
|
||||||
|
|
||||||
/*
|
|
||||||
* State bits to ignore when matching key or button events. By default,
|
|
||||||
* numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
|
|
||||||
*/
|
|
||||||
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is the huge key array which defines all compatibility to the Linux
|
|
||||||
* world. Please decide about changes wisely.
|
|
||||||
*/
|
|
||||||
static Key key[] = {
|
|
||||||
/* keysym mask string appkey appcursor */
|
|
||||||
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
|
|
||||||
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
|
|
||||||
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
|
||||||
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
|
||||||
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
|
|
||||||
{ XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
|
||||||
{ XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
|
||||||
{ XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
|
|
||||||
{ XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
|
||||||
{ XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
|
||||||
{ XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
|
|
||||||
{ XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
|
||||||
{ XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
|
||||||
{ XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
|
|
||||||
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
|
||||||
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
|
||||||
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
|
||||||
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
|
||||||
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
|
|
||||||
{ XK_KP_End, ControlMask, "\033[J", -1, 0},
|
|
||||||
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
|
|
||||||
{ XK_KP_End, ShiftMask, "\033[K", -1, 0},
|
|
||||||
{ XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
|
|
||||||
{ XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
|
||||||
{ XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
|
|
||||||
{ XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
|
||||||
{ XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
|
||||||
{ XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
|
|
||||||
{ XK_KP_Insert, ControlMask, "\033[L", -1, 0},
|
|
||||||
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
|
|
||||||
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
|
||||||
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
|
||||||
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0},
|
|
||||||
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
|
|
||||||
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
|
|
||||||
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
|
||||||
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
|
||||||
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
|
||||||
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
|
|
||||||
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
|
|
||||||
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
|
|
||||||
{ XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
|
|
||||||
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
|
|
||||||
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
|
|
||||||
{ XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
|
|
||||||
{ XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
|
|
||||||
{ XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
|
|
||||||
{ XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
|
|
||||||
{ XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
|
|
||||||
{ XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
|
|
||||||
{ XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
|
|
||||||
{ XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
|
|
||||||
{ XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
|
|
||||||
{ XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
|
|
||||||
{ XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
|
|
||||||
{ XK_Up, ShiftMask, "\033[1;2A", 0, 0},
|
|
||||||
{ XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
|
|
||||||
{ XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0},
|
|
||||||
{ XK_Up, ControlMask, "\033[1;5A", 0, 0},
|
|
||||||
{ XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0},
|
|
||||||
{ XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0},
|
|
||||||
{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0},
|
|
||||||
{ XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
|
||||||
{ XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
|
||||||
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0},
|
|
||||||
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
|
|
||||||
{ XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0},
|
|
||||||
{ XK_Down, ControlMask, "\033[1;5B", 0, 0},
|
|
||||||
{ XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0},
|
|
||||||
{ XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0},
|
|
||||||
{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0},
|
|
||||||
{ XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
|
||||||
{ XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
|
||||||
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0},
|
|
||||||
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
|
|
||||||
{ XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0},
|
|
||||||
{ XK_Left, ControlMask, "\033[1;5D", 0, 0},
|
|
||||||
{ XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0},
|
|
||||||
{ XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0},
|
|
||||||
{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0},
|
|
||||||
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
|
||||||
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
|
||||||
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0},
|
|
||||||
{ XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
|
|
||||||
{ XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0},
|
|
||||||
{ XK_Right, ControlMask, "\033[1;5C", 0, 0},
|
|
||||||
{ XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0},
|
|
||||||
{ XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0},
|
|
||||||
{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0},
|
|
||||||
{ XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
|
||||||
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
|
||||||
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
|
|
||||||
{ XK_Return, Mod1Mask, "\033\r", 0, 0},
|
|
||||||
{ XK_Return, XK_ANY_MOD, "\r", 0, 0},
|
|
||||||
{ XK_Insert, ShiftMask, "\033[4l", -1, 0},
|
|
||||||
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
|
||||||
{ XK_Insert, ControlMask, "\033[L", -1, 0},
|
|
||||||
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0},
|
|
||||||
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
|
||||||
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
|
||||||
{ XK_Delete, ControlMask, "\033[M", -1, 0},
|
|
||||||
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0},
|
|
||||||
{ XK_Delete, ShiftMask, "\033[2K", -1, 0},
|
|
||||||
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
|
||||||
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
|
||||||
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
|
||||||
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
|
|
||||||
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
|
|
||||||
{ XK_Home, ShiftMask, "\033[2J", 0, -1},
|
|
||||||
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1},
|
|
||||||
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
|
||||||
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
|
||||||
{ XK_End, ControlMask, "\033[J", -1, 0},
|
|
||||||
{ XK_End, ControlMask, "\033[1;5F", +1, 0},
|
|
||||||
{ XK_End, ShiftMask, "\033[K", -1, 0},
|
|
||||||
{ XK_End, ShiftMask, "\033[1;2F", +1, 0},
|
|
||||||
{ XK_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
|
||||||
{ XK_Prior, ControlMask, "\033[5;5~", 0, 0},
|
|
||||||
{ XK_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
|
||||||
{ XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
|
||||||
{ XK_Next, ControlMask, "\033[6;5~", 0, 0},
|
|
||||||
{ XK_Next, ShiftMask, "\033[6;2~", 0, 0},
|
|
||||||
{ XK_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
|
||||||
{ XK_F1, XK_NO_MOD, "\033OP" , 0, 0},
|
|
||||||
{ XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
|
|
||||||
{ XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
|
|
||||||
{ XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
|
|
||||||
{ XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
|
|
||||||
{ XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
|
|
||||||
{ XK_F2, XK_NO_MOD, "\033OQ" , 0, 0},
|
|
||||||
{ XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
|
|
||||||
{ XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
|
|
||||||
{ XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
|
|
||||||
{ XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
|
|
||||||
{ XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
|
|
||||||
{ XK_F3, XK_NO_MOD, "\033OR" , 0, 0},
|
|
||||||
{ XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
|
|
||||||
{ XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
|
|
||||||
{ XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
|
|
||||||
{ XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
|
|
||||||
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
|
|
||||||
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0},
|
|
||||||
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
|
|
||||||
{ XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
|
|
||||||
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
|
|
||||||
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
|
|
||||||
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0},
|
|
||||||
{ XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
|
|
||||||
{ XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
|
|
||||||
{ XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
|
|
||||||
{ XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
|
|
||||||
{ XK_F6, XK_NO_MOD, "\033[17~", 0, 0},
|
|
||||||
{ XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
|
|
||||||
{ XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
|
|
||||||
{ XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
|
|
||||||
{ XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
|
|
||||||
{ XK_F7, XK_NO_MOD, "\033[18~", 0, 0},
|
|
||||||
{ XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
|
|
||||||
{ XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
|
|
||||||
{ XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
|
|
||||||
{ XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
|
|
||||||
{ XK_F8, XK_NO_MOD, "\033[19~", 0, 0},
|
|
||||||
{ XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
|
|
||||||
{ XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
|
|
||||||
{ XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
|
|
||||||
{ XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
|
|
||||||
{ XK_F9, XK_NO_MOD, "\033[20~", 0, 0},
|
|
||||||
{ XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
|
|
||||||
{ XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
|
|
||||||
{ XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
|
|
||||||
{ XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
|
|
||||||
{ XK_F10, XK_NO_MOD, "\033[21~", 0, 0},
|
|
||||||
{ XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
|
|
||||||
{ XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
|
|
||||||
{ XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
|
|
||||||
{ XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
|
|
||||||
{ XK_F11, XK_NO_MOD, "\033[23~", 0, 0},
|
|
||||||
{ XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
|
|
||||||
{ XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
|
|
||||||
{ XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
|
|
||||||
{ XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
|
|
||||||
{ XK_F12, XK_NO_MOD, "\033[24~", 0, 0},
|
|
||||||
{ XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
|
|
||||||
{ XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
|
|
||||||
{ XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
|
|
||||||
{ XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
|
|
||||||
{ XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0},
|
|
||||||
{ XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0},
|
|
||||||
{ XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0},
|
|
||||||
{ XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0},
|
|
||||||
{ XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0},
|
|
||||||
{ XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0},
|
|
||||||
{ XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0},
|
|
||||||
{ XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0},
|
|
||||||
{ XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0},
|
|
||||||
{ XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0},
|
|
||||||
{ XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0},
|
|
||||||
{ XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0},
|
|
||||||
{ XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0},
|
|
||||||
{ XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0},
|
|
||||||
{ XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0},
|
|
||||||
{ XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0},
|
|
||||||
{ XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0},
|
|
||||||
{ XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0},
|
|
||||||
{ XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0},
|
|
||||||
{ XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0},
|
|
||||||
{ XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0},
|
|
||||||
{ XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
|
|
||||||
{ XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Selection types' masks.
|
|
||||||
* Use the same masks as usual.
|
|
||||||
* Button1Mask is always unset, to make masks match between ButtonPress.
|
|
||||||
* ButtonRelease and MotionNotify.
|
|
||||||
* If no match is found, regular selection is used.
|
|
||||||
*/
|
|
||||||
static uint selmasks[] = {
|
|
||||||
[SEL_RECTANGULAR] = Mod1Mask,
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Printable characters in ASCII, used to estimate the advance width
|
|
||||||
* of single wide characters.
|
|
||||||
*/
|
|
||||||
static char ascii_printable[] =
|
|
||||||
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
|
||||||
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
|
||||||
"`abcdefghijklmnopqrstuvwxyz{|}~";
|
|
|
@ -1,37 +0,0 @@
|
||||||
# st version
|
|
||||||
VERSION = 0.8.4
|
|
||||||
|
|
||||||
# Customize below to fit your system
|
|
||||||
|
|
||||||
# paths
|
|
||||||
PREFIX = /usr/local
|
|
||||||
MANPREFIX = $(PREFIX)/share/man
|
|
||||||
|
|
||||||
X11INC = /usr/X11R6/include
|
|
||||||
X11LIB = /usr/X11R6/lib
|
|
||||||
|
|
||||||
PKG_CONFIG = pkg-config
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
INCS = -I$(X11INC) \
|
|
||||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
|
||||||
`$(PKG_CONFIG) --cflags freetype2` \
|
|
||||||
`$(PKG_CONFIG) --cflags harfbuzz`
|
|
||||||
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
|
||||||
`$(PKG_CONFIG) --libs fontconfig` \
|
|
||||||
`$(PKG_CONFIG) --libs freetype2` \
|
|
||||||
`$(PKG_CONFIG) --libs harfbuzz`
|
|
||||||
|
|
||||||
# flags
|
|
||||||
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
|
|
||||||
STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
|
|
||||||
STLDFLAGS = $(LIBS) $(LDFLAGS)
|
|
||||||
|
|
||||||
# OpenBSD:
|
|
||||||
#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
|
|
||||||
#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
|
|
||||||
# `$(PKG_CONFIG) --libs fontconfig` \
|
|
||||||
# `$(PKG_CONFIG) --libs freetype2`
|
|
||||||
|
|
||||||
# compiler and linker
|
|
||||||
# CC = c99
|
|
|
@ -1,136 +0,0 @@
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <math.h>
|
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
#include <hb.h>
|
|
||||||
#include <hb-ft.h>
|
|
||||||
|
|
||||||
#include "st.h"
|
|
||||||
|
|
||||||
void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
|
|
||||||
hb_font_t *hbfindfont(XftFont *match);
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
XftFont *match;
|
|
||||||
hb_font_t *font;
|
|
||||||
} HbFontMatch;
|
|
||||||
|
|
||||||
static int hbfontslen = 0;
|
|
||||||
static HbFontMatch *hbfontcache = NULL;
|
|
||||||
|
|
||||||
void
|
|
||||||
hbunloadfonts()
|
|
||||||
{
|
|
||||||
for (int i = 0; i < hbfontslen; i++) {
|
|
||||||
hb_font_destroy(hbfontcache[i].font);
|
|
||||||
XftUnlockFace(hbfontcache[i].match);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hbfontcache != NULL) {
|
|
||||||
free(hbfontcache);
|
|
||||||
hbfontcache = NULL;
|
|
||||||
}
|
|
||||||
hbfontslen = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
hb_font_t *
|
|
||||||
hbfindfont(XftFont *match)
|
|
||||||
{
|
|
||||||
for (int i = 0; i < hbfontslen; i++) {
|
|
||||||
if (hbfontcache[i].match == match)
|
|
||||||
return hbfontcache[i].font;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Font not found in cache, caching it now. */
|
|
||||||
hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 1));
|
|
||||||
FT_Face face = XftLockFace(match);
|
|
||||||
hb_font_t *font = hb_ft_font_create(face, NULL);
|
|
||||||
if (font == NULL)
|
|
||||||
die("Failed to load Harfbuzz font.");
|
|
||||||
|
|
||||||
hbfontcache[hbfontslen].match = match;
|
|
||||||
hbfontcache[hbfontslen].font = font;
|
|
||||||
hbfontslen += 1;
|
|
||||||
|
|
||||||
return font;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
|
|
||||||
{
|
|
||||||
int start = 0, length = 1, gstart = 0;
|
|
||||||
hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
|
|
||||||
|
|
||||||
for (int idx = 1, specidx = 1; idx < len; idx++) {
|
|
||||||
if (glyphs[idx].mode & ATTR_WDUMMY) {
|
|
||||||
length += 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
|
|
||||||
hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
|
|
||||||
|
|
||||||
/* Reset the sequence. */
|
|
||||||
length = 1;
|
|
||||||
start = specidx;
|
|
||||||
gstart = idx;
|
|
||||||
} else {
|
|
||||||
length += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
specidx++;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* EOL. */
|
|
||||||
hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
|
|
||||||
|
|
||||||
/* Apply the transformation to glyph specs. */
|
|
||||||
for (int i = 0, specidx = 0; i < len; i++) {
|
|
||||||
if (glyphs[i].mode & ATTR_WDUMMY)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (codepoints[i] != specs[specidx].glyph)
|
|
||||||
((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
|
|
||||||
|
|
||||||
specs[specidx++].glyph = codepoints[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
free(codepoints);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
|
|
||||||
{
|
|
||||||
hb_font_t *font = hbfindfont(xfont);
|
|
||||||
if (font == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
Rune rune;
|
|
||||||
ushort mode = USHRT_MAX;
|
|
||||||
hb_buffer_t *buffer = hb_buffer_create();
|
|
||||||
hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
|
|
||||||
|
|
||||||
/* Fill buffer with codepoints. */
|
|
||||||
for (int i = start; i < (start+length); i++) {
|
|
||||||
rune = string[i].u;
|
|
||||||
mode = string[i].mode;
|
|
||||||
if (mode & ATTR_WDUMMY)
|
|
||||||
rune = 0x0020;
|
|
||||||
hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Shape the segment. */
|
|
||||||
hb_shape(font, buffer, NULL, 0);
|
|
||||||
|
|
||||||
/* Get new glyph info. */
|
|
||||||
hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
|
|
||||||
|
|
||||||
/* Write new codepoints. */
|
|
||||||
for (int i = 0; i < length; i++) {
|
|
||||||
hb_codepoint_t gid = info[i].codepoint;
|
|
||||||
codepoints[start+i] = gid;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Cleanup. */
|
|
||||||
hb_buffer_destroy(buffer);
|
|
||||||
}
|
|
|
@ -1,7 +0,0 @@
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
#include <hb.h>
|
|
||||||
#include <hb-ft.h>
|
|
||||||
|
|
||||||
void hbunloadfonts();
|
|
||||||
void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
|
|
||||||
|
|
|
@ -1,152 +0,0 @@
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
index 00cb6b1..8f87c0f 100644
|
|
||||||
--- a/x.c
|
|
||||||
+++ b/x.c
|
|
||||||
@@ -78,6 +78,7 @@ typedef XftGlyphFontSpec GlyphFontSpec;
|
|
||||||
typedef struct {
|
|
||||||
int tw, th; /* tty width and height */
|
|
||||||
int w, h; /* window width and height */
|
|
||||||
+ int hborderpx, vborderpx;
|
|
||||||
int ch; /* char height */
|
|
||||||
int cw; /* char width */
|
|
||||||
int mode; /* window state/mode flags */
|
|
||||||
@@ -311,7 +312,7 @@ zoomreset(const Arg *arg)
|
|
||||||
int
|
|
||||||
evcol(XEvent *e)
|
|
||||||
{
|
|
||||||
- int x = e->xbutton.x - borderpx;
|
|
||||||
+ int x = e->xbutton.x - win.hborderpx;
|
|
||||||
LIMIT(x, 0, win.tw - 1);
|
|
||||||
return x / win.cw;
|
|
||||||
}
|
|
||||||
@@ -319,7 +320,7 @@ evcol(XEvent *e)
|
|
||||||
int
|
|
||||||
evrow(XEvent *e)
|
|
||||||
{
|
|
||||||
- int y = e->xbutton.y - borderpx;
|
|
||||||
+ int y = e->xbutton.y - win.vborderpx;
|
|
||||||
LIMIT(y, 0, win.th - 1);
|
|
||||||
return y / win.ch;
|
|
||||||
}
|
|
||||||
@@ -675,6 +676,9 @@ cresize(int width, int height)
|
|
||||||
col = MAX(1, col);
|
|
||||||
row = MAX(1, row);
|
|
||||||
|
|
||||||
+ win.hborderpx = (win.w - col * win.cw) / 2;
|
|
||||||
+ win.vborderpx = (win.h - row * win.ch) / 2;
|
|
||||||
+
|
|
||||||
tresize(col, row);
|
|
||||||
xresize(col, row);
|
|
||||||
ttyresize(win.tw, win.th);
|
|
||||||
@@ -793,8 +797,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;
|
|
||||||
@@ -1022,8 +1026,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.hborderpx + cols * win.cw;
|
|
||||||
+ win.h = 2 * win.vborderpx + rows * win.ch;
|
|
||||||
if (xw.gm & XNegative)
|
|
||||||
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
|
|
||||||
if (xw.gm & YNegative)
|
|
||||||
@@ -1123,7 +1127,7 @@ xinit(int cols, int rows)
|
|
||||||
int
|
|
||||||
xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
|
|
||||||
{
|
|
||||||
- float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
|
|
||||||
+ float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
|
|
||||||
ushort mode, prevmode = USHRT_MAX;
|
|
||||||
Font *font = &dc.font;
|
|
||||||
int frcflags = FRC_NORMAL;
|
|
||||||
@@ -1259,7 +1263,7 @@ void
|
|
||||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
|
||||||
{
|
|
||||||
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
|
||||||
- int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
|
||||||
+ int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch,
|
|
||||||
width = charlen * win.cw;
|
|
||||||
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
|
|
||||||
XRenderColor colfg, colbg;
|
|
||||||
@@ -1349,17 +1353,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|
||||||
|
|
||||||
/* Intelligent cleaning up of the borders. */
|
|
||||||
if (x == 0) {
|
|
||||||
- xclear(0, (y == 0)? 0 : winy, borderpx,
|
|
||||||
+ xclear(0, (y == 0)? 0 : winy, win.vborderpx,
|
|
||||||
winy + win.ch +
|
|
||||||
- ((winy + win.ch >= borderpx + win.th)? win.h : 0));
|
|
||||||
+ ((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
|
|
||||||
}
|
|
||||||
- if (winx + width >= borderpx + win.tw) {
|
|
||||||
+ if (winx + width >= win.hborderpx + 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.vborderpx + 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.hborderpx);
|
|
||||||
+ if (winy + win.ch >= win.vborderpx + win.th)
|
|
||||||
xclear(winx, winy + win.ch, winx + width, win.h);
|
|
||||||
|
|
||||||
/* Clean up the region we want to draw to. */
|
|
||||||
@@ -1452,35 +1456,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
|
||||||
case 3: /* Blinking Underline */
|
|
||||||
case 4: /* Steady Underline */
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + cx * win.cw,
|
|
||||||
- borderpx + (cy + 1) * win.ch - \
|
|
||||||
+ win.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + (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.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + cy * win.ch,
|
|
||||||
cursorthickness, win.ch);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + cx * win.cw,
|
|
||||||
- borderpx + cy * win.ch,
|
|
||||||
+ win.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + cy * win.ch,
|
|
||||||
win.cw - 1, 1);
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + cx * win.cw,
|
|
||||||
- borderpx + cy * win.ch,
|
|
||||||
+ win.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + cy * win.ch,
|
|
||||||
1, win.ch - 1);
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + (cx + 1) * win.cw - 1,
|
|
||||||
- borderpx + cy * win.ch,
|
|
||||||
+ win.hborderpx + (cx + 1) * win.cw - 1,
|
|
||||||
+ win.vborderpx + cy * win.ch,
|
|
||||||
1, win.ch - 1);
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + cx * win.cw,
|
|
||||||
- borderpx + (cy + 1) * win.ch - 1,
|
|
||||||
+ win.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + (cy + 1) * win.ch - 1,
|
|
||||||
win.cw, 1);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
index e5f1737..5cabd60 100644
|
|
||||||
--- a/x.c
|
|
||||||
+++ b/x.c
|
|
||||||
@@ -673,6 +673,7 @@ setsel(char *str, Time t)
|
|
||||||
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
|
|
||||||
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
|
|
||||||
selclear();
|
|
||||||
+ clipcopy(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
|
@ -1,307 +0,0 @@
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 470ac86..38240da 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
include config.mk
|
|
||||||
|
|
||||||
-SRC = st.c x.c
|
|
||||||
+SRC = st.c x.c hb.c
|
|
||||||
OBJ = $(SRC:.c=.o)
|
|
||||||
|
|
||||||
all: options st
|
|
||||||
@@ -22,7 +22,8 @@ config.h:
|
|
||||||
$(CC) $(STCFLAGS) -c $<
|
|
||||||
|
|
||||||
st.o: config.h st.h win.h
|
|
||||||
-x.o: arg.h config.h st.h win.h
|
|
||||||
+x.o: arg.h config.h st.h win.h hb.h
|
|
||||||
+hb.o: st.h
|
|
||||||
|
|
||||||
$(OBJ): config.h config.mk
|
|
||||||
|
|
||||||
diff --git a/config.mk b/config.mk
|
|
||||||
index beafc35..3df5c83 100644
|
|
||||||
--- a/config.mk
|
|
||||||
+++ b/config.mk
|
|
||||||
@@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
|
|
||||||
# includes and libs
|
|
||||||
INCS = -I$(X11INC) \
|
|
||||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
|
||||||
- `$(PKG_CONFIG) --cflags freetype2`
|
|
||||||
+ `$(PKG_CONFIG) --cflags freetype2` \
|
|
||||||
+ `$(PKG_CONFIG) --cflags harfbuzz`
|
|
||||||
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
|
||||||
`$(PKG_CONFIG) --libs fontconfig` \
|
|
||||||
- `$(PKG_CONFIG) --libs freetype2`
|
|
||||||
+ `$(PKG_CONFIG) --libs freetype2` \
|
|
||||||
+ `$(PKG_CONFIG) --libs harfbuzz`
|
|
||||||
|
|
||||||
# flags
|
|
||||||
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
|
|
||||||
diff --git a/hb.c b/hb.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..7df2828
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/hb.c
|
|
||||||
@@ -0,0 +1,136 @@
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include <stdio.h>
|
|
||||||
+#include <math.h>
|
|
||||||
+#include <X11/Xft/Xft.h>
|
|
||||||
+#include <hb.h>
|
|
||||||
+#include <hb-ft.h>
|
|
||||||
+
|
|
||||||
+#include "st.h"
|
|
||||||
+
|
|
||||||
+void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
|
|
||||||
+hb_font_t *hbfindfont(XftFont *match);
|
|
||||||
+
|
|
||||||
+typedef struct {
|
|
||||||
+ XftFont *match;
|
|
||||||
+ hb_font_t *font;
|
|
||||||
+} HbFontMatch;
|
|
||||||
+
|
|
||||||
+static int hbfontslen = 0;
|
|
||||||
+static HbFontMatch *hbfontcache = NULL;
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+hbunloadfonts()
|
|
||||||
+{
|
|
||||||
+ for (int i = 0; i < hbfontslen; i++) {
|
|
||||||
+ hb_font_destroy(hbfontcache[i].font);
|
|
||||||
+ XftUnlockFace(hbfontcache[i].match);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (hbfontcache != NULL) {
|
|
||||||
+ free(hbfontcache);
|
|
||||||
+ hbfontcache = NULL;
|
|
||||||
+ }
|
|
||||||
+ hbfontslen = 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+hb_font_t *
|
|
||||||
+hbfindfont(XftFont *match)
|
|
||||||
+{
|
|
||||||
+ for (int i = 0; i < hbfontslen; i++) {
|
|
||||||
+ if (hbfontcache[i].match == match)
|
|
||||||
+ return hbfontcache[i].font;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Font not found in cache, caching it now. */
|
|
||||||
+ hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 1));
|
|
||||||
+ FT_Face face = XftLockFace(match);
|
|
||||||
+ hb_font_t *font = hb_ft_font_create(face, NULL);
|
|
||||||
+ if (font == NULL)
|
|
||||||
+ die("Failed to load Harfbuzz font.");
|
|
||||||
+
|
|
||||||
+ hbfontcache[hbfontslen].match = match;
|
|
||||||
+ hbfontcache[hbfontslen].font = font;
|
|
||||||
+ hbfontslen += 1;
|
|
||||||
+
|
|
||||||
+ return font;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
|
|
||||||
+{
|
|
||||||
+ int start = 0, length = 1, gstart = 0;
|
|
||||||
+ hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
|
|
||||||
+
|
|
||||||
+ for (int idx = 1, specidx = 1; idx < len; idx++) {
|
|
||||||
+ if (glyphs[idx].mode & ATTR_WDUMMY) {
|
|
||||||
+ length += 1;
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
|
|
||||||
+ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
|
|
||||||
+
|
|
||||||
+ /* Reset the sequence. */
|
|
||||||
+ length = 1;
|
|
||||||
+ start = specidx;
|
|
||||||
+ gstart = idx;
|
|
||||||
+ } else {
|
|
||||||
+ length += 1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ specidx++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* EOL. */
|
|
||||||
+ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
|
|
||||||
+
|
|
||||||
+ /* Apply the transformation to glyph specs. */
|
|
||||||
+ for (int i = 0, specidx = 0; i < len; i++) {
|
|
||||||
+ if (glyphs[i].mode & ATTR_WDUMMY)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ if (codepoints[i] != specs[specidx].glyph)
|
|
||||||
+ ((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
|
|
||||||
+
|
|
||||||
+ specs[specidx++].glyph = codepoints[i];
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ free(codepoints);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
|
|
||||||
+{
|
|
||||||
+ hb_font_t *font = hbfindfont(xfont);
|
|
||||||
+ if (font == NULL)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ Rune rune;
|
|
||||||
+ ushort mode = USHRT_MAX;
|
|
||||||
+ hb_buffer_t *buffer = hb_buffer_create();
|
|
||||||
+ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
|
|
||||||
+
|
|
||||||
+ /* Fill buffer with codepoints. */
|
|
||||||
+ for (int i = start; i < (start+length); i++) {
|
|
||||||
+ rune = string[i].u;
|
|
||||||
+ mode = string[i].mode;
|
|
||||||
+ if (mode & ATTR_WDUMMY)
|
|
||||||
+ rune = 0x0020;
|
|
||||||
+ hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Shape the segment. */
|
|
||||||
+ hb_shape(font, buffer, NULL, 0);
|
|
||||||
+
|
|
||||||
+ /* Get new glyph info. */
|
|
||||||
+ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
|
|
||||||
+
|
|
||||||
+ /* Write new codepoints. */
|
|
||||||
+ for (int i = 0; i < length; i++) {
|
|
||||||
+ hb_codepoint_t gid = info[i].codepoint;
|
|
||||||
+ codepoints[start+i] = gid;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Cleanup. */
|
|
||||||
+ hb_buffer_destroy(buffer);
|
|
||||||
+}
|
|
||||||
diff --git a/hb.h b/hb.h
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..b3e02d0
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/hb.h
|
|
||||||
@@ -0,0 +1,7 @@
|
|
||||||
+#include <X11/Xft/Xft.h>
|
|
||||||
+#include <hb.h>
|
|
||||||
+#include <hb-ft.h>
|
|
||||||
+
|
|
||||||
+void hbunloadfonts();
|
|
||||||
+void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
|
|
||||||
+
|
|
||||||
diff --git a/st.c b/st.c
|
|
||||||
index 641edc0..14a0b66 100644
|
|
||||||
--- a/st.c
|
|
||||||
+++ b/st.c
|
|
||||||
@@ -2670,7 +2670,8 @@ draw(void)
|
|
||||||
drawregion(0, 0, term.col, term.row);
|
|
||||||
if (term.scr == 0)
|
|
||||||
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
|
||||||
- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
|
||||||
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx],
|
|
||||||
+ term.line[term.ocy], term.col);
|
|
||||||
term.ocx = cx;
|
|
||||||
term.ocy = term.c.y;
|
|
||||||
xfinishdraw();
|
|
||||||
diff --git a/st.h b/st.h
|
|
||||||
index b9a4eeb..b49b84a 100644
|
|
||||||
--- a/st.h
|
|
||||||
+++ b/st.h
|
|
||||||
@@ -11,7 +11,8 @@
|
|
||||||
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
|
|
||||||
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
|
|
||||||
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
|
|
||||||
-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
|
|
||||||
+#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
|
|
||||||
+ (a).fg != (b).fg || \
|
|
||||||
(a).bg != (b).bg)
|
|
||||||
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
|
|
||||||
(t1.tv_nsec-t2.tv_nsec)/1E6)
|
|
||||||
@@ -33,6 +34,7 @@ enum glyph_attribute {
|
|
||||||
ATTR_WRAP = 1 << 8,
|
|
||||||
ATTR_WIDE = 1 << 9,
|
|
||||||
ATTR_WDUMMY = 1 << 10,
|
|
||||||
+ ATTR_LIGA = 1 << 11,
|
|
||||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/win.h b/win.h
|
|
||||||
index a6ef1b9..bc0d180 100644
|
|
||||||
--- a/win.h
|
|
||||||
+++ b/win.h
|
|
||||||
@@ -25,7 +25,7 @@ enum win_mode {
|
|
||||||
|
|
||||||
void xbell(void);
|
|
||||||
void xclipcopy(void);
|
|
||||||
-void xdrawcursor(int, int, Glyph, int, int, Glyph);
|
|
||||||
+void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
|
|
||||||
void xdrawline(Line, int, int, int);
|
|
||||||
void xfinishdraw(void);
|
|
||||||
void xloadcols(void);
|
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
index e5f1737..3334a83 100644
|
|
||||||
--- a/x.c
|
|
||||||
+++ b/x.c
|
|
||||||
@@ -19,6 +19,7 @@ char *argv0;
|
|
||||||
#include "arg.h"
|
|
||||||
#include "st.h"
|
|
||||||
#include "win.h"
|
|
||||||
+#include "hb.h"
|
|
||||||
|
|
||||||
/* types used in config.h */
|
|
||||||
typedef struct {
|
|
||||||
@@ -1031,6 +1032,9 @@ xunloadfont(Font *f)
|
|
||||||
void
|
|
||||||
xunloadfonts(void)
|
|
||||||
{
|
|
||||||
+ /* Clear Harfbuzz font cache. */
|
|
||||||
+ hbunloadfonts();
|
|
||||||
+
|
|
||||||
/* Free the loaded fonts in the font cache. */
|
|
||||||
while (frclen > 0)
|
|
||||||
XftFontClose(xw.dpy, frc[--frclen].font);
|
|
||||||
@@ -1229,7 +1233,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
|
||||||
mode = glyphs[i].mode;
|
|
||||||
|
|
||||||
/* Skip dummy wide-character spacing. */
|
|
||||||
- if (mode == ATTR_WDUMMY)
|
|
||||||
+ if (mode & ATTR_WDUMMY)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* Determine font for glyph if different from previous glyph. */
|
|
||||||
@@ -1336,6 +1340,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
|
||||||
numspecs++;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* Harfbuzz transformation for ligatures. */
|
|
||||||
+ hbtransform(specs, glyphs, len, x, y);
|
|
||||||
+
|
|
||||||
return numspecs;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1485,14 +1492,17 @@ xdrawglyph(Glyph g, int x, int y)
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
|
||||||
+xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
|
|
||||||
{
|
|
||||||
Color drawcol;
|
|
||||||
|
|
||||||
/* remove the old cursor */
|
|
||||||
if (selected(ox, oy))
|
|
||||||
og.mode ^= ATTR_REVERSE;
|
|
||||||
- xdrawglyph(og, ox, oy);
|
|
||||||
+
|
|
||||||
+ /* Redraw the line where cursor was previously.
|
|
||||||
+ * It will restore the ligatures broken by the cursor. */
|
|
||||||
+ xdrawline(line, 0, oy, len);
|
|
||||||
|
|
||||||
if (IS_SET(MODE_HIDE))
|
|
||||||
return;
|
|
|
@ -1,79 +0,0 @@
|
||||||
From a7eedc85e0609177cdb1ed3f6203fa37e6420012 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Matias Lang <yo@matiaslang.me>
|
|
||||||
Date: Wed, 17 Jul 2019 01:10:44 -0300
|
|
||||||
Subject: [PATCH] Add shortcut to spawn new terminal in the current dir
|
|
||||||
|
|
||||||
Ctrl-Shift-Return now creates a new ST terminal, whose CWD is the same
|
|
||||||
as the parent st's CWD
|
|
||||||
---
|
|
||||||
config.h | 1 +
|
|
||||||
st.c | 21 +++++++++++++++++++++
|
|
||||||
st.h | 1 +
|
|
||||||
3 files changed, 23 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/config.h b/config.h
|
|
||||||
index 0e01717..31f26d8 100644
|
|
||||||
--- a/config.h
|
|
||||||
+++ b/config.h
|
|
||||||
@@ -178,6 +178,7 @@ static Shortcut shortcuts[] = {
|
|
||||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
|
||||||
+ { TERMMOD, XK_Return, newterm, {.i = 0} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff --git a/st.c b/st.c
|
|
||||||
index b8e6077..044e29b 100644
|
|
||||||
--- a/st.c
|
|
||||||
+++ b/st.c
|
|
||||||
@@ -153,6 +153,7 @@ typedef struct {
|
|
||||||
} STREscape;
|
|
||||||
|
|
||||||
static void execsh(char *, char **);
|
|
||||||
+static char *getcwd_by_pid(pid_t pid);
|
|
||||||
static void stty(char **);
|
|
||||||
static void sigchld(int);
|
|
||||||
static void ttywriteraw(const char *, size_t);
|
|
||||||
@@ -1059,6 +1060,26 @@ tswapscreen(void)
|
|
||||||
tfulldirt();
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+newterm(const Arg* a)
|
|
||||||
+{
|
|
||||||
+ switch (fork()) {
|
|
||||||
+ case -1:
|
|
||||||
+ die("fork failed: %s\n", strerror(errno));
|
|
||||||
+ break;
|
|
||||||
+ case 0:
|
|
||||||
+ chdir(getcwd_by_pid(pid));
|
|
||||||
+ execlp("st", "./st", NULL);
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static char *getcwd_by_pid(pid_t pid) {
|
|
||||||
+ char buf[32];
|
|
||||||
+ snprintf(buf, sizeof buf, "/proc/%d/cwd", pid);
|
|
||||||
+ return realpath(buf, NULL);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
tscrolldown(int orig, int n)
|
|
||||||
{
|
|
||||||
diff --git a/st.h b/st.h
|
|
||||||
index 38c61c4..54d4a43 100644
|
|
||||||
--- a/st.h
|
|
||||||
+++ b/st.h
|
|
||||||
@@ -80,6 +80,7 @@ void die(const char *, ...);
|
|
||||||
void redraw(void);
|
|
||||||
void draw(void);
|
|
||||||
|
|
||||||
+void newterm(const Arg *);
|
|
||||||
void printscreen(const Arg *);
|
|
||||||
void printsel(const Arg *);
|
|
||||||
void sendbreak(const Arg *);
|
|
||||||
--
|
|
||||||
2.19.2
|
|
||||||
|
|
|
@ -1,351 +0,0 @@
|
||||||
diff --git a/config.h b/config.h
|
|
||||||
index 0895a1f..eef24df 100644
|
|
||||||
--- a/config.h
|
|
||||||
+++ b/config.h
|
|
||||||
@@ -188,6 +188,8 @@ static Shortcut shortcuts[] = {
|
|
||||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
|
||||||
+ { MODKEY|ShiftMask, XK_K, kscrollup, {.i = -1} },
|
|
||||||
+ { MODKEY|ShiftMask, XK_J, kscrolldown, {.i = -1} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff --git a/st.c b/st.c
|
|
||||||
index 0ce6ac2..641edc0 100644
|
|
||||||
--- a/st.c
|
|
||||||
+++ b/st.c
|
|
||||||
@@ -35,6 +35,7 @@
|
|
||||||
#define ESC_ARG_SIZ 16
|
|
||||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
|
||||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
|
||||||
+#define HISTSIZE 2000
|
|
||||||
|
|
||||||
/* macros */
|
|
||||||
#define IS_SET(flag) ((term.mode & (flag)) != 0)
|
|
||||||
@@ -42,6 +43,9 @@
|
|
||||||
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
|
||||||
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
|
||||||
#define ISDELIM(u) (u && wcschr(worddelimiters, u))
|
|
||||||
+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
|
|
||||||
+ term.scr + HISTSIZE + 1) % HISTSIZE] : \
|
|
||||||
+ term.line[(y) - term.scr])
|
|
||||||
|
|
||||||
enum term_mode {
|
|
||||||
MODE_WRAP = 1 << 0,
|
|
||||||
@@ -117,6 +121,9 @@ typedef struct {
|
|
||||||
int col; /* nb col */
|
|
||||||
Line *line; /* screen */
|
|
||||||
Line *alt; /* alternate screen */
|
|
||||||
+ Line hist[HISTSIZE]; /* history buffer */
|
|
||||||
+ int histi; /* history index */
|
|
||||||
+ int scr; /* scroll back */
|
|
||||||
int *dirty; /* dirtyness of lines */
|
|
||||||
TCursor c; /* cursor */
|
|
||||||
int ocx; /* old cursor col */
|
|
||||||
@@ -185,8 +192,8 @@ static void tnewline(int);
|
|
||||||
static void tputtab(int);
|
|
||||||
static void tputc(Rune);
|
|
||||||
static void treset(void);
|
|
||||||
-static void tscrollup(int, int);
|
|
||||||
-static void tscrolldown(int, int);
|
|
||||||
+static void tscrollup(int, int, int);
|
|
||||||
+static void tscrolldown(int, int, int);
|
|
||||||
static void tsetattr(int *, int);
|
|
||||||
static void tsetchar(Rune, Glyph *, int, int);
|
|
||||||
static void tsetdirt(int, int);
|
|
||||||
@@ -415,10 +422,10 @@ tlinelen(int y)
|
|
||||||
{
|
|
||||||
int i = term.col;
|
|
||||||
|
|
||||||
- if (term.line[y][i - 1].mode & ATTR_WRAP)
|
|
||||||
+ if (TLINE(y)[i - 1].mode & ATTR_WRAP)
|
|
||||||
return i;
|
|
||||||
|
|
||||||
- while (i > 0 && term.line[y][i - 1].u == ' ')
|
|
||||||
+ while (i > 0 && TLINE(y)[i - 1].u == ' ')
|
|
||||||
--i;
|
|
||||||
|
|
||||||
return i;
|
|
||||||
@@ -527,7 +534,7 @@ selsnap(int *x, int *y, int direction)
|
|
||||||
* Snap around if the word wraps around at the end or
|
|
||||||
* beginning of a line.
|
|
||||||
*/
|
|
||||||
- prevgp = &term.line[*y][*x];
|
|
||||||
+ prevgp = &TLINE(*y)[*x];
|
|
||||||
prevdelim = ISDELIM(prevgp->u);
|
|
||||||
for (;;) {
|
|
||||||
newx = *x + direction;
|
|
||||||
@@ -542,14 +549,14 @@ selsnap(int *x, int *y, int direction)
|
|
||||||
yt = *y, xt = *x;
|
|
||||||
else
|
|
||||||
yt = newy, xt = newx;
|
|
||||||
- if (!(term.line[yt][xt].mode & ATTR_WRAP))
|
|
||||||
+ if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (newx >= tlinelen(newy))
|
|
||||||
break;
|
|
||||||
|
|
||||||
- gp = &term.line[newy][newx];
|
|
||||||
+ gp = &TLINE(newy)[newx];
|
|
||||||
delim = ISDELIM(gp->u);
|
|
||||||
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
|
||||||
|| (delim && gp->u != prevgp->u)))
|
|
||||||
@@ -570,14 +577,14 @@ selsnap(int *x, int *y, int direction)
|
|
||||||
*x = (direction < 0) ? 0 : term.col - 1;
|
|
||||||
if (direction < 0) {
|
|
||||||
for (; *y > 0; *y += direction) {
|
|
||||||
- if (!(term.line[*y-1][term.col-1].mode
|
|
||||||
+ if (!(TLINE(*y-1)[term.col-1].mode
|
|
||||||
& ATTR_WRAP)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (direction > 0) {
|
|
||||||
for (; *y < term.row-1; *y += direction) {
|
|
||||||
- if (!(term.line[*y][term.col-1].mode
|
|
||||||
+ if (!(TLINE(*y)[term.col-1].mode
|
|
||||||
& ATTR_WRAP)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
@@ -608,13 +615,13 @@ getsel(void)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sel.type == SEL_RECTANGULAR) {
|
|
||||||
- gp = &term.line[y][sel.nb.x];
|
|
||||||
+ gp = &TLINE(y)[sel.nb.x];
|
|
||||||
lastx = sel.ne.x;
|
|
||||||
} else {
|
|
||||||
- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
|
|
||||||
+ gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
|
|
||||||
lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
|
|
||||||
}
|
|
||||||
- last = &term.line[y][MIN(lastx, linelen-1)];
|
|
||||||
+ last = &TLINE(y)[MIN(lastx, linelen-1)];
|
|
||||||
while (last >= gp && last->u == ' ')
|
|
||||||
--last;
|
|
||||||
|
|
||||||
@@ -849,6 +856,9 @@ void
|
|
||||||
ttywrite(const char *s, size_t n, int may_echo)
|
|
||||||
{
|
|
||||||
const char *next;
|
|
||||||
+ Arg arg = (Arg) { .i = term.scr };
|
|
||||||
+
|
|
||||||
+ kscrolldown(&arg);
|
|
||||||
|
|
||||||
if (may_echo && IS_SET(MODE_ECHO))
|
|
||||||
twrite(s, n, 1);
|
|
||||||
@@ -1060,13 +1070,53 @@ tswapscreen(void)
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
-tscrolldown(int orig, int n)
|
|
||||||
+kscrolldown(const Arg* a)
|
|
||||||
+{
|
|
||||||
+ int n = a->i;
|
|
||||||
+
|
|
||||||
+ if (n < 0)
|
|
||||||
+ n = term.row + n;
|
|
||||||
+
|
|
||||||
+ if (n > term.scr)
|
|
||||||
+ n = term.scr;
|
|
||||||
+
|
|
||||||
+ if (term.scr > 0) {
|
|
||||||
+ term.scr -= n;
|
|
||||||
+ selscroll(0, -n);
|
|
||||||
+ tfulldirt();
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+kscrollup(const Arg* a)
|
|
||||||
+{
|
|
||||||
+ int n = a->i;
|
|
||||||
+
|
|
||||||
+ if (n < 0)
|
|
||||||
+ n = term.row + n;
|
|
||||||
+
|
|
||||||
+ if (term.scr <= HISTSIZE-n) {
|
|
||||||
+ term.scr += n;
|
|
||||||
+ selscroll(0, n);
|
|
||||||
+ tfulldirt();
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+tscrolldown(int orig, int n, int copyhist)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
Line temp;
|
|
||||||
|
|
||||||
LIMIT(n, 0, term.bot-orig+1);
|
|
||||||
|
|
||||||
+ if (copyhist) {
|
|
||||||
+ term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
|
|
||||||
+ temp = term.hist[term.histi];
|
|
||||||
+ term.hist[term.histi] = term.line[term.bot];
|
|
||||||
+ term.line[term.bot] = temp;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
tsetdirt(orig, term.bot-n);
|
|
||||||
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
|
||||||
|
|
||||||
@@ -1076,17 +1126,28 @@ tscrolldown(int orig, int n)
|
|
||||||
term.line[i-n] = temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
- selscroll(orig, n);
|
|
||||||
+ if (term.scr == 0)
|
|
||||||
+ selscroll(orig, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
-tscrollup(int orig, int n)
|
|
||||||
+tscrollup(int orig, int n, int copyhist)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
Line temp;
|
|
||||||
|
|
||||||
LIMIT(n, 0, term.bot-orig+1);
|
|
||||||
|
|
||||||
+ if (copyhist) {
|
|
||||||
+ term.histi = (term.histi + 1) % HISTSIZE;
|
|
||||||
+ temp = term.hist[term.histi];
|
|
||||||
+ term.hist[term.histi] = term.line[orig];
|
|
||||||
+ term.line[orig] = temp;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (term.scr > 0 && term.scr < HISTSIZE)
|
|
||||||
+ term.scr = MIN(term.scr + n, HISTSIZE-1);
|
|
||||||
+
|
|
||||||
tclearregion(0, orig, term.col-1, orig+n-1);
|
|
||||||
tsetdirt(orig+n, term.bot);
|
|
||||||
|
|
||||||
@@ -1096,7 +1157,8 @@ tscrollup(int orig, int n)
|
|
||||||
term.line[i+n] = temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
- selscroll(orig, -n);
|
|
||||||
+ if (term.scr == 0)
|
|
||||||
+ selscroll(orig, -n);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -1135,7 +1197,7 @@ tnewline(int first_col)
|
|
||||||
int y = term.c.y;
|
|
||||||
|
|
||||||
if (y == term.bot) {
|
|
||||||
- tscrollup(term.top, 1);
|
|
||||||
+ tscrollup(term.top, 1, 1);
|
|
||||||
} else {
|
|
||||||
y++;
|
|
||||||
}
|
|
||||||
@@ -1300,14 +1362,14 @@ void
|
|
||||||
tinsertblankline(int n)
|
|
||||||
{
|
|
||||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
|
||||||
- tscrolldown(term.c.y, n);
|
|
||||||
+ tscrolldown(term.c.y, n, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
tdeleteline(int n)
|
|
||||||
{
|
|
||||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
|
||||||
- tscrollup(term.c.y, n);
|
|
||||||
+ tscrollup(term.c.y, n, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t
|
|
||||||
@@ -1738,11 +1800,11 @@ csihandle(void)
|
|
||||||
break;
|
|
||||||
case 'S': /* SU -- Scroll <n> line up */
|
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
|
||||||
- tscrollup(term.top, csiescseq.arg[0]);
|
|
||||||
+ tscrollup(term.top, csiescseq.arg[0], 0);
|
|
||||||
break;
|
|
||||||
case 'T': /* SD -- Scroll <n> line down */
|
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
|
||||||
- tscrolldown(term.top, csiescseq.arg[0]);
|
|
||||||
+ tscrolldown(term.top, csiescseq.arg[0], 0);
|
|
||||||
break;
|
|
||||||
case 'L': /* IL -- Insert <n> blank lines */
|
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
|
||||||
@@ -2248,7 +2310,7 @@ eschandle(uchar ascii)
|
|
||||||
return 0;
|
|
||||||
case 'D': /* IND -- Linefeed */
|
|
||||||
if (term.c.y == term.bot) {
|
|
||||||
- tscrollup(term.top, 1);
|
|
||||||
+ tscrollup(term.top, 1, 1);
|
|
||||||
} else {
|
|
||||||
tmoveto(term.c.x, term.c.y+1);
|
|
||||||
}
|
|
||||||
@@ -2261,7 +2323,7 @@ eschandle(uchar ascii)
|
|
||||||
break;
|
|
||||||
case 'M': /* RI -- Reverse index */
|
|
||||||
if (term.c.y == term.top) {
|
|
||||||
- tscrolldown(term.top, 1);
|
|
||||||
+ tscrolldown(term.top, 1, 1);
|
|
||||||
} else {
|
|
||||||
tmoveto(term.c.x, term.c.y-1);
|
|
||||||
}
|
|
||||||
@@ -2482,7 +2544,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
|
|
||||||
void
|
|
||||||
tresize(int col, int row)
|
|
||||||
{
|
|
||||||
- int i;
|
|
||||||
+ int i, j;
|
|
||||||
int minrow = MIN(row, term.row);
|
|
||||||
int mincol = MIN(col, term.col);
|
|
||||||
int *bp;
|
|
||||||
@@ -2519,6 +2581,14 @@ tresize(int col, int row)
|
|
||||||
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
|
||||||
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
|
|
||||||
|
|
||||||
+ for (i = 0; i < HISTSIZE; i++) {
|
|
||||||
+ term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
|
|
||||||
+ for (j = mincol; j < col; j++) {
|
|
||||||
+ term.hist[i][j] = term.c.attr;
|
|
||||||
+ term.hist[i][j].u = ' ';
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* resize each row to new width, zero-pad if needed */
|
|
||||||
for (i = 0; i < minrow; i++) {
|
|
||||||
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
|
||||||
@@ -2577,7 +2647,7 @@ drawregion(int x1, int y1, int x2, int y2)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
term.dirty[y] = 0;
|
|
||||||
- xdrawline(term.line[y], x1, y, x2);
|
|
||||||
+ xdrawline(TLINE(y), x1, y, x2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2598,8 +2668,9 @@ draw(void)
|
|
||||||
cx--;
|
|
||||||
|
|
||||||
drawregion(0, 0, term.col, term.row);
|
|
||||||
- xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
|
||||||
- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
|
||||||
+ if (term.scr == 0)
|
|
||||||
+ xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
|
||||||
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
|
||||||
term.ocx = cx;
|
|
||||||
term.ocy = term.c.y;
|
|
||||||
xfinishdraw();
|
|
||||||
diff --git a/st.h b/st.h
|
|
||||||
index d978458..b9a4eeb 100644
|
|
||||||
--- a/st.h
|
|
||||||
+++ b/st.h
|
|
||||||
@@ -81,6 +81,8 @@ void die(const char *, ...);
|
|
||||||
void redraw(void);
|
|
||||||
void draw(void);
|
|
||||||
|
|
||||||
+void kscrolldown(const Arg *);
|
|
||||||
+void kscrollup(const Arg *);
|
|
||||||
void printscreen(const Arg *);
|
|
||||||
void printsel(const Arg *);
|
|
||||||
void sendbreak(const Arg *);
|
|
BIN
.suckless/st/st
BIN
.suckless/st/st
Binary file not shown.
|
@ -1,177 +0,0 @@
|
||||||
.TH ST 1 st\-VERSION
|
|
||||||
.SH NAME
|
|
||||||
st \- simple terminal
|
|
||||||
.SH SYNOPSIS
|
|
||||||
.B st
|
|
||||||
.RB [ \-aiv ]
|
|
||||||
.RB [ \-c
|
|
||||||
.IR class ]
|
|
||||||
.RB [ \-f
|
|
||||||
.IR font ]
|
|
||||||
.RB [ \-g
|
|
||||||
.IR geometry ]
|
|
||||||
.RB [ \-n
|
|
||||||
.IR name ]
|
|
||||||
.RB [ \-o
|
|
||||||
.IR iofile ]
|
|
||||||
.RB [ \-T
|
|
||||||
.IR title ]
|
|
||||||
.RB [ \-t
|
|
||||||
.IR title ]
|
|
||||||
.RB [ \-l
|
|
||||||
.IR line ]
|
|
||||||
.RB [ \-w
|
|
||||||
.IR windowid ]
|
|
||||||
.RB [[ \-e ]
|
|
||||||
.IR command
|
|
||||||
.RI [ arguments ...]]
|
|
||||||
.PP
|
|
||||||
.B st
|
|
||||||
.RB [ \-aiv ]
|
|
||||||
.RB [ \-c
|
|
||||||
.IR class ]
|
|
||||||
.RB [ \-f
|
|
||||||
.IR font ]
|
|
||||||
.RB [ \-g
|
|
||||||
.IR geometry ]
|
|
||||||
.RB [ \-n
|
|
||||||
.IR name ]
|
|
||||||
.RB [ \-o
|
|
||||||
.IR iofile ]
|
|
||||||
.RB [ \-T
|
|
||||||
.IR title ]
|
|
||||||
.RB [ \-t
|
|
||||||
.IR title ]
|
|
||||||
.RB [ \-w
|
|
||||||
.IR windowid ]
|
|
||||||
.RB \-l
|
|
||||||
.IR line
|
|
||||||
.RI [ stty_args ...]
|
|
||||||
.SH DESCRIPTION
|
|
||||||
.B st
|
|
||||||
is a simple terminal emulator.
|
|
||||||
.SH OPTIONS
|
|
||||||
.TP
|
|
||||||
.B \-a
|
|
||||||
disable alternate screens in terminal
|
|
||||||
.TP
|
|
||||||
.BI \-c " class"
|
|
||||||
defines the window class (default $TERM).
|
|
||||||
.TP
|
|
||||||
.BI \-f " font"
|
|
||||||
defines the
|
|
||||||
.I font
|
|
||||||
to use when st is run.
|
|
||||||
.TP
|
|
||||||
.BI \-g " geometry"
|
|
||||||
defines the X11 geometry string.
|
|
||||||
The form is [=][<cols>{xX}<rows>][{+-}<xoffset>{+-}<yoffset>]. See
|
|
||||||
.BR XParseGeometry (3)
|
|
||||||
for further details.
|
|
||||||
.TP
|
|
||||||
.B \-i
|
|
||||||
will fixate the position given with the -g option.
|
|
||||||
.TP
|
|
||||||
.BI \-n " name"
|
|
||||||
defines the window instance name (default $TERM).
|
|
||||||
.TP
|
|
||||||
.BI \-o " iofile"
|
|
||||||
writes all the I/O to
|
|
||||||
.I iofile.
|
|
||||||
This feature is useful when recording st sessions. A value of "-" means
|
|
||||||
standard output.
|
|
||||||
.TP
|
|
||||||
.BI \-T " title"
|
|
||||||
defines the window title (default 'st').
|
|
||||||
.TP
|
|
||||||
.BI \-t " title"
|
|
||||||
defines the window title (default 'st').
|
|
||||||
.TP
|
|
||||||
.BI \-w " windowid"
|
|
||||||
embeds st within the window identified by
|
|
||||||
.I windowid
|
|
||||||
.TP
|
|
||||||
.BI \-l " line"
|
|
||||||
use a tty
|
|
||||||
.I line
|
|
||||||
instead of a pseudo terminal.
|
|
||||||
.I line
|
|
||||||
should be a (pseudo-)serial device (e.g. /dev/ttyS0 on Linux for serial port
|
|
||||||
0).
|
|
||||||
When this flag is given
|
|
||||||
remaining arguments are used as flags for
|
|
||||||
.BR stty(1).
|
|
||||||
By default st initializes the serial line to 8 bits, no parity, 1 stop bit
|
|
||||||
and a 38400 baud rate. The speed is set by appending it as last argument
|
|
||||||
(e.g. 'st -l /dev/ttyS0 115200'). Arguments before the last one are
|
|
||||||
.BR stty(1)
|
|
||||||
flags. If you want to set odd parity on 115200 baud use for example 'st -l
|
|
||||||
/dev/ttyS0 parenb parodd 115200'. Set the number of bits by using for
|
|
||||||
example 'st -l /dev/ttyS0 cs7 115200'. See
|
|
||||||
.BR stty(1)
|
|
||||||
for more arguments and cases.
|
|
||||||
.TP
|
|
||||||
.B \-v
|
|
||||||
prints version information to stderr, then exits.
|
|
||||||
.TP
|
|
||||||
.BI \-e " command " [ " arguments " "... ]"
|
|
||||||
st executes
|
|
||||||
.I command
|
|
||||||
instead of the shell. If this is used it
|
|
||||||
.B must be the last option
|
|
||||||
on the command line, as in xterm / rxvt.
|
|
||||||
This option is only intended for compatibility,
|
|
||||||
and all the remaining arguments are used as a command
|
|
||||||
even without it.
|
|
||||||
.SH SHORTCUTS
|
|
||||||
.TP
|
|
||||||
.B Break
|
|
||||||
Send a break in the serial line.
|
|
||||||
Break key is obtained in PC keyboards
|
|
||||||
pressing at the same time control and pause.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Print Screen
|
|
||||||
Toggle if st should print to the
|
|
||||||
.I iofile.
|
|
||||||
.TP
|
|
||||||
.B Shift-Print Screen
|
|
||||||
Print the full screen to the
|
|
||||||
.I iofile.
|
|
||||||
.TP
|
|
||||||
.B Print Screen
|
|
||||||
Print the selection to the
|
|
||||||
.I iofile.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-Page Up
|
|
||||||
Increase font size.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-Page Down
|
|
||||||
Decrease font size.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-Home
|
|
||||||
Reset to default font size.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-y
|
|
||||||
Paste from primary selection (middle mouse button).
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-c
|
|
||||||
Copy the selected text to the clipboard selection.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-v
|
|
||||||
Paste from the clipboard selection.
|
|
||||||
.SH CUSTOMIZATION
|
|
||||||
.B st
|
|
||||||
can be customized by creating a custom config.h and (re)compiling the source
|
|
||||||
code. This keeps it fast, secure and simple.
|
|
||||||
.SH AUTHORS
|
|
||||||
See the LICENSE file for the authors.
|
|
||||||
.SH LICENSE
|
|
||||||
See the LICENSE file for the terms of redistribution.
|
|
||||||
.SH SEE ALSO
|
|
||||||
.BR tabbed (1),
|
|
||||||
.BR utmp (1),
|
|
||||||
.BR stty (1),
|
|
||||||
.BR scroll (1)
|
|
||||||
.SH BUGS
|
|
||||||
See the TODO file in the distribution.
|
|
||||||
|
|
2677
.suckless/st/st.c
2677
.suckless/st/st.c
File diff suppressed because it is too large
Load Diff
|
@ -1,129 +0,0 @@
|
||||||
/* See LICENSE for license details. */
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
/* macros */
|
|
||||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
|
||||||
#define MAX(a, b) ((a) < (b) ? (b) : (a))
|
|
||||||
#define LEN(a) (sizeof(a) / sizeof(a)[0])
|
|
||||||
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
|
|
||||||
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
|
|
||||||
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
|
|
||||||
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
|
|
||||||
#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
|
|
||||||
(a).fg != (b).fg || \
|
|
||||||
(a).bg != (b).bg)
|
|
||||||
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
|
|
||||||
(t1.tv_nsec-t2.tv_nsec)/1E6)
|
|
||||||
#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
|
|
||||||
|
|
||||||
#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
|
|
||||||
#define IS_TRUECOL(x) (1 << 24 & (x))
|
|
||||||
|
|
||||||
enum glyph_attribute {
|
|
||||||
ATTR_NULL = 0,
|
|
||||||
ATTR_BOLD = 1 << 0,
|
|
||||||
ATTR_FAINT = 1 << 1,
|
|
||||||
ATTR_ITALIC = 1 << 2,
|
|
||||||
ATTR_UNDERLINE = 1 << 3,
|
|
||||||
ATTR_BLINK = 1 << 4,
|
|
||||||
ATTR_REVERSE = 1 << 5,
|
|
||||||
ATTR_INVISIBLE = 1 << 6,
|
|
||||||
ATTR_STRUCK = 1 << 7,
|
|
||||||
ATTR_WRAP = 1 << 8,
|
|
||||||
ATTR_WIDE = 1 << 9,
|
|
||||||
ATTR_WDUMMY = 1 << 10,
|
|
||||||
ATTR_LIGA = 1 << 11,
|
|
||||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum selection_mode {
|
|
||||||
SEL_IDLE = 0,
|
|
||||||
SEL_EMPTY = 1,
|
|
||||||
SEL_READY = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
enum selection_type {
|
|
||||||
SEL_REGULAR = 1,
|
|
||||||
SEL_RECTANGULAR = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
enum selection_snap {
|
|
||||||
SNAP_WORD = 1,
|
|
||||||
SNAP_LINE = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef unsigned char uchar;
|
|
||||||
typedef unsigned int uint;
|
|
||||||
typedef unsigned long ulong;
|
|
||||||
typedef unsigned short ushort;
|
|
||||||
|
|
||||||
typedef uint_least32_t Rune;
|
|
||||||
|
|
||||||
#define Glyph Glyph_
|
|
||||||
typedef struct {
|
|
||||||
Rune u; /* character code */
|
|
||||||
ushort mode; /* attribute flags */
|
|
||||||
uint32_t fg; /* foreground */
|
|
||||||
uint32_t bg; /* background */
|
|
||||||
} Glyph;
|
|
||||||
|
|
||||||
typedef Glyph *Line;
|
|
||||||
|
|
||||||
typedef union {
|
|
||||||
int i;
|
|
||||||
uint ui;
|
|
||||||
float f;
|
|
||||||
const void *v;
|
|
||||||
const char *s;
|
|
||||||
} Arg;
|
|
||||||
|
|
||||||
void die(const char *, ...);
|
|
||||||
void redraw(void);
|
|
||||||
void draw(void);
|
|
||||||
|
|
||||||
void kscrolldown(const Arg *);
|
|
||||||
void kscrollup(const Arg *);
|
|
||||||
void printscreen(const Arg *);
|
|
||||||
void printsel(const Arg *);
|
|
||||||
void sendbreak(const Arg *);
|
|
||||||
void toggleprinter(const Arg *);
|
|
||||||
|
|
||||||
int tattrset(int);
|
|
||||||
void tnew(int, int);
|
|
||||||
void tresize(int, int);
|
|
||||||
void tsetdirtattr(int);
|
|
||||||
void ttyhangup(void);
|
|
||||||
int ttynew(char *, char *, char *, char **);
|
|
||||||
size_t ttyread(void);
|
|
||||||
void ttyresize(int, int);
|
|
||||||
void ttywrite(const char *, size_t, int);
|
|
||||||
|
|
||||||
void resettitle(void);
|
|
||||||
|
|
||||||
void selclear(void);
|
|
||||||
void selinit(void);
|
|
||||||
void selstart(int, int, int);
|
|
||||||
void selextend(int, int, int, int);
|
|
||||||
int selected(int, int);
|
|
||||||
char *getsel(void);
|
|
||||||
|
|
||||||
size_t utf8encode(Rune, char *);
|
|
||||||
|
|
||||||
void *xmalloc(size_t);
|
|
||||||
void *xrealloc(void *, size_t);
|
|
||||||
char *xstrdup(char *);
|
|
||||||
|
|
||||||
/* config.h globals */
|
|
||||||
extern char *utmp;
|
|
||||||
extern char *scroll;
|
|
||||||
extern char *stty_args;
|
|
||||||
extern char *vtiden;
|
|
||||||
extern wchar_t *worddelimiters;
|
|
||||||
extern int allowaltscreen;
|
|
||||||
extern int allowwindowops;
|
|
||||||
extern char *termname;
|
|
||||||
extern unsigned int tabspaces;
|
|
||||||
extern unsigned int defaultfg;
|
|
||||||
extern unsigned int defaultbg;
|
|
|
@ -1,239 +0,0 @@
|
||||||
st-mono| simpleterm monocolor,
|
|
||||||
acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
|
|
||||||
am,
|
|
||||||
bce,
|
|
||||||
bel=^G,
|
|
||||||
blink=\E[5m,
|
|
||||||
bold=\E[1m,
|
|
||||||
cbt=\E[Z,
|
|
||||||
cvvis=\E[?25h,
|
|
||||||
civis=\E[?25l,
|
|
||||||
clear=\E[H\E[2J,
|
|
||||||
cnorm=\E[?12l\E[?25h,
|
|
||||||
colors#2,
|
|
||||||
cols#80,
|
|
||||||
cr=^M,
|
|
||||||
csr=\E[%i%p1%d;%p2%dr,
|
|
||||||
cub=\E[%p1%dD,
|
|
||||||
cub1=^H,
|
|
||||||
cud1=^J,
|
|
||||||
cud=\E[%p1%dB,
|
|
||||||
cuf1=\E[C,
|
|
||||||
cuf=\E[%p1%dC,
|
|
||||||
cup=\E[%i%p1%d;%p2%dH,
|
|
||||||
cuu1=\E[A,
|
|
||||||
cuu=\E[%p1%dA,
|
|
||||||
dch=\E[%p1%dP,
|
|
||||||
dch1=\E[P,
|
|
||||||
dim=\E[2m,
|
|
||||||
dl=\E[%p1%dM,
|
|
||||||
dl1=\E[M,
|
|
||||||
ech=\E[%p1%dX,
|
|
||||||
ed=\E[J,
|
|
||||||
el=\E[K,
|
|
||||||
el1=\E[1K,
|
|
||||||
enacs=\E)0,
|
|
||||||
flash=\E[?5h$<80/>\E[?5l,
|
|
||||||
fsl=^G,
|
|
||||||
home=\E[H,
|
|
||||||
hpa=\E[%i%p1%dG,
|
|
||||||
hs,
|
|
||||||
ht=^I,
|
|
||||||
hts=\EH,
|
|
||||||
ich=\E[%p1%d@,
|
|
||||||
il1=\E[L,
|
|
||||||
il=\E[%p1%dL,
|
|
||||||
ind=^J,
|
|
||||||
indn=\E[%p1%dS,
|
|
||||||
invis=\E[8m,
|
|
||||||
is2=\E[4l\E>\E[?1034l,
|
|
||||||
it#8,
|
|
||||||
kel=\E[1;2F,
|
|
||||||
ked=\E[1;5F,
|
|
||||||
ka1=\E[1~,
|
|
||||||
ka3=\E[5~,
|
|
||||||
kc1=\E[4~,
|
|
||||||
kc3=\E[6~,
|
|
||||||
kbs=\177,
|
|
||||||
kcbt=\E[Z,
|
|
||||||
kb2=\EOu,
|
|
||||||
kcub1=\EOD,
|
|
||||||
kcud1=\EOB,
|
|
||||||
kcuf1=\EOC,
|
|
||||||
kcuu1=\EOA,
|
|
||||||
kDC=\E[3;2~,
|
|
||||||
kent=\EOM,
|
|
||||||
kEND=\E[1;2F,
|
|
||||||
kIC=\E[2;2~,
|
|
||||||
kNXT=\E[6;2~,
|
|
||||||
kPRV=\E[5;2~,
|
|
||||||
kHOM=\E[1;2H,
|
|
||||||
kLFT=\E[1;2D,
|
|
||||||
kRIT=\E[1;2C,
|
|
||||||
kind=\E[1;2B,
|
|
||||||
kri=\E[1;2A,
|
|
||||||
kclr=\E[3;5~,
|
|
||||||
kdl1=\E[3;2~,
|
|
||||||
kdch1=\E[3~,
|
|
||||||
kich1=\E[2~,
|
|
||||||
kend=\E[4~,
|
|
||||||
kf1=\EOP,
|
|
||||||
kf2=\EOQ,
|
|
||||||
kf3=\EOR,
|
|
||||||
kf4=\EOS,
|
|
||||||
kf5=\E[15~,
|
|
||||||
kf6=\E[17~,
|
|
||||||
kf7=\E[18~,
|
|
||||||
kf8=\E[19~,
|
|
||||||
kf9=\E[20~,
|
|
||||||
kf10=\E[21~,
|
|
||||||
kf11=\E[23~,
|
|
||||||
kf12=\E[24~,
|
|
||||||
kf13=\E[1;2P,
|
|
||||||
kf14=\E[1;2Q,
|
|
||||||
kf15=\E[1;2R,
|
|
||||||
kf16=\E[1;2S,
|
|
||||||
kf17=\E[15;2~,
|
|
||||||
kf18=\E[17;2~,
|
|
||||||
kf19=\E[18;2~,
|
|
||||||
kf20=\E[19;2~,
|
|
||||||
kf21=\E[20;2~,
|
|
||||||
kf22=\E[21;2~,
|
|
||||||
kf23=\E[23;2~,
|
|
||||||
kf24=\E[24;2~,
|
|
||||||
kf25=\E[1;5P,
|
|
||||||
kf26=\E[1;5Q,
|
|
||||||
kf27=\E[1;5R,
|
|
||||||
kf28=\E[1;5S,
|
|
||||||
kf29=\E[15;5~,
|
|
||||||
kf30=\E[17;5~,
|
|
||||||
kf31=\E[18;5~,
|
|
||||||
kf32=\E[19;5~,
|
|
||||||
kf33=\E[20;5~,
|
|
||||||
kf34=\E[21;5~,
|
|
||||||
kf35=\E[23;5~,
|
|
||||||
kf36=\E[24;5~,
|
|
||||||
kf37=\E[1;6P,
|
|
||||||
kf38=\E[1;6Q,
|
|
||||||
kf39=\E[1;6R,
|
|
||||||
kf40=\E[1;6S,
|
|
||||||
kf41=\E[15;6~,
|
|
||||||
kf42=\E[17;6~,
|
|
||||||
kf43=\E[18;6~,
|
|
||||||
kf44=\E[19;6~,
|
|
||||||
kf45=\E[20;6~,
|
|
||||||
kf46=\E[21;6~,
|
|
||||||
kf47=\E[23;6~,
|
|
||||||
kf48=\E[24;6~,
|
|
||||||
kf49=\E[1;3P,
|
|
||||||
kf50=\E[1;3Q,
|
|
||||||
kf51=\E[1;3R,
|
|
||||||
kf52=\E[1;3S,
|
|
||||||
kf53=\E[15;3~,
|
|
||||||
kf54=\E[17;3~,
|
|
||||||
kf55=\E[18;3~,
|
|
||||||
kf56=\E[19;3~,
|
|
||||||
kf57=\E[20;3~,
|
|
||||||
kf58=\E[21;3~,
|
|
||||||
kf59=\E[23;3~,
|
|
||||||
kf60=\E[24;3~,
|
|
||||||
kf61=\E[1;4P,
|
|
||||||
kf62=\E[1;4Q,
|
|
||||||
kf63=\E[1;4R,
|
|
||||||
khome=\E[1~,
|
|
||||||
kil1=\E[2;5~,
|
|
||||||
krmir=\E[2;2~,
|
|
||||||
knp=\E[6~,
|
|
||||||
kmous=\E[M,
|
|
||||||
kpp=\E[5~,
|
|
||||||
lines#24,
|
|
||||||
mir,
|
|
||||||
msgr,
|
|
||||||
npc,
|
|
||||||
op=\E[39;49m,
|
|
||||||
pairs#64,
|
|
||||||
mc0=\E[i,
|
|
||||||
mc4=\E[4i,
|
|
||||||
mc5=\E[5i,
|
|
||||||
rc=\E8,
|
|
||||||
rev=\E[7m,
|
|
||||||
ri=\EM,
|
|
||||||
rin=\E[%p1%dT,
|
|
||||||
ritm=\E[23m,
|
|
||||||
rmacs=\E(B,
|
|
||||||
rmcup=\E[?1049l,
|
|
||||||
rmir=\E[4l,
|
|
||||||
rmkx=\E[?1l\E>,
|
|
||||||
rmso=\E[27m,
|
|
||||||
rmul=\E[24m,
|
|
||||||
rs1=\Ec,
|
|
||||||
rs2=\E[4l\E>\E[?1034l,
|
|
||||||
sc=\E7,
|
|
||||||
sitm=\E[3m,
|
|
||||||
sgr0=\E[0m,
|
|
||||||
smacs=\E(0,
|
|
||||||
smcup=\E[?1049h,
|
|
||||||
smir=\E[4h,
|
|
||||||
smkx=\E[?1h\E=,
|
|
||||||
smso=\E[7m,
|
|
||||||
smul=\E[4m,
|
|
||||||
tbc=\E[3g,
|
|
||||||
tsl=\E]0;,
|
|
||||||
xenl,
|
|
||||||
vpa=\E[%i%p1%dd,
|
|
||||||
# XTerm extensions
|
|
||||||
rmxx=\E[29m,
|
|
||||||
smxx=\E[9m,
|
|
||||||
# disabled rep for now: causes some issues with older ncurses versions.
|
|
||||||
# rep=%p1%c\E[%p2%{1}%-%db,
|
|
||||||
# tmux extensions, see TERMINFO EXTENSIONS in tmux(1)
|
|
||||||
Tc,
|
|
||||||
Ms=\E]52;%p1%s;%p2%s\007,
|
|
||||||
Se=\E[2 q,
|
|
||||||
Ss=\E[%p1%d q,
|
|
||||||
|
|
||||||
st| simpleterm,
|
|
||||||
use=st-mono,
|
|
||||||
colors#8,
|
|
||||||
setab=\E[4%p1%dm,
|
|
||||||
setaf=\E[3%p1%dm,
|
|
||||||
setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
|
|
||||||
setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
|
|
||||||
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
|
|
||||||
|
|
||||||
st-256color| simpleterm with 256 colors,
|
|
||||||
use=st,
|
|
||||||
ccc,
|
|
||||||
colors#256,
|
|
||||||
oc=\E]104\007,
|
|
||||||
pairs#32767,
|
|
||||||
# Nicked from xterm-256color
|
|
||||||
initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
|
|
||||||
setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
|
|
||||||
setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
|
|
||||||
|
|
||||||
st-meta| simpleterm with meta key,
|
|
||||||
use=st,
|
|
||||||
km,
|
|
||||||
rmm=\E[?1034l,
|
|
||||||
smm=\E[?1034h,
|
|
||||||
rs2=\E[4l\E>\E[?1034h,
|
|
||||||
is2=\E[4l\E>\E[?1034h,
|
|
||||||
|
|
||||||
st-meta-256color| simpleterm with meta key and 256 colors,
|
|
||||||
use=st-256color,
|
|
||||||
km,
|
|
||||||
rmm=\E[?1034l,
|
|
||||||
smm=\E[?1034h,
|
|
||||||
rs2=\E[4l\E>\E[?1034h,
|
|
||||||
is2=\E[4l\E>\E[?1034h,
|
|
||||||
|
|
||||||
st-bs| simpleterm with backspace as backspace,
|
|
||||||
use=st,
|
|
||||||
kbs=\010,
|
|
||||||
kdch1=\177,
|
|
||||||
|
|
||||||
st-bs-256color| simpleterm with backspace as backspace and 256colors,
|
|
||||||
use=st-256color,
|
|
||||||
kbs=\010,
|
|
||||||
kdch1=\177,
|
|
|
@ -1,40 +0,0 @@
|
||||||
/* See LICENSE for license details. */
|
|
||||||
|
|
||||||
enum win_mode {
|
|
||||||
MODE_VISIBLE = 1 << 0,
|
|
||||||
MODE_FOCUSED = 1 << 1,
|
|
||||||
MODE_APPKEYPAD = 1 << 2,
|
|
||||||
MODE_MOUSEBTN = 1 << 3,
|
|
||||||
MODE_MOUSEMOTION = 1 << 4,
|
|
||||||
MODE_REVERSE = 1 << 5,
|
|
||||||
MODE_KBDLOCK = 1 << 6,
|
|
||||||
MODE_HIDE = 1 << 7,
|
|
||||||
MODE_APPCURSOR = 1 << 8,
|
|
||||||
MODE_MOUSESGR = 1 << 9,
|
|
||||||
MODE_8BIT = 1 << 10,
|
|
||||||
MODE_BLINK = 1 << 11,
|
|
||||||
MODE_FBLINK = 1 << 12,
|
|
||||||
MODE_FOCUS = 1 << 13,
|
|
||||||
MODE_MOUSEX10 = 1 << 14,
|
|
||||||
MODE_MOUSEMANY = 1 << 15,
|
|
||||||
MODE_BRCKTPASTE = 1 << 16,
|
|
||||||
MODE_NUMLOCK = 1 << 17,
|
|
||||||
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
|
||||||
|MODE_MOUSEMANY,
|
|
||||||
};
|
|
||||||
|
|
||||||
void xbell(void);
|
|
||||||
void xclipcopy(void);
|
|
||||||
void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
|
|
||||||
void xdrawline(Line, int, int, int);
|
|
||||||
void xfinishdraw(void);
|
|
||||||
void xloadcols(void);
|
|
||||||
int xsetcolorname(int, const char *);
|
|
||||||
void xseticontitle(char *);
|
|
||||||
void xsettitle(char *);
|
|
||||||
int xsetcursor(int);
|
|
||||||
void xsetmode(int, unsigned int);
|
|
||||||
void xsetpointermotion(int);
|
|
||||||
void xsetsel(char *);
|
|
||||||
int xstartdraw(void);
|
|
||||||
void xximspot(int, int);
|
|
2073
.suckless/st/x.c
2073
.suckless/st/x.c
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue