vhad/PaperWM
1
0
Fork 0
mirror of https://github.com/gosticks/PaperWM.git synced 2026-10-04 19:46:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

keybind: super-t take window and place at final destination

Browse Source 
This also fixes the rather strange behavior of super-ctrl-above_tab which
actually didn't move to the previous workspace.
This commit is contained in:
Tor Hedin Brønner
2019-01-09 11:51:04 +01:00
parent 98f1e02646
commit 75e66de782
6 changed files with 75 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -1
View File
@@ -55,11 +55,12 @@ PaperWM doesn't handle attached modal dialogs very well, so it's best to turn it
| <kbd>Super</kbd><kbd>Ctrl</kbd><kbd>,</kbd> or <kbd>Super</kbd><kbd>Ctrl</kbd><kbd>.</kbd> | Move the current window to the left or right |
| <kbd>Super</kbd><kbd>Ctrl</kbd><kbd>Left</kbd> or <kbd>Super</kbd><kbd>Ctrl</kbd><kbd>Right</kbd> | Move the current window to the left or right |
| <kbd>Super</kbd><kbd>Ctrl</kbd><kbd>Up</kbd> or <kbd>Super</kbd><kbd>Ctrl</kbd><kbd>Down</kbd> | Move the current window up or down |
| <kbd>Super</kbd><kbd>t</kbd> | Take the window, placing it when finished navigating |
| <kbd>Super</kbd><kbd>Tab</kbd> or <kbd>Alt</kbd><kbd>Tab</kbd> | Cycle through the most recently used windows |
| <kbd>Super</kbd><kbd>Shift</kbd><kbd>Tab</kbd> or <kbd>Alt</kbd><kbd>Shift</kbd><kbd>Tab</kbd> | Cycle backwards through the most recently used windows |
| <kbd>Super</kbd><kbd>C</kbd> | Center the active window horizontally |
| <kbd>Super</kbd><kbd>R</kbd> | Resize the window (cycles through useful widths) |
| <kbd>Super</kbd><kbd>Shift</kbd><kbd>R</kbd> | Resize the window (cycles through useful heights) |
| <kbd>Super</kbd><kbd>Shift</kbd><kbd>R</kbd> | Resize the window (cycles through useful heights) |
| <kbd>Super</kbd><kbd>F</kbd> | Maximize the width of a window |
| <kbd>Super</kbd><kbd>Shift</kbd><kbd>F</kbd> | Toggle fullscreen |
| <kbd>Super</kbd><kbd>Return</kbd> or <kbd>Super</kbd><kbd>N</kbd> | Create a new window from the active application |
keybindings.js
+2
View File
@@ -80,6 +80,8 @@ function init() {
registerNavigatorAction('move-previous-workspace-backward',
Tiling.movePreviousSpaceBackwards);
registerNavigatorAction('take-window', Tiling.takeWindow);
registerMinimapAction("switch-next", (mw, space) => space.switchLinear(1));
registerMinimapAction("switch-previous", (mw, space) => space.switchLinear(-1));
prefs.js
+1 -1
View File
@@ -165,7 +165,7 @@ class SettingsWidget {
'move-left', 'move-right', 'move-up', 'move-down',
'slurp-in', 'barf-out', 'center-horizontally',
'paper-toggle-fullscreen', 'toggle-maximize-width', 'cycle-width',
'cycle-height']
'cycle-height', 'take-window']
.forEach(k => {
addKeybinding(windows.model.child_model, settings, k);
});
schemas/gschemas.compiled
BIN
View File
Binary file not shown.
schemas/org.gnome.shell.extensions.org-scrollwm.gschema.xml
+5
View File
@@ -47,6 +47,11 @@
<summary>Attach/detach the active window into the scratch layer</summary>
</key>
<key type="as" name="take-window">
<default><![CDATA[['<Super>t']]]></default>
<summary>Take the window, dropping it when finished navigating</summary>
</key>
<key type="as" name="switch-next">
<default><![CDATA[['<Super>period']]]></default>
<summary>Switch to the next window</summary>
tiling.js
+65 -46
View File
@@ -1012,7 +1012,6 @@ class Spaces extends Map {
this.clickOverlays = [];
this.signals = new utils.Signals();
this.stack = [];
this._moving = [];
let spaceContainer = new Clutter.Actor({name: 'spaceContainer'});
spaceContainer.hide();
this.spaceContainer = spaceContainer;
@@ -1386,45 +1385,24 @@ class Spaces extends Map {
let newSpace = this.selectedSpace;
let to = from;
if (move && this.selectedSpace.selectedWindow) {
let moving = this.selectedSpace.selectedWindow;
this._moving.push(moving);
this.selectedSpace.removeWindow(moving);
let actor = moving.get_compositor_private();
backgroundGroup.add_actor(moving.clone);
let lowest = this._moving[this._moving.length - 2];
lowest && backgroundGroup.set_child_below_sibling(moving.clone, lowest.clone);
let point = this.selectedSpace.cloneContainer.apply_relative_transform_to_point(
backgroundGroup, new Clutter.Vertex({x: moving.clone.x,
y: moving.clone.y}));
moving.clone.set_position(point.x, point.y);
let x = Math.round(space.monitor.x +
space.monitor.width -
(0.1*space.monitor.width*(1 +this._moving.length)));
let y = Math.round(space.monitor.y + space.monitor.height*2/3)
+ 20*this._moving.length;
moving.move_frame(true, x, y);
animateWindow(moving);
Tweener.addTween(moving.clone,
{x, y,
time: prefs.animation_time,
transition
});
} else {
if (direction === Meta.MotionDirection.DOWN)
to = from + 1;
else
to = from - 1;
if (to < 0 || to >= mru.length) {
to = from;
}
if (to === from && Tweener.getTweenCount(newSpace.actor) > 0)
return;
newSpace = mru[to];
this.selectedSpace = newSpace;
takeWindow(this.selectedSpace.selectedWindow,
this.selectedSpace,
{navigator: Navigator.getNavigator()});
}
if (direction === Meta.MotionDirection.DOWN)
to = from + 1;
else
to = from - 1;
if (to < 0 || to >= mru.length) {
to = from;
}
if (to === from && Tweener.getTweenCount(newSpace.actor) > 0)
return;
newSpace = mru[to];
this.selectedSpace = newSpace;
TopBar.updateWorkspaceIndicator(newSpace.workspace.index());
mru.forEach((space, i) => {
@@ -1462,14 +1440,6 @@ class Spaces extends Map {
inPreview = false;
TopBar.updateWorkspaceIndicator(to.workspace.index());
this._moving.reverse().forEach(w => {
w.change_workspace(to.workspace);
if (w.get_workspace() === to.workspace) {
insertWindow(w, {existing: true});
}
});
this._moving = [];
this.selectedSpace = to;
to.actor.show();
@@ -2571,3 +2541,52 @@ function movePreviousSpace(mw, space) {
function movePreviousSpaceBackwards(mw, space) {
spaces.selectSpace(Meta.MotionDirection.UP, true);
}
/**
Detach the @metaWindow, storing it at the bottom right corner while
navigating. When done, insert all the detached windows again.
*/
function takeWindow(metaWindow, space, {navigator}) {
space = space || spaces.selectedSpace;
metaWindow = metaWindow || space.selectedWindow;
navigator = navigator || Navigator.getNavigator();
if (!space.removeWindow(metaWindow))
return;
if (!navigator._movingId) {
navigator._moving = [];
let id = navigator.connect('destroy', () => {
navigator.disconnect(id);
let space = spaces.selectedSpace;
navigator._moving.reverse().forEach(w => {
w.change_workspace(space.workspace);
if (w.get_workspace() === space.workspace) {
insertWindow(w, {existing: true});
}
});
});
}
navigator._moving.push(metaWindow);
let parent = backgroundGroup;
let actor = metaWindow.get_compositor_private();
parent.add_actor(metaWindow.clone);
let lowest = navigator._moving[navigator._moving.length - 2];
lowest && parent.set_child_below_sibling(metaWindow.clone, lowest.clone);
let point = space.cloneContainer.apply_relative_transform_to_point(
parent, new Clutter.Vertex({x: metaWindow.clone.x,
y: metaWindow.clone.y}));
metaWindow.clone.set_position(point.x, point.y);
let x = Math.round(space.monitor.x +
space.monitor.width -
(0.1*space.monitor.width*(1 +navigator._moving.length)));
let y = Math.round(space.monitor.y + space.monitor.height*2/3)
+ 20*navigator._moving.length;
metaWindow.move_frame(true, x, y);
animateWindow(metaWindow);
Tweener.addTween(metaWindow.clone,
{x, y,
time: prefs.animation_time,
transition: 'easeInOutQuad',
});
}