2009-04-13 10:55:41 -04:00
|
|
|
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
|
|
|
|
|
|
|
const Big = imports.gi.Big;
|
|
|
|
const Clutter = imports.gi.Clutter;
|
2009-09-28 23:31:54 -04:00
|
|
|
const Gdk = imports.gi.Gdk;
|
2009-04-13 10:55:41 -04:00
|
|
|
const Lang = imports.lang;
|
2009-10-02 11:02:46 -04:00
|
|
|
const Mainloop = imports.mainloop;
|
2009-05-13 15:32:51 -04:00
|
|
|
const Meta = imports.gi.Meta;
|
2009-04-13 10:55:41 -04:00
|
|
|
const Pango = imports.gi.Pango;
|
|
|
|
const Shell = imports.gi.Shell;
|
2009-10-02 11:02:46 -04:00
|
|
|
const Signals = imports.signals;
|
2009-09-29 12:19:16 -04:00
|
|
|
const St = imports.gi.St;
|
2009-04-13 10:55:41 -04:00
|
|
|
|
|
|
|
const Main = imports.ui.main;
|
2009-10-09 09:43:31 -04:00
|
|
|
const Tweener = imports.ui.tweener;
|
2009-04-13 10:55:41 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
const POPUP_ARROW_COLOR = new Clutter.Color();
|
|
|
|
POPUP_ARROW_COLOR.from_pixel(0xffffffff);
|
2009-10-09 09:43:31 -04:00
|
|
|
const POPUP_UNFOCUSED_ARROW_COLOR = new Clutter.Color();
|
|
|
|
POPUP_UNFOCUSED_ARROW_COLOR.from_pixel(0x808080ff);
|
2009-10-02 11:02:46 -04:00
|
|
|
const TRANSPARENT_COLOR = new Clutter.Color();
|
|
|
|
TRANSPARENT_COLOR.from_pixel(0x00000000);
|
2009-04-13 10:55:41 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
const POPUP_APPICON_SIZE = 96;
|
|
|
|
const POPUP_LIST_SPACING = 8;
|
2010-03-17 13:31:03 -04:00
|
|
|
const POPUP_SCROLL_TIME = 0.10; // seconds
|
2009-04-13 10:55:41 -04:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
const DISABLE_HOVER_TIMEOUT = 500; // milliseconds
|
2009-09-21 13:44:42 -04:00
|
|
|
|
2010-03-17 13:31:03 -04:00
|
|
|
const THUMBNAIL_DEFAULT_SIZE = 256;
|
2009-10-09 09:43:31 -04:00
|
|
|
const THUMBNAIL_POPUP_TIME = 500; // milliseconds
|
|
|
|
const THUMBNAIL_FADE_TIME = 0.2; // seconds
|
2009-10-02 11:02:46 -04:00
|
|
|
|
2010-03-17 13:31:03 -04:00
|
|
|
const iconSizes = [96, 64, 48, 32, 22];
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
function mod(a, b) {
|
|
|
|
return (a + b) % b;
|
|
|
|
}
|
|
|
|
|
2009-04-13 10:55:41 -04:00
|
|
|
function AltTabPopup() {
|
|
|
|
this._init();
|
|
|
|
}
|
|
|
|
|
|
|
|
AltTabPopup.prototype = {
|
|
|
|
_init : function() {
|
2010-03-17 13:31:03 -04:00
|
|
|
this.actor = new Shell.GenericContainer({ reactive: true });
|
|
|
|
|
|
|
|
this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
|
|
|
|
this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
|
|
|
|
this.actor.connect('allocate', Lang.bind(this, this._allocate));
|
2009-04-13 10:55:41 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
|
2009-09-30 05:28:32 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
this._haveModal = false;
|
2009-04-13 10:55:41 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
this._currentApp = 0;
|
2009-10-09 09:43:31 -04:00
|
|
|
this._currentWindow = 0;
|
2009-10-02 11:02:46 -04:00
|
|
|
this._thumbnailTimeoutId = 0;
|
2009-10-09 09:43:31 -04:00
|
|
|
this._motionTimeoutId = 0;
|
|
|
|
|
|
|
|
// Initially disable hover so we ignore the enter-event if
|
|
|
|
// the switcher appears underneath the current pointer location
|
|
|
|
this._disableHover();
|
2009-04-13 10:55:41 -04:00
|
|
|
|
2009-08-05 19:54:22 -04:00
|
|
|
global.stage.add_actor(this.actor);
|
2009-04-13 10:55:41 -04:00
|
|
|
},
|
|
|
|
|
2010-03-17 13:31:03 -04:00
|
|
|
_getPreferredWidth: function (actor, forHeight, alloc) {
|
|
|
|
alloc.min_size = global.screen_width;
|
|
|
|
alloc.natural_size = global.screen_width;
|
|
|
|
},
|
|
|
|
|
|
|
|
_getPreferredHeight: function (actor, forWidth, alloc) {
|
|
|
|
alloc.min_size = global.screen_height;
|
|
|
|
alloc.natural_size = global.screen_height;
|
|
|
|
},
|
|
|
|
|
|
|
|
_allocate: function (actor, box, flags) {
|
|
|
|
let childBox = new Clutter.ActorBox();
|
|
|
|
let focus = global.get_focus_monitor();
|
|
|
|
|
|
|
|
// Allocate the appSwitcher
|
|
|
|
// We select a size based on an icon size that does not overflow the screen
|
|
|
|
let [childMinHeight, childNaturalHeight] = this._appSwitcher.actor.get_preferred_height(focus.width - POPUP_LIST_SPACING * 2);
|
|
|
|
let [childMinWidth, childNaturalWidth] = this._appSwitcher.actor.get_preferred_width(childNaturalHeight);
|
|
|
|
childBox.x1 = Math.max(POPUP_LIST_SPACING, focus.x + Math.floor((focus.width - childNaturalWidth) / 2));
|
|
|
|
childBox.x2 = Math.min(childBox.x1 + focus.width - POPUP_LIST_SPACING * 2, childBox.x1 + childNaturalWidth);
|
|
|
|
childBox.y1 = focus.y + Math.floor((focus.height - childNaturalHeight) / 2);
|
|
|
|
childBox.y2 = childBox.y1 + childNaturalHeight;
|
|
|
|
this._appSwitcher.actor.allocate(childBox, flags);
|
|
|
|
|
|
|
|
// Allocate the thumbnails
|
|
|
|
// We try to avoid overflowing the screen so we base the resulting size on
|
|
|
|
// those calculations
|
|
|
|
if (this._thumbnails) {
|
|
|
|
let icon = this._appIcons[this._currentApp].actor;
|
|
|
|
let [posX, posY] = icon.get_transformed_position();
|
|
|
|
let thumbnailCenter = posX + icon.width / 2;
|
|
|
|
let [childMinWidth, childNaturalWidth] = this._thumbnails.actor.get_preferred_width(-1);
|
|
|
|
childBox.x1 = Math.max(POPUP_LIST_SPACING, Math.floor(thumbnailCenter - childNaturalWidth / 2));
|
|
|
|
if (childBox.x1 + childNaturalWidth > focus.width - POPUP_LIST_SPACING * 2) {
|
|
|
|
let offset = childBox.x1 + childNaturalWidth - focus.width + POPUP_LIST_SPACING * 2;
|
|
|
|
childBox.x1 = Math.max(POPUP_LIST_SPACING, childBox.x1 - offset - POPUP_LIST_SPACING * 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
childBox.x2 = childBox.x1 + childNaturalWidth;
|
|
|
|
if (childBox.x2 > focus.width - POPUP_LIST_SPACING)
|
|
|
|
childBox.x2 = focus.width - POPUP_LIST_SPACING;
|
|
|
|
childBox.y1 = this._appSwitcher.actor.allocation.y2 + POPUP_LIST_SPACING * 2;
|
|
|
|
this._thumbnails.addClones(focus.height - POPUP_LIST_SPACING - childBox.y1);
|
|
|
|
let [childMinHeight, childNaturalHeight] = this._thumbnails.actor.get_preferred_height(-1);
|
|
|
|
childBox.y2 = childBox.y1 + childNaturalHeight;
|
|
|
|
this._thumbnails.actor.allocate(childBox, flags);
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
2009-10-01 05:23:00 -04:00
|
|
|
show : function(backward) {
|
2009-10-15 19:28:29 -04:00
|
|
|
let tracker = Shell.WindowTracker.get_default();
|
|
|
|
let apps = tracker.get_running_apps ("");
|
2009-09-15 11:11:32 -04:00
|
|
|
|
|
|
|
if (!apps.length)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!Main.pushModal(this.actor))
|
|
|
|
return false;
|
|
|
|
this._haveModal = true;
|
|
|
|
|
|
|
|
this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
|
|
|
|
this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
this.actor.connect('button-press-event', Lang.bind(this, this._clickedOutside));
|
|
|
|
this.actor.connect('scroll-event', Lang.bind(this, this._onScroll));
|
2009-09-21 13:44:42 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
this._appSwitcher = new AppSwitcher(apps);
|
|
|
|
this.actor.add_actor(this._appSwitcher.actor);
|
|
|
|
this._appSwitcher.connect('item-activated', Lang.bind(this, this._appActivated));
|
2009-10-09 09:43:31 -04:00
|
|
|
this._appSwitcher.connect('item-entered', Lang.bind(this, this._appEntered));
|
2009-08-25 15:23:53 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
this._appIcons = this._appSwitcher.icons;
|
|
|
|
|
|
|
|
// Make the initial selection
|
|
|
|
if (this._appIcons.length == 1) {
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
if (!backward && this._appIcons[0].cachedWindows.length > 1) {
|
2009-10-02 11:02:46 -04:00
|
|
|
// For compatibility with the multi-app case below
|
2009-10-09 09:43:31 -04:00
|
|
|
this._select(0, 1, true);
|
2009-10-02 11:02:46 -04:00
|
|
|
} else
|
|
|
|
this._select(0);
|
|
|
|
} else if (backward) {
|
|
|
|
this._select(this._appIcons.length - 1);
|
|
|
|
} else {
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
let firstWindows = this._appIcons[0].cachedWindows;
|
|
|
|
if (firstWindows.length > 1) {
|
|
|
|
let curAppNextWindow = firstWindows[1];
|
|
|
|
let nextAppWindow = this._appIcons[1].cachedWindows[0];
|
2009-10-02 11:02:46 -04:00
|
|
|
|
|
|
|
// If the next window of the current app is more-recently-used
|
|
|
|
// than the first window of the next app, then select it.
|
|
|
|
if (curAppNextWindow.get_workspace() == global.screen.get_active_workspace() &&
|
|
|
|
curAppNextWindow.get_user_time() > nextAppWindow.get_user_time())
|
2009-10-09 09:43:31 -04:00
|
|
|
this._select(0, 1, true);
|
2009-10-02 11:02:46 -04:00
|
|
|
else
|
|
|
|
this._select(1);
|
|
|
|
} else
|
|
|
|
this._select(1);
|
2009-10-01 05:23:00 -04:00
|
|
|
}
|
2009-09-28 23:31:54 -04:00
|
|
|
|
|
|
|
// There's a race condition; if the user released Alt before
|
|
|
|
// we got the grab, then we won't be notified. (See
|
|
|
|
// https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
|
2009-10-02 11:02:46 -04:00
|
|
|
// details.) So we check now. (Have to do this after updating
|
|
|
|
// selection.)
|
2009-10-06 10:53:25 -04:00
|
|
|
let mods = global.get_modifier_keys();
|
2009-09-28 23:31:54 -04:00
|
|
|
if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
|
|
|
|
this._finish();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2009-09-15 11:11:32 -04:00
|
|
|
return true;
|
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_nextApp : function() {
|
|
|
|
return mod(this._currentApp + 1, this._appIcons.length);
|
|
|
|
},
|
|
|
|
_previousApp : function() {
|
|
|
|
return mod(this._currentApp - 1, this._appIcons.length);
|
2009-09-29 13:29:17 -04:00
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_nextWindow : function() {
|
2009-10-09 09:43:31 -04:00
|
|
|
return mod(this._currentWindow + 1,
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
this._appIcons[this._currentApp].cachedWindows.length);
|
2009-10-02 11:02:46 -04:00
|
|
|
},
|
|
|
|
_previousWindow : function() {
|
2009-10-09 09:43:31 -04:00
|
|
|
return mod(this._currentWindow - 1,
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
this._appIcons[this._currentApp].cachedWindows.length);
|
2009-10-02 11:02:46 -04:00
|
|
|
},
|
|
|
|
|
|
|
|
_keyPressEvent : function(actor, event) {
|
|
|
|
let keysym = event.get_key_symbol();
|
2009-10-07 17:20:33 -04:00
|
|
|
let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
|
2009-10-02 11:02:46 -04:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
this._disableHover();
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
// The WASD stuff is for debugging in Xephyr, where the arrow
|
|
|
|
// keys aren't mapped correctly
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
if (keysym == Clutter.grave)
|
2009-10-02 11:02:46 -04:00
|
|
|
this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow());
|
|
|
|
else if (keysym == Clutter.Escape)
|
|
|
|
this.destroy();
|
2009-10-09 09:43:31 -04:00
|
|
|
else if (this._thumbnailsFocused) {
|
|
|
|
if (keysym == Clutter.Tab) {
|
|
|
|
if (shift && this._currentWindow == 0)
|
|
|
|
this._select(this._previousApp());
|
|
|
|
else if (!shift && this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
|
|
|
|
this._select(this._nextApp());
|
|
|
|
else
|
|
|
|
this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow());
|
|
|
|
} else if (keysym == Clutter.Left || keysym == Clutter.a)
|
2009-10-02 11:02:46 -04:00
|
|
|
this._select(this._currentApp, this._previousWindow());
|
|
|
|
else if (keysym == Clutter.Right || keysym == Clutter.d)
|
|
|
|
this._select(this._currentApp, this._nextWindow());
|
|
|
|
else if (keysym == Clutter.Up || keysym == Clutter.w)
|
|
|
|
this._select(this._currentApp, null, true);
|
|
|
|
} else {
|
2009-10-09 09:43:31 -04:00
|
|
|
if (keysym == Clutter.Tab)
|
|
|
|
this._select(shift ? this._previousApp() : this._nextApp());
|
|
|
|
else if (keysym == Clutter.Left || keysym == Clutter.a)
|
2009-10-02 11:02:46 -04:00
|
|
|
this._select(this._previousApp());
|
|
|
|
else if (keysym == Clutter.Right || keysym == Clutter.d)
|
|
|
|
this._select(this._nextApp());
|
|
|
|
else if (keysym == Clutter.Down || keysym == Clutter.s)
|
2009-10-09 09:43:31 -04:00
|
|
|
this._select(this._currentApp, this._currentWindow);
|
2009-09-26 10:56:41 -04:00
|
|
|
}
|
2009-10-02 11:02:46 -04:00
|
|
|
|
|
|
|
return true;
|
2009-09-26 10:56:41 -04:00
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_keyReleaseEvent : function(actor, event) {
|
|
|
|
let keysym = event.get_key_symbol();
|
2009-09-26 10:56:41 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
if (keysym == Clutter.Alt_L || keysym == Clutter.Alt_R)
|
|
|
|
this._finish();
|
|
|
|
|
|
|
|
return true;
|
|
|
|
},
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
_onScroll : function(actor, event) {
|
|
|
|
let direction = event.get_scroll_direction();
|
|
|
|
if (direction == Clutter.ScrollDirection.UP) {
|
|
|
|
if (this._thumbnailsFocused) {
|
|
|
|
if (this._currentWindow == 0)
|
|
|
|
this._select(this._previousApp());
|
|
|
|
else
|
|
|
|
this._select(this._currentApp, this._previousWindow());
|
|
|
|
} else {
|
|
|
|
let nwindows = this._appIcons[this._currentApp].cachedWindows.length;
|
|
|
|
if (nwindows > 1)
|
|
|
|
this._select(this._currentApp, nwindows - 1);
|
|
|
|
else
|
|
|
|
this._select(this._previousApp());
|
|
|
|
}
|
|
|
|
} else if (direction == Clutter.ScrollDirection.DOWN) {
|
|
|
|
if (this._thumbnailsFocused) {
|
|
|
|
if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
|
|
|
|
this._select(this._nextApp());
|
|
|
|
else
|
|
|
|
this._select(this._currentApp, this._nextWindow());
|
|
|
|
} else {
|
|
|
|
let nwindows = this._appIcons[this._currentApp].cachedWindows.length;
|
|
|
|
if (nwindows > 1)
|
|
|
|
this._select(this._currentApp, 0);
|
|
|
|
else
|
|
|
|
this._select(this._nextApp());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
|
|
|
_clickedOutside : function(actor, event) {
|
|
|
|
this.destroy();
|
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_appActivated : function(appSwitcher, n) {
|
2009-10-09 09:43:31 -04:00
|
|
|
// If the user clicks on the selected app, activate the
|
|
|
|
// selected window; otherwise (eg, they click on an app while
|
|
|
|
// !mouseActive) activate the first window of the clicked-on
|
|
|
|
// app.
|
|
|
|
let window = (n == this._currentApp) ? this._currentWindow : 0;
|
|
|
|
Main.activateWindow(this._appIcons[n].cachedWindows[window]);
|
2009-10-02 11:02:46 -04:00
|
|
|
this.destroy();
|
|
|
|
},
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
_appEntered : function(appSwitcher, n) {
|
2009-10-02 11:02:46 -04:00
|
|
|
if (!this._mouseActive)
|
|
|
|
return;
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
this._select(n);
|
2009-10-02 11:02:46 -04:00
|
|
|
},
|
|
|
|
|
|
|
|
_windowActivated : function(thumbnailList, n) {
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
Main.activateWindow(this._appIcons[this._currentApp].cachedWindows[n]);
|
2009-10-02 11:02:46 -04:00
|
|
|
this.destroy();
|
|
|
|
},
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
_windowEntered : function(thumbnailList, n) {
|
2009-10-02 11:02:46 -04:00
|
|
|
if (!this._mouseActive)
|
|
|
|
return;
|
|
|
|
|
|
|
|
this._select(this._currentApp, n);
|
|
|
|
},
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
_disableHover : function() {
|
|
|
|
this._mouseActive = false;
|
2009-10-02 11:02:46 -04:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
if (this._motionTimeoutId != 0)
|
|
|
|
Mainloop.source_remove(this._motionTimeoutId);
|
2009-10-02 11:02:46 -04:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
this._motionTimeoutId = Mainloop.timeout_add(DISABLE_HOVER_TIMEOUT, Lang.bind(this, this._mouseTimedOut));
|
|
|
|
},
|
|
|
|
|
|
|
|
_mouseTimedOut : function() {
|
|
|
|
this._motionTimeoutId = 0;
|
|
|
|
this._mouseActive = true;
|
2009-10-02 11:02:46 -04:00
|
|
|
},
|
|
|
|
|
|
|
|
_finish : function() {
|
|
|
|
let app = this._appIcons[this._currentApp];
|
2009-10-09 09:43:31 -04:00
|
|
|
let window = app.cachedWindows[this._currentWindow];
|
2009-10-02 11:02:46 -04:00
|
|
|
Main.activateWindow(window);
|
|
|
|
this.destroy();
|
|
|
|
},
|
|
|
|
|
|
|
|
destroy : function() {
|
|
|
|
this.actor.destroy();
|
|
|
|
},
|
|
|
|
|
|
|
|
_onDestroy : function() {
|
|
|
|
if (this._haveModal)
|
|
|
|
Main.popModal(this.actor);
|
|
|
|
|
2010-03-17 13:31:03 -04:00
|
|
|
if (this._thumbnails)
|
|
|
|
this._destroyThumbnails();
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
if (this._keyPressEventId)
|
|
|
|
global.stage.disconnect(this._keyPressEventId);
|
|
|
|
if (this._keyReleaseEventId)
|
|
|
|
global.stage.disconnect(this._keyReleaseEventId);
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
if (this._motionTimeoutId != 0)
|
|
|
|
Mainloop.source_remove(this._motionTimeoutId);
|
2009-10-02 11:02:46 -04:00
|
|
|
if (this._thumbnailTimeoutId != 0)
|
|
|
|
Mainloop.source_remove(this._thumbnailTimeoutId);
|
|
|
|
},
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
/**
|
|
|
|
* _select:
|
|
|
|
* @app: index of the app to select
|
|
|
|
* @window: (optional) index of which of @app's windows to select
|
|
|
|
* @forceAppFocus: optional flag, see below
|
|
|
|
*
|
|
|
|
* Selects the indicated @app, and optional @window, and sets
|
|
|
|
* this._thumbnailsFocused appropriately to indicate whether the
|
|
|
|
* arrow keys should act on the app list or the thumbnail list.
|
|
|
|
*
|
|
|
|
* If @app is specified and @window is unspecified or %null, then
|
|
|
|
* the app is highlighted (ie, given a light background), and the
|
|
|
|
* current thumbnail list, if any, is destroyed. If @app has
|
|
|
|
* multiple windows, and @forceAppFocus is not %true, then a
|
|
|
|
* timeout is started to open a thumbnail list.
|
|
|
|
*
|
|
|
|
* If @app and @window are specified (and @forceAppFocus is not),
|
|
|
|
* then @app will be outlined, a thumbnail list will be created
|
|
|
|
* and focused (if it hasn't been already), and the @window'th
|
|
|
|
* window in it will be highlighted.
|
|
|
|
*
|
|
|
|
* If @app and @window are specified and @forceAppFocus is %true,
|
|
|
|
* then @app will be highlighted, and @window outlined, and the
|
|
|
|
* app list will have the keyboard focus.
|
|
|
|
*/
|
|
|
|
_select : function(app, window, forceAppFocus) {
|
|
|
|
if (app != this._currentApp || window == null) {
|
|
|
|
if (this._thumbnails)
|
|
|
|
this._destroyThumbnails();
|
2009-10-02 11:02:46 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (this._thumbnailTimeoutId != 0) {
|
|
|
|
Mainloop.source_remove(this._thumbnailTimeoutId);
|
|
|
|
this._thumbnailTimeoutId = 0;
|
|
|
|
}
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
this._thumbnailsFocused = (window != null) && !forceAppFocus;
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
this._currentApp = app;
|
2009-10-09 09:43:31 -04:00
|
|
|
this._currentWindow = window ? window : 0;
|
|
|
|
this._appSwitcher.highlight(app, this._thumbnailsFocused);
|
2009-10-02 11:02:46 -04:00
|
|
|
|
|
|
|
if (window != null) {
|
|
|
|
if (!this._thumbnails)
|
|
|
|
this._createThumbnails();
|
2009-10-09 09:43:31 -04:00
|
|
|
this._currentWindow = window;
|
|
|
|
this._thumbnails.highlight(window, forceAppFocus);
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
} else if (this._appIcons[this._currentApp].cachedWindows.length > 1 &&
|
2009-10-09 09:43:31 -04:00
|
|
|
!forceAppFocus) {
|
2009-10-02 11:02:46 -04:00
|
|
|
this._thumbnailTimeoutId = Mainloop.timeout_add (
|
|
|
|
THUMBNAIL_POPUP_TIME,
|
|
|
|
Lang.bind(this, function () {
|
2009-10-09 09:43:31 -04:00
|
|
|
this._select(this._currentApp, 0, true);
|
2009-10-02 11:02:46 -04:00
|
|
|
return false;
|
|
|
|
}));
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
_destroyThumbnails : function() {
|
|
|
|
Tweener.addTween(this._thumbnails.actor,
|
|
|
|
{ opacity: 0,
|
|
|
|
time: THUMBNAIL_FADE_TIME,
|
|
|
|
transition: "easeOutQuad",
|
|
|
|
onComplete: function() { this.destroy(); }
|
|
|
|
});
|
|
|
|
this._thumbnails = null;
|
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_createThumbnails : function() {
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
this._thumbnails = new ThumbnailList (this._appIcons[this._currentApp].cachedWindows);
|
2009-10-02 11:02:46 -04:00
|
|
|
this._thumbnails.connect('item-activated', Lang.bind(this, this._windowActivated));
|
2009-10-09 09:43:31 -04:00
|
|
|
this._thumbnails.connect('item-entered', Lang.bind(this, this._windowEntered));
|
2009-10-02 11:02:46 -04:00
|
|
|
|
|
|
|
this.actor.add_actor(this._thumbnails.actor);
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
this._thumbnails.actor.opacity = 0;
|
|
|
|
Tweener.addTween(this._thumbnails.actor,
|
|
|
|
{ opacity: 255,
|
|
|
|
time: THUMBNAIL_FADE_TIME,
|
|
|
|
transition: "easeOutQuad"
|
|
|
|
});
|
2009-10-02 11:02:46 -04:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
function SwitcherList(squareItems) {
|
|
|
|
this._init(squareItems);
|
|
|
|
}
|
|
|
|
|
|
|
|
SwitcherList.prototype = {
|
|
|
|
_init : function(squareItems) {
|
2010-03-17 13:31:03 -04:00
|
|
|
this.actor = new St.BoxLayout({ style_class: 'switcher-list' });
|
2009-10-02 11:02:46 -04:00
|
|
|
|
|
|
|
// Here we use a GenericContainer so that we can force all the
|
|
|
|
// children except the separator to have the same width.
|
|
|
|
this._list = new Shell.GenericContainer();
|
|
|
|
this._list.spacing = POPUP_LIST_SPACING;
|
|
|
|
|
|
|
|
this._list.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
|
|
|
|
this._list.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
|
|
|
|
this._list.connect('allocate', Lang.bind(this, this._allocate));
|
|
|
|
|
2010-03-17 13:31:03 -04:00
|
|
|
this._clipBin = new St.Bin({style_class: 'cbin'});
|
|
|
|
this._clipBin.child = this._list;
|
|
|
|
this.actor.add_actor(this._clipBin);
|
|
|
|
|
|
|
|
this._leftGradient = new St.BoxLayout({style_class: 'thumbnail-scroll-gradient-left', vertical: true});
|
|
|
|
this._rightGradient = new St.BoxLayout({style_class: 'thumbnail-scroll-gradient-right', vertical: true});
|
|
|
|
this.actor.add_actor(this._leftGradient);
|
|
|
|
this.actor.add_actor(this._rightGradient);
|
|
|
|
|
|
|
|
// Those arrows indicate whether scrolling in one direction is possible
|
|
|
|
this._leftArrow = new St.DrawingArea();
|
|
|
|
this._leftArrow.connect('repaint', Lang.bind(this,
|
|
|
|
function (area) {
|
|
|
|
Shell.draw_box_pointer(area, Shell.PointerDirection.LEFT, TRANSPARENT_COLOR, POPUP_ARROW_COLOR);
|
|
|
|
}));
|
|
|
|
|
|
|
|
this._rightArrow = new St.DrawingArea();
|
|
|
|
this._rightArrow.connect('repaint', Lang.bind(this,
|
|
|
|
function (area) {
|
|
|
|
Shell.draw_box_pointer(area, Shell.PointerDirection.RIGHT, TRANSPARENT_COLOR, POPUP_ARROW_COLOR);
|
|
|
|
}));
|
|
|
|
|
|
|
|
this._leftGradient.add_actor(this._leftArrow);
|
|
|
|
this._rightGradient.add_actor(this._rightArrow);
|
2009-10-02 11:02:46 -04:00
|
|
|
|
|
|
|
this._items = [];
|
|
|
|
this._highlighted = -1;
|
|
|
|
this._separator = null;
|
|
|
|
this._squareItems = squareItems;
|
2010-03-17 13:31:03 -04:00
|
|
|
this._scrollable = false;
|
2009-10-02 11:02:46 -04:00
|
|
|
},
|
|
|
|
|
|
|
|
addItem : function(item) {
|
2009-11-12 17:46:59 -05:00
|
|
|
let bbox = new St.Clickable({ style_class: 'item-box',
|
|
|
|
reactive: true });
|
|
|
|
|
|
|
|
bbox.set_child(item);
|
2009-10-09 09:43:31 -04:00
|
|
|
this._list.add_actor(bbox);
|
2009-10-02 11:02:46 -04:00
|
|
|
|
|
|
|
let n = this._items.length;
|
2009-11-16 14:16:22 -05:00
|
|
|
bbox.connect('clicked', Lang.bind(this, function () {
|
2009-10-02 11:02:46 -04:00
|
|
|
this._itemActivated(n);
|
|
|
|
}));
|
2009-10-09 09:43:31 -04:00
|
|
|
bbox.connect('enter-event', Lang.bind(this, function () {
|
|
|
|
this._itemEntered(n);
|
|
|
|
}));
|
2009-10-02 11:02:46 -04:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
this._items.push(bbox);
|
2009-10-02 11:02:46 -04:00
|
|
|
},
|
|
|
|
|
|
|
|
addSeparator: function () {
|
2010-03-15 09:50:05 -04:00
|
|
|
let box = new St.Bin({ style_class: 'separator' });
|
2009-10-02 11:02:46 -04:00
|
|
|
this._separator = box;
|
|
|
|
this._list.add_actor(box);
|
2009-09-26 10:56:41 -04:00
|
|
|
},
|
2009-12-18 18:50:40 -05:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
highlight: function(index, justOutline) {
|
2009-10-02 11:02:46 -04:00
|
|
|
if (this._highlighted != -1)
|
2009-11-12 17:46:59 -05:00
|
|
|
this._items[this._highlighted].style_class = 'item-box';
|
2009-09-26 10:56:41 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
this._highlighted = index;
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
if (this._highlighted != -1) {
|
|
|
|
if (justOutline)
|
2009-11-12 17:46:59 -05:00
|
|
|
this._items[this._highlighted].style_class = 'outlined-item-box';
|
2009-10-09 09:43:31 -04:00
|
|
|
else
|
2009-11-12 17:46:59 -05:00
|
|
|
this._items[this._highlighted].style_class = 'selected-item-box';
|
2009-10-02 11:02:46 -04:00
|
|
|
}
|
2010-03-17 13:31:03 -04:00
|
|
|
|
|
|
|
let monitor = global.get_focus_monitor();
|
|
|
|
let itemSize = this._items[index].allocation.x2 - this._items[index].allocation.x1;
|
|
|
|
let [posX, posY] = this._items[index].get_transformed_position();
|
|
|
|
posX += this.actor.x;
|
|
|
|
|
|
|
|
if (posX + itemSize > monitor.width)
|
|
|
|
this._scrollToRight();
|
|
|
|
else if (posX < 0)
|
|
|
|
this._scrollToLeft();
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
_scrollToLeft : function() {
|
|
|
|
let x = this._items[this._highlighted].allocation.x1;
|
|
|
|
this._rightGradient.show();
|
|
|
|
Tweener.addTween(this._list, { anchor_x: x,
|
|
|
|
time: POPUP_SCROLL_TIME,
|
|
|
|
transition: 'easeOutQuad',
|
|
|
|
onComplete: Lang.bind(this, function () {
|
|
|
|
if (this._highlighted == 0)
|
|
|
|
this._leftGradient.hide();
|
|
|
|
})
|
|
|
|
});
|
|
|
|
},
|
|
|
|
|
|
|
|
_scrollToRight : function() {
|
|
|
|
let monitor = global.get_focus_monitor();
|
|
|
|
let padding = this.actor.get_theme_node().get_horizontal_padding();
|
|
|
|
let x = this._items[this._highlighted].allocation.x2 - monitor.width + padding + POPUP_LIST_SPACING * 2;
|
|
|
|
this._leftGradient.show();
|
|
|
|
Tweener.addTween(this._list, { anchor_x: x,
|
|
|
|
time: POPUP_SCROLL_TIME,
|
|
|
|
transition: 'easeOutQuad',
|
|
|
|
onComplete: Lang.bind(this, function () {
|
|
|
|
if (this._highlighted == this._items.length - 1)
|
|
|
|
this._rightGradient.hide();
|
|
|
|
})
|
|
|
|
});
|
2009-10-02 11:02:46 -04:00
|
|
|
},
|
|
|
|
|
|
|
|
_itemActivated: function(n) {
|
|
|
|
this.emit('item-activated', n);
|
|
|
|
},
|
2009-12-18 18:50:40 -05:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
_itemEntered: function(n) {
|
|
|
|
this.emit('item-entered', n);
|
2009-10-02 11:02:46 -04:00
|
|
|
},
|
|
|
|
|
|
|
|
_maxChildWidth: function (forHeight) {
|
2009-09-30 05:28:32 -04:00
|
|
|
let maxChildMin = 0;
|
|
|
|
let maxChildNat = 0;
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
for (let i = 0; i < this._items.length; i++) {
|
|
|
|
let [childMin, childNat] = this._items[i].get_preferred_width(forHeight);
|
|
|
|
maxChildMin = Math.max(childMin, maxChildMin);
|
|
|
|
maxChildNat = Math.max(childNat, maxChildNat);
|
|
|
|
|
|
|
|
if (this._squareItems) {
|
|
|
|
let [childMin, childNat] = this._items[i].get_preferred_height(-1);
|
2009-09-30 05:33:43 -04:00
|
|
|
maxChildMin = Math.max(childMin, maxChildMin);
|
|
|
|
maxChildNat = Math.max(childNat, maxChildNat);
|
|
|
|
}
|
2009-09-30 05:28:32 -04:00
|
|
|
}
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
return [maxChildMin, maxChildNat];
|
|
|
|
},
|
|
|
|
|
|
|
|
_getPreferredWidth: function (actor, forHeight, alloc) {
|
|
|
|
let [maxChildMin, maxChildNat] = this._maxChildWidth(forHeight);
|
|
|
|
|
2009-09-30 05:33:43 -04:00
|
|
|
let separatorWidth = 0;
|
2009-10-02 11:02:46 -04:00
|
|
|
if (this._separator) {
|
|
|
|
let [sepMin, sepNat] = this._separator.get_preferred_width(forHeight);
|
|
|
|
separatorWidth = sepNat + this._list.spacing;
|
|
|
|
}
|
2009-09-30 05:33:43 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
let totalSpacing = this._list.spacing * (this._items.length - 1);
|
|
|
|
alloc.min_size = this._items.length * maxChildMin + separatorWidth + totalSpacing;
|
2010-02-01 12:31:26 -05:00
|
|
|
alloc.natural_size = alloc.min_size;
|
2009-09-30 05:28:32 -04:00
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_getPreferredHeight: function (actor, forWidth, alloc) {
|
2009-09-30 05:28:32 -04:00
|
|
|
let maxChildMin = 0;
|
|
|
|
let maxChildNat = 0;
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
for (let i = 0; i < this._items.length; i++) {
|
|
|
|
let [childMin, childNat] = this._items[i].get_preferred_height(-1);
|
|
|
|
maxChildMin = Math.max(childMin, maxChildMin);
|
|
|
|
maxChildNat = Math.max(childNat, maxChildNat);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this._squareItems) {
|
|
|
|
let [childMin, childNat] = this._maxChildWidth(-1);
|
2009-09-30 05:28:32 -04:00
|
|
|
maxChildMin = Math.max(childMin, maxChildMin);
|
2010-02-01 12:31:26 -05:00
|
|
|
maxChildNat = maxChildMin;
|
2009-09-30 05:28:32 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
alloc.min_size = maxChildMin;
|
2010-02-01 11:51:40 -05:00
|
|
|
alloc.natural_size = maxChildNat;
|
2009-09-30 05:28:32 -04:00
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_allocate: function (actor, box, flags) {
|
2009-09-30 05:28:32 -04:00
|
|
|
let childHeight = box.y2 - box.y1;
|
2009-09-30 05:33:43 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
let [maxChildMin, maxChildNat] = this._maxChildWidth(childHeight);
|
|
|
|
let totalSpacing = this._list.spacing * (this._items.length - 1);
|
|
|
|
|
2009-09-30 05:33:43 -04:00
|
|
|
let separatorWidth = 0;
|
2009-10-02 11:02:46 -04:00
|
|
|
if (this._separator) {
|
|
|
|
let [sepMin, sepNat] = this._separator.get_preferred_width(childHeight);
|
|
|
|
separatorWidth = sepNat;
|
|
|
|
totalSpacing += this._list.spacing;
|
|
|
|
}
|
2009-09-30 05:33:43 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
let childWidth = Math.floor(Math.max(0, box.x2 - box.x1 - totalSpacing - separatorWidth) / this._items.length);
|
2009-09-30 05:28:32 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
let x = 0;
|
|
|
|
let children = this._list.get_children();
|
|
|
|
let childBox = new Clutter.ActorBox();
|
2010-03-17 13:31:03 -04:00
|
|
|
|
|
|
|
let focus = global.get_focus_monitor();
|
|
|
|
if (this.actor.allocation.x2 == focus.width - POPUP_LIST_SPACING) {
|
|
|
|
if (this._squareItems)
|
|
|
|
childWidth = childHeight;
|
|
|
|
else
|
|
|
|
childWidth = children[0].get_preferred_width(childHeight)[0];
|
|
|
|
}
|
|
|
|
|
2009-09-30 05:28:32 -04:00
|
|
|
for (let i = 0; i < children.length; i++) {
|
2009-10-02 11:02:46 -04:00
|
|
|
if (this._items.indexOf(children[i]) != -1) {
|
2009-09-30 05:33:43 -04:00
|
|
|
let [childMin, childNat] = children[i].get_preferred_height(childWidth);
|
|
|
|
let vSpacing = (childHeight - childNat) / 2;
|
|
|
|
childBox.x1 = x;
|
|
|
|
childBox.y1 = vSpacing;
|
|
|
|
childBox.x2 = x + childWidth;
|
2009-10-02 11:02:46 -04:00
|
|
|
childBox.y2 = childBox.y1 + childNat;
|
2009-09-30 05:33:43 -04:00
|
|
|
children[i].allocate(childBox, flags);
|
2009-10-02 11:02:46 -04:00
|
|
|
|
|
|
|
x += this._list.spacing + childWidth;
|
|
|
|
} else if (children[i] == this._separator) {
|
2009-09-30 05:33:43 -04:00
|
|
|
// We want the separator to be more compact than the rest.
|
|
|
|
childBox.x1 = x;
|
|
|
|
childBox.y1 = 0;
|
|
|
|
childBox.x2 = x + separatorWidth;
|
|
|
|
childBox.y2 = childHeight;
|
|
|
|
children[i].allocate(childBox, flags);
|
2009-10-02 11:02:46 -04:00
|
|
|
x += this._list.spacing + separatorWidth;
|
|
|
|
} else {
|
|
|
|
// Something else, eg, AppSwitcher's arrows;
|
|
|
|
// we don't allocate it.
|
2009-09-30 05:33:43 -04:00
|
|
|
}
|
2009-09-30 05:28:32 -04:00
|
|
|
}
|
2010-03-17 13:31:03 -04:00
|
|
|
|
|
|
|
let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
|
|
|
|
let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
|
|
|
|
let topPadding = this.actor.get_theme_node().get_padding(St.Side.TOP);
|
|
|
|
let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
|
|
|
|
|
|
|
|
// Show the arrows and gradients when scrolling is needed
|
|
|
|
if (children[children.length - 1].allocation.x2 > this.actor.width - leftPadding - rightPadding && !this._scrollable) {
|
|
|
|
this._leftGradient.set_height(this.actor.height);
|
|
|
|
this._leftGradient.x = this.actor.x;
|
|
|
|
this._leftGradient.y = this.actor.y;
|
|
|
|
|
|
|
|
this._rightGradient.set_height(this.actor.height);
|
|
|
|
this._rightGradient.x = this.actor.x + (this.actor.allocation.x2 - this.actor.allocation.x1) - this._rightGradient.width;
|
|
|
|
this._rightGradient.y = this.actor.y;
|
|
|
|
|
|
|
|
let arrowWidth = Math.floor(leftPadding / 3);
|
|
|
|
let arrowHeight = arrowWidth * 2;
|
|
|
|
this._leftArrow.set_size(arrowWidth, arrowHeight);
|
|
|
|
this._leftArrow.set_position(POPUP_LIST_SPACING, this.actor.height / 2 - arrowWidth);
|
|
|
|
|
|
|
|
arrowWidth = Math.floor(rightPadding / 3);
|
|
|
|
arrowHeight = arrowWidth * 2;
|
|
|
|
this._rightArrow.set_size(arrowWidth, arrowHeight);
|
|
|
|
this._rightArrow.set_position(this._rightGradient.width - arrowHeight, this.actor.height / 2 - arrowWidth);
|
|
|
|
|
|
|
|
this._scrollable = true;
|
|
|
|
|
|
|
|
this._leftGradient.hide();
|
|
|
|
this._rightGradient.show();
|
|
|
|
}
|
|
|
|
else if (!this._scrollable){
|
|
|
|
this._leftGradient.hide();
|
|
|
|
this._rightGradient.hide();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Clip the area for scrolling
|
|
|
|
this._clipBin.set_clip(0, -topPadding, (this.actor.allocation.x2 - this.actor.allocation.x1) - leftPadding - rightPadding, this.actor.height + bottomPadding);
|
2009-10-02 11:02:46 -04:00
|
|
|
}
|
|
|
|
};
|
2009-09-15 11:11:32 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
Signals.addSignalMethods(SwitcherList.prototype);
|
2009-09-15 11:11:32 -04:00
|
|
|
|
2009-11-12 17:46:59 -05:00
|
|
|
function AppIcon(app) {
|
|
|
|
this._init(app);
|
|
|
|
}
|
|
|
|
|
|
|
|
AppIcon.prototype = {
|
|
|
|
_init: function(app) {
|
|
|
|
this.app = app;
|
|
|
|
this.actor = new St.BoxLayout({ style_class: "alt-tab-app",
|
|
|
|
vertical: true });
|
2010-03-17 13:31:03 -04:00
|
|
|
this.icon = null;
|
|
|
|
this._iconBin = new St.Bin();
|
2010-02-17 04:52:11 -05:00
|
|
|
|
2010-03-17 13:31:03 -04:00
|
|
|
this.actor.add(this._iconBin, { x_fill: false, y_fill: false } );
|
|
|
|
this.label = new St.Label({ text: this.app.get_name() });
|
|
|
|
this.actor.add(this.label, { x_fill: false });
|
|
|
|
},
|
|
|
|
|
|
|
|
set_size: function(size) {
|
|
|
|
this.icon = this.app.create_icon_texture(size);
|
|
|
|
this._iconBin.set_size(size, size);
|
|
|
|
this._iconBin.child = this.icon;
|
2009-11-12 17:46:59 -05:00
|
|
|
}
|
2010-03-15 09:50:05 -04:00
|
|
|
};
|
2009-11-12 17:46:59 -05:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
function AppSwitcher(apps) {
|
|
|
|
this._init(apps);
|
|
|
|
}
|
2009-09-15 11:11:32 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
AppSwitcher.prototype = {
|
|
|
|
__proto__ : SwitcherList.prototype,
|
2009-09-15 11:11:32 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_init : function(apps) {
|
|
|
|
SwitcherList.prototype._init.call(this, true);
|
2009-09-15 11:11:32 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
// Construct the AppIcons, sort by time, add to the popup
|
|
|
|
let activeWorkspace = global.screen.get_active_workspace();
|
|
|
|
let workspaceIcons = [];
|
|
|
|
let otherIcons = [];
|
|
|
|
for (let i = 0; i < apps.length; i++) {
|
2009-11-12 17:46:59 -05:00
|
|
|
let appIcon = new AppIcon(apps[i]);
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
// Cache the window list now; we don't handle dynamic changes here,
|
|
|
|
// and we don't want to be continually retrieving it
|
|
|
|
appIcon.cachedWindows = appIcon.app.get_windows();
|
2009-10-02 11:02:46 -04:00
|
|
|
if (this._hasWindowsOnWorkspace(appIcon, activeWorkspace))
|
|
|
|
workspaceIcons.push(appIcon);
|
|
|
|
else
|
|
|
|
otherIcons.push(appIcon);
|
|
|
|
}
|
2009-04-13 10:55:41 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
workspaceIcons.sort(Lang.bind(this, this._sortAppIcon));
|
|
|
|
otherIcons.sort(Lang.bind(this, this._sortAppIcon));
|
2009-08-13 12:52:50 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
this.icons = [];
|
|
|
|
this._arrows = [];
|
|
|
|
for (let i = 0; i < workspaceIcons.length; i++)
|
|
|
|
this._addIcon(workspaceIcons[i]);
|
|
|
|
if (workspaceIcons.length > 0 && otherIcons.length > 0)
|
|
|
|
this.addSeparator();
|
|
|
|
for (let i = 0; i < otherIcons.length; i++)
|
|
|
|
this._addIcon(otherIcons[i]);
|
2009-08-13 12:52:50 -04:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
this._curApp = -1;
|
2010-03-17 13:31:03 -04:00
|
|
|
this._iconSize = 0;
|
|
|
|
},
|
|
|
|
|
|
|
|
_getPreferredHeight: function (actor, forWidth, alloc) {
|
|
|
|
let j = 0;
|
|
|
|
while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
let iconPadding = this._items[j].get_theme_node().get_horizontal_padding();
|
|
|
|
let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
|
|
|
|
let iconSpacing = iconNaturalHeight + iconPadding;
|
|
|
|
let totalSpacing = this._list.spacing * (this._items.length - 1);
|
|
|
|
if (this._separator)
|
|
|
|
totalSpacing += this._separator.width + this._list.spacing;
|
|
|
|
|
|
|
|
// We just assume the whole screen here due to weirdness happing with the passed width
|
|
|
|
let focus = global.get_focus_monitor();
|
|
|
|
let availWidth = focus.width - POPUP_LIST_SPACING * 2 - this.actor.get_theme_node().get_horizontal_padding();
|
|
|
|
let height = 0;
|
|
|
|
|
|
|
|
for(let i = 0; i < iconSizes.length; i++) {
|
|
|
|
this._iconSize = iconSizes[i];
|
|
|
|
height = iconSizes[i] + iconSpacing;
|
|
|
|
let w = height * this._items.length + totalSpacing;
|
|
|
|
if (w <= availWidth)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this._items.length == 1) {
|
|
|
|
this._iconSize = iconSizes[0];
|
|
|
|
height = iconSizes[0] + iconSpacing;
|
|
|
|
}
|
|
|
|
|
|
|
|
alloc.min_size = height;
|
|
|
|
alloc.natural_size = height;
|
2009-08-13 12:52:50 -04:00
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_allocate: function (actor, box, flags) {
|
2010-03-17 13:31:03 -04:00
|
|
|
for(let i = 0; i < this.icons.length; i++) {
|
|
|
|
if (this.icons[i].icon != null)
|
|
|
|
break;
|
|
|
|
this.icons[i].set_size(this._iconSize);
|
|
|
|
}
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
// Allocate the main list items
|
|
|
|
SwitcherList.prototype._allocate.call(this, actor, box, flags);
|
|
|
|
|
|
|
|
let arrowHeight = Math.floor(this.actor.get_theme_node().get_padding(St.Side.BOTTOM) / 3);
|
|
|
|
let arrowWidth = arrowHeight * 2;
|
|
|
|
|
|
|
|
// Now allocate each arrow underneath its item
|
|
|
|
let childBox = new Clutter.ActorBox();
|
|
|
|
for (let i = 0; i < this._items.length; i++) {
|
|
|
|
let itemBox = this._items[i].allocation;
|
|
|
|
childBox.x1 = Math.floor(itemBox.x1 + (itemBox.x2 - itemBox.x1 - arrowWidth) / 2);
|
|
|
|
childBox.x2 = childBox.x1 + arrowWidth;
|
|
|
|
childBox.y1 = itemBox.y2 + arrowHeight;
|
|
|
|
childBox.y2 = childBox.y1 + arrowHeight;
|
|
|
|
this._arrows[i].allocate(childBox, flags);
|
2009-09-21 13:44:42 -04:00
|
|
|
}
|
|
|
|
},
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
// We override SwitcherList's highlight() method to also deal with
|
|
|
|
// the AppSwitcher->ThumbnailList arrows. Apps with only 1 window
|
|
|
|
// will hide their arrows by default, but show them when their
|
|
|
|
// thumbnails are visible (ie, when the app icon is supposed to be
|
|
|
|
// in justOutline mode). Apps with multiple windows will normally
|
|
|
|
// show a dim arrow, but show a bright arrow when they are
|
|
|
|
// highlighted; their redraw handler will use the right color
|
|
|
|
// based on this._curApp; we just need to do a queue_relayout() to
|
|
|
|
// force it to redraw. (queue_redraw() doesn't work because
|
|
|
|
// ShellDrawingArea only redraws on allocate.)
|
|
|
|
highlight : function(n, justOutline) {
|
|
|
|
if (this._curApp != -1) {
|
|
|
|
if (this.icons[this._curApp].cachedWindows.length == 1)
|
|
|
|
this._arrows[this._curApp].hide();
|
|
|
|
else
|
|
|
|
this._arrows[this._curApp].queue_relayout();
|
|
|
|
}
|
2009-09-21 13:44:42 -04:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
SwitcherList.prototype.highlight.call(this, n, justOutline);
|
|
|
|
this._curApp = n;
|
2009-09-28 23:31:54 -04:00
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
if (this._curApp != -1) {
|
|
|
|
if (justOutline && this.icons[this._curApp].cachedWindows.length == 1)
|
|
|
|
this._arrows[this._curApp].show();
|
|
|
|
else
|
|
|
|
this._arrows[this._curApp].queue_relayout();
|
|
|
|
}
|
2009-04-13 10:55:41 -04:00
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_addIcon : function(appIcon) {
|
|
|
|
this.icons.push(appIcon);
|
|
|
|
this.addItem(appIcon.actor);
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
let n = this._arrows.length;
|
2009-11-14 16:39:22 -05:00
|
|
|
let arrow = new St.DrawingArea();
|
2010-03-03 18:00:05 -05:00
|
|
|
arrow.connect('repaint', Lang.bind(this,
|
|
|
|
function (area) {
|
|
|
|
Shell.draw_box_pointer(area, Shell.PointerDirection.DOWN,
|
2009-10-02 11:02:46 -04:00
|
|
|
TRANSPARENT_COLOR,
|
2009-10-09 09:43:31 -04:00
|
|
|
this._curApp == n ? POPUP_ARROW_COLOR : POPUP_UNFOCUSED_ARROW_COLOR);
|
2009-10-02 11:02:46 -04:00
|
|
|
}));
|
|
|
|
this._list.add_actor(arrow);
|
|
|
|
this._arrows.push(arrow);
|
2009-10-09 09:43:31 -04:00
|
|
|
|
|
|
|
if (appIcon.cachedWindows.length == 1)
|
|
|
|
arrow.hide();
|
2009-09-15 11:11:32 -04:00
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_hasWindowsOnWorkspace: function(appIcon, workspace) {
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
let windows = appIcon.cachedWindows;
|
|
|
|
for (let i = 0; i < windows.length; i++) {
|
|
|
|
if (windows[i].get_workspace() == workspace)
|
2009-10-02 11:02:46 -04:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
2009-09-21 13:04:30 -04:00
|
|
|
},
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
_sortAppIcon : function(appIcon1, appIcon2) {
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 16:40:00 -04:00
|
|
|
return appIcon1.app.compare(appIcon2.app);
|
2009-10-02 11:02:46 -04:00
|
|
|
}
|
|
|
|
};
|
2009-09-21 13:04:30 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
function ThumbnailList(windows) {
|
|
|
|
this._init(windows);
|
|
|
|
}
|
2009-09-21 13:04:30 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
ThumbnailList.prototype = {
|
|
|
|
__proto__ : SwitcherList.prototype,
|
|
|
|
|
|
|
|
_init : function(windows) {
|
|
|
|
SwitcherList.prototype._init.call(this);
|
|
|
|
|
2009-10-14 05:45:57 -04:00
|
|
|
let activeWorkspace = global.screen.get_active_workspace();
|
|
|
|
|
|
|
|
// We fake the value of "separatorAdded" when the app has no window
|
|
|
|
// on the current workspace, to avoid displaying a useless separator in
|
|
|
|
// that case.
|
|
|
|
let separatorAdded = windows.length == 0 || windows[0].get_workspace() != activeWorkspace;
|
|
|
|
|
2010-03-17 13:31:03 -04:00
|
|
|
this._labels = new Array();
|
|
|
|
this._thumbnailBins = new Array();
|
|
|
|
this._clones = new Array();
|
|
|
|
this._windows = windows;
|
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
for (let i = 0; i < windows.length; i++) {
|
2009-10-14 05:45:57 -04:00
|
|
|
if (!separatorAdded && windows[i].get_workspace() != activeWorkspace) {
|
|
|
|
this.addSeparator();
|
|
|
|
separatorAdded = true;
|
|
|
|
}
|
|
|
|
|
2009-10-09 09:43:31 -04:00
|
|
|
let box = new St.BoxLayout({ style_class: "thumbnail-box",
|
|
|
|
vertical: true });
|
|
|
|
|
2009-12-18 18:50:40 -05:00
|
|
|
let bin = new St.Bin({ style_class: "thumbnail" });
|
|
|
|
|
|
|
|
box.add_actor(bin);
|
2010-03-17 13:31:03 -04:00
|
|
|
this._thumbnailBins.push(bin);
|
2009-10-09 09:43:31 -04:00
|
|
|
|
2009-11-13 14:38:38 -05:00
|
|
|
let title = windows[i].get_title();
|
|
|
|
if (title) {
|
|
|
|
let name = new St.Label({ text: title });
|
|
|
|
// St.Label doesn't support text-align so use a Bin
|
|
|
|
let bin = new St.Bin({ x_align: St.Align.MIDDLE });
|
2010-03-17 13:31:03 -04:00
|
|
|
this._labels.push(bin);
|
2009-11-13 14:38:38 -05:00
|
|
|
bin.add_actor(name);
|
|
|
|
box.add_actor(bin);
|
|
|
|
}
|
2009-10-09 09:43:31 -04:00
|
|
|
|
2009-10-02 11:02:46 -04:00
|
|
|
this.addItem(box);
|
2009-09-21 13:04:30 -04:00
|
|
|
}
|
2010-03-17 13:31:03 -04:00
|
|
|
},
|
|
|
|
|
|
|
|
addClones : function (availHeight) {
|
|
|
|
if (!this._thumbnailBins.length)
|
|
|
|
return;
|
|
|
|
let totalPadding = this._items[0].get_theme_node().get_horizontal_padding() + this._items[0].get_theme_node().get_vertical_padding();
|
|
|
|
totalPadding += this.actor.get_theme_node().get_horizontal_padding() + this.actor.get_theme_node().get_vertical_padding();
|
|
|
|
let [labelMinHeight, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
|
|
|
|
let [found, spacing] = this._items[0].child.get_theme_node().get_length('spacing', false);
|
|
|
|
if (!found)
|
|
|
|
spacing = 0;
|
|
|
|
|
|
|
|
availHeight = Math.min(availHeight - labelNaturalHeight - totalPadding - spacing, THUMBNAIL_DEFAULT_SIZE);
|
|
|
|
let binHeight = availHeight + this._items[0].get_theme_node().get_vertical_padding() + this.actor.get_theme_node().get_vertical_padding() - spacing;
|
|
|
|
binHeight = Math.min(THUMBNAIL_DEFAULT_SIZE, binHeight);
|
|
|
|
|
|
|
|
for (let i = 0; i < this._thumbnailBins.length; i++) {
|
|
|
|
let mutterWindow = this._windows[i].get_compositor_private();
|
|
|
|
let windowTexture = mutterWindow.get_texture ();
|
|
|
|
let [width, height] = windowTexture.get_size();
|
|
|
|
let scale = Math.min(1.0, THUMBNAIL_DEFAULT_SIZE / width, availHeight / height);
|
|
|
|
let clone = new Clutter.Clone ({ source: windowTexture,
|
|
|
|
reactive: true,
|
|
|
|
width: width * scale,
|
|
|
|
height: height * scale });
|
|
|
|
|
|
|
|
this._thumbnailBins[i].set_height(binHeight);
|
|
|
|
this._thumbnailBins[i].add_actor(clone);
|
|
|
|
this._clones.push(clone);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Make sure we only do this once
|
|
|
|
this._thumbnailBins = new Array();
|
2009-04-13 10:55:41 -04:00
|
|
|
}
|
|
|
|
};
|