meta: Move private defines to a private header

These defines are unused outside of mutter, and actually not
desirable to export. Move them to a private header.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/859
This commit is contained in:
Carlos Garnacho 2019-10-15 12:56:26 +02:00 committed by Jonas Ådahl
parent c2d03bf73e
commit 97010ac64d
5 changed files with 11 additions and 8 deletions

View File

@ -55,6 +55,7 @@
#include "backends/meta-output.h"
#include "backends/x11/meta-monitor-manager-xrandr.h"
#include "clutter/clutter.h"
#include "core/main-private.h"
#include "core/util-private.h"
#include "meta/main.h"
#include "meta/meta-x11-errors.h"

View File

@ -37,6 +37,14 @@ typedef enum _MetaDisplayPolicy
META_DISPLAY_POLICY_DISABLED,
} MetaDisplayPolicy;
#define META_POINT_IN_RECT(xcoord, ycoord, rect) \
((xcoord) >= (rect).x && \
(xcoord) < ((rect).x + (rect).width) && \
(ycoord) >= (rect).y && \
(ycoord) < ((rect).y + (rect).height))
#define META_GRAB_OP_GET_BASE_TYPE(op) (op & 0x00FF)
META_EXPORT_TEST
void meta_override_compositor_configuration (MetaCompositorType compositor_type,
GType backend_gtype);

View File

@ -32,6 +32,7 @@
#include "backends/meta-logical-monitor.h"
#include "cogl/cogl-trace.h"
#include "core/frame.h"
#include "core/main-private.h"
#include "core/meta-workspace-manager-private.h"
#include "core/window-private.h"
#include "meta/group.h"

View File

@ -147,8 +147,6 @@ enum
_WGO_N = META_GRAB_OP_WINDOW_DIR_NORTH,
};
#define META_GRAB_OP_GET_BASE_TYPE(op) (op & 0x00FF)
typedef enum
{
META_GRAB_OP_NONE,
@ -507,12 +505,6 @@ void meta_frame_borders_clear (MetaFrameBorders *self);
/************************************************************/
#define META_POINT_IN_RECT(xcoord, ycoord, rect) \
((xcoord) >= (rect).x && \
(xcoord) < ((rect).x + (rect).width) && \
(ycoord) >= (rect).y && \
(ycoord) < ((rect).y + (rect).height))
/**
* MetaStackLayer:
* @META_LAYER_DESKTOP: Desktop layer

View File

@ -25,6 +25,7 @@
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include "core/main-private.h"
#include "meta/common.h"
#include "meta/types.h"
#include "ui/theme-private.h"