aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorLines
2018-05-15Correctly clip title texture if necessaryemersion-0/+1
2018-05-14Merge pull request #1954 from RyanDwyer/marksDrew DeVault-6/+209
2018-05-15Change unmark implemention to match i3'sRyan Dwyer-15/+43
2018-05-15Implement marksRyan Dwyer-3/+178
2018-05-14Merge pull request #1978 from RedSoxFan/fix-1975Drew DeVault-111/+101
2018-05-14Merge branch 'master' into fix-1975Brian Ashworth-702/+707
2018-05-14Always render top border for border normalBrian Ashworth-12/+10
2018-05-14Merge pull request #1871 from emersion/kill-wl-shellDrew DeVault-200/+2
2018-05-14Kill wl_shellemersion-200/+2
2018-05-14Merge pull request #1968 from RyanDwyer/fix-criteriaDrew DeVault-504/+707
2018-05-14Fix y and height for a hidden top normal borderBrian Ashworth-4/+2
2018-05-14Merge branch 'master' into fix-1975Brian Ashworth-13/+1074
2018-05-14Fix titles and detect edges for hide_edge_bordersBrian Ashworth-102/+96
2018-05-14Fix crash when launching programs from dmenuRyan Dwyer-1/+2
2018-05-14xdg_shell: Replace get_prop with get_string_propRyan Dwyer-2/+2
2018-05-14Initialise error_arg to NULL in criteria_parseRyan Dwyer-0/+1
2018-05-14Fix double free in criteriaRyan Dwyer-2/+1
2018-05-14Revert "Revert "Merge pull request #1953 from RyanDwyer/criteria-focused""Ryan Dwyer-42/+171
2018-05-14Revert "Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements""Ryan Dwyer-507/+580
2018-05-13Actually fix swayidleDrew DeVault-2/+2
2018-05-13swayidle: use wl_event_loop_dispatch_idleDrew DeVault-2/+3
2018-05-13Enable lazy xwayland1.0-alpha.2Drew DeVault-1/+1
2018-05-13Merge pull request #1970 from emersion/xdg-shell-stableDrew DeVault-1/+331
2018-05-13Add pixman to swayidle depsDrew DeVault-0/+1
2018-05-13Merge pull request #1971 from emersion/fix-pango-markupDrew DeVault-7/+9
2018-05-13Fix pango markupemersion-7/+9
2018-05-13Add xdg-shell stable supportemersion-1/+331
2018-05-13Merge pull request #1935 from heghe/heghe/fix-pango-markup-crashemersion-6/+99
2018-05-13Fix crash when using pango markup fontHeghedus Razvan-6/+99
2018-05-13Merge pull request #1824 from snaggen/idleDrew DeVault-2/+636
2018-05-13Merge pull request #1960 from RedSoxFan/edge-bordersRyan Dwyer-121/+251
2018-05-13Merge branch 'master' into edge-bordersRyan Dwyer-13/+0
2018-05-12Fix recursion when counting descendants of a typeBrian Ashworth-1/+2
2018-05-13Remove asciidoc file for swayidleMattias Eriksson-67/+0
2018-05-13Idle handling for dpms/lockscreen et alMattias Eriksson-2/+703
2018-05-12Merge pull request #1967 from emersion/remove-xdg-popup-unmapDrew DeVault-13/+0
2018-05-12Don't destroy view child on xdg-popup unmapemersion-13/+0
2018-05-12Only count views for hide_edge_borders smartBrian Ashworth-6/+15
2018-05-12Merge branch 'master' into edge-bordersBrian Ashworth-1561/+1083
2018-05-12Count descendant views for hide_edge_borders smartBrian Ashworth-5/+22
2018-05-12Merge pull request #1964 from emersion/wlroots-970Drew DeVault-1/+1
2018-05-12Merge branch 'master' into wlroots-970Drew DeVault-1553/+1073
2018-05-12Merge pull request #1958 from swaywm/scdocDrew DeVault-1551/+983
2018-05-12Merge remote-tracking branch 'origin/master' into scdocDrew DeVault-5/+90
2018-05-12Merge pull request #1959 from RyanDwyer/ipc-get-seatsDrew DeVault-5/+93
2018-05-12Merge branch 'master' into scdocDrew DeVault-587/+516
2018-05-12Fix typosDrew DeVault-9/+9
2018-05-12Send pointer discrete axis values and sourceemersion-1/+1
2018-05-12Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements"Drew DeVault-613/+517
2018-05-12Revert "Merge pull request #1953 from RyanDwyer/criteria-focused"Drew DeVault-171/+42