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

Do not use negative values for task state since it is used as array index

Browse source
This commit is contained in:
o9000 2016-01-03 02:44:14 +01:00
parent 0992662396
commit 1ff868fdb7
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/taskbar/task.c
View file

@ -104,7 +104,7 @@ Task *add_task(Window win)
task_instance->win_y = task_template.win_y; task_instance->win_y = task_template.win_y;
task_instance->win_w = task_template.win_w; task_instance->win_w = task_template.win_w;
task_instance->win_h = task_template.win_h; task_instance->win_h = task_template.win_h;
task_instance->current_state = -1; // to update the current state later in set_task_state... task_instance->current_state = TASK_UNDEFINED; // to update the current state later in set_task_state...
if (task_instance->desktop == ALL_DESKTOPS && server.desktop != j) { if (task_instance->desktop == ALL_DESKTOPS && server.desktop != j) {
// fprintf(stderr, "%s %d: win = %ld hiding task: another desktop\n", __FUNCTION__, __LINE__, win); // fprintf(stderr, "%s %d: win = %ld hiding task: another desktop\n", __FUNCTION__, __LINE__, win);
task_instance->area.on_screen = FALSE; task_instance->area.on_screen = FALSE;
@ -549,7 +549,7 @@ void reset_active_task()
void set_task_state(Task *task, TaskState state) void set_task_state(Task *task, TaskState state)
{ {
if (!task || state < 0 || state >= TASK_STATE_COUNT) if (!task || state == TASK_UNDEFINED || state >= TASK_STATE_COUNT)
return; return;
if (state == TASK_ACTIVE && task->current_state != state) { if (state == TASK_ACTIVE && task->current_state != state) {

1
src/taskbar/task.h
View file

@ -18,6 +18,7 @@ typedef enum TaskState {
TASK_ACTIVE, TASK_ACTIVE,
TASK_ICONIFIED, TASK_ICONIFIED,
TASK_URGENT, TASK_URGENT,
TASK_UNDEFINED,
TASK_STATE_COUNT, TASK_STATE_COUNT,
} TaskState; } TaskState;