Commit graph

4567 commits

Author SHA1 Message Date
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
f718556a85 Removed debugging, added in proper gap resets for config reloads 2015-08-18 21:05:58 -05: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
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
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
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
Drew DeVault
a64b10df83 Fix switching between focused outputs 2015-08-18 08:30:21 -04:00
Drew DeVault
868cb3ca71 Revert "config handles comments better"
This reverts commit e9c3a9016f.
2015-08-18 08:05:34 -04:00
Drew DeVault
2139001c9f Coding style enforcement
This was done by hand, so I might have missed things. If anyone knows of
a good C style enforcement tool, let me know.
2015-08-18 07:20:34 -04:00
taiyu
af1b3d9755 fixed floating window crashing bug 2015-08-18 04:09:43 -07:00
Drew DeVault
2f6dd0687b Merge pull request #65 from taiyu-len/focus_v2
Focus v2
2015-08-18 07:02:31 -04:00
Drew DeVault
debb0d6bc1 Fix #64 2015-08-18 06:53:13 -04:00
taiyu
b132f67e7b minor fixes 2015-08-18 03:48:41 -07:00
taiyu
abd0afb03a enhanced whitespace remover 2015-08-18 03:22:31 -07:00
taiyu
e9c3a9016f config handles comments better 2015-08-18 02:48:56 -07:00
taiyu
63bc0d3b54 more changes 2015-08-18 02:46:14 -07:00
taiyu
eff55d0de1 fixed doubling memory bug for config lines longer then 128 2015-08-18 01:32:54 -07:00
taiyu
4606fb1ee3 merged Luminarys resizing code 2015-08-18 01:07:12 -07:00
taiyu
f0fe4a346d style 2015-08-18 00:58:25 -07:00
taiyu
11321ca2dd changed handling of focus, handling of view by type 2015-08-18 00:28:44 -07:00
Luminarys
e541ba3d87 Added in basic, but semi-broken moving/resizing functionality to floating windows 2015-08-18 01:33:15 -05:00
Drew DeVault
780893a933 Add support for workspace [name] output [name] 2015-08-17 20:34:53 -04:00
Drew DeVault
3f3d1ffee4 Rearrange main.c some more 2015-08-17 18:20:56 -04:00
Luminarys
7427ce8930 Switched config loading order to prevent root access w/wlc 2015-08-17 17:15:05 -05:00
Luminarys
1781450e86 Typo fix and more clarification 2015-08-17 14:24:55 -05:00
Luminarys
b5f19f0fd3 View destroy handling clean up and clarifications 2015-08-17 14:22:49 -05:00
taiyu
199ba05ef1 put back 2015-08-17 11:44:05 -07:00
taiyu
0eed6a4f99 Merge branch 'master' of https://github.com/SirCmpwn/sway
merging
2015-08-17 11:25:36 -07:00
taiyu
d2995d1eb2 fixed handling of views with override_redirect (dmenu) 2015-08-17 11:24:45 -07:00
Drew DeVault
9835845e22 Fix segfault from focus_view 2015-08-17 14:18:57 -04:00
taiyu
f832c02065 fixed when views dont have names. 2015-08-17 10:02:09 -07:00
Luminarys
c9ce8bf1bd Style and other minor fixes 2015-08-17 10:34:39 -05:00
Luminarys
3f475f5009 Minor fix to do proper floating refocuses 2015-08-17 10:22:00 -05:00
Luminarys
47ec999e71 Fixes to floating and umanaged views 2015-08-17 10:18:06 -05:00
Luminarys
da77dc45a9 Deleted file 2015-08-17 00:40:14 -05:00
Luminarys
05f969074e Added in basic floating toggling 2015-08-17 00:38:34 -05:00
Drew DeVault
be2635daa6 Fix format warnings 2015-08-16 22:16:09 -04:00
taiyu
f1d5305dc6 fix 2015-08-16 19:06:31 -07:00
taiyu
4077238782 sends hidden views to back, visible view to front 2015-08-16 18:59:12 -07:00
taiyu
ffb3458322 focus changes when mouse moves over border instead of all mouse movement 2015-08-16 18:41:51 -07:00
taiyu
498cf268f7 unmanaged views handled better 2015-08-16 18:24:46 -07:00
taiyu
c024f06631 handle_view_state_request 2015-08-16 17:28:06 -07:00
Luminarys
6b80879ec9 Minor naming fix workspace changing commands 2015-08-16 15:51:43 -05:00
Drew DeVault
7f4529ec8b Merge pull request #44 from Luminarys/master
Added in workspace next/prev and workspace output_next/prev
2015-08-16 16:46:16 -04:00
taiyu
5b860c67c3 fixed split [vh], small memory leak, unescape_strings handle \xnn 2015-08-16 13:38:54 -07:00
Drew DeVault
7514431836 Fix pointer events properly 2015-08-16 16:12:40 -04:00
Drew DeVault
7878490425 Revert "Return false from pointer events"
This reverts commit 981db16a8e.
2015-08-16 16:10:05 -04:00
Drew DeVault
981db16a8e Return false from pointer events 2015-08-16 16:00:11 -04:00
Luminarys
0a0fe18fd6 Added in workspace next/prev and workspace output_next/prev 2015-08-16 14:50:01 -05:00
Drew DeVault
4a5828370c Log output name when added to tree 2015-08-16 14:51:53 -04:00
Drew DeVault
19c0ec6a08 Fix movement between outputs 2015-08-16 14:47:08 -04:00
Drew DeVault
5ff71c2d5c Fix key handling from wlc 2015-08-16 13:26:41 -04:00
Drew DeVault
e64e61779e Set C_OUTPUT name to name from wlc 2015-08-16 13:07:43 -04:00
Drew DeVault
a092df52da Remove WLC_IDLE_TIME environment variable 2015-08-16 13:04:59 -04:00
Luminarys
dfaf3a059f Added in better exit handling 2015-08-16 11:54:37 -05:00
Luminarys
c94c41d1db Added in kill command 2015-08-16 11:41:41 -05:00
Drew DeVault
6e8280e7fd Config errors should not be fatal 2015-08-16 12:03:34 -04:00
Drew DeVault
7f8ebb7d0d Move headers to include/ 2015-08-16 11:02:56 -04:00
Drew DeVault
360b3d67b0 Add split [h|v|horizontal|vertical] command 2015-08-16 11:01:01 -04:00
Drew DeVault
ae536c21d3 Revert "get/set_userdata stores swayc_t *, fixed memory leak, minor changes." 2015-08-16 08:10:56 -04:00
taiyu
eefc76b39e set userdata for handler to swayc_t container 2015-08-16 00:46:58 -07:00
taiyu
e9e09d123c reduced code duplication 2015-08-15 22:11:19 -07:00
taiyu
9d69d880e6 Merge branch 'master' of https://github.com/SirCmpwn/sway
merge
2015-08-15 21:52:46 -07:00
taiyu
083d1eed1f fixed 2 small memory leaks & adds format attribute to log. 2015-08-15 21:21:20 -07:00
Luminarys
64a971882a Minor fix to config loading 2015-08-15 20:13:18 -05:00
Drew DeVault
6cc8ea29e5 Merge pull request #36 from Luminarys/master
Added in config file loading from multiple sources
2015-08-15 21:11:24 -04:00
Luminarys
24231bef0e Added in additional checks for i3 config paths 2015-08-15 20:03:33 -05:00
Luminarys
614393c09c Added in config file loading from multiple sources 2015-08-15 19:51:23 -05:00
taiyu
2e92538d7f style 2015-08-15 17:45:16 -07:00
taiyu
14b7755134 set maximize flag for handled views 2015-08-15 17:43:45 -07:00
taiyu
3a21ba020f made better, reduced code duplication 2015-08-15 15:20:07 -07:00
taiyu
8752a166ed Merge branch 'master' of https://github.com/SirCmpwn/sway
merging
2015-08-15 14:35:55 -07:00
taiyu
824a3d81aa fixed fullscreen & focusing 2015-08-15 14:32:14 -07:00
Luminarys
56814310e0 Fixed reloading and arrange_windows 2015-08-15 16:13:21 -05:00
Drew DeVault
976e1b1c71 Merge branch 'master' of github.com:SirCmpwn/sway 2015-08-15 16:53:53 -04:00
Drew DeVault
0ed6501aa4 Set WLC_IDLE_TIME to 0 2015-08-15 16:53:42 -04:00
Luminarys
469579835b Fixed output focusing for workspace switch 2015-08-15 15:15:25 -05:00
Drew DeVault
7f9ed880b0 Rename variable in workspace.c 2015-08-15 16:08:13 -04:00
Drew DeVault
f606508bcc Fix switching focus between outputs 2015-08-15 16:03:45 -04:00
Drew DeVault
d5ff5e98fa Fix build 2015-08-15 15:26:05 -04:00
Drew DeVault
8b90f283bc Merge pull request #31 from Luminarys/master
Multi output fixes
2015-08-15 15:13:24 -04:00
Luminarys
b97d8756a8 Minor style fix 2015-08-15 14:12:42 -05:00
Luminarys
9ba914747e Removed alignment 2015-08-15 14:10:44 -05:00
Luminarys
9b0196e7ed Style fixes 2015-08-15 14:02:03 -05:00
Luminarys
618b3df051 Fixed workspace switching in multimonitor layouts 2015-08-15 13:55:06 -05:00
Luminarys
b01a04f22b Added layout debugger back in and fixed mutlimonitor layout issues 2015-08-15 13:22:03 -05:00
taiyu
9bb2788768 fixed split 2015-08-15 11:19:44 -07:00
taiyu
f3a970e24e fixed focus 2015-08-15 08:34:09 -07:00
taiyu
cd0cdc28aa fixed focus 2015-08-15 08:27:51 -07:00
Taiyu
80ae2a7774 removed debug 2015-08-14 13:13:06 -07:00
Taiyu
60d840fe3f style 2015-08-14 12:44:35 -07:00
Taiyu
b8cba33c01 changed swayc related functions, cleaned up some functions, moved wlc related things into handlers 2015-08-14 12:42:19 -07:00
Luminarys
ffe59b27a9 Style fix 2015-08-13 14:49:34 -05:00
Luminarys
ea9efc884d Allowed for execd commands to be spawned after abort 2015-08-13 14:41:36 -05:00
Luminarys
d785cbd54c Even more style fixes 2015-08-13 14:41:36 -05:00
Luminarys
7788aa4cbd More style fixes 2015-08-13 14:41:36 -05:00
Luminarys
527288a826 fixes to cmd queue freeing, style 2015-08-13 14:41:36 -05:00
Luminarys
9a0a858d1e Typo fix 2015-08-13 14:41:36 -05:00
Luminarys
d12a786160 Removed some unnecessary logs 2015-08-13 14:41:36 -05:00
Luminarys
3cdeb9bd5e Minor fix to memory management 2015-08-13 14:41:36 -05:00
Luminarys
ab130fb56b Added in command queue 2015-08-13 14:41:36 -05:00
Luminarys
2c9f5eca89 Fixes to workspace generation 2015-08-13 14:41:36 -05:00
Luminarys
8d63ac594b Changed workspace name generation to try and use bindsyms when possible 2015-08-13 14:41:36 -05:00
Taiyu
7d294213d1 style 2015-08-13 12:26:39 -07:00
Taiyu
e3edab8a4c change workspace layout when trying to split it 2015-08-13 12:23:56 -07:00
Taiyu
57c28f96fd split workspace bug 2015-08-13 12:02:56 -07:00
Taiyu
0a205776d7 small change 2015-08-13 07:50:46 -07:00
Taiyu
ad21281540 style, spelling 2015-08-13 07:48:03 -07:00
Taiyu
5df5b00989 moved signal handling to main 2015-08-13 00:44:56 -07:00
Taiyu
f798e9bb0b moved fd modifying stuff to log.c 2015-08-13 00:24:03 -07:00
Taiyu
ac1c2d31bf no more output from programs called with exec, fixed focus return values 2015-08-12 22:58:15 -07:00
Taiyu
dc9efcd79f better error handling 2015-08-12 21:51:38 -07:00
Taiyu
65406cb61b safer forking, reduce duplicate code, cleanup zombie processes 2015-08-12 21:06:09 -07:00
Taiyu
0f387483fd moving stuff around 2015-08-12 20:59:43 -07:00
Drew DeVault
fe9037ace3 Merge pull request #18 from taiyu-len/master
list_insert now works as it should
2015-08-11 14:21:01 -04:00
Taiyu
4c87498222 style 2015-08-11 11:12:50 -07:00
Drew DeVault
2839054d16 Add unnecessary log 2015-08-11 14:05:47 -04:00
Luminarys
a5b02791d4 Changed command handler to perform var subs on all cmd args
Fixed workspace_next_name to use the first workspace name it can find in the config

Minor fixes

Changed command handler to perform var subs on all portions of a command

Revert "Changed command handler to perform var subs on all portions of a command"

This reverts commit fcfcffa1ea9819bcada6e6c85b40b21bf1b3a96e.

Var sub fixes

Minor fixes

More minor fixes
2015-08-11 12:48:55 -05:00
Taiyu
0490988673 list_insert now works as it should 2015-08-11 10:44:29 -07:00
Taiyu
a22ba17621 added command repeat on keydown 2015-08-11 01:09:08 -07:00
Taiyu
5d5a20bf25 small fix 2015-08-11 00:38:02 -07:00
Taiyu
4e33a9b23c define -> enum 2015-08-11 00:36:31 -07:00
Taiyu
5534edca6e removed old code 2015-08-11 00:06:43 -07:00
Taiyu
66799480ff removed old code 2015-08-11 00:04:40 -07:00
Taiyu
de9cec2e43 fixed bug 2015-08-10 23:57:25 -07:00
Taiyu
737a7421fd added multikey handling for handle_key\(...\) 2015-08-10 23:37:25 -07:00
Drew DeVault
96d7ff1e19 Slightly better multihead support 2015-08-10 23:54:23 -04:00
Drew DeVault
dd115cece3 Prevent passing WM keys, improve multihead support 2015-08-10 23:47:14 -04:00
Taiyu
25a3aa6ed6 small change 2015-08-10 20:13:24 -07:00
Taiyu
2ac3535afe silly mistake + style 2015-08-10 20:09:47 -07:00
Taiyu
beabb12d63 destroys empty workspace + minor bugfixes 2015-08-10 17:32:50 -07:00
Taiyu
f7cee6a1b9 fixed 'return NULL' in 'void continer_map(...)' 2015-08-10 15:50:47 -07:00
Luminarys
a386d98518 Changed cmd handlers to use bool instead of int 2015-08-10 16:51:18 -05:00
Drew DeVault
763c44fb85 Merge pull request #12 from taiyu-len/master
return 0 on success.
2015-08-10 17:34:01 -04:00
Taiyu
f62a700bc8 return 0 on success for cmd_fullscreen 2015-08-10 14:31:32 -07:00
Drew DeVault
c10fc5b526 Set view->visible to true when created 2015-08-10 17:31:19 -04:00
Taiyu
604be65625 make cmd_workspace return 0 on success 2015-08-10 14:29:24 -07:00
Jose Diez
8f19faf6e7 layout: fixed tabs 2015-08-10 22:50:26 +02:00
Jose Diez
d8f364a846 workspaces: follow_pointer_mouse doesn't follow hidden containers 2015-08-10 22:50:26 +02:00
Jose Diez
8cc2c6fa7a Basic workspace functionality 2015-08-10 22:49:50 +02:00
Taiyu
820dda1be6 fixed small memory leak. v2 2015-08-10 13:16:38 -07:00
Drew DeVault
54374d81b5 Fix some errors with config loading 2015-08-10 15:45:36 -04:00
Luminarys
d570acd395 Changed cmd_reload to arrange windows post reload 2015-08-10 14:38:15 -05:00
Luminarys
88997bbfe6 Minor fix 2015-08-10 14:24:31 -05:00
Luminarys
508980e3ab Abstracted load_config 2015-08-10 14:22:22 -05:00
Luminarys
7c02a1967b Spaces to Tabs 2015-08-10 14:09:51 -05:00
Luminarys
68beabda03 Style fixes and slight reload command alteration 2015-08-10 14:00:10 -05:00
Luminarys
c0ee2a6406 Added in reload and exec_always handling 2015-08-10 13:53:43 -05:00
Drew DeVault
9c3a04b996 Focus unmanaged windows when created 2015-08-10 13:43:09 -04:00
Drew DeVault
06bca18a09 Fix issue with untitled windows 2015-08-10 11:50:32 -04:00
Drew DeVault
f9ae9ab6e3 Merge pull request #4 from taiyu-len/master
fixed focus_parent, moved into move_focus() function
2015-08-10 10:18:04 -04:00
Taiyu
f923c4e6b9 fixed style 2015-08-10 07:06:54 -07:00
Drew DeVault
c741de8ca4 Override WLC_DIM by default 2015-08-10 08:29:57 -04:00
Taiyu
b43161fd45 fixed focus_parent, moved into move_focus() function 2015-08-10 00:05:44 -07:00
Drew DeVault
6f0a1cdcd1 Or maybe do the exact opposite of that 2015-08-09 23:13:39 -04:00
Drew DeVault
f6e65b6bb2 Don't override keys if command fails 2015-08-09 23:04:37 -04:00
Drew DeVault
b49cfa0c16 Fix bug with focus parent
Thanks anon
2015-08-09 22:53:00 -04:00
Drew DeVault
c12d0f1a62 Finish up fullscreen command 2015-08-09 20:58:03 -04:00
Drew DeVault
0078a6fa36 Flesh out fullscreen support a bit 2015-08-09 20:49:58 -04:00
jdiez17
b922e1cb29 fullscreen: partially working 2015-08-09 20:49:58 -04:00
Drew DeVault
2b1a0728b8 Keep track of window names 2015-08-09 20:40:52 -04:00
jdiez17
56d29bbec5 log: add newline 2015-08-10 02:24:19 +02:00
Drew DeVault
8597c3c7e7 Implement focus parent 2015-08-09 20:21:08 -04:00
jdiez17
d62efd70e4 commands: re-add log_colors 2015-08-10 02:20:40 +02:00
Drew DeVault
ba14118f13 Fix focus follows mouse 2015-08-09 20:13:22 -04:00
Drew DeVault
9f091c7f82 Add movement support 2015-08-09 20:10:26 -04:00
Drew DeVault
1669da719c Destroy containers when all views are removed 2015-08-09 19:32:03 -04:00
Drew DeVault
2231586569 Implement splith/splitv
Ref #2
2015-08-09 19:27:25 -04:00
jdiez17
69edcb88ea style: More compliance 2015-08-09 20:41:54 +02:00
jdiez17
c688ff704d log, commands: Add log_colors command 2015-08-09 20:38:02 +02:00
Drew DeVault
ec2fedf6d0 Implement layout [splith|splitv|toggle split] 2015-08-09 14:35:59 -04:00
Drew DeVault
b075b06478 Load config after xwayland is created
This lets us run x commands on startup
2015-08-09 14:03:54 -04:00
Drew DeVault
4924628ac2 Set DISPLAY to :1 automatically 2015-08-09 13:54:52 -04:00
Drew DeVault
ea9659f39c Implement exec 2015-08-09 12:26:32 -04:00
Drew DeVault
bab080cea3 Fix up some issues with focus 2015-08-09 12:06:46 -04:00
Drew DeVault
f97a48d5b7 Implement focus_follows_mouse 2015-08-09 09:23:10 -04:00
Drew DeVault
086691016e Handle unmanaged windows appropriately 2015-08-09 08:35:33 -04:00
Drew DeVault
a78b921803 Implement key bindings 2015-08-08 19:24:18 -04:00
Drew DeVault
4181c36862 Handle focus changes
And some simple refactoring
2015-08-08 18:34:44 -04:00
Drew DeVault
c7be30d912 Deny window resize requests 2015-08-08 18:22:22 -04:00
Drew DeVault
6066467dff Tile some windows baby 2015-08-08 18:17:08 -04:00
Drew DeVault
148f59f3a6 Refactor in-memory tree 2015-08-08 17:44:51 -04:00
Drew DeVault
0427fddb5a Add logging and new windows into layout tree 2015-08-08 17:01:27 -04:00
Drew DeVault
2786fa2215 Destroy outputs when appropriate 2015-08-06 08:40:41 -04:00
Drew DeVault
c102f18499 Add layout containers for new outputs 2015-08-06 08:40:16 -04:00
Drew DeVault
82bc36c681 Start to build out window management functions 2015-08-06 08:24:14 -04:00
Drew DeVault
47b28bd335 Clean up config loading and launch wayland 2015-08-05 22:59:06 -04:00
Drew DeVault
e7a8868514 Make main.c less stupid 2015-08-05 22:56:45 -04:00
Drew DeVault
a74268dfab Add TODO so I don't forget later 2015-08-05 22:55:51 -04:00
Drew DeVault
254d0df3b2 Push the XKB key to the key list
Instead of the key name
2015-08-05 22:41:46 -04:00
Drew DeVault
5767dcc86e Mostly implement bindsym command 2015-08-05 22:40:38 -04:00
Drew DeVault
d0f1fb71d1 Flesh out some command parsing
This implements the `set` command from i3
2015-08-05 22:10:56 -04:00
Drew DeVault
e07c77fbb7 Build out command subsystem
Everyone loves code stolen from your own projects
2015-08-05 17:30:47 -04:00
Drew DeVault
542ef0c777 Pull in some scas code and read i3 config file 2015-08-04 21:30:40 -04:00
Drew DeVault
6a33e1e3cd Initial commit 2015-08-04 21:02:46 -04:00