X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.h;h=915c08db73ffabf79f46f14ba08030b15b660296;hb=HEAD;hp=0d3cf0e71a78f4aa818a83fe9bb49778f860cb89;hpb=b8f207892a11b53365c47b4828254269fca5c8e9;p=chaz%2Fopenbox diff --git a/openbox/frame.h b/openbox/frame.h index 0d3cf0e7..915c08db 100644 --- a/openbox/frame.h +++ b/openbox/frame.h @@ -21,7 +21,7 @@ #define __frame_h #include "geom.h" -#include "render/render.h" +#include "obrender/render.h" typedef struct _ObFrame ObFrame; @@ -53,9 +53,16 @@ typedef enum { /*! This is a special context, which occurs while dragging a window in a move/resize */ OB_FRAME_CONTEXT_MOVE_RESIZE, + OB_FRAME_CONTEXT_DOCK, OB_FRAME_NUM_CONTEXTS } ObFrameContext; +#define FRAME_CONTEXT(co, cl) ((cl && cl->type != OB_CLIENT_TYPE_DESKTOP) ? \ + co == OB_FRAME_CONTEXT_FRAME : FALSE) +#define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \ + co == OB_FRAME_CONTEXT_DESKTOP : \ + co == OB_FRAME_CONTEXT_CLIENT) + /*! The decorations the client window wants to be displayed on it */ typedef enum { OB_FRAME_DECOR_TITLEBAR = 1 << 0, /*!< Display a titlebar */ @@ -68,7 +75,7 @@ typedef enum { /*! Display a button to toggle the window's placement on all desktops */ OB_FRAME_DECOR_ALLDESKTOPS = 1 << 7, - OB_FRAME_DECOR_SHADE = 1 << 8, /*!< Displays a shade button */ + OB_FRAME_DECOR_SHADE = 1 << 8, /*!< Display a shade button */ OB_FRAME_DECOR_CLOSE = 1 << 9 /*!< Display a close button */ } ObFrameDecorations; @@ -77,16 +84,15 @@ struct _ObFrame struct _ObClient *client; Window window; - Window plate; - Strut size; + Strut size; /* the size of the frame */ + Strut oldsize; /* the size of the frame last told to the client */ Rect area; gboolean visible; guint functions; guint decorations; - Window inner; /*!< The window for drawing the inner client border */ Window title; Window label; Window max; @@ -118,6 +124,17 @@ struct _ObFrame Window rgriptop; Window rgripright; Window rgripbottom; + Window innerleft; /*!< For drawing the inner client border */ + Window innertop; /*!< For drawing the inner client border */ + Window innerright; /*!< For drawing the inner client border */ + Window innerbottom; /*!< For drawing the inner client border */ + Window innerblb; + Window innerbll; + Window innerbrb; + Window innerbrr; + Window backback; /*!< A colored window shown while resizing */ + Window backfront; /*!< An undrawn-in window, to prevent flashing on + unmap */ /* These are resize handles inside the titlebar */ Window topresize; @@ -128,16 +145,6 @@ struct _ObFrame Colormap colormap; - RrAppearance *a_unfocused_title; - RrAppearance *a_focused_title; - RrAppearance *a_unfocused_label; - RrAppearance *a_focused_label; - RrAppearance *a_icon; - RrAppearance *a_unfocused_handle; - RrAppearance *a_focused_handle; - - GSList *clients; - gint icon_on; /* if the window icon button is on */ gint label_on; /* if the window title is on */ gint iconify_on; /* if the window iconify button is on */ @@ -156,11 +163,13 @@ struct _ObFrame gint max_x; /* x-position of the window maximize button */ gint close_x; /* x-position of the window close button */ gint bwidth; /* border width */ - gint rbwidth; /* border width between the title and client */ - gint cbwidth_x; /* client border width */ - gint cbwidth_y; /* client border width */ + gint cbwidth_l; /* client border width */ + gint cbwidth_t; /* client border width */ + gint cbwidth_r; /* client border width */ + gint cbwidth_b; /* client border width */ gboolean max_horz; /* when maxed some decorations are hidden */ gboolean max_vert; /* when maxed some decorations are hidden */ + gboolean shaded; /* decorations adjust when shaded */ /* the leftmost and rightmost elements in the titlebar */ ObFrameContext leftmost; @@ -178,16 +187,19 @@ struct _ObFrame gboolean iconify_hover; gboolean focused; + gboolean need_render; gboolean flashing; gboolean flash_on; GTimeVal flash_end; + guint flash_timer; /*! Is the frame currently in an animation for iconify or restore. 0 means that it is not animating. > 0 means it is animating an iconify. < 0 means it is animating a restore. */ gint iconify_animation_going; + guint iconify_animation_timer; GTimeVal iconify_animation_end; }; @@ -197,6 +209,9 @@ void frame_free(ObFrame *self); void frame_show(ObFrame *self); void frame_hide(ObFrame *self); void frame_adjust_theme(ObFrame *self); +#ifdef SHAPE +void frame_adjust_shape_kind(ObFrame *self, int kind); +#endif void frame_adjust_shape(ObFrame *self); void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized, gboolean fake); @@ -210,6 +225,16 @@ void frame_release_client(ObFrame *self); ObFrameContext frame_context_from_string(const gchar *name); +/*! Parses a ObFrameContext from a string of space-separated context names. + @names The list of context names, the first of which is removed from the + string. + @cx The ObFrameContext is returned here. If an invalid name is found, this + is set to OB_FRAME_CONTEXT_NONE. + @return TRUE if there was something to read in @names, FALSE if it was an + empty input. +*/ +gboolean frame_next_context_from_string(gchar *names, ObFrameContext *cx); + ObFrameContext frame_context(struct _ObClient *self, Window win, gint x, gint y); @@ -217,13 +242,21 @@ ObFrameContext frame_context(struct _ObClient *self, Window win, be positioned. @return The proper coordinates for the frame, based on the client. */ -void frame_client_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h); +void frame_client_gravity(ObFrame *self, gint *x, gint *y); /*! Reversly applies gravity to the frame's position to find where the client should be positioned. @return The proper coordinates for the client, based on the frame. */ -void frame_frame_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h); +void frame_frame_gravity(ObFrame *self, gint *x, gint *y); + +/*! Convert a rectangle in client coordinates/sizes to what it would be + for the frame, given its current decorations sizes */ +void frame_rect_to_frame(ObFrame *self, Rect *r); + +/*! Convert a rectangle in frame coordinates/sizes to what it would be for the + client, given its current decorations sizes */ +void frame_rect_to_client(ObFrame *self, Rect *r); void frame_flash_start(ObFrame *self); void frame_flash_stop(ObFrame *self);