mirror of
https://github.com/brl/mutter.git
synced 2025-07-05 10:31:18 +00:00
Comprehensively rename to Mutter
Code: All references in the code not related to themes, keybindings, or GConf were changed from 'metacity' to 'mutter'. This includes, among other things, strings, comments, the atoms used in the message protocol, and the envvars used for debugging. The GConf schema file was reduced to the 3 settings new to mutter. The overall version was brought up to 2.27 to match current gnome. Structure: All files named '*metacity*' were renamed '*mutter*' with appropriate changes in the automake system. Files removed are doc/creating_themes, src/themes, doc/metacity-theme.dtd, metacity.doap. These files will eventually end up in an external gnome-wm-data module. Installation location: On the filesystem the mutter-plugindir was change from $(libdir)/metacity/plugins/clutter to just $(libdir)/mutter/plugins. The mutter-plugins.pc.in reflects these changes. Note: mutter.desktop.in and mutter-wm.desktop both continue to have X-GNOME-WMSettingsModule=metacity set. This allows gnome-control-center to continue using libmetacity.so for configuration. This is fine since most the general keybindings and wm settings are being read from /apps/metacity/* in gconf.
This commit is contained in:

committed by
Owen W. Taylor

parent
9127993d84
commit
51a6467968
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X managed windows */
|
||||
/* Mutter X managed windows */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington, Anders Carlsson
|
||||
@ -1419,7 +1419,7 @@ set_wm_state (MetaWindow *window,
|
||||
meta_verbose ("Setting wm state %s on %s\n",
|
||||
wm_state_to_string (state), window->desc);
|
||||
|
||||
/* Metacity doesn't use icon windows, so data[1] should be None
|
||||
/* Mutter doesn't use icon windows, so data[1] should be None
|
||||
* according to the ICCCM 2.0 Section 4.1.3.1.
|
||||
*/
|
||||
data[0] = state;
|
||||
@ -1987,9 +1987,9 @@ meta_window_queue (MetaWindow *window, guint queuebits)
|
||||
|
||||
const gint window_queue_idle_priority[NUMBER_OF_QUEUES] =
|
||||
{
|
||||
G_PRIORITY_DEFAULT_IDLE, /* CALC_SHOWING */
|
||||
META_PRIORITY_RESIZE, /* MOVE_RESIZE */
|
||||
G_PRIORITY_DEFAULT_IDLE /* UPDATE_ICON */
|
||||
META_PRIORITY_BEFORE_REDRAW, /* CALC_SHOWING */
|
||||
META_PRIORITY_RESIZE, /* MOVE_RESIZE */
|
||||
META_PRIORITY_BEFORE_REDRAW /* UPDATE_ICON */
|
||||
};
|
||||
|
||||
const GSourceFunc window_queue_idle_handler[NUMBER_OF_QUEUES] =
|
||||
@ -3332,7 +3332,7 @@ window_activate (MetaWindow *window,
|
||||
}
|
||||
|
||||
/* This function exists since most of the functionality in window_activate
|
||||
* is useful for Metacity, but Metacity shouldn't need to specify a client
|
||||
* is useful for Mutter, but Mutter shouldn't need to specify a client
|
||||
* type for itself. ;-)
|
||||
*/
|
||||
void
|
||||
@ -3863,10 +3863,10 @@ meta_window_move_resize_internal (MetaWindow *window,
|
||||
need_configure_notify = TRUE;
|
||||
|
||||
/* MapRequest events with a PPosition or UPosition hint with a frame
|
||||
* are moved by metacity without resizing; send a configure notify
|
||||
* are moved by mutter without resizing; send a configure notify
|
||||
* in such cases. See #322840. (Note that window->constructing is
|
||||
* only true iff this call is due to a MapRequest, and when
|
||||
* PPosition/UPosition hints aren't set, metacity seems to send a
|
||||
* PPosition/UPosition hints aren't set, mutter seems to send a
|
||||
* ConfigureNotify anyway due to the above code.)
|
||||
*/
|
||||
if (window->constructing && window->frame &&
|
||||
@ -5707,7 +5707,7 @@ meta_window_notify_focus (MetaWindow *window,
|
||||
*
|
||||
* My suggestion is to change it so that we clearly separate
|
||||
* actual keyboard focus tracking using the xterm algorithm,
|
||||
* and metacity's "pretend" focus window, and go through all
|
||||
* and mutter's "pretend" focus window, and go through all
|
||||
* the code and decide which one should be used in each place;
|
||||
* a hard bit is deciding on a policy for that.
|
||||
*
|
||||
@ -6577,8 +6577,8 @@ set_allowed_actions_hint (MetaWindow *window)
|
||||
data[i] = window->display->atom__NET_WM_ACTION_SHADE;
|
||||
++i;
|
||||
}
|
||||
/* sticky according to EWMH is different from metacity's sticky;
|
||||
* metacity doesn't support EWMH sticky
|
||||
/* sticky according to EWMH is different from mutter's sticky;
|
||||
* mutter doesn't support EWMH sticky
|
||||
*/
|
||||
if (window->has_maximize_func)
|
||||
{
|
||||
|
Reference in New Issue
Block a user