Merge remote-tracking branch 'jturney/master'
This commit is contained in:
commit
7d87545ba7
|
@ -87,7 +87,7 @@ static const struct extension_info known_glx_extensions[] = {
|
|||
{ GLX(SGIX_fbconfig), VER(1,3), Y, },
|
||||
{ GLX(SGIX_pbuffer), VER(1,3), Y, },
|
||||
{ GLX(SGIX_visual_select_group), VER(0,0), Y, },
|
||||
{ GLX(INTEL_swap_event), VER(1,4), N, },
|
||||
{ GLX(INTEL_swap_event), VER(0,0), N, },
|
||||
{ NULL }
|
||||
/* *INDENT-ON* */
|
||||
};
|
||||
|
|
|
@ -174,7 +174,7 @@ static char GLXServerExtensions[] =
|
|||
"GLX_SGIS_multisample "
|
||||
#endif
|
||||
"GLX_SGIX_fbconfig "
|
||||
"GLX_SGIX_pbuffer " "GLX_MESA_copy_sub_buffer " "GLX_INTEL_swap_event";
|
||||
"GLX_SGIX_pbuffer " "GLX_MESA_copy_sub_buffer ";
|
||||
|
||||
static Bool
|
||||
glxCloseScreen(ScreenPtr pScreen)
|
||||
|
|
|
@ -1625,6 +1625,18 @@ glxWinCreateContext(__GLXscreen * screen,
|
|||
* Utility functions
|
||||
*/
|
||||
|
||||
static int
|
||||
GetShift(int Mask)
|
||||
{
|
||||
int Shift = 0;
|
||||
|
||||
while ((Mask &1) == 0) {
|
||||
Shift++;
|
||||
Mask >>=1;
|
||||
}
|
||||
return Shift;
|
||||
}
|
||||
|
||||
static int
|
||||
fbConfigToPixelFormat(__GLXconfig * mode, PIXELFORMATDESCRIPTOR * pfdret,
|
||||
int drawableTypeOverride)
|
||||
|
@ -1661,16 +1673,26 @@ fbConfigToPixelFormat(__GLXconfig * mode, PIXELFORMATDESCRIPTOR * pfdret,
|
|||
pfd.dwFlags |= PFD_DOUBLEBUFFER;
|
||||
}
|
||||
|
||||
pfd.iPixelType = PFD_TYPE_RGBA;
|
||||
pfd.cColorBits = mode->redBits + mode->greenBits + mode->blueBits;
|
||||
pfd.cRedBits = mode->redBits;
|
||||
pfd.cRedShift = 0; /* FIXME */
|
||||
pfd.cRedShift = GetShift(mode->redMask);
|
||||
pfd.cGreenBits = mode->greenBits;
|
||||
pfd.cGreenShift = 0; /* FIXME */
|
||||
pfd.cGreenShift = GetShift(mode->greenMask);
|
||||
pfd.cBlueBits = mode->blueBits;
|
||||
pfd.cBlueShift = 0; /* FIXME */
|
||||
pfd.cBlueShift = GetShift(mode->blueMask);
|
||||
pfd.cAlphaBits = mode->alphaBits;
|
||||
pfd.cAlphaShift = 0; /* FIXME */
|
||||
pfd.cAlphaShift = GetShift(mode->alphaMask);
|
||||
|
||||
if (mode->visualType == GLX_TRUE_COLOR) {
|
||||
pfd.iPixelType = PFD_TYPE_RGBA;
|
||||
pfd.dwVisibleMask =
|
||||
(pfd.cRedBits << pfd.cRedShift) | (pfd.cGreenBits << pfd.cGreenShift) |
|
||||
(pfd.cBlueBits << pfd.cBlueShift) | (pfd.cAlphaBits << pfd.cAlphaShift);
|
||||
}
|
||||
else {
|
||||
pfd.iPixelType = PFD_TYPE_COLORINDEX;
|
||||
pfd.dwVisibleMask = mode->transparentIndex;
|
||||
}
|
||||
|
||||
pfd.cAccumBits =
|
||||
mode->accumRedBits + mode->accumGreenBits + mode->accumBlueBits +
|
||||
|
@ -1910,24 +1932,26 @@ glxWinCreateConfigs(HDC hdc, glxWinScreen * screen)
|
|||
/* EXT_visual_info / GLX 1.2 */
|
||||
if (pfd.iPixelType == PFD_TYPE_COLORINDEX) {
|
||||
c->base.visualType = GLX_STATIC_COLOR;
|
||||
|
||||
if (!getenv("GLWIN_ENABLE_COLORINDEX_FBCONFIGS")) {
|
||||
GLWIN_DEBUG_MSG
|
||||
("pixelFormat %d is PFD_TYPE_COLORINDEX, skipping", i + 1);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else {
|
||||
c->base.visualType = GLX_TRUE_COLOR;
|
||||
}
|
||||
|
||||
// pfd.dwVisibleMask; ???
|
||||
c->base.transparentPixel = GLX_NONE;
|
||||
c->base.transparentRed = GLX_NONE;
|
||||
c->base.transparentGreen = GLX_NONE;
|
||||
c->base.transparentBlue = GLX_NONE;
|
||||
c->base.transparentAlpha = GLX_NONE;
|
||||
c->base.transparentIndex = pfd.dwVisibleMask;
|
||||
c->base.transparentPixel = GLX_TRANSPARENT_INDEX;
|
||||
}
|
||||
else {
|
||||
c->base.visualType = GLX_TRUE_COLOR;
|
||||
c->base.transparentRed =
|
||||
(pfd.dwVisibleMask & c->base.redMask) >> pfd.cRedShift;
|
||||
c->base.transparentGreen =
|
||||
(pfd.dwVisibleMask & c->base.greenMask) >> pfd.cGreenShift;
|
||||
c->base.transparentBlue =
|
||||
(pfd.dwVisibleMask & c->base.blueMask) >> pfd.cBlueShift;
|
||||
c->base.transparentAlpha =
|
||||
(pfd.dwVisibleMask & c->base.alphaMask) >> pfd.cAlphaShift;
|
||||
c->base.transparentIndex = GLX_NONE;
|
||||
c->base.transparentPixel = GLX_TRANSPARENT_RGB;
|
||||
}
|
||||
|
||||
/* ARB_multisample / SGIS_multisample */
|
||||
c->base.sampleBuffers = 0;
|
||||
|
@ -2180,14 +2204,6 @@ glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen)
|
|||
c->base.indexBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);
|
||||
c->base.rgbBits = 0;
|
||||
c->base.visualType = GLX_STATIC_COLOR;
|
||||
|
||||
if (!getenv("GLWIN_ENABLE_COLORINDEX_FBCONFIGS")) {
|
||||
GLWIN_DEBUG_MSG
|
||||
("pixelFormat %d is WGL_TYPE_COLORINDEX_ARB, skipping",
|
||||
i + 1);
|
||||
continue;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case WGL_TYPE_RGBA_FLOAT_ARB:
|
||||
|
|
|
@ -1174,15 +1174,6 @@ Bool
|
|||
void
|
||||
winSetShapeRootless(WindowPtr pWindow, int kind);
|
||||
|
||||
/*
|
||||
* winmultiwindowicons.c - Used by both multi-window and Win32Rootless
|
||||
*/
|
||||
|
||||
HICON winXIconToHICON(WindowPtr pWin, int iconSize);
|
||||
|
||||
void
|
||||
winSelectIcons(WindowPtr pWin, HICON * pIcon, HICON * pSmallIcon);
|
||||
|
||||
#ifdef XWIN_MULTIWINDOW
|
||||
/*
|
||||
* winmultiwindowshape.c
|
||||
|
|
|
@ -74,10 +74,10 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
|
|||
int iConnNumber;
|
||||
struct timeval tv;
|
||||
int iReturn;
|
||||
DWORD dwStopTime = (GetTickCount() / 1000) + iTimeoutSec;
|
||||
DWORD dwStopTime = GetTickCount() + iTimeoutSec * 1000;
|
||||
|
||||
/* We need to ensure that all pending events are processed */
|
||||
XSync(pDisplay, FALSE);
|
||||
winDebug("winProcessXEventsTimeout () - pumping X events for %d seconds\n",
|
||||
iTimeoutSec);
|
||||
|
||||
/* Get our connection number */
|
||||
iConnNumber = ConnectionNumber(pDisplay);
|
||||
|
@ -85,17 +85,24 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
|
|||
/* Loop for X events */
|
||||
while (1) {
|
||||
fd_set fdsRead;
|
||||
long remainingTime;
|
||||
|
||||
/* We need to ensure that all pending events are processed */
|
||||
XSync(pDisplay, FALSE);
|
||||
|
||||
/* Setup the file descriptor set */
|
||||
FD_ZERO(&fdsRead);
|
||||
FD_SET(iConnNumber, &fdsRead);
|
||||
|
||||
/* Adjust timeout */
|
||||
tv.tv_sec = dwStopTime - (GetTickCount() / 1000);
|
||||
tv.tv_usec = 0;
|
||||
remainingTime = dwStopTime - GetTickCount();
|
||||
tv.tv_sec = remainingTime / 1000;
|
||||
tv.tv_usec = (remainingTime % 1000) * 1000;
|
||||
winDebug("winProcessXEventsTimeout () - %d milliseconds left\n",
|
||||
remainingTime);
|
||||
|
||||
/* Break out if no time left */
|
||||
if (tv.tv_sec < 0)
|
||||
if (remainingTime <= 0)
|
||||
return WIN_XEVENTS_SUCCESS;
|
||||
|
||||
/* Wait for an X event */
|
||||
|
@ -103,7 +110,7 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
|
|||
&fdsRead, /* Read mask */
|
||||
NULL, /* No write mask */
|
||||
NULL, /* No exception mask */
|
||||
&tv); /* No timeout */
|
||||
&tv); /* Timeout */
|
||||
if (iReturn < 0) {
|
||||
ErrorF("winProcessXEventsTimeout - Call to select () failed: %d. "
|
||||
"Bailing.\n", iReturn);
|
||||
|
@ -116,11 +123,19 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
|
|||
/* Exit when we see that server is shutting down */
|
||||
iReturn = winClipboardFlushXEvents(hwnd,
|
||||
iWindow, pDisplay, fUseUnicode);
|
||||
|
||||
winDebug
|
||||
("winProcessXEventsTimeout () - winClipboardFlushXEvents returned %d\n",
|
||||
iReturn);
|
||||
|
||||
if (WIN_XEVENTS_NOTIFY == iReturn) {
|
||||
/* Bail out if notify processed */
|
||||
return iReturn;
|
||||
}
|
||||
}
|
||||
else {
|
||||
winDebug("winProcessXEventsTimeout - Spurious wake\n");
|
||||
}
|
||||
}
|
||||
|
||||
return WIN_XEVENTS_SUCCESS;
|
||||
|
|
|
@ -31,75 +31,65 @@
|
|||
#ifdef HAVE_XWIN_CONFIG_H
|
||||
#include <xwin-config.h>
|
||||
#endif
|
||||
#include "win.h"
|
||||
#include "dixevents.h"
|
||||
#include "winmultiwindowclass.h"
|
||||
|
||||
#ifndef WINVER
|
||||
#define WINVER 0x0500
|
||||
#endif
|
||||
|
||||
#include <X11/Xwindows.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
#include "winresource.h"
|
||||
#include "winprefs.h"
|
||||
|
||||
#include "propertyst.h"
|
||||
#include "windowstr.h"
|
||||
#include "winmsg.h"
|
||||
#include "winmultiwindowicons.h"
|
||||
#include "winglobals.h"
|
||||
/*
|
||||
* global variables
|
||||
*/
|
||||
extern HINSTANCE g_hInstance;
|
||||
|
||||
/*
|
||||
* Prototypes for local functions
|
||||
* Scale an X icon ZPixmap into a Windoze icon bitmap
|
||||
*/
|
||||
|
||||
static void
|
||||
|
||||
winScaleXBitmapToWindows(int iconSize, int effBPP,
|
||||
PixmapPtr pixmap, unsigned char *image);
|
||||
|
||||
/*
|
||||
* Scale an X icon bitmap into a Windoze icon bitmap
|
||||
*/
|
||||
|
||||
static void
|
||||
winScaleXBitmapToWindows(int iconSize,
|
||||
int effBPP, PixmapPtr pixmap, unsigned char *image)
|
||||
winScaleXImageToWindowsIcon(int iconSize,
|
||||
int effBPP,
|
||||
int stride, XImage * pixmap, unsigned char *image)
|
||||
{
|
||||
int row, column, effXBPP, effXDepth;
|
||||
unsigned char *outPtr;
|
||||
char *iconData = 0;
|
||||
int stride, xStride;
|
||||
unsigned char *iconData = 0;
|
||||
int xStride;
|
||||
float factX, factY;
|
||||
int posX, posY;
|
||||
unsigned char *ptr;
|
||||
unsigned int zero;
|
||||
unsigned int color;
|
||||
|
||||
effXBPP = BitsPerPixel(pixmap->drawable.depth);
|
||||
effXDepth = pixmap->drawable.depth;
|
||||
|
||||
if (pixmap->drawable.bitsPerPixel == 15)
|
||||
effXBPP = pixmap->bits_per_pixel;
|
||||
if (pixmap->bits_per_pixel == 15)
|
||||
effXBPP = 16;
|
||||
|
||||
if (pixmap->drawable.depth == 15)
|
||||
effXDepth = pixmap->depth;
|
||||
if (pixmap->depth == 15)
|
||||
effXDepth = 16;
|
||||
|
||||
/* Need 16-bit aligned rows for DDBitmaps */
|
||||
stride = ((iconSize * effBPP + 15) & (~15)) / 8;
|
||||
xStride = PixmapBytePad(pixmap->drawable.width, pixmap->drawable.depth);
|
||||
xStride = pixmap->bytes_per_line;
|
||||
if (stride == 0 || xStride == 0) {
|
||||
ErrorF("winScaleXBitmapToWindows - stride or xStride is zero. "
|
||||
"Bailing.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Allocate memory for icon data */
|
||||
iconData = malloc(xStride * pixmap->drawable.height);
|
||||
if (!iconData) {
|
||||
ErrorF("winScaleXBitmapToWindows - malloc failed for iconData. "
|
||||
"Bailing.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Get icon data */
|
||||
miGetImage((DrawablePtr) &(pixmap->drawable), 0, 0,
|
||||
pixmap->drawable.width, pixmap->drawable.height,
|
||||
ZPixmap, 0xffffffff, iconData);
|
||||
iconData = (unsigned char *) pixmap->data;
|
||||
|
||||
/* Keep aspect ratio */
|
||||
factX = ((float) pixmap->drawable.width) / ((float) iconSize);
|
||||
factY = ((float) pixmap->drawable.height) / ((float) iconSize);
|
||||
factX = ((float) pixmap->width) / ((float) iconSize);
|
||||
factY = ((float) pixmap->height) / ((float) iconSize);
|
||||
if (factX > factY)
|
||||
factY = factX;
|
||||
else
|
||||
|
@ -119,8 +109,7 @@ winScaleXBitmapToWindows(int iconSize,
|
|||
ptr += posX / 8;
|
||||
|
||||
/* Out of X icon bounds, leave space blank */
|
||||
if (posX >= pixmap->drawable.width
|
||||
|| posY >= pixmap->drawable.height)
|
||||
if (posX >= pixmap->width || posY >= pixmap->height)
|
||||
ptr = (unsigned char *) &zero;
|
||||
|
||||
if ((*ptr) & (1 << (posX & 7)))
|
||||
|
@ -162,8 +151,7 @@ winScaleXBitmapToWindows(int iconSize,
|
|||
ptr += posX * (effXBPP / 8);
|
||||
|
||||
/* Out of X icon bounds, leave space blank */
|
||||
if (posX >= pixmap->drawable.width
|
||||
|| posY >= pixmap->drawable.height)
|
||||
if (posX >= pixmap->width || posY >= pixmap->height)
|
||||
ptr = (unsigned char *) &zero;
|
||||
color = (((*ptr) << 16)
|
||||
+ ((*(ptr + 1)) << 8)
|
||||
|
@ -203,8 +191,7 @@ winScaleXBitmapToWindows(int iconSize,
|
|||
ptr += posX * (effXBPP / 8);
|
||||
|
||||
/* Out of X icon bounds, leave space blank */
|
||||
if (posX >= pixmap->drawable.width
|
||||
|| posY >= pixmap->drawable.height)
|
||||
if (posX >= pixmap->width || posY >= pixmap->height)
|
||||
ptr = (unsigned char *) &zero;
|
||||
color = ((*ptr) << 8) + (*(ptr + 1));
|
||||
switch (effBPP) {
|
||||
|
@ -238,7 +225,6 @@ winScaleXBitmapToWindows(int iconSize,
|
|||
} /* end if effxbpp==16) */
|
||||
} /* end for column */
|
||||
} /* end for row */
|
||||
free(iconData);
|
||||
}
|
||||
|
||||
static HICON
|
||||
|
@ -250,7 +236,7 @@ NetWMToWinIconAlpha(uint32_t * icon)
|
|||
HICON result;
|
||||
HDC hdc = GetDC(NULL);
|
||||
uint32_t *DIB_pixels;
|
||||
ICONINFO ii = { TRUE };
|
||||
ICONINFO ii;
|
||||
BITMAPV4HEADER bmh = { sizeof(bmh) };
|
||||
|
||||
/* Define an ARGB pixel format used for Color+Alpha icons */
|
||||
|
@ -264,6 +250,9 @@ NetWMToWinIconAlpha(uint32_t * icon)
|
|||
bmh.bV4GreenMask = 0x0000FF00;
|
||||
bmh.bV4BlueMask = 0x000000FF;
|
||||
|
||||
ii.fIcon = TRUE;
|
||||
ii.xHotspot = 0; /* ignored */
|
||||
ii.yHotspot = 0; /* ignored */
|
||||
ii.hbmColor = CreateDIBSection(hdc, (BITMAPINFO *) & bmh,
|
||||
DIB_RGB_COLORS, (void **) &DIB_pixels, NULL,
|
||||
0);
|
||||
|
@ -291,12 +280,15 @@ NetWMToWinIconThreshold(uint32_t * icon)
|
|||
uint32_t *pixels = &icon[2];
|
||||
int row, col;
|
||||
HICON result;
|
||||
ICONINFO ii = { TRUE };
|
||||
ICONINFO ii;
|
||||
|
||||
HDC hdc = GetDC(NULL);
|
||||
HDC xorDC = CreateCompatibleDC(hdc);
|
||||
HDC andDC = CreateCompatibleDC(hdc);
|
||||
|
||||
ii.fIcon = TRUE;
|
||||
ii.xHotspot = 0; /* ignored */
|
||||
ii.yHotspot = 0; /* ignored */
|
||||
ii.hbmColor = CreateCompatibleBitmap(hdc, width, height);
|
||||
ii.hbmMask = CreateCompatibleBitmap(hdc, width, height);
|
||||
ReleaseDC(NULL, hdc);
|
||||
|
@ -365,93 +357,106 @@ NetWMToWinIcon(int bpp, uint32_t * icon)
|
|||
return NetWMToWinIconThreshold(icon);
|
||||
}
|
||||
|
||||
static pointer
|
||||
GetWindowProp(WindowPtr pWin, Atom name, long int *size_return)
|
||||
{
|
||||
struct _Window *pwin;
|
||||
struct _Property *prop;
|
||||
|
||||
if (!pWin || !name) {
|
||||
ErrorF("GetWindowProp - pWin or name was NULL\n");
|
||||
return 0;
|
||||
}
|
||||
pwin = (struct _Window *) pWin;
|
||||
if (!pwin->optional)
|
||||
return NULL;
|
||||
for (prop = (struct _Property *) pwin->optional->userProps;
|
||||
prop; prop = prop->next) {
|
||||
if (prop->propertyName == name) {
|
||||
*size_return = prop->size;
|
||||
return prop->data;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Attempt to create a custom icon from the WM_HINTS bitmaps
|
||||
*/
|
||||
|
||||
static
|
||||
HICON
|
||||
winXIconToHICON(WindowPtr pWin, int iconSize)
|
||||
winXIconToHICON(Display * pDisplay, Window id, int iconSize)
|
||||
{
|
||||
unsigned char *mask, *image, *imageMask;
|
||||
unsigned char *mask, *image = NULL, *imageMask;
|
||||
unsigned char *dst, *src;
|
||||
PixmapPtr iconPtr;
|
||||
PixmapPtr maskPtr;
|
||||
int planes, bpp, effBPP, stride, maskStride, i;
|
||||
int planes, bpp, i;
|
||||
int biggest_size = 0;
|
||||
HDC hDC;
|
||||
ICONINFO ii;
|
||||
WinXWMHints hints;
|
||||
XWMHints *hints;
|
||||
HICON hIcon = NULL;
|
||||
uint32_t *biggest_icon = NULL;
|
||||
|
||||
/* Try to get _NET_WM_ICON icons first */
|
||||
static Atom _XA_NET_WM_ICON;
|
||||
static int generation;
|
||||
uint32_t *icon, *icon_data = NULL;
|
||||
long int size = 0;
|
||||
unsigned long int size;
|
||||
unsigned long int type;
|
||||
int format;
|
||||
unsigned long int left;
|
||||
|
||||
hDC = GetDC(GetDesktopWindow());
|
||||
planes = GetDeviceCaps(hDC, PLANES);
|
||||
bpp = GetDeviceCaps(hDC, BITSPIXEL);
|
||||
ReleaseDC(GetDesktopWindow(), hDC);
|
||||
|
||||
/* Always prefer _NET_WM_ICON icons */
|
||||
if (generation != serverGeneration) {
|
||||
generation = serverGeneration;
|
||||
_XA_NET_WM_ICON = MakeAtom("_NET_WM_ICON", 12, TRUE);
|
||||
_XA_NET_WM_ICON = XInternAtom(pDisplay, "_NET_WM_ICON", FALSE);
|
||||
}
|
||||
|
||||
if (_XA_NET_WM_ICON)
|
||||
icon_data = GetWindowProp(pWin, _XA_NET_WM_ICON, &size);
|
||||
if (icon_data) {
|
||||
for (icon = icon_data;
|
||||
icon < &icon_data[size] && *icon;
|
||||
if ((XGetWindowProperty(pDisplay, id, _XA_NET_WM_ICON,
|
||||
0, MAXINT, FALSE,
|
||||
AnyPropertyType, &type, &format, &size, &left,
|
||||
(unsigned char **) &icon_data) == Success) &&
|
||||
(icon_data != NULL)) {
|
||||
for (icon = icon_data; icon < &icon_data[size] && *icon;
|
||||
icon = &icon[icon[0] * icon[1] + 2]) {
|
||||
if (icon[0] == iconSize && icon[1] == iconSize)
|
||||
return NetWMToWinIcon(bpp, icon);
|
||||
/* Find the biggest icon and let Windows scale the size */
|
||||
/* Find an exact match to the size we require... */
|
||||
if (icon[0] == iconSize && icon[1] == iconSize) {
|
||||
winDebug("winXIconToHICON: found %lu x %lu NetIcon\n", icon[0],
|
||||
icon[1]);
|
||||
hIcon = NetWMToWinIcon(bpp, icon);
|
||||
break;
|
||||
}
|
||||
/* Otherwise, find the biggest icon and let Windows scale the size */
|
||||
else if (biggest_size < icon[0]) {
|
||||
biggest_icon = icon;
|
||||
biggest_size = icon[0];
|
||||
}
|
||||
}
|
||||
if (biggest_icon)
|
||||
return NetWMToWinIcon(bpp, biggest_icon);
|
||||
|
||||
if (!hIcon && biggest_icon) {
|
||||
winDebug
|
||||
("winXIconToHICON: selected %lu x %lu NetIcon for scaling to %u x %u\n",
|
||||
biggest_icon[0], biggest_icon[1], iconSize, iconSize);
|
||||
|
||||
hIcon = NetWMToWinIcon(bpp, biggest_icon);
|
||||
}
|
||||
winDebug("winXIconToHICON - pWin %x: no suitable NetIcon\n", (int) pWin,
|
||||
iconSize);
|
||||
|
||||
winMultiWindowGetWMHints(pWin, &hints);
|
||||
if (!hints.icon_pixmap)
|
||||
return NULL;
|
||||
XFree(icon_data);
|
||||
}
|
||||
|
||||
dixLookupResourceByType((pointer) &iconPtr, hints.icon_pixmap, RT_PIXMAP,
|
||||
NullClient, DixUnknownAccess);
|
||||
if (!hIcon) {
|
||||
winDebug("winXIconToHICON: no suitable NetIcon\n");
|
||||
|
||||
if (!iconPtr)
|
||||
return NULL;
|
||||
hints = XGetWMHints(pDisplay, id);
|
||||
if (hints) {
|
||||
winDebug("winXIconToHICON: id 0x%x icon_pixmap hint %x\n", id,
|
||||
hints->icon_pixmap);
|
||||
|
||||
if (hints->icon_pixmap) {
|
||||
Window root;
|
||||
int x, y;
|
||||
unsigned int width, height, border_width, depth;
|
||||
XImage *xImageIcon;
|
||||
XImage *xImageMask = NULL;
|
||||
|
||||
XGetGeometry(pDisplay, hints->icon_pixmap, &root, &x, &y,
|
||||
&width, &height, &border_width, &depth);
|
||||
|
||||
xImageIcon =
|
||||
XGetImage(pDisplay, hints->icon_pixmap, 0, 0, width, height,
|
||||
0xFFFFFFFF, ZPixmap);
|
||||
winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%x\n", id,
|
||||
xImageIcon);
|
||||
|
||||
if (hints->icon_mask)
|
||||
xImageMask =
|
||||
XGetImage(pDisplay, hints->icon_mask, 0, 0, width,
|
||||
height, 0xFFFFFFFF, ZPixmap);
|
||||
|
||||
if (xImageIcon) {
|
||||
int effBPP, stride, maskStride;
|
||||
|
||||
/* 15 BPP is really 16BPP as far as we care */
|
||||
if (bpp == 15)
|
||||
|
@ -467,17 +472,21 @@ winXIconToHICON(WindowPtr pWin, int iconSize)
|
|||
|
||||
image = malloc(stride * iconSize);
|
||||
imageMask = malloc(stride * iconSize);
|
||||
mask = malloc(maskStride * iconSize);
|
||||
|
||||
/* Default to a completely black mask */
|
||||
mask = calloc(maskStride, iconSize);
|
||||
memset(imageMask, 0, stride * iconSize);
|
||||
memset(mask, 0, maskStride * iconSize);
|
||||
|
||||
winScaleXBitmapToWindows(iconSize, effBPP, iconPtr, image);
|
||||
dixLookupResourceByType((pointer) &maskPtr, hints.icon_mask, RT_PIXMAP,
|
||||
NullClient, DixUnknownAccess);
|
||||
winScaleXImageToWindowsIcon(iconSize, effBPP, stride,
|
||||
xImageIcon, image);
|
||||
|
||||
if (maskPtr) {
|
||||
winScaleXBitmapToWindows(iconSize, 1, maskPtr, mask);
|
||||
|
||||
winScaleXBitmapToWindows(iconSize, effBPP, maskPtr, imageMask);
|
||||
if (xImageMask) {
|
||||
winScaleXImageToWindowsIcon(iconSize, 1, maskStride,
|
||||
xImageMask, mask);
|
||||
winScaleXImageToWindowsIcon(iconSize, effBPP, stride,
|
||||
xImageMask, imageMask);
|
||||
}
|
||||
|
||||
/* Now we need to set all bits of the icon which are not masked */
|
||||
/* on to 0 because Color is really an XOR, not an OR function */
|
||||
|
@ -489,17 +498,18 @@ winXIconToHICON(WindowPtr pWin, int iconSize)
|
|||
*(dst++) = 0;
|
||||
else
|
||||
dst++;
|
||||
}
|
||||
|
||||
ii.fIcon = TRUE;
|
||||
ii.xHotspot = 0; /* ignored */
|
||||
ii.yHotspot = 0; /* ignored */
|
||||
|
||||
/* Create Win32 mask from pixmap shape */
|
||||
ii.hbmMask = CreateBitmap(iconSize, iconSize, planes, 1, mask);
|
||||
ii.hbmMask =
|
||||
CreateBitmap(iconSize, iconSize, planes, 1, mask);
|
||||
|
||||
/* Create Win32 bitmap from pixmap */
|
||||
ii.hbmColor = CreateBitmap(iconSize, iconSize, planes, bpp, image);
|
||||
ii.hbmColor =
|
||||
CreateBitmap(iconSize, iconSize, planes, bpp, image);
|
||||
|
||||
/* Merge Win32 mask and bitmap into icon */
|
||||
hIcon = CreateIconIndirect(&ii);
|
||||
|
@ -513,6 +523,15 @@ winXIconToHICON(WindowPtr pWin, int iconSize)
|
|||
free(image);
|
||||
free(imageMask);
|
||||
|
||||
if (xImageMask)
|
||||
XDestroyImage(xImageMask);
|
||||
|
||||
XDestroyImage(xImageIcon);
|
||||
}
|
||||
}
|
||||
XFree(hints);
|
||||
}
|
||||
}
|
||||
return hIcon;
|
||||
}
|
||||
|
||||
|
@ -522,46 +541,37 @@ winXIconToHICON(WindowPtr pWin, int iconSize)
|
|||
|
||||
#ifdef XWIN_MULTIWINDOW
|
||||
void
|
||||
winUpdateIcon(Window id)
|
||||
winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew)
|
||||
{
|
||||
WindowPtr pWin;
|
||||
HICON hIcon, hIconSmall = NULL, hIconOld;
|
||||
|
||||
dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient,
|
||||
DixUnknownAccess);
|
||||
if (pWin) {
|
||||
winWindowPriv(pWin);
|
||||
if (pWinPriv->hWnd) {
|
||||
hIcon = winOverrideIcon((unsigned long) pWin);
|
||||
if (!hIcon) {
|
||||
hIcon = winXIconToHICON(pWin, GetSystemMetrics(SM_CXICON));
|
||||
if (!hIcon) {
|
||||
hIcon = g_hIconX;
|
||||
hIconSmall = g_hSmallIconX;
|
||||
}
|
||||
else {
|
||||
/* Leave undefined if not found */
|
||||
/* Start with the icon from preferences, if any */
|
||||
hIcon = hIconNew;
|
||||
hIconSmall = hIconNew;
|
||||
|
||||
/* If we still need an icon, try and get the icon from WM_HINTS */
|
||||
if (!hIcon)
|
||||
hIcon = winXIconToHICON(pDisplay, id, GetSystemMetrics(SM_CXICON));
|
||||
if (!hIconSmall)
|
||||
hIconSmall =
|
||||
winXIconToHICON(pWin, GetSystemMetrics(SM_CXSMICON));
|
||||
}
|
||||
winXIconToHICON(pDisplay, id, GetSystemMetrics(SM_CXSMICON));
|
||||
|
||||
/* If we got the small, but not the large one swap them */
|
||||
if (!hIcon && hIconSmall) {
|
||||
hIcon = hIconSmall;
|
||||
hIconSmall = NULL;
|
||||
}
|
||||
|
||||
/* Set the large icon */
|
||||
hIconOld = (HICON) SendMessage(pWinPriv->hWnd,
|
||||
WM_SETICON, ICON_BIG,
|
||||
(LPARAM) hIcon);
|
||||
|
||||
/* Delete the icon if its not the default */
|
||||
hIconOld = (HICON) SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM) hIcon);
|
||||
/* Delete the old icon if its not the default */
|
||||
winDestroyIcon(hIconOld);
|
||||
|
||||
/* Same for the small icon */
|
||||
hIconOld = (HICON) SendMessage(pWinPriv->hWnd,
|
||||
WM_SETICON, ICON_SMALL,
|
||||
(LPARAM) hIconSmall);
|
||||
hIconOld =
|
||||
(HICON) SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
|
||||
winDestroyIcon(hIconOld);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
winInitGlobalIcons(void)
|
||||
|
@ -591,37 +601,21 @@ winInitGlobalIcons(void)
|
|||
}
|
||||
|
||||
void
|
||||
winSelectIcons(WindowPtr pWin, HICON * pIcon, HICON * pSmallIcon)
|
||||
winSelectIcons(HICON * pIcon, HICON * pSmallIcon)
|
||||
{
|
||||
HICON hIcon, hSmallIcon;
|
||||
|
||||
winInitGlobalIcons();
|
||||
|
||||
/* Try and get the icon from WM_HINTS */
|
||||
hIcon = winXIconToHICON(pWin, GetSystemMetrics(SM_CXICON));
|
||||
hSmallIcon = winXIconToHICON(pWin, GetSystemMetrics(SM_CXSMICON));
|
||||
|
||||
/* If we got the small, but not the large one swap them */
|
||||
if (!hIcon && hSmallIcon) {
|
||||
hIcon = hSmallIcon;
|
||||
hSmallIcon = NULL;
|
||||
}
|
||||
|
||||
/* Use default X icon if no icon loaded from WM_HINTS */
|
||||
if (!hIcon) {
|
||||
/* Use default X icon */
|
||||
hIcon = g_hIconX;
|
||||
hSmallIcon = g_hSmallIconX;
|
||||
}
|
||||
|
||||
if (pIcon)
|
||||
*pIcon = hIcon;
|
||||
else
|
||||
winDestroyIcon(hIcon);
|
||||
|
||||
if (pSmallIcon)
|
||||
*pSmallIcon = hSmallIcon;
|
||||
else
|
||||
winDestroyIcon(hSmallIcon);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
42
hw/xwin/winmultiwindowicons.h
Normal file
42
hw/xwin/winmultiwindowicons.h
Normal file
|
@ -0,0 +1,42 @@
|
|||
/*
|
||||
* File: winmultiwindowicons.h
|
||||
* Purpose: interface for multiwindow mode icon functions
|
||||
*
|
||||
* Copyright (c) Jon TURNEY 2012
|
||||
*
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef WINMULTIWINDOWICONS_H
|
||||
#define WINMULTIWINDOWICONS_H
|
||||
|
||||
void
|
||||
winUpdateIcon(HWND hWnd, Display * pDisplay, Window id, HICON hIconNew);
|
||||
|
||||
void
|
||||
winInitGlobalIcons(void);
|
||||
|
||||
void
|
||||
winDestroyIcon(HICON hIcon);
|
||||
|
||||
void
|
||||
winSelectIcons(HICON * pIcon, HICON * pSmallIcon);
|
||||
|
||||
#endif /* WINMULTIWINDOWICONS_H */
|
|
@ -63,6 +63,11 @@ winInitMultiWindowClass(void)
|
|||
WNDCLASSEX wcx;
|
||||
|
||||
if (atomXWinClass == 0) {
|
||||
HICON hIcon, hIconSmall;
|
||||
|
||||
/* Load the default icons */
|
||||
winSelectIcons(&hIcon, &hIconSmall);
|
||||
|
||||
/* Setup our window class */
|
||||
wcx.cbSize = sizeof(WNDCLASSEX);
|
||||
wcx.style = CS_HREDRAW | CS_VREDRAW | (g_fNativeGl ? CS_OWNDC : 0);
|
||||
|
@ -70,12 +75,12 @@ winInitMultiWindowClass(void)
|
|||
wcx.cbClsExtra = 0;
|
||||
wcx.cbWndExtra = 0;
|
||||
wcx.hInstance = g_hInstance;
|
||||
wcx.hIcon = g_hIconX;
|
||||
wcx.hIcon = hIcon;
|
||||
wcx.hCursor = 0;
|
||||
wcx.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
|
||||
wcx.lpszMenuName = NULL;
|
||||
wcx.lpszClassName = WINDOW_CLASS_X;
|
||||
wcx.hIconSm = g_hSmallIconX;
|
||||
wcx.hIconSm = hIconSmall;
|
||||
|
||||
#if CYGMULTIWINDOW_DEBUG
|
||||
ErrorF("winCreateWindowsWindow - Creating class: %s\n", WINDOW_CLASS_X);
|
||||
|
@ -479,8 +484,6 @@ winCreateWindowsWindow(WindowPtr pWin)
|
|||
HWND hFore = NULL;
|
||||
|
||||
winWindowPriv(pWin);
|
||||
HICON hIcon;
|
||||
HICON hIconSmall;
|
||||
winPrivScreenPtr pScreenPriv = pWinPriv->pScreenPriv;
|
||||
WinXSizeHints hints;
|
||||
WindowPtr pDaddy;
|
||||
|
@ -574,13 +577,6 @@ winCreateWindowsWindow(WindowPtr pWin)
|
|||
}
|
||||
pWinPriv->hWnd = hWnd;
|
||||
|
||||
/* Set application or .XWinrc defined Icons */
|
||||
winSelectIcons(pWin, &hIcon, &hIconSmall);
|
||||
if (hIcon)
|
||||
SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM) hIcon);
|
||||
if (hIconSmall)
|
||||
SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
|
||||
|
||||
/* Change style back to popup, already placed... */
|
||||
SetWindowLongPtr(hWnd, GWL_STYLE,
|
||||
WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
|
||||
|
|
|
@ -151,7 +151,7 @@ static Bool
|
|||
InitQueue(WMMsgQueuePtr pQueue);
|
||||
|
||||
static void
|
||||
GetWindowName(Display * pDpy, Window iWin, wchar_t ** ppName);
|
||||
GetWindowName(Display * pDpy, Window iWin, char **ppWindowName);
|
||||
|
||||
static int
|
||||
SendXMessage(Display * pDisplay, Window iWin, Atom atmType, long nData);
|
||||
|
@ -399,38 +399,19 @@ InitQueue(WMMsgQueuePtr pQueue)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
/*
|
||||
* GetWindowName - Retrieve the title of an X Window
|
||||
*/
|
||||
|
||||
static void
|
||||
GetWindowName(Display * pDisplay, Window iWin, wchar_t ** ppName)
|
||||
static
|
||||
char *
|
||||
Xutf8TextPropertyToString(Display * pDisplay, XTextProperty * xtp)
|
||||
{
|
||||
int nResult, nNum;
|
||||
int nNum;
|
||||
char **ppList;
|
||||
char *pszReturnData;
|
||||
int iLen, i;
|
||||
XTextProperty xtpName;
|
||||
|
||||
#if CYGMULTIWINDOW_DEBUG
|
||||
ErrorF("GetWindowName\n");
|
||||
#endif
|
||||
if (Xutf8TextPropertyToTextList(pDisplay, xtp, &ppList, &nNum) >= Success &&
|
||||
nNum > 0 && *ppList) {
|
||||
int i;
|
||||
int iLen = 0;
|
||||
|
||||
/* Intialize ppName to NULL */
|
||||
*ppName = NULL;
|
||||
|
||||
/* Try to get --- */
|
||||
nResult = XGetWMName(pDisplay, iWin, &xtpName);
|
||||
if (!nResult || !xtpName.value || !xtpName.nitems) {
|
||||
#if CYGMULTIWINDOW_DEBUG
|
||||
ErrorF("GetWindowName - XGetWMName failed. No name.\n");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
if (Xutf8TextPropertyToTextList(pDisplay, &xtpName, &ppList, &nNum) >=
|
||||
Success && nNum > 0 && *ppList) {
|
||||
iLen = 0;
|
||||
for (i = 0; i < nNum; i++)
|
||||
iLen += strlen(ppList[i]);
|
||||
pszReturnData = (char *) malloc(iLen + 1);
|
||||
|
@ -444,15 +425,40 @@ GetWindowName(Display * pDisplay, Window iWin, wchar_t ** ppName)
|
|||
pszReturnData = (char *) malloc(1);
|
||||
pszReturnData[0] = '\0';
|
||||
}
|
||||
iLen = MultiByteToWideChar(CP_UTF8, 0, pszReturnData, -1, NULL, 0);
|
||||
*ppName = (wchar_t *) malloc(sizeof(wchar_t) * (iLen + 1));
|
||||
MultiByteToWideChar(CP_UTF8, 0, pszReturnData, -1, *ppName, iLen);
|
||||
XFree(xtpName.value);
|
||||
free(pszReturnData);
|
||||
|
||||
return pszReturnData;
|
||||
}
|
||||
|
||||
/*
|
||||
* GetWindowName - Retrieve the title of an X Window
|
||||
*/
|
||||
|
||||
static void
|
||||
GetWindowName(Display * pDisplay, Window iWin, char **ppWindowName)
|
||||
{
|
||||
int nResult;
|
||||
XTextProperty xtpWindowName;
|
||||
char *pszWindowName;
|
||||
|
||||
#if CYGMULTIWINDOW_DEBUG
|
||||
ErrorF("GetWindowName - Returning\n");
|
||||
ErrorF("GetWindowName\n");
|
||||
#endif
|
||||
|
||||
/* Intialize ppWindowName to NULL */
|
||||
*ppWindowName = NULL;
|
||||
|
||||
/* Try to get window name */
|
||||
nResult = XGetWMName(pDisplay, iWin, &xtpWindowName);
|
||||
if (!nResult || !xtpWindowName.value || !xtpWindowName.nitems) {
|
||||
#if CYGMULTIWINDOW_DEBUG
|
||||
ErrorF("GetWindowName - XGetWMName failed. No name.\n");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
pszWindowName = Xutf8TextPropertyToString(pDisplay, &xtpWindowName);
|
||||
XFree(xtpWindowName.value);
|
||||
*ppWindowName = pszWindowName;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -528,20 +534,72 @@ UpdateName(WMInfoPtr pWMInfo, Window iWindow)
|
|||
if (!hWnd)
|
||||
return;
|
||||
|
||||
/* Set the Windows window name */
|
||||
GetWindowName(pWMInfo->pDisplay, iWindow, &pszName);
|
||||
if (pszName) {
|
||||
/* Get the window attributes */
|
||||
/* If window isn't override-redirect */
|
||||
XGetWindowAttributes(pWMInfo->pDisplay, iWindow, &attr);
|
||||
if (!attr.override_redirect) {
|
||||
SetWindowTextW(hWnd, pszName);
|
||||
winUpdateIcon(iWindow);
|
||||
char *pszWindowName;
|
||||
|
||||
/* Get the X windows window name */
|
||||
GetWindowName(pWMInfo->pDisplay, iWindow, &pszWindowName);
|
||||
|
||||
if (pszWindowName) {
|
||||
/* Convert from UTF-8 to wide char */
|
||||
int iLen =
|
||||
MultiByteToWideChar(CP_UTF8, 0, pszWindowName, -1, NULL, 0);
|
||||
wchar_t *pwszWideWindowName =
|
||||
(wchar_t *) malloc(sizeof(wchar_t) * (iLen + 1));
|
||||
MultiByteToWideChar(CP_UTF8, 0, pszWindowName, -1,
|
||||
pwszWideWindowName, iLen);
|
||||
|
||||
/* Set the Windows window name */
|
||||
SetWindowTextW(hWnd, pwszWideWindowName);
|
||||
|
||||
free(pwszWideWindowName);
|
||||
free(pszWindowName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
free(pszName);
|
||||
/*
|
||||
* Updates the icon of a HWND according to its X icon properties
|
||||
*/
|
||||
|
||||
static void
|
||||
UpdateIcon(WMInfoPtr pWMInfo, Window iWindow)
|
||||
{
|
||||
HWND hWnd;
|
||||
HICON hIconNew = NULL;
|
||||
XWindowAttributes attr;
|
||||
|
||||
hWnd = getHwnd(pWMInfo, iWindow);
|
||||
if (!hWnd)
|
||||
return;
|
||||
|
||||
/* If window isn't override-redirect */
|
||||
XGetWindowAttributes(pWMInfo->pDisplay, iWindow, &attr);
|
||||
if (!attr.override_redirect) {
|
||||
XClassHint class_hint = { 0, 0 };
|
||||
char *window_name = 0;
|
||||
|
||||
if (XGetClassHint(pWMInfo->pDisplay, iWindow, &class_hint)) {
|
||||
XFetchName(pWMInfo->pDisplay, iWindow, &window_name);
|
||||
|
||||
hIconNew =
|
||||
(HICON) winOverrideIcon(class_hint.res_name,
|
||||
class_hint.res_class, window_name);
|
||||
|
||||
if (class_hint.res_name)
|
||||
XFree(class_hint.res_name);
|
||||
if (class_hint.res_class)
|
||||
XFree(class_hint.res_class);
|
||||
if (window_name)
|
||||
XFree(window_name);
|
||||
}
|
||||
}
|
||||
|
||||
winUpdateIcon(hWnd, pWMInfo->pDisplay, iWindow, hIconNew);
|
||||
}
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Fix up any differences between the X11 and Win32 window stacks
|
||||
|
@ -665,7 +723,7 @@ winMultiWindowWMProc(void *pArg)
|
|||
PropModeReplace,
|
||||
(unsigned char *) &(pNode->msg.hwndWindow), 1);
|
||||
UpdateName(pWMInfo, pNode->msg.iWindow);
|
||||
winUpdateIcon(pNode->msg.iWindow);
|
||||
UpdateIcon(pWMInfo, pNode->msg.iWindow);
|
||||
break;
|
||||
|
||||
case WM_WM_MAP2:
|
||||
|
@ -688,7 +746,7 @@ winMultiWindowWMProc(void *pArg)
|
|||
PropModeReplace,
|
||||
(unsigned char *) &(pNode->msg.hwndWindow), 1);
|
||||
UpdateName(pWMInfo, pNode->msg.iWindow);
|
||||
winUpdateIcon(pNode->msg.iWindow);
|
||||
UpdateIcon(pWMInfo, pNode->msg.iWindow);
|
||||
{
|
||||
HWND zstyle = HWND_NOTOPMOST;
|
||||
|
||||
|
@ -750,8 +808,8 @@ winMultiWindowWMProc(void *pArg)
|
|||
UpdateName(pWMInfo, pNode->msg.iWindow);
|
||||
break;
|
||||
|
||||
case WM_WM_HINTS_EVENT:
|
||||
winUpdateIcon(pNode->msg.iWindow);
|
||||
case WM_WM_ICON_EVENT:
|
||||
UpdateIcon(pWMInfo, pNode->msg.iWindow);
|
||||
break;
|
||||
|
||||
case WM_WM_CHANGE_STATE:
|
||||
|
@ -802,6 +860,7 @@ winMultiWindowXMsgProc(void *pArg)
|
|||
Atom atmWmName;
|
||||
Atom atmWmHints;
|
||||
Atom atmWmChange;
|
||||
Atom atmNetWmIcon;
|
||||
int iReturn;
|
||||
XIconSize *xis;
|
||||
|
||||
|
@ -927,6 +986,7 @@ winMultiWindowXMsgProc(void *pArg)
|
|||
atmWmName = XInternAtom(pProcArg->pDisplay, "WM_NAME", False);
|
||||
atmWmHints = XInternAtom(pProcArg->pDisplay, "WM_HINTS", False);
|
||||
atmWmChange = XInternAtom(pProcArg->pDisplay, "WM_CHANGE_STATE", False);
|
||||
atmNetWmIcon = XInternAtom(pProcArg->pDisplay, "_NET_WM_ICON", False);
|
||||
|
||||
/*
|
||||
iiimxcf had a bug until 2009-04-27, assuming that the
|
||||
|
@ -1054,8 +1114,8 @@ winMultiWindowXMsgProc(void *pArg)
|
|||
True, StructureNotifyMask, &event_send);
|
||||
}
|
||||
}
|
||||
else if (event.type == PropertyNotify
|
||||
&& event.xproperty.atom == atmWmName) {
|
||||
else if (event.type == PropertyNotify) {
|
||||
if (event.xproperty.atom == atmWmName) {
|
||||
memset(&msg, 0, sizeof(msg));
|
||||
|
||||
msg.msg = WM_WM_NAME_EVENT;
|
||||
|
@ -1064,16 +1124,16 @@ winMultiWindowXMsgProc(void *pArg)
|
|||
/* Other fields ignored */
|
||||
winSendMessageToWM(pProcArg->pWMInfo, &msg);
|
||||
}
|
||||
else if (event.type == PropertyNotify
|
||||
&& event.xproperty.atom == atmWmHints) {
|
||||
else if ((event.xproperty.atom == atmWmHints) ||
|
||||
(event.xproperty.atom == atmNetWmIcon)) {
|
||||
memset(&msg, 0, sizeof(msg));
|
||||
|
||||
msg.msg = WM_WM_HINTS_EVENT;
|
||||
msg.msg = WM_WM_ICON_EVENT;
|
||||
msg.iWindow = event.xproperty.window;
|
||||
|
||||
/* Other fields ignored */
|
||||
winSendMessageToWM(pProcArg->pWMInfo, &msg);
|
||||
}
|
||||
}
|
||||
else if (event.type == ClientMessage
|
||||
&& event.xclient.message_type == atmWmChange
|
||||
&& event.xclient.data.l[0] == IconicState) {
|
||||
|
@ -1683,13 +1743,11 @@ winUpdateWindowPosition(HWND hWnd, Bool reshape, HWND * zstyle)
|
|||
/* Setup a rectangle with the X window position and size */
|
||||
SetRect(&rcNew, iX, iY, iX + iWidth, iY + iHeight);
|
||||
|
||||
#if 0
|
||||
ErrorF("winUpdateWindowPosition - (%d, %d)-(%d, %d)\n",
|
||||
winDebug("winUpdateWindowPosition - drawable extent (%d, %d)-(%d, %d)\n",
|
||||
rcNew.left, rcNew.top, rcNew.right, rcNew.bottom);
|
||||
#endif
|
||||
|
||||
AdjustWindowRectEx(&rcNew, GetWindowLongPtr(hWnd, GWL_STYLE), FALSE,
|
||||
WS_EX_APPWINDOW);
|
||||
GetWindowLongPtr(hWnd, GWL_EXSTYLE));
|
||||
|
||||
/* Don't allow window decoration to disappear off to top-left as a result of this adjustment */
|
||||
if (rcNew.left < GetSystemMetrics(SM_XVIRTUALSCREEN)) {
|
||||
|
@ -1704,10 +1762,8 @@ winUpdateWindowPosition(HWND hWnd, Bool reshape, HWND * zstyle)
|
|||
rcNew.bottom += iDy;
|
||||
}
|
||||
|
||||
#if 0
|
||||
ErrorF("winUpdateWindowPosition - (%d, %d)-(%d, %d)\n",
|
||||
winDebug("winUpdateWindowPosition - Window extent (%d, %d)-(%d, %d)\n",
|
||||
rcNew.left, rcNew.top, rcNew.right, rcNew.bottom);
|
||||
#endif
|
||||
|
||||
/* Position the Windows window */
|
||||
SetWindowPos(hWnd, *zstyle, rcNew.left, rcNew.top,
|
||||
|
|
|
@ -148,7 +148,6 @@ static wBOOL CALLBACK
|
|||
ReloadEnumWindowsProc(HWND hwnd, LPARAM lParam)
|
||||
{
|
||||
HICON hicon;
|
||||
Window wid;
|
||||
|
||||
if (!hwnd) {
|
||||
ErrorF("ReloadEnumWindowsProc: hwnd==NULL!\n");
|
||||
|
@ -173,10 +172,23 @@ ReloadEnumWindowsProc(HWND hwnd, LPARAM lParam)
|
|||
/* This window is now clean of our taint (but with undefined icons) */
|
||||
}
|
||||
else {
|
||||
/* winUpdateIcon() will set the icon default, dynamic, or from xwinrc */
|
||||
wid = (Window) GetProp(hwnd, WIN_WID_PROP);
|
||||
if (wid)
|
||||
winUpdateIcon(wid);
|
||||
/* Send a message to WM thread telling it re-evaluate the icon for this window */
|
||||
{
|
||||
winWMMessageRec wmMsg;
|
||||
|
||||
WindowPtr pWin = GetProp(hwnd, WIN_WINDOW_PROP);
|
||||
|
||||
if (pWin) {
|
||||
winPrivWinPtr pWinPriv = winGetWindowPriv(pWin);
|
||||
winPrivScreenPtr s_pScreenPriv = pWinPriv->pScreenPriv;
|
||||
|
||||
wmMsg.msg = WM_WM_ICON_EVENT;
|
||||
wmMsg.hwndWindow = hwnd;
|
||||
wmMsg.iWindow = (Window) GetProp(hwnd, WIN_WID_PROP);
|
||||
|
||||
winSendMessageToWM(s_pScreenPriv->pWMInfo, &wmMsg);
|
||||
}
|
||||
}
|
||||
|
||||
/* Update the system menu for this window */
|
||||
SetupSysMenu((unsigned long) hwnd);
|
||||
|
@ -577,31 +589,15 @@ LoadImageComma(char *fname, int sx, int sy, int flags)
|
|||
* ICONS{} section in the prefs file, and load the icon from a file
|
||||
*/
|
||||
HICON
|
||||
winOverrideIcon(unsigned long longWin)
|
||||
winOverrideIcon(char *res_name, char *res_class, char *wmName)
|
||||
{
|
||||
WindowPtr pWin = (WindowPtr) longWin;
|
||||
char *res_name, *res_class;
|
||||
int i;
|
||||
HICON hicon;
|
||||
char *wmName;
|
||||
|
||||
if (pWin == NULL)
|
||||
return 0;
|
||||
|
||||
/* If we can't find the class, we can't override from default! */
|
||||
if (!winMultiWindowGetClassHint(pWin, &res_name, &res_class))
|
||||
return 0;
|
||||
|
||||
winMultiWindowGetWMName(pWin, &wmName);
|
||||
|
||||
for (i = 0; i < pref.iconItems; i++) {
|
||||
if (!strcmp(pref.icon[i].match, res_name) ||
|
||||
!strcmp(pref.icon[i].match, res_class) ||
|
||||
if ((res_name && !strcmp(pref.icon[i].match, res_name)) ||
|
||||
(res_class && !strcmp(pref.icon[i].match, res_class)) ||
|
||||
(wmName && strstr(wmName, pref.icon[i].match))) {
|
||||
free(res_name);
|
||||
free(res_class);
|
||||
free(wmName);
|
||||
|
||||
if (pref.icon[i].hicon)
|
||||
return pref.icon[i].hicon;
|
||||
|
||||
|
@ -616,10 +612,6 @@ winOverrideIcon(unsigned long longWin)
|
|||
}
|
||||
|
||||
/* Didn't find the icon, fail gracefully */
|
||||
free(res_name);
|
||||
free(res_class);
|
||||
free(wmName);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -164,7 +164,7 @@ Bool
|
|||
int
|
||||
winIconIsOverride(unsigned hiconIn);
|
||||
|
||||
HICON winOverrideIcon(unsigned long longpWin);
|
||||
HICON winOverrideIcon(char *res_name, char *res_class, char *wmName);
|
||||
|
||||
unsigned long
|
||||
winOverrideStyle(char *res_name, char *res_class, char *wmName);
|
||||
|
|
|
@ -231,7 +231,7 @@ winMWExtWMCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
|
|||
// Store the implementation private frame ID
|
||||
pFrame->wid = (RootlessFrameID) pRLWinPriv;
|
||||
|
||||
winSelectIcons(pFrame->win, &hIcon, &hIconSmall);
|
||||
winSelectIcons(&hIcon, &hIconSmall);
|
||||
|
||||
/* Set standard class name prefix so we can identify window easily */
|
||||
strncpy(pszClass, WINDOW_CLASS_X, sizeof(pszClass));
|
||||
|
|
|
@ -147,39 +147,8 @@ winMWExtWMMoveResizeXWindow(WindowPtr pWin, int x, int y, int w, int h)
|
|||
}
|
||||
|
||||
/*
|
||||
* winMWExtWMUpdateIcon
|
||||
* Change the Windows window icon
|
||||
*/
|
||||
|
||||
void
|
||||
winMWExtWMUpdateIcon(Window id)
|
||||
{
|
||||
WindowPtr pWin;
|
||||
HICON hIcon, hiconOld;
|
||||
|
||||
dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient,
|
||||
DixUnknownAccess);
|
||||
hIcon = winOverrideIcon((unsigned long) pWin);
|
||||
|
||||
if (!hIcon)
|
||||
hIcon = winXIconToHICON(pWin, GetSystemMetrics(SM_CXICON));
|
||||
|
||||
if (hIcon) {
|
||||
win32RootlessWindowPtr pRLWinPriv
|
||||
= (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, FALSE);
|
||||
|
||||
if (pRLWinPriv->hWnd) {
|
||||
|
||||
hiconOld = (HICON) SendMessage(pRLWinPriv->hWnd,
|
||||
WM_SETICON, ICON_BIG,
|
||||
(LPARAM) hIcon);
|
||||
winDestroyIcon(hiconOld);
|
||||
}
|
||||
hIcon = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* winMWExtWMDecorateWindow - Update window style. Called by EnumWindows.
|
||||
*/
|
||||
|
||||
|
|
|
@ -115,7 +115,7 @@ typedef struct _winWMMessageRec {
|
|||
#define WM_WM_KILL (WM_USER + 7)
|
||||
#define WM_WM_ACTIVATE (WM_USER + 8)
|
||||
#define WM_WM_NAME_EVENT (WM_USER + 9)
|
||||
#define WM_WM_HINTS_EVENT (WM_USER + 10)
|
||||
#define WM_WM_ICON_EVENT (WM_USER + 10)
|
||||
#define WM_WM_CHANGE_STATE (WM_USER + 11)
|
||||
#define WM_WM_MAP2 (WM_USER + 12)
|
||||
#define WM_WM_MAP3 (WM_USER + 13)
|
||||
|
@ -157,18 +157,5 @@ void
|
|||
void
|
||||
winMinimizeWindow(Window id);
|
||||
|
||||
/*
|
||||
* winmultiwindowicons.c
|
||||
*/
|
||||
|
||||
void
|
||||
winUpdateIcon(Window id);
|
||||
|
||||
void
|
||||
winInitGlobalIcons(void);
|
||||
|
||||
void
|
||||
winDestroyIcon(HICON hIcon);
|
||||
|
||||
#endif /* XWIN_MULTIWINDOW */
|
||||
#endif
|
||||
|
|
|
@ -439,8 +439,6 @@ ProcWindowsWMFrameDraw(ClientPtr client)
|
|||
|
||||
ShowWindow(pRLWinPriv->hWnd, nCmdShow);
|
||||
|
||||
winMWExtWMUpdateIcon(pWin->drawable.id);
|
||||
|
||||
if (wBoundingShape(pWin) != NULL) {
|
||||
/* wBoundingShape is relative to *inner* origin of window.
|
||||
Translate by borderWidth to get the outside-relative position. */
|
||||
|
|
|
@ -1583,7 +1583,7 @@ Win32TempDir()
|
|||
if (getenv("TEMP") != NULL)
|
||||
return getenv("TEMP");
|
||||
else if (getenv("TMP") != NULL)
|
||||
return getenv("TEMP");
|
||||
return getenv("TMP");
|
||||
else
|
||||
return "/tmp";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user