X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=1c9913a121276e0776a863973424e46de3417d5b;hb=742106511fbaca5ebef385a9c60c427e8dd7a6dd;hp=65e116c854850622825a29a2889e2a957f39a4ae;hpb=b1f5555218ecaa3827450125dc47b4bf0d404ee4;p=chaz%2Fopenbox diff --git a/openbox/frame.c b/openbox/frame.c index 65e116c8..1c9913a1 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -1,4 +1,5 @@ #include "frame.h" +#include "client.h" #include "openbox.h" #include "extensions.h" #include "framerender.h" @@ -8,17 +9,13 @@ #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ ButtonPressMask | ButtonReleaseMask) #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \ - ButtonMotionMask | ExposureMask) + ButtonMotionMask | ExposureMask | \ + EnterWindowMask | LeaveWindowMask) -static void layout_title(Frame *self); +#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \ + f->cbwidth) -void frame_startup() -{ -} - -void frame_shutdown() -{ -} +static void layout_title(ObFrame *self); static Window createWindow(Window parent, unsigned long mask, XSetWindowAttributes *attrib) @@ -29,21 +26,23 @@ static Window createWindow(Window parent, unsigned long mask, } -Frame *frame_new() +ObFrame *frame_new() { XSetWindowAttributes attrib; unsigned long mask; - Frame *self; + ObFrame *self; - self = g_new(Frame, 1); + self = g_new(ObFrame, 1); self->visible = FALSE; + self->decorations = 0; /* create all of the decor windows */ mask = CWOverrideRedirect | CWEventMask; attrib.event_mask = FRAME_EVENTMASK; attrib.override_redirect = TRUE; - self->window = createWindow(ob_root, mask, &attrib); + self->window = createWindow(RootWindow(ob_display, ob_screen), + mask, &attrib); mask = 0; self->plate = createWindow(self->window, mask, &attrib); @@ -60,9 +59,9 @@ Frame *frame_new() self->iconify = createWindow(self->title, mask, &attrib); self->handle = createWindow(self->window, mask, &attrib); mask |= CWCursor; - attrib.cursor = ob_cursors.bl; + attrib.cursor = ob_cursor(OB_CURSOR_SOUTHWEST); self->lgrip = createWindow(self->handle, mask, &attrib); - attrib.cursor = ob_cursors.br; + attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST); self->rgrip = createWindow(self->handle, mask, &attrib); self->focused = FALSE; @@ -108,11 +107,13 @@ Frame *frame_new() self->max_press = self->close_press = self->desk_press = self->iconify_press = self->shade_press = FALSE; + self->max_hover = self->close_hover = self->desk_hover = + self->iconify_hover = self->shade_hover = FALSE; - return (Frame*)self; + return (ObFrame*)self; } -static void frame_free(Frame *self) +static void frame_free(ObFrame *self) { RrAppearanceFree(self->a_unfocused_title); RrAppearanceFree(self->a_focused_title); @@ -127,7 +128,7 @@ static void frame_free(Frame *self) g_free(self); } -void frame_show(Frame *self) +void frame_show(ObFrame *self) { if (!self->visible) { self->visible = TRUE; @@ -135,7 +136,7 @@ void frame_show(Frame *self) } } -void frame_hide(Frame *self) +void frame_hide(ObFrame *self) { if (self->visible) { self->visible = FALSE; @@ -144,7 +145,7 @@ void frame_hide(Frame *self) } } -void frame_adjust_shape(Frame *self) +void frame_adjust_shape(ObFrame *self) { #ifdef SHAPE int num; @@ -165,7 +166,7 @@ void frame_adjust_shape(Frame *self) ShapeBounding, ShapeSet); num = 0; - if (self->client->decorations & Decor_Titlebar) { + if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { xrect[0].x = -ob_rr_theme->bevel; xrect[0].y = -ob_rr_theme->bevel; xrect[0].width = self->width + self->bwidth * 2; @@ -174,7 +175,7 @@ void frame_adjust_shape(Frame *self) ++num; } - if (self->client->decorations & Decor_Handle) { + if (self->decorations & OB_FRAME_DECOR_HANDLE) { xrect[1].x = -ob_rr_theme->bevel; xrect[1].y = FRAME_HANDLE_Y(self); xrect[1].width = self->width + self->bwidth * 2; @@ -190,10 +191,11 @@ void frame_adjust_shape(Frame *self) #endif } -void frame_adjust_area(Frame *self, gboolean moved, gboolean resized) +void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized) { if (resized) { - if (self->client->decorations & Decor_Border) { + self->decorations = self->client->decorations; + if (self->decorations & OB_FRAME_DECOR_BORDER) { self->bwidth = ob_rr_theme->bwidth; self->cbwidth = ob_rr_theme->cbwidth; } else { @@ -223,7 +225,7 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized) self->max_x = -1; self->close_x = -1; - if (self->client->decorations & Decor_Titlebar) { + if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { XMoveResizeWindow(ob_display, self->title, -self->bwidth, -self->bwidth, self->width, ob_rr_theme->title_height); @@ -235,19 +237,27 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized) } else XUnmapWindow(ob_display, self->title); - if (self->client->decorations & Decor_Handle) { + if (self->decorations & OB_FRAME_DECOR_HANDLE) { XMoveResizeWindow(ob_display, self->handle, -self->bwidth, FRAME_HANDLE_Y(self), self->width, ob_rr_theme->handle_height); - XMoveWindow(ob_display, self->lgrip, - -self->bwidth, -self->bwidth); - XMoveWindow(ob_display, self->rgrip, - -self->bwidth + self->width - - ob_rr_theme->grip_width, -self->bwidth); self->innersize.bottom += ob_rr_theme->handle_height + self->bwidth; XMapWindow(ob_display, self->handle); + if (self->decorations & OB_FRAME_DECOR_GRIPS) { + XMoveWindow(ob_display, self->lgrip, + -self->bwidth, -self->bwidth); + XMoveWindow(ob_display, self->rgrip, + -self->bwidth + self->width - + ob_rr_theme->grip_width, -self->bwidth); + XMapWindow(ob_display, self->lgrip); + XMapWindow(ob_display, self->rgrip); + } else { + XUnmapWindow(ob_display, self->lgrip); + XUnmapWindow(ob_display, self->rgrip); + } + /* XXX make a subwindow with these dimentions? ob_rr_theme->grip_width + self->bwidth, 0, self->width - (ob_rr_theme->grip_width + self->bwidth) * 2, @@ -289,7 +299,7 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized) frame_client_gravity. */ self->area.x = self->client->area.x; self->area.y = self->client->area.y; - frame_client_gravity((Frame*)self, + frame_client_gravity((ObFrame*)self, &self->area.x, &self->area.y); } @@ -307,28 +317,28 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized) } } -void frame_adjust_state(Frame *self) +void frame_adjust_state(ObFrame *self) { framerender_frame(self); } -void frame_adjust_focus(Frame *self, gboolean hilite) +void frame_adjust_focus(ObFrame *self, gboolean hilite) { self->focused = hilite; framerender_frame(self); } -void frame_adjust_title(Frame *self) +void frame_adjust_title(ObFrame *self) { framerender_frame(self); } -void frame_adjust_icon(Frame *self) +void frame_adjust_icon(ObFrame *self) { framerender_frame(self); } -void frame_grab_client(Frame *self, Client *client) +void frame_grab_client(ObFrame *self, ObClient *client) { self->client = client; @@ -342,7 +352,7 @@ void frame_grab_client(Frame *self, Client *client) member set the root window, and one set to the client, but both get handled and need to be ignored. */ - if (ob_state == State_Starting) + if (ob_state() == OB_STATE_STARTING) client->ignore_unmaps += 2; /* select the event mask on the client's parent (to receive config/map @@ -370,7 +380,7 @@ void frame_grab_client(Frame *self, Client *client) g_hash_table_insert(window_map, &self->rgrip, client); } -void frame_release_client(Frame *self, Client *client) +void frame_release_client(ObFrame *self, ObClient *client) { XEvent ev; @@ -389,7 +399,8 @@ void frame_release_client(Frame *self, Client *client) } else { /* according to the ICCCM - if the client doesn't reparent itself, then we will reparent the window to root for them */ - XReparentWindow(ob_display, client->window, ob_root, + XReparentWindow(ob_display, client->window, + RootWindow(ob_display, ob_screen), client->area.x, client->area.y); } @@ -412,7 +423,7 @@ void frame_release_client(Frame *self, Client *client) frame_free(self); } -static void layout_title(Frame *self) +static void layout_title(ObFrame *self) { char *lc; int x; @@ -425,28 +436,24 @@ static void layout_title(Frame *self) for (lc = ob_rr_theme->title_layout; *lc != '\0'; ++lc) { switch (*lc) { case 'N': - if (!(self->client->decorations & Decor_Icon)) break; if (n) { *lc = ' '; break; } /* rm duplicates */ n = TRUE; self->label_width -= (ob_rr_theme->button_size + 2 + ob_rr_theme->bevel + 1); break; case 'D': - if (!(self->client->decorations & Decor_AllDesktops)) break; if (d) { *lc = ' '; break; } /* rm duplicates */ d = TRUE; self->label_width -= (ob_rr_theme->button_size + ob_rr_theme->bevel + 1); break; case 'S': - if (!(self->client->decorations & Decor_Shade)) break; if (s) { *lc = ' '; break; } /* rm duplicates */ s = TRUE; self->label_width -= (ob_rr_theme->button_size + ob_rr_theme->bevel + 1); break; case 'I': - if (!(self->client->decorations & Decor_Iconify)) break; if (i) { *lc = ' '; break; } /* rm duplicates */ i = TRUE; self->label_width -= (ob_rr_theme->button_size + @@ -457,14 +464,12 @@ static void layout_title(Frame *self) l = TRUE; break; case 'M': - if (!(self->client->decorations & Decor_Maximize)) break; if (m) { *lc = ' '; break; } /* rm duplicates */ m = TRUE; self->label_width -= (ob_rr_theme->button_size + ob_rr_theme->bevel + 1); break; case 'C': - if (!(self->client->decorations & Decor_Close)) break; if (c) { *lc = ' '; break; } /* rm duplicates */ c = TRUE; self->label_width -= (ob_rr_theme->button_size + @@ -541,68 +546,64 @@ static void layout_title(Frame *self) } } -Context frame_context_from_string(char *name) +ObFrameContext frame_context_from_string(char *name) { if (!g_ascii_strcasecmp("root", name)) - return Context_Root; + return OB_FRAME_CONTEXT_ROOT; else if (!g_ascii_strcasecmp("client", name)) - return Context_Client; + return OB_FRAME_CONTEXT_CLIENT; else if (!g_ascii_strcasecmp("titlebar", name)) - return Context_Titlebar; + return OB_FRAME_CONTEXT_TITLEBAR; else if (!g_ascii_strcasecmp("handle", name)) - return Context_Handle; + return OB_FRAME_CONTEXT_HANDLE; else if (!g_ascii_strcasecmp("frame", name)) - return Context_Frame; + return OB_FRAME_CONTEXT_FRAME; else if (!g_ascii_strcasecmp("blcorner", name)) - return Context_BLCorner; - else if (!g_ascii_strcasecmp("tlcorner", name)) - return Context_TLCorner; + return OB_FRAME_CONTEXT_BLCORNER; else if (!g_ascii_strcasecmp("brcorner", name)) - return Context_BRCorner; - else if (!g_ascii_strcasecmp("trcorner", name)) - return Context_TRCorner; + return OB_FRAME_CONTEXT_BRCORNER; else if (!g_ascii_strcasecmp("maximize", name)) - return Context_Maximize; + return OB_FRAME_CONTEXT_MAXIMIZE; else if (!g_ascii_strcasecmp("alldesktops", name)) - return Context_AllDesktops; + return OB_FRAME_CONTEXT_ALLDESKTOPS; else if (!g_ascii_strcasecmp("shade", name)) - return Context_Shade; + return OB_FRAME_CONTEXT_SHADE; else if (!g_ascii_strcasecmp("iconify", name)) - return Context_Iconify; + return OB_FRAME_CONTEXT_ICONIFY; else if (!g_ascii_strcasecmp("icon", name)) - return Context_Icon; + return OB_FRAME_CONTEXT_ICON; else if (!g_ascii_strcasecmp("close", name)) - return Context_Close; - return Context_None; + return OB_FRAME_CONTEXT_CLOSE; + return OB_FRAME_CONTEXT_NONE; } -Context frame_context(Client *client, Window win) +ObFrameContext frame_context(ObClient *client, Window win) { - Frame *self; + ObFrame *self; - if (win == ob_root) return Context_Root; - if (client == NULL) return Context_None; - if (win == client->window) return Context_Client; + if (win == RootWindow(ob_display, ob_screen)) return OB_FRAME_CONTEXT_ROOT; + if (client == NULL) return OB_FRAME_CONTEXT_NONE; + if (win == client->window) return OB_FRAME_CONTEXT_CLIENT; self = client->frame; - if (win == self->window) return Context_Frame; - if (win == self->plate) return Context_Client; - if (win == self->title) return Context_Titlebar; - if (win == self->label) return Context_Titlebar; - if (win == self->handle) return Context_Handle; - if (win == self->lgrip) return Context_BLCorner; - if (win == self->rgrip) return Context_BRCorner; - if (win == self->max) return Context_Maximize; - if (win == self->iconify)return Context_Iconify; - if (win == self->close) return Context_Close; - if (win == self->icon) return Context_Icon; - if (win == self->desk) return Context_AllDesktops; - if (win == self->shade) return Context_Shade; - - return Context_None; + if (win == self->window) return OB_FRAME_CONTEXT_FRAME; + if (win == self->plate) return OB_FRAME_CONTEXT_CLIENT; + if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR; + if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR; + if (win == self->handle) return OB_FRAME_CONTEXT_HANDLE; + if (win == self->lgrip) return OB_FRAME_CONTEXT_BLCORNER; + if (win == self->rgrip) return OB_FRAME_CONTEXT_BRCORNER; + if (win == self->max) return OB_FRAME_CONTEXT_MAXIMIZE; + if (win == self->iconify)return OB_FRAME_CONTEXT_ICONIFY; + if (win == self->close) return OB_FRAME_CONTEXT_CLOSE; + if (win == self->icon) return OB_FRAME_CONTEXT_ICON; + if (win == self->desk) return OB_FRAME_CONTEXT_ALLDESKTOPS; + if (win == self->shade) return OB_FRAME_CONTEXT_SHADE; + + return OB_FRAME_CONTEXT_NONE; } -void frame_client_gravity(Frame *self, int *x, int *y) +void frame_client_gravity(ObFrame *self, int *x, int *y) { /* horizontal */ switch (self->client->gravity) { @@ -657,7 +658,7 @@ void frame_client_gravity(Frame *self, int *x, int *y) } } -void frame_frame_gravity(Frame *self, int *x, int *y) +void frame_frame_gravity(ObFrame *self, int *x, int *y) { /* horizontal */ switch (self->client->gravity) {