mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

labwc.h: remove "extern struct server server"

Browse source
This commit is contained in:
Johan Malm 2020-09-08 20:18:12 +01:00
parent 84ebd2dae5
commit e99d0bb34e
11 changed files with 62 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/view.c
View file

@ -140,10 +140,10 @@ void view_focus(struct view *view)
/* TODO: move xwayland decendants to front */
}
static struct view *first_view(void)
static struct view *first_view(struct server *server)
{
struct view *view;
view = wl_container_of(server.views.next, view, link);
view = wl_container_of(server->views.next, view, link);
return view;
}
@ -172,21 +172,22 @@ static int has_focusable_view(struct wl_list *wl_list)
return false;
}
/*
* Return next view. If NULL provided, return second view from front.
/**
* view_next - return next view
* @current: view used as reference point for defining 'next'
* Note: If @current=NULL, the list's second view is returned
*/
/* TODO: rename function */
struct view *view_next(struct view *current)
struct view *view_next(struct server *server, struct view *current)
{
if (!has_focusable_view(&server.views))
if (!has_focusable_view(&server->views))
return NULL;
struct view *view = current ? current : first_view();
struct view *view = current ? current : first_view(server);
/* Replacement for wl_list_for_each_from() */
do {
view = wl_container_of(view->link.next, view, link);
} while (&view->link == &server.views || !isfocusable(view));
} while (&view->link == &server->views || !isfocusable(view));
return view;
}