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

*fix* minor bugfixes

Browse Source 
*fix* do not use g_ptr_array_unref since not everybody has glib-2.22 ;)



git-svn-id: http://tint2.googlecode.com/svn/trunk@333 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2010-01-10 15:00:40 +00:00
parent c6ff59f9f7
commit a20eb44a28
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/systray/systraybar.c
View File

@@ -102,7 +102,6 @@ void draw_systray(void *obj, cairo_t *c)
XCopyArea(server.dsp, systray.area.pix, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0); XCopyArea(server.dsp, systray.area.pix, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0);
} }
// tint2 don't draw systray icons. just the background.
refresh_systray = 1; refresh_systray = 1;
} }

4
src/taskbar/task.c
View File

@@ -443,7 +443,7 @@ void active_task()
if (w1) { if (w1) {
Window w2; Window w2;
if (XGetTransientForHint(server.dsp, w1, &w2) != 0) if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
if (w2) w1 = w2; if (w2 && !task_get_tasks(w1)) w1 = w2;
set_task_state((task_active = task_get_task(w1)), TASK_ACTIVE); set_task_state((task_active = task_get_task(w1)), TASK_ACTIVE);
} }
} }
@@ -456,6 +456,7 @@ void set_task_state(Task *tsk, int state)
if (tsk->current_state != state) { if (tsk->current_state != state) {
GPtrArray* task_group = task_get_tasks(tsk->win); GPtrArray* task_group = task_get_tasks(tsk->win);
if (task_group) {
int i; int i;
for (i=0; i<task_group->len; ++i) { for (i=0; i<task_group->len; ++i) {
Task* tsk1 = g_ptr_array_index(task_group, i); Task* tsk1 = g_ptr_array_index(task_group, i);
@@ -469,6 +470,7 @@ void set_task_state(Task *tsk, int state)
} }
panel_refresh = 1; panel_refresh = 1;
} }
}
} }

4
src/taskbar/taskbar.c
View File

@@ -37,7 +37,7 @@ GHashTable* win_to_task_table = 0;
guint win_hash(gconstpointer key) { return (guint)*((Window*)key); } guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); } gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
void free_ptr_array(gpointer* data) { g_ptr_array_free(data, 1); }
void init_taskbar() void init_taskbar()
{ {
@@ -45,7 +45,7 @@ void init_taskbar()
int i, j; int i, j;
if (win_to_task_table == 0) if (win_to_task_table == 0)
win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, g_ptr_array_unref); win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
for (i=0 ; i < nb_panel ; i++) { for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i]; panel = &panel1[i];

3
src/tint.c
View File

@@ -310,6 +310,7 @@ void event_button_release (XEvent *e)
if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) { if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
forward_click(e); forward_click(e);
XLowerWindow (server.dsp, panel->main_win);
task_drag = 0; task_drag = 0;
return; return;
} }
@@ -587,7 +588,7 @@ void event_configure_notify (Window win)
Panel *p = tsk->area.panel; Panel *p = tsk->area.panel;
if (p->monitor != window_get_monitor (win)) { if (p->monitor != window_get_monitor (win)) {
remove_task (tsk); remove_task (tsk);
add_task (win); tsk = add_task (win);
if (win == window_get_active ()) { if (win == window_get_active ()) {
set_task_state(tsk, TASK_ACTIVE); set_task_state(tsk, TASK_ACTIVE);
task_active = tsk; task_active = tsk;

2
src/util/window.c
View File

@@ -88,7 +88,7 @@ int window_is_hidden (Window win)
} }
if (at[i] == server.atom._NET_WM_STATE_MODAL) { if (at[i] == server.atom._NET_WM_STATE_MODAL) {
// do not add modal windows if the transient window is already in the taskbar // do not add modal windows if the transient window is already in the taskbar
if ( XGetTransientForHint(server.dsp, win, &window) && task_get_task(window) ) { if ( XGetTransientForHint(server.dsp, win, &window) && task_get_tasks(window) ) {
XFree(at); XFree(at);
return 1; return 1;
} }