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

Add finer-grained signals to ShellAppMonitor, update appDisplay

Browse Source
This commit is contained in:
Dan Winship 2009-08-12 16:05:25 -04:00
parent f7d85e618c
commit 15a3f39f65
4 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/ui/appDisplay.js
View File

@ -193,7 +193,10 @@ AppDisplay.prototype = {
this._appSystem.connect('favorites-changed', Lang.bind(this, function(appSys) { this._appSystem.connect('favorites-changed', Lang.bind(this, function(appSys) {
this._redisplay(false); this._redisplay(false);
})); }));
this._appMonitor.connect('changed', Lang.bind(this, function(monitor) { this._appMonitor.connect('app-added', Lang.bind(this, function(monitor) {
this._redisplay(false);
}));
this._appMonitor.connect('app-removed', Lang.bind(this, function(monitor) {
this._redisplay(false); this._redisplay(false);
})); }));
@ -761,7 +764,10 @@ AppWell.prototype = {
this._appSystem.connect('favorites-changed', Lang.bind(this, function(appSys) { this._appSystem.connect('favorites-changed', Lang.bind(this, function(appSys) {
this._redisplay(); this._redisplay();
})); }));
this._appMonitor.connect('changed', Lang.bind(this, function(monitor) { this._appMonitor.connect('app-added', Lang.bind(this, function(monitor) {
this._redisplay();
}));
this._appMonitor.connect('app-removed', Lang.bind(this, function(monitor) {
this._redisplay(); this._redisplay();
})); }));

53
src/shell-app-monitor.c
View File

@ -18,6 +18,7 @@
#include "shell-app-monitor.h" #include "shell-app-monitor.h"
#include "shell-app-system.h" #include "shell-app-system.h"
#include "shell-global.h" #include "shell-global.h"
#include "shell-marshal.h"
#include "display.h" #include "display.h"
#include "window.h" #include "window.h"
@ -154,7 +155,10 @@ struct AppUsage
}; };
enum { enum {
CHANGED, APP_ADDED,
APP_REMOVED,
WINDOW_ADDED,
WINDOW_REMOVED,
STARTUP_SEQUENCE_CHANGED, STARTUP_SEQUENCE_CHANGED,
LAST_SIGNAL LAST_SIGNAL
@ -196,13 +200,41 @@ static void shell_app_monitor_class_init(ShellAppMonitorClass *klass)
gobject_class->finalize = shell_app_monitor_finalize; gobject_class->finalize = shell_app_monitor_finalize;
signals[CHANGED] = g_signal_new ("changed", signals[APP_ADDED] = g_signal_new ("app-added",
SHELL_TYPE_APP_MONITOR, SHELL_TYPE_APP_MONITOR,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
0, 0,
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, _shell_marshal_VOID__BOXED,
G_TYPE_NONE, 0); G_TYPE_NONE, 1,
SHELL_TYPE_APP_INFO);
signals[APP_REMOVED] = g_signal_new ("app-removed",
SHELL_TYPE_APP_MONITOR,
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
_shell_marshal_VOID__BOXED,
G_TYPE_NONE, 1,
SHELL_TYPE_APP_INFO);
signals[WINDOW_ADDED] = g_signal_new ("window-added",
SHELL_TYPE_APP_MONITOR,
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
_shell_marshal_VOID__BOXED_OBJECT,
G_TYPE_NONE, 2,
SHELL_TYPE_APP_INFO,
META_TYPE_WINDOW);
signals[WINDOW_REMOVED] = g_signal_new ("window-removed",
SHELL_TYPE_APP_MONITOR,
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
_shell_marshal_VOID__BOXED_OBJECT,
G_TYPE_NONE, 2,
SHELL_TYPE_APP_INFO,
META_TYPE_WINDOW);
signals[STARTUP_SEQUENCE_CHANGED] = g_signal_new ("startup-sequence-changed", signals[STARTUP_SEQUENCE_CHANGED] = g_signal_new ("startup-sequence-changed",
SHELL_TYPE_APP_MONITOR, SHELL_TYPE_APP_MONITOR,
@ -526,15 +558,18 @@ track_window (ShellAppMonitor *self,
usage = get_app_usage_from_window (self, window); usage = get_app_usage_from_window (self, window);
/* Ephemerally keep track of the number of windows open for this app, /* Keep track of the number of windows open for this app, when it
* when it switches between 0 and 1 we emit a changed signal. * switches between 0 and 1 we emit an app-added signal.
*/ */
usage->window_count++; usage->window_count++;
if (usage->initially_seen_sequence == 0) if (usage->initially_seen_sequence == 0)
usage->initially_seen_sequence = ++self->initially_seen_sequence; usage->initially_seen_sequence = ++self->initially_seen_sequence;
usage->last_seen = get_time (); usage->last_seen = get_time ();
if (usage->window_count == 1) if (usage->window_count == 1)
g_signal_emit (self, signals[CHANGED], 0); g_signal_emit (self, signals[APP_ADDED], 0, app);
/* Emit window-added after app-added */
g_signal_emit (self, signals[WINDOW_ADDED], 0, app, window);
} }
static void static void
@ -569,10 +604,12 @@ shell_app_monitor_on_window_removed (MetaWorkspace *workspace,
/* Remove before emitting */ /* Remove before emitting */
g_hash_table_remove (self->window_to_app, window); g_hash_table_remove (self->window_to_app, window);
g_signal_emit (self, signals[WINDOW_REMOVED], 0, app, window);
if (usage->window_count == 0) if (usage->window_count == 0)
{ {
usage->initially_seen_sequence = 0; usage->initially_seen_sequence = 0;
g_signal_emit (self, signals[CHANGED], 0); g_signal_emit (self, signals[APP_REMOVED], 0);
} }
} }

2
src/shell-app-monitor.h
View File

@ -30,8 +30,6 @@ struct _ShellAppMonitorClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
void (*apps_changed)(ShellAppMonitor *menuwrapper,
gpointer data);
}; };
GType shell_app_monitor_get_type (void) G_GNUC_CONST; GType shell_app_monitor_get_type (void) G_GNUC_CONST;

2
src/shell-marshal.list
View File

@ -1,2 +1,4 @@
VOID:INT,INT,INT VOID:INT,INT,INT
VOID:OBJECT,INT,INT,INT,INT VOID:OBJECT,INT,INT,INT,INT
VOID:BOXED
VOID:BOXED,OBJECT