Commit graph

3360 commits

Author SHA1 Message Date
Rostislav Pehlivanov
0cdc47ab1e Revert "Meson: Replace option instlibdir with libexecdir"
This reverts commit 830c4ef74c.
2018-05-06 00:19:43 +01:00
Rostislav Pehlivanov
cf602687c6 Revert "command/exec_always: Use wlr_log for logging errors in the child process"
This reverts commit 177c67e6b8.
2018-05-06 00:19:29 +01:00
Rostislav Pehlivanov
ac903c8752 Revert "security.d: Update install paths for swaybar and swaybg"
This reverts commit b4249166f3.
2018-05-06 00:19:12 +01:00
emersion
54265bf65e
Merge pull request #1917 from RyanDwyer/pango-markup
Implement pango support
2018-05-05 23:38:09 +01:00
Ryan Dwyer
556ff5f50e Implement pango support
Implements support for the pango: prefix in the font command.

Closes #1903.
2018-05-06 08:25:22 +10:00
emersion
72ce50737d
Merge pull request #1926 from RyanDwyer/fix-setenv-path
Fix PATH setenv() in exec_always
2018-05-05 23:24:02 +01:00
Ryan Dwyer
1daf69477e Fix PATH setenv() in exec_always 2018-05-06 08:16:34 +10:00
emersion
c96ac2ff2a
Merge pull request #1881 from nbraud/usr-lib
Install swaybar and swaybg under /usr/lib/sway
2018-05-05 20:09:34 +01:00
emersion
786727d8bb
Merge branch 'master' into usr-lib 2018-05-05 20:03:46 +01:00
Drew DeVault
967b14c227
Merge pull request #1924 from nbraud/spelling
swaymsg: Fix spelling in error message
2018-05-05 15:00:40 -04:00
Nicolas Braud-Santoni
30c00b2696
Merge branch 'master' into spelling 2018-05-05 20:42:17 +02:00
Nicolas Braud-Santoni
cb2a3e9036 swaymsg: Fix spelling in error message 2018-05-05 20:40:34 +02:00
Nicolas Braud-Santoni
b4249166f3 security.d: Update install paths for swaybar and swaybg 2018-05-05 17:42:41 +02:00
Nicolas Braud-Santoni
177c67e6b8 command/exec_always: Use wlr_log for logging errors in the child process 2018-05-05 17:22:46 +02:00
Nicolas Braud-Santoni
830c4ef74c Meson: Replace option instlibdir with libexecdir
Derive a value from it, called `rundir` rather than writing join_paths(libexecdir,
'sway') all over the place.
2018-05-05 17:22:46 +02:00
Nicolas Braud-Santoni
1670b46bf6 Make the LIBDIR path configurable 2018-05-05 17:22:46 +02:00
Nicolas Braud-Santoni
7709340727 exec_always: Search for executables in /usr/lib/sway 2018-05-05 17:22:46 +02:00
Nicolas Braud-Santoni
f2c209c299 Install swaybar and swaybg under /usr/lib/sway 2018-05-05 17:22:46 +02:00
Drew DeVault
a8d1b05bac
Merge pull request #1915 from RyanDwyer/title-format
Implement title_format
2018-05-05 11:08:33 -04:00
Ryan Dwyer
936226845f Add extra check for view title being NULL 2018-05-05 22:29:37 +10:00
Ryan Dwyer
5d6d24e71a Move code for re-arranging after font height change into a common place 2018-05-05 22:29:37 +10:00
Ryan Dwyer
da7d6642d3 Refactor parse_title_format() 2018-05-05 22:29:37 +10:00
Ryan Dwyer
d10a0a8c41 Fix memory leak in title_format command 2018-05-05 22:29:37 +10:00
Ryan Dwyer
228c478e8d Implement title_format
This implements the title_format command, with a new placeholder %shell
which gets substituted with the view type (xwayland, xdg_shell_v6 or
wl_shell).

Example config:

    for_window [title=".*"] title_format %title (class=%class instance=%instance shell=%shell)
2018-05-05 22:29:37 +10:00
Drew DeVault
8dae168b77
Merge pull request #1918 from RyanDwyer/title-scissor
Use scissor to render title texture
2018-05-05 07:25:10 -04:00
Ryan Dwyer
e83e5487be Use scissor to render title texture
This allows the title's texture to always be the full width of the text,
and clipped at render time according to the desired width (eg. tabs...).

As an added bonus, the texture no longer needs to be updated when
containers are arranged.
2018-05-05 20:32:31 +10:00
emersion
fbcbbb976c
Merge pull request #1912 from Hello71/patch-1
Check for NULL in container_update_title
2018-05-04 16:21:38 +01:00
Alex Xu (Hello71)
3202c45054 Check for NULL in container_update_title
Fixes crash when opening Firefox developer tools.
2018-05-04 11:10:01 -04:00
Drew DeVault
029c9b1796
Merge pull request #1907 from emersion/backend-input-mapping
Default to backend-wise input device mapping, if any
2018-05-03 10:46:02 -04:00
emersion
812525246a
Merge pull request #1901 from swaywm/touch-hide-cursor
Hide cursor on touch down
2018-05-03 15:45:40 +01:00
Drew DeVault
d233e75eec Hide cursor on touch down 2018-05-03 10:39:34 -04:00
Drew DeVault
00e62c214d Fix alphabetization of command list 2018-05-03 09:24:13 -04:00
Drew DeVault
437ae28566
Merge pull request #1906 from emersion/fix-resize-no-arg-segfault
Fix segfault when running the resize command without arguments
2018-05-03 09:17:35 -04:00
emersion
424006089e
Default to backend-wise input device mapping, if any 2018-05-03 14:16:17 +01:00
emersion
29224e7aec
Fix segfault when running the resize command without arguments 2018-05-03 14:04:39 +01:00
Drew DeVault
4fd3996d77
Merge pull request #1905 from RyanDwyer/fix-title-width
Fix title texture width
2018-05-03 09:02:53 -04:00
Ryan Dwyer
ed0d606c2a Fix title texture width
Use max of the container width or text width.
2018-05-03 22:51:14 +10:00
Drew DeVault
85396b90fb Fix unfocused.text default 2018-05-03 08:22:16 -04:00
Drew DeVault
87e65e5c5b
Merge pull request #1895 from RyanDwyer/show-titles
Render titles
2018-05-03 08:20:27 -04:00
Drew DeVault
58a033d816 Convert border_colors.text to float[4] 2018-05-03 08:14:17 -04:00
Drew DeVault
8f06aa7598 Fix anti-aliasing 2018-05-03 08:12:26 -04:00
Ryan Dwyer
74d1367fac Update titles when surfaces are committed 2018-05-03 15:42:49 +10:00
Ryan Dwyer
89d1571041 Fix potential segfault when setting container title 2018-05-03 15:23:39 +10:00
Ryan Dwyer
d3d1e38c1b Change comment format 2018-05-03 15:12:00 +10:00
Ryan Dwyer
55b307cddf Calculate config->font_height based on existing container titles 2018-05-03 15:12:00 +10:00
Ryan Dwyer
b667298a0a Render titles 2018-05-03 15:12:00 +10:00
emersion
f3d0885524
Merge pull request #1893 from swaywm/touch
Implement basic touch support
2018-05-02 22:09:11 +01:00
Drew DeVault
52aa245b24 Implement basic touch support
This required changing container_at_cursor to container_at_coords so
that we could get the appropriate surface (and sx/xy) without moving the
cursor.

Future work:

- Simulate a cursor for clients which have not bound to wl_touch
- Keep sending motion events when moving outside the surface (#1892)
- Bind gestures to sway commands
2018-05-02 09:00:26 -04:00
Dillen Meijboom
b45e2bd95e Fixed #1888 GCC cannot compile due to uninitialized variables (#1889) 2018-05-02 10:40:45 +01:00
emersion
fe9cc21ea7
Merge pull request #1886 from RyanDwyer/border-alpha
Support alpha in border colours
2018-05-02 08:00:23 +01:00