Commit graph

2298 commits

Author SHA1 Message Date
Tony Crisci e1e15bb43e ipc: recursive workspace containers in event
Recursively describe workspace containers in the workspace event. This is for
compatability with i3 and i3ipc libraries.
2016-08-04 21:26:39 -04:00
Drew DeVault 61befb49f7 Merge pull request #835 from acrisci/feature/ipc-view-include-nodes
ipc: always include nodes in views
2016-08-04 21:24:36 -04:00
Tony Crisci 50901a0892 ipc: always include nodes in views
This is for i3 (and i3ipc library) compatability.
2016-08-04 21:19:52 -04:00
Drew DeVault 76e5dffeaa Merge pull request #834 from Hummer12007/swapfix
Arrange windows after swapping containers
2016-08-04 19:58:52 -04:00
Mykyta Holubakha e1b1d94a4e Arrange windows after swapping containers
Fixes #833
2016-08-05 02:07:03 +03:00
Drew DeVault f773eb96a8 Merge pull request #832 from thejan2009/bug/workspace-back-and-forth
Fix 'workspace back_and_forth' and workspace_auto_back_and_forth clash
2016-08-04 15:36:29 -04:00
D.B 132017d242 Fix 'workspace back_and_forth' and workspace_auto_back_and_forth clash
When workspace_auto_back_and_forth is enabled, workspaces get switched
twice with previously mentioned command, which is not the expected
behavior.

Removes one redundant creation of previous workspace.
2016-08-04 21:31:46 +02:00
Drew DeVault 4b0de51766 Merge pull request #831 from progandy/fix_colors
common: use strtoul in parse_color to avoid clamp
2016-08-04 09:27:27 -04:00
progandy bf4056a2c6 common: use strtoul in parse_color to avoid clamp
Some implementations of strtol may clamp the values to LONG_MAX instead of
wrapping around to negative values, so use strtoul instead to parse colors.
2016-08-04 14:37:54 +02:00
Drew DeVault 5ec70458e5 Merge pull request #830 from acrisci/feature/simplify-set-focus
Simplify focus setting
2016-08-04 07:48:00 -04:00
Tony Crisci 81eb9ea12c Simplify focus setting
Merge the main rendering paths of all containers to make focus setting a bit
simpler and easier to follow.
2016-08-03 23:24:53 -04:00
Drew DeVault 735f3d076e Merge pull request #827 from acrisci/bug/ipc-id-uint
Use uintptr_t for ipc container id
2016-08-03 21:07:23 -04:00
Tony Crisci c98e91f01f Use uintptr_t for ipc container id
This is for compatability with i3.
2016-08-03 20:34:47 -04:00
Drew DeVault c970d45d74 Merge pull request #822 from mayhewj/add-resize-to-config
Add resize mode to the default config file
2016-08-03 07:07:53 -04:00
Justin Mayhew 94adb24642 Add resize mode to config
These are the default keybindings in i3.
2016-08-03 00:07:28 -03:00
Justin Mayhew 342e36e31f Don't repeat direction keys in config
I really didn't want to have to repeat the direction keys again for
resize mode, and this makes it easier to change all of the relevant
keybindings if you don't like the defaults (or prefer i3's).
2016-08-02 23:56:31 -03:00
Drew DeVault 3a9f4f8b31 Merge pull request #820 from minus7/bar-wrap-scroll-fix
fixed uninitialized bar.wrap_scroll
2016-08-02 16:08:46 -04:00
minus b246799548 fixed uninitialized bar.wrap_scroll 2016-08-02 22:02:39 +02:00
Drew DeVault 947570e6df Merge pull request #817 from zandrmartin/fix-unmanaged-node-json
remove unmanaged nodes from get_tree
2016-08-02 14:52:48 -04:00
Drew DeVault 506be24b62 Merge pull request #810 from acrisci/feature/swaymsg-pretty
swaymsg: pretty print ipc response
2016-08-02 14:52:41 -04:00
Zandr Martin 9fa92951fe
remove unmanaged nodes from get_tree 2016-08-02 13:24:21 -05:00
Drew DeVault c7d12faefc Update README.md screenshot 2016-08-02 08:50:03 -04:00
Drew DeVault 31ce010861 Fix segfault in border.c 2016-08-02 07:35:25 -04:00
Drew DeVault 18602367f1 Merge pull request #815 from acrisci/bug/focus-container-on-op-change
bugfix: focus container on output when focused
2016-08-02 00:04:55 -04:00
Tony Crisci 4344fe5011 bugfix: focus container on output when focused
Focus the container on the output (not the output itself) when an output is
focused.

This is intended to fix a bug where borders are not updated correctly when
switching the vt away/back to sway.
2016-08-01 23:56:34 -04:00
Drew DeVault a4096b73c9 Merge pull request #813 from acrisci/bug/remove-dead-lock-var
Remove dead global locked_view_focus
2016-08-01 22:33:37 -04:00
Tony Crisci 2f65100bee Remove dead global locked_view_focus
The value of `locked_view_focus` is always false. Remove dead code associated
with this variable to simplify things.
2016-08-01 22:25:08 -04:00
Drew DeVault 2d907ef1f6 Merge pull request #811 from acrisci/feature/focus-container
Implement focus handling for containers
2016-08-01 07:27:12 -04:00
Drew DeVault c6f9767487 Merge pull request #812 from zandrmartin/floating-fullscreen-size-fix
cache floating container size when fullscreening
2016-08-01 07:25:31 -04:00
Zandr Martin b18c169036
cache floating container size when fullscreening 2016-07-31 21:45:27 -05:00
Tony Crisci fe608c80ae Update view border when workspace is focused
When a workspace is focused, update the borders of all its child containers to
be focused to indicate the workspace container is focused.
2016-07-31 21:42:51 -04:00
Tony Crisci d731d6a846 Bugfix: descend focus stack on new window focus
When switching back to a workspace after new window creation, it is now
necessary to descend the focus stack into the focused container of the
workspace to determine which container should get the focus. This is because
the `set_focused_container()` function no longer automatically descends into
the focus stack to find the correct view to focus.
2016-07-31 21:25:40 -04:00
Tony Crisci b39249508f Refactor functions to update container borders
Replace `update_view_border()` with `update_container_border()`. The latter
should handle both the case where the container is a view or if the container
has children.
2016-07-31 20:32:40 -04:00
Tony Crisci f78d07d39b Implement focus handling for containers
The previous implementation of focus handling assumed that only views can be
focused. Containers can also be focused with a command like `focus parent` or
`focus child`.

Change `set_focused_container()` to handle the case of the given container
being a container with children and update borders accordingly.
2016-07-31 18:10:33 -04:00
Tony Crisci 6535da7bde swaymsg: pretty print ipc response
fixes #809
2016-07-31 14:47:32 -04:00
Drew DeVault a947cb6919 Merge pull request #808 from zandrmartin/document-kill-command
document `kill` command
2016-07-31 10:38:40 -04:00
Zandr Martin 53f6b1f3b0
document kill command 2016-07-31 08:54:15 -05:00
Drew DeVault 955020b161 Merge pull request #806 from thejan2009/fix-nested-layouts
Update container geometry on layout switch
2016-07-31 08:57:55 -04:00
D.B 9977b01928 Update container geometry on layout switch
Deeply nested containers which had their layouts changed didn't update
their actual_geometry, this messed up their child containers. Those got
width and height of 0, which was then decreased for stacked/tabbed
containers by title height. Underflow ensued, these containers suddenly
had height 4294967273. In short, not updating actual_geometry didn't
play nicely with nested containers.
2016-07-31 10:22:18 +02:00
Drew DeVault 44a4905466 Merge pull request #805 from zandrmartin/swaybg-solid-color
implement solid color rendering for swaybg
2016-07-30 23:28:02 -04:00
Zandr Martin 98aa59fdda
implement solid color rendering for swaybg 2016-07-30 18:50:13 -05:00
Drew DeVault 2e4ece65da Merge pull request #803 from zandrmartin/x11-pids
update handler to get pid from wlc for all views - now ok to merge
2016-07-30 10:17:31 -04:00
Zandr Martin e6af5f8bdb
Merge branch 'master' of git://github.com/SirCmpwn/sway into x11-pids 2016-07-30 08:44:21 -05:00
Drew DeVault e3104a48e3 Merge pull request #804 from thejan2009/misc-border-fix
Misc border fix
2016-07-30 09:43:03 -04:00
D.B c33e0ee629 revert border hiding to more recent version 2016-07-30 15:22:53 +02:00
D.B 8d0048c8d5 properly hide top border inside tabbed/stacked
When titlebar is hidden, top border of the topmost view inside
tabbed/stacked container will not be drawn. This is changed in layout.c

On the other hand, top border should be drawn sometimes, for example
when titlebar is hidden on a view that is not the topmost inside
tabbed/stacked container. This is changed in border.c
2016-07-30 15:12:34 +02:00
Zandr Martin c0683a0444
remove outdated (when wlc commit merged) comment 2016-07-29 20:20:14 -05:00
Zandr Martin d0a0d5e03c
update handler to get pid from wlc for all views 2016-07-29 16:40:38 -05:00
Drew DeVault 3f83968d30 Fix swaybg sizing on hidpi outputs 2016-07-29 09:14:26 -04:00
Drew DeVault 9b24af1c22 Document scale factor configuration in sway(5) 2016-07-29 08:00:23 -04:00