forked from pool/WindowMaker
56 lines
1.3 KiB
Diff
56 lines
1.3 KiB
Diff
|
--- WINGs/wwindow.c
|
||
|
|
+++ WINGs/wwindow.c
|
||
|
|
@@ -254,14 +254,14 @@
|
||
|
|
setMiniwindow(WMWindow *win, RImage *image)
|
||
|
|
{
|
||
|
|
WMScreen *scr= win->view->screen;
|
||
|
|
- CARD32 *data;
|
||
|
|
+ long *data;
|
||
|
|
int x, y;
|
||
|
|
int o;
|
||
|
|
|
||
|
|
if (!image)
|
||
|
|
return;
|
||
|
|
|
||
|
|
- data = wmalloc((image->width * image->height + 2) * sizeof(CARD32));
|
||
|
|
+ data = wmalloc((image->width * image->height + 2) * sizeof(long));
|
||
|
|
|
||
|
|
o= 0;
|
||
|
|
data[o++] = image->width;
|
||
|
|
--- src/wmspec.c
|
||
|
|
+++ src/wmspec.c
|
||
|
|
@@ -389,12 +389,12 @@
|
||
|
|
*
|
||
|
|
* The logic can also be changed to accept bigger images and scale them down.
|
||
|
|
*/
|
||
|
|
-static CARD32*
|
||
|
|
-findBestIcon(CARD32 *data, unsigned long items)
|
||
|
|
+static unsigned long*
|
||
|
|
+findBestIcon(unsigned long *data, unsigned long items)
|
||
|
|
{
|
||
|
|
int size, wanted, d, distance;
|
||
|
|
unsigned long i;
|
||
|
|
- CARD32 *icon;
|
||
|
|
+ unsigned long *icon;
|
||
|
|
|
||
|
|
/* better use only 75% of icon_size. For 64x64 this means 48x48
|
||
|
|
* This leaves room around the icon for the miniwindow title and
|
||
|
|
@@ -418,7 +418,7 @@
|
||
|
|
|
||
|
|
|
||
|
|
static RImage*
|
||
|
|
-makeRImageFromARGBData(CARD32 *data)
|
||
|
|
+makeRImageFromARGBData(unsigned long *data)
|
||
|
|
{
|
||
|
|
int size, width, height, i;
|
||
|
|
RImage *image;
|
||
|
|
@@ -449,7 +449,7 @@
|
||
|
|
static void
|
||
|
|
updateIconImage(WScreen *scr, WWindow *wwin)
|
||
|
|
{
|
||
|
|
- CARD32 *property, *data;
|
||
|
|
+ unsigned long *property, *data;
|
||
|
|
unsigned long items, rest;
|
||
|
|
Atom type;
|
||
|
|
int format;
|