X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.h;h=5d84df0b3a26777c940f961b4969c6f4fe3c69f2;hb=f827fbcaee822a0ef7d573edeb551bf2c1865aac;hp=18f1b23aefe74b582351d6c46f8f22d28cdac9a1;hpb=cb444e37d21009b0e32705901836f77b08f4c5aa;p=chaz%2Fopenbox diff --git a/openbox/client.h b/openbox/client.h index 18f1b23a..5d84df0b 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -3,6 +3,8 @@ #include "geom.h" #include "stacking.h" +#include "render/color.h" + #include #include @@ -11,12 +13,12 @@ struct Group; /* The value in client.transient_for indicating it is a transient for its group instead of for a single window */ -#define TRAN_GROUP ((void*)~0ul) +#define TRAN_GROUP ((void*)~0l) /*! Holds an icon in ARGB format */ typedef struct Icon { - unsigned long width, height; - unsigned long *data; + int width, height; + pixel32 *data; } Icon; /*! The MWM Hints as retrieved from the window property @@ -108,10 +110,24 @@ typedef enum { Decor_Close = 1 << 8 /*!< Display a close button */ } Decoration; +/*! The directions used by client_find_directional */ +typedef enum { + Direction_North, + Direction_East, + Direction_South, + Direction_West, + Direction_NorthEast, + Direction_SouthEast, + Direction_SouthWest, + Direction_NorthWest +} Direction; typedef struct Client { + ObWindow obwin; + Window window; + /*! The window's decorations. NULL while the window is being managed! */ struct Frame *frame; /*! The number of unmap events to ignore on the window */ @@ -133,10 +149,13 @@ typedef struct Client { GSList *transients; /*! The desktop on which the window resides (0xffffffff for all desktops) */ - unsigned int desktop; + guint desktop; /*! Normal window title */ gchar *title; + /*! The count for the title. When another window with the same title + exists, a count will be appended to it. */ + guint title_count; /*! Window title when iconified */ gchar *icon_title; @@ -276,25 +295,13 @@ typedef struct Client { */ int functions; - /*! Saved decorations from before becoming fullscreen */ - int pre_fs_decor; - - /*! Saved functions from before becoming fullscreen */ - int pre_fs_func; - /*! Icons for the client as specified on the client window */ Icon *icons; /*! The number of icons in icons */ int nicons; - - /*! The icon for the client specified in the WMHints or the KWM hints */ - Pixmap pixmap_icon; - /*! The mask for the pixmap_icon, or None if its not masked */ - Pixmap pixmap_icon_mask; } Client; extern GList *client_list; -extern GHashTable *client_map; void client_startup(); void client_shutdown(); @@ -347,6 +354,11 @@ gboolean client_focused(Client *self); void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, gboolean user, gboolean final); +/*! Moves a client so that it is on screen if it is entirely out of the + viewable screen. +*/ +void client_move_onscreen(Client *self); + /*! Fullscreen's or unfullscreen's the client window @param fs true if the window should be made fullscreen; false if it should be returned to normal state. @@ -395,11 +407,6 @@ void client_kill(Client *self); desktop has been changed. Generally this should be FALSE. */ void client_set_desktop(Client *self, guint target, gboolean donthide); -/*! Return a modal child of the client window - @return A modal child of the client window, or 0 if none was found. -*/ -Client *client_find_modal_child(Client *self); - /*! Validate client, by making sure no Destroy or Unmap events exist in the event queue for the window. @return true if the client is valid; false if the client has already @@ -423,15 +430,16 @@ void client_set_state(Client *self, Atom action, long data1, long data2); Client passed to it or another Client if appropriate. */ Client *client_focus_target(Client *self); -/* Returns if a client can be focused or not */ -gboolean client_focusable(Client *self); - /*! Attempt to focus the client window */ gboolean client_focus(Client *self); /*! Remove focus from the client window */ void client_unfocus(Client *self); +/*! Activates the client for use, focusing, uniconifying it, etc. To be used + when the user deliberately selects a window for use. */ +void client_activate(Client *self); + /*! Calculates the stacking layer for the client window */ void client_calc_layer(Client *self); @@ -449,18 +457,14 @@ void client_update_normal_hints(Client *self); process. */ void client_update_wmhints(Client *self); -/*! Updates the window's title */ +/*! Updates the window's title and icon title */ void client_update_title(Client *self); -/*! Updates the window's icon title */ -void client_update_icon_title(Client *self); /*! Updates the window's application name and class */ void client_update_class(Client *self); /*! Updates the strut for the client */ void client_update_strut(Client *self); /*! Updates the window's icons */ void client_update_icons(Client *self); -/*! Updates the window's kwm icon */ -void client_update_kwm_icon(Client *self); /*! Set up what decor should be shown on the window and what functions should be allowed (Client::decorations and Client::functions). @@ -473,4 +477,31 @@ void client_get_type(Client *self); Icon *client_icon(Client *self, int w, int h); +/*! Searches a client's transients for a focused window. The function does not + check for the passed client, only for its transients. + If no focused transient is found, NULL is returned. +*/ +Client *client_search_focus_tree(Client *self); + +/*! Searches a client's transient tree for a focused window. The function + searches up the tree and down other branches as well as the passed client's. + If no focused client is found, NULL is returned. +*/ +Client *client_search_focus_tree_full(Client *self); + +/*! Return a modal child of the client window + @return A modal child of the client window, or 0 if none was found. +*/ +Client *client_search_modal_child(Client *self); + +/*! Return the "closest" client in the given direction */ +Client *client_find_directional(Client *c, Direction dir); + +/*! Set a client window to be above/below other clients. + @layer < 0 indicates the client should be placed below other clients.
+ = 0 indicates the client should be placed with other clients.
+ > 0 indicates the client should be placed above other clients. +*/ +void client_set_layer(Client *self, int layer); + #endif