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

Update GnomeShellPlugin according to recent changes in MutterPlugin

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=621083
This commit is contained in:
Maxim Ermilov 2010-06-17 01:28:57 +04:00
parent d8f7629a4f
commit 4800a80c3a
4 changed files with 55 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/windowManager.js
View File

@ -30,18 +30,21 @@ WindowManager.prototype = {
this._destroying = []; this._destroying = [];
this._switchData = null; this._switchData = null;
this._shellwm.connect('switch-workspace', Lang.bind(this, this._switchWorkspace));
this._shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone)); this._shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
this._shellwm.connect('kill-window-effects', Lang.bind(this, function (shellwm, actor) {
this._minimizeWindowDone(shellwm, actor);
this._maximizeWindowDone(shellwm, actor);
this._unmaximizeWindowDone(shellwm, actor);
this._mapWindowDone(shellwm, actor);
this._destroyWindowDone(shellwm, actor);
}));
this._shellwm.connect('switch-workspace', Lang.bind(this, this._switchWorkspace));
this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow)); this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
this._shellwm.connect('kill-minimize', Lang.bind(this, this._minimizeWindowDone));
this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow)); this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
this._shellwm.connect('kill-maximize', Lang.bind(this, this._maximizeWindowDone));
this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow)); this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
this._shellwm.connect('kill-unmaximize', Lang.bind(this, this._unmaximizeWindowDone));
this._shellwm.connect('map', Lang.bind(this, this._mapWindow)); this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
this._shellwm.connect('kill-map', Lang.bind(this, this._mapWindowDone));
this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow)); this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
this._shellwm.connect('kill-destroy', Lang.bind(this, this._destroyWindowDone));
this._workspaceSwitcherPopup = null; this._workspaceSwitcherPopup = null;
this.setKeybindingHandler('switch_to_workspace_left', Lang.bind(this, this._showWorkspaceSwitcher)); this.setKeybindingHandler('switch_to_workspace_left', Lang.bind(this, this._showWorkspaceSwitcher));
@ -197,7 +200,7 @@ WindowManager.prototype = {
return; return;
} }
let windows = shellwm.get_switch_workspace_actors(); let windows = global.get_windows();
/* @direction is the direction that the "camera" moves, so the /* @direction is the direction that the "camera" moves, so the
* screen contents have to move one screen's worth in the * screen contents have to move one screen's worth in the

30
src/gnome-shell-plugin.c
View File

@ -78,13 +78,13 @@ static void gnome_shell_plugin_destroy (MutterPlugin *plugi
MutterWindow *actor); MutterWindow *actor);
static void gnome_shell_plugin_switch_workspace (MutterPlugin *plugin, static void gnome_shell_plugin_switch_workspace (MutterPlugin *plugin,
const GList **actors,
gint from, gint from,
gint to, gint to,
MetaMotionDirection direction); MetaMotionDirection direction);
static void gnome_shell_plugin_kill_effect (MutterPlugin *plugin,
MutterWindow *actor, static void gnome_shell_plugin_kill_window_effects (MutterPlugin *plugin,
gulong events); MutterWindow *actor);
static void gnome_shell_plugin_kill_switch_workspace (MutterPlugin *plugin);
static gboolean gnome_shell_plugin_xevent_filter (MutterPlugin *plugin, static gboolean gnome_shell_plugin_xevent_filter (MutterPlugin *plugin,
XEvent *event); XEvent *event);
@ -142,7 +142,9 @@ gnome_shell_plugin_class_init (GnomeShellPluginClass *klass)
plugin_class->destroy = gnome_shell_plugin_destroy; plugin_class->destroy = gnome_shell_plugin_destroy;
plugin_class->switch_workspace = gnome_shell_plugin_switch_workspace; plugin_class->switch_workspace = gnome_shell_plugin_switch_workspace;
plugin_class->kill_effect = gnome_shell_plugin_kill_effect;
plugin_class->kill_window_effects = gnome_shell_plugin_kill_window_effects;
plugin_class->kill_switch_workspace = gnome_shell_plugin_kill_switch_workspace;
plugin_class->xevent_filter = gnome_shell_plugin_xevent_filter; plugin_class->xevent_filter = gnome_shell_plugin_xevent_filter;
plugin_class->plugin_info = gnome_shell_plugin_plugin_info; plugin_class->plugin_info = gnome_shell_plugin_plugin_info;
@ -458,22 +460,24 @@ gnome_shell_plugin_destroy (MutterPlugin *plugin,
static void static void
gnome_shell_plugin_switch_workspace (MutterPlugin *plugin, gnome_shell_plugin_switch_workspace (MutterPlugin *plugin,
const GList **actors,
gint from, gint from,
gint to, gint to,
MetaMotionDirection direction) MetaMotionDirection direction)
{ {
_shell_wm_switch_workspace (get_shell_wm(), _shell_wm_switch_workspace (get_shell_wm(), from, to, direction);
actors, from, to, direction);
} }
static void static void
gnome_shell_plugin_kill_effect (MutterPlugin *plugin, gnome_shell_plugin_kill_window_effects (MutterPlugin *plugin,
MutterWindow *actor, MutterWindow *actor)
gulong events)
{ {
_shell_wm_kill_effect (get_shell_wm(), _shell_wm_kill_window_effects (get_shell_wm(), actor);
actor, events); }
static void
gnome_shell_plugin_kill_switch_workspace (MutterPlugin *plugin)
{
_shell_wm_kill_switch_workspace (get_shell_wm());
} }
static gboolean static gboolean

159
src/shell-wm.c
View File

@ -14,24 +14,19 @@ struct _ShellWM {
GObject parent; GObject parent;
MutterPlugin *plugin; MutterPlugin *plugin;
GList *switch_workspace_actors;
}; };
/* Signals */ /* Signals */
enum enum
{ {
MINIMIZE, MINIMIZE,
KILL_MINIMIZE,
MAXIMIZE, MAXIMIZE,
KILL_MAXIMIZE,
UNMAXIMIZE, UNMAXIMIZE,
KILL_UNMAXIMIZE,
MAP, MAP,
KILL_MAP,
DESTROY, DESTROY,
KILL_DESTROY,
SWITCH_WORKSPACE, SWITCH_WORKSPACE,
KILL_SWITCH_WORKSPACE, KILL_SWITCH_WORKSPACE,
KILL_WINDOW_EFFECTS,
KEYBINDING, KEYBINDING,
@ -40,9 +35,6 @@ enum
G_DEFINE_TYPE(ShellWM, shell_wm, G_TYPE_OBJECT); G_DEFINE_TYPE(ShellWM, shell_wm, G_TYPE_OBJECT);
static void shell_wm_set_switch_workspace_actors (ShellWM *wm,
GList *actors);
static guint shell_wm_signals [LAST_SIGNAL] = { 0 }; static guint shell_wm_signals [LAST_SIGNAL] = { 0 };
static void static void
@ -53,10 +45,6 @@ shell_wm_init (ShellWM *wm)
static void static void
shell_wm_finalize (GObject *object) shell_wm_finalize (GObject *object)
{ {
ShellWM *wm = SHELL_WM (object);
shell_wm_set_switch_workspace_actors (wm, NULL);
G_OBJECT_CLASS (shell_wm_parent_class)->finalize (object); G_OBJECT_CLASS (shell_wm_parent_class)->finalize (object);
} }
@ -76,15 +64,6 @@ shell_wm_class_init (ShellWMClass *klass)
g_cclosure_marshal_VOID__OBJECT, g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW); MUTTER_TYPE_COMP_WINDOW);
shell_wm_signals[KILL_MINIMIZE] =
g_signal_new ("kill-minimize",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW);
shell_wm_signals[MAXIMIZE] = shell_wm_signals[MAXIMIZE] =
g_signal_new ("maximize", g_signal_new ("maximize",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
@ -94,15 +73,6 @@ shell_wm_class_init (ShellWMClass *klass)
_shell_marshal_VOID__OBJECT_INT_INT_INT_INT, _shell_marshal_VOID__OBJECT_INT_INT_INT_INT,
G_TYPE_NONE, 5, G_TYPE_NONE, 5,
MUTTER_TYPE_COMP_WINDOW, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); MUTTER_TYPE_COMP_WINDOW, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
shell_wm_signals[KILL_MAXIMIZE] =
g_signal_new ("kill-maximize",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW);
shell_wm_signals[UNMAXIMIZE] = shell_wm_signals[UNMAXIMIZE] =
g_signal_new ("unmaximize", g_signal_new ("unmaximize",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
@ -112,15 +82,6 @@ shell_wm_class_init (ShellWMClass *klass)
_shell_marshal_VOID__OBJECT_INT_INT_INT_INT, _shell_marshal_VOID__OBJECT_INT_INT_INT_INT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); MUTTER_TYPE_COMP_WINDOW, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
shell_wm_signals[KILL_UNMAXIMIZE] =
g_signal_new ("kill-unmaximize",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW);
shell_wm_signals[MAP] = shell_wm_signals[MAP] =
g_signal_new ("map", g_signal_new ("map",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
@ -130,15 +91,6 @@ shell_wm_class_init (ShellWMClass *klass)
g_cclosure_marshal_VOID__OBJECT, g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW); MUTTER_TYPE_COMP_WINDOW);
shell_wm_signals[KILL_MAP] =
g_signal_new ("kill-map",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW);
shell_wm_signals[DESTROY] = shell_wm_signals[DESTROY] =
g_signal_new ("destroy", g_signal_new ("destroy",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
@ -148,15 +100,6 @@ shell_wm_class_init (ShellWMClass *klass)
g_cclosure_marshal_VOID__OBJECT, g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW); MUTTER_TYPE_COMP_WINDOW);
shell_wm_signals[KILL_DESTROY] =
g_signal_new ("kill-destroy",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW);
shell_wm_signals[SWITCH_WORKSPACE] = shell_wm_signals[SWITCH_WORKSPACE] =
g_signal_new ("switch-workspace", g_signal_new ("switch-workspace",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
@ -174,6 +117,15 @@ shell_wm_class_init (ShellWMClass *klass)
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
shell_wm_signals[KILL_WINDOW_EFFECTS] =
g_signal_new ("kill-window-effects",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
MUTTER_TYPE_COMP_WINDOW);
/** /**
* ShellWM::keybinding: * ShellWM::keybinding:
@ -204,51 +156,14 @@ shell_wm_class_init (ShellWMClass *klass)
void void
_shell_wm_switch_workspace (ShellWM *wm, _shell_wm_switch_workspace (ShellWM *wm,
const GList **actors,
gint from, gint from,
gint to, gint to,
MetaMotionDirection direction) MetaMotionDirection direction)
{ {
shell_wm_set_switch_workspace_actors (wm, (GList *)*actors);
g_signal_emit (wm, shell_wm_signals[SWITCH_WORKSPACE], 0, g_signal_emit (wm, shell_wm_signals[SWITCH_WORKSPACE], 0,
from, to, direction); from, to, direction);
} }
/**
* shell_wm_get_switch_workspace_actors:
* @wm: the #ShellWM
*
* A workaround for a missing feature in gobject-introspection. Returns
* the list of windows involved in a switch-workspace operation (which
* cannot be passed directly to the signal handler because there's no
* way to annotate the element-type of a signal parameter.)
*
* Return value: (element-type MutterWindow) (transfer full): the list
* of windows
**/
GList *
shell_wm_get_switch_workspace_actors (ShellWM *wm)
{
GList *l;
for (l = wm->switch_workspace_actors; l; l = l->next)
g_object_ref (l->data);
return g_list_copy (wm->switch_workspace_actors);
}
static void
shell_wm_set_switch_workspace_actors (ShellWM *wm, GList *actors)
{
const GList *l;
for (l = wm->switch_workspace_actors; l; l = l->next)
g_object_unref (l->data);
g_list_free (wm->switch_workspace_actors);
wm->switch_workspace_actors = g_list_copy (actors);
for (l = wm->switch_workspace_actors; l; l = l->next)
g_object_ref (l->data);
}
/** /**
* shell_wm_completed_switch_workspace: * shell_wm_completed_switch_workspace:
* @wm: the ShellWM * @wm: the ShellWM
@ -259,15 +174,7 @@ shell_wm_set_switch_workspace_actors (ShellWM *wm, GList *actors)
void void
shell_wm_completed_switch_workspace (ShellWM *wm) shell_wm_completed_switch_workspace (ShellWM *wm)
{ {
g_return_if_fail (wm->switch_workspace_actors != NULL); mutter_plugin_switch_workspace_completed (wm->plugin);
/* mutter_plugin_effect_completed() requires us to pass a window,
* though it doesn't matter *which* window in this case.
*/
mutter_plugin_effect_completed (wm->plugin,
wm->switch_workspace_actors->data,
MUTTER_PLUGIN_SWITCH_WORKSPACE);
shell_wm_set_switch_workspace_actors (wm, NULL);
} }
/** /**
@ -281,9 +188,7 @@ void
shell_wm_completed_minimize (ShellWM *wm, shell_wm_completed_minimize (ShellWM *wm,
MutterWindow *actor) MutterWindow *actor)
{ {
mutter_plugin_effect_completed (wm->plugin, mutter_plugin_minimize_completed (wm->plugin, actor);
actor,
MUTTER_PLUGIN_MINIMIZE);
} }
/** /**
@ -297,9 +202,7 @@ void
shell_wm_completed_maximize (ShellWM *wm, shell_wm_completed_maximize (ShellWM *wm,
MutterWindow *actor) MutterWindow *actor)
{ {
mutter_plugin_effect_completed (wm->plugin, mutter_plugin_maximize_completed (wm->plugin, actor);
actor,
MUTTER_PLUGIN_MAXIMIZE);
} }
/** /**
@ -313,9 +216,7 @@ void
shell_wm_completed_unmaximize (ShellWM *wm, shell_wm_completed_unmaximize (ShellWM *wm,
MutterWindow *actor) MutterWindow *actor)
{ {
mutter_plugin_effect_completed (wm->plugin, mutter_plugin_unmaximize_completed (wm->plugin, actor);
actor,
MUTTER_PLUGIN_UNMAXIMIZE);
} }
/** /**
@ -329,9 +230,7 @@ void
shell_wm_completed_map (ShellWM *wm, shell_wm_completed_map (ShellWM *wm,
MutterWindow *actor) MutterWindow *actor)
{ {
mutter_plugin_effect_completed (wm->plugin, mutter_plugin_map_completed (wm->plugin, actor);
actor,
MUTTER_PLUGIN_MAP);
} }
/** /**
@ -345,28 +244,20 @@ void
shell_wm_completed_destroy (ShellWM *wm, shell_wm_completed_destroy (ShellWM *wm,
MutterWindow *actor) MutterWindow *actor)
{ {
mutter_plugin_effect_completed (wm->plugin, mutter_plugin_destroy_completed (wm->plugin, actor);
actor,
MUTTER_PLUGIN_DESTROY);
} }
void void
_shell_wm_kill_effect (ShellWM *wm, _shell_wm_kill_switch_workspace (ShellWM *wm)
MutterWindow *actor,
gulong events)
{ {
if (events & MUTTER_PLUGIN_MINIMIZE) g_signal_emit (wm, shell_wm_signals[KILL_SWITCH_WORKSPACE], 0);
g_signal_emit (wm, shell_wm_signals[KILL_MINIMIZE], 0, actor); }
if (events & MUTTER_PLUGIN_MAXIMIZE)
g_signal_emit (wm, shell_wm_signals[KILL_MAXIMIZE], 0, actor); void
if (events & MUTTER_PLUGIN_UNMAXIMIZE) _shell_wm_kill_window_effects (ShellWM *wm,
g_signal_emit (wm, shell_wm_signals[KILL_UNMAXIMIZE], 0, actor); MutterWindow *actor)
if (events & MUTTER_PLUGIN_MAP) {
g_signal_emit (wm, shell_wm_signals[KILL_MAP], 0, actor); g_signal_emit (wm, shell_wm_signals[KILL_WINDOW_EFFECTS], 0, actor);
if (events & MUTTER_PLUGIN_DESTROY)
g_signal_emit (wm, shell_wm_signals[KILL_DESTROY], 0, actor);
if (events & MUTTER_PLUGIN_SWITCH_WORKSPACE)
g_signal_emit (wm, shell_wm_signals[KILL_SWITCH_WORKSPACE], 0);
} }

7
src/shell-wm.h
View File

@ -64,13 +64,12 @@ void _shell_wm_destroy (ShellWM *wm,
MutterWindow *actor); MutterWindow *actor);
void _shell_wm_switch_workspace (ShellWM *wm, void _shell_wm_switch_workspace (ShellWM *wm,
const GList **actors,
gint from, gint from,
gint to, gint to,
MetaMotionDirection direction); MetaMotionDirection direction);
void _shell_wm_kill_effect (ShellWM *wm, void _shell_wm_kill_window_effects (ShellWM *wm,
MutterWindow *actor, MutterWindow *actor);
gulong events); void _shell_wm_kill_switch_workspace (ShellWM *wm);
/* Keybinding stuff */ /* Keybinding stuff */
void shell_wm_takeover_keybinding (ShellWM *wm, void shell_wm_takeover_keybinding (ShellWM *wm,