From f940292cfe5a80290a5dae8a62e05fbcbab32a7f Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 18 Mar 2014 21:22:58 -0400 Subject: [PATCH] Move MetaGroup to be X11-specific --- src/Makefile.am | 4 +--- src/core/stack.c | 2 +- src/core/window-private.h | 2 ++ src/core/window.c | 2 +- src/meta/types.h | 5 ----- src/x11/group-private.h | 41 --------------------------------------- src/x11/group-props.c | 1 - src/x11/group-props.h | 2 +- src/x11/group.c | 2 +- src/{meta => x11}/group.h | 26 ++++++++++++++++--------- src/x11/window-props.c | 2 +- 11 files changed, 25 insertions(+), 64 deletions(-) delete mode 100644 src/x11/group-private.h rename src/{meta => x11}/group.h (84%) diff --git a/src/Makefile.am b/src/Makefile.am index fff1f22dd..7bb7b586b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -183,11 +183,10 @@ libmutter_wayland_la_SOURCES = \ x11/iconcache.h \ x11/async-getprop.c \ x11/async-getprop.h \ - x11/group-private.h \ x11/group-props.c \ x11/group-props.h \ x11/group.c \ - meta/group.h \ + x11/group.h \ x11/window-props.c \ x11/window-props.h \ x11/window-x11.c \ @@ -234,7 +233,6 @@ libmutterinclude_base_headers = \ meta/display.h \ meta/errors.h \ meta/gradient.h \ - meta/group.h \ meta/keybindings.h \ meta/main.h \ meta/meta-background-actor.h \ diff --git a/src/core/stack.c b/src/core/stack.c index c9223ccd4..c088bea62 100644 --- a/src/core/stack.c +++ b/src/core/stack.c @@ -30,7 +30,7 @@ #include "window-private.h" #include #include "frame.h" -#include +#include "group.h" #include #include diff --git a/src/core/window-private.h b/src/core/window-private.h index 8a90de67e..b52d88b2c 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -45,6 +45,8 @@ #include #include "meta-wayland-types.h" +#include "group.h" + typedef struct _MetaWindowQueue MetaWindowQueue; typedef enum { diff --git a/src/core/window.c b/src/core/window.c index 6bc821acc..2a4503d1c 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -43,7 +43,7 @@ #include #include "resizepopup.h" #include "xprops.h" -#include +#include "group.h" #include "window-props.h" #include "constraints.h" #include "mutter-enum-types.h" diff --git a/src/meta/types.h b/src/meta/types.h index cd6af2b63..13446ef31 100644 --- a/src/meta/types.h +++ b/src/meta/types.h @@ -30,11 +30,6 @@ typedef struct _MetaFrame MetaFrame; typedef struct _MetaScreen MetaScreen; typedef struct _MetaWindow MetaWindow; typedef struct _MetaWorkspace MetaWorkspace; -/** - * MetaGroup: (skip) - * - */ -typedef struct _MetaGroup MetaGroup; typedef struct _MetaKeyBinding MetaKeyBinding; typedef struct _MetaCursorTracker MetaCursorTracker; diff --git a/src/x11/group-private.h b/src/x11/group-private.h deleted file mode 100644 index 72e6cd275..000000000 --- a/src/x11/group-private.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - -/* Mutter window group private header */ - -/* - * Copyright (C) 2002 Red Hat Inc. - * - * 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, see . - */ - -#ifndef META_GROUP_PRIVATE_H -#define META_GROUP_PRIVATE_H - -#include - -struct _MetaGroup -{ - int refcount; - MetaDisplay *display; - GSList *windows; - Window group_leader; - char *startup_id; - char *wm_client_machine; -}; - -#endif - - - - diff --git a/src/x11/group-props.c b/src/x11/group-props.c index 521ffbd60..f079d2c72 100644 --- a/src/x11/group-props.c +++ b/src/x11/group-props.c @@ -21,7 +21,6 @@ #include #include "group-props.h" -#include "group-private.h" #include "xprops.h" #include diff --git a/src/x11/group-props.h b/src/x11/group-props.h index 1fb49ea1a..492b87241 100644 --- a/src/x11/group-props.h +++ b/src/x11/group-props.h @@ -22,7 +22,7 @@ #ifndef META_GROUP_PROPS_H #define META_GROUP_PROPS_H -#include +#include "group.h" #include "window-private.h" void meta_group_reload_property (MetaGroup *group, diff --git a/src/x11/group.c b/src/x11/group.c index 8965735c2..71b2280b7 100644 --- a/src/x11/group.c +++ b/src/x11/group.c @@ -27,7 +27,7 @@ #include #include -#include "group-private.h" +#include "group.h" #include "group-props.h" #include "window-private.h" #include diff --git a/src/meta/group.h b/src/x11/group.h similarity index 84% rename from src/meta/group.h rename to src/x11/group.h index 2ec647806..7d97e44a5 100644 --- a/src/meta/group.h +++ b/src/x11/group.h @@ -1,10 +1,10 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -/* Mutter window groups */ +/* Mutter window group private header */ -/* +/* * Copyright (C) 2002 Red Hat Inc. - * + * * 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 @@ -14,7 +14,7 @@ * 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, see . */ @@ -26,9 +26,21 @@ #include #include +typedef struct _MetaGroup MetaGroup; + +struct _MetaGroup +{ + int refcount; + MetaDisplay *display; + GSList *windows; + Window group_leader; + char *startup_id; + char *wm_client_machine; +}; + /* note, can return NULL */ MetaGroup* meta_window_get_group (MetaWindow *window); -void meta_window_compute_group (MetaWindow* window); +void meta_window_compute_group (MetaWindow *window); void meta_window_shutdown_group (MetaWindow *window); void meta_window_group_leader_changed (MetaWindow *window); @@ -49,7 +61,3 @@ gboolean meta_group_property_notify (MetaGroup *group, XEvent *event); #endif - - - - diff --git a/src/x11/window-props.c b/src/x11/window-props.c index b1bd6e1e4..5b4707b14 100644 --- a/src/x11/window-props.c +++ b/src/x11/window-props.c @@ -44,7 +44,7 @@ #include #include "xprops.h" #include "frame.h" -#include +#include "group.h" #include #include #include