X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.h;h=19bade78c73a22ded9c59398e181efc560d5dbd3;hb=564b727966ef1a38309d45b2ab040c3deeb658a4;hp=f77ff35ada8fca88190b5724bc591df4dc8679f8;hpb=ebe3091560a859996a9904c342c62b512b39bee0;p=chaz%2Fopenbox

diff --git a/openbox/frame.h b/openbox/frame.h
index f77ff35a..19bade78 100644
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    frame.h for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -76,12 +77,10 @@ struct _ObFrame
     Rect      area;
     gboolean  visible;
 
-    /*! Whether the window is obscured at all or fully visible. */
-    gboolean obscured;
-
     guint     decorations;
     gboolean  max_horz;
 
+    Window    inner;  /*!< The window for drawing the inner client border */
     Window    title;
     Window    label;
     Window    max;
@@ -94,8 +93,12 @@ struct _ObFrame
     Window    lgrip;
     Window    rgrip;
 
-    Window    tlresize;
-    Window    trresize;
+    Window    tltresize;
+    Window    tllresize;
+    Window    trtresize;
+    Window    trrresize;
+
+    Colormap  colormap;
 
     RrAppearance *a_unfocused_title;
     RrAppearance *a_focused_title;
@@ -141,13 +144,14 @@ struct _ObFrame
     GTimeVal  flash_end;
 };
 
-ObFrame *frame_new();
+ObFrame *frame_new(struct _ObClient *c);
 void frame_show(ObFrame *self);
 void frame_hide(ObFrame *self);
 void frame_adjust_theme(ObFrame *self);
 void frame_adjust_shape(ObFrame *self);
 void frame_adjust_area(ObFrame *self, gboolean moved,
                        gboolean resized, gboolean fake);
+void frame_adjust_client_area(ObFrame *self);
 void frame_adjust_state(ObFrame *self);
 void frame_adjust_focus(ObFrame *self, gboolean hilite);
 void frame_adjust_title(ObFrame *self);
@@ -163,13 +167,13 @@ 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, int *x, int *y);
+void frame_client_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h);
 
 /*! 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, int *x, int *y);
+void frame_frame_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h);
 
 void frame_flash_start(ObFrame *self);
 void frame_flash_stop(ObFrame *self);