Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

client: change global linked list to an array 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-04-09 17:17:10 +02:00
parent 87c3c02b72
commit be752cc81c
11 changed files with 98 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awesome.c
View File

@ -59,7 +59,6 @@ typedef struct
void
awesome_atexit(void)
{
client_t *c;
int screen_nbr, nscreens;
a_dbus_cleanup();
@ -81,10 +80,10 @@ awesome_atexit(void)
systray_cleanup(screen_nbr);
/* remap all clients since some WM won't handle them otherwise */
for(c = globalconf.clients; c; c = c->next)
foreach(c, globalconf.clients)
{
client_unban(c);
titlebar_client_detach(c);
client_unban(*c);
titlebar_client_detach(*c);
}
xcb_flush(globalconf.connection);

71
client.c
View File

@ -131,9 +131,10 @@ client_getcontent(client_t *c)
client_t *
client_getbywin(xcb_window_t w)
{
client_t *c;
for(c = globalconf.clients; c && c->win != w; c = c->next);
return c;
for(int i = 0; i < globalconf.clients.len; i++)
if(globalconf.clients.tab[i]->win == w)
return globalconf.clients.tab[i];
return NULL;
}
/** Record that a client lost focus.
@ -240,8 +241,13 @@ void
client_focus(client_t *c)
{
/* We have to set focus on first client */
if(!c && !(c = globalconf.clients))
if(!c)
{
if(globalconf.clients.len)
c = globalconf.clients.tab[0];
else
return;
}
if(!client_maybevisible(c, c->screen))
return;
@ -475,7 +481,7 @@ client_manage(xcb_window_t w, xcb_get_geometry_reply_t *wgeom, int phys_screen,
screen_client_moveto(c, screen, false, true);
/* Push client in client list */
client_list_push(&globalconf.clients, client_ref(&c));
client_array_push(&globalconf.clients, client_ref(&c));
/* Push client in stack */
client_raise(c);
@ -711,13 +717,15 @@ client_resize(client_t *c, area_t geometry, bool hints)
void
client_update_strut_positions(int screen)
{
client_t *c;
area_t allowed_area, geom;
/* Ignore all struts for starters. */
for(c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->screen == screen && client_hasstrut(c))
c->ignore_strut = true;
}
/* Rationale:
* Top and bottom panels are common, so they take precendence.
@ -725,8 +733,9 @@ client_update_strut_positions(int screen)
*/
/* WINDOW_TYPE_DOCK: top + bottom. */
for(c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->screen != screen || !client_hasstrut(c) || c->type != WINDOW_TYPE_DOCK)
continue;
@ -767,8 +776,9 @@ client_update_strut_positions(int screen)
}
/* WINDOW_TYPE_DOCK: left + right. */
for(c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->screen != screen || !client_hasstrut(c) || c->type != WINDOW_TYPE_DOCK)
continue;
@ -809,8 +819,9 @@ client_update_strut_positions(int screen)
}
/* not WINDOW_TYPE_DOCK: top + bottom. */
for(c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->screen != screen || !client_hasstrut(c) || c->type == WINDOW_TYPE_DOCK)
continue;
@ -851,8 +862,9 @@ client_update_strut_positions(int screen)
}
/* not WINDOW_TYPE_DOCK: left + right. */
for(c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->screen != screen || !client_hasstrut(c) || c->type == WINDOW_TYPE_DOCK)
continue;
@ -1180,15 +1192,25 @@ client_unmanage(client_t *c)
tag_array_t *tags = &globalconf.screens[c->screen].tags;
/* Reset transient_for attributes of widows that maybe refering to us */
for(client_t *tc = globalconf.clients; tc; tc = tc->next)
foreach(_tc, globalconf.clients)
{
client_t *tc = *_tc;
if(tc->transient_for == c)
tc->transient_for = NULL;
}
if(globalconf.screens[c->phys_screen].client_focus == c)
client_unfocus(c);
/* remove client everywhere */
client_list_detach(&globalconf.clients, c);
client_t **_c = NULL;
foreach(iter, globalconf.clients)
if(c == *iter)
{
_c = iter;
break;
}
client_array_remove(&globalconf.clients, _c);
stack_client_delete(c);
for(int i = 0; i < tags->len; i++)
untag_client(c, tags->tab[i]);
@ -1267,28 +1289,31 @@ static int
luaA_client_get(lua_State *L)
{
int i = 1, screen;
client_t *c;
screen = luaL_optnumber(L, 1, 0) - 1;
lua_newtable(L);
if(screen == SCREEN_UNDEF)
for(c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
luaA_client_userdata_new(globalconf.L, c);
lua_rawseti(L, -2, i++);
}
else
{
luaA_checkscreen(screen);
for(c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->screen == screen)
{
luaA_client_userdata_new(globalconf.L, c);
lua_rawseti(L, -2, i++);
}
}
}
return 1;
}
@ -1373,7 +1398,19 @@ luaA_client_swap(lua_State *L)
if(*c != *swap)
{
client_list_swap(&globalconf.clients, *swap, *c);
/* makes c and swap points on array address, not Lua */
foreach(iter, globalconf.clients)
if(*c == *iter)
c = iter;
else if(*swap == *iter)
swap = iter;
/* swap entry in the array */
client_t *tmp;
tmp = *c;
*c = *swap;
*swap = tmp;
client_need_arrange(*c);
client_need_arrange(*swap);

2
client.h
View File

@ -84,8 +84,6 @@ int luaA_client_newindex(lua_State *);
int luaA_client_userdata_new(lua_State *, client_t *);
DO_SLIST(client_t, client, client_unref)
static inline void
client_stack(void)
{

3
event.c
View File

@ -878,8 +878,9 @@ event_handle_mappingnotify(void *data,
window_grabkeys(s->root, &globalconf.keys);
}
for(client_t *c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
xcb_ungrab_key(connection, XCB_GRAB_ANY, c->win, XCB_BUTTON_MASK_ANY);
window_grabkeys(c->win, &c->keys);
}

17
ewmh.c
View File

@ -143,18 +143,15 @@ ewmh_init(int phys_screen)
void
ewmh_update_net_client_list(int phys_screen)
{
xcb_window_t *wins;
client_t *c;
xcb_window_t *wins = p_alloca(xcb_window_t, globalconf.clients.len);
int n = 0;
for(c = globalconf.clients; c; c = c->next)
n++;
wins = p_alloca(xcb_window_t, n);
for(n = 0, c = globalconf.clients; c; c = c->next, n++)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->phys_screen == phys_screen)
wins[n] = c->win;
wins[n++] = c->win;
}
xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE,
xutil_screen_get(globalconf.connection, phys_screen)->root,

8
layout.c
View File

@ -31,11 +31,11 @@
static void
arrange(int screen)
{
client_t *c;
uint32_t select_input_val[] = { CLIENT_SELECT_INPUT_EVENT_MASK & ~(XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_LEAVE_WINDOW) };
for(c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
/* Bob Marley v2:
* While we arrange, we do not want to receive EnterNotify or LeaveNotify
* events, or we would get spurious events. */
@ -74,9 +74,9 @@ arrange(int screen)
/* Now, we want to receive EnterNotify and LeaveNotify events back. */
select_input_val[0] = CLIENT_SELECT_INPUT_EVENT_MASK;
for(c = globalconf.clients; c; c = c->next)
foreach(c, globalconf.clients)
xcb_change_window_attributes(globalconf.connection,
c->win,
(*c)->win,
XCB_CW_EVENT_MASK,
select_input_val);
}

4
screen.c
View File

@ -178,9 +178,9 @@ screen_area_get(int screen, wibox_array_t *wiboxes,
/* Some clients request more space than their size, because another window of the same app already has some space. */
/* So we clamp the strut size. */
if(strut)
foreach(_c, globalconf.clients)
{
client_t *c;
for(c = globalconf.clients; c; c = c->next)
client_t *c = *_c;
if(client_isvisible(c, screen) && !c->ignore_strut)
{
if(c->strut.top_start_x || c->strut.top_end_x)

4
structs.h
View File

@ -242,8 +242,6 @@ struct client_t
bool size_hints_honor;
/** Window it is transient for */
client_t *transient_for;
/** Next and previous clients */
client_t *prev, *next;
};
ARRAY_TYPE(client_t *, client)
@ -322,7 +320,7 @@ struct awesome_t
/** Check for XTest extension */
bool have_xtest;
/** Clients list */
client_t *clients;
client_array_t clients;
/** Embedded windows */
xembed_window_array_t embedded;
/** Path to config file */

16
titlebar.c
View File

@ -34,11 +34,9 @@
client_t *
client_getbytitlebar(wibox_t *titlebar)
{
client_t *c;
for(c = globalconf.clients; c; c = c->next)
if(c->titlebar == titlebar)
return c;
foreach(c, globalconf.clients)
if((*c)->titlebar == titlebar)
return *c;
return NULL;
}
@ -50,11 +48,9 @@ client_getbytitlebar(wibox_t *titlebar)
client_t *
client_getbytitlebarwin(xcb_window_t win)
{
client_t *c;
for(c = globalconf.clients; c; c = c->next)
if(c->titlebar && c->titlebar->sw.window == win)
return c;
foreach(c, globalconf.clients)
if((*c)->titlebar && (*c)->titlebar->sw.window == win)
return *c;
return NULL;
}

15
wibox.c
View File

@ -504,9 +504,12 @@ wibox_getbywin(xcb_window_t w)
return s;
}
for(client_t *c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->titlebar && c->titlebar->sw.window == w)
return c->titlebar;
}
return NULL;
}
@ -541,10 +544,13 @@ wibox_refresh(void)
wibox_draw(s);
}
for(client_t *c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->titlebar && c->titlebar->need_update)
wibox_draw(c->titlebar);
}
}
/** Reposition all wiboxes.
*/
@ -797,7 +803,9 @@ luaA_wibox_invalidate_byitem(lua_State *L, const void *item)
}
for(client_t *c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->titlebar && luaA_wibox_hasitem(L, c->titlebar, item))
{
/* recompute widget node list */
@ -805,6 +813,7 @@ luaA_wibox_invalidate_byitem(lua_State *L, const void *item)
lua_pop(L, 1); /* remove widgets table */
}
}
}
/** Wibox object.
* \param L The Lua VM state.

5
widget.c
View File

@ -325,7 +325,9 @@ widget_invalidate_bywidget(widget_t *widget)
}
}
for(client_t *c = globalconf.clients; c; c = c->next)
foreach(_c, globalconf.clients)
{
client_t *c = *_c;
if(c->titlebar && !c->titlebar->need_update)
for(int j = 0; j < c->titlebar->widgets.len; j++)
if(c->titlebar->widgets.tab[j].widget == widget)
@ -334,6 +336,7 @@ widget_invalidate_bywidget(widget_t *widget)
break;
}
}
}
/** Create a new widget.
* \param L The Lua VM state.