frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for building multiwindow and internalwm on mingw 

Changed some debugging output
This commit is contained in:
Alexander Gottwald 2004-11-22 14:28:25 +00:00
parent 255c3c0e8c
commit bc7493801d
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xwin/ChangeLog
View File

@ -1,3 +1,10 @@
2004-11-22 Alexander Gottwald <ago at freedesktop dot org>
* winmultiwindowwm.c:
Fixes for building multiwindow and internalwm on mingw
* winwin32rootless.c:
Changed some debugging output
2004-11-22 Alexander Gottwald <ago at freedesktop dot org> 2004-11-22 Alexander Gottwald <ago at freedesktop dot org>
* InitOutput.c, winglobals.c, winprocarg.c: * InitOutput.c, winglobals.c, winprocarg.c:

7
hw/xwin/winmultiwindowwm.c
View File

@ -33,7 +33,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#ifdef __CYGWIN__
#include <sys/select.h> #include <sys/select.h>
#endif
#include <fcntl.h> #include <fcntl.h>
#include <setjmp.h> #include <setjmp.h>
#include <pthread.h> #include <pthread.h>
@ -44,11 +46,8 @@
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
/* Fixups to prevent collisions between Windows and X headers */
#define ATOM DWORD
/* Windows headers */ /* Windows headers */
#include <windows.h> #include <Xwindows.h>
/* Local headers */ /* Local headers */
#include "obj_base.h" #include "obj_base.h"

11
hw/xwin/winwin32rootless.c
View File

@ -694,7 +694,7 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
Bool fReturn = TRUE; Bool fReturn = TRUE;
HDC hdcNew; HDC hdcNew;
HBITMAP hbmpNew; HBITMAP hbmpNew;
#if CYGMULTIWINDOW_DEBUG && FALSE #if CYGMULTIWINDOW_DEBUG
winDebug ("winMWExtWMStartDrawing (%08x) %08x\n", (int) pRLWinPriv, pRLWinPriv->fDestroyed); winDebug ("winMWExtWMStartDrawing (%08x) %08x\n", (int) pRLWinPriv, pRLWinPriv->fDestroyed);
#endif #endif
@ -704,7 +704,7 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
if (pScreen) pScreenPriv = winGetScreenPriv(pScreen); if (pScreen) pScreenPriv = winGetScreenPriv(pScreen);
if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo; if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo;
#if CYGMULTIWINDOW_DEBUG && FALSE #if CYGMULTIWINDOW_DEBUG
winDebug ("\tpScreenPriv %08X\n", (int) pScreenPriv); winDebug ("\tpScreenPriv %08X\n", (int) pScreenPriv);
winDebug ("\tpScreenInfo %08X\n", (int) pScreenInfo); winDebug ("\tpScreenInfo %08X\n", (int) pScreenInfo);
winDebug ("\t(%d, %d)\n", (int)pRLWinPriv->pFrame->width, winDebug ("\t(%d, %d)\n", (int)pRLWinPriv->pFrame->width,
@ -805,11 +805,12 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
pRLWinPriv->hbmpShadow = hbmpNew; pRLWinPriv->hbmpShadow = hbmpNew;
pRLWinPriv->fResized = FALSE; pRLWinPriv->fResized = FALSE;
}
#if CYGMULTIWINDOW_DEBUG && FALSE #if CYGMULTIWINDOW_DEBUG && FALSE
winDebug ("winMWExtWMStartDrawing - 0x%08x %d\n", winDebug ("winMWExtWMStartDrawing - 0x%08x %d\n",
(unsigned int)pRLWinPriv->pfb, (unsigned int)dibsection.dsBm.bmWidthBytes); (unsigned int)pRLWinPriv->pfb,
(unsigned int)dibsection.dsBm.bmWidthBytes);
#endif #endif
}
} }
else else
{ {