diff options
| author | okan | 2009-01-16 15:24:14 +0000 |
|---|---|---|
| committer | okan | 2009-01-16 15:24:14 +0000 |
| commit | 13a190c9c75ba29a569c4adf686cd05b0cd698ac (patch) | |
| tree | 83f36d330560f5871cd994ba90e3c855514d0766 /calmwm.h | |
| parent | f069a19b033cc9adb37dea328d36f15bcdc0c892 (diff) | |
| download | cwm-13a190c9c75ba29a569c4adf686cd05b0cd698ac.tar.gz | |
remove pwin, bringing us to one client, one window. we no longer have
to push attributes around, so things get a lot simplier, while fixing a
few issues in the meantime; original suggestion by Edd Barrett many many
moons ago.
annoying window placement and race, found in c2k8 by todd, fix by oga!
lots of feedback from todd and oga - thanks!
"commit that bad boy" oga@
Diffstat (limited to 'calmwm.h')
| -rw-r--r-- | calmwm.h | 19 |
1 files changed, 4 insertions, 15 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: calmwm.h,v 1.73 2009/01/15 00:32:35 okan Exp $ + * $Id: calmwm.h,v 1.74 2009/01/16 15:24:14 okan Exp $ */ #ifndef _CALMWM_H_ @@ -45,14 +45,12 @@ struct screen_ctx { Window rootwin; Window menuwin; Colormap colormap; - XColor bgcolor, fgcolor, fccolor, redcolor, cyancolor, + XColor bgcolor, fgcolor, fccolor, redcolor, graycolor, whitecolor, blackcolor; char *display; - unsigned long blackpixl, whitepixl, redpixl, bluepixl, cyanpixl; + unsigned long blackpixl, whitepixl, redpixl, bluepixl, graypixl; GC gc; - Pixmap gray, blue, red; - int altpersist; int xmax; @@ -81,10 +79,10 @@ TAILQ_HEAD(screen_ctx_q, screen_ctx); #define CLIENT_DOVMAXIMIZE 0x10 #define CLIENT_VMAXIMIZED 0x20 +#define CLIENT_BWIDTH 1 #define CLIENT_HIGHLIGHT_BLUE 1 #define CLIENT_HIGHLIGHT_RED 2 - struct winname { TAILQ_ENTRY(winname) entry; char *name; @@ -104,8 +102,6 @@ struct client_ctx { Colormap cmap; - Window pwin; - u_int bwidth; struct { int x, y, width, height; @@ -316,7 +312,6 @@ void client_setup(void); struct client_ctx *client_new(Window, struct screen_ctx *, int); int client_delete(struct client_ctx *, int, int); void client_setactive(struct client_ctx *, int); -void client_gravitate(struct client_ctx *, int); void client_resize(struct client_ctx *); void client_lower(struct client_ctx *); void client_raise(struct client_ctx *); @@ -336,8 +331,6 @@ void client_update(struct client_ctx *); void client_placecalc(struct client_ctx *); void client_maximize(struct client_ctx *); void client_vertmaximize(struct client_ctx *); -u_long client_bg_pixel(struct client_ctx *); -Pixmap client_bg_pixmap(struct client_ctx *); void client_map(struct client_ctx *); void client_mtf(struct client_ctx *); struct client_ctx *client_cycle(int); @@ -345,7 +338,6 @@ struct client_ctx *client_mrunext(struct client_ctx *); struct client_ctx *client_mruprev(struct client_ctx *); void client_gethints(struct client_ctx *); void client_freehints(struct client_ctx *); -void client_do_shape(struct client_ctx *); struct menu *menu_filter(struct menu_q *, char *, char *, int, void (*)(struct menu_q *, struct menu_q *, char *), @@ -365,7 +357,6 @@ void xev_handle_keypress(struct xevent *, XEvent *); void xev_handle_keyrelease(struct xevent *, XEvent *); void xev_handle_expose(struct xevent *, XEvent *); void xev_handle_clientmessage(struct xevent *, XEvent *); -void xev_handle_shape(struct xevent *, XEvent *); void xev_handle_randr(struct xevent *, XEvent *); void xev_handle_mapping(struct xevent *, XEvent *); @@ -512,8 +503,6 @@ extern u_int Nscreens; extern struct client_ctx_q Clientq; -extern int Doshape, Shape_ev; -extern int Doshape, Shape_ev; extern int HasXinerama, HasRandr, Randr_ev; extern struct conf Conf; |