emersion
8e3d19aad2
Merge pull request #2096 from kupospelov/fix-title-update
...
Fix view title update order
2018-06-03 09:20:57 +01:00
Ryan Dwyer
8289e30308
Fix potential crash when destroying workspace
...
`_container_destroy` emits a destroy event, and any listener for this
event should have access to the full container, not a half destroyed
one.
`_container_destroy` also destroys the swayc, so we have to grab a
reference to the sway_workspace so we can free it afterwards.
This also fixes a memory leak where the floating container wasn't freed.
Fixes #2092 .
2018-06-03 10:28:24 +10:00
Konstantin Pospelov
e6baac4297
Fix view title update order
...
This commit fixes the function call order to make sure that the title
texture is updated using the relevant global font size.
2018-06-03 00:32:18 +03:00
Ryan Dwyer
3f1cfd547e
Fix top border when a view is initially floating
...
Fixes #2085 .
2018-06-02 11:45:16 +10:00
Ryan Dwyer
a2c1cb9072
Fix mpv damage issue when unfullscreening into floating
2018-06-01 23:14:58 +10:00
Ryan Dwyer
f24087d104
Fix fullscreen position
2018-06-01 23:14:58 +10:00
Ryan Dwyer
97672295ed
Don't unmaximize floating views
2018-06-01 23:14:58 +10:00
Ryan Dwyer
40af5d81a1
Fix getting adjacent output
2018-06-01 23:14:58 +10:00
Ryan Dwyer
d4ed204d4d
Remove container_self_or_parent_floating
2018-06-01 23:14:58 +10:00
Ryan Dwyer
70f5d6fcf3
Rename container_set_geometry_from_view
2018-06-01 23:14:58 +10:00
Ryan Dwyer
e4e912ea91
Store swayc coordinates as layout-local
2018-06-01 23:14:58 +10:00
Ryan Dwyer
02de2a6f65
Rename set_maximized functions to set_tiled
2018-06-01 23:14:58 +10:00
Ryan Dwyer
dc83b158e1
Fix issues with sticky containers and workspaces
...
* Attach sticky containers to new workspaces when switching
* Fire the close event *before* we start destroying the workspace to
prevent a crash
Because the sticky container now follows the visible workspace, this
simplifies the rendering and container_at logic.
2018-06-01 23:14:58 +10:00
Ryan Dwyer
13a4b0512e
Fix unfullscreening a floating view
2018-06-01 23:14:58 +10:00
Ryan Dwyer
aaba7642b3
Replace is_floating boolean with function
2018-06-01 23:14:58 +10:00
Ryan Dwyer
34f35f0bad
Use L_FLOATING instead of reapable boolean
2018-06-01 23:14:58 +10:00
Ryan Dwyer
1f2e399ade
Implement floating
2018-06-01 23:14:58 +10:00
Drew DeVault
f3ab895916
Implement floating enable
2018-06-01 23:14:58 +10:00
emersion
c47d6cb1c4
Merge pull request #2081 from RedSoxFan/fix-2077
...
Send reparent events in container_split
2018-06-01 10:36:47 +01:00
Brian Ashworth
8237d944d4
Fix move perpendicular segfault
2018-06-01 01:12:10 -04:00
Brian Ashworth
cca587b21f
Send reparent events in container_split
2018-05-31 23:47:21 -04:00
Brian Ashworth
e13c94f2dd
Fix typo
2018-05-31 12:07:54 -04:00
Brian Ashworth
633bee9019
Fix moving out of tab/stack when only child
2018-05-31 11:51:00 -04:00
Brian Ashworth
3b90b55666
Notify of subtree change
2018-05-29 11:27:04 -04:00
Brian Ashworth
103a302fa4
Fix moving out of a tabbed/stacked workspace
2018-05-29 11:21:55 -04:00
Brian Ashworth
a66fd74a54
Fix breaking out of tabs/stacks
2018-05-29 11:21:55 -04:00
Ryan Dwyer
6f4cb2b29d
Add tree representation to IPC workspace description
2018-05-29 17:42:11 +10:00
emersion
1071785f56
Merge pull request #2060 from RedSoxFan/focus-wrapping
...
Implement focus_wrapping
2018-05-28 10:30:11 +01:00
emersion
015878e5db
Merge pull request #2058 from RyanDwyer/refactor-parse-title-format
...
Refactor parse_title_format
2018-05-28 09:18:07 +01:00
Brian Ashworth
46da1dc32b
Implement focus_wrapping
2018-05-27 23:20:21 -04:00
Ryan Dwyer
7c7d24600b
Fix ancestor typos
2018-05-28 12:45:42 +10:00
Ryan Dwyer
9df1432f56
Refactor parse_title_format
...
Don't read properties until needed, and do it with less lines of code.
2018-05-28 12:03:43 +10:00
Brian Ashworth
fd137c4f05
Send workspace::move in container_output_destroy
2018-05-27 12:27:18 -04:00
emersion
9c0cc98d07
Don't move empty workspaces when output is destroyed
2018-05-27 16:58:31 +01:00
Ryan Dwyer
8fda41dab5
Merge branch 'master' into cmd-swap
2018-05-28 00:14:22 +10:00
Ryan Dwyer
d3dd7e5bae
Rename view_get_type to view_get_shell
2018-05-27 22:02:00 +10:00
Ryan Dwyer
51865c00c8
Add %app_id to title_format
2018-05-27 09:50:38 +10:00
Brian Ashworth
569f4e0e4c
Implement swap command
2018-05-26 11:05:02 -04:00
Drew DeVault
ab74c95d56
Merge pull request #2036 from RyanDwyer/workspace-switch-on-map
...
Switch workspace if required when mapping a view
2018-05-25 08:47:08 -04:00
Drew DeVault
daf328d054
Merge pull request #2033 from RyanDwyer/arrange-after-flatten
...
Arrange views after flattening the parent
2018-05-25 08:43:57 -04:00
Drew DeVault
a268a0c2ae
Merge pull request #2034 from RyanDwyer/cleanup-container-titles
...
Clean up container title functions
2018-05-25 08:41:01 -04:00
Ryan Dwyer
f32a002401
Switch workspace if required when mapping a view
...
If a view is created on a workspace that wasn't visible, switch to it.
Fixes #1879 .
2018-05-25 22:28:01 +10:00
Ryan Dwyer
e496cc99f8
Fix focus bug when moving between outputs
...
When moving focus left or right to an adjacent output, only select the
first or last child in the new workspace if the workspace's layout is
horizontalish. If it's a verticalish layout, use the last focused
container.
2018-05-25 21:39:48 +10:00
Ryan Dwyer
db38b9bbf3
Clean up container title functions
...
* Add and use lenient_strcat and lenient_strncat functions
* Rename `concatenate_child_titles` function as that's no longer what it
does
* Rename `container_notify_child_title_changed` because we only need to
notify that the tree structure has changed, not titles
* Don't notify parents when a child changes its title
* Update ancestor titles when changing a container's layout
* Eg. create nested tabs and change the inner container to stacking
* No need to store tree presentation in both container->name and
formatted_title
2018-05-25 21:07:59 +10:00
Ryan Dwyer
320703fdca
Arrange views after flattening the parent
...
Fixes #2029 .
2018-05-25 16:42:55 +10:00
Ryan Dwyer
c9630975da
Fix crash in move workspace to output command
...
Fixes #2026 .
2018-05-24 23:01:17 +10:00
Ryan Dwyer
cdbae9a5e9
Fix nested tabs
...
Fixes #2023 .
2018-05-24 17:38:31 +10:00
Ryan Dwyer
5354988317
Implement clicking stacked title bars
2018-05-22 08:43:00 +10:00
Ryan Dwyer
f6c3682c05
Use constants for titlebar dimensions
2018-05-22 08:27:42 +10:00
Ryan Dwyer
664169fbf1
Implement stacked layout
2018-05-22 08:27:24 +10:00
Brian Ashworth
0273c6438c
Fix hide_edge_borders smart for tabs and stacks
2018-05-21 13:18:18 -04:00
Ryan Dwyer
5ab4930185
Fix tab border issues
2018-05-21 20:16:56 +10:00
Ryan Dwyer
4672cb7ccf
Use class or app_id in tree representation
2018-05-21 20:16:56 +10:00
Ryan Dwyer
efc07fb3d4
Don't track damage for views on inactive tabs
2018-05-21 20:16:56 +10:00
Ryan Dwyer
bd79584f65
Add assertion in container_at_view
2018-05-21 20:16:56 +10:00
Ryan Dwyer
c08f9bf257
Implement tabbed layout
2018-05-21 20:16:56 +10:00
Ryan Dwyer
c4ea2b51f6
Fix hide_edge_borders constraints
...
When checking if a border is on the edge, the check should be done
against the workspace rather than the output.
2018-05-21 13:59:01 +10:00
Ryan Dwyer
9fd28aea8c
Rebuild textures if needed when moving a container
...
When moving a container to an output which has a different scale than
the previous, rebuild the title and marks textures at the new scale.
Fixes #1999 .
2018-05-19 23:33:36 +10:00
Ryan Dwyer
ebb0d051db
Fix many border opacity issues
2018-05-17 08:29:14 +10:00
Ryan Dwyer
69ac7f73e7
Destroy marks textures when view destroyed
2018-05-17 08:29:14 +10:00
Ryan Dwyer
b351d0a64a
Set textures to null when destroying
2018-05-17 08:29:14 +10:00
Ryan Dwyer
5384fdcbc6
Don't show marks which start with an underscore
2018-05-17 08:29:14 +10:00
Ryan Dwyer
0e2cc0af30
Implement show_marks
2018-05-17 08:29:14 +10:00
Ryan Dwyer
fc96f004d2
Don't steal focus when a view changes its title
...
Fixes #1989
2018-05-16 20:29:04 +10:00
Ryan Dwyer
22d38600d0
Implement marks
2018-05-15 11:18:27 +10:00
Brian Ashworth
9ba0dca7ba
Merge branch 'master' into fix-1975
2018-05-14 09:06:23 -04:00
emersion
95a10dd4f3
Kill wl_shell
2018-05-14 13:26:10 +01:00
Brian Ashworth
3488fbc859
Fix y and height for a hidden top normal border
2018-05-14 01:46:53 -04:00
Brian Ashworth
34b864fb17
Merge branch 'master' into fix-1975
2018-05-14 00:28:21 -04:00
Brian Ashworth
6ff7c52736
Fix titles and detect edges for hide_edge_borders
2018-05-14 00:20:34 -04:00
Ryan Dwyer
92b8497a0b
Fix crash when launching programs from dmenu
2018-05-14 11:48:15 +10:00
Ryan Dwyer
bffcb496cc
Revert "Revert "Merge pull request #1953 from RyanDwyer/criteria-focused""
...
This reverts commit ac0e62584f
2018-05-14 11:38:09 +10:00
Ryan Dwyer
1e9aaa54a8
Revert "Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements""
...
This reverts commit 32a572cecf
2018-05-14 11:38:09 +10:00
Drew DeVault
b2dec12368
Merge pull request #1970 from emersion/xdg-shell-stable
...
Add xdg-shell stable support
2018-05-13 13:45:15 -04:00
emersion
88d9d43b36
Add xdg-shell stable support
2018-05-13 16:38:56 +01:00
Heghedus Razvan
789a877b37
Fix crash when using pango markup font
...
The characters & < > ' " needs to be escaped when using pango markup
Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
2018-05-13 17:53:45 +03:00
Brian Ashworth
0f43eac5dc
Fix recursion when counting descendants of a type
2018-05-12 21:19:55 -04:00
Brian Ashworth
2adf23c2a3
Only count views for hide_edge_borders smart
2018-05-12 12:56:26 -04:00
Brian Ashworth
ec60e24f75
Merge branch 'master' into edge-borders
2018-05-12 12:43:34 -04:00
Brian Ashworth
e3625d8f33
Count descendant views for hide_edge_borders smart
2018-05-12 12:37:48 -04:00
Drew DeVault
32a572cecf
Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements"
...
This reverts commit 3e1bf721c62217518bd5
2018-05-12 08:52:54 -04:00
Drew DeVault
ac0e62584f
Revert "Merge pull request #1953 from RyanDwyer/criteria-focused"
...
This reverts commit 2511adffc23e1bf721c6
2018-05-12 08:52:48 -04:00
Ryan Dwyer
4717c71da5
Merge branch 'master' into fix-crash-on-fullscreen
2018-05-12 17:52:51 +10:00
Ryan Dwyer
94e42f9857
Implement __focused__ criteria
2018-05-12 12:34:12 +10:00
Brian Ashworth
3db7fc2bb2
Implement hide_edge_borders
2018-05-11 18:44:56 -04:00
Dudemanguy911
935bda0f33
fix crash on fullscreen toggle
2018-05-11 07:42:56 -05:00
Ryan Dwyer
3b0c26d149
Overhaul criteria implementation
...
The criteria struct now uses properties for each token type rather than
the list_t list of tokens. The reason for this is that different token
types have different data types: pcre, string and number to name a few.
This solution should be more flexible moving forward. A bonus of this is
that criteria is now easier to understand when looking at the struct
definition.
The criteria parser has been rewritten because the previous one didn't
support valueless pairs (eg. [class="foo" floating]).
Criteria now has types. Types at the moment are CT_COMMAND,
CT_ASSIGN_WORKSPACE and CT_ASSIGN_OUTPUT. i3 uses types as well.
Previously the assign command was creating a criteria with 'move to
workspace <name>' as its command, but this caused the window to appear
briefly on the focused workspace before being moved to the assigned
workspace. It now creates the view directly in the assigned workspace.
Each view will only execute a given criteria once. This is achieved by
storing a list of executed criteria in the view. This is the same
strategy used by i3.
Escaping now works properly. Previously you could do things like
[class="Fire\"fox"] and the stored value would be 'Fire\"fox', but it
should be (and now is) 'Fire"fox'.
The public functions in criteria.c are now all prefixed with criteria_.
Xwayland views now listen to the set_title, set_class and
set_window_type events and criteria will be run when these happen. XDG
shell has none of these events so it continues to update the title in
handle_commit.
Each view type's get_prop function has been split into get_string_prop
and get_int_prop because some properties like the X11 window ID and
window type are numeric.
The following new criteria tokens are now supported:
* id (X11 window ID)
* instance
* tiling
* workspace
2018-05-11 09:38:53 +10:00
emersion
c0f5d740a5
Damage container when updating title
2018-05-10 23:03:51 +01:00
emersion
bec80f1551
Damage borders when damaging view
2018-05-10 23:03:50 +01:00
Ryan Dwyer
556ff5f50e
Implement pango support
...
Implements support for the pango: prefix in the font command.
Closes #1903 .
2018-05-06 08:25:22 +10:00
Ryan Dwyer
936226845f
Add extra check for view title being NULL
2018-05-05 22:29:37 +10:00
Ryan Dwyer
5d6d24e71a
Move code for re-arranging after font height change into a common place
2018-05-05 22:29:37 +10:00
Ryan Dwyer
da7d6642d3
Refactor parse_title_format()
2018-05-05 22:29:37 +10:00
Ryan Dwyer
228c478e8d
Implement title_format
...
This implements the title_format command, with a new placeholder %shell
which gets substituted with the view type (xwayland, xdg_shell_v6 or
wl_shell).
Example config:
for_window [title=".*"] title_format %title (class=%class instance=%instance shell=%shell)
2018-05-05 22:29:37 +10:00
Ryan Dwyer
e83e5487be
Use scissor to render title texture
...
This allows the title's texture to always be the full width of the text,
and clipped at render time according to the desired width (eg. tabs...).
As an added bonus, the texture no longer needs to be updated when
containers are arranged.
2018-05-05 20:32:31 +10:00
Alex Xu (Hello71)
3202c45054
Check for NULL in container_update_title
...
Fixes crash when opening Firefox developer tools.
2018-05-04 11:10:01 -04:00
Ryan Dwyer
ed0d606c2a
Fix title texture width
...
Use max of the container width or text width.
2018-05-03 22:51:14 +10:00
Drew DeVault
58a033d816
Convert border_colors.text to float[4]
2018-05-03 08:14:17 -04:00
Drew DeVault
8f06aa7598
Fix anti-aliasing
2018-05-03 08:12:26 -04:00
Ryan Dwyer
89d1571041
Fix potential segfault when setting container title
2018-05-03 15:23:39 +10:00
Ryan Dwyer
55b307cddf
Calculate config->font_height based on existing container titles
2018-05-03 15:12:00 +10:00
Ryan Dwyer
b667298a0a
Render titles
2018-05-03 15:12:00 +10:00
Dillen Meijboom
b45e2bd95e
Fixed #1888 GCC cannot compile due to uninitialized variables ( #1889 )
2018-05-02 10:40:45 +01:00
db
22170bde77
Fix layer surface crash on output destroy
...
Before freeing sway_output, NULL the wlr_output reference to it. Check for that
NULL in layer_shell handle_destroy. Don't damage null container in unmap.
Additionaly, terminate swaybg if its output is being disabled.
2018-05-01 19:05:32 +02:00
Ryan Dwyer
83952c5201
Restore view_update_position()
2018-05-01 07:46:57 -04:00
Ryan Dwyer
55577498c0
Allow clicking view decorations to focus view
2018-05-01 07:46:57 -04:00
Ryan Dwyer
0375f966f1
Fix surface offset when using borders
2018-05-01 07:46:57 -04:00
Ryan Dwyer
fa5de2876e
Move docblock and fix indenting of switch/case.
2018-05-01 07:46:57 -04:00
Ryan Dwyer
630ba30e3c
Implement borders
...
Implements rendering of borders. Title text is still to do.
Implements the following configuration directives:
* client.focused
* client.focused_inactive
* client.unfocused
* client.urgent
* border
* default_border
2018-05-01 07:46:57 -04:00
Ryan Dwyer
91f97fc21a
Fix segfault in view_unmap()
...
If the last remaining view on a workspace is unmapped and the workspace
is not visible, parent will be a C_OUTPUT. Call the arrange_output()
function in this case.
2018-05-01 17:18:20 +10:00
Ryan Dwyer
312fdf313f
Remove arrange_windows()
...
After the refactor, this function is no longer called.
2018-04-30 08:47:38 +10:00
Ryan Dwyer
167c2e1aa9
Refactor arrange_windows()
...
Replaces arrange_windows() with arrange_root(), arrange_output(),
arrange_workspace() and arrange_children_of().
Also makes fullscreen views save and restore their dimensions, which
allows it to preserve any custom resize and is also a requirement for
floating views once they are implemented.
2018-04-28 11:26:14 +10:00
Ryan Dwyer
ae39d7b28c
Remove sway_container.workspace_layout
...
Fixes #1716 .
2018-04-26 10:14:18 +10:00
Ryan Dwyer
dfc26c664f
Update wording about unmanaged/unmapped views
2018-04-24 20:14:22 +10:00
Ryan Dwyer
30a7488936
Add assert to view_execute_criteria()
2018-04-24 20:08:32 +10:00
Ryan Dwyer
72767e1cc3
Implement criteria commands
...
Implements the following commands:
* for_window [...] <cmdlist>
* assign [...] <workspace>
2018-04-24 20:08:32 +10:00
Ryan Dwyer
22b9169631
Fix crash in container_descendants()
...
If root is a C_VIEW, the children property is a null pointer.
2018-04-24 12:27:04 +10:00
emersion
a41057714f
Update for wlroots#885
2018-04-21 19:12:49 +01:00
Ryan Dwyer
34429a3605
Keep view fullscreened when moving to another workspace.
...
container_handle_fullscreen_reparent() must be called *after* setting
the container's new parent.
2018-04-20 21:26:14 +10:00
Ryan Dwyer
45a2fad0de
container_get_in_direction(): Don't split this function
2018-04-19 12:53:02 +10:00
Ryan Dwyer
7e38cc2e05
arrange_windows(): Calculate workspace properties when fullscreen
2018-04-19 12:50:53 +10:00
Ryan Dwyer
35ccdd67a8
More fullscreen fixes.
...
* Render fullscreen views without wlr function, which makes popups and
lockscreen work.
* Don't allow input events to surfaces behind fullscreen views.
* Use correct output dimensions (for rotated outputs).
2018-04-18 08:35:28 +10:00
Ryan Dwyer
72beae209b
Fullscreen fixes.
2018-04-18 00:10:32 +10:00
Ryan Dwyer
cc4da245a8
Fix views unmapping their own fullscreen windows.
2018-04-17 11:06:03 +10:00
Ryan Dwyer
c685ef081f
Create sway_workspace struct.
2018-04-17 09:31:34 +10:00
Ryan Dwyer
bfd5834f4c
Feedback for fullscreen.
2018-04-17 08:11:50 +10:00
Ryan Dwyer
52420cc24d
Implement fullscreen.
2018-04-16 20:36:40 +10:00
Dominique Martinet
8490d1662c
Fix gcc maybe-uninitialized warning
2018-04-13 22:47:27 +09:00
Dominique Martinet
de65d05821
container_destroy: fix segfault
...
cont->children doesn't have to be NULL when there is no children
2018-04-13 14:58:23 +09:00
Tony Crisci
9db859585e
container_create_notify on split
2018-04-07 18:01:18 -04:00
Tony Crisci
c0f9ee7bd1
seat get focus inactive view
2018-04-07 16:06:36 -04:00
emersion
61abd56ca4
Fix output containers position
2018-04-07 12:44:02 -04:00
Drew DeVault
c47b4d4edb
Merge pull request #1756 from emersion/output-damage
...
Fine-grained damage tracking
2018-04-07 11:53:10 -04:00
Drew DeVault
f5a9bd5cb7
Merge pull request #1700 from swaywm/move-cmd-full
...
Implement move [left|right|up|down]
2018-04-07 11:19:25 -04:00
emersion
93ca8919f6
Don't rejigger if parent has two children
2018-04-06 18:10:02 -04:00
emersion
37b173f326
When moving between outputs, use output center as reference
2018-04-06 17:50:12 -04:00
Drew DeVault
640232eb22
Revert "Break everything^W^WUse wlr_box for sway_container"
2018-04-06 16:13:26 -04:00
Drew DeVault
df0d57b916
Fix issue with incorrectly rejiggered workspaces
2018-04-06 15:54:03 -04:00
Drew DeVault
764489e737
Break everything^W^WUse wlr_box for sway_container
2018-04-06 15:38:37 -04:00
Drew DeVault
9109b1fd11
Fix moving to parallel container on another output
2018-04-06 15:37:55 -04:00
Drew DeVault
5ff16994c5
Address @emersion feedback
2018-04-06 15:09:52 -04:00
Drew DeVault
c8be7bfc1e
Fix another of @orestisf1993's issues
2018-04-06 13:57:04 -04:00
Drew DeVault
1f70b94f34
Fix moving into right end of container
2018-04-06 13:17:22 -04:00
Drew DeVault
cd6e3182fa
Fix issues @orestisf1993 raised
2018-04-06 12:46:33 -04:00
Drew DeVault
b5baa78dc3
Address @emersion's comments
2018-04-06 11:53:10 -04:00
Drew DeVault
603e0e42c5
Add debug tree view
2018-04-06 11:49:27 -04:00
emersion
516f5454ad
Simplify damage tracking functions, use them in layer shell
2018-04-06 11:45:40 -04:00
emersion
290c916290
Send surface enter/leave events to view children
2018-04-06 10:26:32 -04:00
Drew DeVault
a06052ad9d
Fix splitting workspaces
2018-04-06 09:43:52 -04:00
Drew DeVault
efac07db5f
Fix workspaces not updated on swaybar
2018-04-06 09:43:52 -04:00
