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

fixed Issue 282 : third try

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@528 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77 2010-08-08 20:03:09 +00:00
parent 9feef39d6f
commit 937d7faa1f
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/server.c
View file

@ -171,7 +171,6 @@ void *server_get_property (Window win, Atom at, Atom type, int *num_results)
result = XGetWindowProperty(server.dsp, win, at, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &nitems_ret, &bafter_ret, &prop_value); result = XGetWindowProperty(server.dsp, win, at, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &nitems_ret, &bafter_ret, &prop_value);
// Send back resultcount // Send back resultcount
// it look some version of gcc doesn't do the cast. so we force it.
if (num_results) *num_results = (int)nitems_ret; if (num_results) *num_results = (int)nitems_ret;
if (result == Success && prop_value) return prop_value; if (result == Success && prop_value) return prop_value;

4
src/taskbar/task.c
View file

@ -209,7 +209,7 @@ void get_icon (Task *tsk)
int i; int i;
Imlib_Image img = NULL; Imlib_Image img = NULL;
XWMHints *hints = 0; XWMHints *hints = 0;
long *data = 0; int32_t *data = 0;
int k; int k;
for (k=0; k<TASK_STATE_COUNT; ++k) { for (k=0; k<TASK_STATE_COUNT; ++k) {
@ -224,7 +224,7 @@ void get_icon (Task *tsk)
if (data) { if (data) {
// get ARGB icon // get ARGB icon
int w, h; int w, h;
long *tmp_data; int32_t *tmp_data;
tmp_data = get_best_icon (data, get_icon_count (data, i), i, &w, &h, panel->g_task.icon_size1); tmp_data = get_best_icon (data, get_icon_count (data, i), i, &w, &h, panel->g_task.icon_size1);

6
src/util/window.c
View file

@ -218,7 +218,7 @@ int window_is_active (Window win)
} }
int get_icon_count (long *data, int num) int get_icon_count (int32_t *data, int num)
{ {
int count, pos, w, h; int count, pos, w, h;
@ -236,10 +236,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) int32_t *get_best_icon (int32_t *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; int width[icon_count], height[icon_count], pos, i, w, h;
long *icon_data[icon_count]; int32_t *icon_data[icon_count];
/* List up icons */ /* List up icons */
pos = 0; pos = 0;

4
src/util/window.h
View file

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