From 886c28224221eae82277497a4dc339e02c8967e6 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 16 Jul 2024 19:19:08 +0200 Subject: [PATCH] swapreq.h: drop SWAPREQ_PROC This macro doesn't do anything more than just making the function declarations a few bytes smaller, but this makes the code harder to read (eg. when just grepping through the code base). Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- include/swapreq.h | 138 ++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 72 deletions(-) diff --git a/include/swapreq.h b/include/swapreq.h index d696aa05e..47d3f7307 100644 --- a/include/swapreq.h +++ b/include/swapreq.h @@ -30,77 +30,71 @@ extern void SwapColorItem(xColorItem * /* pItem */ ); extern void SwapConnClientPrefix(xConnClientPrefix * /* pCCP */ ); -#undef SWAPREQ_PROC - -#define SWAPREQ_PROC(func) extern int func(ClientPtr /* client */) - -SWAPREQ_PROC(SProcAllocColor); -SWAPREQ_PROC(SProcAllocColorCells); -SWAPREQ_PROC(SProcAllocColorPlanes); -SWAPREQ_PROC(SProcAllocNamedColor); -SWAPREQ_PROC(SProcChangeActivePointerGrab); -SWAPREQ_PROC(SProcChangeGC); -SWAPREQ_PROC(SProcChangeHosts); -SWAPREQ_PROC(SProcChangeKeyboardControl); -SWAPREQ_PROC(SProcChangeKeyboardMapping); -SWAPREQ_PROC(SProcChangePointerControl); -SWAPREQ_PROC(SProcChangeProperty); -SWAPREQ_PROC(SProcChangeWindowAttributes); -SWAPREQ_PROC(SProcClearToBackground); -SWAPREQ_PROC(SProcConfigureWindow); -SWAPREQ_PROC(SProcConvertSelection); -SWAPREQ_PROC(SProcCopyArea); -SWAPREQ_PROC(SProcCopyColormapAndFree); -SWAPREQ_PROC(SProcCopyGC); -SWAPREQ_PROC(SProcCopyPlane); -SWAPREQ_PROC(SProcCreateColormap); -SWAPREQ_PROC(SProcCreateCursor); -SWAPREQ_PROC(SProcCreateGC); -SWAPREQ_PROC(SProcCreateGlyphCursor); -SWAPREQ_PROC(SProcCreatePixmap); -SWAPREQ_PROC(SProcCreateWindow); -SWAPREQ_PROC(SProcDeleteProperty); -SWAPREQ_PROC(SProcFillPoly); -SWAPREQ_PROC(SProcFreeColors); -SWAPREQ_PROC(SProcGetImage); -SWAPREQ_PROC(SProcGetMotionEvents); -SWAPREQ_PROC(SProcGetProperty); -SWAPREQ_PROC(SProcGrabButton); -SWAPREQ_PROC(SProcGrabKey); -SWAPREQ_PROC(SProcGrabKeyboard); -SWAPREQ_PROC(SProcGrabPointer); -SWAPREQ_PROC(SProcImageText); -SWAPREQ_PROC(SProcInternAtom); -SWAPREQ_PROC(SProcListFonts); -SWAPREQ_PROC(SProcListFontsWithInfo); -SWAPREQ_PROC(SProcLookupColor); -SWAPREQ_PROC(SProcNoOperation); -SWAPREQ_PROC(SProcOpenFont); -SWAPREQ_PROC(SProcPoly); -SWAPREQ_PROC(SProcPolyText); -SWAPREQ_PROC(SProcPutImage); -SWAPREQ_PROC(SProcQueryBestSize); -SWAPREQ_PROC(SProcQueryColors); -SWAPREQ_PROC(SProcQueryExtension); -SWAPREQ_PROC(SProcRecolorCursor); -SWAPREQ_PROC(SProcReparentWindow); -SWAPREQ_PROC(SProcResourceReq); -SWAPREQ_PROC(SProcRotateProperties); -SWAPREQ_PROC(SProcSendEvent); -SWAPREQ_PROC(SProcSetClipRectangles); -SWAPREQ_PROC(SProcSetDashes); -SWAPREQ_PROC(SProcSetFontPath); -SWAPREQ_PROC(SProcSetInputFocus); -SWAPREQ_PROC(SProcSetScreenSaver); -SWAPREQ_PROC(SProcSetSelectionOwner); -SWAPREQ_PROC(SProcSimpleReq); -SWAPREQ_PROC(SProcStoreColors); -SWAPREQ_PROC(SProcStoreNamedColor); -SWAPREQ_PROC(SProcTranslateCoords); -SWAPREQ_PROC(SProcUngrabButton); -SWAPREQ_PROC(SProcUngrabKey); -SWAPREQ_PROC(SProcWarpPointer); - -#undef SWAPREQ_PROC +int SProcAllocColor(ClientPtr client); +int SProcAllocColorCells(ClientPtr client); +int SProcAllocColorPlanes(ClientPtr client); +int SProcAllocNamedColor(ClientPtr client); +int SProcChangeActivePointerGrab(ClientPtr client); +int SProcChangeGC(ClientPtr client); +int SProcChangeHosts(ClientPtr client); +int SProcChangeKeyboardControl(ClientPtr client); +int SProcChangeKeyboardMapping(ClientPtr client); +int SProcChangePointerControl(ClientPtr client); +int SProcChangeProperty(ClientPtr client); +int SProcChangeWindowAttributes(ClientPtr client); +int SProcClearToBackground(ClientPtr client); +int SProcConfigureWindow(ClientPtr client); +int SProcConvertSelection(ClientPtr client); +int SProcCopyArea(ClientPtr client); +int SProcCopyColormapAndFree(ClientPtr client); +int SProcCopyGC(ClientPtr client); +int SProcCopyPlane(ClientPtr client); +int SProcCreateColormap(ClientPtr client); +int SProcCreateCursor(ClientPtr client); +int SProcCreateGC(ClientPtr client); +int SProcCreateGlyphCursor(ClientPtr client); +int SProcCreatePixmap(ClientPtr client); +int SProcCreateWindow(ClientPtr client); +int SProcDeleteProperty(ClientPtr client); +int SProcFillPoly(ClientPtr client); +int SProcFreeColors(ClientPtr client); +int SProcGetImage(ClientPtr client); +int SProcGetMotionEvents(ClientPtr client); +int SProcGetProperty(ClientPtr client); +int SProcGrabButton(ClientPtr client); +int SProcGrabKey(ClientPtr client); +int SProcGrabKeyboard(ClientPtr client); +int SProcGrabPointer(ClientPtr client); +int SProcImageText(ClientPtr client); +int SProcInternAtom(ClientPtr client); +int SProcListFonts(ClientPtr client); +int SProcListFontsWithInfo(ClientPtr client); +int SProcLookupColor(ClientPtr client); +int SProcNoOperation(ClientPtr client); +int SProcOpenFont(ClientPtr client); +int SProcPoly(ClientPtr client); +int SProcPolyText(ClientPtr client); +int SProcPutImage(ClientPtr client); +int SProcQueryBestSize(ClientPtr client); +int SProcQueryColors(ClientPtr client); +int SProcQueryExtension(ClientPtr client); +int SProcRecolorCursor(ClientPtr client); +int SProcReparentWindow(ClientPtr client); +int SProcResourceReq(ClientPtr client); +int SProcRotateProperties(ClientPtr client); +int SProcSendEvent(ClientPtr client); +int SProcSetClipRectangles(ClientPtr client); +int SProcSetDashes(ClientPtr client); +int SProcSetFontPath(ClientPtr client); +int SProcSetInputFocus(ClientPtr client); +int SProcSetScreenSaver(ClientPtr client); +int SProcSetSelectionOwner(ClientPtr client); +int SProcSimpleReq(ClientPtr client); +int SProcStoreColors(ClientPtr client); +int SProcStoreNamedColor(ClientPtr client); +int SProcTranslateCoords(ClientPtr client); +int SProcUngrabButton(ClientPtr client); +int SProcUngrabKey(ClientPtr client); +int SProcWarpPointer(ClientPtr client); #endif /* SWAPREQ_H */