brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kill off ShellAppInfo, move into ShellApp

Browse Source 
This dramatically thins down and sanitizes the application code.

The ShellAppSystem changes in a number of ways:
* Preferences are special cased more explicitly; they aren't apps,
  they're shortcuts for an app), and we don't have many of them, so
  don't need e.g. the optimizations in ShellAppSystem for searching.
* get_app() changes to lookup_app() and returns null if an app isn't
  found.  The semantics where it tried to find the .desktop file
  if we didn't know about it were just broken; I am pretty sure no
  caller needs this, and if they do we'll fix them.
* ShellAppSystem maintains two indexes on apps (by desktop file id
  and by GMenuTreeEntry), but is no longer in the business of
  dealing with GMenuTree as far as hierarchy and categories go.  That
  is moved up into js/ui/appDisplay.js.  Actually, it flattens both
  apps and settings.

Also, ShellWindowTracker is now the sole reference-owner for
window-backed apps.  We still do the weird "window:0x1234beef" id
for these apps, but a reference is not stored in ShellAppSystem.

The js/ui/appDisplay.js code is rewritten, and sucks a lot less.
Variable names are clearer:

_apps -> _appIcons
_filterApp -> _visibleApps
_filters -> _categoryBox

Similarly for function names.  We no longer call (for every app) a
recursive lookup in GMenuTree to see if it's in a particular section
on every category switch; it's all cached.

NOTE - this intentionally reverts the incremental loading code from
commit 7813c5b93f.  It's fast enough
here without that.

https://bugzilla.gnome.org/show_bug.cgi?id=648149
This commit is contained in:
Colin Walters 2011-04-21 13:35:01 -04:00
parent 8ada9b43ae
commit 10dcc100e9
22 changed files with 1184 additions and 1584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

294
js/ui/appDisplay.js
View File

@ -3,6 +3,7 @@
const Clutter = imports.gi.Clutter; const Clutter = imports.gi.Clutter;
const GLib = imports.gi.GLib; const GLib = imports.gi.GLib;
const Gtk = imports.gi.Gtk; const Gtk = imports.gi.Gtk;
const GMenu = imports.gi.GMenu;
const Shell = imports.gi.Shell; const Shell = imports.gi.Shell;
const Lang = imports.lang; const Lang = imports.lang;
const Signals = imports.signals; const Signals = imports.signals;
@ -35,8 +36,7 @@ AlphabeticalView.prototype = {
this._appSystem = Shell.AppSystem.get_default(); this._appSystem = Shell.AppSystem.get_default();
this._pendingAppLaterId = 0; this._pendingAppLaterId = 0;
this._apps = []; this._appIcons = {}; // desktop file id
this._filterApp = null;
let box = new St.BoxLayout({ vertical: true }); let box = new St.BoxLayout({ vertical: true });
box.add(this._grid.actor, { y_align: St.Align.START, expand: true }); box.add(this._grid.actor, { y_align: St.Align.START, expand: true });
@ -63,20 +63,17 @@ AlphabeticalView.prototype = {
_removeAll: function() { _removeAll: function() {
this._grid.removeAll(); this._grid.removeAll();
this._apps = []; this._appIcons = {};
}, },
_addApp: function(appInfo) { _addApp: function(app) {
let appIcon = new AppWellIcon(this._appSystem.get_app(appInfo.get_id())); var id = app.get_id();
let appIcon = new AppWellIcon(app);
this._grid.addItem(appIcon.actor); this._grid.addItem(appIcon.actor);
appIcon.actor.connect('key-focus-in', Lang.bind(this, this._ensureIconVisible)); appIcon.actor.connect('key-focus-in', Lang.bind(this, this._ensureIconVisible));
appIcon._appInfo = appInfo; this._appIcons[id] = appIcon;
if (this._filterApp && !this._filterApp(appInfo))
appIcon.actor.hide();
this._apps.push(appIcon);
}, },
_ensureIconVisible: function(icon) { _ensureIconVisible: function(icon) {
@ -105,52 +102,33 @@ AlphabeticalView.prototype = {
transition: 'easeOutQuad' }); transition: 'easeOutQuad' });
}, },
setFilter: function(filter) { setVisibleApps: function(apps) {
this._filterApp = filter; if (apps == null) { // null implies "all"
for (let i = 0; i < this._apps.length; i++) for (var id in this._appIcons) {
this._apps[i].actor.visible = filter(this._apps[i]._appInfo); var icon = this._appIcons[id];
}, icon.actor.visible = true;
// Create actors for the applications in an idle to avoid blocking
// for too long; see bug 647778
_addPendingApps: function() {
let i;
let startTimeMillis = new Date().getTime();
for (i = 0; i < this._pendingAppIds.length; i++) {
let id = this._pendingAppIds[i];
this._addApp(this._pendingApps[id]);
let currentTimeMillis = new Date().getTime();
if (currentTimeMillis - startTimeMillis > MAX_APPLICATION_WORK_MILLIS)
break;
} }
this._pendingAppIds.splice(0, i + 1);
if (this._pendingAppIds.length > 0) {
return true;
} else { } else {
this._pendingAppLaterId = 0; // Set everything to not-visible, then set to visible what we should see
this._pendingAppIds = null; for (var id in this._appIcons) {
this._pendingApps = null; var icon = this._appIcons[id];
return false; icon.actor.visible = false;
}
for (var i = 0; i < apps.length; i++) {
var app = apps[i];
var id = app.get_id();
var icon = this._appIcons[id];
icon.actor.visible = true;
}
} }
}, },
refresh: function(apps) { setAppList: function(apps) {
let ids = [];
for (let i in apps)
ids.push(i);
ids.sort(function(a, b) {
return apps[a].get_name().localeCompare(apps[b].get_name());
});
this._removeAll(); this._removeAll();
for (var i = 0; i < apps.length; i++) {
this._pendingAppIds = ids; var app = apps[i];
this._pendingApps = apps; this._addApp(app);
if (this._pendingAppLaterId) }
Meta.later_remove(this._pendingAppLaterId);
this._pendingAppLaterId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
Lang.bind(this, this._addPendingApps));
} }
}; };
@ -171,23 +149,24 @@ ViewByCategories.prototype = {
// -2 is a flag to indicate that nothing is selected // -2 is a flag to indicate that nothing is selected
// (used only before the actor is mapped the first time) // (used only before the actor is mapped the first time)
this._currentCategory = -2; this._currentCategory = -2;
this._filters = new St.BoxLayout({ vertical: true, reactive: true }); this._categories = [];
this._filtersBox = new St.ScrollView({ x_fill: false, this._apps = null;
this._categoryBox = new St.BoxLayout({ vertical: true, reactive: true });
this._categoryScroll = new St.ScrollView({ x_fill: false,
y_fill: false, y_fill: false,
style_class: 'vfade' }); style_class: 'vfade' });
this._filtersBox.add_actor(this._filters); this._categoryScroll.add_actor(this._categoryBox);
this.actor.add(this._view.actor, { expand: true, x_fill: true, y_fill: true }); this.actor.add(this._view.actor, { expand: true, x_fill: true, y_fill: true });
this.actor.add(this._filtersBox, { expand: false, y_fill: false, y_align: St.Align.START }); this.actor.add(this._categoryScroll, { expand: false, y_fill: false, y_align: St.Align.START });
// Always select the "All" filter when switching to the app view // Always select the "All" filter when switching to the app view
this.actor.connect('notify::mapped', Lang.bind(this, this.actor.connect('notify::mapped', Lang.bind(this,
function() { function() {
if (this.actor.mapped && this._allFilter) if (this.actor.mapped && this._allCategoryButton)
this._selectCategory(-1); this._selectCategory(-1);
})); }));
this._sections = [];
// We need a dummy actor to catch the keyboard focus if the // We need a dummy actor to catch the keyboard focus if the
// user Ctrl-Alt-Tabs here before the deferred work creates // user Ctrl-Alt-Tabs here before the deferred work creates
// our real contents // our real contents
@ -201,64 +180,94 @@ ViewByCategories.prototype = {
this._currentCategory = num; this._currentCategory = num;
if (num != -1) if (num != -1) {
this._allFilter.remove_style_pseudo_class('selected'); var category = this._categories[num];
else this._allCategoryButton.remove_style_pseudo_class('selected');
this._allFilter.add_style_pseudo_class('selected'); this._view.setVisibleApps(category.apps);
} else {
this._allCategoryButton.add_style_pseudo_class('selected');
this._view.setVisibleApps(null);
}
this._view.setFilter(Lang.bind(this, function(app) { for (var i = 0; i < this._categories.length; i++) {
if (num == -1)
return true;
return this._sections[num].name == app.get_section();
}));
for (let i = 0; i < this._sections.length; i++) {
if (i == num) if (i == num)
this._sections[i].filterActor.add_style_pseudo_class('selected'); this._categories[i].button.add_style_pseudo_class('selected');
else else
this._sections[i].filterActor.remove_style_pseudo_class('selected'); this._categories[i].button.remove_style_pseudo_class('selected');
} }
}, },
_addFilter: function(name, num) { // Recursively load a GMenuTreeDirectory; we could put this in ShellAppSystem too
_loadCategory: function(dir, appList) {
var iter = dir.iter();
var nextType;
while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
if (nextType == GMenu.TreeItemType.ENTRY) {
var entry = iter.get_entry();
var app = this._appSystem.lookup_app_by_tree_entry(entry);
appList.push(app);
} else if (nextType == GMenu.TreeItemType.DIRECTORY) {
_loadCategory(iter.get_directory(), appList);
}
}
},
_addCategory: function(name, index, dir, allApps) {
let button = new St.Button({ label: GLib.markup_escape_text (name, -1), let button = new St.Button({ label: GLib.markup_escape_text (name, -1),
style_class: 'app-filter', style_class: 'app-filter',
x_align: St.Align.START, x_align: St.Align.START,
can_focus: true }); can_focus: true });
this._filters.add(button, { expand: true, x_fill: true, y_fill: false });
button.connect('clicked', Lang.bind(this, function() { button.connect('clicked', Lang.bind(this, function() {
this._selectCategory(num); this._selectCategory(index);
})); }));
if (num != -1) var apps;
this._sections[num] = { filterActor: button, if (dir == null) {
name: name }; apps = allApps;
else this._allCategoryButton = button;
this._allFilter = button; } else {
apps = [];
this._loadCategory(dir, apps);
this._categories.push({ apps: apps,
name: name,
button: button });
}
this._categoryBox.add(button, { expand: true, x_fill: true, y_fill: false });
}, },
_removeAll: function() { _removeAll: function() {
this._sections = []; this._categories = [];
this._filters.destroy_children(); this._categoryBox.destroy_children();
}, },
refresh: function(apps) { refresh: function() {
this._removeAll(); this._removeAll();
let sections = this._appSystem.get_sections(); var allApps = Shell.AppSystem.get_default().get_all();
this._apps = apps; allApps.sort(function(a, b) {
return a.compare_by_name(b);
});
/* Translators: Filter to display all applications */ /* Translators: Filter to display all applications */
this._addFilter(_("All"), -1); this._addCategory(_("All"), -1, null, allApps);
if (!sections) var tree = this._appSystem.get_tree();
return; var root = tree.get_root_directory();
for (let i = 0; i < sections.length; i++) var iter = root.iter();
this._addFilter(sections[i], i); var nextType;
var i = 0;
while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
if (nextType == GMenu.TreeItemType.DIRECTORY) {
var dir = iter.get_directory();
this._addCategory(dir.get_name(), i, dir);
i++;
}
}
this._view.setAppList(allApps);
this._selectCategory(-1); this._selectCategory(-1);
this._view.refresh(apps);
if (this._focusDummy) { if (this._focusDummy) {
let focused = this._focusDummy.has_key_focus(); let focused = this._focusDummy.has_key_focus();
@ -291,31 +300,24 @@ AllAppDisplay.prototype = {
}, },
_redisplay: function() { _redisplay: function() {
let apps = this._appSystem.get_flattened_apps().filter(function(app) { this._appView.refresh();
return !app.get_is_nodisplay();
});
this._appView.refresh(apps);
} }
}; };
function BaseAppSearchProvider() { function AppSearchProvider() {
this._init(); this._init();
} }
BaseAppSearchProvider.prototype = { AppSearchProvider.prototype = {
__proto__: Search.SearchProvider.prototype, __proto__: Search.SearchProvider.prototype,
_init: function(name) { _init: function() {
Search.SearchProvider.prototype._init.call(this, name); Search.SearchProvider.prototype._init.call(this, _("APPLICATIONS"));
this._appSys = Shell.AppSystem.get_default(); this._appSys = Shell.AppSystem.get_default();
}, },
getResultMeta: function(resultId) { getResultMeta: function(app) {
let app = this._appSys.get_app(resultId); return { 'id': app,
if (!app)
return null;
return { 'id': resultId,
'name': app.get_name(), 'name': app.get_name(),
'createIcon': function(size) { 'createIcon': function(size) {
return app.create_icon_texture(size); return app.create_icon_texture(size);
@ -323,6 +325,14 @@ BaseAppSearchProvider.prototype = {
}; };
}, },
getInitialResultSet: function(terms) {
return this._appSys.initial_search(terms);
},
getSubsearchResultSet: function(previousResults, terms) {
return this._appSys.subsearch(previousResults, terms);
},
activateResult: function(id, params) { activateResult: function(id, params) {
params = Params.parse(params, { workspace: null, params = Params.parse(params, { workspace: null,
timestamp: null }); timestamp: null });
@ -332,7 +342,7 @@ BaseAppSearchProvider.prototype = {
let modifiers = event ? Shell.get_event_state(event) : 0; let modifiers = event ? Shell.get_event_state(event) : 0;
let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK; let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK;
let app = this._appSys.get_app(id); let app = this._appSys.lookup_app(id);
if (openNewWindow) if (openNewWindow)
app.open_new_window(workspace); app.open_new_window(workspace);
else else
@ -343,54 +353,62 @@ BaseAppSearchProvider.prototype = {
params = Params.parse(params, { workspace: null, params = Params.parse(params, { workspace: null,
timestamp: null }); timestamp: null });
let app = this._appSys.get_app(id); let app = this._appSys.lookup_app(id);
app.open_new_window(params.workspace ? params.workspace.index() : -1); app.open_new_window(params.workspace ? params.workspace.index() : -1);
}
};
function AppSearchProvider() {
this._init();
}
AppSearchProvider.prototype = {
__proto__: BaseAppSearchProvider.prototype,
_init: function() {
BaseAppSearchProvider.prototype._init.call(this, _("APPLICATIONS"));
},
getInitialResultSet: function(terms) {
return this._appSys.initial_search(false, terms);
},
getSubsearchResultSet: function(previousResults, terms) {
return this._appSys.subsearch(false, previousResults, terms);
}, },
createResultActor: function (resultMeta, terms) { createResultActor: function (resultMeta, terms) {
let app = this._appSys.get_app(resultMeta['id']); let app = resultMeta['id'];
let icon = new AppWellIcon(app); let icon = new AppWellIcon(app);
return icon.actor; return icon.actor;
} }
}; };
function PrefsSearchProvider() { function SettingsSearchProvider() {
this._init(); this._init();
} }
PrefsSearchProvider.prototype = { SettingsSearchProvider.prototype = {
__proto__: BaseAppSearchProvider.prototype, __proto__: Search.SearchProvider.prototype,
_init: function() { _init: function() {
BaseAppSearchProvider.prototype._init.call(this, _("SETTINGS")); Search.SearchProvider.prototype._init.call(this, _("SETTINGS"));
this._appSys = Shell.AppSystem.get_default();
this._gnomecc = this._appSys.lookup_app('gnome-control-center.desktop');
},
getResultMeta: function(pref) {
return { 'id': pref,
'name': pref.get_name(),
'createIcon': function(size) {
return pref.create_icon_texture(size);
}
};
}, },
getInitialResultSet: function(terms) { getInitialResultSet: function(terms) {
return this._appSys.initial_search(true, terms); return this._appSys.search_settings(terms);
}, },
getSubsearchResultSet: function(previousResults, terms) { getSubsearchResultSet: function(previousResults, terms) {
return this._appSys.subsearch(true, previousResults, terms); return this._appSys.search_settings(terms);
},
activateResult: function(pref, params) {
params = Params.parse(params, { workspace: null,
timestamp: null });
pref.activate(params.workspace);
},
dragActivateResult: function(pref, params) {
this.activateResult(pref, params);
},
createResultActor: function (resultMeta, terms) {
let app = resultMeta['id'];
let icon = new AppWellIcon(app);
return icon.actor;
} }
}; };
@ -416,12 +434,12 @@ AppIcon.prototype = {
} }
}; };
function AppWellIcon(app, iconParams) { function AppWellIcon(app, iconParams, onActivateOverride) {
this._init(app, iconParams); this._init(app, iconParams, onActivateOverride);
} }
AppWellIcon.prototype = { AppWellIcon.prototype = {
_init : function(app, iconParams) { _init : function(app, iconParams, onActivateOverride) {
this.app = app; this.app = app;
this.actor = new St.Button({ style_class: 'app-well-app', this.actor = new St.Button({ style_class: 'app-well-app',
reactive: true, reactive: true,
@ -436,6 +454,8 @@ AppWellIcon.prototype = {
this.actor.label_actor = this.icon.label; this.actor.label_actor = this.icon.label;
// A function callback to override the default "app.activate()"; used by preferences
this._onActivateOverride = onActivateOverride;
this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress)); this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
this.actor.connect('clicked', Lang.bind(this, this._onClicked)); this.actor.connect('clicked', Lang.bind(this, this._onClicked));
this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu)); this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));
@ -569,12 +589,16 @@ AppWellIcon.prototype = {
this.emit('launching'); this.emit('launching');
let modifiers = Shell.get_event_state(event); let modifiers = Shell.get_event_state(event);
if (this._onActivateOverride) {
this._onActivateOverride(event);
} else {
if (modifiers & Clutter.ModifierType.CONTROL_MASK if (modifiers & Clutter.ModifierType.CONTROL_MASK
&& this.app.state == Shell.AppState.RUNNING) { && this.app.state == Shell.AppState.RUNNING) {
this.app.open_new_window(-1); this.app.open_new_window(-1);
} else { } else {
this.app.activate(-1); this.app.activate(-1);
} }
}
Main.overview.hide(); Main.overview.hide();
}, },

6
js/ui/appFavorites.js
View File

@ -28,7 +28,7 @@ AppFavorites.prototype = {
let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY); let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
let appSys = Shell.AppSystem.get_default(); let appSys = Shell.AppSystem.get_default();
let apps = ids.map(function (id) { let apps = ids.map(function (id) {
return appSys.get_app(id); return appSys.lookup_app(id);
}).filter(function (app) { }).filter(function (app) {
return app != null; return app != null;
}); });
@ -65,7 +65,7 @@ AppFavorites.prototype = {
if (appId in this._favorites) if (appId in this._favorites)
return false; return false;
let app = Shell.AppSystem.get_default().get_app(appId); let app = Shell.AppSystem.get_default().lookup_app(appId);
if (!app) if (!app)
return false; return false;
@ -84,7 +84,7 @@ AppFavorites.prototype = {
if (!this._addFavorite(appId, pos)) if (!this._addFavorite(appId, pos))
return; return;
let app = Shell.AppSystem.get_default().get_app(appId); let app = Shell.AppSystem.get_default().lookup_app(appId);
Main.overview.shellInfo.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () { Main.overview.shellInfo.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
this._removeFavorite(appId); this._removeFavorite(appId);

12
js/ui/dash.js
View File

@ -207,7 +207,7 @@ RemoveFavoriteIcon.prototype = {
let app = null; let app = null;
if (source instanceof AppDisplay.AppWellIcon) { if (source instanceof AppDisplay.AppWellIcon) {
let appSystem = Shell.AppSystem.get_default(); let appSystem = Shell.AppSystem.get_default();
app = appSystem.get_app(source.getId()); app = appSystem.lookup_app(source.getId());
} else if (source.metaWindow) { } else if (source.metaWindow) {
let tracker = Shell.WindowTracker.get_default(); let tracker = Shell.WindowTracker.get_default();
app = tracker.get_window_app(source.metaWindow); app = tracker.get_window_app(source.metaWindow);
@ -330,7 +330,7 @@ Dash.prototype = {
_onDragMotion: function(dragEvent) { _onDragMotion: function(dragEvent) {
let app = null; let app = null;
if (dragEvent.source instanceof AppDisplay.AppWellIcon) if (dragEvent.source instanceof AppDisplay.AppWellIcon)
app = this._appSystem.get_app(dragEvent.source.getId()); app = this._appSystem.lookup_app(dragEvent.source.getId());
else if (dragEvent.source.metaWindow) else if (dragEvent.source.metaWindow)
app = this._tracker.get_window_app(dragEvent.source.metaWindow); app = this._tracker.get_window_app(dragEvent.source.metaWindow);
else else
@ -619,12 +619,12 @@ Dash.prototype = {
handleDragOver : function(source, actor, x, y, time) { handleDragOver : function(source, actor, x, y, time) {
let app = null; let app = null;
if (source instanceof AppDisplay.AppWellIcon) if (source instanceof AppDisplay.AppWellIcon)
app = this._appSystem.get_app(source.getId()); app = this._appSystem.lookup_app(source.getId());
else if (source.metaWindow) else if (source.metaWindow)
app = this._tracker.get_window_app(source.metaWindow); app = this._tracker.get_window_app(source.metaWindow);
// Don't allow favoriting of transient apps // Don't allow favoriting of transient apps
if (app == null || app.is_transient()) if (app == null || app.is_window_backed())
return DND.DragMotionResult.NO_DROP; return DND.DragMotionResult.NO_DROP;
let favorites = AppFavorites.getAppFavorites().getFavorites(); let favorites = AppFavorites.getAppFavorites().getFavorites();
@ -704,13 +704,13 @@ Dash.prototype = {
acceptDrop : function(source, actor, x, y, time) { acceptDrop : function(source, actor, x, y, time) {
let app = null; let app = null;
if (source instanceof AppDisplay.AppWellIcon) { if (source instanceof AppDisplay.AppWellIcon) {
app = this._appSystem.get_app(source.getId()); app = this._appSystem.lookup_app(source.getId());
} else if (source.metaWindow) { } else if (source.metaWindow) {
app = this._tracker.get_window_app(source.metaWindow); app = this._tracker.get_window_app(source.metaWindow);
} }
// Don't allow favoriting of transient apps // Don't allow favoriting of transient apps
if (app == null || app.is_transient()) { if (app == null || app.is_window_backed()) {
return false; return false;
} }

2
js/ui/dateMenu.js
View File

@ -199,7 +199,7 @@ DateMenuButton.prototype = {
_onPreferencesActivate: function() { _onPreferencesActivate: function() {
this.menu.close(); this.menu.close();
Main.overview.hide(); Main.overview.hide();
let app = Shell.AppSystem.get_default().get_app('gnome-datetime-panel.desktop'); let app = Shell.AppSystem.get_default().lookup_setting('gnome-datetime-panel.desktop');
app.activate(-1); app.activate(-1);
}, },

2
js/ui/endSessionDialog.js
View File

@ -113,7 +113,7 @@ function findAppFromInhibitor(inhibitor) {
let app = null; let app = null;
for (let i = 0; i < candidateDesktopFiles.length; i++) { for (let i = 0; i < candidateDesktopFiles.length; i++) {
try { try {
app = appSystem.get_app(candidateDesktopFiles[i]); app = appSystem.lookup_app(candidateDesktopFiles[i]);
if (app) if (app)
break; break;

2
js/ui/lookingGlass.js
View File

@ -247,7 +247,7 @@ WindowList.prototype = {
box.add(propsBox); box.add(propsBox);
propsBox.add(new St.Label({ text: 'wmclass: ' + metaWindow.get_wm_class() })); propsBox.add(new St.Label({ text: 'wmclass: ' + metaWindow.get_wm_class() }));
let app = tracker.get_window_app(metaWindow); let app = tracker.get_window_app(metaWindow);
if (app != null && !app.is_transient()) { if (app != null && !app.is_window_backed()) {
let icon = app.create_icon_texture(22); let icon = app.create_icon_texture(22);
let propBox = new St.BoxLayout({ style: 'spacing: 6px; ' }); let propBox = new St.BoxLayout({ style: 'spacing: 6px; ' });
propsBox.add(propBox); propsBox.add(propBox);

2
js/ui/overview.js
View File

@ -188,7 +188,7 @@ Overview.prototype = {
// Default search providers // Default search providers
this.viewSelector.addSearchProvider(new AppDisplay.AppSearchProvider()); this.viewSelector.addSearchProvider(new AppDisplay.AppSearchProvider());
this.viewSelector.addSearchProvider(new AppDisplay.PrefsSearchProvider()); this.viewSelector.addSearchProvider(new AppDisplay.SettingsSearchProvider());
this.viewSelector.addSearchProvider(new PlaceDisplay.PlaceSearchProvider()); this.viewSelector.addSearchProvider(new PlaceDisplay.PlaceSearchProvider());
this.viewSelector.addSearchProvider(new DocDisplay.DocSearchProvider()); this.viewSelector.addSearchProvider(new DocDisplay.DocSearchProvider());

2
js/ui/status/accessibility.js
View File

@ -90,7 +90,7 @@ ATIndicator.prototype = {
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this.menu.addAction(_("Universal Access Settings"), function() { this.menu.addAction(_("Universal Access Settings"), function() {
Main.overview.hide(); Main.overview.hide();
let app = Shell.AppSystem.get_default().get_app('gnome-universal-access-panel.desktop'); let app = Shell.AppSystem.get_default().lookup_setting('gnome-universal-access-panel.desktop');
app.activate(-1); app.activate(-1);
}); });
}, },

2
js/ui/status/bluetooth.js
View File

@ -91,7 +91,7 @@ Indicator.prototype = {
this.menu.addAction(_("Bluetooth Settings"), function() { this.menu.addAction(_("Bluetooth Settings"), function() {
Main.overview.hide() Main.overview.hide()
let app = Shell.AppSystem.get_default().get_app('bluetooth-properties.desktop'); let app = Shell.AppSystem.get_default().lookup_setting('bluetooth-properties.desktop');
app.activate(-1); app.activate(-1);
}); });

2
js/ui/status/keyboard.js
View File

@ -74,7 +74,7 @@ XKBIndicator.prototype = {
})); }));
this.menu.addAction(_("Region and Language Settings"), function() { this.menu.addAction(_("Region and Language Settings"), function() {
Main.overview.hide(); Main.overview.hide();
let app = Shell.AppSystem.get_default().get_app('gnome-region-panel.desktop'); let app = Shell.AppSystem.get_default().lookup_setting('gnome-region-panel.desktop');
app.activate(-1); app.activate(-1);
}); });
}, },

2
js/ui/status/network.js
View File

@ -1604,7 +1604,7 @@ NMApplet.prototype = {
this.menu.addAction(_("Network Settings"), function() { this.menu.addAction(_("Network Settings"), function() {
Main.overview.hide(); Main.overview.hide();
let app = Shell.AppSystem.get_default().get_app('gnome-network-panel.desktop'); let app = Shell.AppSystem.get_default().lookup_setting('gnome-network-panel.desktop');
app.activate(-1); app.activate(-1);
}); });

2
js/ui/status/power.js
View File

@ -82,7 +82,7 @@ Indicator.prototype = {
this.menu.addAction(_("Power Settings"),function() { this.menu.addAction(_("Power Settings"),function() {
Main.overview.hide(); Main.overview.hide();
let app = Shell.AppSystem.get_default().get_app('gnome-power-panel.desktop'); let app = Shell.AppSystem.get_default().lookup_setting('gnome-power-panel.desktop');
app.activate(-1); app.activate(-1);
}); });

2
js/ui/status/volume.js
View File

@ -63,7 +63,7 @@ Indicator.prototype = {
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this.menu.addAction(_("Sound Settings"), function() { this.menu.addAction(_("Sound Settings"), function() {
Main.overview.hide(); Main.overview.hide();
let app = Shell.AppSystem.get_default().get_app('gnome-sound-panel.desktop'); let app = Shell.AppSystem.get_default().lookup_setting('gnome-sound-panel.desktop');
app.activate(-1); app.activate(-1);
}); });

4
js/ui/statusMenu.js
View File

@ -274,13 +274,13 @@ StatusMenuButton.prototype = {
_onMyAccountActivate: function() { _onMyAccountActivate: function() {
Main.overview.hide(); Main.overview.hide();
let app = Shell.AppSystem.get_default().get_app('gnome-user-accounts-panel.desktop'); let app = Shell.AppSystem.get_default().lookup_setting('gnome-user-accounts-panel.desktop');
app.activate(-1); app.activate(-1);
}, },
_onPreferencesActivate: function() { _onPreferencesActivate: function() {
Main.overview.hide(); Main.overview.hide();
let app = Shell.AppSystem.get_default().get_app('gnome-control-center.desktop'); let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
app.activate(-1); app.activate(-1);
}, },

2
src/Makefile.am
View File

@ -269,7 +269,7 @@ libgnome_shell_la_LIBADD = \
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags) libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
Shell-0.1.gir: libgnome-shell.la St-1.0.gir Shell-0.1.gir: libgnome-shell.la St-1.0.gir
Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0
Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir) Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
Shell_0_1_gir_LIBS = libgnome-shell.la Shell_0_1_gir_LIBS = libgnome-shell.la
Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources) Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)

11
src/shell-app-private.h
View File

@ -10,11 +10,9 @@
G_BEGIN_DECLS G_BEGIN_DECLS
ShellAppInfo *_shell_app_get_info (ShellApp *app);
ShellApp* _shell_app_new_for_window (MetaWindow *window); ShellApp* _shell_app_new_for_window (MetaWindow *window);
ShellApp* _shell_app_new (ShellAppInfo *appinfo); ShellApp* _shell_app_new (GMenuTreeEntry *entry);
void _shell_app_handle_startup_sequence (ShellApp *app, SnStartupSequence *sequence); void _shell_app_handle_startup_sequence (ShellApp *app, SnStartupSequence *sequence);
@ -22,6 +20,13 @@ void _shell_app_add_window (ShellApp *app, MetaWindow *window);
void _shell_app_remove_window (ShellApp *app, MetaWindow *window); void _shell_app_remove_window (ShellApp *app, MetaWindow *window);
void _shell_app_do_match (ShellApp *app,
GSList *terms,
GSList **multiple_prefix_results,
GSList **prefix_results,
GSList **multiple_substring_results,
GSList **substring_results);
G_END_DECLS G_END_DECLS
#endif /* __SHELL_APP_PRIVATE_H__ */ #endif /* __SHELL_APP_PRIVATE_H__ */

1818
src/shell-app-system.c
View File

File diff suppressed because it is too large Load Diff

62
src/shell-app-system.h
View File

@ -5,6 +5,8 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <meta/window.h> #include <meta/window.h>
#define GMENU_I_KNOW_THIS_IS_UNSTABLE
#include <gmenu-tree.h>
#include "shell-app.h" #include "shell-app.h"
@ -37,63 +39,33 @@ struct _ShellAppSystemClass
GType shell_app_system_get_type (void) G_GNUC_CONST; GType shell_app_system_get_type (void) G_GNUC_CONST;
ShellAppSystem *shell_app_system_get_default (void); ShellAppSystem *shell_app_system_get_default (void);
typedef struct _ShellAppInfo ShellAppInfo; GMenuTree *shell_app_system_get_tree (ShellAppSystem *system);
#define SHELL_TYPE_APP_INFO (shell_app_info_get_type ()) ShellApp *shell_app_system_lookup_app (ShellAppSystem *system,
GType shell_app_info_get_type (void);
ShellAppInfo *shell_app_info_ref (ShellAppInfo *info);
void shell_app_info_unref (ShellAppInfo *info);
const char *shell_app_info_get_id (ShellAppInfo *info);
char *shell_app_info_get_name (ShellAppInfo *info);
char *shell_app_info_get_description (ShellAppInfo *info);
char *shell_app_info_get_executable (ShellAppInfo *info);
char *shell_app_info_get_desktop_file_path (ShellAppInfo *info);
GIcon *shell_app_info_get_icon (ShellAppInfo *info);
ClutterActor *shell_app_info_create_icon_texture (ShellAppInfo *info,
float size);
char *shell_app_info_get_section (ShellAppInfo *info);
gboolean shell_app_info_get_is_nodisplay (ShellAppInfo *info);
gboolean shell_app_info_is_transient (ShellAppInfo *info);
MetaWindow *shell_app_info_get_source_window (ShellAppInfo *info);
gboolean shell_app_info_launch (ShellAppInfo *info,
GError **error);
gboolean shell_app_info_launch_full (ShellAppInfo *info,
guint timestamp,
GList *uris,
int workspace,
char **startup_id,
GError **error);
GList *shell_app_system_get_sections (ShellAppSystem *system);
GSList *shell_app_system_get_flattened_apps (ShellAppSystem *system);
GSList *shell_app_system_get_all_settings (ShellAppSystem *system);
ShellApp *shell_app_system_get_app (ShellAppSystem *system,
const char *id); const char *id);
ShellApp *shell_app_system_get_app_for_path (ShellAppSystem *system, ShellApp *shell_app_system_lookup_app_by_tree_entry (ShellAppSystem *system,
GMenuTreeEntry *entry);
ShellApp *shell_app_system_lookup_app_for_path (ShellAppSystem *system,
const char *desktop_path); const char *desktop_path);
ShellApp *shell_app_system_get_app_for_window (ShellAppSystem *self,
MetaWindow *window);
ShellApp *shell_app_system_lookup_heuristic_basename (ShellAppSystem *system, ShellApp *shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,
const char *id); const char *id);
ShellAppInfo *shell_app_system_create_from_window (ShellAppSystem *system,
MetaWindow *window); GSList *shell_app_system_get_all (ShellAppSystem *system);
GSList *shell_app_system_initial_search (ShellAppSystem *system, GSList *shell_app_system_initial_search (ShellAppSystem *system,
gboolean prefs,
GSList *terms); GSList *terms);
GSList *shell_app_system_subsearch (ShellAppSystem *system, GSList *shell_app_system_subsearch (ShellAppSystem *system,
gboolean prefs,
GSList *previous_results, GSList *previous_results,
GSList *terms); GSList *terms);
/* internal API */ GMenuTree *shell_app_system_get_settings_tree (ShellAppSystem *system);
void _shell_app_system_register_app (ShellAppSystem *self,
ShellApp *app); GSList *shell_app_system_search_settings (ShellAppSystem *system,
GSList *terms);
ShellApp *shell_app_system_lookup_setting (ShellAppSystem *system,
const char *id);
#endif /* __SHELL_APP_SYSTEM_H__ */ #endif /* __SHELL_APP_SYSTEM_H__ */

8
src/shell-app-usage.c
View File

@ -105,7 +105,7 @@ G_DEFINE_TYPE (ShellAppUsage, shell_app_usage, G_TYPE_OBJECT);
struct UsageData struct UsageData
{ {
/* Whether the application we're tracking is "transient", see /* Whether the application we're tracking is "transient", see
* shell_app_info_is_transient. * shell_app_is_window_backed.
*/ */
gboolean transient; gboolean transient;
@ -315,7 +315,7 @@ on_app_state_changed (ShellWindowTracker *tracker,
UsageData *usage; UsageData *usage;
gboolean running; gboolean running;
if (shell_app_is_transient (app)) if (shell_app_is_window_backed (app))
return; return;
usage = get_usage_for_app (self, app); usage = get_usage_for_app (self, app);
@ -509,7 +509,7 @@ shell_app_usage_get_most_used (ShellAppUsage *self,
const char *appid = iter->data; const char *appid = iter->data;
ShellApp *app; ShellApp *app;
app = shell_app_system_get_app (appsys, appid); app = shell_app_system_lookup_app (appsys, appid);
if (!app) if (!app)
continue; continue;
@ -670,7 +670,7 @@ idle_save_application_usage (gpointer data)
{ {
ShellApp *app; ShellApp *app;
app = shell_app_system_get_app (shell_app_system_get_default(), id); app = shell_app_system_lookup_app (shell_app_system_get_default(), id);
if (!app) if (!app)
continue; continue;

430
src/shell-app.c
View File

@ -14,6 +14,14 @@
#include "shell-window-tracker-private.h" #include "shell-window-tracker-private.h"
#include "st.h" #include "st.h"
typedef enum {
MATCH_NONE,
MATCH_SUBSTRING, /* Not prefix, substring */
MATCH_MULTIPLE_SUBSTRING, /* Matches multiple criteria with substrings */
MATCH_PREFIX, /* Strict prefix */
MATCH_MULTIPLE_PREFIX, /* Matches multiple criteria, at least one prefix */
} ShellAppSearchMatch;
/* This is mainly a memory usage optimization - the user is going to /* This is mainly a memory usage optimization - the user is going to
* be running far fewer of the applications at one time than they have * be running far fewer of the applications at one time than they have
* installed. But it also just helps keep the code more logically * installed. But it also just helps keep the code more logically
@ -38,7 +46,7 @@ typedef struct {
* SECTION:shell-app * SECTION:shell-app
* @short_description: Object representing an application * @short_description: Object representing an application
* *
* This object wraps a #ShellAppInfo, providing methods and signals * This object wraps a #GMenuTreeEntry, providing methods and signals
* primarily useful for running applications. * primarily useful for running applications.
*/ */
struct _ShellApp struct _ShellApp
@ -49,9 +57,16 @@ struct _ShellApp
ShellAppState state; ShellAppState state;
ShellAppInfo *info; GMenuTreeEntry *entry; /* If NULL, this app is backend by exactly one MetaWindow */
ShellAppRunningState *running_state; ShellAppRunningState *running_state;
char *window_id_string;
char *casefolded_name;
char *name_collation_key;
char *casefolded_description;
char *casefolded_exec;
}; };
G_DEFINE_TYPE (ShellApp, shell_app, G_TYPE_OBJECT); G_DEFINE_TYPE (ShellApp, shell_app, G_TYPE_OBJECT);
@ -93,7 +108,18 @@ shell_app_get_property (GObject *gobject,
const char * const char *
shell_app_get_id (ShellApp *app) shell_app_get_id (ShellApp *app)
{ {
return shell_app_info_get_id (app->info); if (app->entry)
return gmenu_tree_entry_get_desktop_file_id (app->entry);
return app->window_id_string;
}
static MetaWindow *
window_backed_app_get_window (ShellApp *app)
{
g_assert (app->entry == NULL);
g_assert (app->running_state);
g_assert (app->running_state->windows);
return app->running_state->windows->data;
} }
/** /**
@ -108,8 +134,33 @@ ClutterActor *
shell_app_create_icon_texture (ShellApp *app, shell_app_create_icon_texture (ShellApp *app,
float size) float size)
{ {
return shell_app_info_create_icon_texture (app->info, size); GIcon *icon;
ClutterActor *ret;
ret = NULL;
if (app->entry == NULL)
{
MetaWindow *window = window_backed_app_get_window (app);
return st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (),
G_OBJECT (window),
"icon");
} }
icon = g_app_info_get_icon (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
if (icon != NULL)
ret = st_texture_cache_load_gicon (st_texture_cache_get_default (), NULL, icon, (int)size);
if (ret == NULL)
{
icon = g_themed_icon_new ("application-x-executable");
ret = st_texture_cache_load_gicon (st_texture_cache_get_default (), NULL, icon, (int)size);
g_object_unref (icon);
}
return ret;
}
typedef struct { typedef struct {
ShellApp *app; ShellApp *app;
int size; int size;
@ -143,13 +194,12 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,
info = NULL; info = NULL;
icon = shell_app_info_get_icon (app->info); icon = g_app_info_get_icon (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
if (icon != NULL) if (icon != NULL)
{ {
info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (),
icon, (int) (size + 0.5), icon, (int) (size + 0.5),
GTK_ICON_LOOKUP_FORCE_SIZE); GTK_ICON_LOOKUP_FORCE_SIZE);
g_object_unref (icon);
} }
if (info == NULL) if (info == NULL)
@ -224,23 +274,24 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,
ClutterActor * ClutterActor *
shell_app_get_faded_icon (ShellApp *app, float size) shell_app_get_faded_icon (ShellApp *app, float size)
{ {
MetaWindow *window;
CoglHandle texture; CoglHandle texture;
ClutterActor *result; ClutterActor *result;
char *cache_key; char *cache_key;
CreateFadedIconData data; CreateFadedIconData data;
/* Punt for WINDOW types for now...easier to reuse the property tracking bits, /* Don't fade for window backed apps for now...easier to reuse the
* and this helps us visually distinguish app-tracked from not. * property tracking bits, and this helps us visually distinguish
* app-tracked from not.
*/ */
window = shell_app_info_get_source_window (app->info); if (!app->entry)
if (window)
{ {
MetaWindow *window = window_backed_app_get_window (app);
return st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (), return st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (),
G_OBJECT (window), G_OBJECT (window),
"icon"); "icon");
} }
cache_key = g_strdup_printf ("faded-icon:%s,size=%f", shell_app_get_id (app), size); cache_key = g_strdup_printf ("faded-icon:%s,size=%f", shell_app_get_id (app), size);
data.app = app; data.app = app;
data.size = (int) (0.5 + size); data.size = (int) (0.5 + size);
@ -266,22 +317,43 @@ shell_app_get_faded_icon (ShellApp *app, float size)
return result; return result;
} }
char * const char *
shell_app_get_name (ShellApp *app) shell_app_get_name (ShellApp *app)
{ {
return shell_app_info_get_name (app->info); if (app->entry)
return g_app_info_get_name (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
else
{
MetaWindow *window = window_backed_app_get_window (app);
const char *name;
name = meta_window_get_wm_class (window);
if (!name)
name = _("Unknown");
return name;
}
} }
char * const char *
shell_app_get_description (ShellApp *app) shell_app_get_description (ShellApp *app)
{ {
return shell_app_info_get_description (app->info); if (app->entry)
return g_app_info_get_description (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
else
return NULL;
} }
/**
* shell_app_is_window_backed:
*
* A window backed application is one which represents just an open
* window, i.e. there's no .desktop file assocation, so we don't know
* how to launch it again.
*/
gboolean gboolean
shell_app_is_transient (ShellApp *app) shell_app_is_window_backed (ShellApp *app)
{ {
return shell_app_info_is_transient (app->info); return app->entry == NULL;
} }
typedef struct { typedef struct {
@ -453,7 +525,7 @@ shell_app_activate (ShellApp *app,
case SHELL_APP_STATE_STOPPED: case SHELL_APP_STATE_STOPPED:
{ {
GError *error = NULL; GError *error = NULL;
if (!shell_app_info_launch_full (app->info, if (!shell_app_launch (app,
0, 0,
NULL, NULL,
workspace, workspace,
@ -489,6 +561,8 @@ void
shell_app_open_new_window (ShellApp *app, shell_app_open_new_window (ShellApp *app,
int workspace) int workspace)
{ {
g_return_if_fail (app->entry != NULL);
/* Here we just always launch the application again, even if we know /* Here we just always launch the application again, even if we know
* it was already running. For most applications this * it was already running. For most applications this
* should have the effect of creating a new window, whether that's * should have the effect of creating a new window, whether that's
@ -497,7 +571,7 @@ shell_app_open_new_window (ShellApp *app,
* as say Pidgin. Ideally, we have the application express to us * as say Pidgin. Ideally, we have the application express to us
* that it supports an explicit new-window action. * that it supports an explicit new-window action.
*/ */
shell_app_info_launch_full (app->info, shell_app_launch (app,
0, 0,
NULL, NULL,
workspace, workspace,
@ -517,17 +591,6 @@ shell_app_get_state (ShellApp *app)
return app->state; return app->state;
} }
/**
* _shell_app_get_info:
*
* Returns: (transfer none): Associated app info
*/
ShellAppInfo *
_shell_app_get_info (ShellApp *app)
{
return app->info;
}
typedef struct { typedef struct {
ShellApp *app; ShellApp *app;
MetaWorkspace *active_workspace; MetaWorkspace *active_workspace;
@ -697,21 +760,26 @@ _shell_app_new_for_window (MetaWindow *window)
ShellApp *app; ShellApp *app;
app = g_object_new (SHELL_TYPE_APP, NULL); app = g_object_new (SHELL_TYPE_APP, NULL);
app->info = shell_app_system_create_from_window (shell_app_system_get_default (), window);
_shell_app_system_register_app (shell_app_system_get_default (), app); /* For windows, its id is simply its pointer address as a string.
* There are various other alternatives, but the address is unique
* and unchanging, which is pretty much the best we can do.
*/
app->window_id_string = g_strdup_printf ("window:%p", window);
_shell_app_add_window (app, window); _shell_app_add_window (app, window);
return app; return app;
} }
ShellApp * ShellApp *
_shell_app_new (ShellAppInfo *info) _shell_app_new (GMenuTreeEntry *info)
{ {
ShellApp *app; ShellApp *app;
app = g_object_new (SHELL_TYPE_APP, NULL); app = g_object_new (SHELL_TYPE_APP, NULL);
app->info = shell_app_info_ref (info); app->entry = gmenu_tree_item_ref (info);
_shell_app_system_register_app (shell_app_system_get_default (), app); app->name_collation_key = g_utf8_collate_key (shell_app_get_name (app), -1);
return app; return app;
} }
@ -922,6 +990,112 @@ shell_app_request_quit (ShellApp *app)
return TRUE; return TRUE;
} }
static void
_gather_pid_callback (GDesktopAppInfo *gapp,
GPid pid,
gpointer data)
{
ShellApp *app;
ShellWindowTracker *tracker;
g_return_if_fail (data != NULL);
app = SHELL_APP (data);
tracker = shell_window_tracker_get_default ();
_shell_window_tracker_add_child_process_app (tracker,
pid,
app);
}
/**
* shell_app_launch:
* @timestamp: Event timestamp, or 0 for current event timestamp
* @uris: List of uris to pass to application
* @workspace: Start on this workspace, or -1 for default
* @startup_id: (out): Returned startup notification ID, or %NULL if none
* @error: A #GError
*/
gboolean
shell_app_launch (ShellApp *app,
guint timestamp,
GList *uris,
int workspace,
char **startup_id,
GError **error)
{
GDesktopAppInfo *gapp;
GdkAppLaunchContext *context;
gboolean ret;
ShellGlobal *global;
MetaScreen *screen;
if (startup_id)
*startup_id = NULL;
if (app->entry == NULL)
{
MetaWindow *window = window_backed_app_get_window (app);
/* We can't pass URIs into a window; shouldn't hit this
* code path. If we do, fix the caller to disallow it.
*/
g_return_val_if_fail (uris == NULL, TRUE);
meta_window_activate (window, timestamp);
return TRUE;
}
global = shell_global_get ();
screen = shell_global_get_screen (global);
if (timestamp == 0)
timestamp = clutter_get_current_event_time ();
if (workspace < 0)
workspace = meta_screen_get_active_workspace_index (screen);
context = gdk_app_launch_context_new ();
gdk_app_launch_context_set_timestamp (context, timestamp);
gdk_app_launch_context_set_desktop (context, workspace);
gapp = gmenu_tree_entry_get_app_info (app->entry);
ret = g_desktop_app_info_launch_uris_as_manager (gapp, uris,
G_APP_LAUNCH_CONTEXT (context),
G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL,
_gather_pid_callback, app,
error);
g_object_unref (context);
return ret;
}
/**
* shell_app_get_app_info:
* @app: a #ShellApp
*
* Returns: (transfer none): The #GDesktopAppInfo for this app, or %NULL if backed by a window
*/
GDesktopAppInfo *
shell_app_get_app_info (ShellApp *app)
{
if (app->entry)
return gmenu_tree_entry_get_app_info (app->entry);
return NULL;
}
/**
* shell_app_get_tree_entry:
* @app: a #ShellApp
*
* Returns: (transfer none): The #GMenuTreeEntry for this app, or %NULL if backed by a window
*/
GMenuTreeEntry *
shell_app_get_tree_entry (ShellApp *app)
{
return app->entry;
}
static void static void
create_running_state (ShellApp *app) create_running_state (ShellApp *app)
{ {
@ -951,6 +1125,171 @@ unref_running_state (ShellAppRunningState *state)
g_slice_free (ShellAppRunningState, state); g_slice_free (ShellAppRunningState, state);
} }
static char *
normalize_and_casefold (const char *str)
{
char *normalized, *result;
if (str == NULL)
return NULL;
normalized = g_utf8_normalize (str, -1, G_NORMALIZE_ALL);
result = g_utf8_casefold (normalized, -1);
g_free (normalized);
return result;
}
static char *
trim_exec_line (const char *str)
{
const char *start, *end, *pos;
end = strchr (str, ' ');
if (end == NULL)
end = str + strlen (str);
start = str;
while ((pos = strchr (start, '/')) && pos < end)
start = ++pos;
return g_strndup (start, end - start);
}
static void
shell_app_init_search_data (ShellApp *app)
{
const char *name;
const char *exec;
const char *comment;
char *normalized_exec;
GDesktopAppInfo *appinfo;
appinfo = gmenu_tree_entry_get_app_info (app->entry);
name = g_app_info_get_name (G_APP_INFO (appinfo));
app->casefolded_name = normalize_and_casefold (name);
comment = g_app_info_get_description (G_APP_INFO (appinfo));
app->casefolded_description = normalize_and_casefold (comment);
exec = g_app_info_get_executable (G_APP_INFO (appinfo));
normalized_exec = normalize_and_casefold (exec);
app->casefolded_exec = trim_exec_line (normalized_exec);
g_free (normalized_exec);
}
/**
* shell_app_compare_by_name:
* @app:
* @other:
*
* Order two applications by name.
*
* Returns: -1, 0, or 1; suitable for use as a comparison function for e.g. g_slist_sort()
*/
int
shell_app_compare_by_name (ShellApp *app, ShellApp *other)
{
return strcmp (app->name_collation_key, other->name_collation_key);
}
static ShellAppSearchMatch
_shell_app_match_search_terms (ShellApp *app,
GSList *terms)
{
GSList *iter;
ShellAppSearchMatch match;
if (G_UNLIKELY (!app->casefolded_name))
shell_app_init_search_data (app);
match = MATCH_NONE;
for (iter = terms; iter; iter = iter->next)
{
ShellAppSearchMatch current_match;
const char *term = iter->data;
const char *p;
current_match = MATCH_NONE;
p = strstr (app->casefolded_name, term);
if (p == app->casefolded_name)
current_match = MATCH_PREFIX;
else if (p != NULL)
current_match = MATCH_SUBSTRING;
p = strstr (app->casefolded_exec, term);
if (p != NULL)
{
if (p == app->casefolded_exec)
current_match = (current_match == MATCH_NONE) ? MATCH_PREFIX
: MATCH_MULTIPLE_PREFIX;
else if (current_match < MATCH_PREFIX)
current_match = (current_match == MATCH_NONE) ? MATCH_SUBSTRING
: MATCH_MULTIPLE_SUBSTRING;
}
if (app->casefolded_description && current_match < MATCH_PREFIX)
{
/* Only do substring matches, as prefix matches are not meaningful
* enough for descriptions
*/
p = strstr (app->casefolded_description, term);
if (p != NULL)
current_match = (current_match == MATCH_NONE) ? MATCH_SUBSTRING
: MATCH_MULTIPLE_SUBSTRING;
}
if (current_match == MATCH_NONE)
return current_match;
if (current_match > match)
match = current_match;
}
return match;
}
void
_shell_app_do_match (ShellApp *app,
GSList *terms,
GSList **multiple_prefix_results,
GSList **prefix_results,
GSList **multiple_substring_results,
GSList **substring_results)
{
ShellAppSearchMatch match;
GAppInfo *appinfo;
g_assert (app != NULL);
/* Skip window-backed apps */
appinfo = (GAppInfo*)shell_app_get_app_info (app);
if (appinfo == NULL)
return;
/* Skip not-visible apps */
if (!g_app_info_should_show (appinfo))
return;
match = _shell_app_match_search_terms (app, terms);
switch (match)
{
case MATCH_NONE:
break;
case MATCH_MULTIPLE_PREFIX:
*multiple_prefix_results = g_slist_prepend (*multiple_prefix_results, app);
break;
case MATCH_PREFIX:
*prefix_results = g_slist_prepend (*prefix_results, app);
break;
case MATCH_MULTIPLE_SUBSTRING:
*multiple_substring_results = g_slist_prepend (*multiple_substring_results, app);
break;
case MATCH_SUBSTRING:
*substring_results = g_slist_prepend (*substring_results, app);
break;
}
}
static void static void
shell_app_init (ShellApp *self) shell_app_init (ShellApp *self)
{ {
@ -962,10 +1301,10 @@ shell_app_dispose (GObject *object)
{ {
ShellApp *app = SHELL_APP (object); ShellApp *app = SHELL_APP (object);
if (app->info) if (app->entry)
{ {
shell_app_info_unref (app->info); gmenu_tree_item_unref (app->entry);
app->info = NULL; app->entry = NULL;
} }
if (app->running_state) if (app->running_state)
@ -977,6 +1316,20 @@ shell_app_dispose (GObject *object)
G_OBJECT_CLASS(shell_app_parent_class)->dispose (object); G_OBJECT_CLASS(shell_app_parent_class)->dispose (object);
} }
static void
shell_app_finalize (GObject *object)
{
ShellApp *app = SHELL_APP (object);
g_free (app->window_id_string);
g_free (app->casefolded_name);
g_free (app->name_collation_key);
g_free (app->casefolded_description);
G_OBJECT_CLASS(shell_app_parent_class)->finalize (object);
}
static void static void
shell_app_class_init(ShellAppClass *klass) shell_app_class_init(ShellAppClass *klass)
{ {
@ -984,6 +1337,7 @@ shell_app_class_init(ShellAppClass *klass)
gobject_class->get_property = shell_app_get_property; gobject_class->get_property = shell_app_get_property;
gobject_class->dispose = shell_app_dispose; gobject_class->dispose = shell_app_dispose;
gobject_class->finalize = shell_app_finalize;
shell_app_signals[WINDOWS_CHANGED] = g_signal_new ("windows-changed", shell_app_signals[WINDOWS_CHANGED] = g_signal_new ("windows-changed",
SHELL_TYPE_APP, SHELL_TYPE_APP,

19
src/shell-app.h
View File

@ -5,6 +5,8 @@
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <gio/gio.h> #include <gio/gio.h>
#include <meta/window.h> #include <meta/window.h>
#define GMENU_I_KNOW_THIS_IS_UNSTABLE
#include <gmenu-tree.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -34,12 +36,14 @@ typedef enum {
GType shell_app_get_type (void) G_GNUC_CONST; GType shell_app_get_type (void) G_GNUC_CONST;
const char *shell_app_get_id (ShellApp *app); const char *shell_app_get_id (ShellApp *app);
GMenuTreeEntry *shell_app_get_tree_entry (ShellApp *app);
GDesktopAppInfo *shell_app_get_app_info (ShellApp *app);
ClutterActor *shell_app_create_icon_texture (ShellApp *app, float size); ClutterActor *shell_app_create_icon_texture (ShellApp *app, float size);
ClutterActor *shell_app_get_faded_icon (ShellApp *app, float size); ClutterActor *shell_app_get_faded_icon (ShellApp *app, float size);
char *shell_app_get_name (ShellApp *app); const char *shell_app_get_name (ShellApp *app);
char *shell_app_get_description (ShellApp *app); const char *shell_app_get_description (ShellApp *app);
gboolean shell_app_is_transient (ShellApp *app); gboolean shell_app_is_window_backed (ShellApp *app);
void shell_app_activate_window (ShellApp *app, MetaWindow *window, guint32 timestamp); void shell_app_activate_window (ShellApp *app, MetaWindow *window, guint32 timestamp);
@ -61,6 +65,15 @@ GSList *shell_app_get_pids (ShellApp *app);
gboolean shell_app_is_on_workspace (ShellApp *app, MetaWorkspace *workspace); gboolean shell_app_is_on_workspace (ShellApp *app, MetaWorkspace *workspace);
gboolean shell_app_launch (ShellApp *app,
guint timestamp,
GList *uris,
int workspace,
char **startup_id,
GError **error);
int shell_app_compare_by_name (ShellApp *app, ShellApp *other);
int shell_app_compare (ShellApp *app, ShellApp *other); int shell_app_compare (ShellApp *app, ShellApp *other);
G_END_DECLS G_END_DECLS

24
src/shell-window-tracker.c
View File

@ -18,7 +18,6 @@
#include <libsn/sn.h> #include <libsn/sn.h>
#include "shell-window-tracker-private.h" #include "shell-window-tracker-private.h"
#include "shell-app-system.h"
#include "shell-app-private.h" #include "shell-app-private.h"
#include "shell-global.h" #include "shell-global.h"
#include "shell-marshal.h" #include "shell-marshal.h"
@ -244,6 +243,8 @@ get_app_from_window_wmclass (MetaWindow *window)
g_free (wmclass); g_free (wmclass);
app = shell_app_system_lookup_heuristic_basename (appsys, with_desktop); app = shell_app_system_lookup_heuristic_basename (appsys, with_desktop);
if (app != NULL)
g_object_ref (app);
g_free (with_desktop); g_free (with_desktop);
return app; return app;
@ -342,17 +343,14 @@ static ShellApp *
get_app_for_window (ShellWindowTracker *monitor, get_app_for_window (ShellWindowTracker *monitor,
MetaWindow *window) MetaWindow *window)
{ {
ShellApp *result; ShellApp *result = NULL;
const char *startup_id; const char *startup_id;
if (meta_window_is_remote (window))
return shell_app_system_get_app_for_window (shell_app_system_get_default (), window);
result = NULL;
/* First, we check whether we already know about this window, /* First, we check whether we already know about this window,
* if so, just return that. * if so, just return that.
*/ */
if (meta_window_get_window_type (window) == META_WINDOW_NORMAL) if (meta_window_get_window_type (window) == META_WINDOW_NORMAL
|| meta_window_is_remote (window))
{ {
result = g_hash_table_lookup (monitor->window_to_app, window); result = g_hash_table_lookup (monitor->window_to_app, window);
if (result != NULL) if (result != NULL)
@ -362,6 +360,9 @@ get_app_for_window (ShellWindowTracker *monitor,
} }
} }
if (meta_window_is_remote (window))
return _shell_app_new_for_window (window);
/* Check if the app's WM_CLASS specifies an app; this is /* Check if the app's WM_CLASS specifies an app; this is
* canonical if it does. * canonical if it does.
*/ */
@ -389,9 +390,12 @@ get_app_for_window (ShellWindowTracker *monitor,
result = shell_startup_sequence_get_app (sequence); result = shell_startup_sequence_get_app (sequence);
if (result) if (result)
{
result = g_object_ref (result);
break; break;
} }
} }
}
/* If we didn't get a startup-notification match, see if we matched /* If we didn't get a startup-notification match, see if we matched
* any other windows in the group. * any other windows in the group.
@ -401,7 +405,7 @@ get_app_for_window (ShellWindowTracker *monitor,
/* Our last resort - we create a fake app from the window */ /* Our last resort - we create a fake app from the window */
if (result == NULL) if (result == NULL)
result = shell_app_system_get_app_for_window (shell_app_system_get_default (), window); result = _shell_app_new_for_window (window);
return result; return result;
} }
@ -855,7 +859,7 @@ shell_startup_sequence_get_id (ShellStartupSequence *sequence)
* shell_startup_sequence_get_app: * shell_startup_sequence_get_app:
* @sequence: A #ShellStartupSequence * @sequence: A #ShellStartupSequence
* *
* Returns: (transfer full): The application being launched, or %NULL if unknown. * Returns: (transfer none): The application being launched, or %NULL if unknown.
*/ */
ShellApp * ShellApp *
shell_startup_sequence_get_app (ShellStartupSequence *sequence) shell_startup_sequence_get_app (ShellStartupSequence *sequence)
@ -869,7 +873,7 @@ shell_startup_sequence_get_app (ShellStartupSequence *sequence)
return NULL; return NULL;
appsys = shell_app_system_get_default (); appsys = shell_app_system_get_default ();
app = shell_app_system_get_app_for_path (appsys, appid); app = shell_app_system_lookup_app_for_path (appsys, appid);
return app; return app;
} }