From 0f796d3b695ccf0bbc28a9f64fff267bc7fbae87 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 6 Apr 2008 09:46:01 +0000 Subject: * Parameter renames for some much used functions from Graeme (#11034) git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@10604 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/x11/src/xlib.pp | 70 +++++++++++++++++++++++------------------------ packages/x11/src/xutil.pp | 6 ++-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/packages/x11/src/xlib.pp b/packages/x11/src/xlib.pp index a79db70e39..b60c69425f 100644 --- a/packages/x11/src/xlib.pp +++ b/packages/x11/src/xlib.pp @@ -1289,25 +1289,25 @@ function XInternAtom(para1:PDisplay; para2:Pchar; para3:TBool):TAtom;cdecl;exter function XInternAtoms(para1:PDisplay; para2:PPchar; para3:cint; para4:TBool; para5:PAtom):TStatus;cdecl;external libX11; function XCopyColormapAndFree(para1:PDisplay; para2:TColormap):TColormap;cdecl;external libX11; function XCreateColormap(para1:PDisplay; para2:TWindow; para3:PVisual; para4:cint):TColormap;cdecl;external libX11; -function XCreatePixmapCursor(para1:PDisplay; para2:TPixmap; para3:TPixmap; para4:PXColor; para5:PXColor; - para6:cuint; para7:cuint):TCursor;cdecl;external libX11; -function XCreateGlyphCursor(para1:PDisplay; para2:TFont; para3:TFont; para4:cuint; para5:cuint; - para6:PXColor; para7:PXColor):TCursor;cdecl;external libX11; -function XCreateFontCursor(para1:PDisplay; para2:cuint):TCursor;cdecl;external libX11; +function XCreatePixmapCursor(ADisplay:PDisplay; ASource:TPixmap; AMask:TPixmap; AForegroundColor:PXColor; ABackgroundColor:PXColor; + AX:cuint; AY:cuint):TCursor;cdecl;external libX11; +function XCreateGlyphCursor(ADisplay:PDisplay; ASourceFont:TFont; AMaskFont:TFont; ASourceChar:cuint; AMaskChar:cuint; + AForegroundColor:PXColor; ABackgroundColor:PXColor):TCursor;cdecl;external libX11; +function XCreateFontCursor(ADisplay:PDisplay; AShape:cuint):TCursor;cdecl;external libX11; function XLoadFont(para1:PDisplay; para2:Pchar):TFont;cdecl;external libX11; function XCreateGC(para1:PDisplay; para2:TDrawable; para3:culong; para4:PXGCValues):TGC;cdecl;external libX11; function XGContextFromGC(para1:TGC):TGContext;cdecl;external libX11; procedure XFlushGC(para1:PDisplay; para2:TGC);cdecl;external libX11; -function XCreatePixmap(para1:PDisplay; para2:TDrawable; para3:cuint; para4:cuint; para5:cuint):TPixmap;cdecl;external libX11; -function XCreateBitmapFromData(para1:PDisplay; para2:TDrawable; para3:Pchar; para4:cuint; para5:cuint):TPixmap;cdecl;external libX11; +function XCreatePixmap(ADisplay:PDisplay; ADrawable:TDrawable; AWidth:cuint; AHeight:cuint; ADepth:cuint):TPixmap;cdecl;external libX11; +function XCreateBitmapFromData(ADiplay:PDisplay; ADrawable:TDrawable; AData:Pchar; AWidth:cuint; AHeight:cuint):TPixmap;cdecl;external libX11; function XCreatePixmapFromBitmapData(para1:PDisplay; para2:TDrawable; para3:Pchar; para4:cuint; para5:cuint; para6:culong; para7:culong; para8:cuint):TPixmap;cdecl;external libX11; -function XCreateSimpleWindow(para1:PDisplay; para2:TWindow; para3:cint; para4:cint; para5:cuint; - para6:cuint; para7:cuint; para8:culong; para9:culong):TWindow;cdecl;external libX11; +function XCreateSimpleWindow(ADisplay:PDisplay; AParent:TWindow; AX:cint; AY:cint; AWidth:cuint; + AHeight:cuint; ABorderWidth:cuint; ABorder:culong; ABackground:culong):TWindow;cdecl;external libX11; function XGetSelectionOwner(para1:PDisplay; para2:TAtom):TWindow;cdecl;external libX11; -function XCreateWindow(para1:PDisplay; para2:TWindow; para3:cint; para4:cint; para5:cuint; - para6:cuint; para7:cuint; para8:cint; para9:cuint; para10:PVisual; - para11:culong; para12:PXSetWindowAttributes):TWindow;cdecl;external libX11; +function XCreateWindow(ADisplay:PDisplay; AParent:TWindow; AX:cint; AY:cint; AWidth:cuint; + AHeight:cuint; ABorderWidth:cuint; ADepth:cint; AClass:cuint; AVisual:PVisual; + AValueMask:culong; AAttributes:PXSetWindowAttributes):TWindow;cdecl;external libX11; function XListInstalledColormaps(para1:PDisplay; para2:TWindow; para3:Pcint):PColormap;cdecl;external libX11; function XListFonts(para1:PDisplay; para2:Pchar; para3:cint; para4:Pcint):PPChar;cdecl;external libX11; function XListFontsWithInfo(para1:PDisplay; para2:Pchar; para3:cint; para4:Pcint; para5:PPXFontStruct):PPChar;cdecl;external libX11; @@ -1332,15 +1332,15 @@ function XInitExtension(para1:PDisplay; para2:Pchar):PXExtCodes;cdecl;external l function XAddExtension(para1:PDisplay):PXExtCodes;cdecl;external libX11; function XFindOnExtensionList(para1:PPXExtData; para2:cint):PXExtData;cdecl;external libX11; function XEHeadOfExtensionList(para1:TXEDataObject):PPXExtData;cdecl;external libX11; -function XRootWindow(para1:PDisplay; para2:cint):TWindow;cdecl;external libX11; -function XDefaultRootWindow(para1:PDisplay):TWindow;cdecl;external libX11; +function XRootWindow(ADisplay:PDisplay; AScreenNumber:cint):TWindow;cdecl;external libX11; +function XDefaultRootWindow(ADisplay:PDisplay):TWindow;cdecl;external libX11; function XRootWindowOfScreen(para1:PScreen):TWindow;cdecl;external libX11; function XDefaultVisual(para1:PDisplay; para2:cint):PVisual;cdecl;external libX11; function XDefaultVisualOfScreen(para1:PScreen):PVisual;cdecl;external libX11; function XDefaultGC(para1:PDisplay; para2:cint):TGC;cdecl;external libX11; function XDefaultGCOfScreen(para1:PScreen):TGC;cdecl;external libX11; -function XBlackPixel(para1:PDisplay; para2:cint):culong;cdecl;external libX11; -function XWhitePixel(para1:PDisplay; para2:cint):culong;cdecl;external libX11; +function XBlackPixel(ADisplay:PDisplay; AScreenNumber:cint):culong;cdecl;external libX11; +function XWhitePixel(ADisplay:PDisplay; AScreenNumber:cint):culong;cdecl;external libX11; function XAllPlanes:culong;cdecl;external libX11; function XBlackPixelOfScreen(para1:PScreen):culong;cdecl;external libX11; function XWhitePixelOfScreen(para1:PScreen):culong;cdecl;external libX11; @@ -1376,7 +1376,7 @@ function XGetCommand(para1:PDisplay; para2:TWindow; para3:PPPchar; para4:Pcint): function XGetWMColormapWindows(para1:PDisplay; para2:TWindow; para3:PPWindow; para4:Pcint):TStatus;cdecl;external libX11; function XSetWMColormapWindows(para1:PDisplay; para2:TWindow; para3:PWindow; para4:cint):TStatus;cdecl;external libX11; procedure XFreeStringList(para1:PPchar);cdecl;external libX11; -function XSetTransientForHint(para1:PDisplay; para2:TWindow; para3:TWindow):cint;cdecl;external libX11; +function XSetTransientForHint(ADisplay:PDisplay; AWindow:TWindow; APropWindow:TWindow):cint;cdecl;external libX11; function XActivateScreenSaver(para1:PDisplay):cint;cdecl;external libX11; function XAddHost(para1:PDisplay; para2:PXHostAddress):cint;cdecl;external libX11; function XAddHosts(para1:PDisplay; para2:PXHostAddress; para3:cint):cint;cdecl;external libX11; @@ -1432,10 +1432,10 @@ function XCopyPlane(para1:PDisplay; para2:TDrawable; para3:TDrawable; para4:TGC; function XDefaultDepth(para1:PDisplay; para2:cint):cint;cdecl;external libX11; function XDefaultDepthOfScreen(para1:PScreen):cint;cdecl;external libX11; function XDefaultScreen(para1:PDisplay):cint;cdecl;external libX11; -function XDefineCursor(para1:PDisplay; para2:TWindow; para3:TCursor):cint;cdecl;external libX11; +function XDefineCursor(ADisplay:PDisplay; AWindow:TWindow; ACursor:TCursor):cint;cdecl;external libX11; function XDeleteProperty(para1:PDisplay; para2:TWindow; para3:TAtom):cint;cdecl;external libX11; -function XDestroyWindow(para1:PDisplay; para2:TWindow):cint;cdecl;external libX11; -function XDestroySubwindows(para1:PDisplay; para2:TWindow):cint;cdecl;external libX11; +function XDestroyWindow(ADisplay:PDisplay; AWindow:TWindow):cint;cdecl;external libX11; +function XDestroySubwindows(ADisplay:PDisplay; AWindow:TWindow):cint;cdecl;external libX11; function XDoesBackingStore(para1:PScreen):cint;cdecl;external libX11; function XDoesSaveUnders(para1:PScreen):TBoolResult;cdecl;external libX11; function XDisableAccessControl(para1:PDisplay):cint;cdecl;external libX11; @@ -1488,7 +1488,7 @@ function XForceScreenSaver(para1:PDisplay; para2:cint):cint;cdecl;external libX1 function XFree(para1:pointer):cint;cdecl;external libX11; function XFreeColormap(para1:PDisplay; para2:TColormap):cint;cdecl;external libX11; function XFreeColors(para1:PDisplay; para2:TColormap; para3:Pculong; para4:cint; para5:culong):cint;cdecl;external libX11; -function XFreeCursor(para1:PDisplay; para2:TCursor):cint;cdecl;external libX11; +function XFreeCursor(ADisplay:PDisplay; ACursor:TCursor):cint;cdecl;external libX11; function XFreeExtensionList(para1:PPchar):cint;cdecl;external libX11; function XFreeFont(para1:PDisplay; para2:PXFontStruct):cint;cdecl;external libX11; function XFreeFontInfo(para1:PPchar; para2:PXFontStruct; para3:cint):cint;cdecl;external libX11; @@ -1535,21 +1535,21 @@ function XInstallColormap(para1:PDisplay; para2:TColormap):cint;cdecl;external l function XKeysymToKeycode(para1:PDisplay; para2:TKeySym):TKeyCode;cdecl;external libX11; function XKillClient(para1:PDisplay; para2:TXID):cint;cdecl;external libX11; function XLookupColor(para1:PDisplay; para2:TColormap; para3:Pchar; para4:PXColor; para5:PXColor):TStatus;cdecl;external libX11; -function XLowerWindow(para1:PDisplay; para2:TWindow):cint;cdecl;external libX11; -function XMapRaised(para1:PDisplay; para2:TWindow):cint;cdecl;external libX11; -function XMapSubwindows(para1:PDisplay; para2:TWindow):cint;cdecl;external libX11; -function XMapWindow(para1:PDisplay; para2:TWindow):cint;cdecl;external libX11; +function XLowerWindow(ADisplay:PDisplay; AWindow:TWindow):cint;cdecl;external libX11; +function XMapRaised(ADisplay:PDisplay; AWindow:TWindow):cint;cdecl;external libX11; +function XMapSubwindows(ADisplay:PDisplay; AWindow:TWindow):cint;cdecl;external libX11; +function XMapWindow(ADisplay:PDisplay; AWindow:TWindow):cint;cdecl;external libX11; function XMaskEvent(para1:PDisplay; para2:clong; para3:PXEvent):cint;cdecl;external libX11; function XMaxCmapsOfScreen(para1:PScreen):cint;cdecl;external libX11; function XMinCmapsOfScreen(para1:PScreen):cint;cdecl;external libX11; -function XMoveResizeWindow(para1:PDisplay; para2:TWindow; para3:cint; para4:cint; para5:cuint; - para6:cuint):cint;cdecl;external libX11; -function XMoveWindow(para1:PDisplay; para2:TWindow; para3:cint; para4:cint):cint;cdecl;external libX11; -function XNextEvent(para1:PDisplay; para2:PXEvent):cint;cdecl;external libX11; +function XMoveResizeWindow(ADisplay:PDisplay; AWindow:TWindow; AX:cint; AY:cint; AWidth:cuint; + AHeight:cuint):cint;cdecl;external libX11; +function XMoveWindow(ADisplay:PDisplay; AWindow:TWindow; AX:cint; AY:cint):cint;cdecl;external libX11; +function XNextEvent(ADisplay:PDisplay; AEvent:PXEvent):cint;cdecl;external libX11; function XNoOp(para1:PDisplay):cint;cdecl;external libX11; function XParseColor(para1:PDisplay; para2:TColormap; para3:Pchar; para4:PXColor):TStatus;cdecl;external libX11; function XParseGeometry(para1:Pchar; para2:Pcint; para3:Pcint; para4:Pcuint; para5:Pcuint):cint;cdecl;external libX11; -function XPeekEvent(para1:PDisplay; para2:PXEvent):cint;cdecl;external libX11; +function XPeekEvent(ADisplay:PDisplay; AEvent:PXEvent):cint;cdecl;external libX11; function XPeekIfEvent(para1:PDisplay; para2:PXEvent; para3:funcifevent; para4:TXPointer):cint;cdecl;external libX11; function XPending(para1:PDisplay):cint;cdecl;external libX11; function XPlanesOfScreen(para1:PScreen):cint;cdecl;external libX11; @@ -1599,7 +1599,7 @@ function XRestackWindows(para1:PDisplay; para2:PWindow; para3:cint):cint;cdecl;e function XRotateBuffers(para1:PDisplay; para2:cint):cint;cdecl;external libX11; function XRotateWindowProperties(para1:PDisplay; para2:TWindow; para3:PAtom; para4:cint; para5:cint):cint;cdecl;external libX11; function XScreenCount(para1:PDisplay):cint;cdecl;external libX11; -function XSelectInput(para1:PDisplay; para2:TWindow; para3:clong):cint;cdecl;external libX11; +function XSelectInput(ADisplay:PDisplay; AWindow:TWindow; AEventMask:clong):cint;cdecl;external libX11; function XSendEvent(para1:PDisplay; para2:TWindow; para3:TBool; para4:clong; para5:PXEvent):TStatus;cdecl;external libX11; function XSetAccessControl(para1:PDisplay; para2:cint):cint;cdecl;external libX11; function XSetArcMode(para1:PDisplay; para2:TGC; para3:cint):cint;cdecl;external libX11; @@ -1652,8 +1652,8 @@ function XTextExtents16(para1:PXFontStruct; para2:PXChar2b; para3:cint; para4:Pc para6:Pcint; para7:PXCharStruct):cint;cdecl;external libX11; function XTextWidth(para1:PXFontStruct; para2:Pchar; para3:cint):cint;cdecl;external libX11; function XTextWidth16(para1:PXFontStruct; para2:PXChar2b; para3:cint):cint;cdecl;external libX11; -function XTranslateCoordinates(para1:PDisplay; para2:TWindow; para3:TWindow; para4:cint; para5:cint; - para6:Pcint; para7:Pcint; para8:PWindow):TBoolResult;cdecl;external libX11; +function XTranslateCoordinates(ADisplay:PDisplay; ASrcWindow:TWindow; ADestWindow:TWindow; ASrcX:cint; ASrcY:cint; + ADestXReturn:Pcint; ADestYReturn:Pcint; AChildReturn:PWindow):TBool;cdecl;external libX11; function XUndefineCursor(para1:PDisplay; para2:TWindow):cint;cdecl;external libX11; function XUngrabButton(para1:PDisplay; para2:cuint; para3:cuint; para4:TWindow):cint;cdecl;external libX11; function XUngrabKey(para1:PDisplay; para2:cint; para3:cuint; para4:TWindow):cint;cdecl;external libX11; @@ -1662,8 +1662,8 @@ function XUngrabPointer(para1:PDisplay; para2:TTime):cint;cdecl;external libX11; function XUngrabServer(para1:PDisplay):cint;cdecl;external libX11; function XUninstallColormap(para1:PDisplay; para2:TColormap):cint;cdecl;external libX11; function XUnloadFont(para1:PDisplay; para2:TFont):cint;cdecl;external libX11; -function XUnmapSubwindows(para1:PDisplay; para2:TWindow):cint;cdecl;external libX11; -function XUnmapWindow(para1:PDisplay; para2:TWindow):cint;cdecl;external libX11; +function XUnmapSubwindows(ADisplay:PDisplay; AWindow:TWindow):cint;cdecl;external libX11; +function XUnmapWindow(ADisplay:PDisplay; AWindow:TWindow):cint;cdecl;external libX11; function XVendorRelease(para1:PDisplay):cint;cdecl;external libX11; function XWarpPointer(para1:PDisplay; para2:TWindow; para3:TWindow; para4:cint; para5:cint; para6:cuint; para7:cuint; para8:cint; para9:cint):cint;cdecl;external libX11; diff --git a/packages/x11/src/xutil.pp b/packages/x11/src/xutil.pp index e46ee0d718..28ae650d23 100644 --- a/packages/x11/src/xutil.pp +++ b/packages/x11/src/xutil.pp @@ -259,9 +259,9 @@ procedure XSetWMClientMachine(para1:PDisplay; para2:TWindow; para3:PXTextPropert function XSetWMHints(para1:PDisplay; para2:TWindow; para3:PXWMHints):cint;cdecl;external libX11; procedure XSetWMIconName(para1:PDisplay; para2:TWindow; para3:PXTextProperty);cdecl;external libX11; procedure XSetWMName(para1:PDisplay; para2:TWindow; para3:PXTextProperty);cdecl;external libX11; -procedure XSetWMNormalHints(para1:PDisplay; para2:TWindow; para3:PXSizeHints);cdecl;external libX11; -procedure XSetWMProperties(para1:PDisplay; para2:TWindow; para3:PXTextProperty; para4:PXTextProperty; para5:PPchar; - para6:cint; para7:PXSizeHints; para8:PXWMHints; para9:PXClassHint);cdecl;external libX11; +procedure XSetWMNormalHints(ADisplay:PDisplay; AWindow:TWindow; AHints:PXSizeHints);cdecl;external libX11; +procedure XSetWMProperties(ADisplay:PDisplay; AWindow:TWindow; AWindowName:PXTextProperty; AIconName:PXTextProperty; AArgv:PPchar; + AArgc:cint; ANormalHints:PXSizeHints; AWMHints:PXWMHints; AClassHints:PXClassHint);cdecl;external libX11; procedure XmbSetWMProperties(para1:PDisplay; para2:TWindow; para3:Pchar; para4:Pchar; para5:PPchar; para6:cint; para7:PXSizeHints; para8:PXWMHints; para9:PXClassHint);cdecl;external libX11; procedure Xutf8SetWMProperties(para1:PDisplay; para2:TWindow; para3:Pchar; para4:Pchar; para5:PPchar; -- cgit v1.2.1