Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Area: refactor list -> children

Browse Source
This commit is contained in:
o9000
2015-11-04 02:37:10 +01:00
parent f2922d7dbd
commit 57c35549f3
8 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/taskbar/task.c
View File

@@ -113,7 +113,7 @@ Task *add_task (Window win)
}
new_tsk2->icon_width = new_tsk.icon_width;
new_tsk2->icon_height = new_tsk.icon_height;
tskbar->area.list = g_list_append(tskbar->area.list, new_tsk2);
tskbar->area.children = g_list_append(tskbar->area.children, new_tsk2);
tskbar->area.resize = 1;
g_ptr_array_add(task_group, new_tsk2);
//printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
@@ -419,7 +419,7 @@ Task *find_active_task(Task *current_task, Task *active_task)
Taskbar* tskbar = current_task->area.parent;
GList *l0 = tskbar->area.list;
GList *l0 = tskbar->area.children;
if (taskbarname_enabled)
l0 = l0->next;
for (; l0 ; l0 = l0->next) {
@@ -438,7 +438,7 @@ Task *next_task(Task *tsk)
Taskbar* tskbar = tsk->area.parent;
GList *l0 = tskbar->area.list;
GList *l0 = tskbar->area.children;
if (taskbarname_enabled) l0 = l0->next;
GList *lfirst_tsk = l0;
for (; l0 ; l0 = l0->next) {
@@ -462,7 +462,7 @@ Task *prev_task(Task *tsk)
Taskbar* tskbar = tsk->area.parent;
tsk2 = 0;
GList *l0 = tskbar->area.list;
GList *l0 = tskbar->area.children;
if (taskbarname_enabled) l0 = l0->next;
GList *lfirst_tsk = l0;
for (; l0 ; l0 = l0->next) {

12
src/taskbar/taskbar.c
View File

@@ -337,7 +337,7 @@ int resize_taskbar(void *obj)
resize_by_layout(obj, panel->g_task.maximum_width);
text_width = panel->g_task.maximum_width;
GList *l = taskbar->area.list;
GList *l = taskbar->area.children;
if (taskbarname_enabled) l = l->next;
for (; l != NULL; l = l->next) {
if (((Task *)l->data)->area.on_screen) {
@@ -391,7 +391,7 @@ void set_taskbar_state(Taskbar *tskbar, int state)
if (taskbarname_enabled && tskbar->bar_name.state_pix[state] == 0)
tskbar->bar_name.area.redraw = 1;
if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
GList *l = tskbar->area.list;
GList *l = tskbar->area.children;
if (taskbarname_enabled) l = l->next;
for ( ; l ; l = l->next)
set_task_redraw(l->data);
@@ -426,9 +426,9 @@ gint compare_tasks_trivial(Task *a, Task *b, Taskbar *taskbar)
if (a == b)
return 0;
if (taskbarname_enabled) {
if (a == taskbar->area.list->data)
if (a == taskbar->area.children->data)
return -1;
if (b == taskbar->area.list->data)
if (b == taskbar->area.children->data)
return 1;
}
return NONTRIVIAL;
@@ -515,7 +515,7 @@ int taskbar_needs_sort(Taskbar *taskbar)
return 0;
GList *i, *j;
for (i = taskbar->area.list, j = i ? i->next : NULL; i && j; i = i->next, j = j->next) {
for (i = taskbar->area.children, j = i ? i->next : NULL; i && j; i = i->next, j = j->next) {
if (compare_tasks(i->data, j->data, taskbar) > 0) {
return 1;
}
@@ -531,7 +531,7 @@ void sort_tasks(Taskbar *taskbar)
if (!taskbar_needs_sort(taskbar)) {
return;
}
taskbar->area.list = g_list_sort_with_data(taskbar->area.list, (GCompareDataFunc)compare_tasks, taskbar);
taskbar->area.children = g_list_sort_with_data(taskbar->area.children, (GCompareDataFunc)compare_tasks, taskbar);
taskbar->area.resize = 1;
panel_refresh = 1;
((Panel*)taskbar->area.panel)->area.resize = 1;

2
src/taskbar/taskbarname.c
View File

@@ -77,7 +77,7 @@ void init_taskbarname_panel(void *p)
tskbar->bar_name.name = g_strdup_printf("%d", j+1);
// append the name at the beginning of taskbar
tskbar->area.list = g_list_append(tskbar->area.list, &tskbar->bar_name);
tskbar->area.children = g_list_append(tskbar->area.children, &tskbar->bar_name);
}
for (l=list ; l ; l = l->next)