[gtk+/client-side-decorations] Strip down common.h to only the things we need

[Federico Mena Quintero <federico src gnome org>]

commit 60d10a4e3694c5e1cf556fb7898af0d7a6020209
Author: Federico Mena Quintero <federico novell com>
Date:   Thu Jun 10 16:20:45 2010 -0500

    Strip down common.h to only the things we need
    
    Types and macros which are not used in the theming code are removed.

 gtk/common.h |  297 +---------------------------------------------------------
 1 files changed, 4 insertions(+), 293 deletions(-)
---
diff --git a/gtk/common.h b/gtk/common.h
index 6681482..a2061da 100644
--- a/gtk/common.h
+++ b/gtk/common.h
@@ -1,5 +1,9 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+/* This is the same as Mutter's common.h, but stripped-down to have
+ * only the types and macros required by the theming code.
+ */
+
 /* Mutter common types shared by core.h and ui.h */
 
 /* 
@@ -26,11 +30,8 @@
 #define META_COMMON_H
 
 /* Don't include GTK or core headers here */
-#include <X11/Xlib.h>
 #include <glib.h>
 
-typedef struct _MetaResizePopup MetaResizePopup;
-
 typedef enum
 {
   META_FRAME_ALLOWS_DELETE            = 1 << 0,
@@ -52,143 +53,6 @@ typedef enum
 
 typedef enum
 {
-  META_MENU_OP_NONE        = 0,
-  META_MENU_OP_DELETE      = 1 << 0,
-  META_MENU_OP_MINIMIZE    = 1 << 1,
-  META_MENU_OP_UNMAXIMIZE  = 1 << 2,
-  META_MENU_OP_MAXIMIZE    = 1 << 3,
-  META_MENU_OP_UNSHADE     = 1 << 4,
-  META_MENU_OP_SHADE       = 1 << 5,
-  META_MENU_OP_UNSTICK     = 1 << 6,
-  META_MENU_OP_STICK       = 1 << 7,
-  META_MENU_OP_WORKSPACES  = 1 << 8,
-  META_MENU_OP_MOVE        = 1 << 9,
-  META_MENU_OP_RESIZE      = 1 << 10,
-  META_MENU_OP_ABOVE       = 1 << 11,
-  META_MENU_OP_UNABOVE     = 1 << 12,
-  META_MENU_OP_MOVE_LEFT   = 1 << 13,
-  META_MENU_OP_MOVE_RIGHT  = 1 << 14,
-  META_MENU_OP_MOVE_UP     = 1 << 15,
-  META_MENU_OP_MOVE_DOWN   = 1 << 16,
-  META_MENU_OP_RECOVER     = 1 << 17
-} MetaMenuOp;
-
-typedef struct _MetaWindowMenu MetaWindowMenu;
-
-typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu,
-                                     Display        *xdisplay,
-                                     Window          client_xwindow,
-                                     guint32         timestamp,
-                                     MetaMenuOp      op,
-                                     int             workspace,
-                                     gpointer        data);
-
-/* when changing this enum, there are various switch statements
- * you have to update
- */
-typedef enum
-{
-  META_GRAB_OP_NONE,
-
-  /* Mouse ops */
-  META_GRAB_OP_MOVING,
-  META_GRAB_OP_RESIZING_SE,
-  META_GRAB_OP_RESIZING_S,
-  META_GRAB_OP_RESIZING_SW,
-  META_GRAB_OP_RESIZING_N,
-  META_GRAB_OP_RESIZING_NE,
-  META_GRAB_OP_RESIZING_NW,
-  META_GRAB_OP_RESIZING_W,
-  META_GRAB_OP_RESIZING_E,
-
-  /* Keyboard ops */
-  META_GRAB_OP_KEYBOARD_MOVING,
-  META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN,
-  META_GRAB_OP_KEYBOARD_RESIZING_S,
-  META_GRAB_OP_KEYBOARD_RESIZING_N,
-  META_GRAB_OP_KEYBOARD_RESIZING_W,
-  META_GRAB_OP_KEYBOARD_RESIZING_E,
-  META_GRAB_OP_KEYBOARD_RESIZING_SE,
-  META_GRAB_OP_KEYBOARD_RESIZING_NE,
-  META_GRAB_OP_KEYBOARD_RESIZING_SW,
-  META_GRAB_OP_KEYBOARD_RESIZING_NW,
-
-  /* Alt+Tab */
-  META_GRAB_OP_KEYBOARD_TABBING_NORMAL,
-  META_GRAB_OP_KEYBOARD_TABBING_DOCK,
-
-  /* Alt+Esc */
-  META_GRAB_OP_KEYBOARD_ESCAPING_NORMAL,
-  META_GRAB_OP_KEYBOARD_ESCAPING_DOCK,
-
-  META_GRAB_OP_KEYBOARD_ESCAPING_GROUP,
-  
-  /* Alt+F6 */
-  META_GRAB_OP_KEYBOARD_TABBING_GROUP,
-  
-  META_GRAB_OP_KEYBOARD_WORKSPACE_SWITCHING,
-  
-  /* Frame button ops */
-  META_GRAB_OP_CLICKING_MINIMIZE,
-  META_GRAB_OP_CLICKING_MAXIMIZE,
-  META_GRAB_OP_CLICKING_UNMAXIMIZE,
-  META_GRAB_OP_CLICKING_DELETE,
-  META_GRAB_OP_CLICKING_MENU,
-  META_GRAB_OP_CLICKING_SHADE,
-  META_GRAB_OP_CLICKING_UNSHADE,
-  META_GRAB_OP_CLICKING_ABOVE,
-  META_GRAB_OP_CLICKING_UNABOVE,
-  META_GRAB_OP_CLICKING_STICK,
-  META_GRAB_OP_CLICKING_UNSTICK,
-
-  /* Special grab op when the compositor asked for a grab */
-  META_GRAB_OP_COMPOSITOR
-} MetaGrabOp;
-
-typedef enum
-{
-  META_CURSOR_DEFAULT,
-  META_CURSOR_NORTH_RESIZE,
-  META_CURSOR_SOUTH_RESIZE,
-  META_CURSOR_WEST_RESIZE,
-  META_CURSOR_EAST_RESIZE,
-  META_CURSOR_SE_RESIZE,
-  META_CURSOR_SW_RESIZE,
-  META_CURSOR_NE_RESIZE,
-  META_CURSOR_NW_RESIZE,
-  META_CURSOR_MOVE_OR_RESIZE_WINDOW,
-  META_CURSOR_BUSY
-
-} MetaCursor;
-
-typedef enum
-{
-  META_FOCUS_MODE_CLICK,
-  META_FOCUS_MODE_SLOPPY,
-  META_FOCUS_MODE_MOUSE
-} MetaFocusMode;
-
-typedef enum
-{
-  META_FOCUS_NEW_WINDOWS_SMART,
-  META_FOCUS_NEW_WINDOWS_STRICT
-} MetaFocusNewWindows;
-
-typedef enum
-{
-  META_ACTION_TITLEBAR_TOGGLE_SHADE,
-  META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE,
-  META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE_HORIZONTALLY,
-  META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE_VERTICALLY,
-  META_ACTION_TITLEBAR_MINIMIZE,
-  META_ACTION_TITLEBAR_NONE,
-  META_ACTION_TITLEBAR_LOWER,
-  META_ACTION_TITLEBAR_MENU,
-  META_ACTION_TITLEBAR_LAST
-} MetaActionTitlebar;
-
-typedef enum
-{
   META_FRAME_TYPE_NORMAL,
   META_FRAME_TYPE_DIALOG,
   META_FRAME_TYPE_MODAL_DIALOG,
@@ -198,74 +62,6 @@ typedef enum
   META_FRAME_TYPE_LAST
 } MetaFrameType;
 
-typedef enum
-{
-  /* Create gratuitous divergence from regular
-   * X mod bits, to be sure we find bugs
-   */
-  META_VIRTUAL_SHIFT_MASK    = 1 << 5,
-  META_VIRTUAL_CONTROL_MASK  = 1 << 6,
-  META_VIRTUAL_ALT_MASK      = 1 << 7,  
-  META_VIRTUAL_META_MASK     = 1 << 8,
-  META_VIRTUAL_SUPER_MASK    = 1 << 9,
-  META_VIRTUAL_HYPER_MASK    = 1 << 10,
-  META_VIRTUAL_MOD2_MASK     = 1 << 11,
-  META_VIRTUAL_MOD3_MASK     = 1 << 12,
-  META_VIRTUAL_MOD4_MASK     = 1 << 13,
-  META_VIRTUAL_MOD5_MASK     = 1 << 14
-} MetaVirtualModifier;
-
-/* Relative directions or sides seem to come up all over the place... */
-/* FIXME: Replace
- *   screen.[ch]:MetaScreenDirection,
- *   workspace.[ch]:MetaMotionDirection,
- * with the use of MetaDirection.
- */
-typedef enum
-{
-  META_DIRECTION_LEFT       = 1 << 0,
-  META_DIRECTION_RIGHT      = 1 << 1,
-  META_DIRECTION_TOP        = 1 << 2,
-  META_DIRECTION_BOTTOM     = 1 << 3,
-
-  /* Some aliases for making code more readable for various circumstances. */
-  META_DIRECTION_UP         = META_DIRECTION_TOP,
-  META_DIRECTION_DOWN       = META_DIRECTION_BOTTOM,
-
-  /* A few more definitions using aliases */
-  META_DIRECTION_HORIZONTAL = META_DIRECTION_LEFT | META_DIRECTION_RIGHT,
-  META_DIRECTION_VERTICAL   = META_DIRECTION_UP   | META_DIRECTION_DOWN,
-} MetaDirection;
-
-/* Negative to avoid conflicting with real workspace
- * numbers
- */
-typedef enum
-{
-  META_MOTION_UP = -1,
-  META_MOTION_DOWN = -2,
-  META_MOTION_LEFT = -3,
-  META_MOTION_RIGHT = -4,
-  /* These are only used for effects */
-  META_MOTION_UP_LEFT = -5,
-  META_MOTION_UP_RIGHT = -6,
-  META_MOTION_DOWN_LEFT = -7,
-  META_MOTION_DOWN_RIGHT = -8
-} MetaMotionDirection;
-
-/* Sometimes we want to talk about sides instead of directions; note
- * that the values must be as follows or meta_window_update_struts()
- * won't work. Using these values also is a safety blanket since
- * MetaDirection used to be used as a side.
- */
-typedef enum
-{
-  META_SIDE_LEFT            = META_DIRECTION_LEFT,
-  META_SIDE_RIGHT           = META_DIRECTION_RIGHT,
-  META_SIDE_TOP             = META_DIRECTION_TOP,
-  META_SIDE_BOTTOM          = META_DIRECTION_BOTTOM
-} MetaSide;
-
 /* Function a window button can have.  Note, you can't add stuff here
  * without extending the theme format to draw a new function and
  * breaking all existing themes.
@@ -299,89 +95,4 @@ struct _MetaButtonLayout
   gboolean right_buttons_has_spacer[MAX_BUTTONS_PER_CORNER];
 };
 
-/* should investigate changing these to whatever most apps use */
-#define META_ICON_WIDTH 32
-#define META_ICON_HEIGHT 32
-#define META_MINI_ICON_WIDTH 16
-#define META_MINI_ICON_HEIGHT 16
-
-#define META_DEFAULT_ICON_NAME "window"
-
-/* Main loop priorities determine when activity in the GLib
- * will take precendence over the others. Priorities are sometimes
- * used to enforce ordering: give A a higher priority than B if
- * A must occur before B. But that poses a problem since then
- * if A occurs frequently enough, B will never occur.
- *
- * Anything we want to occur more or less immediately should
- * have a priority of G_PRIORITY_DEFAULT. When we want to
- * coelesce multiple things together, the appropriate place to
- * do it is usually META_PRIORITY_BEFORE_REDRAW.
- *
- * Note that its usually better to use meta_later_add() rather
- * than calling g_idle_add() directly; this will make sure things
- * get run when added from a clutter event handler without
- * waiting for another repaint cycle.
- *
- * If something has a priority lower than the redraw priority
- * (such as a default priority idle), then it may be arbitrarily
- * delayed. This happens if the screen is updating rapidly: we
- * are spending all our time either redrawing or waiting for a
- * vblank-synced buffer swap. (When X is improved to allow
- * clutter to do the buffer-swap asychronously, this will get
- * better.)
- */
-
-/* G_PRIORITY_DEFAULT:
- *  events
- *  many timeouts
- */
-
-/* GTK_PRIORITY_RESIZE:         (G_PRIORITY_HIGH_IDLE + 10) */
-#define META_PRIORITY_RESIZE    (G_PRIORITY_HIGH_IDLE + 15)
-/* GTK_PRIORITY_REDRAW:         (G_PRIORITY_HIGH_IDLE + 20) */
-
-#define META_PRIORITY_BEFORE_REDRAW  (G_PRIORITY_HIGH_IDLE + 40)
-/*  calc-showing idle
- *  update-icon idle
- */
-
-/* CLUTTER_PRIORITY_REDRAW:     (G_PRIORITY_HIGH_IDLE + 50) */
-#define META_PRIORITY_REDRAW    (G_PRIORITY_HIGH_IDLE + 50)
-
-/* ==== Anything below here can be starved arbitrarily ==== */
-
-/* G_PRIORITY_DEFAULT_IDLE:
- *  Mutter plugin unloading
- *  GConf notify idle
- */
-
-/* Chosen to be below the GConf notify idle */
-#define META_PRIORITY_PREFS_NOTIFY   (G_PRIORITY_DEFAULT_IDLE + 10)
-
-/************************************************************/
-
-#define POINT_IN_RECT(xcoord, ycoord, rect) \
- ((xcoord) >= (rect).x &&                   \
-  (xcoord) <  ((rect).x + (rect).width) &&  \
-  (ycoord) >= (rect).y &&                   \
-  (ycoord) <  ((rect).y + (rect).height))
-
-/**
- * Layers a window can be in.
- * These MUST be in the order of stacking.
- */
-typedef enum
-{
-  META_LAYER_DESKTOP	       = 0,
-  META_LAYER_BOTTOM	       = 1,
-  META_LAYER_NORMAL	       = 2,
-  META_LAYER_TOP	       = 4, /* Same as DOCK; see EWMH and bug 330717 */
-  META_LAYER_DOCK	       = 4,
-  META_LAYER_FULLSCREEN	       = 5,
-  META_LAYER_FOCUSED_WINDOW    = 6,
-  META_LAYER_OVERRIDE_REDIRECT = 7,
-  META_LAYER_LAST	       = 8
-} MetaStackLayer;
-
 #endif