X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.h;h=b5372647fd85c811c9f18a270508cd87daf398c1;hb=5316bc6c3e3329dc620cfd15d472ed5d376100f8;hp=78206c337fa966a66d54ebe5a74f10cf6640bf71;hpb=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox

diff --git a/openbox/frame.h b/openbox/frame.h
index 78206c33..b5372647 100644
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -1,3 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   frame.h for the Openbox window manager
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef __frame_h
 #define __frame_h
 
@@ -25,6 +44,9 @@ typedef enum {
     OB_FRAME_CONTEXT_ICONIFY,
     OB_FRAME_CONTEXT_ICON,
     OB_FRAME_CONTEXT_CLOSE,
+    /*! This is a special context, which occurs while dragging a window in
+      a move/resize */
+    OB_FRAME_CONTEXT_MOVE_RESIZE,
     OB_FRAME_NUM_CONTEXTS
 } ObFrameContext;
 
@@ -55,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;
@@ -73,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;
@@ -120,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);
@@ -134,7 +159,7 @@ void frame_adjust_icon(ObFrame *self);
 void frame_grab_client(ObFrame *self, struct _ObClient *client);
 void frame_release_client(ObFrame *self, struct _ObClient *client);
 
-ObFrameContext frame_context_from_string(char *name);
+ObFrameContext frame_context_from_string(const gchar *name);
 
 ObFrameContext frame_context(struct _ObClient *self, Window win);
 
@@ -142,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);
 
 /*! 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);
 
 void frame_flash_start(ObFrame *self);
 void frame_flash_stop(ObFrame *self);