isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-14 20:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

stack-tracker: Fix code style

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-06-16 11:37:15 -04:00
parent 9711d95996
commit 01b6d9bfe2
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/stack-tracker.c
View File

@ -485,14 +485,12 @@ requery_xserver_stack (MetaStackTracker *tracker)
screen->xroot, screen->xroot,
&ignored1, &ignored2, &children, &n_children); &ignored1, &ignored2, &children, &n_children);
tracker->xserver_stack = tracker->xserver_stack = g_array_sized_new (FALSE, FALSE, sizeof (MetaStackWindow), n_children);
g_array_sized_new (FALSE, FALSE, sizeof (MetaStackWindow), n_children);
g_array_set_size (tracker->xserver_stack, n_children); g_array_set_size (tracker->xserver_stack, n_children);
for (i = 0; i < n_children; i++) for (i = 0; i < n_children; i++)
{ {
MetaStackWindow *window = MetaStackWindow *window = &g_array_index (tracker->xserver_stack, MetaStackWindow, i);
&g_array_index (tracker->xserver_stack, MetaStackWindow, i);
window->any.type = META_WINDOW_CLIENT_TYPE_X11; window->any.type = META_WINDOW_CLIENT_TYPE_X11;
window->x11.xwindow = children[i]; window->x11.xwindow = children[i];
} }
@ -909,15 +907,11 @@ resync_verified_stack_with_xserver_stack (MetaStackTracker *tracker)
g_queue_clear (tracker->unverified_predictions); g_queue_clear (tracker->unverified_predictions);
j = 0; j = 0;
expected_xwindow = expected_xwindow = &g_array_index (tracker->xserver_stack, MetaStackWindow, j);
&g_array_index (tracker->xserver_stack, MetaStackWindow, j);
for (i = 0; for (i = 0; i < tracker->verified_stack->len; )
i < tracker->verified_stack->len;
)
{ {
MetaStackWindow *current = MetaStackWindow *current = &g_array_index (tracker->verified_stack, MetaStackWindow, i);
&g_array_index (tracker->verified_stack, MetaStackWindow, i);
if (current->any.type != META_WINDOW_CLIENT_TYPE_X11) if (current->any.type != META_WINDOW_CLIENT_TYPE_X11)
{ {
@ -954,8 +948,7 @@ resync_verified_stack_with_xserver_stack (MetaStackTracker *tracker)
/* Technically we only need to look forward from i if we /* Technically we only need to look forward from i if we
* wanted to optimize this a bit... */ * wanted to optimize this a bit... */
expected_index = expected_index = find_window (tracker->verified_stack, expected_xwindow);
find_window (tracker->verified_stack, expected_xwindow);
if (expected_index >= 0) if (expected_index >= 0)
{ {
@ -993,8 +986,7 @@ resync_verified_stack_with_xserver_stack (MetaStackTracker *tracker)
i++; i++;
j++; j++;
expected_xwindow = expected_xwindow = &g_array_index (tracker->xserver_stack, MetaStackWindow, j);
&g_array_index (tracker->xserver_stack, MetaStackWindow, j);
if (j >= tracker->xserver_stack->len) if (j >= tracker->xserver_stack->len)
break; break;
@ -1004,8 +996,7 @@ resync_verified_stack_with_xserver_stack (MetaStackTracker *tracker)
* xserver_stack and so we can remove them. */ * xserver_stack and so we can remove them. */
while (i < tracker->verified_stack->len) while (i < tracker->verified_stack->len)
{ {
MetaStackWindow *current = MetaStackWindow *current = &g_array_index (tracker->verified_stack, MetaStackWindow, i);
&g_array_index (tracker->verified_stack, MetaStackWindow, i);
if (current->any.type == META_WINDOW_CLIENT_TYPE_X11) if (current->any.type == META_WINDOW_CLIENT_TYPE_X11)
g_array_remove_index (tracker->verified_stack, i); g_array_remove_index (tracker->verified_stack, i);
@ -1019,8 +1010,7 @@ resync_verified_stack_with_xserver_stack (MetaStackTracker *tracker)
* entries in xserver_stack then append them all to the end */ * entries in xserver_stack then append them all to the end */
for (; j < tracker->xserver_stack->len; j++) for (; j < tracker->xserver_stack->len; j++)
{ {
MetaStackWindow *current = MetaStackWindow *current = &g_array_index (tracker->xserver_stack, MetaStackWindow, j);
&g_array_index (tracker->xserver_stack, MetaStackWindow, j);
g_array_append_val (tracker->verified_stack, *current); g_array_append_val (tracker->verified_stack, *current);
modified_stack = TRUE; modified_stack = TRUE;