Commit c6ff59f9 authored by Andreas.Fink85's avatar Andreas.Fink85

*fix* panel_monitor = n works again, after I've broken it with revision 308

*add* convenience storage for tasks in a hash map (Window is mapped to a GPtrArray of Task*)
*fix* bugfix in resize_taskbar when task.area.width/height changes



git-svn-id: http://tint2.googlecode.com/svn/trunk@332 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
parent 45187216
......@@ -226,11 +226,6 @@ void add_entry (char *key, char *value)
panel_config.monitor = atoi (value);
if (panel_config.monitor > 0) panel_config.monitor -= 1;
}
if (panel_config.monitor > (server.nb_monitor-1)) {
// server.nb_monitor minimum value is 1 (see get_monitors())
fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
panel_config.monitor = 0;
}
}
else if (strcmp (key, "panel_size") == 0) {
extract_values(value, &value1, &value2, &value3);
......
......@@ -81,6 +81,12 @@ void init_panel()
int i, old_nb_panel;
Panel *new_panel, *p;
if (panel_config.monitor > (server.nb_monitor-1)) {
// server.nb_monitor minimum value is 1 (see get_monitors())
fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
panel_config.monitor = 0;
}
init_tooltip();
init_systray();
init_clock();
......
This diff is collapsed.
......@@ -33,12 +33,20 @@
#include "panel.h"
GHashTable* win_to_task_table = 0;
guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
void init_taskbar()
{
Panel *panel;
int i, j;
if (win_to_task_table == 0)
win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, g_ptr_array_unref);
for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i];
......@@ -138,110 +146,73 @@ void init_taskbar()
}
}
void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data) {remove_task(task_get_task(*(Window*)key)); }
void cleanup_taskbar()
{
Panel *panel;
Taskbar *tskbar;
int i, j;
GSList *l0;
Task *tsk;
if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0);
for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i];
for (j=0 ; j < panel->nb_desktop ; j++) {
tskbar = &panel->taskbar[j];
l0 = tskbar->area.list;
while (l0) {
tsk = l0->data;
l0 = l0->next;
// careful : remove_task change l0->next
remove_task (tsk);
}
free_area (&tskbar->area);
// remove taskbar from the panel
panel->area.list = g_slist_remove(panel->area.list, tskbar);
}
}
for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i];
if (panel->taskbar) {
free(panel->taskbar);
panel->taskbar = 0;
}
}
if (win_to_task_table) {
g_hash_table_destroy(win_to_task_table);
win_to_task_table = 0;
}
}
Task *task_get_task (Window win)
{
Task *tsk;
GSList *l0;
int i, j;
for (i=0 ; i < nb_panel ; i++) {
for (j=0 ; j < panel1[i].nb_desktop ; j++) {
for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
tsk = l0->data;
if (win == tsk->win)
return tsk;
}
}
}
return 0;
GPtrArray* task_group = task_get_tasks(win);
if (task_group)
return g_ptr_array_index(task_group, 0);
else
return 0;
}
GSList* task_get_tasks(Window win)
GPtrArray* task_get_tasks(Window win)
{
GSList* l = 0;
GSList* it;
Task* tsk;
int i, j;
for (i=0; i<nb_panel; ++i) {
for (j=0; j<panel1[i].nb_desktop; ++j) {
for (it=panel1[i].taskbar[j].area.list; it; it=it->next) {
tsk = it->data;
if (win == tsk->win)
l = g_slist_prepend(l, tsk);
}
}
}
return l;
return g_hash_table_lookup(win_to_task_table, &win);
}
void task_refresh_tasklist ()
{
Window *win;
int num_results, i, j, k;
GSList *l0;
Task *tsk;
int num_results, i;
win = server_get_property (server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
if (!win) return;
// Remove any old and set active win
active_task();
for (i=0 ; i < nb_panel ; i++) {
for (j=0 ; j < panel1[i].nb_desktop ; j++) {
l0 = panel1[i].taskbar[j].area.list;
while (l0) {
tsk = l0->data;
l0 = l0->next;
for (k = 0; k < num_results; k++) {
if (tsk->win == win[k]) break;
}
// careful : remove_task change l0->next
if (k == num_results) remove_task (tsk);
}
}
// remark from Andreas: This seems unneccessary...
// active_task();
GList* win_list = g_hash_table_get_keys(win_to_task_table);
GList* it;
for (it=win_list; it; it=it->next) {
for (i = 0; i < num_results; i++)
if (*((Window*)it->data) == win[i])
break;
if (i == num_results)
taskbar_remove_task(it->data, 0, 0);
}
g_list_free(win_list);
// Add any new
for (i = 0; i < num_results; i++)
......@@ -293,6 +264,7 @@ void resize_taskbar(void *obj)
tsk = l->data;
if (!tsk->area.on_screen) continue;
tsk->area.posx = x;
if (tsk->area.width != pixel_width) set_task_redraw(tsk);
tsk->area.width = pixel_width;
if (modulo_width) {
tsk->area.width++;
......@@ -330,6 +302,7 @@ void resize_taskbar(void *obj)
tsk = l->data;
if (!tsk->area.on_screen) continue;
tsk->area.posy = y;
if (tsk->area.height != pixel_height) set_task_redraw(tsk);
tsk->area.height = pixel_height;
if (modulo_height) {
tsk->area.height++;
......@@ -340,6 +313,3 @@ void resize_taskbar(void *obj)
}
}
}
......@@ -10,6 +10,7 @@
#include "task.h"
extern GHashTable* win_to_task_table;
// tint2 use one taskbar per desktop.
typedef struct {
// always start with area
......@@ -36,7 +37,7 @@ void init_taskbar();
void cleanup_taskbar();
Task *task_get_task (Window win);
GSList* task_get_tasks(Window win);
GPtrArray* task_get_tasks(Window win);
void task_refresh_tasklist ();
void resize_taskbar(void *obj);
......
......@@ -381,7 +381,7 @@ void event_button_release (XEvent *e)
void event_property_notify (XEvent *e)
{
int i, j;
int i;
Task *tsk;
Window win = e->xproperty.window;
Atom at = e->xproperty.atom;
......@@ -492,21 +492,7 @@ void event_property_notify (XEvent *e)
// Window title changed
if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
Task *tsk2;
GSList *l0;
get_title(tsk);
// changed other tsk->title
for (i=0 ; i < nb_panel ; i++) {
for (j=0 ; j < panel1[i].nb_desktop ; j++) {
for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
tsk2 = l0->data;
if (tsk->win == tsk2->win && tsk != tsk2) {
tsk2->title = tsk->title;
set_task_redraw(tsk2);
}
}
}
}
panel_refresh = 1;
}
// Demand attention
......@@ -521,38 +507,15 @@ void event_property_notify (XEvent *e)
}
else if (at == server.atom.WM_STATE) {
// Iconic state
int state = tsk->current_state;
int state = (task_active && tsk->win == task_active->win ? TASK_ACTIVE : TASK_NORMAL);
if (window_is_iconified(win))
state = TASK_ICONIFIED;
GSList* task_list = task_get_tasks(win);
GSList* it = task_list;
while (it) {
Task* t = it->data;
set_task_state(t, state);
it = it->next;
}
g_slist_free(task_list);
set_task_state(tsk, state);
panel_refresh = 1;
}
// Window icon changed
else if (at == server.atom._NET_WM_ICON) {
get_icon(tsk);
Task *tsk2;
GSList* task_list = task_get_tasks(tsk->win);
GSList *l0 = task_list;
while (l0) {
tsk2 = l0->data;
if (tsk2 != tsk) {
tsk2->icon_width = tsk->icon_width;
tsk2->icon_height = tsk->icon_height;
int k=0;
for ( ; k<TASK_STATE_COUNT; ++k)
tsk2->icon[k] = tsk->icon[k];
set_task_redraw(tsk2);
}
l0 = l0->next;
}
g_slist_free(task_list);
panel_refresh = 1;
}
// Window desktop changed
......@@ -626,15 +589,8 @@ void event_configure_notify (Window win)
remove_task (tsk);
add_task (win);
if (win == window_get_active ()) {
GSList* task_list = task_get_tasks(win);
GSList* it = task_list;
while (it) {
Task *tsk = it->data;
set_task_state(tsk, TASK_ACTIVE);
task_active = tsk;
it = task_list->next;
}
g_slist_free(task_list);
set_task_state(tsk, TASK_ACTIVE);
task_active = tsk;
}
panel_refresh = 1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment