core/core: Rename and move to x11/meta-x11-window-control

The functionality core/core.c and core/core.h provides are helpers for
the window decorations. This was not possible to derive from the name
itself, thus rename it and put it in the right place.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/854
This commit is contained in:
Jonas Ådahl 2019-10-13 16:47:47 +02:00 committed by Florian Müllner
parent 7c2e926c44
commit da213febdc
5 changed files with 9 additions and 8 deletions

View File

@ -330,8 +330,6 @@ mutter_sources = [
'core/boxes-private.h', 'core/boxes-private.h',
'core/constraints.c', 'core/constraints.c',
'core/constraints.h', 'core/constraints.h',
'core/core.c',
'core/core.h',
'core/delete.c', 'core/delete.c',
'core/display.c', 'core/display.c',
'core/display-private.h', 'core/display-private.h',
@ -414,6 +412,8 @@ mutter_sources = [
'x11/meta-x11-selection-output-stream-private.h', 'x11/meta-x11-selection-output-stream-private.h',
'x11/meta-x11-stack.c', 'x11/meta-x11-stack.c',
'x11/meta-x11-stack-private.h', 'x11/meta-x11-stack-private.h',
'x11/meta-x11-window-control.c',
'x11/meta-x11-window-control.h',
'x11/mutter-Xatomtype.h', 'x11/mutter-Xatomtype.h',
'x11/session.c', 'x11/session.c',
'x11/session.h', 'x11/session.h',

View File

@ -27,7 +27,6 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "core/core.h"
#include "core/frame.h" #include "core/frame.h"
#include "core/window-private.h" #include "core/window-private.h"
#include "meta/boxes.h" #include "meta/boxes.h"
@ -36,6 +35,7 @@
#include "meta/util.h" #include "meta/util.h"
#include "ui/ui.h" #include "ui/ui.h"
#include "ui/frames.h" #include "ui/frames.h"
#include "x11/meta-x11-window-control.h"
#include "x11/window-x11-private.h" #include "x11/window-x11-private.h"
#include "x11/window-x11.h" #include "x11/window-x11.h"

View File

@ -25,13 +25,13 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "core/core.h"
#include "meta/prefs.h" #include "meta/prefs.h"
#include "meta/util.h" #include "meta/util.h"
#include "ui/frames.h" #include "ui/frames.h"
#include "ui/theme-private.h" #include "ui/theme-private.h"
#include "ui/ui.h" #include "ui/ui.h"
#include "x11/meta-x11-display-private.h" #include "x11/meta-x11-display-private.h"
#include "x11/meta-x11-window-control.h"
struct _MetaUI struct _MetaUI
{ {

View File

@ -23,7 +23,8 @@
#include "config.h" #include "config.h"
#include "core/core.h" #include "x11/meta-x11-window-control.h"
#include "core/frame.h" #include "core/frame.h"
#include "core/meta-workspace-manager-private.h" #include "core/meta-workspace-manager-private.h"
#include "core/util-private.h" #include "core/util-private.h"

View File

@ -20,8 +20,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef META_CORE_H #ifndef META_X11_WINDOW__CONTROL_H
#define META_CORE_H #define META_X11_WINDOW__CONTROL_H
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
@ -77,4 +77,4 @@ void meta_core_set_screen_cursor (Display *xdisplay,
Window frame_on_screen, Window frame_on_screen,
MetaCursor cursor); MetaCursor cursor);
#endif #endif /* META_X11_WINDOW_CONTROL_H */