alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #53 from taiyu-len/master

Browse source 
send_to_back/bring_to_front set when view changes visibility.
This commit is contained in:
Drew DeVault 2015-08-16 22:11:33 -04:00
parent 9e56d72e11 f1d5305dc6
commit cb504c8f7b
6 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/container.h
View file

@ -68,4 +68,7 @@ swayc_t *destroy_view(swayc_t *view);
swayc_t *find_container(swayc_t *container, bool (*test)(swayc_t *view, void *data), void *data); swayc_t *find_container(swayc_t *container, bool (*test)(swayc_t *view, void *data), void *data);
void container_map(swayc_t *, void (*f)(swayc_t *, void *), void *); void container_map(swayc_t *, void (*f)(swayc_t *, void *), void *);
//Mappings
void set_view_visibility(swayc_t *view, void *data);
#endif #endif

1
include/layout.h
View file

@ -22,6 +22,7 @@ void arrange_windows(swayc_t *container, int width, int height);
void unfocus_all(swayc_t *container); void unfocus_all(swayc_t *container);
void focus_view(swayc_t *view); void focus_view(swayc_t *view);
void focus_view_for(swayc_t *ancestor, swayc_t *container); void focus_view_for(swayc_t *ancestor, swayc_t *container);
swayc_t *get_focused_container(swayc_t *parent); swayc_t *get_focused_container(swayc_t *parent);
swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent); swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent);

12
sway/container.c
View file

@ -227,3 +227,15 @@ void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), voi
} }
} }
void set_view_visibility(swayc_t *view, void *data) {
uint32_t *p = data;
if (view->type == C_VIEW) {
wlc_view_set_mask(view->handle, *p);
if (*p == 2) {
wlc_view_bring_to_front(view->handle);
} else {
wlc_view_send_to_back(view->handle);
}
}
view->visible = (*p == 2);
}

2
sway/handlers.c
View file

@ -238,8 +238,8 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
} }
static bool handle_pointer_motion(wlc_handle view, uint32_t time, const struct wlc_origin *origin) { static bool handle_pointer_motion(wlc_handle view, uint32_t time, const struct wlc_origin *origin) {
static wlc_handle prev_view = 0;
mouse_origin = *origin; mouse_origin = *origin;
static wlc_handle prev_view = -1;
if (config->focus_follows_mouse && prev_view != view) { if (config->focus_follows_mouse && prev_view != view) {
focus_pointer(); focus_pointer();
} }

3
sway/layout.c
View file

@ -237,7 +237,7 @@ void unfocus_all(swayc_t *container) {
} }
void focus_view(swayc_t *view) { void focus_view(swayc_t *view) {
sway_log(L_DEBUG, "Setting focus for %p", view); sway_log(L_DEBUG, "Setting focus for %p:%ld", view, view->handle);
swayc_t *c = view; swayc_t *c = view;
//Set focus from root to view //Set focus from root to view
while (c != &root_container) { while (c != &root_container) {
@ -272,4 +272,3 @@ void focus_view_for(swayc_t *top, swayc_t *view) {
} }
} }

13
sway/workspace.c
View file

@ -80,15 +80,6 @@ bool workspace_by_name(swayc_t *view, void *data) {
(strcasecmp(view->name, (char *) data) == 0); (strcasecmp(view->name, (char *) data) == 0);
} }
void set_mask(swayc_t *view, void *data) {
uint32_t *p = data;
if (view->type == C_VIEW) {
wlc_view_set_mask(view->handle, *p);
}
view->visible = (*p == 2);
}
swayc_t *workspace_find_by_name(const char* name) { swayc_t *workspace_find_by_name(const char* name) {
return find_container(&root_container, workspace_by_name, (void *) name); return find_container(&root_container, workspace_by_name, (void *) name);
} }
@ -194,9 +185,9 @@ void workspace_switch(swayc_t *workspace) {
// set all c_views in the old workspace to the invisible mask if the workspace // set all c_views in the old workspace to the invisible mask if the workspace
// is in the same output & c_views in the new workspace to the visible mask // is in the same output & c_views in the new workspace to the visible mask
container_map(focused_workspace, set_mask, &mask); container_map(focused_workspace, set_view_visibility, &mask);
mask = 2; mask = 2;
container_map(workspace, set_mask, &mask); container_map(workspace, set_view_visibility, &mask);
wlc_output_set_mask(ws_output->handle, 2); wlc_output_set_mask(ws_output->handle, 2);
destroy_workspace(focused_workspace); destroy_workspace(focused_workspace);