X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.h;h=b48c07cacfee521bca50146f395976ba57fd2fd4;hb=86b809df8a5e6c3c65faaaeadcd6e0d196a74040;hp=b49bf38fa4a2586cc2783a163ab0bf4d64b8218e;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox

diff --git a/openbox/frame.h b/openbox/frame.h
index b49bf38f..b48c07ca 100644
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -1,6 +1,7 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- 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        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -97,6 +98,8 @@ struct _ObFrame
     Window    tlresize;
     Window    trresize;
 
+    Colormap  colormap;
+
     RrAppearance *a_unfocused_title;
     RrAppearance *a_focused_title;
     RrAppearance *a_unfocused_label;
@@ -141,7 +144,7 @@ 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);
@@ -155,7 +158,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);
 
@@ -163,13 +166,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);