Commit graph

5747 commits

Author SHA1 Message Date
Luminarys daea22bc89 Resize lock fixes 2015-08-19 12:06:00 -05:00
Ezra 745031e6f9 More merge resolution. 2015-08-19 11:29:32 -05:00
Luminarys 9542f8746a Added in resize locking 2015-08-19 11:28:04 -05:00
Luminarys 0b23962564 Resolved merge conflicts 2015-08-19 11:23:27 -05:00
taiyu 289aab9f0a removed debug which shouldnt be there 2015-08-19 09:21:44 -07:00
taiyu 8205a6fd3b floating_modifier uses mod_keys instead of anykey 2015-08-19 09:09:35 -07:00
Luminarys dd8ff4a150 Added in resize locking 2015-08-19 10:52:01 -05:00
Drew DeVault 2d3bd3c747 Merge pull request #86 from Luminarys/master
Fixed config loading
2015-08-19 10:36:33 -04:00
Luminarys 0e4df85ba1 Fixed config loading 2015-08-19 09:33:30 -05:00
Drew DeVault 0f29f04816 Set test to NULL when appropriate
Thanks @SyedAmerGilani
2015-08-19 08:24:39 -04:00
Drew DeVault 1ec8e082a2 Free environment vars after loading config
Thanks @SyedAmerGilani
2015-08-19 08:22:18 -04:00
Drew DeVault 79f9d93ef3 Refactor config file loading 2015-08-19 07:50:27 -04:00
Drew DeVault 8fb2e7e34e Merge pull request #79 from taiyu-len/master
fixed floating_modifier related things
2015-08-19 07:14:03 -04:00
Drew DeVault ae367c5af4 Merge pull request #80 from SyedAmerGilani/fix_memory_leaks
fix a few possible memory leaks
2015-08-19 07:01:14 -04:00
Drew DeVault 5c8daa6487 Merge pull request #81 from SyedAmerGilani/fix_xdg_config_home
fixed string building for XDG_CONFIG_HOME config loading
2015-08-19 07:00:35 -04:00
Syed Amer Gilani ba5b451dd0 fixed string building for XDG_CONFIG_HOME config loading 2015-08-19 12:51:11 +02:00
Syed Amer Gilani 95517ac77e fix a few possible memory leaks 2015-08-19 11:27:48 +02:00
taiyu c5a6982893 fixed some more bugs, moved layout_log into log.ch, restored focus_parent 2015-08-19 01:06:15 -07:00
taiyu e16a4015ff fixed focus key handler 2015-08-19 00:28:53 -07:00
taiyu 1bf02144e5 fixed floating_modifier related things 2015-08-18 23:52:42 -07:00
taiyu 6dc1ae802b focus to only child 2015-08-18 22:20:31 -07:00
Luminarys 774e594714 Fixed full screen workspace switch focusing 2015-08-18 21:41:16 -05:00
taiyu 2f40459de4 fixed focus on fullscreen view destroy 2015-08-18 19:15:10 -07:00
Luminarys 3c430688a8 header update 2015-08-18 21:06:41 -05:00
Luminarys f718556a85 Removed debugging, added in proper gap resets for config reloads 2015-08-18 21:05:58 -05:00
Drew DeVault ab5805ca6e Merge pull request #74 from Luminarys/master
Added in proper floating window resizing
2015-08-18 19:25:16 -04:00
Luminarys ab43927a47 Minor fixes that might be helpful later 2015-08-18 18:04:46 -05:00
Luminarys 7137be9a3f Fixes to make floating windows work better 2015-08-18 18:03:23 -05:00
Luminarys 3e950c2b1c Basic fixes to floating movement 2015-08-18 18:03:23 -05:00
Drew DeVault e6d83206bd Document new commands in sway(5) 2015-08-18 18:51:20 -04:00
Drew DeVault cf916bbf6f Improvements to gaps 2015-08-18 18:44:50 -04:00
Drew DeVault 446d593b4c Merge pull request #73 from KoffeinFlummi/gaps
Add support for gaps option
2015-08-18 18:07:51 -04:00
KoffeinFlummi c75d5ceba4 Merge remote-tracking branch 'upstream/master' into gaps 2015-08-19 00:05:18 +02:00
Drew DeVault 8e201091a5 Fix indented comments being weird 2015-08-18 18:03:38 -04:00
KoffeinFlummi 4c688cba4e Add support for gaps option 2015-08-18 23:53:57 +02:00
Drew DeVault 443ae9b89e Merge pull request #72 from minus7/assert
added sway_assert function
2015-08-18 17:44:00 -04:00
minus faccaf6112 added sway_assert function
returns false on a failed assertion in release mode and raises SIGABRT in debug mode
2015-08-18 23:38:34 +02:00
Luminarys 5b6e489872 More patches for wlc compat 2015-08-18 16:28:24 -05:00
Luminarys a7c045a520 Patched for wlc updates 2015-08-18 16:24:01 -05:00
Half-Shot f314d95103 Merge branch 'master' of https://github.com/SirCmpwn/sway 2015-08-18 21:42:28 +01:00
Will Hunt d6ab5e481b Beguin work on the move command.
Stubbed method.
2015-08-18 21:42:23 +01:00
Drew DeVault feb0195341 Improve README (more) 2015-08-18 16:18:15 -04:00
Drew DeVault be871731e1 Improve README 2015-08-18 16:16:42 -04:00
Drew DeVault 62a21d9d4d Merge pull request #71 from Luminarys/master
Added in proper focus handling for floating containers.
2015-08-18 15:24:39 -04:00
Luminarys 7756f423c3 Removed unnecessary debugging lines 2015-08-18 13:54:52 -05:00
Luminarys 01c6caced6 Added in proper focus handling for floating windows 2015-08-18 13:53:06 -05:00
Drew DeVault ef2f3d3115 Merge pull request #70 from taiyu-len/master
restored fullscreen/focus behavior
2015-08-18 14:51:57 -04:00
taiyu 03e83c7ef9 restored fullscreen/focus behavior 2015-08-18 11:22:52 -07:00
Luminarys 23b90d8e69 Fixed mouse clicks from triggering a segfault 2015-08-18 10:39:37 -05:00
Drew DeVault 85a573dab7 Revert "enhanced whitespace remover"
This reverts commit abd0afb03a.
2015-08-18 08:39:26 -04:00