mirror of
https://github.com/brl/mutter.git
synced 2025-07-23 01:51:38 +00:00
Remove Mutter namespace prefix
Move all objects and functions namespaced with Mutter into the Meta namespace to get a single consistent namespace. Changes that aren't simply changing mutter to meta: MutterWindow => MetaWindowActor mutter_get_windows => meta_get_window_actors mutter_plugin_get_windows => meta_plugin_get_window_actors https://bugzilla.gnome.org/show_bug.cgi?id=628520
This commit is contained in:
@ -11,8 +11,8 @@
|
||||
#include "compositor-mutter.h"
|
||||
#include "xprops.h"
|
||||
#include "prefs.h"
|
||||
#include "mutter-window-private.h"
|
||||
#include "mutter-window-group.h"
|
||||
#include "meta-window-actor-private.h"
|
||||
#include "meta-window-group.h"
|
||||
#include "../core/window-private.h" /* to check window->hidden */
|
||||
#include "../core/display-private.h" /* for meta_display_lookup_x_window() */
|
||||
#include <X11/extensions/shape.h>
|
||||
@ -36,13 +36,13 @@ composite_at_least_version (MetaDisplay *display, int maj, int min)
|
||||
static void sync_actor_stacking (GList *windows);
|
||||
|
||||
static void
|
||||
mutter_finish_workspace_switch (MetaCompScreen *info)
|
||||
meta_finish_workspace_switch (MetaCompScreen *info)
|
||||
{
|
||||
GList *l;
|
||||
|
||||
/* Finish hiding and showing actors for the new workspace */
|
||||
for (l = info->windows; l; l = l->next)
|
||||
mutter_window_sync_visibility (l->data);
|
||||
meta_window_actor_sync_visibility (l->data);
|
||||
|
||||
/*
|
||||
* Fix up stacking order in case the plugin messed it up.
|
||||
@ -54,7 +54,7 @@ mutter_finish_workspace_switch (MetaCompScreen *info)
|
||||
}
|
||||
|
||||
void
|
||||
mutter_switch_workspace_completed (MetaScreen *screen)
|
||||
meta_switch_workspace_completed (MetaScreen *screen)
|
||||
{
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
|
||||
@ -67,7 +67,7 @@ mutter_switch_workspace_completed (MetaScreen *screen)
|
||||
}
|
||||
|
||||
if (!info->switch_workspace_in_progress)
|
||||
mutter_finish_workspace_switch (info);
|
||||
meta_finish_workspace_switch (info);
|
||||
}
|
||||
|
||||
void
|
||||
@ -84,7 +84,7 @@ add_win (MetaWindow *window)
|
||||
|
||||
g_return_if_fail (info != NULL);
|
||||
|
||||
mutter_window_new (window);
|
||||
meta_window_actor_new (window);
|
||||
|
||||
sync_actor_stacking (info->windows);
|
||||
}
|
||||
@ -94,16 +94,16 @@ process_damage (MetaCompositor *compositor,
|
||||
XDamageNotifyEvent *event,
|
||||
MetaWindow *window)
|
||||
{
|
||||
MutterWindow *cw;
|
||||
MetaWindowActor *window_actor;
|
||||
|
||||
if (window == NULL)
|
||||
return;
|
||||
|
||||
cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
if (cw == NULL)
|
||||
window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
if (window_actor == NULL)
|
||||
return;
|
||||
|
||||
mutter_window_process_damage (cw, event);
|
||||
meta_window_actor_process_damage (window_actor, event);
|
||||
}
|
||||
|
||||
#ifdef HAVE_SHAPE
|
||||
@ -112,18 +112,18 @@ process_shape (MetaCompositor *compositor,
|
||||
XShapeEvent *event,
|
||||
MetaWindow *window)
|
||||
{
|
||||
MutterWindow *cw;
|
||||
MetaWindowActor *window_actor;
|
||||
|
||||
if (window == NULL)
|
||||
return;
|
||||
|
||||
cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
if (cw == NULL)
|
||||
window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
if (window_actor == NULL)
|
||||
return;
|
||||
|
||||
if (event->kind == ShapeBounding)
|
||||
{
|
||||
mutter_window_update_shape (cw, event->shaped);
|
||||
meta_window_actor_update_shape (window_actor, event->shaped);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -133,19 +133,19 @@ process_property_notify (MetaCompositor *compositor,
|
||||
XPropertyEvent *event,
|
||||
MetaWindow *window)
|
||||
{
|
||||
MutterWindow *cw;
|
||||
MetaWindowActor *window_actor;
|
||||
|
||||
if (window == NULL)
|
||||
return;
|
||||
|
||||
cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
if (cw == NULL)
|
||||
window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
if (window_actor == NULL)
|
||||
return;
|
||||
|
||||
/* Check for the opacity changing */
|
||||
if (event->atom == compositor->atom_net_wm_window_opacity)
|
||||
{
|
||||
mutter_window_update_opacity (cw);
|
||||
meta_window_actor_update_opacity (window_actor);
|
||||
DEBUG_TRACE ("process_property_notify: net_wm_window_opacity\n");
|
||||
return;
|
||||
}
|
||||
@ -185,13 +185,13 @@ get_output_window (MetaScreen *screen)
|
||||
}
|
||||
|
||||
/**
|
||||
* mutter_get_stage_for_screen:
|
||||
* meta_get_stage_for_screen:
|
||||
* @screen: a #MetaScreen
|
||||
*
|
||||
* Returns: (transfer none): The #ClutterStage for the screen
|
||||
*/
|
||||
ClutterActor *
|
||||
mutter_get_stage_for_screen (MetaScreen *screen)
|
||||
meta_get_stage_for_screen (MetaScreen *screen)
|
||||
{
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
|
||||
@ -202,13 +202,13 @@ mutter_get_stage_for_screen (MetaScreen *screen)
|
||||
}
|
||||
|
||||
/**
|
||||
* mutter_get_overlay_group_for_screen:
|
||||
* meta_get_overlay_group_for_screen:
|
||||
* @screen: a #MetaScreen
|
||||
*
|
||||
* Returns: (transfer none): The overlay group corresponding to @screen
|
||||
*/
|
||||
ClutterActor *
|
||||
mutter_get_overlay_group_for_screen (MetaScreen *screen)
|
||||
meta_get_overlay_group_for_screen (MetaScreen *screen)
|
||||
{
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
|
||||
@ -219,13 +219,13 @@ mutter_get_overlay_group_for_screen (MetaScreen *screen)
|
||||
}
|
||||
|
||||
/**
|
||||
* mutter_get_window_group_for_screen:
|
||||
* meta_get_window_group_for_screen:
|
||||
* @screen: a #MetaScreen
|
||||
*
|
||||
* Returns: (transfer none): The window group corresponding to @screen
|
||||
*/
|
||||
ClutterActor *
|
||||
mutter_get_window_group_for_screen (MetaScreen *screen)
|
||||
meta_get_window_group_for_screen (MetaScreen *screen)
|
||||
{
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
|
||||
@ -236,13 +236,13 @@ mutter_get_window_group_for_screen (MetaScreen *screen)
|
||||
}
|
||||
|
||||
/**
|
||||
* mutter_get_windows:
|
||||
* meta_get_window_actors:
|
||||
* @screen: a #MetaScreen
|
||||
*
|
||||
* Returns: (transfer none) (element-type Clutter.Actor): The windows on @screen
|
||||
* Returns: (transfer none) (element-type Clutter.Actor): The set of #MetaWindowActor on @screen
|
||||
*/
|
||||
GList *
|
||||
mutter_get_windows (MetaScreen *screen)
|
||||
meta_get_window_actors (MetaScreen *screen)
|
||||
{
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
|
||||
@ -253,7 +253,7 @@ mutter_get_windows (MetaScreen *screen)
|
||||
}
|
||||
|
||||
static void
|
||||
do_set_stage_input_region (MetaScreen *screen,
|
||||
do_set_stage_input_region (MetaScreen *screen,
|
||||
XserverRegion region)
|
||||
{
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
@ -266,8 +266,8 @@ do_set_stage_input_region (MetaScreen *screen,
|
||||
}
|
||||
|
||||
void
|
||||
mutter_set_stage_input_region (MetaScreen *screen,
|
||||
XserverRegion region)
|
||||
meta_set_stage_input_region (MetaScreen *screen,
|
||||
XserverRegion region)
|
||||
{
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
MetaDisplay *display = meta_screen_get_display (screen);
|
||||
@ -295,7 +295,7 @@ mutter_set_stage_input_region (MetaScreen *screen,
|
||||
}
|
||||
|
||||
void
|
||||
mutter_empty_stage_input_region (MetaScreen *screen)
|
||||
meta_empty_stage_input_region (MetaScreen *screen)
|
||||
{
|
||||
/* Using a static region here is a bit hacky, but Metacity never opens more than
|
||||
* one XDisplay, so it works fine. */
|
||||
@ -308,16 +308,16 @@ mutter_empty_stage_input_region (MetaScreen *screen)
|
||||
region = XFixesCreateRegion (xdpy, NULL, 0);
|
||||
}
|
||||
|
||||
mutter_set_stage_input_region (screen, region);
|
||||
meta_set_stage_input_region (screen, region);
|
||||
}
|
||||
|
||||
gboolean
|
||||
mutter_begin_modal_for_plugin (MetaScreen *screen,
|
||||
MutterPlugin *plugin,
|
||||
Window grab_window,
|
||||
Cursor cursor,
|
||||
MetaModalOptions options,
|
||||
guint32 timestamp)
|
||||
meta_begin_modal_for_plugin (MetaScreen *screen,
|
||||
MetaPlugin *plugin,
|
||||
Window grab_window,
|
||||
Cursor cursor,
|
||||
MetaModalOptions options,
|
||||
guint32 timestamp)
|
||||
{
|
||||
/* To some extent this duplicates code in meta_display_begin_grab_op(), but there
|
||||
* are significant differences in how we handle grabs that make it difficult to
|
||||
@ -382,9 +382,9 @@ mutter_begin_modal_for_plugin (MetaScreen *screen,
|
||||
}
|
||||
|
||||
void
|
||||
mutter_end_modal_for_plugin (MetaScreen *screen,
|
||||
MutterPlugin *plugin,
|
||||
guint32 timestamp)
|
||||
meta_end_modal_for_plugin (MetaScreen *screen,
|
||||
MetaPlugin *plugin,
|
||||
guint32 timestamp)
|
||||
{
|
||||
MetaDisplay *display = meta_screen_get_display (screen);
|
||||
Display *xdpy = meta_display_get_xdisplay (display);
|
||||
@ -408,15 +408,15 @@ mutter_end_modal_for_plugin (MetaScreen *screen,
|
||||
* a left-over modal grab for this screen.
|
||||
*/
|
||||
void
|
||||
mutter_check_end_modal (MetaScreen *screen)
|
||||
meta_check_end_modal (MetaScreen *screen)
|
||||
{
|
||||
MetaDisplay *display = meta_screen_get_display (screen);
|
||||
MetaCompositor *compositor = display->compositor;
|
||||
|
||||
if (compositor->modal_plugin &&
|
||||
mutter_plugin_get_screen (compositor->modal_plugin) == screen)
|
||||
meta_plugin_get_screen (compositor->modal_plugin) == screen)
|
||||
{
|
||||
mutter_end_modal_for_plugin (screen,
|
||||
meta_end_modal_for_plugin (screen,
|
||||
compositor->modal_plugin,
|
||||
CurrentTime);
|
||||
}
|
||||
@ -492,7 +492,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
|
||||
|
||||
XSelectInput (xdisplay, xwin, event_mask);
|
||||
|
||||
info->window_group = mutter_window_group_new (screen);
|
||||
info->window_group = meta_window_group_new (screen);
|
||||
info->overlay_group = clutter_group_new ();
|
||||
info->hidden_group = clutter_group_new ();
|
||||
|
||||
@ -505,18 +505,18 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
|
||||
clutter_actor_hide (info->hidden_group);
|
||||
|
||||
info->plugin_mgr =
|
||||
mutter_plugin_manager_get (screen);
|
||||
meta_plugin_manager_get (screen);
|
||||
|
||||
if (info->plugin_mgr != mutter_plugin_manager_get_default ())
|
||||
if (info->plugin_mgr != meta_plugin_manager_get_default ())
|
||||
{
|
||||
/* The default plugin manager has been initialized during
|
||||
* global preferences load.
|
||||
*/
|
||||
if (!mutter_plugin_manager_load (info->plugin_mgr))
|
||||
if (!meta_plugin_manager_load (info->plugin_mgr))
|
||||
g_critical ("failed to load plugins");
|
||||
}
|
||||
|
||||
if (!mutter_plugin_manager_initialize (info->plugin_mgr))
|
||||
if (!meta_plugin_manager_initialize (info->plugin_mgr))
|
||||
g_critical ("failed to initialize plugins");
|
||||
|
||||
/*
|
||||
@ -575,14 +575,14 @@ void
|
||||
meta_compositor_remove_window (MetaCompositor *compositor,
|
||||
MetaWindow *window)
|
||||
{
|
||||
MutterWindow *cw = NULL;
|
||||
MetaWindowActor *window_actor = NULL;
|
||||
|
||||
DEBUG_TRACE ("meta_compositor_remove_window\n");
|
||||
cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
if (!cw)
|
||||
window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
if (!window_actor)
|
||||
return;
|
||||
|
||||
mutter_window_destroy (cw);
|
||||
meta_window_actor_destroy (window_actor);
|
||||
}
|
||||
|
||||
void
|
||||
@ -620,7 +620,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
|
||||
{
|
||||
if (compositor->modal_plugin && is_grabbed_event (event))
|
||||
{
|
||||
MutterPluginClass *klass = MUTTER_PLUGIN_GET_CLASS (compositor->modal_plugin);
|
||||
MetaPluginClass *klass = META_PLUGIN_GET_CLASS (compositor->modal_plugin);
|
||||
|
||||
if (klass->xevent_filter)
|
||||
klass->xevent_filter (compositor->modal_plugin, event);
|
||||
@ -638,7 +638,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
|
||||
screen = meta_window_get_screen (window);
|
||||
info = meta_screen_get_compositor_data (screen);
|
||||
|
||||
if (mutter_plugin_manager_xevent_filter (info->plugin_mgr, event))
|
||||
if (meta_plugin_manager_xevent_filter (info->plugin_mgr, event))
|
||||
{
|
||||
DEBUG_TRACE ("meta_compositor_process_event (filtered,window==NULL)\n");
|
||||
return TRUE;
|
||||
@ -657,7 +657,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
|
||||
|
||||
info = meta_screen_get_compositor_data (screen);
|
||||
|
||||
if (mutter_plugin_manager_xevent_filter (info->plugin_mgr, event))
|
||||
if (meta_plugin_manager_xevent_filter (info->plugin_mgr, event))
|
||||
{
|
||||
DEBUG_TRACE ("meta_compositor_process_event (filtered,window==NULL)\n");
|
||||
return TRUE;
|
||||
@ -715,12 +715,12 @@ meta_compositor_show_window (MetaCompositor *compositor,
|
||||
MetaWindow *window,
|
||||
MetaCompEffect effect)
|
||||
{
|
||||
MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
DEBUG_TRACE ("meta_compositor_show_window\n");
|
||||
if (!cw)
|
||||
if (!window_actor)
|
||||
return;
|
||||
|
||||
mutter_window_show (cw, effect);
|
||||
meta_window_actor_show (window_actor, effect);
|
||||
}
|
||||
|
||||
void
|
||||
@ -728,12 +728,12 @@ meta_compositor_hide_window (MetaCompositor *compositor,
|
||||
MetaWindow *window,
|
||||
MetaCompEffect effect)
|
||||
{
|
||||
MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
DEBUG_TRACE ("meta_compositor_hide_window\n");
|
||||
if (!cw)
|
||||
if (!window_actor)
|
||||
return;
|
||||
|
||||
mutter_window_hide (cw, effect);
|
||||
meta_window_actor_hide (window_actor, effect);
|
||||
}
|
||||
|
||||
void
|
||||
@ -742,12 +742,12 @@ meta_compositor_maximize_window (MetaCompositor *compositor,
|
||||
MetaRectangle *old_rect,
|
||||
MetaRectangle *new_rect)
|
||||
{
|
||||
MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
DEBUG_TRACE ("meta_compositor_maximize_window\n");
|
||||
if (!cw)
|
||||
if (!window_actor)
|
||||
return;
|
||||
|
||||
mutter_window_maximize (cw, old_rect, new_rect);
|
||||
meta_window_actor_maximize (window_actor, old_rect, new_rect);
|
||||
}
|
||||
|
||||
void
|
||||
@ -756,12 +756,12 @@ meta_compositor_unmaximize_window (MetaCompositor *compositor,
|
||||
MetaRectangle *old_rect,
|
||||
MetaRectangle *new_rect)
|
||||
{
|
||||
MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
DEBUG_TRACE ("meta_compositor_unmaximize_window\n");
|
||||
if (!cw)
|
||||
if (!window_actor)
|
||||
return;
|
||||
|
||||
mutter_window_unmaximize (cw, old_rect, new_rect);
|
||||
meta_window_actor_unmaximize (window_actor, old_rect, new_rect);
|
||||
}
|
||||
|
||||
void
|
||||
@ -774,7 +774,7 @@ meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
|
||||
*/
|
||||
MetaScreen *screen = meta_workspace_get_screen (workspace);
|
||||
MetaCompScreen *info;
|
||||
MutterPluginManager *mgr;
|
||||
MetaPluginManager *mgr;
|
||||
|
||||
DEBUG_TRACE ("meta_compositor_update_workspace_geometry\n");
|
||||
info = meta_screen_get_compositor_data (screen);
|
||||
@ -783,7 +783,7 @@ meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
|
||||
if (!mgr || !workspace)
|
||||
return;
|
||||
|
||||
mutter_plugin_manager_update_workspace (mgr, workspace);
|
||||
meta_plugin_manager_update_workspace (mgr, workspace);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -809,7 +809,7 @@ meta_compositor_switch_workspace (MetaCompositor *compositor,
|
||||
info->switch_workspace_in_progress++;
|
||||
|
||||
if (!info->plugin_mgr ||
|
||||
!mutter_plugin_manager_switch_workspace (info->plugin_mgr,
|
||||
!meta_plugin_manager_switch_workspace (info->plugin_mgr,
|
||||
from_indx,
|
||||
to_indx,
|
||||
direction))
|
||||
@ -821,7 +821,7 @@ meta_compositor_switch_workspace (MetaCompositor *compositor,
|
||||
* necessarily change during the window hiding/unhiding, only their
|
||||
* relative position toward the destkop window.
|
||||
*/
|
||||
mutter_finish_workspace_switch (info);
|
||||
meta_finish_workspace_switch (info);
|
||||
}
|
||||
}
|
||||
|
||||
@ -834,9 +834,9 @@ sync_actor_stacking (GList *windows)
|
||||
|
||||
for (tmp = g_list_last (windows); tmp != NULL; tmp = tmp->prev)
|
||||
{
|
||||
MutterWindow *cw = tmp->data;
|
||||
MetaWindowActor *window_actor = tmp->data;
|
||||
|
||||
clutter_actor_lower_bottom (CLUTTER_ACTOR (cw));
|
||||
clutter_actor_lower_bottom (CLUTTER_ACTOR (window_actor));
|
||||
}
|
||||
}
|
||||
|
||||
@ -858,12 +858,12 @@ meta_compositor_sync_stack (MetaCompositor *compositor,
|
||||
|
||||
/* Sources: first window is the highest */
|
||||
stack = g_list_copy (stack); /* The new stack of MetaWindow */
|
||||
old_stack = g_list_reverse (info->windows); /* The old stack of MutterWindow */
|
||||
old_stack = g_list_reverse (info->windows); /* The old stack of MetaWindowActor */
|
||||
info->windows = NULL;
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
MutterWindow *old_actor = NULL, *stack_actor = NULL, *actor;
|
||||
MetaWindowActor *old_actor = NULL, *stack_actor = NULL, *actor;
|
||||
MetaWindow *old_window = NULL, *stack_window = NULL, *window;
|
||||
|
||||
/* Find the remaining top actor in our existing stack (ignoring
|
||||
@ -871,10 +871,10 @@ meta_compositor_sync_stack (MetaCompositor *compositor,
|
||||
while (old_stack)
|
||||
{
|
||||
old_actor = old_stack->data;
|
||||
old_window = mutter_window_get_meta_window (old_actor);
|
||||
old_window = meta_window_actor_get_meta_window (old_actor);
|
||||
|
||||
if (old_window->hidden &&
|
||||
!mutter_window_effect_in_progress (old_actor))
|
||||
!meta_window_actor_effect_in_progress (old_actor))
|
||||
old_stack = g_list_delete_link (old_stack, old_stack);
|
||||
else
|
||||
break;
|
||||
@ -884,10 +884,10 @@ meta_compositor_sync_stack (MetaCompositor *compositor,
|
||||
while (stack)
|
||||
{
|
||||
stack_window = stack->data;
|
||||
stack_actor = MUTTER_WINDOW (meta_window_get_compositor_private (stack_window));
|
||||
stack_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (stack_window));
|
||||
if (!stack_actor)
|
||||
{
|
||||
meta_verbose ("Failed to find corresponding MutterWindow "
|
||||
meta_verbose ("Failed to find corresponding MetaWindowActor "
|
||||
"for window %s\n", meta_window_get_description (stack_window));
|
||||
stack = g_list_delete_link (stack, stack);
|
||||
}
|
||||
@ -933,41 +933,41 @@ void
|
||||
meta_compositor_window_mapped (MetaCompositor *compositor,
|
||||
MetaWindow *window)
|
||||
{
|
||||
MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
DEBUG_TRACE ("meta_compositor_window_mapped\n");
|
||||
if (!cw)
|
||||
if (!window_actor)
|
||||
return;
|
||||
|
||||
mutter_window_mapped (cw);
|
||||
meta_window_actor_mapped (window_actor);
|
||||
}
|
||||
|
||||
void
|
||||
meta_compositor_window_unmapped (MetaCompositor *compositor,
|
||||
MetaWindow *window)
|
||||
{
|
||||
MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
DEBUG_TRACE ("meta_compositor_window_unmapped\n");
|
||||
if (!cw)
|
||||
if (!window_actor)
|
||||
return;
|
||||
|
||||
mutter_window_unmapped (cw);
|
||||
meta_window_actor_unmapped (window_actor);
|
||||
}
|
||||
|
||||
void
|
||||
meta_compositor_sync_window_geometry (MetaCompositor *compositor,
|
||||
MetaWindow *window)
|
||||
{
|
||||
MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
|
||||
MetaScreen *screen = meta_window_get_screen (window);
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
|
||||
MetaScreen *screen = meta_window_get_screen (window);
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
|
||||
DEBUG_TRACE ("meta_compositor_sync_window_geometry\n");
|
||||
g_return_if_fail (info);
|
||||
|
||||
if (!cw)
|
||||
if (!window_actor)
|
||||
return;
|
||||
|
||||
mutter_window_sync_actor_position (cw);
|
||||
meta_window_actor_sync_actor_position (window_actor);
|
||||
}
|
||||
|
||||
void
|
||||
@ -994,11 +994,11 @@ pre_paint_windows (MetaCompScreen *info)
|
||||
GList *l;
|
||||
|
||||
for (l = info->windows; l; l = l->next)
|
||||
mutter_window_pre_paint (l->data);
|
||||
meta_window_actor_pre_paint (l->data);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
mutter_repaint_func (gpointer data)
|
||||
meta_repaint_func (gpointer data)
|
||||
{
|
||||
MetaCompositor *compositor = data;
|
||||
GSList *screens = meta_display_get_screens (compositor->display);
|
||||
@ -1040,7 +1040,7 @@ meta_compositor_new (MetaDisplay *display)
|
||||
|
||||
compositor->display = display;
|
||||
|
||||
if (g_getenv("MUTTER_DISABLE_MIPMAPS"))
|
||||
if (g_getenv("META_DISABLE_MIPMAPS"))
|
||||
compositor->no_mipmaps = TRUE;
|
||||
|
||||
meta_verbose ("Creating %d atoms\n", (int) G_N_ELEMENTS (atom_names));
|
||||
@ -1051,7 +1051,7 @@ meta_compositor_new (MetaDisplay *display)
|
||||
compositor->atom_x_set_root = atoms[1];
|
||||
compositor->atom_net_wm_window_opacity = atoms[2];
|
||||
|
||||
compositor->repaint_func_id = clutter_threads_add_repaint_func (mutter_repaint_func,
|
||||
compositor->repaint_func_id = clutter_threads_add_repaint_func (meta_repaint_func,
|
||||
compositor,
|
||||
NULL);
|
||||
|
||||
@ -1059,11 +1059,11 @@ meta_compositor_new (MetaDisplay *display)
|
||||
}
|
||||
|
||||
/**
|
||||
* mutter_get_overlay_window: (skip)
|
||||
* meta_get_overlay_window: (skip)
|
||||
*
|
||||
*/
|
||||
Window
|
||||
mutter_get_overlay_window (MetaScreen *screen)
|
||||
meta_get_overlay_window (MetaScreen *screen)
|
||||
{
|
||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||
|
||||
|
Reference in New Issue
Block a user