Commit graph

332 commits

Author SHA1 Message Date
Drew DeVault
14947c92aa Merge pull request #94 from taiyu-len/master
input_state.ch, and command conflicts resolved
2015-08-20 07:38:04 -04:00
taiyu
ba6034e8c8 changes 2015-08-20 04:24:39 -07:00
Drew DeVault
616d630fb0 Merge pull request #96 from KoffeinFlummi/gap-fix
Change gap behaviour to more closely match i3-gaps
2015-08-20 06:51:56 -04:00
KoffeinFlummi
3c124d9e7d Change gap behaviour to more closely match i3-gaps
Previously, when only using inner gaps, the gap between a window at the
edge of the output was only half the size of the gaps between views.

Additionally, the gaps between the actual windows was twice as wide as
it was on i3-gaps.
2015-08-20 08:47:51 +02:00
taiyu
1d9b73ed67 remove debug message 2015-08-19 20:31:28 -07:00
taiyu
686780f12d another small fix to move_focus 2015-08-19 20:29:24 -07:00
taiyu
66e82a68fc small fix 2015-08-19 20:28:05 -07:00
taiyu
5ff0619ca1 input state, find_container_in_direction 2015-08-19 20:22:15 -07:00
taiyu
470b4dfbae key_state.ch, and command conflicts resolved 2015-08-19 18:59:27 -07:00
Drew DeVault
4db89b5fe4 Deal with more xkb bullshit 2015-08-19 21:14:34 -04:00
Drew DeVault
e5d3074d70 Whitelist a handful of characters for keys
Ones that don't change when you hold shift
2015-08-19 21:04:34 -04:00
Drew DeVault
f2f7192865 Merge pull request #93 from Luminarys/master
Fixed mode_toggle
2015-08-19 21:00:39 -04:00
Luminarys
29b6b2f37b Fixed mode_toggle 2015-08-19 19:57:39 -05:00
Drew DeVault
1d8591d902 Improve key handling somewhat
XKB is fucking bullshit
2015-08-19 20:52:52 -04:00
Drew DeVault
84a778b688 Improve key buffer handling 2015-08-19 20:12:05 -04:00
Drew DeVault
2dabca03f4 Remove logging of all key presess
This makes the logs a bit too hard to read
2015-08-19 19:55:40 -04:00
Drew DeVault
057d2e529d Merge pull request #92 from z33ky/master
A couple of cppcheck issues
2015-08-19 19:30:26 -04:00
Alexander 'z33ky' Hirsch
f85d0740a8 Fix potential memory leak 2015-08-20 02:30:22 +02:00
Alexander 'z33ky' Hirsch
22675b0111 Minor style fix 2015-08-20 02:30:22 +02:00
Alexander 'z33ky' Hirsch
c068f47ce3 Fix potential crash when toggling fullscreen mode 2015-08-20 02:30:22 +02:00
Drew DeVault
74c9df0c07 Fix error with workspace/output name matching 2015-08-19 19:29:55 -04:00
taiyu
6f424ff6b8 fixed default active_workspace, and more use of set_focused_container_for(...) 2015-08-19 16:15:17 -07:00
taiyu
b79a49a394 use enums for pointer click names 2015-08-19 15:44:13 -07:00
taiyu
a31f23f90c fixed active_workspace update on focus change 2015-08-19 15:22:55 -07:00
taiyu
a90bd212a1 Merge branch 'master' of https://github.com/SirCmpwn/sway
merge
2015-08-19 13:27:23 -07:00
taiyu
269d6ba4ea fixed 2015-08-19 13:27:06 -07:00
Drew DeVault
532598947d Merge pull request #90 from taiyu-len/master
floating mode_toggle
2015-08-19 16:15:38 -04:00
taiyu
6cc29ebbf5 man page update 2015-08-19 13:10:58 -07:00
taiyu
48a983316c floating mode_toggle 2015-08-19 13:02:29 -07:00
Luminarys
c29214f348 Minor style fix 2015-08-19 14:14:54 -05:00
Drew DeVault
4ac920827d Merge pull request #89 from taiyu-len/master
reset floating view on floating_mod repress
2015-08-19 15:09:14 -04:00
taiyu
e53a95c60d style 2015-08-19 11:15:13 -07:00
taiyu
7bbb102e2d reset floating view on floating_mod repress 2015-08-19 10:45:40 -07:00
Drew DeVault
87d5d14310 Merge pull request #88 from aouelete/master
Fixed config path
2015-08-19 13:44:36 -04:00
aouelete
acbcf17905 Fixed config path 2015-08-19 13:41:58 -04:00
taiyu
8f529536e3 pointer uses its own modifiers 2015-08-19 10:27:53 -07:00
taiyu
8686142351 Merge pull request #87 from Luminarys/master
Added in resize locking
2015-08-19 10:25:36 -07:00
Luminarys
912702f030 Fixed conflicts 2015-08-19 12:07:51 -05:00
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