Giovanni Campagna
9d9ef27317
Recently WindowsNavigator would just crash the shell upon entering the overview. I'm not sure where the bug was, probably it was due to the new window layout code.
273 lines
9.9 KiB
JavaScript
273 lines
9.9 KiB
JavaScript
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
|
const Clutter = imports.gi.Clutter;
|
|
const Lang = imports.lang;
|
|
const Mainloop = imports.mainloop;
|
|
const St = imports.gi.St;
|
|
|
|
const Main = imports.ui.main;
|
|
const Workspace = imports.ui.workspace;
|
|
const WorkspacesView = imports.ui.workspacesView;
|
|
|
|
function injectToFunction(parent, name, func) {
|
|
let origin = parent[name];
|
|
parent[name] = function() {
|
|
let ret;
|
|
ret = origin.apply(this, arguments);
|
|
if (ret === undefined)
|
|
ret = func.apply(this, arguments);
|
|
return ret;
|
|
}
|
|
return origin;
|
|
}
|
|
|
|
let winInjections, workspaceInjections, workViewInjections, createdActors, connectedSignals;
|
|
|
|
function resetState() {
|
|
winInjections = { };
|
|
workspaceInjections = { };
|
|
workViewInjections = { };
|
|
createdActors = [ ];
|
|
connectedSignals = [ ];
|
|
}
|
|
|
|
function enable() {
|
|
resetState();
|
|
|
|
Workspace.WindowOverlay.prototype.showTooltip = function() {
|
|
this._text.raise_top();
|
|
this._text.show();
|
|
this._text.text = (this._windowClone.slotId + 1).toString();
|
|
}
|
|
winInjections['showTooltip'] = undefined;
|
|
|
|
Workspace.WindowOverlay.prototype.hideTooltip = function() {
|
|
if (this._text && this._text.visible)
|
|
this._text.hide();
|
|
}
|
|
winInjections['hideTooltip'] = undefined;
|
|
|
|
Workspace.Workspace.prototype.showTooltip = function() {
|
|
if (this._tip == null)
|
|
return;
|
|
this._tip.text = (this.metaWorkspace.index() + 1).toString();
|
|
this._tip.x = this._x;
|
|
this._tip.y = this._y;
|
|
this._tip.show();
|
|
this._tip.raise_top();
|
|
}
|
|
workspaceInjections['showTooltip'] = undefined;
|
|
|
|
Workspace.Workspace.prototype.hideTooltip = function() {
|
|
if (this._tip == null)
|
|
return;
|
|
if (!this._tip.get_parent())
|
|
return;
|
|
this._tip.hide();
|
|
}
|
|
workspaceInjections['hideTooltip'] = undefined;
|
|
|
|
Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
|
|
for (let i = 0; i < this._windows.length; i++) {
|
|
if ((this._windows[i].slotId + 1) == id)
|
|
return this._windows[i].metaWindow;
|
|
}
|
|
return null;
|
|
}
|
|
workspaceInjections['getWindowWithTooltip'] = undefined;
|
|
|
|
Workspace.Workspace.prototype.showWindowsTooltips = function() {
|
|
for (let i in this._windowOverlays) {
|
|
if (this._windowOverlays[i] != null)
|
|
this._windowOverlays[i].showTooltip();
|
|
}
|
|
}
|
|
workspaceInjections['showWindowsTooltips'] = undefined;
|
|
|
|
Workspace.Workspace.prototype.hideWindowsTooltips = function() {
|
|
for (let i in this._windowOverlays) {
|
|
if (this._windowOverlays[i] != null)
|
|
this._windowOverlays[i].hideTooltip();
|
|
}
|
|
}
|
|
workspaceInjections['hideWindowsTooltips'] = undefined;
|
|
|
|
WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
|
|
if (global.stage.get_key_focus() == global.stage)
|
|
global.stage.set_key_focus(this._prevFocusActor);
|
|
this._pickWindow = false;
|
|
for (let i = 0; i < this._workspaces.length; i++)
|
|
this._workspaces[i].hideWindowsTooltips();
|
|
}
|
|
workViewInjections['_hideTooltips'] = undefined;
|
|
|
|
WorkspacesView.WorkspacesView.prototype._hideWorkspacesTooltips = function() {
|
|
global.stage.set_key_focus(this._prevFocusActor);
|
|
this._pickWorkspace = false;
|
|
for (let i = 0; i < this._workspaces.length; i++)
|
|
this._workspaces[i].hideTooltip();
|
|
}
|
|
workViewInjections['_hideWorkspacesTooltips'] = undefined;
|
|
|
|
WorkspacesView.WorkspacesView.prototype._onKeyRelease = function(s, o) {
|
|
if (this._pickWindow &&
|
|
(o.get_key_symbol() == Clutter.KEY_Alt_L ||
|
|
o.get_key_symbol() == Clutter.KEY_Alt_R))
|
|
this._hideTooltips();
|
|
if (this._pickWorkspace &&
|
|
(o.get_key_symbol() == Clutter.KEY_Control_L ||
|
|
o.get_key_symbol() == Clutter.KEY_Control_R))
|
|
this._hideWorkspacesTooltips();
|
|
}
|
|
workViewInjections['_onKeyRelease'] = undefined;
|
|
|
|
WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
|
|
if(Main.overview._viewSelector._activePage != Main.overview._viewSelector._workspacesPage)
|
|
return false;
|
|
|
|
if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
|
|
o.get_key_symbol() == Clutter.KEY_Alt_R)
|
|
&& !this._pickWorkspace) {
|
|
this._prevFocusActor = global.stage.get_key_focus();
|
|
global.stage.set_key_focus(null);
|
|
this._active = global.screen.get_active_workspace_index();
|
|
this._pickWindow = true;
|
|
this._workspaces[global.screen.get_active_workspace_index()].showWindowsTooltips();
|
|
return true;
|
|
}
|
|
if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
|
|
o.get_key_symbol() == Clutter.KEY_Control_R)
|
|
&& !this._pickWindow) {
|
|
this._prevFocusActor = global.stage.get_key_focus();
|
|
global.stage.set_key_focus(null);
|
|
this._pickWorkspace = true;
|
|
for (let i = 0; i < this._workspaces.length; i++)
|
|
this._workspaces[i].showTooltip();
|
|
return true;
|
|
}
|
|
|
|
if (global.stage.get_key_focus() != global.stage)
|
|
return false;
|
|
|
|
// ignore shift presses, they're required to get numerals in azerty keyboards
|
|
if ((this._pickWindow || this._pickWorkspace) &&
|
|
(o.get_key_symbol() == Clutter.KEY_Shift_L ||
|
|
o.get_key_symbol() == Clutter.KEY_Shift_R))
|
|
return true;
|
|
|
|
if (this._pickWindow) {
|
|
if (this._active != global.screen.get_active_workspace_index()) {
|
|
this._hideTooltips();
|
|
return false;
|
|
}
|
|
|
|
let c = o.get_key_symbol() - Clutter.KEY_KP_0;
|
|
if (c > 9 || c <= 0) {
|
|
c = o.get_key_symbol() - Clutter.KEY_0;
|
|
if (c > 9 || c <= 0) {
|
|
this._hideTooltips();
|
|
global.log(c);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
let win = this._workspaces[this._active].getWindowWithTooltip(c);
|
|
this._hideTooltips();
|
|
|
|
if (win)
|
|
Main.activateWindow(win, global.get_current_time());
|
|
|
|
return true;
|
|
}
|
|
if (this._pickWorkspace) {
|
|
let c = o.get_key_symbol() - Clutter.KEY_KP_0;
|
|
if (c > 9 || c <= 0) {
|
|
c = o.get_key_symbol() - Clutter.KEY_0;
|
|
if (c > 9 || c <= 0) {
|
|
this._hideWorkspacesTooltips();
|
|
return false;
|
|
}
|
|
}
|
|
|
|
let workspace = this._workspaces[c - 1];
|
|
if (workspace !== undefined)
|
|
workspace.metaWorkspace.activate(global.get_current_time());
|
|
|
|
this._hideWorkspacesTooltips();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
workViewInjections['_onKeyPress'] = undefined;
|
|
|
|
winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
|
|
this._id = null;
|
|
createdActors.push(this._text = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip' }));
|
|
this._text.hide();
|
|
parentActor.add_actor(this._text);
|
|
});
|
|
|
|
winInjections['updatePositions'] = injectToFunction(Workspace.WindowOverlay.prototype, 'updatePositions', function(cloneX, cloneY, cloneWidth, cloneHeight) {
|
|
let textX = cloneX - 2;
|
|
let textY = cloneY - 2;
|
|
this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
|
|
this._text.raise_top();
|
|
});
|
|
|
|
workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) {
|
|
if (metaWorkspace && metaWorkspace.index() < 9) {
|
|
createdActors.push(this._tip = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip',
|
|
visible: false }));
|
|
|
|
this.actor.add_actor(this._tip);
|
|
let signalId = this.actor.connect('notify::scale-x', Lang.bind(this, function() {
|
|
this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
|
|
}));
|
|
connectedSignals.push({ obj: this.actor, id: signalId });
|
|
} else
|
|
this._tip = null;
|
|
});
|
|
|
|
workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(width, height, x, y, workspaces) {
|
|
this._pickWorkspace = false;
|
|
this._pickWindow = false;
|
|
this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._onKeyPress));
|
|
this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._onKeyRelease));
|
|
connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
|
|
connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
|
|
});
|
|
|
|
workViewInjections['_onDestroy'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
|
|
global.stage.disconnect(this._keyPressEventId);
|
|
global.stage.disconnect(this._keyReleaseEventId);
|
|
connectedSignals = [ ];
|
|
});
|
|
}
|
|
|
|
function removeInjection(object, injection, name) {
|
|
if (injection[name] === undefined)
|
|
delete object[name];
|
|
else
|
|
object[name] = injection[name];
|
|
}
|
|
|
|
function disable() {
|
|
for (i in workspaceInjections)
|
|
removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
|
|
for (i in winInjections)
|
|
removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
|
|
for (i in workViewInjections)
|
|
removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);
|
|
|
|
for each (i in connectedSignals)
|
|
i.obj.disconnect(i.id);
|
|
|
|
for each (i in createdActors)
|
|
i.destroy();
|
|
|
|
resetState();
|
|
}
|
|
|
|
function init() {
|
|
/* do nothing */
|
|
}
|