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:
Jon Nettleton
committed by
Owen W. Taylor
Owen W. Taylor
parent
9127993d84
commit
51a6467968
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity visual bell */
|
||||
/* Mutter visual bell */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2002 Sun Microsystems Inc.
|
||||
@ -25,7 +25,7 @@
|
||||
/**
|
||||
* \file bell.c Ring the bell or flash the screen
|
||||
*
|
||||
* Sometimes, X programs "ring the bell", whatever that means. Metacity lets
|
||||
* Sometimes, X programs "ring the bell", whatever that means. Mutter lets
|
||||
* the user configure the bell to be audible or visible (aka visual), and
|
||||
* if it's visual it can be configured to be frame-flash or fullscreen-flash.
|
||||
* We never get told about audible bells; X handles them just fine by itself.
|
||||
@ -210,7 +210,12 @@ bell_flash_window_frame (MetaWindow *window)
|
||||
g_assert (window->frame != NULL);
|
||||
window->frame->is_flashing = 1;
|
||||
meta_frame_queue_draw (window->frame);
|
||||
g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, 100,
|
||||
/* Since this idle is added after the Clutter clock source, with
|
||||
* the same priority, it will be executed after it as well, so
|
||||
* we are guaranteed to get at least one frame drawn in the
|
||||
* flashed state, no matter how loaded we are.
|
||||
*/
|
||||
g_timeout_add_full (META_PRIORITY_REDRAW, 100,
|
||||
bell_unflash_frame, window->frame, NULL);
|
||||
}
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
/**
|
||||
* \file bell.h Ring the bell or flash the screen
|
||||
*
|
||||
* Sometimes, X programs "ring the bell", whatever that means. Metacity lets
|
||||
* Sometimes, X programs "ring the bell", whatever that means. Mutter lets
|
||||
* the user configure the bell to be audible or visible (aka visual), and
|
||||
* if it's visual it can be configured to be frame-flash or fullscreen-flash.
|
||||
* We never get told about audible bells; X handles them just fine by itself.
|
||||
@ -54,7 +54,7 @@ void meta_bell_notify (MetaDisplay *display, XkbAnyEvent *xkb_ev);
|
||||
|
||||
/**
|
||||
* Turns the bell to audible or visual. This tells X what to do, but
|
||||
* not Metacity; you will need to set the "visual bell" pref for that.
|
||||
* not Mutter; you will need to set the "visual bell" pref for that.
|
||||
*
|
||||
* If the configure script found we had no XKB, this is a no-op.
|
||||
*
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity size/position constraints */
|
||||
/* Mutter size/position constraints */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2002, 2003 Red Hat, Inc.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity size/position constraints */
|
||||
/* Mutter size/position constraints */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2002 Red Hat, Inc.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity interface used by GTK+ UI to talk to core */
|
||||
/* Mutter interface used by GTK+ UI to talk to core */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity window deletion */
|
||||
/* Mutter window deletion */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001, 2002 Havoc Pennington
|
||||
@ -71,7 +71,8 @@ sigchld_handler (MetaNexus *nexus, guint arg1, gpointer arg2, gpointer user_data
|
||||
if (GPOINTER_TO_INT (arg2) == ours->dialog_pid)
|
||||
{
|
||||
if (arg1 == 1 /* pressed "force quit" */)
|
||||
g_idle_add (delete_window_callback, user_data);
|
||||
g_idle_add_full (G_PRIORITY_DEFAULT,
|
||||
delete_window_callback, user_data, NULL);
|
||||
|
||||
ours->dialog_pid = -1; /* forget it anyway */
|
||||
}
|
||||
@ -249,7 +250,7 @@ meta_window_present_delete_dialog (MetaWindow *window, guint32 timestamp)
|
||||
GSList *tmp;
|
||||
|
||||
/* Activate transient for window that belongs to
|
||||
* metacity-dialog
|
||||
* mutter-dialog
|
||||
*/
|
||||
|
||||
windows = meta_display_list_windows (window->display);
|
||||
@ -260,7 +261,7 @@ meta_window_present_delete_dialog (MetaWindow *window, guint32 timestamp)
|
||||
|
||||
if (w->xtransient_for == window->xwindow &&
|
||||
w->res_class &&
|
||||
g_ascii_strcasecmp (w->res_class, "metacity-dialog") == 0)
|
||||
g_ascii_strcasecmp (w->res_class, "mutter-dialog") == 0)
|
||||
{
|
||||
meta_window_activate (w, timestamp);
|
||||
break;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X display handler */
|
||||
/* Mutter X display handler */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X display handler */
|
||||
/* Mutter X display handler */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
@ -403,7 +403,7 @@ meta_display_open (void)
|
||||
#endif
|
||||
|
||||
/* FIXME copy the checks from GDK probably */
|
||||
the_display->static_gravity_works = g_getenv ("METACITY_USE_STATIC_GRAVITY") != NULL;
|
||||
the_display->static_gravity_works = g_getenv ("MUTTER_USE_STATIC_GRAVITY") != NULL;
|
||||
|
||||
meta_bell_init (the_display);
|
||||
|
||||
@ -681,11 +681,11 @@ meta_display_open (void)
|
||||
meta_prop_set_utf8_string_hint (the_display,
|
||||
the_display->leader_window,
|
||||
the_display->atom__NET_WM_NAME,
|
||||
"Metacity");
|
||||
"Mutter");
|
||||
|
||||
meta_prop_set_utf8_string_hint (the_display,
|
||||
the_display->leader_window,
|
||||
the_display->atom__METACITY_VERSION,
|
||||
the_display->atom__MUTTER_VERSION,
|
||||
VERSION);
|
||||
|
||||
data[0] = the_display->leader_window;
|
||||
@ -1434,7 +1434,7 @@ handle_net_restack_window (MetaDisplay* display,
|
||||
|
||||
/**
|
||||
* This is the most important function in the whole program. It is the heart,
|
||||
* it is the nexus, it is the Grand Central Station of Metacity's world.
|
||||
* it is the nexus, it is the Grand Central Station of Mutter's world.
|
||||
* When we create a MetaDisplay, we ask GDK to pass *all* events for *all*
|
||||
* windows to this function. So every time anything happens that we might
|
||||
* want to know about, this function gets called. You see why it gets a bit
|
||||
@ -1663,7 +1663,7 @@ event_callback (XEvent *event,
|
||||
gboolean unmodified;
|
||||
|
||||
grab_mask = display->window_grab_modifiers;
|
||||
if (g_getenv ("METACITY_DEBUG_BUTTON_GRABS"))
|
||||
if (g_getenv ("MUTTER_DEBUG_BUTTON_GRABS"))
|
||||
grab_mask |= ControlMask;
|
||||
|
||||
/* Two possible sources of an unmodified event; one is a
|
||||
@ -2235,7 +2235,7 @@ event_callback (XEvent *event,
|
||||
* sentinel_counter variable declaration in display.h
|
||||
*/
|
||||
if (event->xproperty.atom ==
|
||||
display->atom__METACITY_SENTINEL)
|
||||
display->atom__MUTTER_SENTINEL)
|
||||
{
|
||||
meta_display_decrement_focus_sentinel (display);
|
||||
}
|
||||
@ -2346,13 +2346,13 @@ event_callback (XEvent *event,
|
||||
}
|
||||
}
|
||||
else if (event->xclient.message_type ==
|
||||
display->atom__METACITY_RESTART_MESSAGE)
|
||||
display->atom__MUTTER_RESTART_MESSAGE)
|
||||
{
|
||||
meta_verbose ("Received restart request\n");
|
||||
meta_restart ();
|
||||
}
|
||||
else if (event->xclient.message_type ==
|
||||
display->atom__METACITY_RELOAD_THEME_MESSAGE)
|
||||
display->atom__MUTTER_RELOAD_THEME_MESSAGE)
|
||||
{
|
||||
meta_verbose ("Received reload theme request\n");
|
||||
meta_ui_set_current_theme (meta_prefs_get_theme (),
|
||||
@ -2360,14 +2360,14 @@ event_callback (XEvent *event,
|
||||
meta_display_retheme_all ();
|
||||
}
|
||||
else if (event->xclient.message_type ==
|
||||
display->atom__METACITY_SET_KEYBINDINGS_MESSAGE)
|
||||
display->atom__MUTTER_SET_KEYBINDINGS_MESSAGE)
|
||||
{
|
||||
meta_verbose ("Received set keybindings request = %d\n",
|
||||
(int) event->xclient.data.l[0]);
|
||||
meta_set_keybindings_disabled (!event->xclient.data.l[0]);
|
||||
}
|
||||
else if (event->xclient.message_type ==
|
||||
display->atom__METACITY_TOGGLE_VERBOSE)
|
||||
display->atom__MUTTER_TOGGLE_VERBOSE)
|
||||
{
|
||||
meta_verbose ("Received toggle verbose message\n");
|
||||
meta_set_verbose (!meta_is_verbose ());
|
||||
@ -3756,7 +3756,7 @@ meta_display_grab_window_buttons (MetaDisplay *display,
|
||||
|
||||
if (display->window_grab_modifiers != 0)
|
||||
{
|
||||
gboolean debug = g_getenv ("METACITY_DEBUG_BUTTON_GRABS") != NULL;
|
||||
gboolean debug = g_getenv ("MUTTER_DEBUG_BUTTON_GRABS") != NULL;
|
||||
int i;
|
||||
for (i = 1; i < 4; i++)
|
||||
{
|
||||
@ -3798,7 +3798,7 @@ meta_display_ungrab_window_buttons (MetaDisplay *display,
|
||||
if (display->window_grab_modifiers == 0)
|
||||
return;
|
||||
|
||||
debug = g_getenv ("METACITY_DEBUG_BUTTON_GRABS") != NULL;
|
||||
debug = g_getenv ("MUTTER_DEBUG_BUTTON_GRABS") != NULL;
|
||||
i = 1;
|
||||
while (i < 4)
|
||||
{
|
||||
@ -3995,7 +3995,7 @@ static gboolean is_syncing = FALSE;
|
||||
*
|
||||
* \bug This is *only* called by meta_display_open, but by that time
|
||||
* we have already turned syncing on or off on startup, and we don't
|
||||
* have any way to do so while Metacity is running, so it's rather
|
||||
* have any way to do so while Mutter is running, so it's rather
|
||||
* pointless.
|
||||
*/
|
||||
gboolean
|
||||
@ -4971,7 +4971,7 @@ meta_display_increment_focus_sentinel (MetaDisplay *display)
|
||||
|
||||
XChangeProperty (display->xdisplay,
|
||||
((MetaScreen*) display->screens->data)->xroot,
|
||||
display->atom__METACITY_SENTINEL,
|
||||
display->atom__MUTTER_SENTINEL,
|
||||
XA_CARDINAL,
|
||||
32, PropModeReplace, (guchar*) data, 1);
|
||||
|
||||
|
||||
@ -442,7 +442,7 @@ draw_box_animation (MetaScreen *screen,
|
||||
|
||||
g_return_if_fail (seconds_duration > 0.0);
|
||||
|
||||
if (g_getenv ("METACITY_DEBUG_EFFECTS"))
|
||||
if (g_getenv ("MUTTER_DEBUG_EFFECTS"))
|
||||
seconds_duration *= 10; /* slow things down */
|
||||
|
||||
/* Create the animation context */
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X error handling */
|
||||
/* Mutter X error handling */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington, error trapping inspired by GDK
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X event source for main loop */
|
||||
/* Mutter X event source for main loop */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington (based on GDK code (C) Owen
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X event source for main loop */
|
||||
/* Mutter X event source for main loop */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X window decorations */
|
||||
/* Mutter X window decorations */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X window decorations */
|
||||
/* Mutter X window decorations */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity window group private header */
|
||||
/* Mutter window group private header */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2002 Red Hat Inc.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity window groups */
|
||||
/* Mutter window groups */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2002 Red Hat Inc.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity window icons */
|
||||
/* Mutter window icons */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2002 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity window icons */
|
||||
/* Mutter window icons */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2002 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity Keybindings */
|
||||
/* Mutter Keybindings */
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
* Copyright (C) 2002 Red Hat Inc.
|
||||
@ -2396,7 +2396,7 @@ error_on_command (int command_index,
|
||||
command_index, command, message);
|
||||
|
||||
/*
|
||||
metacity-dialog said:
|
||||
mutter-dialog said:
|
||||
|
||||
FIXME offer to change the value of the command's gconf key
|
||||
*/
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity main() */
|
||||
/* Mutter main() */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
@ -26,14 +26,14 @@
|
||||
* \file
|
||||
* Program startup.
|
||||
* Functions which parse the command-line arguments, create the display,
|
||||
* kick everything off and then close down Metacity when it's time to go.
|
||||
* kick everything off and then close down Mutter when it's time to go.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \mainpage
|
||||
* Metacity - a boring window manager for the adult in you
|
||||
* Mutter - a boring window manager for the adult in you
|
||||
*
|
||||
* Many window managers are like Marshmallow Froot Loops; Metacity
|
||||
* Many window managers are like Marshmallow Froot Loops; Mutter
|
||||
* is like Cheerios.
|
||||
*
|
||||
* The best way to get a handle on how the whole system fits together
|
||||
@ -85,13 +85,13 @@
|
||||
static MetaExitCode meta_exit_code = META_EXIT_SUCCESS;
|
||||
|
||||
/**
|
||||
* Handle on the main loop, so that we have an easy way of shutting Metacity
|
||||
* Handle on the main loop, so that we have an easy way of shutting Mutter
|
||||
* down.
|
||||
*/
|
||||
static GMainLoop *meta_main_loop = NULL;
|
||||
|
||||
/**
|
||||
* If set, Metacity will spawn an identical copy of itself immediately
|
||||
* If set, Mutter will spawn an identical copy of itself immediately
|
||||
* before quitting.
|
||||
*/
|
||||
static gboolean meta_restart_after_quit = FALSE;
|
||||
@ -100,7 +100,7 @@ static void prefs_changed_callback (MetaPreference pref,
|
||||
gpointer data);
|
||||
|
||||
/**
|
||||
* Prints log messages. If Metacity was compiled with backtrace support,
|
||||
* Prints log messages. If Mutter was compiled with backtrace support,
|
||||
* also prints a backtrace (see meta_print_backtrace()).
|
||||
*
|
||||
* \param log_domain the domain the error occurred in (we ignore this)
|
||||
@ -120,13 +120,13 @@ log_handler (const gchar *log_domain,
|
||||
}
|
||||
|
||||
/**
|
||||
* Prints the version notice. This is shown when Metacity is called
|
||||
* Prints the version notice. This is shown when Mutter is called
|
||||
* with the --version switch.
|
||||
*/
|
||||
static void
|
||||
version (void)
|
||||
{
|
||||
g_print (_("metacity %s\n"
|
||||
g_print (_("mutter %s\n"
|
||||
"Copyright (C) 2001-2008 Havoc Pennington, Red Hat, Inc., and others\n"
|
||||
"This is free software; see the source for copying conditions.\n"
|
||||
"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),
|
||||
@ -136,7 +136,7 @@ version (void)
|
||||
|
||||
/**
|
||||
* Prints a list of which configure script options were used to
|
||||
* build this copy of Metacity. This is actually always called
|
||||
* build this copy of Mutter. This is actually always called
|
||||
* on startup, but it's all no-op unless we're in verbose mode
|
||||
* (see meta_set_verbose).
|
||||
*/
|
||||
@ -189,7 +189,7 @@ meta_print_compilation_info (void)
|
||||
* Prints the version number, the current timestamp (not the
|
||||
* build date), the locale, the character encoding, and a list
|
||||
* of configure script options that were used to build this
|
||||
* copy of Metacity. This is actually always called
|
||||
* copy of Mutter. This is actually always called
|
||||
* on startup, but it's all no-op unless we're in verbose mode
|
||||
* (see meta_set_verbose).
|
||||
*/
|
||||
@ -204,7 +204,7 @@ meta_print_self_identity (void)
|
||||
g_date_clear (&d, 1);
|
||||
g_date_set_time_t (&d, time (NULL));
|
||||
g_date_strftime (buf, sizeof (buf), "%x", &d);
|
||||
meta_verbose ("Metacity version %s running on %s\n",
|
||||
meta_verbose ("Mutter version %s running on %s\n",
|
||||
VERSION, buf);
|
||||
|
||||
/* Locale and encoding. */
|
||||
@ -217,7 +217,7 @@ meta_print_self_identity (void)
|
||||
}
|
||||
|
||||
/**
|
||||
* The set of possible options that can be set on Metacity's
|
||||
* The set of possible options that can be set on Mutter's
|
||||
* command line. This type exists so that meta_parse_options() can
|
||||
* write to an instance of it.
|
||||
*/
|
||||
@ -246,14 +246,14 @@ typedef struct
|
||||
|
||||
/**
|
||||
* Parses argc and argv and returns the
|
||||
* arguments that Metacity understands in meta_args.
|
||||
* arguments that Mutter understands in meta_args.
|
||||
*
|
||||
* The strange call signature has to be written like it is so
|
||||
* that g_option_context_parse() gets a chance to modify argc and
|
||||
* argv.
|
||||
*
|
||||
* \param argc Pointer to the number of arguments Metacity was given
|
||||
* \param argv Pointer to the array of arguments Metacity was given
|
||||
* \param argc Pointer to the number of arguments Mutter was given
|
||||
* \param argv Pointer to the array of arguments Mutter was given
|
||||
* \param meta_args The result of parsing the arguments.
|
||||
**/
|
||||
static GOptionContext *
|
||||
@ -272,7 +272,7 @@ meta_parse_options (int *argc, char ***argv,
|
||||
{
|
||||
"replace", 0, 0, G_OPTION_ARG_NONE,
|
||||
&my_args.replace_wm,
|
||||
N_("Replace the running window manager with Metacity"),
|
||||
N_("Replace the running window manager with Mutter"),
|
||||
NULL
|
||||
},
|
||||
{
|
||||
@ -343,7 +343,7 @@ meta_parse_options (int *argc, char ***argv,
|
||||
GError *error = NULL;
|
||||
|
||||
ctx = g_option_context_new (NULL);
|
||||
g_option_context_add_main_entries (ctx, options, "metacity");
|
||||
g_option_context_add_main_entries (ctx, options, "mutter");
|
||||
|
||||
#ifdef WITH_CLUTTER
|
||||
/*
|
||||
@ -356,7 +356,7 @@ meta_parse_options (int *argc, char ***argv,
|
||||
|
||||
if (!g_option_context_parse (ctx, argc, argv, &error))
|
||||
{
|
||||
g_print ("metacity: %s\n", error->message);
|
||||
g_print ("mutter: %s\n", error->message);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@ -367,7 +367,7 @@ meta_parse_options (int *argc, char ***argv,
|
||||
|
||||
|
||||
#ifdef WITH_CLUTTER
|
||||
/* Metacity is responsible for pulling events off the X queue, so Clutter
|
||||
/* Mutter is responsible for pulling events off the X queue, so Clutter
|
||||
* doesn't need (and shouldn't) run its normal event source which polls
|
||||
* the X fd, but we do have to deal with dispatching events that accumulate
|
||||
* in the clutter queue. This happens, for example, when clutter generate
|
||||
@ -434,9 +434,9 @@ meta_clutter_init (GOptionContext *ctx, int *argc, char ***argv)
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Selects which display Metacity should use. It first tries to use
|
||||
* Selects which display Mutter should use. It first tries to use
|
||||
* display_name as the display. If display_name is NULL then
|
||||
* try to use the environment variable METACITY_DISPLAY. If that
|
||||
* try to use the environment variable MUTTER_DISPLAY. If that
|
||||
* also is NULL, use the default - :0.0
|
||||
*/
|
||||
static void
|
||||
@ -445,9 +445,9 @@ meta_select_display (gchar *display_name)
|
||||
gchar *envVar = "";
|
||||
if (display_name)
|
||||
envVar = g_strconcat ("DISPLAY=", display_name, NULL);
|
||||
else if (g_getenv ("METACITY_DISPLAY"))
|
||||
else if (g_getenv ("MUTTER_DISPLAY"))
|
||||
envVar = g_strconcat ("DISPLAY=",
|
||||
g_getenv ("METACITY_DISPLAY"), NULL);
|
||||
g_getenv ("MUTTER_DISPLAY"), NULL);
|
||||
/* DO NOT FREE envVar, putenv() sucks */
|
||||
putenv (envVar);
|
||||
}
|
||||
@ -560,9 +560,9 @@ main (int argc, char **argv)
|
||||
g_printerr ("Failed to register SIGCHLD handler: %s\n",
|
||||
g_strerror (errno));
|
||||
|
||||
if (g_getenv ("METACITY_VERBOSE"))
|
||||
if (g_getenv ("MUTTER_VERBOSE"))
|
||||
meta_set_verbose (TRUE);
|
||||
if (g_getenv ("METACITY_DEBUG"))
|
||||
if (g_getenv ("MUTTER_DEBUG"))
|
||||
meta_set_debugging (TRUE);
|
||||
|
||||
if (g_get_home_dir ())
|
||||
@ -574,7 +574,7 @@ main (int argc, char **argv)
|
||||
|
||||
meta_print_self_identity ();
|
||||
|
||||
bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR);
|
||||
bindtextdomain (GETTEXT_PACKAGE, MUTTER_LOCALEDIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
|
||||
@ -606,7 +606,7 @@ main (int argc, char **argv)
|
||||
#endif /* WITH_CLUTTER */
|
||||
|
||||
#ifdef HAVE_INTROSPECTION
|
||||
g_irepository_prepend_search_path (METACITY_PKGLIBDIR);
|
||||
g_irepository_prepend_search_path (MUTTER_PKGLIBDIR);
|
||||
if (meta_args.introspect)
|
||||
{
|
||||
GError *error = NULL;
|
||||
@ -631,7 +631,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
#endif
|
||||
|
||||
meta_set_syncing (meta_args.sync || (g_getenv ("METACITY_SYNC") != NULL));
|
||||
meta_set_syncing (meta_args.sync || (g_getenv ("MUTTER_SYNC") != NULL));
|
||||
|
||||
if (meta_args.print_version)
|
||||
version ();
|
||||
@ -674,7 +674,7 @@ main (int argc, char **argv)
|
||||
|
||||
#endif
|
||||
|
||||
if (g_getenv ("METACITY_G_FATAL_WARNINGS") != NULL)
|
||||
if (g_getenv ("MUTTER_G_FATAL_WARNINGS") != NULL)
|
||||
g_log_set_always_fatal (G_LOG_LEVEL_MASK);
|
||||
|
||||
meta_ui_set_current_theme (meta_prefs_get_theme (), FALSE);
|
||||
@ -692,7 +692,7 @@ main (int argc, char **argv)
|
||||
GError *err = NULL;
|
||||
GDir *themes_dir = NULL;
|
||||
|
||||
if (!(themes_dir = g_dir_open (METACITY_DATADIR"/themes", 0, &err)))
|
||||
if (!(themes_dir = g_dir_open (MUTTER_DATADIR"/themes", 0, &err)))
|
||||
{
|
||||
meta_fatal (_("Failed to scan themes directory: %s\n"), err->message);
|
||||
g_error_free (err);
|
||||
@ -711,7 +711,7 @@ main (int argc, char **argv)
|
||||
|
||||
if (!meta_ui_have_a_theme ())
|
||||
meta_fatal (_("Could not find a theme! Be sure %s exists and contains the usual themes.\n"),
|
||||
METACITY_DATADIR"/themes");
|
||||
MUTTER_DATADIR"/themes");
|
||||
|
||||
/* Connect to SM as late as possible - but before managing display,
|
||||
* or we might try to manage a window before we have the session
|
||||
@ -782,7 +782,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
|
||||
/**
|
||||
* Stops Metacity. This tells the event loop to stop processing; it is rather
|
||||
* Stops Mutter. This tells the event loop to stop processing; it is rather
|
||||
* dangerous to use this rather than meta_restart() because this will leave
|
||||
* the user with no window manager. We generally do this only if, for example,
|
||||
* the session manager asks us to; we assume the session manager knows what
|
||||
@ -800,10 +800,10 @@ meta_quit (MetaExitCode code)
|
||||
}
|
||||
|
||||
/**
|
||||
* Restarts Metacity. In practice, this tells the event loop to stop
|
||||
* Restarts Mutter. In practice, this tells the event loop to stop
|
||||
* processing, having first set the meta_restart_after_quit flag which
|
||||
* tells Metacity to spawn an identical copy of itself before quitting.
|
||||
* This happens on receipt of a _METACITY_RESTART_MESSAGE client event.
|
||||
* tells Mutter to spawn an identical copy of itself before quitting.
|
||||
* This happens on receipt of a _MUTTER_RESTART_MESSAGE client event.
|
||||
*/
|
||||
void
|
||||
meta_restart (void)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/**
|
||||
* \file metacity-Xatomtype.h Types for communicating with X about properties
|
||||
* \file mutter-Xatomtype.h Types for communicating with X about properties
|
||||
*
|
||||
* This files defines crock C structures for calling XGetWindowProperty and
|
||||
* XChangeProperty. All fields must be longs as the semantics of property
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity window placement */
|
||||
/* Mutter window placement */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity window placement */
|
||||
/* Mutter window placement */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity preferences */
|
||||
/* Mutter preferences */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington, Copyright (C) 2002 Red Hat Inc.
|
||||
@ -57,7 +57,7 @@
|
||||
#define KEY_TERMINAL_DIR "/desktop/gnome/applications/terminal"
|
||||
#define KEY_TERMINAL_COMMAND KEY_TERMINAL_DIR "/exec"
|
||||
|
||||
#define KEY_OVERLAY_KEY "/apps/metacity/general/overlay_key"
|
||||
#define KEY_OVERLAY_KEY "/apps/mutter/general/overlay_key"
|
||||
#define KEY_SCREEN_BINDINGS_PREFIX "/apps/metacity/global_keybindings"
|
||||
#define KEY_WINDOW_BINDINGS_PREFIX "/apps/metacity/window_keybindings"
|
||||
#define KEY_LIST_BINDINGS_SUFFIX "_list"
|
||||
@ -65,11 +65,11 @@
|
||||
#define KEY_WORKSPACE_NAME_PREFIX "/apps/metacity/workspace_names/name_"
|
||||
|
||||
#ifdef WITH_CLUTTER
|
||||
#define KEY_CLUTTER_DISABLED "/apps/metacity/general/clutter_disabled"
|
||||
#define KEY_CLUTTER_PLUGINS "/apps/metacity/general/clutter_plugins"
|
||||
#define KEY_CLUTTER_DISABLED "/apps/mutter/general/clutter_disabled"
|
||||
#define KEY_CLUTTER_PLUGINS "/apps/mutter/general/clutter_plugins"
|
||||
#endif
|
||||
|
||||
#define KEY_LIVE_HIDDEN_WINDOWS "/apps/metacity/general/live_hidden_windows"
|
||||
#define KEY_LIVE_HIDDEN_WINDOWS "/apps/mutter/general/live_hidden_windows"
|
||||
|
||||
#define KEY_NO_TAB_POPUP "/apps/metacity/general/no_tab_popup"
|
||||
|
||||
@ -328,7 +328,7 @@ typedef struct
|
||||
|
||||
/* FIXMEs: */
|
||||
/* @@@ Don't use NULL lines at the end; glib can tell you how big it is */
|
||||
/* @@@ /apps/metacity/general should be assumed if first char is not / */
|
||||
/* @@@ /apps/mutter/general should be assumed if first char is not / */
|
||||
/* @@@ Will it ever be possible to merge init and update? If not, why not? */
|
||||
|
||||
static MetaEnumPreference preferences_enum[] =
|
||||
@ -429,13 +429,13 @@ static MetaBoolPreference preferences_bool[] =
|
||||
FALSE,
|
||||
},
|
||||
#ifdef WITH_CLUTTER
|
||||
{ "/apps/metacity/general/clutter_disabled",
|
||||
{ "/apps/mutter/general/clutter_disabled",
|
||||
META_PREF_CLUTTER_DISABLED,
|
||||
&clutter_disabled,
|
||||
FALSE,
|
||||
},
|
||||
#endif
|
||||
{ "/apps/metacity/general/live_hidden_windows",
|
||||
{ "/apps/mutter/general/live_hidden_windows",
|
||||
META_PREF_LIVE_HIDDEN_WINDOWS,
|
||||
&live_hidden_windows,
|
||||
FALSE,
|
||||
@ -1028,6 +1028,7 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func,
|
||||
/* @@@ again, use glib's ability to tell you the size of the array */
|
||||
static gchar *gconf_dirs_we_are_interested_in[] = {
|
||||
"/apps/metacity",
|
||||
"/apps/mutter",
|
||||
KEY_TERMINAL_DIR,
|
||||
KEY_GNOME_ACCESSIBILITY,
|
||||
"/desktop/gnome/peripherals/mouse",
|
||||
@ -1243,7 +1244,7 @@ change_notify (GConfClient *client,
|
||||
#endif
|
||||
else
|
||||
{
|
||||
meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n",
|
||||
meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Mutter\n",
|
||||
key);
|
||||
}
|
||||
|
||||
|
||||
@ -1,195 +0,0 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2008 Thomas Thurman
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
* 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/** \file Schema bindings generator.
|
||||
*
|
||||
* This program simply takes the items given in the binding list in
|
||||
* all-keybindings.h and turns them into a portion of
|
||||
* the GConf .schemas file.
|
||||
*
|
||||
* FIXME: also need to make 50-metacity-desktop-key.xml
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <glib.h>
|
||||
#include "config.h"
|
||||
|
||||
#define _(x) x
|
||||
|
||||
static void single_stanza (gboolean is_window, const char *name,
|
||||
const char *default_value,
|
||||
gboolean can_reverse,
|
||||
const char *description);
|
||||
|
||||
char *about_keybindings, *about_reversible_keybindings;
|
||||
|
||||
char *source_filename, *target_filename;
|
||||
FILE *source_file, *target_file;
|
||||
|
||||
static void
|
||||
single_stanza (gboolean is_window, const char *name,
|
||||
const char *default_value,
|
||||
gboolean can_reverse,
|
||||
const char *description)
|
||||
{
|
||||
char *keybinding_type = is_window? "window": "global";
|
||||
char *escaped_default_value, *escaped_description;
|
||||
|
||||
if (description==NULL)
|
||||
return; /* it must be undocumented, so it can't go in this table */
|
||||
|
||||
escaped_description = g_markup_escape_text (description, -1);
|
||||
escaped_default_value = default_value==NULL? "disabled":
|
||||
g_markup_escape_text (default_value, -1);
|
||||
|
||||
fprintf (target_file, " <schema>\n");
|
||||
fprintf (target_file, " <key>/schemas/apps/metacity/%s_keybindings/%s</key>\n",
|
||||
keybinding_type, name);
|
||||
fprintf (target_file, " <applyto>/apps/metacity/%s_keybindings/%s</applyto>\n",
|
||||
keybinding_type, name);
|
||||
fprintf (target_file, " <owner>metacity</owner>\n");
|
||||
fprintf (target_file, " <type>string</type>\n");
|
||||
fprintf (target_file, " <default>%s</default>\n", escaped_default_value);
|
||||
|
||||
fprintf (target_file, " <locale name=\"C\">\n");
|
||||
fprintf (target_file, " <short>%s</short>\n", description);
|
||||
fprintf (target_file, " <long>%s</long>\n",
|
||||
can_reverse? about_reversible_keybindings:
|
||||
about_keybindings);
|
||||
fprintf (target_file, " </locale>\n");
|
||||
fprintf (target_file, " </schema>\n\n");
|
||||
|
||||
g_free (escaped_description);
|
||||
|
||||
if (default_value!=NULL)
|
||||
g_free (escaped_default_value);
|
||||
}
|
||||
|
||||
static void produce_bindings ();
|
||||
|
||||
static void
|
||||
produce_bindings ()
|
||||
{
|
||||
/* 10240 is ridiculous overkill; we're writing the input file and
|
||||
* the lines are always 80 chars or less.
|
||||
*/
|
||||
char buffer[10240];
|
||||
|
||||
source_file = fopen(source_filename, "r");
|
||||
|
||||
if (!source_file)
|
||||
{
|
||||
g_error ("Cannot compile without %s: %s\n",
|
||||
source_filename, strerror (errno));
|
||||
}
|
||||
|
||||
target_file = fopen(target_filename, "w");
|
||||
|
||||
if (!target_file)
|
||||
{
|
||||
g_error ("Cannot create %s: %s\n",
|
||||
target_filename, strerror (errno));
|
||||
}
|
||||
|
||||
while (fgets (buffer, sizeof (buffer), source_file))
|
||||
{
|
||||
if (strstr (buffer, "<!-- GENERATED -->"))
|
||||
break;
|
||||
|
||||
fprintf (target_file, "%s", buffer);
|
||||
}
|
||||
|
||||
if (!feof (source_file))
|
||||
{
|
||||
#define keybind(name, handler, param, flags, stroke, description) \
|
||||
single_stanza ( \
|
||||
flags & BINDING_PER_WINDOW, \
|
||||
#name, \
|
||||
stroke, \
|
||||
flags & BINDING_REVERSES, \
|
||||
description);
|
||||
#include "all-keybindings.h"
|
||||
#undef keybind
|
||||
}
|
||||
|
||||
while (fgets (buffer, sizeof (buffer), source_file))
|
||||
fprintf (target_file, "%s", buffer);
|
||||
|
||||
if (fclose (source_file)!=0)
|
||||
{
|
||||
g_error ("Cannot close %s: %s\n",
|
||||
source_filename, strerror (errno));
|
||||
}
|
||||
|
||||
if (fclose (target_file)!=0)
|
||||
{
|
||||
g_error ("Cannot close %s: %s\n",
|
||||
target_filename, strerror (errno));
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
if (argc!=3)
|
||||
{
|
||||
g_error ("Syntax: %s <source.in.in> <target.in>\n", argv[0]);
|
||||
}
|
||||
|
||||
source_filename = argv[1];
|
||||
target_filename = argv[2];
|
||||
|
||||
/* Translators: Please don't translate "Control", "Shift", etc, since these
|
||||
* are hardcoded (in gtk/gtkaccelgroup.c; it's not metacity's fault).
|
||||
* "disabled" must also stay as it is.
|
||||
*/
|
||||
about_keybindings = g_markup_escape_text(_( \
|
||||
"The format looks like \"<Control>a\" or <Shift><Alt>F1\".\n\n"\
|
||||
"The parser is fairly liberal and allows "\
|
||||
"lower or upper case, and also abbreviations such as \"<Ctl>\" and " \
|
||||
"\"<Ctrl>\". If you set the option to the special string " \
|
||||
"\"disabled\", then there will be no keybinding for this action."),
|
||||
-1);
|
||||
|
||||
about_reversible_keybindings = g_markup_escape_text(_( \
|
||||
"The format looks like \"<Control>a\" or <Shift><Alt>F1\".\n\n"\
|
||||
"The parser is fairly liberal and allows "\
|
||||
"lower or upper case, and also abbreviations such as \"<Ctl>\" and " \
|
||||
"\"<Ctrl>\". If you set the option to the special string " \
|
||||
"\"disabled\", then there will be no keybinding for this action.\n\n"\
|
||||
"This keybinding may be reversed by holding down the \"shift\" key; "
|
||||
"therefore, \"shift\" cannot be one of the keys it uses."),
|
||||
-1);
|
||||
|
||||
produce_bindings ();
|
||||
|
||||
g_free (about_keybindings);
|
||||
g_free (about_reversible_keybindings);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* eof schema-bindings.c */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/**
|
||||
* \file screen-private.h Screens which Metacity manages
|
||||
* \file screen-private.h Screens which Mutter manages
|
||||
*
|
||||
* Managing X screens.
|
||||
* This file contains methods on this class which are available to
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X screen handler */
|
||||
/* Mutter X screen handler */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001, 2002 Havoc Pennington
|
||||
@ -328,7 +328,7 @@ reload_xinerama_infos (MetaScreen *screen)
|
||||
}
|
||||
#else
|
||||
meta_topic (META_DEBUG_XINERAMA,
|
||||
"Metacity compiled without XFree86 Xinerama support\n");
|
||||
"Mutter compiled without XFree86 Xinerama support\n");
|
||||
#endif /* HAVE_XFREE_XINERAMA */
|
||||
|
||||
#ifdef HAVE_SOLARIS_XINERAMA
|
||||
@ -387,7 +387,7 @@ reload_xinerama_infos (MetaScreen *screen)
|
||||
}
|
||||
#else
|
||||
meta_topic (META_DEBUG_XINERAMA,
|
||||
"Metacity compiled without Solaris Xinerama support\n");
|
||||
"Mutter compiled without Solaris Xinerama support\n");
|
||||
#endif /* HAVE_SOLARIS_XINERAMA */
|
||||
|
||||
|
||||
@ -396,7 +396,7 @@ reload_xinerama_infos (MetaScreen *screen)
|
||||
*/
|
||||
if (screen->n_xinerama_infos == 0)
|
||||
{
|
||||
if (g_getenv ("METACITY_DEBUG_XINERAMA"))
|
||||
if (g_getenv ("MUTTER_DEBUG_XINERAMA"))
|
||||
{
|
||||
meta_topic (META_DEBUG_XINERAMA,
|
||||
"Pretending a single monitor has two Xinerama screens\n");
|
||||
@ -1204,7 +1204,7 @@ set_desktop_viewport_hint (MetaScreen *screen)
|
||||
return;
|
||||
|
||||
/*
|
||||
* Metacity does not implement viewports, so this is a fixed 0,0
|
||||
* Mutter does not implement viewports, so this is a fixed 0,0
|
||||
*/
|
||||
data[0] = 0;
|
||||
data[1] = 0;
|
||||
@ -2115,7 +2115,7 @@ meta_screen_queue_workarea_recalc (MetaScreen *screen)
|
||||
meta_topic (META_DEBUG_WORKAREA,
|
||||
"Adding work area hint idle function\n");
|
||||
screen->work_area_idle =
|
||||
g_idle_add_full (META_PRIORITY_WORK_AREA_HINT,
|
||||
g_idle_add_full (META_PRIORITY_BEFORE_REDRAW,
|
||||
(GSourceFunc) set_work_area_idle_func,
|
||||
screen,
|
||||
NULL);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity Session Management */
|
||||
/* Mutter Session Management */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington (some code in here from
|
||||
@ -309,8 +309,8 @@ meta_session_init (const char *previous_client_id,
|
||||
prop1.type = SmARRAY8;
|
||||
prop1.num_vals = 1;
|
||||
prop1.vals = &prop1val;
|
||||
prop1val.value = "metacity";
|
||||
prop1val.length = strlen ("metacity");
|
||||
prop1val.value = "mutter";
|
||||
prop1val.length = strlen ("mutter");
|
||||
|
||||
/* twm sets getuid() for this, but the SM spec plainly
|
||||
* says pw_name, twm is on crack
|
||||
@ -596,7 +596,7 @@ set_clone_restart_commands (void)
|
||||
g_return_if_fail (client_id);
|
||||
|
||||
i = 0;
|
||||
restartv[i] = "metacity";
|
||||
restartv[i] = "mutter";
|
||||
++i;
|
||||
restartv[i] = "--sm-client-id";
|
||||
++i;
|
||||
@ -617,7 +617,7 @@ set_clone_restart_commands (void)
|
||||
/* Clone (no client ID) */
|
||||
|
||||
i = 0;
|
||||
clonev[i] = "metacity";
|
||||
clonev[i] = "mutter";
|
||||
++i;
|
||||
clonev[i] = NULL;
|
||||
|
||||
@ -818,7 +818,7 @@ decode_text_from_utf8 (const char *text)
|
||||
static void
|
||||
save_state (void)
|
||||
{
|
||||
char *metacity_dir;
|
||||
char *mutter_dir;
|
||||
char *session_dir;
|
||||
FILE *outfile;
|
||||
GSList *windows;
|
||||
@ -837,19 +837,19 @@ save_state (void)
|
||||
* we probably already have full_save_path figured out and therefore
|
||||
* can just use the directory name from that.
|
||||
*/
|
||||
metacity_dir = g_strconcat (g_get_user_config_dir (),
|
||||
G_DIR_SEPARATOR_S "metacity",
|
||||
mutter_dir = g_strconcat (g_get_user_config_dir (),
|
||||
G_DIR_SEPARATOR_S "mutter",
|
||||
NULL);
|
||||
|
||||
session_dir = g_strconcat (metacity_dir,
|
||||
session_dir = g_strconcat (mutter_dir,
|
||||
G_DIR_SEPARATOR_S "sessions",
|
||||
NULL);
|
||||
|
||||
if (mkdir (metacity_dir, 0700) < 0 &&
|
||||
if (mkdir (mutter_dir, 0700) < 0 &&
|
||||
errno != EEXIST)
|
||||
{
|
||||
meta_warning (_("Could not create directory '%s': %s\n"),
|
||||
metacity_dir, g_strerror (errno));
|
||||
mutter_dir, g_strerror (errno));
|
||||
}
|
||||
|
||||
if (mkdir (session_dir, 0700) < 0 &&
|
||||
@ -871,14 +871,14 @@ save_state (void)
|
||||
}
|
||||
|
||||
/* The file format is:
|
||||
* <metacity_session id="foo">
|
||||
* <mutter_session id="foo">
|
||||
* <window id="bar" class="XTerm" name="xterm" title="/foo/bar" role="blah" type="normal" stacking="5">
|
||||
* <workspace index="2"/>
|
||||
* <workspace index="4"/>
|
||||
* <sticky/> <minimized/> <maximized/>
|
||||
* <geometry x="100" y="100" width="200" height="200" gravity="northwest"/>
|
||||
* </window>
|
||||
* </metacity_session>
|
||||
* </mutter_session>
|
||||
*
|
||||
* Note that attributes on <window> are the match info we use to
|
||||
* see if the saved state applies to a restored window, and
|
||||
@ -886,7 +886,7 @@ save_state (void)
|
||||
*
|
||||
*/
|
||||
|
||||
fprintf (outfile, "<metacity_session id=\"%s\">\n",
|
||||
fprintf (outfile, "<mutter_session id=\"%s\">\n",
|
||||
client_id);
|
||||
|
||||
windows = meta_display_list_windows (meta_get_display ());
|
||||
@ -998,7 +998,7 @@ save_state (void)
|
||||
|
||||
g_slist_free (windows);
|
||||
|
||||
fputs ("</metacity_session>\n", outfile);
|
||||
fputs ("</mutter_session>\n", outfile);
|
||||
|
||||
out:
|
||||
if (outfile)
|
||||
@ -1016,7 +1016,7 @@ save_state (void)
|
||||
}
|
||||
}
|
||||
|
||||
g_free (metacity_dir);
|
||||
g_free (mutter_dir);
|
||||
g_free (session_dir);
|
||||
}
|
||||
|
||||
@ -1055,7 +1055,7 @@ static void text_handler (GMarkupParseContext *context,
|
||||
gpointer user_data,
|
||||
GError **error);
|
||||
|
||||
static GMarkupParser metacity_session_parser = {
|
||||
static GMarkupParser mutter_session_parser = {
|
||||
start_element_handler,
|
||||
end_element_handler,
|
||||
text_handler,
|
||||
@ -1076,7 +1076,7 @@ load_state (const char *previous_save_file)
|
||||
char *session_file;
|
||||
|
||||
session_file = g_strconcat (g_get_user_config_dir (),
|
||||
G_DIR_SEPARATOR_S "metacity"
|
||||
G_DIR_SEPARATOR_S "mutter"
|
||||
G_DIR_SEPARATOR_S "sessions" G_DIR_SEPARATOR_S,
|
||||
previous_save_file,
|
||||
NULL);
|
||||
@ -1089,9 +1089,9 @@ load_state (const char *previous_save_file)
|
||||
{
|
||||
char *canonical_session_file = session_file;
|
||||
|
||||
/* Maybe they were doing it the old way, with ~/.metacity */
|
||||
/* Maybe they were doing it the old way, with ~/.mutter */
|
||||
session_file = g_strconcat (g_get_home_dir (),
|
||||
G_DIR_SEPARATOR_S ".metacity"
|
||||
G_DIR_SEPARATOR_S ".mutter"
|
||||
G_DIR_SEPARATOR_S "sessions"
|
||||
G_DIR_SEPARATOR_S,
|
||||
previous_save_file,
|
||||
@ -1122,7 +1122,7 @@ load_state (const char *previous_save_file)
|
||||
parse_data.info = NULL;
|
||||
parse_data.previous_id = NULL;
|
||||
|
||||
context = g_markup_parse_context_new (&metacity_session_parser,
|
||||
context = g_markup_parse_context_new (&mutter_session_parser,
|
||||
0, &parse_data, NULL);
|
||||
|
||||
error = NULL;
|
||||
@ -1173,7 +1173,7 @@ start_element_handler (GMarkupParseContext *context,
|
||||
|
||||
pd = user_data;
|
||||
|
||||
if (strcmp (element_name, "metacity_session") == 0)
|
||||
if (strcmp (element_name, "mutter_session") == 0)
|
||||
{
|
||||
/* Get previous ID */
|
||||
int i;
|
||||
@ -1192,7 +1192,7 @@ start_element_handler (GMarkupParseContext *context,
|
||||
g_set_error (error,
|
||||
G_MARKUP_ERROR,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("<metacity_session> attribute seen but we already have the session ID"));
|
||||
_("<mutter_session> attribute seen but we already have the session ID"));
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1206,7 +1206,7 @@ start_element_handler (GMarkupParseContext *context,
|
||||
G_MARKUP_ERROR,
|
||||
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
|
||||
_("Unknown attribute %s on <%s> element"),
|
||||
name, "metacity_session");
|
||||
name, "mutter_session");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1530,7 +1530,7 @@ get_possible_matches (MetaWindow *window)
|
||||
|
||||
retval = NULL;
|
||||
|
||||
ignore_client_id = g_getenv ("METACITY_DEBUG_SM") != NULL;
|
||||
ignore_client_id = g_getenv ("MUTTER_DEBUG_SM") != NULL;
|
||||
|
||||
tmp = window_info_list;
|
||||
while (tmp != NULL)
|
||||
@ -1715,7 +1715,7 @@ regenerate_save_file (void)
|
||||
|
||||
if (client_id)
|
||||
full_save_path = g_strconcat (g_get_user_config_dir (),
|
||||
G_DIR_SEPARATOR_S "metacity"
|
||||
G_DIR_SEPARATOR_S "mutter"
|
||||
G_DIR_SEPARATOR_S "sessions" G_DIR_SEPARATOR_S,
|
||||
client_id,
|
||||
".ms",
|
||||
|
||||
@ -276,7 +276,7 @@ main (int argc, char **argv)
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (getenv ("METACITY_SYNC") != NULL)
|
||||
if (getenv ("MUTTER_SYNC") != NULL)
|
||||
XSynchronize (xdisplay, True);
|
||||
|
||||
XSetErrorHandler (x_error_handler);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity box operation testing program */
|
||||
/* Mutter box operation testing program */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2005 Elijah Newren
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity utilities */
|
||||
/* Mutter utilities */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
@ -81,14 +81,14 @@ static FILE* logfile = NULL;
|
||||
static void
|
||||
ensure_logfile (void)
|
||||
{
|
||||
if (logfile == NULL && g_getenv ("METACITY_USE_LOGFILE"))
|
||||
if (logfile == NULL && g_getenv ("MUTTER_USE_LOGFILE"))
|
||||
{
|
||||
char *filename = NULL;
|
||||
char *tmpl;
|
||||
int fd;
|
||||
GError *err;
|
||||
|
||||
tmpl = g_strdup_printf ("metacity-%d-debug-log-XXXXXX",
|
||||
tmpl = g_strdup_printf ("mutter-%d-debug-log-XXXXXX",
|
||||
(int) getpid ());
|
||||
|
||||
err = NULL;
|
||||
@ -135,7 +135,7 @@ meta_set_verbose (gboolean setting)
|
||||
{
|
||||
#ifndef WITH_VERBOSE_MODE
|
||||
if (setting)
|
||||
meta_fatal (_("Metacity was compiled without support for verbose mode\n"));
|
||||
meta_fatal (_("Mutter was compiled without support for verbose mode\n"));
|
||||
#else
|
||||
if (setting)
|
||||
ensure_logfile ();
|
||||
@ -567,7 +567,7 @@ meta_show_dialog (const char *type,
|
||||
argvl[i++] = screen_number_text;
|
||||
argvl[i++] = "--title";
|
||||
/* Translators: This is the title used on dialog boxes */
|
||||
argvl[i++] = _("Metacity");
|
||||
argvl[i++] = _("Mutter");
|
||||
argvl[i++] = "--text";
|
||||
argvl[i++] = message;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/**
|
||||
* \file window-private.h Windows which Metacity manages
|
||||
* \file window-private.h Windows which Mutter manages
|
||||
*
|
||||
* Managing X windows.
|
||||
* This file contains methods on this class which are available to
|
||||
|
||||
@ -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)
|
||||
{
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity Workspaces */
|
||||
/* Mutter Workspaces */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
/* Metacity X property convenience routines */
|
||||
/* Mutter X property convenience routines */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 Havoc Pennington
|
||||
@ -86,7 +86,7 @@ from The Open Group.
|
||||
#include "util.h"
|
||||
#include "async-getprop.h"
|
||||
#include "ui.h"
|
||||
#include "metacity-Xatomtype.h"
|
||||
#include "mutter-Xatomtype.h"
|
||||
#include <X11/Xatom.h>
|
||||
#include <string.h>
|
||||
#include "window-private.h"
|
||||
|
||||
Reference in New Issue
Block a user