From 17cf2c230d936abc273a1918f6a46556ee4b1677 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Thu, 11 Oct 2007 23:35:45 +0200
Subject: [PATCH] remove display as arg of layouts

---
 common.h           |  2 +-
 config.h           |  2 +-
 layout.c           |  2 +-
 layouts/floating.c |  4 ++--
 layouts/max.c      |  4 ++--
 layouts/tile.c     | 12 ++++++------
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common.h b/common.h
index cd8d38878..984b4d2ec 100644
--- a/common.h
+++ b/common.h
@@ -28,6 +28,6 @@
 #define UICB_PROTO(name)         void name(awesome_config *, const char *)
 
 /** Common prototype definition for layouts function */
-#define LAYOUT_PROTO(name)         void name(Display *, awesome_config *)
+#define LAYOUT_PROTO(name)         void name(awesome_config *)
 
 #endif
diff --git a/config.h b/config.h
index e1e0bcb1f..c4cf8d88a 100644
--- a/config.h
+++ b/config.h
@@ -49,7 +49,7 @@ typedef struct awesome_config awesome_config;
 typedef struct
 {
     char *symbol;
-    void (*arrange) (Display *, awesome_config *);
+    void (*arrange) (awesome_config *);
 } Layout;
 
 typedef struct
diff --git a/layout.c b/layout.c
index 9dc9330aa..ab7c62a83 100644
--- a/layout.c
+++ b/layout.c
@@ -46,7 +46,7 @@ arrange(Display * disp, awesome_config *awesomeconf)
         else if(c->screen == awesomeconf->screen)
             ban(c);
     }
-    awesomeconf->current_layout->arrange(disp, awesomeconf);
+    awesomeconf->current_layout->arrange(awesomeconf);
     focus(disp, NULL, True, awesomeconf);
     restack(disp, awesomeconf);
 }
diff --git a/layouts/floating.c b/layouts/floating.c
index 4cff91cda..652f3b0cc 100644
--- a/layouts/floating.c
+++ b/layouts/floating.c
@@ -23,8 +23,8 @@
 #include "layouts/floating.h"
 
 void
-layout_floating(Display *disp __attribute__ ((unused)), awesome_config *awesomeconf)
-{                               /* default floating layout */
+layout_floating(awesome_config *awesomeconf)
+{
     Client *c;
 
     for(c = *awesomeconf->clients; c; c = c->next)
diff --git a/layouts/max.c b/layouts/max.c
index 71c178cb7..266d5bd5a 100644
--- a/layouts/max.c
+++ b/layouts/max.c
@@ -24,10 +24,10 @@
 #include "layouts/max.h"
 
 void
-layout_max(Display *disp, awesome_config *awesomeconf)
+layout_max(awesome_config *awesomeconf)
 {
     Client *c;
-    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
+    ScreenInfo *si = get_screen_info(awesomeconf->display, awesomeconf->screen, &awesomeconf->statusbar);
 
     for(c = *awesomeconf->clients; c; c = c->next)
         if(IS_TILED(c, awesomeconf->screen, awesomeconf->tags, awesomeconf->ntags))
diff --git a/layouts/tile.c b/layouts/tile.c
index 1d4b5cfe7..1c1af3400 100644
--- a/layouts/tile.c
+++ b/layouts/tile.c
@@ -83,7 +83,7 @@ uicb_setmwfact(awesome_config * awesomeconf,
 }
 
 static void
-_tile(Display *disp, awesome_config *awesomeconf, const Bool right)
+_tile(awesome_config *awesomeconf, const Bool right)
 {
     /* windows area geometry */
     int wah = 0, waw = 0, wax = 0, way = 0;
@@ -96,7 +96,7 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
     ScreenInfo *screens_info = NULL;
     Client *c;
 
-    screens_info = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
+    screens_info = get_screen_info(awesomeconf->display, awesomeconf->screen, &awesomeconf->statusbar);
 
     for(n = 0, c = *awesomeconf->clients; c; c = c->next)
         if(IS_TILED(c, awesomeconf->screen, awesomeconf->tags, awesomeconf->ntags))
@@ -168,13 +168,13 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
 }
 
 void
-layout_tile(Display *disp, awesome_config *awesomeconf)
+layout_tile(awesome_config *awesomeconf)
 {
-    _tile(disp, awesomeconf, True);
+    _tile(awesomeconf, True);
 }
 
 void
-layout_tileleft(Display *disp, awesome_config *awesomeconf)
+layout_tileleft(awesome_config *awesomeconf)
 {
-    _tile(disp, awesomeconf, False);
+    _tile(awesomeconf, False);
 }