diff --git a/ewmh.c b/ewmh.c index 1513bdfe..1113eed8 100644 --- a/ewmh.c +++ b/ewmh.c @@ -290,7 +290,7 @@ ewmh_process_state_atom(client_t *c, xcb_atom_t state, int set) } else if(set == _NET_WM_STATE_ADD) { - geometry = screen_get_area(c->screen, NULL, &globalconf.screens[c->screen].padding); + geometry = screen_area_get(c->screen, NULL, &globalconf.screens[c->screen].padding); /* save geometry */ c->m_geometry = c->geometry; c->wasfloating = c->isfloating; diff --git a/layouts/fibonacci.c b/layouts/fibonacci.c index e9540680..6b3b2c76 100644 --- a/layouts/fibonacci.c +++ b/layouts/fibonacci.c @@ -32,7 +32,7 @@ layout_fibonacci(int screen, int shape) int n = 0, i = 0; client_t *c; area_t geometry, area; - geometry = area = screen_get_area(screen, + geometry = area = screen_area_get(screen, globalconf.screens[screen].statusbar, &globalconf.screens[screen].padding); diff --git a/layouts/magnifier.c b/layouts/magnifier.c index c5c190cd..f76e3851 100644 --- a/layouts/magnifier.c +++ b/layouts/magnifier.c @@ -33,7 +33,7 @@ layout_magnifier(int screen) int n = 0; client_t *c, *focus; tag_t **curtags = tags_get_current(screen); - area_t geometry, area = screen_get_area(screen, + area_t geometry, area = screen_area_get(screen, globalconf.screens[screen].statusbar, &globalconf.screens[screen].padding); diff --git a/layouts/max.c b/layouts/max.c index 90f47a30..fd71f930 100644 --- a/layouts/max.c +++ b/layouts/max.c @@ -31,7 +31,7 @@ void layout_max(int screen) { client_t *c, *focus; - area_t area = screen_get_area(screen, + area_t area = screen_area_get(screen, globalconf.screens[screen].statusbar, &globalconf.screens[screen].padding); diff --git a/layouts/tile.c b/layouts/tile.c index a791045f..c15771ad 100644 --- a/layouts/tile.c +++ b/layouts/tile.c @@ -42,9 +42,9 @@ _tile(int screen, const position_t position) client_t *c; tag_t **curtags = tags_get_current(screen); - area = screen_get_area(screen, + area = screen_area_get(screen, globalconf.screens[screen].statusbar, - &globalconf.screens[screen].padding); + &globalconf.screens[screen].padding); for(n = 0, c = globalconf.clients; c; c = c->next) if(IS_TILED(c, screen)) diff --git a/mouse.c b/mouse.c index b0ca48b8..108b6cf3 100644 --- a/mouse.c +++ b/mouse.c @@ -99,7 +99,7 @@ mouse_snapclient(client_t *c, area_t geometry, int snap) client_t *snapper; area_t snapper_geometry; area_t screen_geometry = - screen_get_area(c->screen, + screen_area_get(c->screen, globalconf.screens[c->screen].statusbar, &globalconf.screens[c->screen].padding); @@ -359,7 +359,7 @@ mouse_client_resize(client_t *c) for(c = globalconf.clients; c && !IS_TILED(c, screen); c = c->next); if(!c) return; - area = screen_get_area(c->screen, + area = screen_area_get(c->screen, globalconf.screens[c->screen].statusbar, &globalconf.screens[c->screen].padding); diff --git a/placement.c b/placement.c index cab09fc1..25b8c75f 100644 --- a/placement.c +++ b/placement.c @@ -42,7 +42,7 @@ placement_fix_offscreen(area_t geometry, int screen, int border) { area_t screen_geometry; - screen_geometry = screen_get_area(screen, + screen_geometry = screen_area_get(screen, globalconf.screens[screen].statusbar, &globalconf.screens[screen].padding); @@ -76,7 +76,7 @@ placement_smart(client_t *c) screen_geometry = p_new(area_t, 1); - *screen_geometry = screen_get_area(c->screen, + *screen_geometry = screen_area_get(c->screen, globalconf.screens[c->screen].statusbar, &globalconf.screens[c->screen].padding); diff --git a/screen.c b/screen.c index 65d8d1c3..a0bc64d1 100644 --- a/screen.c +++ b/screen.c @@ -39,7 +39,7 @@ extern awesome_t globalconf; * \return The screen area. */ area_t -screen_get_area(int screen, statusbar_t *statusbar, padding_t *padding) +screen_area_get(int screen, statusbar_t *statusbar, padding_t *padding) { area_t area = globalconf.screens_info->geometry[screen]; statusbar_t *sb; @@ -146,8 +146,8 @@ move_client_to_screen(client_t *c, int new_screen, bool doresize) area_t new_geometry, new_f_geometry; new_f_geometry = c->f_geometry; - to = screen_get_area(c->screen, NULL, NULL); - from = screen_get_area(old_screen, NULL, NULL); + to = screen_area_get(c->screen, NULL, NULL); + from = screen_area_get(old_screen, NULL, NULL); /* compute new coords in new screen */ new_f_geometry.x = (c->f_geometry.x - from.x) + to.x; diff --git a/screen.h b/screen.h index 1ce5ea97..8d8cf3b9 100644 --- a/screen.h +++ b/screen.h @@ -24,7 +24,7 @@ #include "structs.h" -area_t screen_get_area(int, statusbar_t *, padding_t *); +area_t screen_area_get(int, statusbar_t *, padding_t *); area_t display_area_get(int, statusbar_t *, padding_t *); int screen_virttophys(int); void move_client_to_screen(client_t *, int, bool); diff --git a/statusbar.c b/statusbar.c index 46c6181d..b40b04e6 100644 --- a/statusbar.c +++ b/statusbar.c @@ -90,7 +90,7 @@ statusbar_position_update(statusbar_t *statusbar, position_t position) if((statusbar->position = position) == Off) return; - area = screen_get_area(statusbar->screen, + area = screen_area_get(statusbar->screen, NULL, &globalconf.screens[statusbar->screen].padding);