mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 09:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90 from taiyu-len/master

Browse source 
floating mode_toggle
This commit is contained in:
Drew DeVault 2015-08-19 16:15:38 -04:00
parent c29214f348 6cc29ebbf5
commit 532598947d
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway.5.txt
View file

@ -41,6 +41,9 @@ Commands
**floating** toggle:: **floating** toggle::
Toggles the "floating" status of the focused view. Toggles the "floating" status of the focused view.
**floating** mode_toggle::
Toggles focus between floating view and tiled view.
**focus** <direction>:: **focus** <direction>::
Direction may be one of _up_, _down_, _left_, _right_, or _parent_. The Direction may be one of _up_, _down_, _left_, _right_, or _parent_. The
directional focus commands will move the focus in that direction. The parent directional focus commands will move the focus in that direction. The parent

11
sway/commands.c
View file

@ -231,6 +231,17 @@ static bool cmd_floating(struct sway_config *config, int argc, char **argv) {
return true; return true;
} }
set_focused_container(view); set_focused_container(view);
} else if (strcasecmp(argv[0], "mode_toggle") == 0) {
if (get_focused_view(active_workspace)->is_floating) {
if (active_workspace->children->length > 0) {
set_focused_container(get_focused_view(active_workspace->children->items[0]));
}
} else {
if (active_workspace->floating->length > 0) {
swayc_t *floating = active_workspace->floating->items[active_workspace->floating->length-1];
set_focused_container(get_focused_view(floating));
}
}
} }
return true; return true;

3
sway/handlers.c
View file

@ -316,6 +316,9 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
} }
bool cmd_success = false; bool cmd_success = false;
sway_log(L_DEBUG, "modifier %x: state %d: key %d, sym: %d",
modifiers->mods, state, key, sym);
if ((modifiers->mods & config->floating_mod) && (dragging || resizing)) { if ((modifiers->mods & config->floating_mod) && (dragging || resizing)) {
reset_floating(get_focused_view(&root_container)); reset_floating(get_focused_view(&root_container));
} }