Set panels/backgrounds' geometries correctly and don't render them ex… #743

deklov · 2016-07-06T05:51:04Z

…plicitly

Panels and backgrounds were explicitly rendered by calling wlc_surface_render
in handle_output_pre_render. Calling wlc_surface_render does not set the
surface's geometry (like wlc_view_set_geometry does). Sway did not call
wlc_view_set_geometry for panels/backgrounds, so wlc defaulted their geometry
to be at the origin. This is not correct for bars unless their location is top.

Furthermore, for a surface to receive pointer events, its mask has to be
set to visible. This causes wlc to render these surfaces, causing panels
and backgrounds to be rendered twice.

This commit makes panels and surfaces visible, sets the correct geometries
and removes the code that explicitly rendered them.

deklov · 2016-07-06T05:52:32Z

Mouse pointer looks like the X default and mouse events are received by the bar.

ddevault · 2016-07-06T12:42:01Z

How well does this work with:

Output resizing (either via swaymsg output ... res ... or the x backend resizing the windows)
Z ordering when the layout is arranged, the bg should always be at the bottom and the bar should be on top of all tiled windows but below floating and fullscreened windows

ddevault · 2016-07-09T15:35:58Z

Bump

deklov · 2016-07-09T19:03:41Z

Not very well unfortunately. I got so excited when the bar started getting mouse events that I forgot to test re-sizing and swaybg. I'll try to work on this some more maybe tonight or tomorrow.

ddevault · 2016-07-09T19:05:17Z

No worries, take your time.

deklov · 2016-07-10T19:19:27Z

Think I got this working but before you merge to master could you please test it.

I wanted to focus on the bar first so I reverted some of my code related to background. I will come back to this later but just in case I don't, I don't want to leave half-done, non-working behind.

deklov · 2016-07-10T19:31:20Z

I forgot to commit something..

deklov · 2016-07-10T19:31:47Z

btw. I have not tested this on dual head since I only have one monitor at home.

deklov · 2016-07-10T19:37:59Z

One more thing. I didn't to anything to try to set the z ordering. Fullscreen does work, but that might be coincidental. Do we need to set it explicitly?

ddevault · 2016-07-10T20:11:34Z

Not sure how it'd shake out over time, restarts, etc.

deklov · 2016-07-10T20:37:36Z

[handlers.c:521] Command 'restart' failed: Unknown/invalid command

Get this before any of my changes as well.

ddevault · 2016-07-10T20:57:30Z

Sorry, I meant reload. Which causes the swaybg and swaybar processes to restart.

deklov · 2016-07-10T21:15:16Z

Reload seems to work just fine.

deklov · 2016-07-11T05:15:49Z

This last commits require the previous commits to be tested and I was to lazy to create a branch with only these commits and too lazy to figure out how to create a PR with only these new commits. Hope you don't mind that I amended them to this PR.

deklov · 2016-07-11T05:17:46Z

swaybar/ipc.c

@@ -7,6 +7,10 @@
 #include "bar/config.h"
 #include "bar/ipc.h"

+void ipc_send_workspace_command(const char *workspace_name) {
+	sway_log(L_DEBUG, "Clicked on window %s", workspace_name);


This log message should be: "Clicked on workspace button %s".

deklov · 2016-07-11T05:52:36Z

Last piece of the puzzle. You can now change workspace by clicking on the bar.

deklov · 2016-07-11T05:53:56Z

swaybar/ipc.c

+	snprintf(command, size, "workspace %s", workspace_name);
+
+	uint32_t reply_size;
+	ipc_single_command(swaybar.ipc_socketfd, IPC_COMMAND, command, &reply_size);


Oops, memory leak forgot to free command.

And another bug, the last argument to ipc_single_command is both input and output... Interesting semantics.

deklov · 2016-07-11T06:11:32Z

Fixed the the memory leak and misuse of ipc_single_command.

ddevault · 2016-07-11T11:47:38Z

How about changing workspaces with the scroll wheel?

deklov · 2016-07-11T14:42:30Z

I look into that once this PR has been merged. Can you please open a ticket with all the mouse related features you want to see for swaybar and assign it to me.

ddevault · 2016-07-11T14:53:17Z

Sure.

ddevault · 2016-07-11T17:28:24Z

Tested this and it doesn't work with multihead - all of the swaybars end up spawning on the same output. You can simulate multihead by running sway with the x backend and using WLC_OUTPUTS=n where n is the number of windows to spawn as virtual outputs.

ddevault · 2016-07-11T17:31:56Z

include/extensions.h

@@ -25,6 +23,8 @@ struct panel_config {
 	enum desktop_shell_panel_position panel_position;
 	// used to determine if client is a panel
 	struct wl_client *client;
+        // wlc handle for this panel's surface, not set until panel is created
+        wlc_handle handle;


deklov · 2016-07-11T18:43:02Z

We know what output each panel should be on: https://github.com/SirCmpwn/sway/blob/master/sway/extensions.c#L88. Could it be as simple as telling wlc what output to put the panels on?

ddevault · 2016-07-11T18:45:40Z

Perhaps!

ddevault · 2016-07-11T18:47:59Z

Can you just push more commits to this branch instead of making a fourth pull request?

deklov · 2016-07-12T01:01:06Z

Yes, I didn't mean to close this PR, must have done so by mistake.

deklov · 2016-07-12T02:51:12Z

The dual head problem was easy to fix: git grep -n 'wlc.*output' in sway's source tree, found wlc_view_set_outpu and added a call to it in handle_view_created. Patch on the way. It will take longer to fix the spelling and tab errors ;)

deklov · 2016-07-14T21:54:09Z

Bump. Can we please try and get this merged.

ddevault · 2016-07-14T22:04:32Z

Can you sync up with master?

This reverts commit 99bda4a. It turned out that code to handle swaybg as shell surface was broken so we don't want to make swaybg a shell surface until this has been fixed.

This code had some issues. Remove it now so that we can start clean and fix it later.

Panels were explicitly rendered by calling wlc_surface_render in handle_output_pre_render. Calling wlc_surface_render does not set the surface's geometry (like wlc_view_set_geometry does). Sway did not call wlc_view_set_geometry for panels, so wlc defaulted their geometry to be at the origin. This is not correct for bars unless their location is top. Furthermore, for a surface to receive pointer events, its mask has to be set to visible. This causes wlc to render these surfaces, causing panels and backgrounds to be rendered twice. This commit makes panels and surfaces visible, sets the correct geometries and removes the code that explicitly rendered them.

Also remove some unnecessary strtup()s and rename a few variables and functions.

This commit does not do anything with this information other than logging it.

…cked

deklov · 2016-07-14T22:18:58Z

Done

ddevault · 2016-07-14T22:57:39Z

Thanks!

deklov force-pushed the panel-as-shell-03 branch from e6a5579 to 3efffe1 Compare July 10, 2016 19:14

deklov force-pushed the panel-as-shell-03 branch from 3efffe1 to 80b4488 Compare July 10, 2016 19:30

deklov reviewed Jul 11, 2016
View reviewed changes

deklov force-pushed the panel-as-shell-03 branch from c3a7e1c to 1a39d19 Compare July 11, 2016 06:10

ddevault reviewed Jul 11, 2016
View reviewed changes

deklov closed this Jul 11, 2016

ddevault reopened this Jul 11, 2016

deklov force-pushed the panel-as-shell-03 branch from 1a39d19 to 7ef164a Compare July 12, 2016 03:10

deklov force-pushed the panel-as-shell-03 branch from 7ef164a to 08bc96a Compare July 14, 2016 22:08

deklov added 8 commits July 14, 2016 17:15

Revert "swaybg: Make swaybg a shell surface"

6d94f77

This reverts commit 99bda4a. It turned out that code to handle swaybg as shell surface was broken so we don't want to make swaybg a shell surface until this has been fixed.

Don't treat backgrounds as shell surfaces

4bb45ab

This code had some issues. Remove it now so that we can start clean and fix it later.

Setup to receive mouse click events and log them

103954d

Extract workspace size computation from render_workspace_button()

c805e42

Also remove some unnecessary strtup()s and rename a few variables and functions.

Use int instead of wl_fixed_t for mouse coordinates

679c7b3

Compute what workspace button is clicked

a0c8799

This commit does not do anything with this information other than logging it.

Send command to sway to change workspace when workspace button is cli…

8a232c8

…cked

deklov force-pushed the panel-as-shell-03 branch from 08bc96a to 8a232c8 Compare July 14, 2016 22:18

ddevault merged commit 6abbe04 into swaywm:master Jul 14, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set panels/backgrounds' geometries correctly and don't render them ex… #743

Set panels/backgrounds' geometries correctly and don't render them ex… #743

deklov commented Jul 6, 2016

deklov commented Jul 6, 2016

ddevault commented Jul 6, 2016

ddevault commented Jul 9, 2016

deklov commented Jul 9, 2016

ddevault commented Jul 9, 2016

deklov commented Jul 10, 2016 •

edited

Loading

deklov commented Jul 10, 2016

deklov commented Jul 10, 2016

deklov commented Jul 10, 2016

ddevault commented Jul 10, 2016

deklov commented Jul 10, 2016

ddevault commented Jul 10, 2016

deklov commented Jul 10, 2016

deklov commented Jul 11, 2016

deklov Jul 11, 2016

deklov commented Jul 11, 2016

deklov Jul 11, 2016

deklov Jul 11, 2016 •

edited

Loading

deklov commented Jul 11, 2016

ddevault commented Jul 11, 2016

deklov commented Jul 11, 2016

ddevault commented Jul 11, 2016

ddevault commented Jul 11, 2016

ddevault Jul 11, 2016

deklov Jul 12, 2016

deklov commented Jul 11, 2016

ddevault commented Jul 11, 2016

ddevault commented Jul 11, 2016

deklov commented Jul 12, 2016

deklov commented Jul 12, 2016

deklov commented Jul 14, 2016

ddevault commented Jul 14, 2016

deklov commented Jul 14, 2016

ddevault commented Jul 14, 2016

Set panels/backgrounds' geometries correctly and don't render them ex… #743

Set panels/backgrounds' geometries correctly and don't render them ex… #743

Conversation

deklov commented Jul 6, 2016

deklov commented Jul 6, 2016

ddevault commented Jul 6, 2016

ddevault commented Jul 9, 2016

deklov commented Jul 9, 2016

ddevault commented Jul 9, 2016

deklov commented Jul 10, 2016 • edited Loading

deklov commented Jul 10, 2016

deklov commented Jul 10, 2016

deklov commented Jul 10, 2016

ddevault commented Jul 10, 2016

deklov commented Jul 10, 2016

ddevault commented Jul 10, 2016

deklov commented Jul 10, 2016

deklov commented Jul 11, 2016

deklov Jul 11, 2016

Choose a reason for hiding this comment

deklov commented Jul 11, 2016

deklov Jul 11, 2016

Choose a reason for hiding this comment

deklov Jul 11, 2016 • edited Loading

Choose a reason for hiding this comment

deklov commented Jul 11, 2016

ddevault commented Jul 11, 2016

deklov commented Jul 11, 2016

ddevault commented Jul 11, 2016

ddevault commented Jul 11, 2016

ddevault Jul 11, 2016

Choose a reason for hiding this comment

deklov Jul 12, 2016

Choose a reason for hiding this comment

deklov commented Jul 11, 2016

ddevault commented Jul 11, 2016

ddevault commented Jul 11, 2016

deklov commented Jul 12, 2016

deklov commented Jul 12, 2016

deklov commented Jul 14, 2016

ddevault commented Jul 14, 2016

deklov commented Jul 14, 2016

ddevault commented Jul 14, 2016

deklov commented Jul 10, 2016 •

edited

Loading

deklov Jul 11, 2016 •

edited

Loading