nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Taskbar: code cleanup (rename task_group -> task_buttons)

Browse source
This commit is contained in:
o9000 2016-01-09 14:07:44 +01:00
parent 650806525a
commit 11b285d045
4 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/taskbar/task.c
View file

@ -85,7 +85,7 @@ Task *add_task(Window win)
// fprintf(stderr, "%s %d: win = %ld, task = %s\n", __FUNCTION__, __LINE__, win, task_template.title ? task_template.title : "??"); // fprintf(stderr, "%s %d: win = %ld, task = %s\n", __FUNCTION__, __LINE__, win, task_template.title ? task_template.title : "??");
// fprintf(stderr, "new task %s win %u: desktop %d, monitor %d\n", new_task.title, win, new_task.desktop, monitor); // fprintf(stderr, "new task %s win %u: desktop %d, monitor %d\n", new_task.title, win, new_task.desktop, monitor);
GPtrArray *task_group = g_ptr_array_new(); GPtrArray *task_buttons = g_ptr_array_new();
for (int j = 0; j < panels[monitor].num_desktops; j++) { for (int j = 0; j < panels[monitor].num_desktops; j++) {
if (task_template.desktop != ALL_DESKTOPS && task_template.desktop != j) if (task_template.desktop != ALL_DESKTOPS && task_template.desktop != j)
continue; continue;
@ -118,13 +118,13 @@ Task *add_task(Window win)
task_instance->icon_height = task_template.icon_height; task_instance->icon_height = task_template.icon_height;
add_area(&task_instance->area, &taskbar->area); add_area(&task_instance->area, &taskbar->area);
g_ptr_array_add(task_group, task_instance); g_ptr_array_add(task_buttons, task_instance);
} }
Window *key = calloc(1, sizeof(Window)); Window *key = calloc(1, sizeof(Window));
*key = task_template.win; *key = task_template.win;
g_hash_table_insert(win_to_task, key, task_group); g_hash_table_insert(win_to_task, key, task_buttons);
set_task_state((Task*)g_ptr_array_index(task_group, 0), task_template.current_state); set_task_state((Task*)g_ptr_array_index(task_buttons, 0), task_template.current_state);
sort_taskbar_for_win(win); sort_taskbar_for_win(win);
@ -134,10 +134,10 @@ Task *add_task(Window win)
} }
if (window_is_urgent(win)) { if (window_is_urgent(win)) {
add_urgent((Task*)g_ptr_array_index(task_group, 0)); add_urgent((Task*)g_ptr_array_index(task_buttons, 0));
} }
return (Task*)g_ptr_array_index(task_group, 0); return (Task*)g_ptr_array_index(task_buttons, 0);
} }
void remove_task(Task *task) void remove_task(Task *task)
@ -177,9 +177,9 @@ void remove_task(Task *task)
} }
} }
GPtrArray *task_group = g_hash_table_lookup(win_to_task, &win); GPtrArray *task_buttons = g_hash_table_lookup(win_to_task, &win);
for (int i = 0; i < task_group->len; ++i) { for (int i = 0; i < task_buttons->len; ++i) {
Task *task2 = g_ptr_array_index(task_group, i); Task *task2 = g_ptr_array_index(task_buttons, i);
if (task2 == active_task) if (task2 == active_task)
active_task = 0; active_task = 0;
if (task2 == task_drag) if (task2 == task_drag)
@ -227,10 +227,10 @@ gboolean task_update_title(Task *task)
} }
task->title = title; task->title = title;
GPtrArray *task_group = get_task_group(task->win); GPtrArray *task_buttons = get_task_buttons(task->win);
if (task_group) { if (task_buttons) {
for (int i = 0; i < task_group->len; ++i) { for (int i = 0; i < task_buttons->len; ++i) {
Task *task2 = g_ptr_array_index(task_group, i); Task *task2 = g_ptr_array_index(task_buttons, i);
task2->title = task->title; task2->title = task->title;
schedule_redraw(&task2->area); schedule_redraw(&task2->area);
} }
@ -337,10 +337,10 @@ void task_update_icon(Task *task)
imlib_context_set_image(orig_image); imlib_context_set_image(orig_image);
imlib_free_image(); imlib_free_image();
GPtrArray *task_group = get_task_group(task->win); GPtrArray *task_buttons = get_task_buttons(task->win);
if (task_group) { if (task_buttons) {
for (i = 0; i < task_group->len; ++i) { for (i = 0; i < task_buttons->len; ++i) {
Task *task2 = g_ptr_array_index(task_group, i); Task *task2 = g_ptr_array_index(task_buttons, i);
task2->icon_width = task->icon_width; task2->icon_width = task->icon_width;
task2->icon_height = task->icon_height; task2->icon_height = task->icon_height;
for (int k = 0; k < TASK_STATE_COUNT; ++k) { for (int k = 0; k < TASK_STATE_COUNT; ++k) {
@ -520,7 +520,7 @@ void reset_active_task()
// printf("Change active task %ld\n", w1); // printf("Change active task %ld\n", w1);
if (w1) { if (w1) {
if (!get_task_group(w1)) { if (!get_task_buttons(w1)) {
Window w2; Window w2;
while (XGetTransientForHint(server.display, w1, &w2)) while (XGetTransientForHint(server.display, w1, &w2))
w1 = w2; w1 = w2;
@ -537,10 +537,10 @@ void set_task_state(Task *task, TaskState state)
if (state == TASK_ACTIVE && task->current_state != state) { if (state == TASK_ACTIVE && task->current_state != state) {
clock_gettime(CLOCK_MONOTONIC, &task->last_activation_time); clock_gettime(CLOCK_MONOTONIC, &task->last_activation_time);
if (taskbar_sort_method == TASKBAR_SORT_LRU || taskbar_sort_method == TASKBAR_SORT_MRU) { if (taskbar_sort_method == TASKBAR_SORT_LRU || taskbar_sort_method == TASKBAR_SORT_MRU) {
GPtrArray *task_group = get_task_group(task->win); GPtrArray *task_buttons = get_task_buttons(task->win);
if (task_group) { if (task_buttons) {
for (int i = 0; i < task_group->len; ++i) { for (int i = 0; i < task_buttons->len; ++i) {
Task *task1 = g_ptr_array_index(task_group, i); Task *task1 = g_ptr_array_index(task_buttons, i);
Taskbar *taskbar = (Taskbar *)task1->area.parent; Taskbar *taskbar = (Taskbar *)task1->area.parent;
sort_tasks(taskbar); sort_tasks(taskbar);
} }
@ -549,10 +549,10 @@ void set_task_state(Task *task, TaskState state)
} }
if (task->current_state != state || hide_task_diff_monitor) { if (task->current_state != state || hide_task_diff_monitor) {
GPtrArray *task_group = get_task_group(task->win); GPtrArray *task_buttons = get_task_buttons(task->win);
if (task_group) { if (task_buttons) {
for (int i = 0; i < task_group->len; ++i) { for (int i = 0; i < task_buttons->len; ++i) {
Task *task1 = g_ptr_array_index(task_group, i); Task *task1 = g_ptr_array_index(task_buttons, i);
task1->current_state = state; task1->current_state = state;
task1->area.bg = panels[0].g_task.background[state]; task1->area.bg = panels[0].g_task.background[state];
schedule_redraw(&task1->area); schedule_redraw(&task1->area);
@ -613,7 +613,7 @@ void add_urgent(Task *task)
if (active_task && active_task->win == task->win) if (active_task && active_task->win == task->win)
return; return;
task = get_task(task->win); // always add the first task for a task group (omnipresent windows) task = get_task(task->win); // always add the first task for the task buttons (omnipresent windows)
task->urgent_tick = 0; task->urgent_tick = 0;
if (g_slist_find(urgent_list, task)) if (g_slist_find(urgent_list, task))
return; return;

18
src/taskbar/taskbar.c
View file

@ -329,13 +329,13 @@ void taskbar_remove_task(Window *win)
Task *get_task(Window win) Task *get_task(Window win)
{ {
GPtrArray *task_group = get_task_group(win); GPtrArray *task_buttons = get_task_buttons(win);
if (task_group) if (task_buttons)
return g_ptr_array_index(task_group, 0); return g_ptr_array_index(task_buttons, 0);
return NULL; return NULL;
} }
GPtrArray *get_task_group(Window win) GPtrArray *get_task_buttons(Window win)
{ {
if (win_to_task && taskbar_enabled) if (win_to_task && taskbar_enabled)
return g_hash_table_lookup(win_to_task, &win); return g_hash_table_lookup(win_to_task, &win);
@ -566,14 +566,14 @@ void sort_taskbar_for_win(Window win)
if (taskbar_sort_method == TASKBAR_NOSORT) if (taskbar_sort_method == TASKBAR_NOSORT)
return; return;
GPtrArray *task_group = get_task_group(win); GPtrArray *task_buttons = get_task_buttons(win);
if (task_group) { if (task_buttons) {
Task *task0 = g_ptr_array_index(task_group, 0); Task *task0 = g_ptr_array_index(task_buttons, 0);
if (task0) { if (task0) {
get_window_coordinates(win, &task0->win_x, &task0->win_y, &task0->win_w, &task0->win_h); get_window_coordinates(win, &task0->win_x, &task0->win_y, &task0->win_w, &task0->win_h);
} }
for (int i = 0; i < task_group->len; ++i) { for (int i = 0; i < task_buttons->len; ++i) {
Task *task = g_ptr_array_index(task_group, i); Task *task = g_ptr_array_index(task_buttons, i);
task->win_x = task0->win_x; task->win_x = task0->win_x;
task->win_y = task0->win_y; task->win_y = task0->win_y;
task->win_w = task0->win_w; task->win_w = task0->win_w;

6
src/taskbar/taskbar.h
View file

@ -74,9 +74,9 @@ void taskbar_refresh_tasklist();
// Returns the task button for this window. If there are multiple buttons, returns the first one. // Returns the task button for this window. If there are multiple buttons, returns the first one.
Task *get_task(Window win); Task *get_task(Window win);
// Returns the task group, i.e. the set of task buttons for this window, usually having only one element. // Returns the task buttons for this window, usually having only one element.
// However for windows shown on all desktops, there is one button for each taskbar (usually only one visible). // However for windows shown on all desktops, there are multiple buttons, one for each taskbar.
GPtrArray *get_task_group(Window win); GPtrArray *get_task_buttons(Window win);
void set_taskbar_state(Taskbar *taskbar, TaskbarState state); void set_taskbar_state(Taskbar *taskbar, TaskbarState state);

2
src/util/window.c
View file

@ -75,7 +75,7 @@ gboolean window_is_hidden(Window win)
// do not add transient_for windows if the transient window is already in the taskbar // do not add transient_for windows if the transient window is already in the taskbar
window = win; window = win;
while (XGetTransientForHint(server.display, window, &window)) { while (XGetTransientForHint(server.display, window, &window)) {
if (get_task_group(window)) { if (get_task_buttons(window)) {
XFree(at); XFree(at);
return TRUE; return TRUE;
} }