From d967edfec9c3144b23c697d8e5d7933fe077847e Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 17 Sep 2007 14:07:31 +0200 Subject: [PATCH] remove screen from layouts arrange() arg --- config.h | 2 +- layout.c | 2 +- layouts/floating.c | 4 ++-- layouts/floating.h | 2 +- layouts/spiral.c | 14 +++++++------- layouts/spiral.h | 4 ++-- layouts/tile.c | 16 ++++++++-------- layouts/tile.h | 4 ++-- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/config.h b/config.h index f3babcc9..34688e20 100644 --- a/config.h +++ b/config.h @@ -65,7 +65,7 @@ typedef struct awesome_config awesome_config; typedef struct { char *symbol; - void (*arrange) (Display *, int, awesome_config *); + void (*arrange) (Display *, awesome_config *); } Layout; typedef struct diff --git a/layout.c b/layout.c index ca7be328..6ee057ab 100644 --- a/layout.c +++ b/layout.c @@ -45,7 +45,7 @@ arrange(Display * disp, DC *drawcontext, awesome_config *awesomeconf) else if(c->screen == awesomeconf->screen) ban(c); } - awesomeconf->current_layout->arrange(disp, awesomeconf->screen, awesomeconf); + awesomeconf->current_layout->arrange(disp, awesomeconf); focus(disp, drawcontext, NULL, True, awesomeconf); restack(disp, drawcontext, awesomeconf); } diff --git a/layouts/floating.c b/layouts/floating.c index 7b2ae30a..8705a1b9 100644 --- a/layouts/floating.c +++ b/layouts/floating.c @@ -27,12 +27,12 @@ extern Client *clients; /* global client */ void -floating(Display *disp __attribute__ ((unused)), int screen, awesome_config *awesomeconf) +floating(Display *disp __attribute__ ((unused)), awesome_config *awesomeconf) { /* default floating layout */ Client *c; for(c = clients; c; c = c->next) - if(isvisible(c, screen, awesomeconf->selected_tags, awesomeconf->ntags)) + if(isvisible(c, awesomeconf->screen, awesomeconf->selected_tags, awesomeconf->ntags)) { if(c->ftview) { diff --git a/layouts/floating.h b/layouts/floating.h index 5295a228..e413991c 100644 --- a/layouts/floating.h +++ b/layouts/floating.h @@ -23,6 +23,6 @@ #ifndef AWESOME_FLOATING_H #define AWESOME_FLOATING_H -void floating(Display *, int, awesome_config *); /* floating layout */ +void floating(Display *, awesome_config *); /* floating layout */ #endif diff --git a/layouts/spiral.c b/layouts/spiral.c index 9836d291..70de4d78 100644 --- a/layouts/spiral.c +++ b/layouts/spiral.c @@ -28,7 +28,7 @@ extern Client *clients; /* global client list */ static void -fibonacci(Display *disp, int screen, awesome_config *awesomeconf, int shape) +fibonacci(Display *disp, awesome_config *awesomeconf, int shape) { int n, nx, ny, nh, nw, i; Client *c; @@ -38,12 +38,12 @@ fibonacci(Display *disp, int screen, awesome_config *awesomeconf, int shape) nw = get_windows_area_width(disp, awesomeconf->statusbar); nh = get_windows_area_height(disp, awesomeconf->statusbar); for(n = 0, c = clients; c; c = c->next) - if(IS_TILED(c, screen, awesomeconf->selected_tags, awesomeconf->ntags)) + if(IS_TILED(c, awesomeconf->screen, awesomeconf->selected_tags, awesomeconf->ntags)) n++; for(i = 0, c = clients; c; c = c->next) { - if(!IS_TILED(c, screen, awesomeconf->selected_tags, awesomeconf->ntags)) + if(!IS_TILED(c, awesomeconf->screen, awesomeconf->selected_tags, awesomeconf->ntags)) continue; c->ismax = False; @@ -87,13 +87,13 @@ fibonacci(Display *disp, int screen, awesome_config *awesomeconf, int shape) void -dwindle(Display *disp, int screen, awesome_config *awesomeconf) +dwindle(Display *disp, awesome_config *awesomeconf) { - fibonacci(disp, screen, awesomeconf, 1); + fibonacci(disp, awesomeconf, 1); } void -spiral(Display *disp, int screen, awesome_config *awesomeconf) +spiral(Display *disp, awesome_config *awesomeconf) { - fibonacci(disp, screen, awesomeconf, 0); + fibonacci(disp, awesomeconf, 0); } diff --git a/layouts/spiral.h b/layouts/spiral.h index 34c73933..0df48d06 100644 --- a/layouts/spiral.h +++ b/layouts/spiral.h @@ -23,7 +23,7 @@ #ifndef AWESOME_SPIRAL_H #define AWESOME_SPIRAL_H -void dwindle(Display *, int, awesome_config *); /* dwindle windows */ -void spiral(Display *, int, awesome_config *); /* spiral windows */ +void dwindle(Display *, awesome_config *); /* dwindle windows */ +void spiral(Display *, awesome_config *); /* spiral windows */ #endif diff --git a/layouts/tile.c b/layouts/tile.c index 0e102923..81248c8e 100644 --- a/layouts/tile.c +++ b/layouts/tile.c @@ -79,7 +79,7 @@ uicb_setmwfact(Display *disp, } static void -_tile(Display *disp, int screen, awesome_config *awesomeconf, const Bool right) +_tile(Display *disp, awesome_config *awesomeconf, const Bool right) { /* windows area geometry */ int wah = 0, waw = 0, wax = 0, way = 0; @@ -93,15 +93,15 @@ _tile(Display *disp, int screen, awesome_config *awesomeconf, const Bool right) ScreenInfo *screens_info = NULL; Client *c; - screens_info = get_screen_info(disp, screen, awesomeconf->statusbar, &screen_numbers); + screens_info = get_screen_info(disp, awesomeconf->screen, awesomeconf->statusbar, &screen_numbers); for(n = 0, c = clients; c; c = c->next) - if(IS_TILED(c, screen, awesomeconf->selected_tags, awesomeconf->ntags)) + if(IS_TILED(c, awesomeconf->screen, awesomeconf->selected_tags, awesomeconf->ntags)) n++; for(i = 0, c = clients; c; c = c->next) { - if(!IS_TILED(c, screen, awesomeconf->selected_tags, awesomeconf->ntags)) + if(!IS_TILED(c, awesomeconf->screen, awesomeconf->selected_tags, awesomeconf->ntags)) continue; if(use_screen == -1 @@ -192,13 +192,13 @@ _tile(Display *disp, int screen, awesome_config *awesomeconf, const Bool right) } void -tile(Display *disp, int screen, awesome_config *awesomeconf) +tile(Display *disp, awesome_config *awesomeconf) { - _tile(disp, screen, awesomeconf, True); + _tile(disp, awesomeconf, True); } void -tileleft(Display *disp, int screen, awesome_config *awesomeconf) +tileleft(Display *disp, awesome_config *awesomeconf) { - _tile(disp, screen, awesomeconf, False); + _tile(disp, awesomeconf, False); } diff --git a/layouts/tile.h b/layouts/tile.h index 050e594c..138544bf 100644 --- a/layouts/tile.h +++ b/layouts/tile.h @@ -28,7 +28,7 @@ void uicb_setnmaster(Display *, DC *, awesome_config *, const char *); /* change number of master windows */ void uicb_setncols(Display *, DC *, awesome_config *, const char *); void uicb_setmwfact(Display *, DC *, awesome_config *, const char *); /* sets master width factor */ -void tile(Display *, int, awesome_config *); -void tileleft(Display *, int, awesome_config *); +void tile(Display *, awesome_config *); +void tileleft(Display *, awesome_config *); #endif -- 2.11.4.GIT