*fix* issue 282

*fix* correct x/y coordinates for tooltip on multi-head setup
*fix* delete multitimer hashmap
*fix* cleanup_panel() needs to be called after cleanup_launcher()


git-svn-id: http://tint2.googlecode.com/svn/trunk@544 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2010-09-12 22:00:00 +00:00
parent 9e81bcbf6a
commit 906ee82dbf
8 changed files with 21 additions and 18 deletions

View File

@@ -77,6 +77,10 @@ void cleanup_timeout()
free(t);
timeout_list = g_slist_remove(timeout_list, t);
}
if (multi_timeouts) {
g_hash_table_destroy(multi_timeouts);
multi_timeouts = 0;
}
}
/** Implementation notes for timeouts: The timeouts are kept in a GSList sorted by their

View File

@@ -221,17 +221,17 @@ int window_is_active (Window win)
}
int get_icon_count (long *data, int num)
int get_icon_count (gulong *data, int num)
{
int count, pos, w, h;
count = 0;
pos = 0;
while (pos < num) {
while (pos+2 < num) {
w = data[pos++];
h = data[pos++];
pos += w * h;
if (pos > num || w * h == 0) break;
if (pos > num || w <= 0 || h <= 0) break;
count++;
}
@@ -239,10 +239,10 @@ int get_icon_count (long *data, int num)
}
long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size)
gulong *get_best_icon (gulong *data, int icon_count, int num, int *iw, int *ih, int best_icon_size)
{
int width[icon_count], height[icon_count], pos, i, w, h;
long *icon_data[icon_count];
gulong *icon_data[icon_count];
/* List up icons */
pos = 0;

View File

@@ -22,8 +22,8 @@ int window_is_urgent (Window win);
int window_is_hidden (Window win);
int window_is_active (Window win);
int window_is_skip_taskbar (Window win);
int get_icon_count (long *data, int num);
long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size);
int get_icon_count (gulong *data, int num);
gulong *get_best_icon (gulong *data, int icon_count, int num, int *iw, int *ih, int best_icon_size);
void window_maximize_restore (Window win);
void window_toggle_shade (Window win);
int window_get_desktop (Window win);