We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch for 64 bit X11 window icons

x11windowicon.patch (text/plain), 1.47 KB, created by Karl F. Glatzer on 2010-07-15 02:34:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karl F. Glatzer

Created: 2010-07-15 02:34:54 UTC

Size: 1.47 KB

patch

obsolete

>--- a/src/video/x11/SDL_x11window.c	2010-07-14 14:09:45.815112071 +0200
>+++ b/src/video/x11/SDL_x11window.c	2010-07-15 11:26:06.021927848 +0200
>@@ -864,8 +864,8 @@
>     if (icon) {
>         SDL_PixelFormat format;
>         SDL_Surface *surface;
>-        int propsize;
>-        Uint32 *propdata;
>+        int i, propsize;
>+        long *propdata;
> 
>         /* Convert the icon to ARGB for modern window managers */
>         SDL_InitFormat(&format, 32, 0x00FF0000, 0x0000FF00, 0x000000FF,
>@@ -877,12 +877,17 @@
> 
>         /* Set the _NET_WM_ICON property */
>         propsize = 2 + (icon->w * icon->h);
>-        propdata = SDL_malloc(propsize * sizeof(Uint32));
>+        propdata = SDL_malloc(propsize * sizeof(long));
>         if (propdata) {
>             propdata[0] = icon->w;
>             propdata[1] = icon->h;
>-            SDL_memcpy(&propdata[2], surface->pixels,
>-                       surface->h * surface->pitch);
>+            //FIXME: Sry i don't know much about memcpy. Maybe it can do the same as the for-loop somehow :) 
>+            /*SDL_memcpy(&propdata[2], surface->pixels,
>+                       surface->h * surface->pitch);*/
>+            for( i = 2; i < ( propdata[0] * propdata[1] ) ; i++ )
>+            {
>+                propdata[i] = ((Uint32 *) surface->pixels)[i-2];
>+            }
>             XChangeProperty(display, data->xwindow, _NET_WM_ICON, XA_CARDINAL,
>                             32, PropModeReplace, (unsigned char *) propdata,
>                             propsize);

Actions: View | Diff

Attachments on bug 1022: 516 | 522 | 526

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.