mirror of
https://github.com/tiyn/dmenu.git
synced 2025-10-18 22:01:20 +02:00
Compare commits
19 Commits
Author | SHA1 | Date | |
---|---|---|---|
829066cbb2 | |||
b5fe99141e | |||
dfc6c11af1 | |||
c27e2fb20e | |||
|
70b41a0fe6 | ||
|
0395a11ec1 | ||
|
9dcf8053a8 | ||
|
e5ff77ab9c | ||
|
9afe2c2b5b | ||
|
446fd5502f | ||
|
7263e134aa | ||
|
f325b36ae6 | ||
|
1551fa01e1 | ||
|
5bc1cb0478 | ||
|
3a6a2a8457 | ||
|
3befdc0815 | ||
|
da47fa1f67 | ||
|
1d594d8739 | ||
|
a617f1e853 |
17
.SRCINFO
Normal file
17
.SRCINFO
Normal file
@@ -0,0 +1,17 @@
|
||||
pkgbase = dmenu-tiyn-git
|
||||
pkgdesc = This is the dmenu build of tiyn. It includes the border, center and password patches.
|
||||
pkgver = 4.9
|
||||
pkgrel = 1
|
||||
url = https://github.com/tiyn/dmenu
|
||||
arch = x86_64
|
||||
arch = i686
|
||||
license = MIT
|
||||
makedepends = git
|
||||
provides = dmenu
|
||||
conflicts = dmenu
|
||||
replaces = dmenu
|
||||
source = git+https://github.com/tiyn/dmenu
|
||||
md5sums = SKIP
|
||||
|
||||
pkgname = dmenu-tiyn-git
|
||||
|
9
.gitignore
vendored
Normal file
9
.gitignore
vendored
Normal file
@@ -0,0 +1,9 @@
|
||||
*.o
|
||||
*.orig
|
||||
*.1
|
||||
dmenu
|
||||
dmenu_run
|
||||
dmenu_path
|
||||
stest
|
||||
pkg
|
||||
*.pkg.tar.xz
|
49
PKGBUILD
Normal file
49
PKGBUILD
Normal file
@@ -0,0 +1,49 @@
|
||||
# This is an example PKGBUILD file. Use this as a start to creating your own,
|
||||
# and remove these comments. For more information, see 'man PKGBUILD'.
|
||||
# NOTE: Please fill out the license field for your package! If it is unknown,
|
||||
# then please put 'unknown'.
|
||||
|
||||
# Maintainer: Marten Kante <tiyn@martenkante.eu>
|
||||
pkgname=dmenu-tiyn-git
|
||||
pkgver=4.9
|
||||
pkgrel=1
|
||||
epoch=
|
||||
pkgdesc="This is the dmenu build of tiyn. It includes the border, center and password patches."
|
||||
arch=(x86_64 i686)
|
||||
url="https://github.com/tiyn/dmenu"
|
||||
license=('MIT')
|
||||
groups=()
|
||||
depends=()
|
||||
makedepends=(git)
|
||||
checkdepends=()
|
||||
optdepends=()
|
||||
provides=(dmenu)
|
||||
conflicts=(dmenu)
|
||||
replaces=(dmenu)
|
||||
backup=()
|
||||
options=()
|
||||
install=
|
||||
changelog=
|
||||
source=("git+$url")
|
||||
noextract=()
|
||||
md5sums=('SKIP')
|
||||
validpgpkeys=()
|
||||
|
||||
pkgver() {
|
||||
cd "${_pkgname}"
|
||||
printf "4.9.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd dmenu
|
||||
make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
|
||||
}
|
||||
|
||||
package() {
|
||||
cd dmenu
|
||||
mkdir -p ${pkgdir}/opt/${pkgname}
|
||||
cp -rf * ${pkgdir}/opt/${pkgname}
|
||||
make PREFIX=/usr DESTDIR="${pkgdir}" install
|
||||
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
|
||||
}
|
19
README.md
Normal file
19
README.md
Normal file
@@ -0,0 +1,19 @@
|
||||
# dmenu
|
||||
|
||||
This is my patched version of dmenu.
|
||||
The base version is directly from suckless.org.
|
||||
This belongs to my larbs installation script, meaning it's supposed to work in the environment of the larbs-base-installation.
|
||||
|
||||
## Patches
|
||||
|
||||
The list below shows the currently applied patches to this build.
|
||||
- dmenu-border-4.9.diff (adds a border)
|
||||
- dmenu-center-20200111-8cd37e1.diff (adds option to center dmenu)
|
||||
- dmenu-fuzzymatch-4.9.diff (adds option to fuzzy matching)
|
||||
- dmenu-password-4.9.diff (adds option to hide input)
|
||||
|
||||
## Installation
|
||||
|
||||
The most basic way is to clone the repository and then invoke make.
|
||||
- `git clone https://github.com/tiyn/dmenu`
|
||||
- `make clean install`
|
12
config.def.h
12
config.def.h
@@ -2,6 +2,9 @@
|
||||
/* 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 */
|
||||
static int fuzzy = 1; /* -F option; if 0, dmenu doesn't use fuzzy matching */
|
||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
||||
static const char *fonts[] = {
|
||||
"monospace:size=10"
|
||||
@@ -9,9 +12,9 @@ static const char *fonts[] = {
|
||||
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" },
|
||||
[SchemeNorm] = { "#dfdfdf", "#0e0f14" },
|
||||
[SchemeSel] = { "#eeeeee", "#282828" },
|
||||
[SchemeOut] = { "#eeeeee", "#282828" },
|
||||
};
|
||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
||||
static unsigned int lines = 0;
|
||||
@@ -21,3 +24,6 @@ static unsigned int lines = 0;
|
||||
* for example: " /?\"&[]"
|
||||
*/
|
||||
static const char worddelimiters[] = " ";
|
||||
|
||||
/* Size of the window border */
|
||||
static const unsigned int border_width = 2;
|
||||
|
38
dmenu.c
38
dmenu.c
@@ -444,7 +444,8 @@ insert:
|
||||
if (lines > 0)
|
||||
return;
|
||||
/* fallthrough */
|
||||
case XK_Up:
|
||||
// case XK_Up:
|
||||
case XK_ISO_Left_Tab:
|
||||
if (sel && sel->left && (sel = sel->left)->right == curr) {
|
||||
curr = prev;
|
||||
calcoffsets();
|
||||
@@ -472,28 +473,29 @@ insert:
|
||||
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:
|
||||
// case XK_Right:
|
||||
// if (text[cursor] != '\0') {
|
||||
// cursor = nextrune(+1);
|
||||
// break;
|
||||
// }
|
||||
// if (lines > 0)
|
||||
// return;
|
||||
// /* fallthrough */
|
||||
// case XK_Down:
|
||||
case XK_Tab:
|
||||
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;
|
||||
// case XK_Tab:
|
||||
// if (!sel)
|
||||
// return;
|
||||
// strncpy(text, sel->text, sizeof text - 1);
|
||||
// text[sizeof text - 1] = '\0';
|
||||
// cursor = strlen(text);
|
||||
// match();
|
||||
// break;
|
||||
}
|
||||
|
||||
draw:
|
||||
|
4
drw.c
4
drw.c
@@ -139,11 +139,11 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
|
||||
* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
|
||||
* and lots more all over the internet.
|
||||
*/
|
||||
FcBool iscol;
|
||||
/*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;
|
||||
|
Reference in New Issue
Block a user