[Xorg-commit] xc/programs/Xserver/hw/xwin winresource.h,NONE,1.1.2.1 Imakefile,1.1.4.1.2.2,1.1.4.1.2.3 InitOutput.c,1.1.4.1.2.10,1.1.4.1.2.11 XWin.rc,1.1.4.1.2.1,1.1.4.1.2.2 win.h,1.1.4.1.2.10,1.1.4.1.2.11 winauth.c,1.1.2.1,1.1.2.2 winclipboard.h,1.1.4.1.2.5,1.1.4.1.2.6 winclipboardthread.c,1.1.4.1.2.7,1.1.4.1.2.8 winclipboardunicode.c,1.1.4.1.2.1,1.1.4.1.2.2 winclipboardwrappers.c,1.1.2.7,1.1.2.8 winclipboardxevents.c,1.1.4.1.2.8,1.1.4.1.2.9 winconfig.c,1.1.4.1.2.4,1.1.4.1.2.5 winconfig.h,1.1,1.1.6.1 winglobals.c,1.1.2.3,1.1.2.4 winkeybd.h,1.1.6.1,1.1.6.2 winms.h,1.1,1.1.6.1 winmultiwindowclass.c,1.1.6.1,1.1.6.2 winmultiwindowclass.h,1.1,1.1.6.1 winprefslex.l,1.1,1.1.6.1 winprefsyacc.y,1.1.6.1,1.1.6.2 winpushpxl.c,1.1,1.1.6.1 winwindow.c,1.1.4.1.2.2,1.1.4.1.2.3 resource.h,1.1.4.1,NONE wincutpaste.c,1.1.4.1.2.1,NONE
Harold L Hunt II
xorg-commit at pdx.freedesktop.org
Thu Jan 15 08:06:46 EET 2004
Committed by: harold
Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv27320
Modified Files:
Tag: CYGWIN
Imakefile InitOutput.c XWin.rc win.h winauth.c winclipboard.h
winclipboardthread.c winclipboardunicode.c
winclipboardwrappers.c winclipboardxevents.c winconfig.c
winconfig.h winglobals.c winkeybd.h winms.h
winmultiwindowclass.c winmultiwindowclass.h winprefslex.l
winprefsyacc.y winpushpxl.c winwindow.c
Added Files:
Tag: CYGWIN
winresource.h
Removed Files:
Tag: CYGWIN
resource.h wincutpaste.c
Log Message:
Sync with XWin Server 4.3.0-41 release. Lots of minor cleanups to enable the code to build in the xserver tree (almost).
--- NEW FILE: winresource.h ---
#if !defined(WINRESOURCE_H)
#define WINRESOURCE_H
/*
*Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
*
*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 XFREE86 PROJECT 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.
*
*Except as contained in this notice, the name of the XFree86 Project
*shall not be used in advertising or otherwise to promote the sale, use
*or other dealings in this Software without prior written authorization
*from the XFree86 Project.
*
* Authors: Harold L Hunt II
*/
/* $XFree86: xc/programs/Xserver/hw/xwin/resource.h,v 1.2 2003/07/29 21:25:15 dawes Exp $ */
#include "winms.h"
/*
* Local defines
*/
#define IDM_APP_ABOUT 40001
#define IDC_STATIC -1
#define IDI_XWIN 101
#define IDM_TRAYICON_MENU 102
#define ID_APP_EXIT 103
#define ID_APP_HIDE_ROOT 104
#define ID_APP_SHOW_ROOT 105
#define ID_APP_ALWAYS_ON_TOP 106
#endif
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Imakefile,v
retrieving revision 1.1.4.1.2.2
retrieving revision 1.1.4.1.2.3
diff -u -d -r1.1.4.1.2.2 -r1.1.4.1.2.3
--- Imakefile 8 Jan 2004 05:10:32 -0000 1.1.4.1.2.2
+++ Imakefile 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.3
@@ -37,7 +37,6 @@
winpfbdd.c \
winkeybd.c \
winmouse.c \
- wincutpaste.c \
winnativegdi.c \
winlayer.c \
winerror.c \
@@ -124,7 +123,6 @@
winpfbdd.o \
winkeybd.o \
winmouse.o \
- wincutpaste.o \
winnativegdi.o \
winlayer.o \
winerror.o \
Index: InitOutput.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/InitOutput.c,v
retrieving revision 1.1.4.1.2.10
retrieving revision 1.1.4.1.2.11
diff -u -d -r1.1.4.1.2.10 -r1.1.4.1.2.11
--- InitOutput.c 13 Jan 2004 01:08:37 -0000 1.1.4.1.2.10
+++ InitOutput.c 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.11
@@ -30,9 +30,11 @@
#include "win.h"
#include "winmsg.h"
+#if WIN_XF86CONFIG_SUPPORT
#include "winconfig.h"
+#endif
#include "winprefs.h"
-#include "Xlocale.h"
+#include "X11/Xlocale.h"
/*
@@ -72,7 +74,7 @@
#endif
#if defined(DDXOSRESET)
-void OsVendorReset ();
+void OsVendorReset (void);
#endif
void winInitializeDefaultScreens (void);
@@ -116,7 +118,7 @@
*/
void
-OsVendorReset ()
+OsVendorReset (void)
{
ErrorF ("OsVendorReset - Hello\n");
@@ -138,7 +140,7 @@
/* See Porting Layer Definition - p. 57 */
void
-ddxGiveUp()
+ddxGiveUp (void)
{
#if CYGDEBUG
winErrorFVerb (2, "ddxGiveUp\n");
@@ -366,9 +368,11 @@
winErrorFVerb (2, "InitOutput\n");
#endif
+#if WIN_XF86CONFIG_SUPPORT
/* Try to read the XF86Config-style configuration file */
if (!winReadConfigfile ())
winErrorFVerb (1, "InitOutput - Error reading config file\n");
+#endif
/* Setup global screen info parameters */
screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
@@ -423,7 +427,7 @@
iMaxConsecutiveScreen = i + 1;
}
winErrorFVerb (2, "InitOutput - g_iNumScreens: %d iMaxConsecutiveScreen: %d\n",
- g_iNumScreens, iMaxConsecutiveScreen);
+ g_iNumScreens, iMaxConsecutiveScreen);
if (g_iNumScreens < iMaxConsecutiveScreen)
FatalError ("InitOutput - Malformed set of screen parameter(s). "
"Screens must be specified consecutively starting with "
@@ -449,9 +453,11 @@
/* Load preferences from XWinrc file */
LoadPreferences();
+#if defined(XCSECURITY)
/* Generate a cookie used by internal clients for authorization */
if (g_fXdmcpEnabled)
winGenerateAuthorization ();
+#endif
/* Perform some one time initialization */
if (1 == serverGeneration)
Index: XWin.rc
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/XWin.rc,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -d -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- XWin.rc 23 Dec 2003 06:32:43 -0000 1.1.4.1.2.1
+++ XWin.rc 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.2
@@ -29,7 +29,7 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xwin/XWin.rc,v 1.2 2003/07/29 21:25:15 dawes Exp $ */
-#include "resource.h"
+#include "winresource.h"
/*
Index: win.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/win.h,v
retrieving revision 1.1.4.1.2.10
retrieving revision 1.1.4.1.2.11
diff -u -d -r1.1.4.1.2.10 -r1.1.4.1.2.11
--- win.h 11 Jan 2004 17:53:50 -0000 1.1.4.1.2.10
+++ win.h 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.11
@@ -51,6 +51,7 @@
#define WIN_LAYER_SUPPORT NO
#define WIN_EMULATE_PSEUDO_SUPPORT YES
#define WIN_UPDATE_STATS NO
+#define WIN_XF86CONFIG_SUPPORT YES
/* Turn debug messages on or off */
@@ -133,8 +134,6 @@
#include <errno.h>
#include <pthread.h>
-#include <X11/XWDFile.h>
-
#ifdef HAS_MMAP
#include <sys/mman.h>
#ifndef MAP_FILE
@@ -142,10 +141,10 @@
#endif /* MAP_FILE */
#endif /* HAS_MMAP */
-#include "X.h"
-#include "Xproto.h"
-#include "Xos.h"
-#include "Xprotostr.h"
+#include "X11/X.h"
+#include "X11/Xproto.h"
+#include "X11/Xos.h"
+#include "X11/Xprotostr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
#include "pixmap.h"
@@ -163,14 +162,16 @@
#include "mibstore.h"
#include "input.h"
#include "mipointer.h"
-#include "keysym.h"
+#include "X11/keysym.h"
#include "mibstore.h"
#include "micoord.h"
#include "dix.h"
#include "miline.h"
#include "shadow.h"
#include "fb.h"
+#if WIN_LAYER_SUPPORT
#include "layer.h"
+#endif
#include "rootless.h"
#ifdef RENDER
@@ -186,6 +187,7 @@
* Windows headers
*/
#include "winms.h"
+#include "./winresource.h"
/*
@@ -390,8 +392,6 @@
DWORD dwDepth;
DWORD dwRefreshRate;
char *pfb;
- XWDColor *pXWDCmap;
- XWDFileHeader *pXWDHeader;
DWORD dwEngine;
DWORD dwEnginePreferred;
DWORD dwClipUpdatesNBoxes;
@@ -735,8 +735,10 @@
* winauth.c
*/
+#if defined(XCSECURITY)
Bool
winGenerateAuthorization (void);
+#endif
/*
@@ -1191,6 +1193,15 @@
/*
+ * winpushpixels.c
+ */
+
+void
+winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
+ int dx, int dy, int xOrg, int yOrg);
+
+
+/*
* winscrinit.c
*/
@@ -1365,6 +1376,9 @@
winAdjustVideoModeShadowGDI (ScreenPtr pScreen);
Bool
+winBltExposedRegionsShadowGDI (ScreenPtr pScreen);
+
+Bool
winActivateAppShadowGDI (ScreenPtr pScreen);
Bool
Index: winauth.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winauth.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- winauth.c 8 Jan 2004 05:10:32 -0000 1.1.2.1
+++ winauth.c 15 Jan 2004 06:06:44 -0000 1.1.2.2
@@ -1,3 +1,4 @@
+#if defined(XCSECURITY)
/*
*Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
*
@@ -31,10 +32,10 @@
#include "win.h"
/* Includes for authorization */
-#include "Xauth.h"
+#include "X11/Xauth.h"
#define _SECURITY_SERVER
-#include "security.h"
-#include "securstr.h"
+#include "X11/extensions/security.h"
+#include "X11/extensions/securstr.h"
/*
@@ -125,3 +126,4 @@
return FALSE;
}
+#endif
Index: winclipboard.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboard.h,v
retrieving revision 1.1.4.1.2.5
retrieving revision 1.1.4.1.2.6
diff -u -d -r1.1.4.1.2.5 -r1.1.4.1.2.6
--- winclipboard.h 12 Jan 2004 01:10:50 -0000 1.1.4.1.2.5
+++ winclipboard.h 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.6
@@ -42,21 +42,25 @@
#include <pthread.h>
/* X headers */
-#include "X.h"
-#include "Xatom.h"
+#include "X11/X.h"
+#include "X11/Xatom.h"
/* NOTE: For some unknown reason, including Xproto.h solves
* tons of problems with including windows.h. Unknowns reasons
* are usually bad, so someone should investigate this.
*/
-#include "Xproto.h"
-#include "Xutil.h"
-#include "Xlocale.h"
+#include "X11/Xproto.h"
+#include "X11/Xutil.h"
+#include "X11/Xlocale.h"
/* Fixups to prevent collisions between Windows and X headers */
#define ATOM DWORD
/* Windows headers */
+#ifndef XFree86Server
+#define XFree86Server
+#endif
#include <windows.h>
+#undef XFree86Server
/* Clipboard module constants */
@@ -86,10 +90,10 @@
*/
Bool
-winInitClipboard ();
+winInitClipboard (void);
HWND
-winClipboardCreateMessagingWindow ();
+winClipboardCreateMessagingWindow (void);
/*
@@ -108,7 +112,7 @@
*/
void *
-winClipboardProc ();
+winClipboardProc (void);
void
winDeinitClipboard (void);
Index: winclipboardthread.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboardthread.c,v
retrieving revision 1.1.4.1.2.7
retrieving revision 1.1.4.1.2.8
diff -u -d -r1.1.4.1.2.7 -r1.1.4.1.2.8
--- winclipboardthread.c 13 Jan 2004 01:08:37 -0000 1.1.4.1.2.7
+++ winclipboardthread.c 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.8
@@ -30,7 +30,7 @@
/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardthread.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
#include "winclipboard.h"
-#include "Xauth.h"
+#include "X11/Xauth.h"
/*
@@ -46,8 +46,10 @@
extern Bool g_fUnicodeClipboard;
extern unsigned long serverGeneration;
+#if defined(XCSECURITY)
extern unsigned int g_uiAuthDataLen;
extern char *g_pAuthData;
+#endif
extern Bool g_fClipboardStarted;
extern HWND g_hwndClipboard;
extern void *g_pClipboardDisplay;
@@ -133,12 +135,14 @@
ErrorF ("winClipboardProc - setjmp returned for IO Error Handler.\n");
pthread_exit (NULL);
}
-
+
+#if defined(XCSECURITY)
/* Use our generated cookie for authentication */
XSetAuthorization (AUTH_NAME,
strlen (AUTH_NAME),
g_pAuthData,
g_uiAuthDataLen);
+#endif
/* Set error handler */
XSetErrorHandler (winClipboardErrorHandler);
Index: winclipboardunicode.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboardunicode.c,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -d -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- winclipboardunicode.c 9 Dec 2003 01:37:16 -0000 1.1.4.1.2.1
+++ winclipboardunicode.c 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.2
@@ -34,6 +34,13 @@
Bool
winClipboardDetectUnicodeSupport (void);
+void
+winClipboardDOStoUNIX (char *pszData, int iLength);
+
+void
+winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength);
+
+
/*
* Determine whether we suport Unicode or not.
* NOTE: Currently, just check if we are on an NT-based platform or not.
Index: winclipboardwrappers.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winclipboardwrappers.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- winclipboardwrappers.c 13 Jan 2004 01:08:37 -0000 1.1.2.7
+++ winclipboardwrappers.c 15 Jan 2004 06:06:44 -0000 1.1.2.8
@@ -30,7 +30,8 @@
#include "win.h"
#include "dixstruct.h"
-#include "Xatom.h"
+#include "X11/Xatom.h"
+
/*
* Constants
Index: winclipboardxevents.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboardxevents.c,v
retrieving revision 1.1.4.1.2.8
retrieving revision 1.1.4.1.2.9
diff -u -d -r1.1.4.1.2.8 -r1.1.4.1.2.9
--- winclipboardxevents.c 11 Jan 2004 07:39:03 -0000 1.1.4.1.2.8
+++ winclipboardxevents.c 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.9
@@ -465,10 +465,11 @@
atomLocalProperty,
iWindow,
CurrentTime);
- if (iReturn == BadAtom || iReturn == BadWindow)
+ if (iReturn != Success)
{
ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
- "XConvertSelection () failed\n");
+ "XConvertSelection () failed, aborting: %d\n",
+ iReturn);
break;
}
@@ -488,10 +489,11 @@
atomLocalProperty,
iWindow,
CurrentTime);
- if (iReturn == BadAtom || iReturn == BadWindow)
+ if (iReturn != Success)
{
ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
- "XConvertSelection () failed\n");
+ "XConvertSelection () failed, aborting: %d\n",
+ iReturn);
break;
}
@@ -502,7 +504,8 @@
else
{
ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
- "Unknown format. Cannot request conversion.\n");
+ "Unknown format. Cannot request conversion, "
+ "aborting.\n");
break;
}
}
@@ -523,7 +526,8 @@
if (iReturn != Success)
{
ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
- "XGetWindowProperty () failed, aborting.\n");
+ "XGetWindowProperty () failed, aborting: %d\n",
+ iReturn);
break;
}
@@ -548,7 +552,8 @@
if (iReturn != Success)
{
ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
- "XGetWindowProperty () failed, aborting.\n");
+ "XGetWindowProperty () failed, aborting: %d\n",
+ iReturn);
break;
}
@@ -600,26 +605,25 @@
else
{
ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
- "X*TextPropertyToTextList list_return is NULL\n");
+ "X*TextPropertyToTextList list_return is NULL.\n");
pszReturnData = malloc (1);
pszReturnData[0] = '\0';
}
}
else
{
+ ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
+ "X*TextPropertyToTextList returned: ");
switch (iReturn)
{
case XNoMemory:
- ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
- "XNoMemory\n");
+ ErrorF ("XNoMemory\n");
break;
case XConverterNotFound:
- ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
- "XConverterNotFound\n");
+ ErrorF ("XConverterNotFound\n");
break;
default:
- ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
- "Unknown Error\n");
+ ErrorF ("%d", iReturn);
break;
}
pszReturnData = malloc (1);
@@ -627,7 +631,8 @@
}
/* Free the data returned from XGetWindowProperty */
- XFreeStringList (ppszTextList);
+ if (ppszTextList)
+ XFreeStringList (ppszTextList);
ppszTextList = NULL;
XFree (xtpText.value);
xtpText.value = NULL;
@@ -648,6 +653,15 @@
/* Allocate memory for the Unicode string */
pwszUnicodeStr
= (wchar_t*) malloc (sizeof (wchar_t) * (iUnicodeLen + 1));
+ if (!pwszUnicodeStr)
+ {
+ ErrorF ("winClipboardFlushXEvents - SelectionNotify "
+ "malloc failed for pwszUnicodeStr, aborting.\n");
+
+ /* Abort */
+ fAbort = TRUE;
+ goto winClipboardFlushXEvents_SelectionNotify_Done;
+ }
/* Do the actual conversion */
MultiByteToWideChar (CP_UTF8,
@@ -670,6 +684,18 @@
hGlobal = GlobalAlloc (GMEM_MOVEABLE, iConvertDataLen);
}
+ /* Check that global memory was allocated */
+ if (!hGlobal)
+ {
+ ErrorF ("winClipboardFlushXEvents - SelectionNotify "
+ "GlobalAlloc failed, aborting: %ld\n",
+ GetLastError ());
+
+ /* Abort */
+ fAbort = TRUE;
+ goto winClipboardFlushXEvents_SelectionNotify_Done;
+ }
+
/* Obtain a pointer to the global memory */
pszGlobalData = GlobalLock (hGlobal);
if (pszGlobalData == NULL)
Index: winconfig.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winconfig.c,v
retrieving revision 1.1.4.1.2.4
retrieving revision 1.1.4.1.2.5
diff -u -d -r1.1.4.1.2.4 -r1.1.4.1.2.5
--- winconfig.c 11 Jan 2004 17:52:39 -0000 1.1.4.1.2.4
+++ winconfig.c 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.5
@@ -39,6 +39,7 @@
#include "XKBsrv.h"
#endif
+#if WIN_XF86CONFIG_SUPPORT
#ifndef CONFIGPATH
#define CONFIGPATH "%A," "%R," \
"/etc/X11/%R," "%P/etc/X11/%R," \
@@ -53,6 +54,8 @@
#endif
XF86ConfigPtr g_xf86configptr = NULL;
+#endif
+
WinCmdlineRec g_cmdline = {
NULL, /* configFile */
NULL, /* fontPath */
@@ -98,6 +101,7 @@
50}
};
+#if WIN_XF86CONFIG_SUPPORT
serverLayoutRec g_winConfigLayout;
static Bool ParseOptionValue (int scrnIndex, pointer options,
@@ -199,6 +203,7 @@
winConfigFiles ();
return retval;
}
+#endif
/* Set the keyboard configuration */
@@ -240,12 +245,16 @@
Bool
winConfigKeyboard (DeviceIntPtr pDevice)
{
+#ifdef XKB
char layoutName[KL_NAMELENGTH];
static unsigned int layoutNum = 0;
- int keyboardType;
+ int keyboardType;
+#endif
+#if WIN_XF86CONFIG_SUPPORT
XF86ConfInputPtr kbd = NULL;
XF86ConfInputPtr input_list = NULL;
MessageType from = X_DEFAULT;
+#endif
MessageType kbdfrom = X_CONFIG;
/* Setup defaults */
@@ -288,7 +297,7 @@
winMsgVerb(X_PROBED, 1, "Setting autorepeat to delay=%d, rate=%d\n",
g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
}
- }
+ }
keyboardType = GetKeyboardType (0);
@@ -335,7 +344,6 @@
g_winInfo.xkb.options = pLayout->xkboptions;
break;
}
-
}
g_winInfo.xkb.initialMap = NULL;
@@ -352,6 +360,7 @@
if (g_cmdline.keyboard)
kbdfrom = X_CMDLINE;
+#if WIN_XF86CONFIG_SUPPORT
/*
* Until the layout code is finished, I search for the keyboard
* device and configure the server with it.
@@ -517,15 +526,18 @@
}
#endif
}
+#endif
return TRUE;
}
+#if WIN_XF86CONFIG_SUPPORT
Bool
winConfigMouse (DeviceIntPtr pDevice)
{
MessageType mousefrom = X_CONFIG;
+
XF86ConfInputPtr mouse = NULL;
XF86ConfInputPtr input_list = NULL;
@@ -618,6 +630,7 @@
return TRUE;
}
+#endif
Bool
@@ -634,6 +647,7 @@
}
+#if WIN_XF86CONFIG_SUPPORT
char *
winSetStrOption (pointer optlist, const char *name, char *deflt)
{
@@ -687,6 +701,7 @@
deflt = o.value.realnum;
return deflt;
}
+#endif
/*
@@ -735,6 +750,7 @@
}
+#if WIN_XF86CONFIG_SUPPORT
/*
* Find the named option in the list.
* @return the pointer to the option record, or NULL if not found.
@@ -1042,6 +1058,7 @@
}
return TRUE;
}
+#endif
char *
Index: winconfig.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winconfig.h,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- winconfig.h 14 Nov 2003 16:48:56 -0000 1.1
+++ winconfig.h 15 Jan 2004 06:06:44 -0000 1.1.6.1
@@ -1,3 +1,5 @@
+#ifndef __WIN_CONFIG_H__
+#define __WIN_CONFIG_H__
/*
*Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
*
@@ -28,11 +30,11 @@
* Authors: Alexander Gottwald
*/
/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.h,v 1.1 2002/10/17 08:18:22 alanh Exp $ */
-#ifndef __WIN_CONFIG_H__
-#define __WIN_CONFIG_H__
#include "win.h"
+#if WIN_XF86CONFIG_SUPPORT
#include "../xfree86/parser/xf86Parser.h"
+#endif
/* These are taken from hw/xfree86/common/xf86str.h */
@@ -205,8 +207,9 @@
extern WinCmdlineRec g_cmdline;
-
+#if WIN_XF86CONFIG_SUPPORT
extern XF86ConfigPtr g_xf86configptr;
+#endif
extern serverLayoutRec g_winConfigLayout;
@@ -282,9 +285,10 @@
int winSetBoolOption (pointer optlist, const char *name, int deflt);
int winSetIntOption (pointer optlist, const char *name, int deflt);
double winSetRealOption (pointer optlist, const char *name, double deflt);
-
+#if WIN_XF86CONFIG_SUPPORT
XF86OptionPtr winFindOption (XF86OptionPtr list, const char *name);
char *winFindOptionValue (XF86OptionPtr list, const char *name);
+#endif
int winNameCompare (const char *s1, const char *s2);
char *winNormalizeName (const char *s);
Index: winglobals.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winglobals.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- winglobals.c 13 Jan 2004 01:08:37 -0000 1.1.2.3
+++ winglobals.c 15 Jan 2004 06:06:44 -0000 1.1.2.4
@@ -67,7 +67,7 @@
FARPROC g_fpDirectDrawCreateClipper = NULL;
HMODULE g_hmodCommonControls = NULL;
-FARPROC g_fpTrackMouseEvent = (FARPROC) (void (*)())NoopDDA;
+FARPROC g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;
/*
Index: winkeybd.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winkeybd.h,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -d -r1.1.6.1 -r1.1.6.2
--- winkeybd.h 24 Dec 2003 21:17:27 -0000 1.1.6.1
+++ winkeybd.h 15 Jan 2004 06:06:44 -0000 1.1.6.2
@@ -1,6 +1,5 @@
#if !defined(WINKEYBD_H)
#define WINKEYBD_H
-
/*
*Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
*
Index: winms.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winms.h,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- winms.h 14 Nov 2003 16:48:56 -0000 1.1
+++ winms.h 15 Jan 2004 06:06:44 -0000 1.1.6.1
@@ -44,6 +44,9 @@
#define WIN32_LEAN_AND_MEAN
#endif
+#ifndef XFree86Server
+#define XFree86Server
+#endif
#include <windows.h>
#include <windowsx.h>
Index: winmultiwindowclass.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -d -r1.1.6.1 -r1.1.6.2
--- winmultiwindowclass.c 21 Dec 2003 07:26:10 -0000 1.1.6.1
+++ winmultiwindowclass.c 15 Jan 2004 06:06:44 -0000 1.1.6.2
@@ -29,7 +29,7 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */
-#include <Xatom.h>
+#include "X11/Xatom.h"
#include "propertyst.h"
#include "windowstr.h"
#include "winmultiwindowclass.h"
Index: winmultiwindowclass.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowclass.h,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- winmultiwindowclass.h 25 Nov 2003 19:28:56 -0000 1.1
+++ winmultiwindowclass.h 15 Jan 2004 06:06:44 -0000 1.1.6.1
@@ -1,3 +1,5 @@
+#if !defined(WINMULTIWINDOWCLASS_H)
+#define WINMULTIWINDOWCLASS_H
/*
*Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
*
@@ -108,3 +110,4 @@
int
winMultiWindowGetWMName (WindowPtr pWin, char **wmName);
+#endif
Index: winprefslex.l
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winprefslex.l,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- winprefslex.l 25 Nov 2003 19:28:56 -0000 1.1
+++ winprefslex.l 15 Jan 2004 06:06:44 -0000 1.1.6.1
@@ -37,7 +37,7 @@
extern YYSTYPE yylval;
extern char *yytext;
-extern int yyparse();
+extern int yyparse(void);
extern void ErrorF (const char* /*f*/, ...);
Index: winprefsyacc.y
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winprefsyacc.y,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -d -r1.1.6.1 -r1.1.6.2
--- winprefsyacc.y 9 Dec 2003 01:37:16 -0000 1.1.6.1
+++ winprefsyacc.y 15 Jan 2004 06:06:44 -0000 1.1.6.2
@@ -68,7 +68,7 @@
extern void ErrorF (const char* /*f*/, ...);
extern char *yytext;
-extern int yylex();
+extern int yylex(void);
%}
@@ -240,7 +240,7 @@
}
static void
-CloseMenu ()
+CloseMenu (void)
{
if (menu.menuItem==NULL || menu.menuItems==0)
{
@@ -261,7 +261,7 @@
}
static void
-OpenIcons ()
+OpenIcons (void)
{
if (pref.icon != NULL) {
ErrorF("LoadPreferences: Redefining icon mappings\n");
@@ -292,12 +292,12 @@
}
static void
-CloseIcons ()
+CloseIcons (void)
{
}
static void
-OpenSysMenu ()
+OpenSysMenu (void)
{
if (pref.sysMenu != NULL) {
ErrorF("LoadPreferences: Redefining system menu\n");
@@ -328,7 +328,7 @@
}
static void
-CloseSysMenu ()
+CloseSysMenu (void)
{
}
Index: winpushpxl.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winpushpxl.c,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- winpushpxl.c 25 Nov 2003 19:28:56 -0000 1.1
+++ winpushpxl.c 15 Jan 2004 06:06:44 -0000 1.1.6.1
@@ -75,11 +75,8 @@
* in the server, we need to rename one of them
*/
void
-winPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
- GCPtr pGC;
- PixmapPtr pBitMap;
- DrawablePtr pDrawable;
- int dx, dy, xOrg, yOrg;
+winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
+ int dx, int dy, int xOrg, int yOrg)
{
int h, dxDivPPW, ibEnd;
MiBits *pwLineStart;
Index: winwindow.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winwindow.c,v
retrieving revision 1.1.4.1.2.2
retrieving revision 1.1.4.1.2.3
diff -u -d -r1.1.4.1.2.2 -r1.1.4.1.2.3
--- winwindow.c 8 Jan 2004 05:10:33 -0000 1.1.4.1.2.2
+++ winwindow.c 15 Jan 2004 06:06:44 -0000 1.1.4.1.2.3
@@ -353,8 +353,10 @@
#endif
fResult = winGetScreenPriv(pWin->drawable.pScreen)->RealizeWindow(pWin);
-
+
+#ifdef SHAPE
winReshapePRootless (pWin);
+#endif
winUpdateRgnPRootless (pWin);
--- resource.h DELETED ---
--- wincutpaste.c DELETED ---
More information about the xorg-commit
mailing list