[screen] s/screen_get_area/screen_area_get/
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
parent
5f2585d82e
commit
24176ba8c7
2
ewmh.c
2
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;
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ _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);
|
||||
|
||||
|
|
4
mouse.c
4
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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
6
screen.c
6
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;
|
||||
|
|
2
screen.h
2
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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue