wmii

commit c09888f7a1b35954518996a9d6dd002d51789822
parent e9cea1dba8eb164eb11dfc7fad587041791d35d8
Author: garbeam <garbeam@localhost.localdomain>
Date:   Sat,  3 Dec 2005 19:02:39 +0200

eleminated all compile issues


Diffstat:
cmd/wm/area.c
 | 
28
+++++++++++++++++++++++++++-
cmd/wm/event.c
 | 
10
++++------
cmd/wm/frame.c
 | 
2
+-
cmd/wm/layout_column.c
 | 
6
+++---

4 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/cmd/wm/area.c b/cmd/wm/area.c
@@ -11,7 +11,7 @@
 
 #include <cext.h>
 
-static Area     zero_area = {0};
+/*static Area     zero_area = {0};*/
 
 void 
 free_area(Area* a)
@@ -46,3 +46,29 @@ focus_area(Area *a, int raise, int up, int down)
 		focus_page(p, raise, 0);
 }
 
+void 
+attach_frame_to_area(Area *a, Frame * f)
+{	
+
+}
+
+void
+detach_frame_from_area(Frame * f, int ignore_focus_and_destroy)
+{
+
+}
+
+void
+draw_area(Area *a)
+{
+}
+
+void
+hide_area(Area *a)
+{
+}
+
+void
+show_area(Area *a)
+{
+}
diff --git a/cmd/wm/event.c b/cmd/wm/event.c
@@ -147,12 +147,10 @@ handle_configurerequest(XEvent * e)
 		gravitate(c, tabh ? tabh : bw, bw, 0);
 
 		if (f) {
-			XRectangle     *frect = rect_of_frame(f);
-			frect->x = wc.x = c->rect.x - bw;
-			frect->y = wc.y = c->rect.y - (tabh ? tabh : bw);
-			frect->width = wc.width = c->rect.width + 2 * bw;
-			frect->height = wc.height =
-				c->rect.height + bw + (tabh ? tabh : bw);
+			f->rect.x = wc.x = c->rect.x - bw;
+			f->rect.y = wc.y = c->rect.y - (tabh ? tabh : bw);
+			f->rect.width = wc.width = c->rect.width + 2 * bw;
+			f->rect.height = wc.height = c->rect.height + bw + (tabh ? tabh : bw);
 			wc.border_width = 1;
 			wc.sibling = None;
 			wc.stack_mode = ev->detail;
diff --git a/cmd/wm/frame.c b/cmd/wm/frame.c
@@ -360,7 +360,7 @@ handle_frame_buttonpress(XButtonEvent * e, Frame * f)
 }
 
 void 
-attach_Cliento_frame(Frame * f, Client * c)
+attach_client_to_frame(Frame * f, Client * c)
 {
 	int             size = count_items((void **) f->clients);
 	wmii_move_ixpfile(c->files[C_PREFIX], f->files[F_CLIENT_PREFIX]);
diff --git a/cmd/wm/layout_column.c b/cmd/wm/layout_column.c
@@ -40,7 +40,7 @@ static Column   zero_column = {0};
 static Acme     zero_acme = {0};
 
 void 
-init_layout_col()
+init_layout_column()
 {
 	layouts =
 	(Layout **) attach_item_end((void **) layouts, &lcol,
@@ -171,7 +171,7 @@ deinit_col(Area *a)
 			while (f->clients && f->clients[0])
 				detach_client_from_frame(f->clients[0], 0, 0);
 			detach_frame_from_area(f, 1);
-			free_frame(f);
+			destroy_frame(f);
 		}
 		free(col->frames);
 	}
@@ -213,7 +213,7 @@ detach_col(Area *a, Client *c, int unmapped, int destroyed)
 	col->refresh = 1;
 	detach_client_from_frame(c, unmapped, destroyed);
 	detach_frame_from_area(f, 1);
-	free_frame(f);
+	destroy_frame(f);
 
 	arrange_col(a);
 }