isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

meta: Add META namespace to macros

Browse Source 
To silence warnings during GIR generation.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/822
This commit is contained in:
Robert Mader 2019-10-02 20:23:41 +02:00 committed by Marco Trevisan
parent 5e7fa20f06
commit a8155a0471
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-monitor-manager.c
View File

@ -2493,7 +2493,7 @@ meta_monitor_manager_get_logical_monitor_at (MetaMonitorManager *manager,
{ {
MetaLogicalMonitor *logical_monitor = l->data; MetaLogicalMonitor *logical_monitor = l->data;
if (POINT_IN_RECT (x, y, logical_monitor->rect)) if (META_POINT_IN_RECT (x, y, logical_monitor->rect))
return logical_monitor; return logical_monitor;
} }

4
src/core/display.c
View File

@ -1071,7 +1071,7 @@ meta_get_display (void)
static inline gboolean static inline gboolean
grab_op_is_window (MetaGrabOp op) grab_op_is_window (MetaGrabOp op)
{ {
return GRAB_OP_GET_BASE_TYPE (op) == META_GRAB_OP_WINDOW_BASE; return META_GRAB_OP_GET_BASE_TYPE (op) == META_GRAB_OP_WINDOW_BASE;
} }
gboolean gboolean
@ -1674,7 +1674,7 @@ get_first_freefloating_window (MetaWindow *window)
static MetaEventRoute static MetaEventRoute
get_event_route_from_grab_op (MetaGrabOp op) get_event_route_from_grab_op (MetaGrabOp op)
{ {
switch (GRAB_OP_GET_BASE_TYPE (op)) switch (META_GRAB_OP_GET_BASE_TYPE (op))
{ {
case META_GRAB_OP_NONE: case META_GRAB_OP_NONE:
/* begin_grab_op shouldn't be called with META_GRAB_OP_NONE. */ /* begin_grab_op shouldn't be called with META_GRAB_OP_NONE. */

2
src/core/stack.c
View File

@ -1146,7 +1146,7 @@ window_contains_point (MetaWindow *window,
meta_window_get_frame_rect (window, &rect); meta_window_get_frame_rect (window, &rect);
return POINT_IN_RECT (root_x, root_y, rect); return META_POINT_IN_RECT (root_x, root_y, rect);
} }
static gboolean static gboolean

4
src/meta/common.h
View File

@ -147,7 +147,7 @@ enum
_WGO_N = META_GRAB_OP_WINDOW_DIR_NORTH, _WGO_N = META_GRAB_OP_WINDOW_DIR_NORTH,
}; };
#define GRAB_OP_GET_BASE_TYPE(op) (op & 0x00FF) #define META_GRAB_OP_GET_BASE_TYPE(op) (op & 0x00FF)
typedef enum typedef enum
{ {
@ -507,7 +507,7 @@ void meta_frame_borders_clear (MetaFrameBorders *self);
/************************************************************/ /************************************************************/
#define POINT_IN_RECT(xcoord, ycoord, rect) \ #define META_POINT_IN_RECT(xcoord, ycoord, rect) \
((xcoord) >= (rect).x && \ ((xcoord) >= (rect).x && \
(xcoord) < ((rect).x + (rect).width) && \ (xcoord) < ((rect).x + (rect).width) && \
(ycoord) >= (rect).y && \ (ycoord) >= (rect).y && \

12
src/ui/frames.c
View File

@ -1733,18 +1733,18 @@ get_control (MetaUIFrame *frame, int root_x, int root_y)
y = root_y - win_y; y = root_y - win_y;
meta_window_get_client_area_rect (frame->meta_window, &client); meta_window_get_client_area_rect (frame->meta_window, &client);
if (POINT_IN_RECT (x, y, client)) if (META_POINT_IN_RECT (x, y, client))
return META_FRAME_CONTROL_CLIENT_AREA; return META_FRAME_CONTROL_CLIENT_AREA;
meta_ui_frame_calc_geometry (frame, &fgeom); meta_ui_frame_calc_geometry (frame, &fgeom);
if (POINT_IN_RECT (x, y, fgeom.close_rect.clickable)) if (META_POINT_IN_RECT (x, y, fgeom.close_rect.clickable))
return META_FRAME_CONTROL_DELETE; return META_FRAME_CONTROL_DELETE;
if (POINT_IN_RECT (x, y, fgeom.min_rect.clickable)) if (META_POINT_IN_RECT (x, y, fgeom.min_rect.clickable))
return META_FRAME_CONTROL_MINIMIZE; return META_FRAME_CONTROL_MINIMIZE;
if (POINT_IN_RECT (x, y, fgeom.menu_rect.clickable)) if (META_POINT_IN_RECT (x, y, fgeom.menu_rect.clickable))
return META_FRAME_CONTROL_MENU; return META_FRAME_CONTROL_MENU;
flags = meta_frame_get_flags (frame->meta_window->frame); flags = meta_frame_get_flags (frame->meta_window->frame);
@ -1757,7 +1757,7 @@ get_control (MetaUIFrame *frame, int root_x, int root_y)
if (flags & META_FRAME_TILED_LEFT || flags & META_FRAME_TILED_RIGHT) if (flags & META_FRAME_TILED_LEFT || flags & META_FRAME_TILED_RIGHT)
has_vert = has_horiz = FALSE; has_vert = has_horiz = FALSE;
if (POINT_IN_RECT (x, y, fgeom.title_rect)) if (META_POINT_IN_RECT (x, y, fgeom.title_rect))
{ {
if (has_vert && y <= TOP_RESIZE_HEIGHT && has_north_resize) if (has_vert && y <= TOP_RESIZE_HEIGHT && has_north_resize)
return META_FRAME_CONTROL_RESIZE_N; return META_FRAME_CONTROL_RESIZE_N;
@ -1765,7 +1765,7 @@ get_control (MetaUIFrame *frame, int root_x, int root_y)
return META_FRAME_CONTROL_TITLE; return META_FRAME_CONTROL_TITLE;
} }
if (POINT_IN_RECT (x, y, fgeom.max_rect.clickable)) if (META_POINT_IN_RECT (x, y, fgeom.max_rect.clickable))
{ {
if (flags & META_FRAME_MAXIMIZED) if (flags & META_FRAME_MAXIMIZED)
return META_FRAME_CONTROL_UNMAXIMIZE; return META_FRAME_CONTROL_UNMAXIMIZE;