Commit graph

4368 commits

Author SHA1 Message Date
emersion 79e970d86e
Correctly clip title texture if necessary 2018-05-15 08:38:28 +01:00
Drew DeVault 95f6d0deba
Merge pull request #1954 from RyanDwyer/marks
Implement marks
2018-05-14 21:44:05 -04:00
Ryan Dwyer 4d1edfcba9 Change unmark implemention to match i3's 2018-05-15 11:24:16 +10:00
Ryan Dwyer 22d38600d0 Implement marks 2018-05-15 11:18:27 +10:00
Drew DeVault f1f54bbc88
Merge pull request #1978 from RedSoxFan/fix-1975
Fix #1975
2018-05-14 18:10:54 -04:00
Brian Ashworth 9ba0dca7ba
Merge branch 'master' into fix-1975 2018-05-14 09:06:23 -04:00
Brian Ashworth 77b42ec821 Always render top border for border normal 2018-05-14 09:04:18 -04:00
Drew DeVault 1837756dbe
Merge pull request #1871 from emersion/kill-wl-shell
Kill wl_shell
2018-05-14 08:33:55 -04:00
emersion 95a10dd4f3
Kill wl_shell 2018-05-14 13:26:10 +01:00
Drew DeVault 4e6cb2b4b2
Merge pull request #1968 from RyanDwyer/fix-criteria
Fix double free in criteria
2018-05-14 08:00:08 -04:00
Brian Ashworth 3488fbc859 Fix y and height for a hidden top normal border 2018-05-14 01:46:53 -04:00
Brian Ashworth 34b864fb17
Merge branch 'master' into fix-1975 2018-05-14 00:28:21 -04:00
Brian Ashworth 6ff7c52736 Fix titles and detect edges for hide_edge_borders 2018-05-14 00:20:34 -04:00
Ryan Dwyer 92b8497a0b Fix crash when launching programs from dmenu 2018-05-14 11:48:15 +10:00
Ryan Dwyer 8432d8a15e xdg_shell: Replace get_prop with get_string_prop 2018-05-14 11:47:39 +10:00
Ryan Dwyer 490f92255c Initialise error_arg to NULL in criteria_parse 2018-05-14 11:38:09 +10:00
Ryan Dwyer 39007fc30f Fix double free in criteria 2018-05-14 11:38:09 +10:00
Ryan Dwyer bffcb496cc Revert "Revert "Merge pull request #1953 from RyanDwyer/criteria-focused""
This reverts commit ac0e62584f.

This reimplements the criteria __focused__ commit in preparation for
fixing a known bug.
2018-05-14 11:38:09 +10:00
Ryan Dwyer 1e9aaa54a8 Revert "Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements""
This reverts commit 32a572cecf.

This reimplements the criteria overhaul in preparation for fixing a
known bug.
2018-05-14 11:38:09 +10:00
Drew DeVault 270c1ee7e5 Actually fix swayidle
I also didn't test this commit though so who knows
2018-05-13 20:21:37 -04:00
Drew DeVault b65a75a6e1 swayidle: use wl_event_loop_dispatch_idle
Fixes #1977
2018-05-13 19:32:16 -04:00
Drew DeVault 404d006a1c Enable lazy xwayland 2018-05-13 14:18:07 -04:00
Drew DeVault b2dec12368
Merge pull request #1970 from emersion/xdg-shell-stable
Add xdg-shell stable support
2018-05-13 13:45:15 -04:00
Drew DeVault 4f540b638e Add pixman to swayidle deps 2018-05-13 12:55:40 -04:00
Drew DeVault 364439cc11
Merge pull request #1971 from emersion/fix-pango-markup
Fix pango markup
2018-05-13 12:26:52 -04:00
emersion 6eda10e4ca
Fix pango markup
The condition checking if the markup is valid was inverted.

This commit also adds better error handling: if the markup cannot
be parsed, it fallbacks to plain text.
2018-05-13 16:52:02 +01:00
emersion 88d9d43b36
Add xdg-shell stable support 2018-05-13 16:38:56 +01:00
emersion 4dfb0529f8
Merge pull request #1935 from heghe/heghe/fix-pango-markup-crash
Fix crash when using pango markup font
2018-05-13 16:16:16 +01:00
Heghedus Razvan 789a877b37 Fix crash when using pango markup font
The characters & < > ' " needs to be escaped when using pango markup

Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
2018-05-13 17:53:45 +03:00
Drew DeVault 61aa0937a7
Merge pull request #1824 from snaggen/idle
DPMS and lock handling
2018-05-13 10:11:10 -04:00
Ryan Dwyer 0c96d757d0
Merge pull request #1960 from RedSoxFan/edge-borders
Implement hide_edge_borders
2018-05-13 11:52:51 +10:00
Ryan Dwyer 90e6dfa268
Merge branch 'master' into edge-borders 2018-05-13 11:45:11 +10:00
Brian Ashworth 0f43eac5dc Fix recursion when counting descendants of a type 2018-05-12 21:19:55 -04:00
Mattias Eriksson f40049b5cd Remove asciidoc file for swayidle 2018-05-13 00:36:52 +02:00
Mattias Eriksson 8fbafbfab5 Idle handling for dpms/lockscreen et al
Swayidle handles idle events and allows
for dpms and lockscreen handling. It also
handles systemd sleep events, and can
raise a lockscreen on sleep

Fixes #541
2018-05-13 00:30:09 +02:00
Drew DeVault 9d607b7253
Merge pull request #1967 from emersion/remove-xdg-popup-unmap
Don't destroy view child on xdg-popup unmap
2018-05-12 14:56:20 -04:00
emersion 360e63b8a7
Don't destroy view child on xdg-popup unmap 2018-05-12 19:33:38 +01:00
Brian Ashworth 2adf23c2a3 Only count views for hide_edge_borders smart 2018-05-12 12:56:26 -04:00
Brian Ashworth ec60e24f75
Merge branch 'master' into edge-borders 2018-05-12 12:43:34 -04:00
Brian Ashworth e3625d8f33 Count descendant views for hide_edge_borders smart 2018-05-12 12:37:48 -04:00
Drew DeVault b1c33ecc25
Merge pull request #1964 from emersion/wlroots-970
Send pointer discrete axis values
2018-05-12 09:40:34 -04:00
Drew DeVault e2b8eac4bf
Merge branch 'master' into wlroots-970 2018-05-12 09:30:00 -04:00
Drew DeVault 867190e082
Merge pull request #1958 from swaywm/scdoc
Port man pages to scdoc
2018-05-12 09:27:24 -04:00
Drew DeVault 2da685e913 Merge remote-tracking branch 'origin/master' into scdoc 2018-05-12 09:01:16 -04:00
Drew DeVault 51b0b25587
Merge pull request #1959 from RyanDwyer/ipc-get-seats
Implement IPC get_seats command
2018-05-12 09:00:32 -04:00
Drew DeVault a2d7079b26 Merge branch 'master' into scdoc 2018-05-12 08:59:25 -04:00
Drew DeVault da679a8051 Fix typos 2018-05-12 08:58:48 -04:00
emersion 50298dc901
Send pointer discrete axis values and source
Update for swaywm/wlroots#970
2018-05-12 13:56:17 +01:00
Drew DeVault 32a572cecf Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements"
This reverts commit 3e1bf721c6, reversing
changes made to 2217518bd5.
2018-05-12 08:52:54 -04:00
Drew DeVault ac0e62584f Revert "Merge pull request #1953 from RyanDwyer/criteria-focused"
This reverts commit 2511adffc2, reversing
changes made to 3e1bf721c6.
2018-05-12 08:52:48 -04:00