Commit Graph

311 Commits

Author SHA1 Message Date
Jari Vetoniemi
543b6c4473
Merge pull request #86 from khardix/pr/extern-wayland-globals
Mark global wayland constant extern
2020-02-07 17:10:25 +09:00
Jan Staněk
2f45c191bc
Mark global wayland constant extern
Without `extern`, the changed lines are not declarations,
but "tentative definitions"
(according to GCC man page, option `-fcommon`).
When specified in a header file
that is included in more than one `.c` file,
these result in linking failure unless `-fcommon` is specified.

GCC 10 changed the default from `-fcommon` to `-fno-common`,
and as such the previous code no longer links properly.

With `extern`, these lines are considered declarations,
and the linking proceeds successfully.
2020-02-06 17:35:20 +01:00
Jari Vetoniemi
7170c93f3a menu: reset cursor at end on set_filter 2020-02-03 17:43:46 +09:00
Jari Vetoniemi
1607215d70 Extra whitespace 2020-02-03 17:26:17 +09:00
Jari Vetoniemi
88bd960718 CMake: Compile renderers after exports 2020-02-03 17:21:19 +09:00
Jari Vetoniemi
e925a6aef7
Merge pull request #84 from escondida/readme-wlroots
Document that bemenu is works only with wlroots-based compositors
2020-01-31 04:07:48 +09:00
Ivy Foster
fc1eba9229 Document that bemenu is currently for use only with wlroots-based compositors
See https://github.com/Cloudef/bemenu/issues/79#issuecomment-572867783
2020-01-29 16:43:43 -06:00
Jari Vetoniemi
b1a3f54b07
Add donation option 2020-01-29 18:43:17 +09:00
Jari Vetoniemi
98f7c806d9
Merge pull request #78 from sleich/master
Add Ctrl-[ shortcut to x11 and wayland
2020-01-08 20:11:14 +09:00
sleich
9ac860b817 Add Ctrl-[ shortcut to x11 and wayland
Ctrl-[ shortcut is used to quit bemenu. It already works with ncurses backend
2020-01-08 04:47:57 +03:00
Jari Vetoniemi
ed31d9d559
Merge pull request #77 from jubalh/err
Rename stdscr to stdscreen to prevent collision
2020-01-04 18:42:39 +09:00
Michael Vetter
0f6e1625b5 Rename stdscr to stdscreen to prevent collision
On my system I get:
```
[    3s] cd /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/build/lib/renderers/x11 && /usr/bin/cc -DPANGO_DISABLE_DEPRECATED -D_GNU_SOURCE -Dbemenu_renderer_x11_EXPORTS -I/home/abuild/rpmbuild/BUI
LD/bemenu-0.3.0/build/lib -I/home/abuild/rpmbuild/BUILD/bemenu-0.3.0/lib/renderers/.. -I/home/abuild/rpmbuild/BUILD/bemenu-0.3.0/build/lib/renderers/x11 -I/usr/include/cairo -I/usr/include/g
lib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/uuid -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/inc
lude/fribidi  -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -DNDEBUG   -Wall
-Wextra -Wno-variadic-macros -Wno-long-long -O2 -g -DNDEBUG -fPIC   -std=c99 -o CMakeFiles/bemenu-renderer-x11.dir/xkb_unicode.c.o   -c /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/lib/renderers
/x11/xkb_unicode.c
[    3s] [ 55%] Building C object lib/CMakeFiles/bemenu.dir/3rdparty/cdl.c.o
[    3s] cd /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/build/lib && /usr/bin/cc -D_GNU_SOURCE -Dbemenu_EXPORTS -I/home/abuild/rpmbuild/BUILD/bemenu-0.3.0/build/lib  -O2 -Wall -D_FORTIFY_SOURCE
=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -DNDEBUG   -Wall -Wextra -Wno-variadic-macros -Wno-long-lo
ng -O2 -g -DNDEBUG -fPIC   -std=c99 -o CMakeFiles/bemenu.dir/3rdparty/cdl.c.o   -c /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/lib/3rdparty/cdl.c
[    3s] In file included from /usr/include/ncurses.h:60,
[    3s]                  from /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/lib/renderers/curses/curses.c:14:
[    3s] /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/lib/renderers/curses/curses.c:27:13: error: field '_nc_stdscr' declared as a function
[    3s]    27 |     WINDOW *stdscr;
[    3s]       |             ^~~~~~
[    3s] /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/lib/renderers/curses/curses.c: In function 'terminate':
[    3s] /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/lib/renderers/curses/curses.c:97:19: error: lvalue required as left operand of assignment
[    3s]    97 |     curses.stdscr = NULL;
[    3s]       |                   ^
[    3s] /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/lib/renderers/curses/curses.c: In function 'render':
[    3s] /home/abuild/rpmbuild/BUILD/bemenu-0.3.0/lib/renderers/curses/curses.c:190:28: error: lvalue required as left operand of assignment
[    3s]   190 |         if ((curses.stdscr = initscr()) == NULL)
[    3s]       |                            ^
```

`man stdscr` sais: "Upon  initializing curses, a default window called stdscr, which is the size of the terminal screen, is created.".

So it seems for some reason there happens a collision here.

Let's rename the window so this doesn't happen.
2019-12-27 14:47:06 +01:00
Jari Vetoniemi
bed158e6ce
Merge pull request #75 from t6/patch-version
Bump version to 0.3.0
2019-12-20 21:26:04 +09:00
Tobias Kortkamp
0c1e34cf81
Bump version to 0.3.0 2019-12-20 09:45:10 +01:00
Jari Vetoniemi
fedb1b0ab0 Use monospace 10 instead of fixed 9 by default
Matches the dmenu default, monospace instead of font name is more
robust.
2019-12-19 16:58:59 +02:00
Jari Vetoniemi
c9d9bcdaf5
Merge pull request #70 from lheckemann/hidpi
Handle HiDPI scaling on Wayland
2019-11-05 21:04:22 +09:00
Linus Heckemann
03c54c1d4b scaling: require scale > 0 2019-11-05 12:59:37 +01:00
Adrian Müller
1f1aebf26a Handle HiDPI scaling on Wayland 2019-11-05 10:13:34 +01:00
Jari Vetoniemi
14f7f02a7c Bump version to 0.2.0 2019-10-25 20:24:55 +09:00
Jari Vetoniemi
442d2833f4
Merge pull request #64 from khardix/man-page
Add man pages for bemenu binaries
2019-08-08 13:45:44 +09:00
Jan “Khardix” Staněk
40114d3cf6
Correct documentation of execution process 2019-08-07 19:18:02 +02:00
Jan Staněk
11b9187a68
Install man pages to expected location 2019-08-07 14:50:18 +02:00
Jan Staněk
29692e5fd0
Write man page for bemenu 2019-08-07 14:33:28 +02:00
Jari Vetoniemi
c6eda7f42b
Merge pull request #61 from sauyon/master
Add C-g shortcut to x11 and wayland
2019-07-15 09:52:44 +03:00
Sauyon Lee
c081cf7609
Add C-g shortcut to x11 and wayland 2019-07-13 00:46:18 +01:00
Jari Vetoniemi
f464f0e30a
Merge pull request #60 from toke/bugfix/upstream-59
Prevent a deadloop in PATH handling
2019-06-05 18:15:42 +03:00
Thomas Kerpe
5d787629a5 Prevent a deadloop in PATH handling
Empty PATH segments should no longer cause
a deadloop.

Fixes #59
2019-06-05 15:59:16 +02:00
Jari Vetoniemi
572470ef8c
Merge pull request #57 from alyssais/line-height
bemenu: add --line-height / -H option
2019-06-01 22:09:52 +03:00
Jari Vetoniemi
dac040f659
Merge pull request #58 from alyssais/gitignore
gitignore: add missing generated files
2019-06-01 22:07:48 +03:00
Alyssa Ross
93cde4831b
bemenu: add --line-height / -H option
Text is displayed vertically centered in a line. If unspecified, or 0,
the previous behaviour of making the height the size of the text, plus
two pixels on either side, is used, so there will be no change in
behaviour if this option is not used.

Fixes https://github.com/Cloudef/bemenu/issues/44.
2019-05-31 23:20:54 +00:00
Alyssa Ross
b2cad5685e
gitignore: add missing generated files 2019-05-31 20:38:09 +00:00
Jari Vetoniemi
121367b940
Merge pull request #56 from samihda/master
Fix typo
2019-05-05 15:50:15 +03:00
samihda
5f01531482 Fix typo 2019-05-03 17:36:21 +02:00
Jari Vetoniemi
f27e35eabc Revert "Use x_LINK_LIBRARIES instead of x_LIBRARIES"
This reverts commit 620ae69020.
2019-04-24 22:39:23 +03:00
Jari Vetoniemi
6cc18e381c
Merge pull request #52 from t6/patch-freebsd
FreeBSD support
2019-04-24 02:44:38 +03:00
Tobias Kortkamp
620ae69020
Use x_LINK_LIBRARIES instead of x_LIBRARIES
The libraries might not be in the linkers default search path, so
use absolute paths for them instead when using TARGET_LINK_LIBRARIES.

Note that XKBCOMMON_LIBRARIES is an alias for XKBCOMMON_LIBRARY and
already contains an absolute path.

Signed-off-by: Tobias Kortkamp <t@tobik.me>
2019-04-23 12:17:16 +02:00
Tobias Kortkamp
2ca0625a70
Depend on epoll-shim on FreeBSD/DragonFly
They do not natively support epoll(2) but require a library shim for it.

Signed-off-by: Tobias Kortkamp <t@tobik.me>
2019-04-23 11:45:13 +02:00
Tobias Kortkamp
312a606d54
Use epoll_create1() instead of epoll_create()
epoll_create() takes a size argument not a flag like EPOLL_CLOEXEC [1].

[1] https://linux.die.net/man/2/epoll_create

Signed-off-by: Tobias Kortkamp <t@tobik.me>
2019-04-23 11:41:03 +02:00
Jari Vetoniemi
8ad07cff11
Merge pull request #49 from ammen99/fix-cmake
x11: add pango as dependency of the x11 renderer
2019-03-26 00:07:26 +02:00
Ilia Bozhinov
31107243db x11: add pango as dependency of the x11 renderer
We include the cairo rendering functions, which use pango.
2019-03-25 23:05:35 +01:00
Ilia Bozhinov
38069992ec Add option to respect panel position (#48)
* implement option to make menu respect panel boundaries

* fixup! implement option to make menu respect panel boundaries
2019-03-25 23:21:17 +02:00
Jari Vetoniemi
b375ef8b0b
Merge pull request #46 from DanySpin97/master
Add options for renderers, make deps required
2019-03-25 10:52:24 +02:00
Danilo Spinella
5ca32626dc Add options for renderers, make deps required 2019-03-25 09:44:45 +01:00
Jari Vetoniemi
1be74a290f
Merge pull request #47 from ammen99/master
wayland: implement a proper repaint cycle
2019-03-25 07:59:16 +02:00
Ilia Bozhinov
ab82afab7f wayland: implement a proper repaint cycle 2019-03-24 20:18:59 +01:00
Jari Vetoniemi
33e540a2b0 CMake: Set version to 0.1.0 2019-03-03 20:46:30 +02:00
Jari Vetoniemi
72a38a7891 CMake: project arguments are separated by space 2019-02-16 13:36:30 +02:00
Jari Vetoniemi
427a3abcda
Merge pull request #39 from concatime/master
Restrict CMake to only C
2019-02-16 13:31:59 +02:00
Issam Maghni
a46ff50e41 Restrict CMake to only C 2019-02-16 01:30:53 -05:00
Jari Vetoniemi
799d8b9d1d
Merge pull request #36 from ppascher/ppascher-patch-1
Fix wayland renderer lagging behind by 1 keystroke
2019-01-31 09:51:56 +02:00