rename the Client struct to ObClient

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 65e116c854850622825a29a2889e2a957f39a4ae..a2335e9f04a91c2b4507c348b51071745d56927e 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -38,6 +38,7 @@ Frame *frame_new()
     self = g_new(Frame, 1);
 
     self->visible = FALSE;
+    self->decorations = 0;
 
     /* create all of the decor windows */
     mask = CWOverrideRedirect | CWEventMask;
@@ -60,9 +61,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;
@@ -165,7 +166,7 @@ void frame_adjust_shape(Frame *self)
                           ShapeBounding, ShapeSet);
 
        num = 0;
-       if (self->client->decorations & Decor_Titlebar) {
+       if (self->decorations & 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 & Decor_Handle) {
            xrect[1].x = -ob_rr_theme->bevel;
            xrect[1].y = FRAME_HANDLE_Y(self);
            xrect[1].width = self->width + self->bwidth * 2;
@@ -193,7 +194,8 @@ void frame_adjust_shape(Frame *self)
 void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
 {
     if (resized) {
-        if (self->client->decorations & Decor_Border) {
+        self->decorations = self->client->decorations;
+        if (self->decorations & 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 & Decor_Titlebar) {
             XMoveResizeWindow(ob_display, self->title,
                               -self->bwidth, -self->bwidth,
                               self->width, ob_rr_theme->title_height);
@@ -235,7 +237,7 @@ 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 & Decor_Handle) {
             XMoveResizeWindow(ob_display, self->handle,
                               -self->bwidth, FRAME_HANDLE_Y(self),
                               self->width, ob_rr_theme->handle_height);
@@ -328,7 +330,7 @@ void frame_adjust_icon(Frame *self)
     framerender_frame(self);
 }
 
-void frame_grab_client(Frame *self, Client *client)
+void frame_grab_client(Frame *self, ObClient *client)
 {
     self->client = client;
 
@@ -342,7 +344,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 +372,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(Frame *self, ObClient *client)
 {
     XEvent ev;
 
@@ -425,28 +427,28 @@ 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 (!(self->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 (!(self->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 (!(self->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 (!(self->decorations & Decor_Iconify)) break;
             if (i) { *lc = ' '; break; } /* rm duplicates */
            i = TRUE;
            self->label_width -= (ob_rr_theme->button_size +
@@ -457,14 +459,14 @@ static void layout_title(Frame *self)
            l = TRUE;
            break;
        case 'M':
-           if (!(self->client->decorations & Decor_Maximize)) break;
+           if (!(self->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 (!(self->decorations & Decor_Close)) break;
             if (c) { *lc = ' '; break; } /* rm duplicates */
            c = TRUE;
            self->label_width -= (ob_rr_theme->button_size +
@@ -576,7 +578,7 @@ Context frame_context_from_string(char *name)
     return Context_None;
 }
 
-Context frame_context(Client *client, Window win)
+Context frame_context(ObClient *client, Window win)
 {
     Frame *self;