[PATCH] include: purge foo(int /*bar*/) function declarations.
Peter Hutterer
peter.hutterer at who-t.net
Wed Jan 5 20:29:59 PST 2011
because, really, comments should be for comments.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
include/XIstubs.h | 22 +-
include/callback.h | 18 +-
include/colormap.h | 140 ++++++------
include/cursor.h | 92 ++++----
include/dix.h | 322 ++++++++++++++--------------
include/dixevents.h | 60 +++---
include/dixfont.h | 140 ++++++------
include/dixgrabs.h | 38 ++--
include/dixstruct.h | 34 ++--
include/exevents.h | 222 ++++++++++----------
include/extension.h | 4 +-
include/extinit.h | 6 +-
include/extnsionst.h | 22 +-
include/gc.h | 82 ++++----
include/gcstruct.h | 278 ++++++++++++------------
include/input.h | 220 ++++++++++----------
include/inputstr.h | 10 +-
include/misc.h | 2 +-
include/os.h | 204 +++++++++---------
include/pixmap.h | 26 ++--
include/property.h | 52 +++---
include/resource.h | 90 ++++----
include/screenint.h | 14 +-
include/scrnintstr.h | 360 ++++++++++++++++----------------
include/swaprep.h | 276 ++++++++++++------------
include/swapreq.h | 6 +-
include/window.h | 186 ++++++++--------
include/xkbfile.h | 180 ++++++++--------
include/xkbrules.h | 20 +-
include/xkbsrv.h | 584 +++++++++++++++++++++++++-------------------------
30 files changed, 1855 insertions(+), 1855 deletions(-)
diff --git a/include/XIstubs.h b/include/XIstubs.h
index 6ab82df..dfdc6f1 100644
--- a/include/XIstubs.h
+++ b/include/XIstubs.h
@@ -28,22 +28,22 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
extern _X_EXPORT int
SetDeviceMode (
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- int /* mode */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ int mode);
extern _X_EXPORT int
SetDeviceValuators (
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- int * /* valuators */,
- int /* first_valuator */,
- int /* num_valuators */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ int * valuators,
+ int first_valuator,
+ int num_valuators);
extern _X_EXPORT int
ChangeDeviceControl (
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- xDeviceCtl * /* control */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ xDeviceCtl * control);
#endif /* XI_STUBS_H */
diff --git a/include/callback.h b/include/callback.h
index 9a1da73..6a7bfc7 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -66,18 +66,18 @@ typedef void (*CallbackProcPtr) (
CallbackListPtr *, pointer, pointer);
extern _X_EXPORT Bool AddCallback(
- CallbackListPtr * /*pcbl*/,
- CallbackProcPtr /*callback*/,
- pointer /*data*/);
+ CallbackListPtr * pcbl,
+ CallbackProcPtr callback,
+ pointer data);
extern _X_EXPORT Bool DeleteCallback(
- CallbackListPtr * /*pcbl*/,
- CallbackProcPtr /*callback*/,
- pointer /*data*/);
+ CallbackListPtr * pcbl,
+ CallbackProcPtr callback,
+ pointer data);
extern _X_EXPORT void _CallCallbacks(
- CallbackListPtr * /*pcbl*/,
- pointer /*call_data*/);
+ CallbackListPtr * pcbl,
+ pointer call_data);
static inline void
CallCallbacks(CallbackListPtr *pcbl, pointer call_data)
@@ -87,7 +87,7 @@ CallCallbacks(CallbackListPtr *pcbl, pointer call_data)
}
extern _X_EXPORT void DeleteCallbackList(
- CallbackListPtr * /*pcbl*/);
+ CallbackListPtr * pcbl);
extern _X_EXPORT void InitCallbackManager(void);
diff --git a/include/colormap.h b/include/colormap.h
index 1b15748..a24b4e4 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -77,113 +77,113 @@ typedef struct _CMEntry *EntryPtr;
typedef struct _colorResource *colorResourcePtr;
extern _X_EXPORT int CreateColormap(
- Colormap /*mid*/,
- ScreenPtr /*pScreen*/,
- VisualPtr /*pVisual*/,
- ColormapPtr* /*ppcmap*/,
- int /*alloc*/,
- int /*client*/);
+ Colormap mid,
+ ScreenPtr pScreen,
+ VisualPtr pVisual,
+ ColormapPtr* ppcmap,
+ int alloc,
+ int client);
extern _X_EXPORT int FreeColormap(
- pointer /*pmap*/,
- XID /*mid*/);
+ pointer pmap,
+ XID mid);
extern _X_EXPORT int TellLostMap(
- WindowPtr /*pwin*/,
+ WindowPtr pwin,
pointer /* Colormap *pmid */);
extern _X_EXPORT int TellGainedMap(
- WindowPtr /*pwin*/,
+ WindowPtr pwin,
pointer /* Colormap *pmid */);
extern _X_EXPORT int CopyColormapAndFree(
- Colormap /*mid*/,
- ColormapPtr /*pSrc*/,
- int /*client*/);
+ Colormap mid,
+ ColormapPtr pSrc,
+ int client);
extern _X_EXPORT int AllocColor(
- ColormapPtr /*pmap*/,
- unsigned short* /*pred*/,
- unsigned short* /*pgreen*/,
- unsigned short* /*pblue*/,
- Pixel* /*pPix*/,
- int /*client*/);
+ ColormapPtr pmap,
+ unsigned short* pred,
+ unsigned short* pgreen,
+ unsigned short* pblue,
+ Pixel* pPix,
+ int client);
extern _X_EXPORT void FakeAllocColor(
- ColormapPtr /*pmap*/,
- xColorItem * /*item*/);
+ ColormapPtr pmap,
+ xColorItem * item);
extern _X_EXPORT void FakeFreeColor(
- ColormapPtr /*pmap*/,
- Pixel /*pixel*/);
+ ColormapPtr pmap,
+ Pixel pixel);
typedef int (*ColorCompareProcPtr)(
- EntryPtr /*pent*/,
- xrgb * /*prgb*/);
+ EntryPtr pent,
+ xrgb * prgb);
extern _X_EXPORT int FindColor(
- ColormapPtr /*pmap*/,
- EntryPtr /*pentFirst*/,
- int /*size*/,
- xrgb* /*prgb*/,
- Pixel* /*pPixel*/,
- int /*channel*/,
- int /*client*/,
- ColorCompareProcPtr /*comp*/);
+ ColormapPtr pmap,
+ EntryPtr pentFirst,
+ int size,
+ xrgb* prgb,
+ Pixel* pPixel,
+ int channel,
+ int client,
+ ColorCompareProcPtr comp);
extern _X_EXPORT int QueryColors(
- ColormapPtr /*pmap*/,
- int /*count*/,
- Pixel* /*ppixIn*/,
- xrgb* /*prgbList*/,
+ ColormapPtr pmap,
+ int count,
+ Pixel* ppixIn,
+ xrgb* prgbList,
ClientPtr client);
extern _X_EXPORT int FreeClientPixels(
- pointer /*pcr*/,
- XID /*fakeid*/);
+ pointer pcr,
+ XID fakeid);
extern _X_EXPORT int AllocColorCells(
- int /*client*/,
- ColormapPtr /*pmap*/,
- int /*colors*/,
- int /*planes*/,
- Bool /*contig*/,
- Pixel* /*ppix*/,
- Pixel* /*masks*/);
+ int client,
+ ColormapPtr pmap,
+ int colors,
+ int planes,
+ Bool contig,
+ Pixel* ppix,
+ Pixel* masks);
extern _X_EXPORT int AllocColorPlanes(
- int /*client*/,
- ColormapPtr /*pmap*/,
- int /*colors*/,
- int /*r*/,
- int /*g*/,
- int /*b*/,
- Bool /*contig*/,
- Pixel* /*pixels*/,
- Pixel* /*prmask*/,
- Pixel* /*pgmask*/,
- Pixel* /*pbmask*/);
+ int client,
+ ColormapPtr pmap,
+ int colors,
+ int r,
+ int g,
+ int b,
+ Bool contig,
+ Pixel* pixels,
+ Pixel* prmask,
+ Pixel* pgmask,
+ Pixel* pbmask);
extern _X_EXPORT int FreeColors(
- ColormapPtr /*pmap*/,
- int /*client*/,
- int /*count*/,
- Pixel* /*pixels*/,
- Pixel /*mask*/);
+ ColormapPtr pmap,
+ int client,
+ int count,
+ Pixel* pixels,
+ Pixel mask);
extern _X_EXPORT int StoreColors(
- ColormapPtr /*pmap*/,
- int /*count*/,
- xColorItem* /*defs*/,
+ ColormapPtr pmap,
+ int count,
+ xColorItem* defs,
ClientPtr client);
extern _X_EXPORT int IsMapInstalled(
- Colormap /*map*/,
- WindowPtr /*pWin*/);
+ Colormap map,
+ WindowPtr pWin);
extern _X_EXPORT Bool ResizeVisualArray(
- ScreenPtr /* pScreen */,
- int /* new_vis_count */,
- DepthPtr /* depth */);
+ ScreenPtr pScreen,
+ int new_vis_count,
+ DepthPtr depth);
#endif /* CMAP_H */
diff --git a/include/cursor.h b/include/cursor.h
index 59978d4..af9cf91 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -69,69 +69,69 @@ extern _X_EXPORT DevPrivateKeyRec cursorScreenDevPriv[MAXSCREENS];
extern _X_EXPORT CursorPtr rootCursor;
extern _X_EXPORT int FreeCursor(
- pointer /*pCurs*/,
- XID /*cid*/);
+ pointer pCurs,
+ XID cid);
extern _X_EXPORT int AllocARGBCursor(
- unsigned char* /*psrcbits*/,
- unsigned char* /*pmaskbits*/,
- CARD32* /*argb*/,
- CursorMetricPtr /*cm*/,
- unsigned /*foreRed*/,
- unsigned /*foreGreen*/,
- unsigned /*foreBlue*/,
- unsigned /*backRed*/,
- unsigned /*backGreen*/,
- unsigned /*backBlue*/,
- CursorPtr* /*ppCurs*/,
- ClientPtr /*client*/,
- XID /*cid*/);
+ unsigned char* psrcbits,
+ unsigned char* pmaskbits,
+ CARD32* argb,
+ CursorMetricPtr cm,
+ unsigned foreRed,
+ unsigned foreGreen,
+ unsigned foreBlue,
+ unsigned backRed,
+ unsigned backGreen,
+ unsigned backBlue,
+ CursorPtr* ppCurs,
+ ClientPtr client,
+ XID cid);
extern _X_EXPORT int AllocGlyphCursor(
- Font /*source*/,
- unsigned int /*sourceChar*/,
- Font /*mask*/,
- unsigned int /*maskChar*/,
- unsigned /*foreRed*/,
- unsigned /*foreGreen*/,
- unsigned /*foreBlue*/,
- unsigned /*backRed*/,
- unsigned /*backGreen*/,
- unsigned /*backBlue*/,
- CursorPtr* /*ppCurs*/,
- ClientPtr /*client*/,
- XID /*cid*/);
+ Font source,
+ unsigned int sourceChar,
+ Font mask,
+ unsigned int maskChar,
+ unsigned foreRed,
+ unsigned foreGreen,
+ unsigned foreBlue,
+ unsigned backRed,
+ unsigned backGreen,
+ unsigned backBlue,
+ CursorPtr* ppCurs,
+ ClientPtr client,
+ XID cid);
extern _X_EXPORT CursorPtr CreateRootCursor(
- char* /*pfilename*/,
- unsigned int /*glyph*/);
+ char* pfilename,
+ unsigned int glyph);
extern _X_EXPORT int ServerBitsFromGlyph(
- FontPtr /*pfont*/,
- unsigned int /*ch*/,
- CursorMetricPtr /*cm*/,
- unsigned char ** /*ppbits*/);
+ FontPtr pfont,
+ unsigned int ch,
+ CursorMetricPtr cm,
+ unsigned char ** ppbits);
extern _X_EXPORT Bool CursorMetricsFromGlyph(
- FontPtr /*pfont*/,
- unsigned /*ch*/,
- CursorMetricPtr /*cm*/);
+ FontPtr pfont,
+ unsigned ch,
+ CursorMetricPtr cm);
extern _X_EXPORT void CheckCursorConfinement(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
extern _X_EXPORT void NewCurrentScreen(
- struct _DeviceIntRec* /*pDev*/,
- ScreenPtr /*newScreen*/,
- int /*x*/,
- int /*y*/);
+ struct _DeviceIntRec* pDev,
+ ScreenPtr newScreen,
+ int x,
+ int y);
-extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec* /* pDev */);
+extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec* pDev);
extern _X_EXPORT void GetSpritePosition(
- struct _DeviceIntRec* /* pDev */,
- int * /*px*/,
- int * /*py*/);
+ struct _DeviceIntRec* pDev,
+ int * px,
+ int * py);
#ifdef PANORAMIX
extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec* pDev);
diff --git a/include/dix.h b/include/dix.h
index 7485e8e..10b62c6 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -139,45 +139,45 @@ typedef struct _TimeStamp {
/* dispatch.c */
extern _X_EXPORT void SetInputCheck(
- HWEventQueuePtr /*c0*/,
- HWEventQueuePtr /*c1*/);
+ HWEventQueuePtr c0,
+ HWEventQueuePtr c1);
extern _X_EXPORT void CloseDownClient(
- ClientPtr /*client*/);
+ ClientPtr client);
extern _X_EXPORT void UpdateCurrentTime(void);
extern _X_EXPORT void UpdateCurrentTimeIf(void);
extern _X_EXPORT int dixDestroyPixmap(
- pointer /*value*/,
- XID /*pid*/);
+ pointer value,
+ XID pid);
extern _X_EXPORT void InitClient(
- ClientPtr /*client*/,
- int /*i*/,
- pointer /*ospriv*/);
+ ClientPtr client,
+ int i,
+ pointer ospriv);
extern _X_EXPORT ClientPtr NextAvailableClient(
- pointer /*ospriv*/);
+ pointer ospriv);
extern _X_EXPORT void SendErrorToClient(
- ClientPtr /*client*/,
- unsigned int /*majorCode*/,
- unsigned int /*minorCode*/,
- XID /*resId*/,
- int /*errorCode*/);
+ ClientPtr client,
+ unsigned int majorCode,
+ unsigned int minorCode,
+ XID resId,
+ int errorCode);
extern _X_EXPORT void MarkClientException(
- ClientPtr /*client*/);
+ ClientPtr client);
extern _X_HIDDEN Bool CreateConnectionBlock(void);
/* dixutils.c */
extern _X_EXPORT int CompareISOLatin1Lowered(
- unsigned char * /*a*/,
+ unsigned char * a,
int alen,
- unsigned char * /*b*/,
+ unsigned char * b,
int blen);
extern _X_EXPORT int dixLookupWindow(
@@ -214,22 +214,22 @@ extern _X_EXPORT int dixLookupClient(
extern _X_EXPORT void NoopDDA(void);
extern _X_EXPORT int AlterSaveSetForClient(
- ClientPtr /*client*/,
- WindowPtr /*pWin*/,
- unsigned /*mode*/,
- Bool /*toRoot*/,
- Bool /*map*/);
+ ClientPtr client,
+ WindowPtr pWin,
+ unsigned mode,
+ Bool toRoot,
+ Bool map);
extern _X_EXPORT void DeleteWindowFromAnySaveSet(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
extern _X_EXPORT void BlockHandler(
- pointer /*pTimeout*/,
- pointer /*pReadmask*/);
+ pointer pTimeout,
+ pointer pReadmask);
extern _X_EXPORT void WakeupHandler(
- int /*result*/,
- pointer /*pReadmask*/);
+ int result,
+ pointer pReadmask);
void
EnableLimitedSchedulingLatency(void);
@@ -238,19 +238,19 @@ void
DisableLimitedSchedulingLatency(void);
typedef void (* WakeupHandlerProcPtr)(
- pointer /* blockData */,
- int /* result */,
- pointer /* pReadmask */);
+ pointer blockData,
+ int result,
+ pointer pReadmask);
extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(
- BlockHandlerProcPtr /*blockHandler*/,
- WakeupHandlerProcPtr /*wakeupHandler*/,
- pointer /*blockData*/);
+ BlockHandlerProcPtr blockHandler,
+ WakeupHandlerProcPtr wakeupHandler,
+ pointer blockData);
extern _X_EXPORT void RemoveBlockAndWakeupHandlers(
- BlockHandlerProcPtr /*blockHandler*/,
- WakeupHandlerProcPtr /*wakeupHandler*/,
- pointer /*blockData*/);
+ BlockHandlerProcPtr blockHandler,
+ WakeupHandlerProcPtr wakeupHandler,
+ pointer blockData);
extern _X_EXPORT void InitBlockAndWakeupHandlers(void);
@@ -259,46 +259,46 @@ extern _X_EXPORT void ProcessWorkQueue(void);
extern _X_EXPORT void ProcessWorkQueueZombies(void);
extern _X_EXPORT Bool QueueWorkProc(
- Bool (* /*function*/)(
- ClientPtr /*clientUnused*/,
- pointer /*closure*/),
- ClientPtr /*client*/,
- pointer /*closure*/
+ Bool (* function)(
+ ClientPtr clientUnused,
+ pointer closure),
+ ClientPtr client,
+ pointer closure
);
typedef Bool (* ClientSleepProcPtr)(
- ClientPtr /*client*/,
- pointer /*closure*/);
+ ClientPtr client,
+ pointer closure);
extern _X_EXPORT Bool ClientSleep(
- ClientPtr /*client*/,
- ClientSleepProcPtr /* function */,
- pointer /*closure*/);
+ ClientPtr client,
+ ClientSleepProcPtr function,
+ pointer closure);
#ifndef ___CLIENTSIGNAL_DEFINED___
#define ___CLIENTSIGNAL_DEFINED___
extern _X_EXPORT Bool ClientSignal(
- ClientPtr /*client*/);
+ ClientPtr client);
#endif /* ___CLIENTSIGNAL_DEFINED___ */
extern _X_EXPORT void ClientWakeup(
- ClientPtr /*client*/);
+ ClientPtr client);
extern _X_EXPORT Bool ClientIsAsleep(
- ClientPtr /*client*/);
+ ClientPtr client);
/* atom.c */
extern _X_EXPORT Atom MakeAtom(
- const char * /*string*/,
- unsigned /*len*/,
- Bool /*makeit*/);
+ const char * string,
+ unsigned len,
+ Bool makeit);
extern _X_EXPORT Bool ValidAtom(
- Atom /*atom*/);
+ Atom atom);
extern _X_EXPORT const char *NameForAtom(
- Atom /*atom*/);
+ Atom atom);
extern _X_EXPORT void AtomError(void) _X_NORETURN;
@@ -315,19 +315,19 @@ extern _X_EXPORT void SetVendorString(char *string);
/* events.c */
extern void SetMaskForEvent(
- int /* deviceid */,
- Mask /* mask */,
- int /* event */);
+ int deviceid,
+ Mask mask,
+ int event);
extern _X_EXPORT void ConfineToShape(
- DeviceIntPtr /* pDev */,
- RegionPtr /* shape */,
- int* /* px */,
- int* /* py */);
+ DeviceIntPtr pDev,
+ RegionPtr shape,
+ int* px,
+ int* py);
extern _X_EXPORT Bool IsParent(
- WindowPtr /* maybeparent */,
- WindowPtr /* child */);
+ WindowPtr maybeparent,
+ WindowPtr child);
extern _X_EXPORT WindowPtr GetCurrentRootWindow(DeviceIntPtr pDev);
@@ -337,176 +337,176 @@ extern _X_EXPORT WindowPtr GetSpriteWindow(DeviceIntPtr pDev);
extern _X_EXPORT void NoticeEventTime(InternalEvent *ev);
extern void EnqueueEvent(
- InternalEvent * /* ev */,
- DeviceIntPtr /* device */);
+ InternalEvent * ev,
+ DeviceIntPtr device);
extern void ActivatePointerGrab(
- DeviceIntPtr /* mouse */,
- GrabPtr /* grab */,
- TimeStamp /* time */,
- Bool /* autoGrab */);
+ DeviceIntPtr mouse,
+ GrabPtr grab,
+ TimeStamp time,
+ Bool autoGrab);
extern void DeactivatePointerGrab(
- DeviceIntPtr /* mouse */);
+ DeviceIntPtr mouse);
extern void ActivateKeyboardGrab(
- DeviceIntPtr /* keybd */,
- GrabPtr /* grab */,
- TimeStamp /* time */,
- Bool /* passive */);
+ DeviceIntPtr keybd,
+ GrabPtr grab,
+ TimeStamp time,
+ Bool passive);
extern void DeactivateKeyboardGrab(
- DeviceIntPtr /* keybd */);
+ DeviceIntPtr keybd);
extern BOOL ActivateFocusInGrab(
- DeviceIntPtr /* dev */,
- WindowPtr /* old */,
- WindowPtr /* win */);
+ DeviceIntPtr dev,
+ WindowPtr old,
+ WindowPtr win);
extern void AllowSome(
- ClientPtr /* client */,
- TimeStamp /* time */,
- DeviceIntPtr /* thisDev */,
- int /* newState */);
+ ClientPtr client,
+ TimeStamp time,
+ DeviceIntPtr thisDev,
+ int newState);
extern void ReleaseActiveGrabs(
ClientPtr client);
extern _X_EXPORT int DeliverEventsToWindow(
- DeviceIntPtr /* pWin */,
- WindowPtr /* pWin */,
- xEventPtr /* pEvents */,
- int /* count */,
- Mask /* filter */,
- GrabPtr /* grab */);
+ DeviceIntPtr pDev,
+ WindowPtr pWin,
+ xEventPtr pEvents,
+ int count,
+ Mask filter,
+ GrabPtr grab);
extern int DeliverDeviceEvents(
- WindowPtr /* pWin */,
- InternalEvent* /* event */,
- GrabPtr /* grab */,
- WindowPtr /* stopAt */,
- DeviceIntPtr /* dev */);
+ WindowPtr pWin,
+ InternalEvent* event,
+ GrabPtr grab,
+ WindowPtr stopAt,
+ DeviceIntPtr dev);
extern void InitializeSprite(
- DeviceIntPtr /* pDev */,
- WindowPtr /* pWin */);
+ DeviceIntPtr pDev,
+ WindowPtr pWin);
extern void UpdateSpriteForScreen(
- DeviceIntPtr /* pDev */,
- ScreenPtr /* pScreen */);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen);
extern _X_EXPORT void WindowHasNewCursor(
- WindowPtr /* pWin */);
+ WindowPtr pWin);
extern Bool CheckDeviceGrabs(
- DeviceIntPtr /* device */,
- DeviceEvent* /* event */,
- WindowPtr /* ancestor */);
+ DeviceIntPtr device,
+ DeviceEvent* event,
+ WindowPtr ancestor);
extern void DeliverFocusedEvent(
- DeviceIntPtr /* keybd */,
- InternalEvent* /* event */,
- WindowPtr /* window */);
+ DeviceIntPtr keybd,
+ InternalEvent* event,
+ WindowPtr window);
extern void DeliverGrabbedEvent(
- InternalEvent* /* event */,
- DeviceIntPtr /* thisDev */,
- Bool /* deactivateGrab */);
+ InternalEvent* event,
+ DeviceIntPtr thisDev,
+ Bool deactivateGrab);
extern void FixKeyState(
- DeviceEvent* /* event */,
- DeviceIntPtr /* keybd */);
+ DeviceEvent* event,
+ DeviceIntPtr keybd);
extern void RecalculateDeliverableEvents(
- WindowPtr /* pWin */);
+ WindowPtr pWin);
extern _X_EXPORT int OtherClientGone(
- pointer /* value */,
- XID /* id */);
+ pointer value,
+ XID id);
extern void DoFocusEvents(
- DeviceIntPtr /* dev */,
- WindowPtr /* fromWin */,
- WindowPtr /* toWin */,
- int /* mode */);
+ DeviceIntPtr dev,
+ WindowPtr fromWin,
+ WindowPtr toWin,
+ int mode);
extern int SetInputFocus(
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- Window /* focusID */,
- CARD8 /* revertTo */,
- Time /* ctime */,
- Bool /* followOK */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ Window focusID,
+ CARD8 revertTo,
+ Time ctime,
+ Bool followOK);
extern int GrabDevice(
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- unsigned /* this_mode */,
- unsigned /* other_mode */,
- Window /* grabWindow */,
- unsigned /* ownerEvents */,
- Time /* ctime */,
- GrabMask* /* mask */,
- int /* grabtype */,
- Cursor /* curs */,
- Window /* confineToWin */,
- CARD8 * /* status */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ unsigned this_mode,
+ unsigned other_mode,
+ Window grabWindow,
+ unsigned ownerEvents,
+ Time ctime,
+ GrabMask* mask,
+ int grabtype,
+ Cursor curs,
+ Window confineToWin,
+ CARD8 * status);
extern void InitEvents(void);
extern void CloseDownEvents(void);
extern void DeleteWindowFromAnyEvents(
- WindowPtr /* pWin */,
- Bool /* freeResources */);
+ WindowPtr pWin,
+ Bool freeResources);
extern Mask EventMaskForClient(
- WindowPtr /* pWin */,
- ClientPtr /* client */);
+ WindowPtr pWin,
+ ClientPtr client);
extern _X_EXPORT int DeliverEvents(
- WindowPtr /*pWin*/,
- xEventPtr /*xE*/,
- int /*count*/,
- WindowPtr /*otherParent*/);
+ WindowPtr pWin,
+ xEventPtr xE,
+ int count,
+ WindowPtr otherParent);
extern Bool CheckMotion(
- DeviceEvent* /* ev */,
- DeviceIntPtr /* pDev */);
+ DeviceEvent* ev,
+ DeviceIntPtr pDev);
extern _X_EXPORT void WriteEventsToClient(
- ClientPtr /*pClient*/,
- int /*count*/,
- xEventPtr /*events*/);
+ ClientPtr pClient,
+ int count,
+ xEventPtr events);
extern _X_EXPORT int TryClientEvents(
- ClientPtr /*client*/,
- DeviceIntPtr /* device */,
- xEventPtr /*pEvents*/,
- int /*count*/,
- Mask /*mask*/,
- Mask /*filter*/,
- GrabPtr /*grab*/);
+ ClientPtr client,
+ DeviceIntPtr device,
+ xEventPtr pEvents,
+ int count,
+ Mask mask,
+ Mask filter,
+ GrabPtr grab);
extern _X_EXPORT void WindowsRestructured(void);
extern int SetClientPointer(
- ClientPtr /* client */,
- DeviceIntPtr /* device */);
+ ClientPtr client,
+ DeviceIntPtr device);
extern _X_EXPORT DeviceIntPtr PickPointer(
- ClientPtr /* client */);
+ ClientPtr client);
extern _X_EXPORT DeviceIntPtr PickKeyboard(
- ClientPtr /* client */);
+ ClientPtr client);
extern Bool IsInterferingGrab(
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- xEvent* /* events */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ xEvent* events);
#ifdef PANORAMIX
extern _X_EXPORT void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff);
diff --git a/include/dixevents.h b/include/dixevents.h
index b915345..9641d39 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -26,59 +26,59 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef DIXEVENTS_H
#define DIXEVENTS_H
-extern _X_EXPORT void SetCriticalEvent(int /* event */);
+extern _X_EXPORT void SetCriticalEvent(int event);
-extern _X_EXPORT CursorPtr GetSpriteCursor(DeviceIntPtr /*pDev*/);
+extern _X_EXPORT CursorPtr GetSpriteCursor(DeviceIntPtr pDev);
-extern _X_EXPORT int ProcAllowEvents(ClientPtr /* client */);
+extern _X_EXPORT int ProcAllowEvents(ClientPtr client);
extern _X_EXPORT int MaybeDeliverEventsToClient(
- WindowPtr /* pWin */,
- xEvent * /* pEvents */,
- int /* count */,
- Mask /* filter */,
- ClientPtr /* dontClient */);
+ WindowPtr pWin,
+ xEvent * pEvents,
+ int count,
+ Mask filter,
+ ClientPtr dontClient);
-extern _X_EXPORT int ProcWarpPointer(ClientPtr /* client */);
+extern _X_EXPORT int ProcWarpPointer(ClientPtr client);
extern _X_EXPORT int EventSelectForWindow(
- WindowPtr /* pWin */,
- ClientPtr /* client */,
- Mask /* mask */);
+ WindowPtr pWin,
+ ClientPtr client,
+ Mask mask);
extern _X_EXPORT int EventSuppressForWindow(
- WindowPtr /* pWin */,
- ClientPtr /* client */,
- Mask /* mask */,
- Bool * /* checkOptional */);
+ WindowPtr pWin,
+ ClientPtr client,
+ Mask mask,
+ Bool * checkOptional);
-extern _X_EXPORT int ProcSetInputFocus(ClientPtr /* client */);
+extern _X_EXPORT int ProcSetInputFocus(ClientPtr client);
-extern _X_EXPORT int ProcGetInputFocus(ClientPtr /* client */);
+extern _X_EXPORT int ProcGetInputFocus(ClientPtr client);
-extern _X_EXPORT int ProcGrabPointer(ClientPtr /* client */);
+extern _X_EXPORT int ProcGrabPointer(ClientPtr client);
-extern _X_EXPORT int ProcChangeActivePointerGrab(ClientPtr /* client */);
+extern _X_EXPORT int ProcChangeActivePointerGrab(ClientPtr client);
-extern _X_EXPORT int ProcUngrabPointer(ClientPtr /* client */);
+extern _X_EXPORT int ProcUngrabPointer(ClientPtr client);
-extern _X_EXPORT int ProcGrabKeyboard(ClientPtr /* client */);
+extern _X_EXPORT int ProcGrabKeyboard(ClientPtr client);
-extern _X_EXPORT int ProcUngrabKeyboard(ClientPtr /* client */);
+extern _X_EXPORT int ProcUngrabKeyboard(ClientPtr client);
-extern _X_EXPORT int ProcQueryPointer(ClientPtr /* client */);
+extern _X_EXPORT int ProcQueryPointer(ClientPtr client);
-extern _X_EXPORT int ProcSendEvent(ClientPtr /* client */);
+extern _X_EXPORT int ProcSendEvent(ClientPtr client);
-extern _X_EXPORT int ProcUngrabKey(ClientPtr /* client */);
+extern _X_EXPORT int ProcUngrabKey(ClientPtr client);
-extern _X_EXPORT int ProcGrabKey(ClientPtr /* client */);
+extern _X_EXPORT int ProcGrabKey(ClientPtr client);
-extern _X_EXPORT int ProcGrabButton(ClientPtr /* client */);
+extern _X_EXPORT int ProcGrabButton(ClientPtr client);
-extern _X_EXPORT int ProcUngrabButton(ClientPtr /* client */);
+extern _X_EXPORT int ProcUngrabButton(ClientPtr client);
-extern _X_EXPORT int ProcRecolorCursor(ClientPtr /* client */);
+extern _X_EXPORT int ProcRecolorCursor(ClientPtr client);
#ifdef PANORAMIX
extern _X_EXPORT void PostSyntheticMotion(DeviceIntPtr pDev,
diff --git a/include/dixfont.h b/include/dixfont.h
index 617b94a..4bfb420 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -33,79 +33,79 @@ SOFTWARE.
typedef struct _DIXFontProp *DIXFontPropPtr;
-extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname*/);
+extern _X_EXPORT Bool SetDefaultFont(char * defaultfontname);
-extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe*/);
+extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr fpe);
-extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe*/);
+extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr fpe);
-extern _X_EXPORT void FontWakeup(pointer /*data*/,
- int /*count*/,
- pointer /*LastSelectMask*/);
+extern _X_EXPORT void FontWakeup(pointer data,
+ int count,
+ pointer LastSelectMask);
-extern _X_EXPORT int OpenFont(ClientPtr /*client*/,
- XID /*fid*/,
- Mask /*flags*/,
- unsigned /*lenfname*/,
- char * /*pfontname*/);
+extern _X_EXPORT int OpenFont(ClientPtr client,
+ XID fid,
+ Mask flags,
+ unsigned lenfname,
+ char * pfontname);
-extern _X_EXPORT int CloseFont(pointer /*pfont*/,
- XID /*fid*/);
+extern _X_EXPORT int CloseFont(pointer pfont,
+ XID fid);
typedef struct _xQueryFontReply *xQueryFontReplyPtr;
-extern _X_EXPORT void QueryFont(FontPtr /*pFont*/,
- xQueryFontReplyPtr /*pReply*/,
- int /*nProtoCCIStructs*/);
+extern _X_EXPORT void QueryFont(FontPtr pFont,
+ xQueryFontReplyPtr pReply,
+ int nProtoCCIStructs);
-extern _X_EXPORT int ListFonts(ClientPtr /*client*/,
- unsigned char * /*pattern*/,
- unsigned int /*length*/,
- unsigned int /*max_names*/);
+extern _X_EXPORT int ListFonts(ClientPtr client,
+ unsigned char * pattern,
+ unsigned int length,
+ unsigned int max_names);
extern _X_EXPORT int
-doListFontsWithInfo(ClientPtr /*client*/,
- LFWIclosurePtr /*c*/);
+doListFontsWithInfo(ClientPtr client,
+ LFWIclosurePtr c);
-extern _X_EXPORT int doPolyText(ClientPtr /*client*/,
- PTclosurePtr /*c*/
+extern _X_EXPORT int doPolyText(ClientPtr client,
+ PTclosurePtr c
);
-extern _X_EXPORT int PolyText(ClientPtr /*client*/,
- DrawablePtr /*pDraw*/,
- GCPtr /*pGC*/,
- unsigned char * /*pElt*/,
- unsigned char * /*endReq*/,
- int /*xorg*/,
- int /*yorg*/,
- int /*reqType*/,
- XID /*did*/);
-
-extern _X_EXPORT int doImageText(ClientPtr /*client*/,
- ITclosurePtr /*c*/);
-
-extern _X_EXPORT int ImageText(ClientPtr /*client*/,
- DrawablePtr /*pDraw*/,
- GCPtr /*pGC*/,
- int /*nChars*/,
- unsigned char * /*data*/,
- int /*xorg*/,
- int /*yorg*/,
- int /*reqType*/,
- XID /*did*/);
-
-extern _X_EXPORT int SetFontPath(ClientPtr /*client*/,
- int /*npaths*/,
- unsigned char * /*paths*/);
-
-extern _X_EXPORT int SetDefaultFontPath(char * /*path*/);
+extern _X_EXPORT int PolyText(ClientPtr client,
+ DrawablePtr pDraw,
+ GCPtr pGC,
+ unsigned char * pElt,
+ unsigned char * endReq,
+ int xorg,
+ int yorg,
+ int reqType,
+ XID did);
+
+extern _X_EXPORT int doImageText(ClientPtr client,
+ ITclosurePtr c);
+
+extern _X_EXPORT int ImageText(ClientPtr client,
+ DrawablePtr pDraw,
+ GCPtr pGC,
+ int nChars,
+ unsigned char * data,
+ int xorg,
+ int yorg,
+ int reqType,
+ XID did);
+
+extern _X_EXPORT int SetFontPath(ClientPtr client,
+ int npaths,
+ unsigned char * paths);
+
+extern _X_EXPORT int SetDefaultFontPath(char * path);
extern _X_EXPORT int GetFontPath(ClientPtr client,
int *count,
int *length,
unsigned char **result);
-extern _X_EXPORT void DeleteClientFontStuff(ClientPtr /*client*/);
+extern _X_EXPORT void DeleteClientFontStuff(ClientPtr client);
/* Quartz support on Mac OS X pulls in the QuickDraw
framework whose InitFonts function conflicts here. */
@@ -116,30 +116,30 @@ extern _X_EXPORT void InitFonts(void);
extern _X_EXPORT void FreeFonts(void);
-extern _X_EXPORT FontPtr find_old_font(XID /*id*/);
+extern _X_EXPORT FontPtr find_old_font(XID id);
-extern _X_EXPORT void GetGlyphs(FontPtr /*font*/,
- unsigned long /*count*/,
- unsigned char * /*chars*/,
- FontEncoding /*fontEncoding*/,
- unsigned long * /*glyphcount*/,
- CharInfoPtr * /*glyphs*/);
+extern _X_EXPORT void GetGlyphs(FontPtr font,
+ unsigned long count,
+ unsigned char * chars,
+ FontEncoding fontEncoding,
+ unsigned long * glyphcount,
+ CharInfoPtr * glyphs);
-extern _X_EXPORT void QueryGlyphExtents(FontPtr /*pFont*/,
- CharInfoPtr * /*charinfo*/,
- unsigned long /*count*/,
- ExtentInfoPtr /*info*/);
+extern _X_EXPORT void QueryGlyphExtents(FontPtr pFont,
+ CharInfoPtr * charinfo,
+ unsigned long count,
+ ExtentInfoPtr info);
-extern _X_EXPORT Bool QueryTextExtents(FontPtr /*pFont*/,
- unsigned long /*count*/,
- unsigned char * /*chars*/,
- ExtentInfoPtr /*info*/);
+extern _X_EXPORT Bool QueryTextExtents(FontPtr pFont,
+ unsigned long count,
+ unsigned char * chars,
+ ExtentInfoPtr info);
-extern _X_EXPORT Bool ParseGlyphCachingMode(char * /*str*/);
+extern _X_EXPORT Bool ParseGlyphCachingMode(char * str);
extern _X_EXPORT void InitGlyphCaching(void);
-extern _X_EXPORT void SetGlyphCachingMode(int /*newmode*/);
+extern _X_EXPORT void SetGlyphCachingMode(int newmode);
extern _X_EXPORT void register_fpe_functions(void);
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 3b2a46d..9d51253 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -29,32 +29,32 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
struct _GrabParameters;
extern GrabPtr CreateGrab(
- int /* client */,
- DeviceIntPtr /* device */,
- DeviceIntPtr /* modDevice */,
- WindowPtr /* window */,
- GrabType /* grabtype */,
- GrabMask * /* mask */,
- struct _GrabParameters * /* param */,
- int /* type */,
- KeyCode /* keybut */,
- WindowPtr /* confineTo */,
- CursorPtr /* cursor */);
+ int client,
+ DeviceIntPtr device,
+ DeviceIntPtr modDevice,
+ WindowPtr window,
+ GrabType grabtype,
+ GrabMask * mask,
+ struct _GrabParameters * param,
+ int type,
+ KeyCode keybut,
+ WindowPtr confineTo,
+ CursorPtr cursor);
extern _X_EXPORT int DeletePassiveGrab(
- pointer /* value */,
- XID /* id */);
+ pointer value,
+ XID id);
extern _X_EXPORT Bool GrabMatchesSecond(
- GrabPtr /* pFirstGrab */,
- GrabPtr /* pSecondGrab */,
- Bool /*ignoreDevice*/);
+ GrabPtr pFirstGrab,
+ GrabPtr pSecondGrab,
+ Bool ignoreDevice);
extern _X_EXPORT int AddPassiveGrabToList(
- ClientPtr /* client */,
- GrabPtr /* pGrab */);
+ ClientPtr client,
+ GrabPtr pGrab);
extern _X_EXPORT Bool DeletePassiveGrabFromList(
- GrabPtr /* pMinuendGrab */);
+ GrabPtr pMinuendGrab);
#endif /* DIXGRABS_H */
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 8547b16..ec663cd 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -46,14 +46,14 @@ typedef struct {
} NewClientInfoRec;
typedef void (*ReplySwapPtr) (
- ClientPtr /* pClient */,
- int /* size */,
- void * /* pbuf */);
+ ClientPtr pClient,
+ int size,
+ void * pbuf);
extern _X_EXPORT void ReplyNotSwappd (
- ClientPtr /* pClient */,
- int /* size */,
- void * /* pbuf */) _X_NORETURN;
+ ClientPtr pClient,
+ int size,
+ void * pbuf) _X_NORETURN;
typedef enum {ClientStateInitial,
ClientStateAuthenticating,
@@ -102,7 +102,7 @@ typedef struct _Client {
SaveSetElt *saveSet;
int numSaved;
int (**requestVector) (
- ClientPtr /* pClient */);
+ ClientPtr pClient);
CARD32 req_len; /* length of current request */
Bool big_requests; /* supports large requests */
int priority;
@@ -140,13 +140,13 @@ extern _X_EXPORT void SmartScheduleInit(void);
/* This prototype is used pervasively in Xext, dix */
-#define DISPATCH_PROC(func) int func(ClientPtr /* client */)
+#define DISPATCH_PROC(func) int func(ClientPtr client)
typedef struct _WorkQueue {
struct _WorkQueue *next;
Bool (*function) (
- ClientPtr /* pClient */,
- pointer /* closure */
+ ClientPtr pClient,
+ pointer closure
);
ClientPtr client;
pointer closure;
@@ -156,10 +156,10 @@ extern _X_EXPORT TimeStamp currentTime;
extern _X_EXPORT TimeStamp lastDeviceEventTime;
extern _X_EXPORT int CompareTimeStamps(
- TimeStamp /*a*/,
- TimeStamp /*b*/);
+ TimeStamp a,
+ TimeStamp b);
-extern _X_EXPORT TimeStamp ClientTimeToServerTime(CARD32 /*c*/);
+extern _X_EXPORT TimeStamp ClientTimeToServerTime(CARD32 c);
typedef struct _CallbackRec {
CallbackProcPtr proc;
@@ -177,14 +177,14 @@ typedef struct _CallbackList {
/* proc vectors */
-extern _X_EXPORT int (* InitialVector[3]) (ClientPtr /*client*/);
+extern _X_EXPORT int (* InitialVector[3]) (ClientPtr client);
-extern _X_EXPORT int (* ProcVector[256]) (ClientPtr /*client*/);
+extern _X_EXPORT int (* ProcVector[256]) (ClientPtr client);
-extern _X_EXPORT int (* SwappedProcVector[256]) (ClientPtr /*client*/);
+extern _X_EXPORT int (* SwappedProcVector[256]) (ClientPtr client);
extern _X_EXPORT ReplySwapPtr ReplySwapVector[256];
-extern _X_EXPORT int ProcBadRequest(ClientPtr /*client*/);
+extern _X_EXPORT int ProcBadRequest(ClientPtr client);
#endif /* DIXSTRUCT_H */
diff --git a/include/exevents.h b/include/exevents.h
index dc59430..e978f81 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -38,51 +38,51 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
***************************************************************/
extern _X_EXPORT int InitProximityClassDeviceStruct(
- DeviceIntPtr /* dev */);
+ DeviceIntPtr dev);
extern _X_EXPORT void InitValuatorAxisStruct(
- DeviceIntPtr /* dev */,
- int /* axnum */,
- Atom /* label */,
- int /* minval */,
- int /* maxval */,
- int /* resolution */,
- int /* min_res */,
- int /* max_res */,
- int /* mode */);
+ DeviceIntPtr dev,
+ int axnum,
+ Atom label,
+ int minval,
+ int maxval,
+ int resolution,
+ int min_res,
+ int max_res,
+ int mode);
/* Input device properties */
extern _X_EXPORT void XIDeleteAllDeviceProperties(
- DeviceIntPtr /* device */
+ DeviceIntPtr device
);
extern _X_EXPORT int XIDeleteDeviceProperty(
- DeviceIntPtr /* device */,
- Atom /* property */,
- Bool /* fromClient */
+ DeviceIntPtr device,
+ Atom property,
+ Bool fromClient
);
extern _X_EXPORT int XIChangeDeviceProperty(
- DeviceIntPtr /* dev */,
- Atom /* property */,
- Atom /* type */,
- int /* format*/,
- int /* mode*/,
- unsigned long /* len*/,
- pointer /* value*/,
- Bool /* sendevent*/
+ DeviceIntPtr dev,
+ Atom property,
+ Atom type,
+ int format,
+ int mode,
+ unsigned long len,
+ pointer value,
+ Bool sendevent
);
extern _X_EXPORT int XIGetDeviceProperty(
- DeviceIntPtr /* dev */,
- Atom /* property */,
- XIPropertyValuePtr* /* value */
+ DeviceIntPtr dev,
+ Atom property,
+ XIPropertyValuePtr* value
);
extern _X_EXPORT int XISetDevicePropertyDeletable(
- DeviceIntPtr /* dev */,
- Atom /* property */,
- Bool /* deletable */
+ DeviceIntPtr dev,
+ Atom property,
+ Bool deletable
);
extern _X_EXPORT long XIRegisterPropertyHandler(
@@ -149,148 +149,148 @@ typedef struct _GrabParameters {
extern int
UpdateDeviceState (
- DeviceIntPtr /* device */,
- DeviceEvent* /* xE */);
+ DeviceIntPtr device,
+ DeviceEvent* xE);
extern void
ProcessOtherEvent (
- InternalEvent* /* ev */,
- DeviceIntPtr /* other */);
+ InternalEvent* ev,
+ DeviceIntPtr other);
extern void
DeviceFocusEvent(
- DeviceIntPtr /* dev */,
- int /* type */,
- int /* mode */,
- int /* detail */,
- WindowPtr /* pWin */);
+ DeviceIntPtr dev,
+ int type,
+ int mode,
+ int detail,
+ WindowPtr pWin);
extern int
CheckGrabValues(
- ClientPtr /* client */,
- GrabParameters* /* param */);
+ ClientPtr client,
+ GrabParameters* param);
extern int
GrabButton(
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- DeviceIntPtr /* modifier_device */,
- int /* button */,
- GrabParameters* /* param */,
- GrabType /* grabtype */,
- GrabMask* /* eventMask */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ DeviceIntPtr modifier_device,
+ int button,
+ GrabParameters* param,
+ GrabType grabtype,
+ GrabMask* eventMask);
extern int
GrabKey(
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- DeviceIntPtr /* modifier_device */,
- int /* key */,
- GrabParameters* /* param */,
- GrabType /* grabtype */,
- GrabMask* /* eventMask */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ DeviceIntPtr modifier_device,
+ int key,
+ GrabParameters* param,
+ GrabType grabtype,
+ GrabMask* eventMask);
extern int
GrabWindow(
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- int /* type */,
- GrabParameters* /* param */,
- GrabMask* /* eventMask */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ int type,
+ GrabParameters* param,
+ GrabMask* eventMask);
extern int
SelectForWindow(
- DeviceIntPtr /* dev */,
- WindowPtr /* pWin */,
- ClientPtr /* client */,
- Mask /* mask */,
- Mask /* exclusivemasks */);
+ DeviceIntPtr dev,
+ WindowPtr pWin,
+ ClientPtr client,
+ Mask mask,
+ Mask exclusivemasks);
extern int
AddExtensionClient (
- WindowPtr /* pWin */,
- ClientPtr /* client */,
- Mask /* mask */,
- int /* mskidx */);
+ WindowPtr pWin,
+ ClientPtr client,
+ Mask mask,
+ int mskidx);
extern void
RecalculateDeviceDeliverableEvents(
- WindowPtr /* pWin */);
+ WindowPtr pWin);
extern int
InputClientGone(
- WindowPtr /* pWin */,
- XID /* id */);
+ WindowPtr pWin,
+ XID id);
extern int
SendEvent (
- ClientPtr /* client */,
- DeviceIntPtr /* d */,
- Window /* dest */,
- Bool /* propagate */,
- xEvent * /* ev */,
- Mask /* mask */,
- int /* count */);
+ ClientPtr client,
+ DeviceIntPtr d,
+ Window dest,
+ Bool propagate,
+ xEvent * ev,
+ Mask mask,
+ int count);
extern int
SetButtonMapping (
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- int /* nElts */,
- BYTE * /* map */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ int nElts,
+ BYTE * map);
extern int
ChangeKeyMapping(
- ClientPtr /* client */,
- DeviceIntPtr /* dev */,
- unsigned /* len */,
- int /* type */,
- KeyCode /* firstKeyCode */,
- CARD8 /* keyCodes */,
- CARD8 /* keySymsPerKeyCode */,
- KeySym * /* map */);
+ ClientPtr client,
+ DeviceIntPtr dev,
+ unsigned len,
+ int type,
+ KeyCode firstKeyCode,
+ CARD8 keyCodes,
+ CARD8 keySymsPerKeyCode,
+ KeySym * map);
extern void
DeleteWindowFromAnyExtEvents(
- WindowPtr /* pWin */,
- Bool /* freeResources */);
+ WindowPtr pWin,
+ Bool freeResources);
extern int
MaybeSendDeviceMotionNotifyHint (
- deviceKeyButtonPointer * /* pEvents */,
- Mask /* mask */);
+ deviceKeyButtonPointer * pEvents,
+ Mask mask);
extern void
CheckDeviceGrabAndHintWindow (
- WindowPtr /* pWin */,
- int /* type */,
- deviceKeyButtonPointer * /* xE */,
- GrabPtr /* grab */,
- ClientPtr /* client */,
- Mask /* deliveryMask */);
+ WindowPtr pWin,
+ int type,
+ deviceKeyButtonPointer * xE,
+ GrabPtr grab,
+ ClientPtr client,
+ Mask deliveryMask);
extern void
MaybeStopDeviceHint(
- DeviceIntPtr /* dev */,
- ClientPtr /* client */);
+ DeviceIntPtr dev,
+ ClientPtr client);
extern int
DeviceEventSuppressForWindow(
- WindowPtr /* pWin */,
- ClientPtr /* client */,
- Mask /* mask */,
- int /* maskndx */);
+ WindowPtr pWin,
+ ClientPtr client,
+ Mask mask,
+ int maskndx);
extern void
SendEventToAllWindows(
- DeviceIntPtr /* dev */,
- Mask /* mask */,
- xEvent * /* ev */,
- int /* count */);
+ DeviceIntPtr dev,
+ Mask mask,
+ xEvent * ev,
+ int count);
extern _X_HIDDEN void XI2EventSwap(
- xGenericEvent * /* from */,
- xGenericEvent * /* to */);
+ xGenericEvent * from,
+ xGenericEvent * to);
/* For an event such as MappingNotify which affects client interpretation
* of input events sent by device dev, should we notify the client, or
diff --git a/include/extension.h b/include/extension.h
index 29a11c3..51beb1a 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -50,9 +50,9 @@ SOFTWARE.
_XFUNCPROTOBEGIN
-extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/);
+extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr client);
-extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
+extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr client);
extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable);
diff --git a/include/extinit.h b/include/extinit.h
index c3aa7b6..702a2f7 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -39,9 +39,9 @@ XInputExtensionInit(
extern _X_EXPORT void
AssignTypeAndName (
- DeviceIntPtr /* dev */,
- Atom /* type */,
- char * /* name */
+ DeviceIntPtr dev,
+ Atom type,
+ char * name
);
#endif /* EXTINIT_H */
diff --git a/include/extnsionst.h b/include/extnsionst.h
index bb66dfb..04f2377 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -58,7 +58,7 @@ SOFTWARE.
typedef struct _ExtensionEntry {
int index;
void (* CloseDown)( /* called at server shutdown */
- struct _ExtensionEntry * /* extension */);
+ struct _ExtensionEntry * extension);
char *name; /* extension name */
int base; /* base request number */
int eventBase;
@@ -69,7 +69,7 @@ typedef struct _ExtensionEntry {
char **aliases;
pointer extPrivate;
unsigned short (* MinorOpcode)( /* called for errors */
- ClientPtr /* client */);
+ ClientPtr client);
PrivateRec *devPrivates;
} ExtensionEntry;
@@ -92,18 +92,18 @@ extern _X_EXPORT void NotImplemented ( /* FIXME: this may move to another file..
#define GetGCValue(pGC, GCElement) (pGC->GCElement)
extern _X_EXPORT ExtensionEntry *AddExtension(
- char* /*name*/,
- int /*NumEvents*/,
- int /*NumErrors*/,
- int (* /*MainProc*/)(ClientPtr /*client*/),
- int (* /*SwappedMainProc*/)(ClientPtr /*client*/),
- void (* /*CloseDownProc*/)(ExtensionEntry * /*extension*/),
- unsigned short (* /*MinorOpcodeProc*/)(ClientPtr /*client*/)
+ char* name,
+ int NumEvents,
+ int NumErrors,
+ int (* MainProc)(ClientPtr /*client*/),
+ int (* SwappedMainProc)(ClientPtr /*client*/),
+ void (* CloseDownProc)(ExtensionEntry * /*extension*/),
+ unsigned short (* MinorOpcodeProc)(ClientPtr /*client*/)
);
extern _X_EXPORT Bool AddExtensionAlias(
- char* /*alias*/,
- ExtensionEntry * /*extension*/);
+ char* alias,
+ ExtensionEntry * extension);
extern _X_EXPORT ExtensionEntry *CheckExtension(const char *extname);
extern _X_EXPORT ExtensionEntry *GetExtensionEntry(int major);
diff --git a/include/gc.h b/include/gc.h
index 2079cfa..4937991 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -85,8 +85,8 @@ typedef struct _GC *GCPtr;
typedef struct _GCOps *GCOpsPtr;
extern _X_EXPORT void ValidateGC(
- DrawablePtr /*pDraw*/,
- GCPtr /*pGC*/);
+ DrawablePtr pDraw,
+ GCPtr pGC);
typedef union {
CARD32 val;
@@ -94,70 +94,70 @@ typedef union {
} ChangeGCVal, *ChangeGCValPtr;
extern int ChangeGCXIDs(
- ClientPtr /*client*/,
- GCPtr /*pGC*/,
- BITS32 /*mask*/,
- CARD32 * /*pval*/);
+ ClientPtr client,
+ GCPtr pGC,
+ BITS32 mask,
+ CARD32 * pval);
extern _X_EXPORT int ChangeGC(
- ClientPtr /*client*/,
- GCPtr /*pGC*/,
- BITS32 /*mask*/,
- ChangeGCValPtr /*pCGCV*/);
+ ClientPtr client,
+ GCPtr pGC,
+ BITS32 mask,
+ ChangeGCValPtr pCGCV);
extern _X_EXPORT GCPtr CreateGC(
- DrawablePtr /*pDrawable*/,
- BITS32 /*mask*/,
- XID* /*pval*/,
- int* /*pStatus*/,
- XID /*gcid*/,
- ClientPtr /*client*/);
+ DrawablePtr pDrawable,
+ BITS32 mask,
+ XID* pval,
+ int* pStatus,
+ XID gcid,
+ ClientPtr client);
extern _X_EXPORT int CopyGC(
- GCPtr/*pgcSrc*/,
- GCPtr/*pgcDst*/,
- BITS32 /*mask*/);
+ GCPtr pgcSrc,
+ GCPtr pgcDst,
+ BITS32 mask);
extern _X_EXPORT int FreeGC(
- pointer /*pGC*/,
- XID /*gid*/);
+ pointer pGC,
+ XID gid);
extern _X_EXPORT void FreeGCperDepth(
- int /*screenNum*/);
+ int screenNum);
extern _X_EXPORT Bool CreateGCperDepth(
- int /*screenNum*/);
+ int screenNum);
extern _X_EXPORT Bool CreateDefaultStipple(
- int /*screenNum*/);
+ int screenNum);
extern _X_EXPORT void FreeDefaultStipple(
- int /*screenNum*/);
+ int screenNum);
extern _X_EXPORT int SetDashes(
- GCPtr /*pGC*/,
- unsigned /*offset*/,
- unsigned /*ndash*/,
- unsigned char* /*pdash*/);
+ GCPtr pGC,
+ unsigned offset,
+ unsigned ndash,
+ unsigned char* pdash);
extern _X_EXPORT int VerifyRectOrder(
- int /*nrects*/,
- xRectangle* /*prects*/,
- int /*ordering*/);
+ int nrects,
+ xRectangle* prects,
+ int ordering);
extern _X_EXPORT int SetClipRects(
- GCPtr /*pGC*/,
- int /*xOrigin*/,
- int /*yOrigin*/,
- int /*nrects*/,
- xRectangle* /*prects*/,
- int /*ordering*/);
+ GCPtr pGC,
+ int xOrigin,
+ int yOrigin,
+ int nrects,
+ xRectangle* prects,
+ int ordering);
extern _X_EXPORT GCPtr GetScratchGC(
- unsigned /*depth*/,
- ScreenPtr /*pScreen*/);
+ unsigned depth,
+ ScreenPtr pScreen);
extern _X_EXPORT void FreeScratchGC(
- GCPtr /*pGC*/);
+ GCPtr pGC);
#endif /* GC_H */
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 4fea02c..fcc7ff0 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -67,34 +67,34 @@ SOFTWARE.
typedef struct _GCFuncs {
void (* ValidateGC)(
- GCPtr /*pGC*/,
- unsigned long /*stateChanges*/,
- DrawablePtr /*pDrawable*/);
+ GCPtr pGC,
+ unsigned long stateChanges,
+ DrawablePtr pDrawable);
void (* ChangeGC)(
- GCPtr /*pGC*/,
- unsigned long /*mask*/);
+ GCPtr pGC,
+ unsigned long mask);
void (* CopyGC)(
- GCPtr /*pGCSrc*/,
- unsigned long /*mask*/,
- GCPtr /*pGCDst*/);
+ GCPtr pGCSrc,
+ unsigned long mask,
+ GCPtr pGCDst);
void (* DestroyGC)(
- GCPtr /*pGC*/);
+ GCPtr pGC);
void (* ChangeClip)(
- GCPtr /*pGC*/,
- int /*type*/,
- pointer /*pvalue*/,
- int /*nrects*/);
+ GCPtr pGC,
+ int type,
+ pointer pvalue,
+ int nrects);
void (* DestroyClip)(
- GCPtr /*pGC*/);
+ GCPtr pGC);
void (* CopyClip)(
- GCPtr /*pgcDst*/,
- GCPtr /*pgcSrc*/);
+ GCPtr pgcDst,
+ GCPtr pgcSrc);
} GCFuncs;
/*
@@ -103,166 +103,166 @@ typedef struct _GCFuncs {
typedef struct _GCOps {
void (* FillSpans)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*nInit*/,
- DDXPointPtr /*pptInit*/,
- int * /*pwidthInit*/,
- int /*fSorted*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int nInit,
+ DDXPointPtr pptInit,
+ int * pwidthInit,
+ int fSorted);
void (* SetSpans)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- char * /*psrc*/,
- DDXPointPtr /*ppt*/,
- int * /*pwidth*/,
- int /*nspans*/,
- int /*fSorted*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ char * psrc,
+ DDXPointPtr ppt,
+ int * pwidth,
+ int nspans,
+ int fSorted);
void (* PutImage)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*depth*/,
- int /*x*/,
- int /*y*/,
- int /*w*/,
- int /*h*/,
- int /*leftPad*/,
- int /*format*/,
- char * /*pBits*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int depth,
+ int x,
+ int y,
+ int w,
+ int h,
+ int leftPad,
+ int format,
+ char * pBits);
RegionPtr (* CopyArea)(
- DrawablePtr /*pSrc*/,
- DrawablePtr /*pDst*/,
- GCPtr /*pGC*/,
- int /*srcx*/,
- int /*srcy*/,
- int /*w*/,
- int /*h*/,
- int /*dstx*/,
- int /*dsty*/);
+ DrawablePtr pSrc,
+ DrawablePtr pDst,
+ GCPtr pGC,
+ int srcx,
+ int srcy,
+ int w,
+ int h,
+ int dstx,
+ int dsty);
RegionPtr (* CopyPlane)(
- DrawablePtr /*pSrcDrawable*/,
- DrawablePtr /*pDstDrawable*/,
- GCPtr /*pGC*/,
- int /*srcx*/,
- int /*srcy*/,
- int /*width*/,
- int /*height*/,
- int /*dstx*/,
- int /*dsty*/,
- unsigned long /*bitPlane*/);
+ DrawablePtr pSrcDrawable,
+ DrawablePtr pDstDrawable,
+ GCPtr pGC,
+ int srcx,
+ int srcy,
+ int width,
+ int height,
+ int dstx,
+ int dsty,
+ unsigned long bitPlane);
void (* PolyPoint)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*mode*/,
- int /*npt*/,
- DDXPointPtr /*pptInit*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int mode,
+ int npt,
+ DDXPointPtr pptInit);
void (* Polylines)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*mode*/,
- int /*npt*/,
- DDXPointPtr /*pptInit*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int mode,
+ int npt,
+ DDXPointPtr pptInit);
void (* PolySegment)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*nseg*/,
- xSegment * /*pSegs*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int nseg,
+ xSegment * pSegs);
void (* PolyRectangle)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*nrects*/,
- xRectangle * /*pRects*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int nrects,
+ xRectangle * pRects);
void (* PolyArc)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*narcs*/,
- xArc * /*parcs*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int narcs,
+ xArc * parcs);
void (* FillPolygon)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*shape*/,
- int /*mode*/,
- int /*count*/,
- DDXPointPtr /*pPts*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int shape,
+ int mode,
+ int count,
+ DDXPointPtr pPts);
void (* PolyFillRect)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*nrectFill*/,
- xRectangle * /*prectInit*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int nrectFill,
+ xRectangle * prectInit);
void (* PolyFillArc)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*narcs*/,
- xArc * /*parcs*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int narcs,
+ xArc * parcs);
int (* PolyText8)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*x*/,
- int /*y*/,
- int /*count*/,
- char * /*chars*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int x,
+ int y,
+ int count,
+ char * chars);
int (* PolyText16)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*x*/,
- int /*y*/,
- int /*count*/,
- unsigned short * /*chars*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int x,
+ int y,
+ int count,
+ unsigned short * chars);
void (* ImageText8)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*x*/,
- int /*y*/,
- int /*count*/,
- char * /*chars*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int x,
+ int y,
+ int count,
+ char * chars);
void (* ImageText16)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*x*/,
- int /*y*/,
- int /*count*/,
- unsigned short * /*chars*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int x,
+ int y,
+ int count,
+ unsigned short * chars);
void (* ImageGlyphBlt)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*x*/,
- int /*y*/,
- unsigned int /*nglyph*/,
- CharInfoPtr * /*ppci*/,
- pointer /*pglyphBase*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int x,
+ int y,
+ unsigned int nglyph,
+ CharInfoPtr * ppci,
+ pointer pglyphBase);
void (* PolyGlyphBlt)(
- DrawablePtr /*pDrawable*/,
- GCPtr /*pGC*/,
- int /*x*/,
- int /*y*/,
- unsigned int /*nglyph*/,
- CharInfoPtr * /*ppci*/,
- pointer /*pglyphBase*/);
+ DrawablePtr pDrawable,
+ GCPtr pGC,
+ int x,
+ int y,
+ unsigned int nglyph,
+ CharInfoPtr * ppci,
+ pointer pglyphBase);
void (* PushPixels)(
- GCPtr /*pGC*/,
- PixmapPtr /*pBitMap*/,
- DrawablePtr /*pDst*/,
- int /*w*/,
- int /*h*/,
- int /*x*/,
- int /*y*/);
+ GCPtr pGC,
+ PixmapPtr pBitMap,
+ DrawablePtr pDst,
+ int w,
+ int h,
+ int x,
+ int y);
} GCOps;
/* there is padding in the bit fields because the Sun compiler doesn't
diff --git a/include/input.h b/include/input.h
index 412150c..adcd142 100644
--- a/include/input.h
+++ b/include/input.h
@@ -120,34 +120,34 @@ extern EventListPtr InputEventList;
extern int InputEventListLen;
typedef int (*DeviceProc)(
- DeviceIntPtr /*device*/,
- int /*what*/);
+ DeviceIntPtr device,
+ int what);
typedef void (*ProcessInputProc)(
- InternalEvent * /*event*/,
- DeviceIntPtr /*device*/);
+ InternalEvent * event,
+ DeviceIntPtr device);
typedef Bool (*DeviceHandleProc)(
- DeviceIntPtr /*device*/,
- void* /*data*/
+ DeviceIntPtr device,
+ void* data
);
typedef void (*DeviceUnwrapProc)(
- DeviceIntPtr /*device*/,
- DeviceHandleProc /*proc*/,
- void* /*data*/
+ DeviceIntPtr device,
+ DeviceHandleProc proc,
+ void* data
);
/* pointer acceleration handling */
typedef void (*PointerAccelSchemeProc)(
- DeviceIntPtr /*pDev*/,
- int /*first_valuator*/,
- int /*num_valuators*/,
- int* /*valuators*/,
- int /*evtime*/);
+ DeviceIntPtr pDev,
+ int first_valuator,
+ int num_valuators,
+ int* valuators,
+ int evtime);
typedef void (*DeviceCallbackProc)(
- DeviceIntPtr /*pDev*/);
+ DeviceIntPtr pDev);
typedef struct _DeviceRec {
pointer devicePrivate;
@@ -248,21 +248,21 @@ extern void InitCoreDevices(void);
extern void InitXTestDevices(void);
extern _X_EXPORT DeviceIntPtr AddInputDevice(
- ClientPtr /*client*/,
- DeviceProc /*deviceProc*/,
- Bool /*autoStart*/);
+ ClientPtr client,
+ DeviceProc deviceProc,
+ Bool autoStart);
extern _X_EXPORT Bool EnableDevice(
- DeviceIntPtr /*device*/,
- BOOL /* sendevent */);
+ DeviceIntPtr device,
+ BOOL sendevent);
extern _X_EXPORT Bool ActivateDevice(
- DeviceIntPtr /*device*/,
- BOOL /* sendevent */);
+ DeviceIntPtr device,
+ BOOL sendevent);
extern _X_EXPORT Bool DisableDevice(
- DeviceIntPtr /*device*/,
- BOOL /* sendevent */);
+ DeviceIntPtr device,
+ BOOL sendevent);
extern int InitAndStartDevices(void);
@@ -271,158 +271,158 @@ extern void CloseDownDevices(void);
extern void UndisplayDevices(void);
extern _X_EXPORT int RemoveDevice(
- DeviceIntPtr /*dev*/,
- BOOL /* sendevent */);
+ DeviceIntPtr dev,
+ BOOL sendevent);
extern _X_EXPORT int NumMotionEvents(void);
extern _X_EXPORT int dixLookupDevice(
- DeviceIntPtr * /* dev */,
- int /* id */,
- ClientPtr /* client */,
- Mask /* access_mode */);
+ DeviceIntPtr * dev,
+ int id,
+ ClientPtr client,
+ Mask access_mode);
extern _X_EXPORT void QueryMinMaxKeyCodes(
- KeyCode* /*minCode*/,
- KeyCode* /*maxCode*/);
+ KeyCode* minCode,
+ KeyCode* maxCode);
extern _X_EXPORT Bool SetKeySymsMap(
- KeySymsPtr /*dst*/,
- KeySymsPtr /*src*/);
+ KeySymsPtr dst,
+ KeySymsPtr src);
extern _X_EXPORT Bool InitButtonClassDeviceStruct(
- DeviceIntPtr /*device*/,
- int /*numButtons*/,
- Atom* /* labels */,
- CARD8* /*map*/);
+ DeviceIntPtr device,
+ int numButtons,
+ Atom* labels,
+ CARD8* map);
extern _X_EXPORT Bool InitValuatorClassDeviceStruct(
- DeviceIntPtr /*device*/,
- int /*numAxes*/,
- Atom* /* labels */,
- int /*numMotionEvents*/,
- int /*mode*/);
+ DeviceIntPtr device,
+ int numAxes,
+ Atom* labels,
+ int numMotionEvents,
+ int mode);
extern _X_EXPORT Bool InitPointerAccelerationScheme(
- DeviceIntPtr /*dev*/,
- int /*scheme*/);
+ DeviceIntPtr dev,
+ int scheme);
extern _X_EXPORT Bool InitAbsoluteClassDeviceStruct(
- DeviceIntPtr /*device*/);
+ DeviceIntPtr device);
extern _X_EXPORT Bool InitFocusClassDeviceStruct(
- DeviceIntPtr /*device*/);
+ DeviceIntPtr device);
typedef void (*BellProcPtr)(
- int /*percent*/,
- DeviceIntPtr /*device*/,
- pointer /*ctrl*/,
+ int percent,
+ DeviceIntPtr device,
+ pointer ctrl,
int);
typedef void (*KbdCtrlProcPtr)(
- DeviceIntPtr /*device*/,
- KeybdCtrl * /*ctrl*/);
+ DeviceIntPtr device,
+ KeybdCtrl * ctrl);
typedef void (*PtrCtrlProcPtr)(
- DeviceIntPtr /*device*/,
- PtrCtrl * /*ctrl*/);
+ DeviceIntPtr device,
+ PtrCtrl * ctrl);
extern _X_EXPORT Bool InitPtrFeedbackClassDeviceStruct(
- DeviceIntPtr /*device*/,
- PtrCtrlProcPtr /*controlProc*/);
+ DeviceIntPtr device,
+ PtrCtrlProcPtr controlProc);
typedef void (*StringCtrlProcPtr)(
- DeviceIntPtr /*device*/,
- StringCtrl * /*ctrl*/);
+ DeviceIntPtr device,
+ StringCtrl * ctrl);
extern _X_EXPORT Bool InitStringFeedbackClassDeviceStruct(
- DeviceIntPtr /*device*/,
- StringCtrlProcPtr /*controlProc*/,
- int /*max_symbols*/,
- int /*num_symbols_supported*/,
- KeySym* /*symbols*/);
+ DeviceIntPtr device,
+ StringCtrlProcPtr controlProc,
+ int max_symbols,
+ int num_symbols_supported,
+ KeySym* symbols);
typedef void (*BellCtrlProcPtr)(
- DeviceIntPtr /*device*/,
- BellCtrl * /*ctrl*/);
+ DeviceIntPtr device,
+ BellCtrl * ctrl);
extern _X_EXPORT Bool InitBellFeedbackClassDeviceStruct(
- DeviceIntPtr /*device*/,
- BellProcPtr /*bellProc*/,
- BellCtrlProcPtr /*controlProc*/);
+ DeviceIntPtr device,
+ BellProcPtr bellProc,
+ BellCtrlProcPtr controlProc);
typedef void (*LedCtrlProcPtr)(
- DeviceIntPtr /*device*/,
- LedCtrl * /*ctrl*/);
+ DeviceIntPtr device,
+ LedCtrl * ctrl);
extern _X_EXPORT Bool InitLedFeedbackClassDeviceStruct(
- DeviceIntPtr /*device*/,
- LedCtrlProcPtr /*controlProc*/);
+ DeviceIntPtr device,
+ LedCtrlProcPtr controlProc);
typedef void (*IntegerCtrlProcPtr)(
- DeviceIntPtr /*device*/,
- IntegerCtrl * /*ctrl*/);
+ DeviceIntPtr device,
+ IntegerCtrl * ctrl);
extern _X_EXPORT Bool InitIntegerFeedbackClassDeviceStruct(
- DeviceIntPtr /*device*/,
- IntegerCtrlProcPtr /*controlProc*/);
+ DeviceIntPtr device,
+ IntegerCtrlProcPtr controlProc);
extern _X_EXPORT Bool InitPointerDeviceStruct(
- DevicePtr /*device*/,
- CARD8* /*map*/,
- int /*numButtons*/,
- Atom* /* btn_labels */,
- PtrCtrlProcPtr /*controlProc*/,
- int /*numMotionEvents*/,
- int /*numAxes*/,
- Atom* /* axes_labels */);
+ DevicePtr device,
+ CARD8* map,
+ int numButtons,
+ Atom* btn_labels,
+ PtrCtrlProcPtr controlProc,
+ int numMotionEvents,
+ int numAxes,
+ Atom* axes_labels);
extern _X_EXPORT Bool InitKeyboardDeviceStruct(
- DeviceIntPtr /*device*/,
- XkbRMLVOSet * /*rmlvo*/,
- BellProcPtr /*bellProc*/,
- KbdCtrlProcPtr /*controlProc*/);
+ DeviceIntPtr device,
+ XkbRMLVOSet * rmlvo,
+ BellProcPtr bellProc,
+ KbdCtrlProcPtr controlProc);
extern int ApplyPointerMapping(
- DeviceIntPtr /* pDev */,
- CARD8 * /* map */,
- int /* len */,
- ClientPtr /* client */);
+ DeviceIntPtr pDev,
+ CARD8 * map,
+ int len,
+ ClientPtr client);
extern Bool BadDeviceMap(
- BYTE* /*buff*/,
- int /*length*/,
- unsigned /*low*/,
- unsigned /*high*/,
- XID* /*errval*/);
+ BYTE* buff,
+ int length,
+ unsigned low,
+ unsigned high,
+ XID* errval);
extern void NoteLedState(
- DeviceIntPtr /*keybd*/,
- int /*led*/,
- Bool /*on*/);
+ DeviceIntPtr keybd,
+ int led,
+ Bool on);
extern void MaybeStopHint(
- DeviceIntPtr /*device*/,
- ClientPtr /*client*/);
+ DeviceIntPtr device,
+ ClientPtr client);
extern void ProcessPointerEvent(
- InternalEvent* /* ev */,
- DeviceIntPtr /*mouse*/);
+ InternalEvent* ev,
+ DeviceIntPtr mouse);
extern void ProcessKeyboardEvent(
- InternalEvent* /*ev*/,
- DeviceIntPtr /*keybd*/);
+ InternalEvent* ev,
+ DeviceIntPtr keybd);
extern Bool LegalModifier(
- unsigned int /*key*/,
- DeviceIntPtr /*pDev*/);
+ unsigned int key,
+ DeviceIntPtr pDev);
extern _X_EXPORT void ProcessInputEvents(void);
extern _X_EXPORT void InitInput(
- int /*argc*/,
- char ** /*argv*/);
+ int argc,
+ char ** argv);
extern _X_EXPORT void CloseInput(void);
extern _X_EXPORT int GetMaximumEventsNum(void);
diff --git a/include/inputstr.h b/include/inputstr.h
index 44de9c4..adb55bd 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -457,12 +457,12 @@ typedef struct _GrabInfoRec {
GrabPtr grab;
CARD8 activatingKey;
void (*ActivateGrab) (
- DeviceIntPtr /*device*/,
- GrabPtr /*grab*/,
- TimeStamp /*time*/,
- Bool /*autoGrab*/);
+ DeviceIntPtr device,
+ GrabPtr grab,
+ TimeStamp time,
+ Bool autoGrab);
void (*DeactivateGrab)(
- DeviceIntPtr /*device*/);
+ DeviceIntPtr device);
struct {
Bool frozen;
int state;
diff --git a/include/misc.h b/include/misc.h
index 62d813e..f931b90 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -268,7 +268,7 @@ extern _X_EXPORT void SwapShorts(
extern _X_EXPORT void MakePredeclaredAtoms(void);
extern _X_EXPORT int Ones(
- unsigned long /*mask*/);
+ unsigned long mask);
typedef struct _xPoint *DDXPointPtr;
typedef struct pixman_box16 *BoxPtr;
diff --git a/include/os.h b/include/os.h
index d747040..69c9249 100644
--- a/include/os.h
+++ b/include/os.h
@@ -93,17 +93,17 @@ extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args);
#endif
extern _X_EXPORT int WaitForSomething(
- int* /*pClientsReady*/
+ int* pClientsReady
);
-extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client*/);
+extern _X_EXPORT int ReadRequestFromClient(ClientPtr client);
extern _X_EXPORT Bool InsertFakeRequest(
- ClientPtr /*client*/,
- char* /*data*/,
- int /*count*/);
+ ClientPtr client,
+ char* data,
+ int count);
-extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client*/);
+extern _X_EXPORT void ResetCurrentRequest(ClientPtr client);
extern _X_EXPORT void FlushAllOutput(void);
@@ -111,7 +111,7 @@ extern _X_EXPORT void FlushIfCriticalOutputPending(void);
extern _X_EXPORT void SetCriticalOutputPending(void);
-extern _X_EXPORT int WriteToClient(ClientPtr /*who*/, int /*count*/, const void* /*buf*/);
+extern _X_EXPORT int WriteToClient(ClientPtr who, int count, const void* buf);
extern _X_EXPORT void ResetOsBuffers(void);
@@ -125,93 +125,93 @@ extern _X_EXPORT void ResetWellKnownSockets(void);
extern _X_EXPORT void CloseWellKnownConnections(void);
-extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/);
+extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr client);
extern _X_EXPORT char *ClientAuthorized(
- ClientPtr /*client*/,
- unsigned int /*proto_n*/,
- char* /*auth_proto*/,
- unsigned int /*string_n*/,
- char* /*auth_string*/);
+ ClientPtr client,
+ unsigned int proto_n,
+ char* auth_proto,
+ unsigned int string_n,
+ char* auth_string);
extern _X_EXPORT Bool EstablishNewConnections(
- ClientPtr /*clientUnused*/,
- pointer /*closure*/);
+ ClientPtr clientUnused,
+ pointer closure);
extern _X_EXPORT void CheckConnections(void);
-extern _X_EXPORT void CloseDownConnection(ClientPtr /*client*/);
+extern _X_EXPORT void CloseDownConnection(ClientPtr client);
-extern _X_EXPORT void AddGeneralSocket(int /*fd*/);
+extern _X_EXPORT void AddGeneralSocket(int fd);
-extern _X_EXPORT void RemoveGeneralSocket(int /*fd*/);
+extern _X_EXPORT void RemoveGeneralSocket(int fd);
-extern _X_EXPORT void AddEnabledDevice(int /*fd*/);
+extern _X_EXPORT void AddEnabledDevice(int fd);
-extern _X_EXPORT void RemoveEnabledDevice(int /*fd*/);
+extern _X_EXPORT void RemoveEnabledDevice(int fd);
-extern _X_EXPORT int OnlyListenToOneClient(ClientPtr /*client*/);
+extern _X_EXPORT int OnlyListenToOneClient(ClientPtr client);
extern _X_EXPORT void ListenToAllClients(void);
-extern _X_EXPORT void IgnoreClient(ClientPtr /*client*/);
+extern _X_EXPORT void IgnoreClient(ClientPtr client);
-extern _X_EXPORT void AttendClient(ClientPtr /*client*/);
+extern _X_EXPORT void AttendClient(ClientPtr client);
-extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client*/);
+extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr client);
-extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client*/);
+extern _X_EXPORT void MakeClientGrabPervious(ClientPtr client);
#ifdef XQUARTZ
-extern void ListenOnOpenFD(int /* fd */, int /* noxauth */);
+extern void ListenOnOpenFD(int fd, int noxauth);
#endif
extern _X_EXPORT CARD32 GetTimeInMillis(void);
extern _X_EXPORT void AdjustWaitForDelay(
- pointer /*waitTime*/,
- unsigned long /*newdelay*/);
+ pointer waitTime,
+ unsigned long newdelay);
typedef struct _OsTimerRec *OsTimerPtr;
typedef CARD32 (*OsTimerCallback)(
- OsTimerPtr /* timer */,
- CARD32 /* time */,
- pointer /* arg */);
+ OsTimerPtr timer,
+ CARD32 time,
+ pointer arg);
extern _X_EXPORT void TimerInit(void);
-extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */);
+extern _X_EXPORT Bool TimerForce(OsTimerPtr timer);
#define TimerAbsolute (1<<0)
#define TimerForceOld (1<<1)
extern _X_EXPORT OsTimerPtr TimerSet(
- OsTimerPtr /* timer */,
- int /* flags */,
- CARD32 /* millis */,
- OsTimerCallback /* func */,
- pointer /* arg */);
+ OsTimerPtr timer,
+ int flags,
+ CARD32 millis,
+ OsTimerCallback func,
+ pointer arg);
extern _X_EXPORT void TimerCheck(void);
-extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */);
-extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */);
+extern _X_EXPORT void TimerCancel(OsTimerPtr pTimer);
+extern _X_EXPORT void TimerFree(OsTimerPtr pTimer);
extern _X_EXPORT void SetScreenSaverTimer(void);
extern _X_EXPORT void FreeScreenSaverTimer(void);
-extern _X_EXPORT void AutoResetServer(int /*sig*/);
+extern _X_EXPORT void AutoResetServer(int sig);
-extern _X_EXPORT void GiveUp(int /*sig*/);
+extern _X_EXPORT void GiveUp(int sig);
extern _X_EXPORT void UseMsg(void);
-extern _X_EXPORT void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
+extern _X_EXPORT void ProcessCommandLine(int argc, char* /*argv*/[]);
extern _X_EXPORT int set_font_authorizations(
- char ** /* authorizations */,
- int * /*authlen */,
- pointer /* client */);
+ char ** authorizations,
+ int * authlen,
+ pointer client);
#ifndef _HAVE_XALLOC_DECLS
#define _HAVE_XALLOC_DECLS
@@ -219,20 +219,20 @@ extern _X_EXPORT int set_font_authorizations(
/*
* Use malloc(3) instead.
*/
-extern _X_EXPORT void *Xalloc(unsigned long /*amount*/) _X_DEPRECATED;
+extern _X_EXPORT void *Xalloc(unsigned long amount) _X_DEPRECATED;
/*
* Use calloc(3) instead
*/
-extern _X_EXPORT void *Xcalloc(unsigned long /*amount*/) _X_DEPRECATED;
+extern _X_EXPORT void *Xcalloc(unsigned long amount) _X_DEPRECATED;
/*
* Use realloc(3) instead
*/
-extern _X_EXPORT void *Xrealloc(void * /*ptr*/, unsigned long /*amount*/)
+extern _X_EXPORT void *Xrealloc(void * ptr, unsigned long amount)
_X_DEPRECATED;
/*
* Use free(3) instead
*/
-extern _X_EXPORT void Xfree(void * /*ptr*/) _X_DEPRECATED;
+extern _X_EXPORT void Xfree(void * ptr) _X_DEPRECATED;
#endif
@@ -240,17 +240,17 @@ extern _X_EXPORT void Xfree(void * /*ptr*/) _X_DEPRECATED;
* This function malloc(3)s buffer, terminating the server if there is not
* enough memory.
*/
-extern _X_EXPORT void *XNFalloc(unsigned long /*amount*/);
+extern _X_EXPORT void *XNFalloc(unsigned long amount);
/*
* This function calloc(3)s buffer, terminating the server if there is not
* enough memory.
*/
-extern _X_EXPORT void *XNFcalloc(unsigned long /*amount*/);
+extern _X_EXPORT void *XNFcalloc(unsigned long amount);
/*
* This function realloc(3)s passed buffer, terminating the server if there is
* not enough memory.
*/
-extern _X_EXPORT void *XNFrealloc(void * /*ptr*/, unsigned long /*amount*/);
+extern _X_EXPORT void *XNFrealloc(void * ptr, unsigned long amount);
/*
* This function strdup(3)s passed string. The only difference from the library
@@ -273,10 +273,10 @@ extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(
extern _X_EXPORT char *XNFprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED;
extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED;
-typedef void (*OsSigHandlerPtr)(int /* sig */);
-typedef int (*OsSigWrapperPtr)(int /* sig */);
+typedef void (*OsSigHandlerPtr)(int sig);
+typedef int (*OsSigWrapperPtr)(int sig);
-extern _X_EXPORT OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */);
+extern _X_EXPORT OsSigHandlerPtr OsSignal(int sig, OsSigHandlerPtr handler);
extern _X_EXPORT OsSigWrapperPtr OsRegisterSigWrapper(OsSigWrapperPtr newWrap);
extern _X_EXPORT int auditTrailLevel;
@@ -285,12 +285,12 @@ extern _X_EXPORT void LockServer(void);
extern _X_EXPORT void UnlockServer(void);
extern _X_EXPORT int OsLookupColor(
- int /*screen*/,
- char * /*name*/,
- unsigned /*len*/,
- unsigned short * /*pred*/,
- unsigned short * /*pgreen*/,
- unsigned short * /*pblue*/);
+ int screen,
+ char * name,
+ unsigned len,
+ unsigned short * pred,
+ unsigned short * pgreen,
+ unsigned short * pblue);
extern _X_EXPORT void OsInit(void);
@@ -324,36 +324,36 @@ extern _X_EXPORT void CheckUserParameters(int argc, char **argv, char **envp);
extern _X_EXPORT void CheckUserAuthorization(void);
extern _X_EXPORT int AddHost(
- ClientPtr /*client*/,
- int /*family*/,
- unsigned /*length*/,
- const void */*pAddr*/);
+ ClientPtr client,
+ int family,
+ unsigned length,
+ const void *pAddr);
extern _X_EXPORT Bool ForEachHostInFamily (
- int /*family*/,
- Bool (* /*func*/ )(
- unsigned char * /* addr */,
- short /* len */,
- pointer /* closure */),
- pointer /*closure*/);
+ int family,
+ Bool (* func )(
+ unsigned char * addr,
+ short len,
+ pointer closure),
+ pointer closure);
extern _X_EXPORT int RemoveHost(
- ClientPtr /*client*/,
- int /*family*/,
- unsigned /*length*/,
- pointer /*pAddr*/);
+ ClientPtr client,
+ int family,
+ unsigned length,
+ pointer pAddr);
extern _X_EXPORT int GetHosts(
- pointer * /*data*/,
- int * /*pnHosts*/,
- int * /*pLen*/,
- BOOL * /*pEnabled*/);
+ pointer * data,
+ int * pnHosts,
+ int * pLen,
+ BOOL * pEnabled);
typedef struct sockaddr * sockaddrPtr;
-extern _X_EXPORT int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);
+extern _X_EXPORT int InvalidHost(sockaddrPtr saddr, int len, ClientPtr client);
-extern _X_EXPORT int LocalClient(ClientPtr /* client */);
+extern _X_EXPORT int LocalClient(ClientPtr client);
extern _X_EXPORT int LocalClientCred(ClientPtr, int *, int *);
@@ -375,7 +375,7 @@ typedef struct {
extern _X_EXPORT int GetLocalClientCreds(ClientPtr, LocalClientCredRec **);
extern _X_EXPORT void FreeLocalClientCreds(LocalClientCredRec *);
-extern _X_EXPORT int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/);
+extern _X_EXPORT int ChangeAccessControl(ClientPtr client, int fEnabled);
extern _X_EXPORT int GetAccessControl(void);
@@ -390,15 +390,15 @@ extern _X_EXPORT void DisableLocalHost(void);
extern _X_EXPORT void AccessUsingXdmcp(void);
-extern _X_EXPORT void DefineSelf(int /*fd*/);
+extern _X_EXPORT void DefineSelf(int fd);
#if XDMCP
-extern _X_EXPORT void AugmentSelf(pointer /*from*/, int /*len*/);
+extern _X_EXPORT void AugmentSelf(pointer from, int len);
extern _X_EXPORT void RegisterAuthorizations(void);
#endif
-extern _X_EXPORT void InitAuthorization(char * /*filename*/);
+extern _X_EXPORT void InitAuthorization(char * filename);
/* extern int LoadAuthorization(void); */
@@ -410,12 +410,12 @@ extern _X_EXPORT int AuthorizationFromID (
char **datap);
extern _X_EXPORT XID CheckAuthorization(
- unsigned int /*namelength*/,
- const char * /*name*/,
- unsigned int /*datalength*/,
- const char * /*data*/,
- ClientPtr /*client*/,
- char ** /*reason*/
+ unsigned int namelength,
+ const char * name,
+ unsigned int datalength,
+ const char * data,
+ ClientPtr client,
+ char ** reason
);
extern _X_EXPORT void ResetAuthorization(void);
@@ -427,22 +427,22 @@ extern _X_EXPORT int RemoveAuthorization (
const char *data);
extern _X_EXPORT int AddAuthorization(
- unsigned int /*name_length*/,
- const char * /*name*/,
- unsigned int /*data_length*/,
- char * /*data*/);
+ unsigned int name_length,
+ const char * name,
+ unsigned int data_length,
+ char * data);
#ifdef XCSECURITY
extern _X_EXPORT XID GenerateAuthorization(
- unsigned int /* name_length */,
- const char * /* name */,
- unsigned int /* data_length */,
- const char * /* data */,
- unsigned int * /* data_length_return */,
- char ** /* data_return */);
+ unsigned int name_length,
+ const char * name,
+ unsigned int data_length,
+ const char * data,
+ unsigned int * data_length_return,
+ char ** data_return);
#endif
-extern _X_EXPORT int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
+extern _X_EXPORT int ddxProcessArgument(int argc, char * argv [], int i);
extern _X_EXPORT void ddxUseMsg(void);
diff --git a/include/pixmap.h b/include/pixmap.h
index 014a111..7b9b15a 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -92,28 +92,28 @@ typedef union _PixUnion {
((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))
extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(
- ScreenPtr /*pScreen*/,
- int /*width*/,
- int /*height*/,
- int /*depth*/,
- int /*bitsPerPixel*/,
- int /*devKind*/,
- pointer /*pPixData*/);
+ ScreenPtr pScreen,
+ int width,
+ int height,
+ int depth,
+ int bitsPerPixel,
+ int devKind,
+ pointer pPixData);
extern _X_EXPORT void FreeScratchPixmapHeader(
- PixmapPtr /*pPixmap*/);
+ PixmapPtr pPixmap);
extern _X_EXPORT Bool CreateScratchPixmapsForScreen(
- int /*scrnum*/);
+ int scrnum);
extern _X_EXPORT void FreeScratchPixmapsForScreen(
- int /*scrnum*/);
+ int scrnum);
extern _X_EXPORT PixmapPtr AllocatePixmap(
- ScreenPtr /*pScreen*/,
- int /*pixDataSize*/);
+ ScreenPtr pScreen,
+ int pixDataSize);
extern _X_EXPORT void FreePixmap(
- PixmapPtr /*pPixmap*/);
+ PixmapPtr pPixmap);
#endif /* PIXMAP_H */
diff --git a/include/property.h b/include/property.h
index 075eb4a..4ed1a80 100644
--- a/include/property.h
+++ b/include/property.h
@@ -53,39 +53,39 @@ SOFTWARE.
typedef struct _Property *PropertyPtr;
extern _X_EXPORT int dixLookupProperty(
- PropertyPtr * /*result*/,
- WindowPtr /*pWin*/,
- Atom /*proprty*/,
- ClientPtr /*pClient*/,
- Mask /*access_mode*/);
+ PropertyPtr * result,
+ WindowPtr pWin,
+ Atom proprty,
+ ClientPtr pClient,
+ Mask access_mode);
extern _X_EXPORT int dixChangeWindowProperty(
- ClientPtr /*pClient*/,
- WindowPtr /*pWin*/,
- Atom /*property*/,
- Atom /*type*/,
- int /*format*/,
- int /*mode*/,
- unsigned long /*len*/,
- pointer /*value*/,
- Bool /*sendevent*/);
+ ClientPtr pClient,
+ WindowPtr pWin,
+ Atom property,
+ Atom type,
+ int format,
+ int mode,
+ unsigned long len,
+ pointer value,
+ Bool sendevent);
extern _X_EXPORT int ChangeWindowProperty(
- WindowPtr /*pWin*/,
- Atom /*property*/,
- Atom /*type*/,
- int /*format*/,
- int /*mode*/,
- unsigned long /*len*/,
- pointer /*value*/,
- Bool /*sendevent*/);
+ WindowPtr pWin,
+ Atom property,
+ Atom type,
+ int format,
+ int mode,
+ unsigned long len,
+ pointer value,
+ Bool sendevent);
extern _X_EXPORT int DeleteProperty(
- ClientPtr /*client*/,
- WindowPtr /*pWin*/,
- Atom /*propName*/);
+ ClientPtr client,
+ WindowPtr pWin,
+ Atom propName);
extern _X_EXPORT void DeleteAllWindowProperties(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
#endif /* PROPERTY_H */
diff --git a/include/resource.h b/include/resource.h
index 080061f..5196f20 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -137,38 +137,38 @@ typedef struct {
} ResourceStateInfoRec;
typedef int (*DeleteType)(
- pointer /*value*/,
- XID /*id*/);
+ pointer value,
+ XID id);
typedef void (*FindResType)(
- pointer /*value*/,
- XID /*id*/,
- pointer /*cdata*/);
+ pointer value,
+ XID id,
+ pointer cdata);
typedef void (*FindAllRes)(
- pointer /*value*/,
- XID /*id*/,
- RESTYPE /*type*/,
- pointer /*cdata*/);
+ pointer value,
+ XID id,
+ RESTYPE type,
+ pointer cdata);
typedef Bool (*FindComplexResType)(
- pointer /*value*/,
- XID /*id*/,
- pointer /*cdata*/);
+ pointer value,
+ XID id,
+ pointer cdata);
extern _X_EXPORT RESTYPE CreateNewResourceType(
- DeleteType /*deleteFunc*/, char * /*name*/);
+ DeleteType deleteFunc, char * name);
extern _X_EXPORT void SetResourceTypeErrorValue(
- RESTYPE /*type*/, int /*errorValue*/);
+ RESTYPE type, int errorValue);
extern _X_EXPORT RESTYPE CreateNewResourceClass(void);
extern _X_EXPORT Bool InitClientResources(
- ClientPtr /*client*/);
+ ClientPtr client);
extern _X_EXPORT XID FakeClientID(
- int /*client*/);
+ int client);
/* Quartz support on Mac OS X uses the CarbonCore
framework whose AddResource function conflicts here. */
@@ -176,46 +176,46 @@ extern _X_EXPORT XID FakeClientID(
#define AddResource Darwin_X_AddResource
#endif
extern _X_EXPORT Bool AddResource(
- XID /*id*/,
- RESTYPE /*type*/,
- pointer /*value*/);
+ XID id,
+ RESTYPE type,
+ pointer value);
extern _X_EXPORT void FreeResource(
- XID /*id*/,
- RESTYPE /*skipDeleteFuncType*/);
+ XID id,
+ RESTYPE skipDeleteFuncType);
extern _X_EXPORT void FreeResourceByType(
- XID /*id*/,
- RESTYPE /*type*/,
- Bool /*skipFree*/);
+ XID id,
+ RESTYPE type,
+ Bool skipFree);
extern _X_EXPORT Bool ChangeResourceValue(
- XID /*id*/,
- RESTYPE /*rtype*/,
- pointer /*value*/);
+ XID id,
+ RESTYPE rtype,
+ pointer value);
extern _X_EXPORT void FindClientResourcesByType(
- ClientPtr /*client*/,
- RESTYPE /*type*/,
- FindResType /*func*/,
- pointer /*cdata*/);
+ ClientPtr client,
+ RESTYPE type,
+ FindResType func,
+ pointer cdata);
extern _X_EXPORT void FindAllClientResources(
- ClientPtr /*client*/,
- FindAllRes /*func*/,
- pointer /*cdata*/);
+ ClientPtr client,
+ FindAllRes func,
+ pointer cdata);
extern _X_EXPORT void FreeClientNeverRetainResources(
- ClientPtr /*client*/);
+ ClientPtr client);
extern _X_EXPORT void FreeClientResources(
- ClientPtr /*client*/);
+ ClientPtr client);
extern _X_EXPORT void FreeAllResources(void);
extern _X_EXPORT Bool LegalNewID(
- XID /*id*/,
- ClientPtr /*client*/);
+ XID id,
+ ClientPtr client);
extern _X_EXPORT pointer LookupClientResourceComplex(
ClientPtr client,
@@ -238,15 +238,15 @@ extern _X_EXPORT int dixLookupResourceByClass(
Mask access_mode);
extern _X_EXPORT void GetXIDRange(
- int /*client*/,
- Bool /*server*/,
- XID * /*minp*/,
- XID * /*maxp*/);
+ int client,
+ Bool server,
+ XID * minp,
+ XID * maxp);
extern _X_EXPORT unsigned int GetXIDList(
- ClientPtr /*client*/,
- unsigned int /*count*/,
- XID * /*pids*/);
+ ClientPtr client,
+ unsigned int count,
+ XID * pids);
extern _X_EXPORT RESTYPE lastResourceType;
extern _X_EXPORT RESTYPE TypeMask;
diff --git a/include/screenint.h b/include/screenint.h
index 4e6c574..70780c2 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -56,13 +56,13 @@ typedef struct _Depth *DepthPtr;
typedef struct _Screen *ScreenPtr;
extern _X_EXPORT int AddScreen(
- Bool (* /*pfnInit*/)(
- int /*index*/,
- ScreenPtr /*pScreen*/,
- int /*argc*/,
- char ** /*argv*/),
- int /*argc*/,
- char** /*argv*/);
+ Bool (* pfnInit)(
+ int index,
+ ScreenPtr pScreen,
+ int argc,
+ char ** argv),
+ int argc,
+ char** argv);
typedef struct _ColormapRec *ColormapPtr;
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 9952325..ae53608 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -86,9 +86,9 @@ typedef struct _ScreenSaverStuff {
XID wid;
char blanked;
Bool (*ExternalScreenSaver)(
- ScreenPtr /*pScreen*/,
- int /*xstate*/,
- Bool /*force*/);
+ ScreenPtr pScreen,
+ int xstate,
+ Bool force);
} ScreenSaverStuffRec;
@@ -99,102 +99,102 @@ typedef struct _ScreenSaverStuff {
*/
typedef Bool (* CloseScreenProcPtr)(
- int /*index*/,
- ScreenPtr /*pScreen*/);
+ int index,
+ ScreenPtr pScreen);
typedef void (* QueryBestSizeProcPtr)(
- int /*class*/,
- unsigned short * /*pwidth*/,
- unsigned short * /*pheight*/,
- ScreenPtr /*pScreen*/);
+ int class,
+ unsigned short * pwidth,
+ unsigned short * pheight,
+ ScreenPtr pScreen);
typedef Bool (* SaveScreenProcPtr)(
- ScreenPtr /*pScreen*/,
- int /*on*/);
+ ScreenPtr pScreen,
+ int on);
typedef void (* GetImageProcPtr)(
- DrawablePtr /*pDrawable*/,
- int /*sx*/,
- int /*sy*/,
- int /*w*/,
- int /*h*/,
- unsigned int /*format*/,
- unsigned long /*planeMask*/,
- char * /*pdstLine*/);
+ DrawablePtr pDrawable,
+ int sx,
+ int sy,
+ int w,
+ int h,
+ unsigned int format,
+ unsigned long planeMask,
+ char * pdstLine);
typedef void (* GetSpansProcPtr)(
- DrawablePtr /*pDrawable*/,
- int /*wMax*/,
- DDXPointPtr /*ppt*/,
- int* /*pwidth*/,
- int /*nspans*/,
- char * /*pdstStart*/);
+ DrawablePtr pDrawable,
+ int wMax,
+ DDXPointPtr ppt,
+ int* pwidth,
+ int nspans,
+ char * pdstStart);
typedef void (* SourceValidateProcPtr)(
- DrawablePtr /*pDrawable*/,
- int /*x*/,
- int /*y*/,
- int /*width*/,
- int /*height*/,
- unsigned int /*subWindowMode*/);
+ DrawablePtr pDrawable,
+ int x,
+ int y,
+ int width,
+ int height,
+ unsigned int subWindowMode);
typedef Bool (* CreateWindowProcPtr)(
- WindowPtr /*pWindow*/);
+ WindowPtr pWindow);
typedef Bool (* DestroyWindowProcPtr)(
- WindowPtr /*pWindow*/);
+ WindowPtr pWindow);
typedef Bool (* PositionWindowProcPtr)(
- WindowPtr /*pWindow*/,
- int /*x*/,
- int /*y*/);
+ WindowPtr pWindow,
+ int x,
+ int y);
typedef Bool (* ChangeWindowAttributesProcPtr)(
- WindowPtr /*pWindow*/,
- unsigned long /*mask*/);
+ WindowPtr pWindow,
+ unsigned long mask);
typedef Bool (* RealizeWindowProcPtr)(
- WindowPtr /*pWindow*/);
+ WindowPtr pWindow);
typedef Bool (* UnrealizeWindowProcPtr)(
- WindowPtr /*pWindow*/);
+ WindowPtr pWindow);
typedef void (* RestackWindowProcPtr)(
- WindowPtr /*pWindow*/,
- WindowPtr /*pOldNextSib*/);
+ WindowPtr pWindow,
+ WindowPtr pOldNextSib);
typedef int (* ValidateTreeProcPtr)(
- WindowPtr /*pParent*/,
- WindowPtr /*pChild*/,
- VTKind /*kind*/);
+ WindowPtr pParent,
+ WindowPtr pChild,
+ VTKind kind);
typedef void (* PostValidateTreeProcPtr)(
- WindowPtr /*pParent*/,
- WindowPtr /*pChild*/,
- VTKind /*kind*/);
+ WindowPtr pParent,
+ WindowPtr pChild,
+ VTKind kind);
typedef void (* WindowExposuresProcPtr)(
- WindowPtr /*pWindow*/,
- RegionPtr /*prgn*/,
- RegionPtr /*other_exposed*/);
+ WindowPtr pWindow,
+ RegionPtr prgn,
+ RegionPtr other_exposed);
typedef void (* CopyWindowProcPtr)(
- WindowPtr /*pWindow*/,
- DDXPointRec /*ptOldOrg*/,
- RegionPtr /*prgnSrc*/);
+ WindowPtr pWindow,
+ DDXPointRec ptOldOrg,
+ RegionPtr prgnSrc);
typedef void (* ClearToBackgroundProcPtr)(
- WindowPtr /*pWindow*/,
- int /*x*/,
- int /*y*/,
- int /*w*/,
- int /*h*/,
- Bool /*generateExposures*/);
+ WindowPtr pWindow,
+ int x,
+ int y,
+ int w,
+ int h,
+ Bool generateExposures);
typedef void (* ClipNotifyProcPtr)(
- WindowPtr /*pWindow*/,
- int /*dx*/,
- int /*dy*/);
+ WindowPtr pWindow,
+ int dx,
+ int dy);
/* pixmap will exist only for the duration of the current rendering operation */
#define CREATE_PIXMAP_USAGE_SCRATCH 1
@@ -204,204 +204,204 @@ typedef void (* ClipNotifyProcPtr)(
#define CREATE_PIXMAP_USAGE_GLYPH_PICTURE 3
typedef PixmapPtr (* CreatePixmapProcPtr)(
- ScreenPtr /*pScreen*/,
- int /*width*/,
- int /*height*/,
- int /*depth*/,
- unsigned /*usage_hint*/);
+ ScreenPtr pScreen,
+ int width,
+ int height,
+ int depth,
+ unsigned usage_hint);
typedef Bool (* DestroyPixmapProcPtr)(
- PixmapPtr /*pPixmap*/);
+ PixmapPtr pPixmap);
typedef Bool (* RealizeFontProcPtr)(
- ScreenPtr /*pScreen*/,
- FontPtr /*pFont*/);
+ ScreenPtr pScreen,
+ FontPtr pFont);
typedef Bool (* UnrealizeFontProcPtr)(
- ScreenPtr /*pScreen*/,
- FontPtr /*pFont*/);
+ ScreenPtr pScreen,
+ FontPtr pFont);
typedef void (* ConstrainCursorProcPtr)(
- DeviceIntPtr /*pDev*/,
- ScreenPtr /*pScreen*/,
- BoxPtr /*pBox*/);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen,
+ BoxPtr pBox);
typedef void (* CursorLimitsProcPtr)(
- DeviceIntPtr /* pDev */,
- ScreenPtr /*pScreen*/,
- CursorPtr /*pCursor*/,
- BoxPtr /*pHotBox*/,
- BoxPtr /*pTopLeftBox*/);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen,
+ CursorPtr pCursor,
+ BoxPtr pHotBox,
+ BoxPtr pTopLeftBox);
typedef Bool (* DisplayCursorProcPtr)(
- DeviceIntPtr /* pDev */,
- ScreenPtr /*pScreen*/,
- CursorPtr /*pCursor*/);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen,
+ CursorPtr pCursor);
typedef Bool (* RealizeCursorProcPtr)(
- DeviceIntPtr /* pDev */,
- ScreenPtr /*pScreen*/,
- CursorPtr /*pCursor*/);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen,
+ CursorPtr pCursor);
typedef Bool (* UnrealizeCursorProcPtr)(
- DeviceIntPtr /* pDev */,
- ScreenPtr /*pScreen*/,
- CursorPtr /*pCursor*/);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen,
+ CursorPtr pCursor);
typedef void (* RecolorCursorProcPtr)(
- DeviceIntPtr /* pDev */,
- ScreenPtr /*pScreen*/,
- CursorPtr /*pCursor*/,
- Bool /*displayed*/);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen,
+ CursorPtr pCursor,
+ Bool displayed);
typedef Bool (* SetCursorPositionProcPtr)(
- DeviceIntPtr /* pDev */,
- ScreenPtr /*pScreen*/,
- int /*x*/,
- int /*y*/,
- Bool /*generateEvent*/);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen,
+ int x,
+ int y,
+ Bool generateEvent);
typedef Bool (* CreateGCProcPtr)(
- GCPtr /*pGC*/);
+ GCPtr pGC);
typedef Bool (* CreateColormapProcPtr)(
- ColormapPtr /*pColormap*/);
+ ColormapPtr pColormap);
typedef void (* DestroyColormapProcPtr)(
- ColormapPtr /*pColormap*/);
+ ColormapPtr pColormap);
typedef void (* InstallColormapProcPtr)(
- ColormapPtr /*pColormap*/);
+ ColormapPtr pColormap);
typedef void (* UninstallColormapProcPtr)(
- ColormapPtr /*pColormap*/);
+ ColormapPtr pColormap);
typedef int (* ListInstalledColormapsProcPtr) (
- ScreenPtr /*pScreen*/,
- XID* /*pmaps */);
+ ScreenPtr pScreen,
+ XID* pmaps);
typedef void (* StoreColorsProcPtr)(
- ColormapPtr /*pColormap*/,
- int /*ndef*/,
- xColorItem * /*pdef*/);
+ ColormapPtr pColormap,
+ int ndef,
+ xColorItem * pdef);
typedef void (* ResolveColorProcPtr)(
- unsigned short* /*pred*/,
- unsigned short* /*pgreen*/,
- unsigned short* /*pblue*/,
- VisualPtr /*pVisual*/);
+ unsigned short* pred,
+ unsigned short* pgreen,
+ unsigned short* pblue,
+ VisualPtr pVisual);
typedef RegionPtr (* BitmapToRegionProcPtr)(
- PixmapPtr /*pPix*/);
+ PixmapPtr pPix);
typedef void (* SendGraphicsExposeProcPtr)(
- ClientPtr /*client*/,
- RegionPtr /*pRgn*/,
- XID /*drawable*/,
- int /*major*/,
- int /*minor*/);
+ ClientPtr client,
+ RegionPtr pRgn,
+ XID drawable,
+ int major,
+ int minor);
typedef void (* ScreenBlockHandlerProcPtr)(
- int /*screenNum*/,
- pointer /*blockData*/,
- pointer /*pTimeout*/,
- pointer /*pReadmask*/);
+ int screenNum,
+ pointer blockData,
+ pointer pTimeout,
+ pointer pReadmask);
typedef void (* ScreenWakeupHandlerProcPtr)(
- int /*screenNum*/,
- pointer /*wakeupData*/,
- unsigned long /*result*/,
- pointer /*pReadMask*/);
+ int screenNum,
+ pointer wakeupData,
+ unsigned long result,
+ pointer pReadMask);
typedef Bool (* CreateScreenResourcesProcPtr)(
- ScreenPtr /*pScreen*/);
+ ScreenPtr pScreen);
typedef Bool (* ModifyPixmapHeaderProcPtr)(
- PixmapPtr /*pPixmap*/,
- int /*width*/,
- int /*height*/,
- int /*depth*/,
- int /*bitsPerPixel*/,
- int /*devKind*/,
- pointer /*pPixData*/);
+ PixmapPtr pPixmap,
+ int width,
+ int height,
+ int depth,
+ int bitsPerPixel,
+ int devKind,
+ pointer pPixData);
typedef PixmapPtr (* GetWindowPixmapProcPtr)(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
typedef void (* SetWindowPixmapProcPtr)(
- WindowPtr /*pWin*/,
- PixmapPtr /*pPix*/);
+ WindowPtr pWin,
+ PixmapPtr pPix);
typedef PixmapPtr (* GetScreenPixmapProcPtr)(
- ScreenPtr /*pScreen*/);
+ ScreenPtr pScreen);
typedef void (* SetScreenPixmapProcPtr)(
- PixmapPtr /*pPix*/);
+ PixmapPtr pPix);
typedef void (* MarkWindowProcPtr)(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
typedef Bool (* MarkOverlappedWindowsProcPtr)(
- WindowPtr /*parent*/,
- WindowPtr /*firstChild*/,
- WindowPtr * /*pLayerWin*/);
+ WindowPtr parent,
+ WindowPtr firstChild,
+ WindowPtr * pLayerWin);
typedef int (* ConfigNotifyProcPtr)(
- WindowPtr /*pWin*/,
- int /*x*/,
- int /*y*/,
- int /*w*/,
- int /*h*/,
- int /*bw*/,
- WindowPtr /*pSib*/);
+ WindowPtr pWin,
+ int x,
+ int y,
+ int w,
+ int h,
+ int bw,
+ WindowPtr pSib);
typedef void (* MoveWindowProcPtr)(
- WindowPtr /*pWin*/,
- int /*x*/,
- int /*y*/,
- WindowPtr /*pSib*/,
- VTKind /*kind*/);
+ WindowPtr pWin,
+ int x,
+ int y,
+ WindowPtr pSib,
+ VTKind kind);
typedef void (* ResizeWindowProcPtr)(
- WindowPtr /*pWin*/,
- int /*x*/,
- int /*y*/,
- unsigned int /*w*/,
- unsigned int /*h*/,
- WindowPtr /*pSib*/
+ WindowPtr pWin,
+ int x,
+ int y,
+ unsigned int w,
+ unsigned int h,
+ WindowPtr pSib
);
typedef WindowPtr (* GetLayerWindowProcPtr)(
- WindowPtr /*pWin*/
+ WindowPtr pWin
);
typedef void (* HandleExposuresProcPtr)(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
typedef void (* ReparentWindowProcPtr)(
- WindowPtr /*pWin*/,
- WindowPtr /*pPriorParent*/);
+ WindowPtr pWin,
+ WindowPtr pPriorParent);
typedef void (* SetShapeProcPtr)(
- WindowPtr /*pWin*/,
- int /* kind */);
+ WindowPtr pWin,
+ int kind);
typedef void (* ChangeBorderWidthProcPtr)(
- WindowPtr /*pWin*/,
- unsigned int /*width*/);
+ WindowPtr pWin,
+ unsigned int width);
typedef void (* MarkUnrealizedWindowProcPtr)(
- WindowPtr /*pChild*/,
- WindowPtr /*pWin*/,
- Bool /*fromConfigure*/);
+ WindowPtr pChild,
+ WindowPtr pWin,
+ Bool fromConfigure);
typedef Bool (* DeviceCursorInitializeProcPtr)(
- DeviceIntPtr /* pDev */,
- ScreenPtr /* pScreen */);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen);
typedef void (* DeviceCursorCleanupProcPtr)(
- DeviceIntPtr /* pDev */,
- ScreenPtr /* pScreen */);
+ DeviceIntPtr pDev,
+ ScreenPtr pScreen);
typedef struct _Screen {
int myNum; /* index of this instance in Screens[] */
@@ -562,8 +562,8 @@ typedef struct _ScreenInfo {
extern _X_EXPORT ScreenInfo screenInfo;
extern _X_EXPORT void InitOutput(
- ScreenInfo * /*pScreenInfo*/,
- int /*argc*/,
- char ** /*argv*/);
+ ScreenInfo * pScreenInfo,
+ int argc,
+ char ** argv);
#endif /* SCREENINTSTRUCT_H */
diff --git a/include/swaprep.h b/include/swaprep.h
index 8c02737..7b8b9f6 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -27,238 +27,238 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define SWAPREP_H 1
extern _X_EXPORT void Swap32Write(
- ClientPtr /* pClient */,
- int /* size */,
- CARD32 * /* pbuf */);
+ ClientPtr pClient,
+ int size,
+ CARD32 * pbuf);
extern _X_EXPORT void CopySwap32Write(
- ClientPtr /* pClient */,
- int /* size */,
- CARD32 * /* pbuf */);
+ ClientPtr pClient,
+ int size,
+ CARD32 * pbuf);
extern _X_EXPORT void CopySwap16Write(
- ClientPtr /* pClient */,
- int /* size */,
- short * /* pbuf */);
+ ClientPtr pClient,
+ int size,
+ short * pbuf);
extern _X_EXPORT void SGenericReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGenericReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGenericReply * pRep);
extern _X_EXPORT void SGetWindowAttributesReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetWindowAttributesReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetWindowAttributesReply * pRep);
extern _X_EXPORT void SGetGeometryReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetGeometryReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetGeometryReply * pRep);
extern _X_EXPORT void SQueryTreeReply(
- ClientPtr /* pClient */,
- int /* size */,
- xQueryTreeReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xQueryTreeReply * pRep);
extern _X_EXPORT void SInternAtomReply(
- ClientPtr /* pClient */,
- int /* size */,
- xInternAtomReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xInternAtomReply * pRep);
extern _X_EXPORT void SGetAtomNameReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetAtomNameReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetAtomNameReply * pRep);
extern _X_EXPORT void SGetPropertyReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetPropertyReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetPropertyReply * pRep);
extern _X_EXPORT void SListPropertiesReply(
- ClientPtr /* pClient */,
- int /* size */,
- xListPropertiesReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xListPropertiesReply * pRep);
extern _X_EXPORT void SGetSelectionOwnerReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetSelectionOwnerReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetSelectionOwnerReply * pRep);
extern _X_EXPORT void SQueryPointerReply(
- ClientPtr /* pClient */,
- int /* size */,
- xQueryPointerReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xQueryPointerReply * pRep);
extern _X_EXPORT void SwapTimeCoordWrite(
- ClientPtr /* pClient */,
- int /* size */,
- xTimecoord * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xTimecoord * pRep);
extern _X_EXPORT void SGetMotionEventsReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetMotionEventsReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetMotionEventsReply * pRep);
extern _X_EXPORT void STranslateCoordsReply(
- ClientPtr /* pClient */,
- int /* size */,
- xTranslateCoordsReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xTranslateCoordsReply * pRep);
extern _X_EXPORT void SGetInputFocusReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetInputFocusReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetInputFocusReply * pRep);
extern _X_EXPORT void SQueryKeymapReply(
- ClientPtr /* pClient */,
- int /* size */,
- xQueryKeymapReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xQueryKeymapReply * pRep);
extern _X_EXPORT void SQueryFontReply(
- ClientPtr /* pClient */,
- int /* size */,
- xQueryFontReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xQueryFontReply * pRep);
extern _X_EXPORT void SQueryTextExtentsReply(
- ClientPtr /* pClient */,
- int /* size */,
- xQueryTextExtentsReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xQueryTextExtentsReply * pRep);
extern _X_EXPORT void SListFontsReply(
- ClientPtr /* pClient */,
- int /* size */,
- xListFontsReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xListFontsReply * pRep);
extern _X_EXPORT void SListFontsWithInfoReply(
- ClientPtr /* pClient */,
- int /* size */,
- xListFontsWithInfoReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xListFontsWithInfoReply * pRep);
extern _X_EXPORT void SGetFontPathReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetFontPathReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetFontPathReply * pRep);
extern _X_EXPORT void SGetImageReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetImageReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetImageReply * pRep);
extern _X_EXPORT void SListInstalledColormapsReply(
- ClientPtr /* pClient */,
- int /* size */,
- xListInstalledColormapsReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xListInstalledColormapsReply * pRep);
extern _X_EXPORT void SAllocColorReply(
- ClientPtr /* pClient */,
- int /* size */,
- xAllocColorReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xAllocColorReply * pRep);
extern _X_EXPORT void SAllocNamedColorReply(
- ClientPtr /* pClient */,
- int /* size */,
- xAllocNamedColorReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xAllocNamedColorReply * pRep);
extern _X_EXPORT void SAllocColorCellsReply(
- ClientPtr /* pClient */,
- int /* size */,
- xAllocColorCellsReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xAllocColorCellsReply * pRep);
extern _X_EXPORT void SAllocColorPlanesReply(
- ClientPtr /* pClient */,
- int /* size */,
- xAllocColorPlanesReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xAllocColorPlanesReply * pRep);
extern _X_EXPORT void SQColorsExtend(
- ClientPtr /* pClient */,
- int /* size */,
- xrgb * /* prgb */);
+ ClientPtr pClient,
+ int size,
+ xrgb * prgb);
extern _X_EXPORT void SQueryColorsReply(
- ClientPtr /* pClient */,
- int /* size */,
- xQueryColorsReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xQueryColorsReply * pRep);
extern _X_EXPORT void SLookupColorReply(
- ClientPtr /* pClient */,
- int /* size */,
- xLookupColorReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xLookupColorReply * pRep);
extern _X_EXPORT void SQueryBestSizeReply(
- ClientPtr /* pClient */,
- int /* size */,
- xQueryBestSizeReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xQueryBestSizeReply * pRep);
extern _X_EXPORT void SListExtensionsReply(
- ClientPtr /* pClient */,
- int /* size */,
- xListExtensionsReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xListExtensionsReply * pRep);
extern _X_EXPORT void SGetKeyboardMappingReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetKeyboardMappingReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetKeyboardMappingReply * pRep);
extern _X_EXPORT void SGetPointerMappingReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetPointerMappingReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetPointerMappingReply * pRep);
extern _X_EXPORT void SGetModifierMappingReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetModifierMappingReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetModifierMappingReply * pRep);
extern _X_EXPORT void SGetKeyboardControlReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetKeyboardControlReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetKeyboardControlReply * pRep);
extern _X_EXPORT void SGetPointerControlReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetPointerControlReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetPointerControlReply * pRep);
extern _X_EXPORT void SGetScreenSaverReply(
- ClientPtr /* pClient */,
- int /* size */,
- xGetScreenSaverReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xGetScreenSaverReply * pRep);
extern _X_EXPORT void SLHostsExtend(
- ClientPtr /* pClient */,
- int /* size */,
- char * /* buf */);
+ ClientPtr pClient,
+ int size,
+ char * buf);
extern _X_EXPORT void SListHostsReply(
- ClientPtr /* pClient */,
- int /* size */,
- xListHostsReply * /* pRep */);
+ ClientPtr pClient,
+ int size,
+ xListHostsReply * pRep);
extern _X_EXPORT void SErrorEvent(
- xError * /* from */,
- xError * /* to */);
+ xError * from,
+ xError * to);
extern _X_EXPORT void SwapConnSetupInfo(
- char * /* pInfo */,
- char * /* pInfoTBase */);
+ char * pInfo,
+ char * pInfoTBase);
extern _X_EXPORT void WriteSConnectionInfo(
- ClientPtr /* pClient */,
- unsigned long /* size */,
- char * /* pInfo */);
+ ClientPtr pClient,
+ unsigned long size,
+ char * pInfo);
extern _X_EXPORT void SwapConnSetupPrefix(
- xConnSetupPrefix * /* pcspFrom */,
- xConnSetupPrefix * /* pcspTo */);
+ xConnSetupPrefix * pcspFrom,
+ xConnSetupPrefix * pcspTo);
extern _X_EXPORT void WriteSConnSetupPrefix(
- ClientPtr /* pClient */,
- xConnSetupPrefix * /* pcsp */);
+ ClientPtr pClient,
+ xConnSetupPrefix * pcsp);
#undef SWAPREP_PROC
-#define SWAPREP_PROC(func) extern _X_EXPORT void func(xEvent * /* from */, xEvent * /* to */)
+#define SWAPREP_PROC(func) extern _X_EXPORT void func(xEvent * from, xEvent * to)
SWAPREP_PROC(SCirculateEvent);
SWAPREP_PROC(SClientMessageEvent);
diff --git a/include/swapreq.h b/include/swapreq.h
index 8038f02..9561b11 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -27,14 +27,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define SWAPREQ_H 1
extern _X_EXPORT void SwapColorItem(
- xColorItem * /* pItem */);
+ xColorItem * pItem);
extern _X_EXPORT void SwapConnClientPrefix(
- xConnClientPrefix * /* pCCP */);
+ xConnClientPrefix * pCCP);
#undef SWAPREQ_PROC
-#define SWAPREQ_PROC(func) extern _X_EXPORT int func(ClientPtr /* client */)
+#define SWAPREQ_PROC(func) extern _X_EXPORT int func(ClientPtr client)
SWAPREQ_PROC(SProcAllocColor);
SWAPREQ_PROC(SProcAllocColorCells);
diff --git a/include/window.h b/include/window.h
index 6fb2f8c..08776f8 100644
--- a/include/window.h
+++ b/include/window.h
@@ -74,55 +74,55 @@ typedef struct _BackingStore *BackingStorePtr;
typedef struct _Window *WindowPtr;
typedef int (*VisitWindowProcPtr)(
- WindowPtr /*pWin*/,
- pointer /*data*/);
+ WindowPtr pWin,
+ pointer data);
extern _X_EXPORT int TraverseTree(
- WindowPtr /*pWin*/,
- VisitWindowProcPtr /*func*/,
- pointer /*data*/);
+ WindowPtr pWin,
+ VisitWindowProcPtr func,
+ pointer data);
extern _X_EXPORT int WalkTree(
- ScreenPtr /*pScreen*/,
- VisitWindowProcPtr /*func*/,
- pointer /*data*/);
+ ScreenPtr pScreen,
+ VisitWindowProcPtr func,
+ pointer data);
extern _X_EXPORT Bool CreateRootWindow(
- ScreenPtr /*pScreen*/);
+ ScreenPtr pScreen);
extern _X_EXPORT void InitRootWindow(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
typedef WindowPtr (* RealChildHeadProc) (WindowPtr pWin);
extern _X_EXPORT void RegisterRealChildHeadProc (RealChildHeadProc proc);
extern _X_EXPORT WindowPtr RealChildHead(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
extern _X_EXPORT WindowPtr CreateWindow(
- Window /*wid*/,
- WindowPtr /*pParent*/,
- int /*x*/,
- int /*y*/,
- unsigned int /*w*/,
- unsigned int /*h*/,
- unsigned int /*bw*/,
- unsigned int /*class*/,
- Mask /*vmask*/,
- XID* /*vlist*/,
- int /*depth*/,
- ClientPtr /*client*/,
- VisualID /*visual*/,
- int* /*error*/);
+ Window wid,
+ WindowPtr pParent,
+ int x,
+ int y,
+ unsigned int w,
+ unsigned int h,
+ unsigned int bw,
+ unsigned int class,
+ Mask vmask,
+ XID* vlist,
+ int depth,
+ ClientPtr client,
+ VisualID visual,
+ int* error);
extern _X_EXPORT int DeleteWindow(
- pointer /*pWin*/,
- XID /*wid*/);
+ pointer pWin,
+ XID wid);
extern _X_EXPORT int DestroySubwindows(
- WindowPtr /*pWin*/,
- ClientPtr /*client*/);
+ WindowPtr pWin,
+ ClientPtr client);
/* Quartz support on Mac OS X uses the HIToolbox
framework whose ChangeWindowAttributes function conflicts here. */
@@ -130,19 +130,19 @@ extern _X_EXPORT int DestroySubwindows(
#define ChangeWindowAttributes Darwin_X_ChangeWindowAttributes
#endif
extern _X_EXPORT int ChangeWindowAttributes(
- WindowPtr /*pWin*/,
- Mask /*vmask*/,
- XID* /*vlist*/,
- ClientPtr /*client*/);
+ WindowPtr pWin,
+ Mask vmask,
+ XID* vlist,
+ ClientPtr client);
extern _X_EXPORT int ChangeWindowDeviceCursor(
- WindowPtr /*pWin*/,
- struct _DeviceIntRec* /*pDev*/,
- struct _Cursor* /*pCursor*/);
+ WindowPtr pWin,
+ struct _DeviceIntRec* pDev,
+ struct _Cursor* pCursor);
extern _X_EXPORT struct _Cursor* WindowGetDeviceCursor(
- WindowPtr /*pWin*/,
- struct _DeviceIntRec* /*pDev*/);
+ WindowPtr pWin,
+ struct _DeviceIntRec* pDev);
/* Quartz support on Mac OS X uses the HIToolbox
framework whose GetWindowAttributes function conflicts here. */
@@ -152,67 +152,67 @@ extern void Darwin_X_GetWindowAttributes(
#else
extern _X_EXPORT void GetWindowAttributes(
#endif
- WindowPtr /*pWin*/,
- ClientPtr /*client*/,
- xGetWindowAttributesReply* /* wa */);
+ WindowPtr pWin,
+ ClientPtr client,
+ xGetWindowAttributesReply* wa);
extern _X_EXPORT void GravityTranslate(
- int /*x*/,
- int /*y*/,
- int /*oldx*/,
- int /*oldy*/,
- int /*dw*/,
- int /*dh*/,
- unsigned /*gravity*/,
- int* /*destx*/,
- int* /*desty*/);
+ int x,
+ int y,
+ int oldx,
+ int oldy,
+ int dw,
+ int dh,
+ unsigned gravity,
+ int* destx,
+ int* desty);
extern _X_EXPORT int ConfigureWindow(
- WindowPtr /*pWin*/,
- Mask /*mask*/,
- XID* /*vlist*/,
- ClientPtr /*client*/);
+ WindowPtr pWin,
+ Mask mask,
+ XID* vlist,
+ ClientPtr client);
extern _X_EXPORT int CirculateWindow(
- WindowPtr /*pParent*/,
- int /*direction*/,
- ClientPtr /*client*/);
+ WindowPtr pParent,
+ int direction,
+ ClientPtr client);
extern _X_EXPORT int ReparentWindow(
- WindowPtr /*pWin*/,
- WindowPtr /*pParent*/,
- int /*x*/,
- int /*y*/,
- ClientPtr /*client*/);
+ WindowPtr pWin,
+ WindowPtr pParent,
+ int x,
+ int y,
+ ClientPtr client);
extern _X_EXPORT int MapWindow(
- WindowPtr /*pWin*/,
- ClientPtr /*client*/);
+ WindowPtr pWin,
+ ClientPtr client);
extern _X_EXPORT void MapSubwindows(
- WindowPtr /*pParent*/,
- ClientPtr /*client*/);
+ WindowPtr pParent,
+ ClientPtr client);
extern _X_EXPORT int UnmapWindow(
- WindowPtr /*pWin*/,
- Bool /*fromConfigure*/);
+ WindowPtr pWin,
+ Bool fromConfigure);
extern _X_EXPORT void UnmapSubwindows(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
extern _X_EXPORT void HandleSaveSet(
- ClientPtr /*client*/);
+ ClientPtr client);
extern _X_EXPORT Bool PointInWindowIsVisible(
- WindowPtr /*pWin*/,
- int /*x*/,
- int /*y*/);
+ WindowPtr pWin,
+ int x,
+ int y);
extern _X_EXPORT RegionPtr NotClippedByChildren(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
extern _X_EXPORT void SendVisibilityNotify(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
extern _X_EXPORT int dixSaveScreens(
ClientPtr client,
@@ -224,46 +224,46 @@ extern _X_EXPORT int SaveScreens(
int mode);
extern _X_EXPORT WindowPtr FindWindowWithOptional(
- WindowPtr /*w*/);
+ WindowPtr w);
extern _X_EXPORT void CheckWindowOptionalNeed(
- WindowPtr /*w*/);
+ WindowPtr w);
extern _X_EXPORT Bool MakeWindowOptional(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
extern _X_EXPORT WindowPtr MoveWindowInStack(
- WindowPtr /*pWin*/,
- WindowPtr /*pNextSib*/);
+ WindowPtr pWin,
+ WindowPtr pNextSib);
extern _X_EXPORT void SetWinSize(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
extern _X_EXPORT void SetBorderSize(
- WindowPtr /*pWin*/);
+ WindowPtr pWin);
extern _X_EXPORT void ResizeChildrenWinSize(
- WindowPtr /*pWin*/,
- int /*dx*/,
- int /*dy*/,
- int /*dw*/,
- int /*dh*/);
+ WindowPtr pWin,
+ int dx,
+ int dy,
+ int dw,
+ int dh);
extern _X_EXPORT void ShapeExtensionInit(void);
extern _X_EXPORT void SendShapeNotify(
- WindowPtr /* pWin */,
- int /* which */ );
+ WindowPtr pWin,
+ int which );
extern _X_EXPORT RegionPtr CreateBoundingShape(
- WindowPtr /* pWin */ );
+ WindowPtr pWin );
extern _X_EXPORT RegionPtr CreateClipShape(
- WindowPtr /* pWin */ );
+ WindowPtr pWin );
extern _X_EXPORT void DisableMapUnmapEvents(
- WindowPtr /* pWin */ );
+ WindowPtr pWin );
extern _X_EXPORT void EnableMapUnmapEvents(
- WindowPtr /* pWin */ );
+ WindowPtr pWin );
#endif /* WINDOW_H */
diff --git a/include/xkbfile.h b/include/xkbfile.h
index a4b99ee..73127e7 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -40,12 +40,12 @@
#define XkbStateDefined (1<<1)
typedef void (*XkbFileAddOnFunc)(
- FILE * /* file */,
- XkbDescPtr /* result */,
- Bool /* topLevel */,
- Bool /* showImplicit */,
- int /* fileSection */,
- void * /* priv */
+ FILE * file,
+ XkbDescPtr result,
+ Bool topLevel,
+ Bool showImplicit,
+ int fileSection,
+ void * priv
);
/***====================================================================***/
@@ -83,99 +83,99 @@ typedef void (*XkbFileAddOnFunc)(
_XFUNCPROTOBEGIN
extern _X_EXPORT char * XkbIndentText(
- unsigned /* size */
+ unsigned size
);
extern _X_EXPORT char * XkbAtomText(
- Atom /* atm */,
- unsigned /* format */
+ Atom atm,
+ unsigned format
);
extern _X_EXPORT char * XkbKeysymText(
- KeySym /* sym */,
- unsigned /* format */
+ KeySym sym,
+ unsigned format
);
extern _X_EXPORT char * XkbStringText(
- char * /* str */,
- unsigned /* format */
+ char * str,
+ unsigned format
);
extern _X_EXPORT char * XkbKeyNameText(
- char * /* name */,
- unsigned /* format */
+ char * name,
+ unsigned format
);
extern _X_EXPORT char *
XkbModIndexText(
- unsigned /* ndx */,
- unsigned /* format */
+ unsigned ndx,
+ unsigned format
);
extern _X_EXPORT char *
XkbModMaskText(
- unsigned /* mask */,
- unsigned /* format */
+ unsigned mask,
+ unsigned format
);
extern _X_EXPORT char * XkbVModIndexText(
- XkbDescPtr /* xkb */,
- unsigned /* ndx */,
- unsigned /* format */
+ XkbDescPtr xkb,
+ unsigned ndx,
+ unsigned format
);
extern _X_EXPORT char * XkbVModMaskText(
- XkbDescPtr /* xkb */,
- unsigned /* modMask */,
- unsigned /* mask */,
- unsigned /* format */
+ XkbDescPtr xkb,
+ unsigned modMask,
+ unsigned mask,
+ unsigned format
);
extern _X_EXPORT char * XkbConfigText(
- unsigned /* config */,
- unsigned /* format */
+ unsigned config,
+ unsigned format
);
extern _X_EXPORT char * XkbSIMatchText(
- unsigned /* type */,
- unsigned /* format */
+ unsigned type,
+ unsigned format
);
extern _X_EXPORT char * XkbIMWhichStateMaskText(
- unsigned /* use_which */,
- unsigned /* format */
+ unsigned use_which,
+ unsigned format
);
extern _X_EXPORT char * XkbControlsMaskText(
- unsigned /* ctrls */,
- unsigned /* format */
+ unsigned ctrls,
+ unsigned format
);
extern _X_EXPORT char * XkbGeomFPText(
- int /* val */,
- unsigned /* format */
+ int val,
+ unsigned format
);
extern _X_EXPORT char * XkbDoodadTypeText(
- unsigned /* type */,
- unsigned /* format */
+ unsigned type,
+ unsigned format
);
extern _X_EXPORT char * XkbActionTypeText(
- unsigned /* type */,
- unsigned /* format */
+ unsigned type,
+ unsigned format
);
extern _X_EXPORT char * XkbActionText(
- XkbDescPtr /* xkb */,
- XkbAction * /* action */,
- unsigned /* format */
+ XkbDescPtr xkb,
+ XkbAction * action,
+ unsigned format
);
extern _X_EXPORT char * XkbBehaviorText(
- XkbDescPtr /* xkb */,
- XkbBehavior * /* behavior */,
- unsigned /* format */
+ XkbDescPtr xkb,
+ XkbBehavior * behavior,
+ unsigned format
);
/***====================================================================***/
@@ -228,81 +228,81 @@ typedef struct _XkbDrawable {
/***====================================================================***/
extern _X_EXPORT unsigned XkbConvertGetByNameComponents(
- Bool /* toXkm */,
- unsigned /* orig */
+ Bool toXkm,
+ unsigned orig
);
extern _X_EXPORT Bool XkbNameMatchesPattern(
- char * /* name */,
- char * /* pattern */
+ char * name,
+ char * pattern
);
/***====================================================================***/
extern _X_EXPORT Bool XkbWriteXKBKeycodes(
- FILE * /* file */,
- XkbDescPtr /* result */,
- Bool /* topLevel */,
- Bool /* showImplicit */,
- XkbFileAddOnFunc /* addOn */,
- void * /* priv */
+ FILE * file,
+ XkbDescPtr result,
+ Bool topLevel,
+ Bool showImplicit,
+ XkbFileAddOnFunc addOn,
+ void * priv
);
extern _X_EXPORT Bool XkbWriteXKBKeyTypes(
- FILE * /* file */,
- XkbDescPtr /* result */,
- Bool /* topLevel */,
- Bool /* showImplicit */,
- XkbFileAddOnFunc /* addOn */,
- void * /* priv */
+ FILE * file,
+ XkbDescPtr result,
+ Bool topLevel,
+ Bool showImplicit,
+ XkbFileAddOnFunc addOn,
+ void * priv
);
extern _X_EXPORT Bool XkbWriteXKBCompatMap(
- FILE * /* file */,
- XkbDescPtr /* result */,
- Bool /* topLevel */,
- Bool /* showImplicit */,
- XkbFileAddOnFunc /* addOn */,
- void * /* priv */
+ FILE * file,
+ XkbDescPtr result,
+ Bool topLevel,
+ Bool showImplicit,
+ XkbFileAddOnFunc addOn,
+ void * priv
);
extern _X_EXPORT Bool XkbWriteXKBSymbols(
- FILE * /* file */,
- XkbDescPtr /* result */,
- Bool /* topLevel */,
- Bool /* showImplicit */,
- XkbFileAddOnFunc /* addOn */,
- void * /* priv */
+ FILE * file,
+ XkbDescPtr result,
+ Bool topLevel,
+ Bool showImplicit,
+ XkbFileAddOnFunc addOn,
+ void * priv
);
extern _X_EXPORT Bool XkbWriteXKBGeometry(
- FILE * /* file */,
- XkbDescPtr /* result */,
- Bool /* topLevel */,
- Bool /* showImplicit */,
- XkbFileAddOnFunc /* addOn */,
- void * /* priv */
+ FILE * file,
+ XkbDescPtr result,
+ Bool topLevel,
+ Bool showImplicit,
+ XkbFileAddOnFunc addOn,
+ void * priv
);
extern _X_EXPORT Bool XkbWriteXKBKeymapForNames(
- FILE * /* file */,
- XkbComponentNamesPtr /* names */,
- XkbDescPtr /* xkb */,
- unsigned /* want */,
- unsigned /* need */
+ FILE * file,
+ XkbComponentNamesPtr names,
+ XkbDescPtr xkb,
+ unsigned want,
+ unsigned need
);
/***====================================================================***/
extern _X_EXPORT Bool XkmProbe(
- FILE * /* file */
+ FILE * file
);
extern _X_EXPORT unsigned XkmReadFile(
- FILE * /* file */,
- unsigned /* need */,
- unsigned /* want */,
- XkbDescPtr * /* result */
+ FILE * file,
+ unsigned need,
+ unsigned want,
+ XkbDescPtr * result
);
_XFUNCPROTOEND
diff --git a/include/xkbrules.h b/include/xkbrules.h
index 0f3f934..826ed23 100644
--- a/include/xkbrules.h
+++ b/include/xkbrules.h
@@ -90,20 +90,20 @@ _XFUNCPROTOBEGIN
struct _XkbComponentNames;
extern _X_EXPORT Bool XkbRF_GetComponents(
- XkbRF_RulesPtr /* rules */,
- XkbRF_VarDefsPtr /* var_defs */,
- struct _XkbComponentNames * /* names */
+ XkbRF_RulesPtr rules,
+ XkbRF_VarDefsPtr var_defs,
+ struct _XkbComponentNames * names
);
extern _X_EXPORT Bool XkbRF_LoadRules(
- FILE * /* file */,
- XkbRF_RulesPtr /* rules */
+ FILE * file,
+ XkbRF_RulesPtr rules
);
extern _X_EXPORT Bool XkbRF_LoadRulesByName(
- char * /* base */,
- char * /* locale */,
- XkbRF_RulesPtr /* rules */
+ char * base,
+ char * locale,
+ XkbRF_RulesPtr rules
);
/***====================================================================***/
@@ -111,8 +111,8 @@ extern _X_EXPORT Bool XkbRF_LoadRulesByName(
extern _X_EXPORT XkbRF_RulesPtr XkbRF_Create(void);
extern _X_EXPORT void XkbRF_Free(
- XkbRF_RulesPtr /* rules */,
- Bool /* freeRules */
+ XkbRF_RulesPtr rules,
+ Bool freeRules
);
/***====================================================================***/
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 9f1507e..26174c0 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -382,454 +382,454 @@ extern _X_EXPORT XkbDescPtr XkbAllocKeyboard(
);
extern _X_EXPORT Status XkbAllocClientMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- unsigned int /* nTypes */
+ XkbDescPtr xkb,
+ unsigned int which,
+ unsigned int nTypes
);
extern _X_EXPORT Status XkbAllocServerMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- unsigned int /* nNewActions */
+ XkbDescPtr xkb,
+ unsigned int which,
+ unsigned int nNewActions
);
extern _X_EXPORT void XkbFreeClientMap(
- XkbDescPtr /* xkb */,
- unsigned int /* what */,
- Bool /* freeMap */
+ XkbDescPtr xkb,
+ unsigned int what,
+ Bool freeMap
);
extern _X_EXPORT void XkbFreeServerMap(
- XkbDescPtr /* xkb */,
- unsigned int /* what */,
- Bool /* freeMap */
+ XkbDescPtr xkb,
+ unsigned int what,
+ Bool freeMap
);
extern _X_EXPORT Status XkbAllocIndicatorMaps(
- XkbDescPtr /* xkb */
+ XkbDescPtr xkb
);
extern _X_EXPORT Status XkbAllocCompatMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- unsigned int /* nInterpret */
+ XkbDescPtr xkb,
+ unsigned int which,
+ unsigned int nInterpret
);
extern _X_EXPORT Status XkbAllocNames(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- int /* nTotalRG */,
- int /* nTotalAliases */
+ XkbDescPtr xkb,
+ unsigned int which,
+ int nTotalRG,
+ int nTotalAliases
);
extern _X_EXPORT Status XkbAllocControls(
- XkbDescPtr /* xkb */,
- unsigned int /* which*/
+ XkbDescPtr xkb,
+ unsigned int which
);
extern _X_EXPORT Status XkbCopyKeyTypes(
- XkbKeyTypePtr /* from */,
- XkbKeyTypePtr /* into */,
- int /* num_types */
+ XkbKeyTypePtr from,
+ XkbKeyTypePtr into,
+ int num_types
);
extern _X_EXPORT Status XkbResizeKeyType(
- XkbDescPtr /* xkb */,
- int /* type_ndx */,
- int /* map_count */,
- Bool /* want_preserve */,
- int /* new_num_lvls */
+ XkbDescPtr xkb,
+ int type_ndx,
+ int map_count,
+ Bool want_preserve,
+ int new_num_lvls
);
extern _X_EXPORT void XkbFreeKeyboard(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- Bool /* freeDesc */
+ XkbDescPtr xkb,
+ unsigned int which,
+ Bool freeDesc
);
extern _X_EXPORT void XkbSetActionKeyMods(
- XkbDescPtr /* xkb */,
- XkbAction * /* act */,
- unsigned int /* mods */
+ XkbDescPtr xkb,
+ XkbAction * act,
+ unsigned int mods
);
extern _X_EXPORT unsigned int XkbMaskForVMask(
- XkbDescPtr /* xkb */,
- unsigned int /* vmask */
+ XkbDescPtr xkb,
+ unsigned int vmask
);
extern _X_EXPORT Bool XkbVirtualModsToReal(
- XkbDescPtr /* xkb */,
- unsigned int /* virtua_mask */,
- unsigned int * /* mask_rtrn */
+ XkbDescPtr xkb,
+ unsigned int virtua_mask,
+ unsigned int * mask_rtrn
);
extern _X_EXPORT unsigned int XkbAdjustGroup(
- int /* group */,
- XkbControlsPtr /* ctrls */
+ int group,
+ XkbControlsPtr ctrls
);
extern _X_EXPORT KeySym *XkbResizeKeySyms(
- XkbDescPtr /* xkb */,
- int /* key */,
- int /* needed */
+ XkbDescPtr xkb,
+ int key,
+ int needed
);
extern _X_EXPORT XkbAction *XkbResizeKeyActions(
- XkbDescPtr /* xkb */,
- int /* key */,
- int /* needed */
+ XkbDescPtr xkb,
+ int key,
+ int needed
);
extern _X_EXPORT void XkbUpdateKeyTypesFromCore(
- DeviceIntPtr /* pXDev */,
- KeySymsPtr /* syms */,
- KeyCode /* first */,
- CARD8 /* num */,
- XkbChangesPtr /* pChanges */
+ DeviceIntPtr pXDev,
+ KeySymsPtr syms,
+ KeyCode first,
+ CARD8 num,
+ XkbChangesPtr pChanges
);
extern _X_EXPORT void XkbUpdateDescActions(
- XkbDescPtr /* xkb */,
- KeyCode /* first */,
- CARD8 /* num */,
- XkbChangesPtr /* changes */
+ XkbDescPtr xkb,
+ KeyCode first,
+ CARD8 num,
+ XkbChangesPtr changes
);
extern _X_EXPORT void XkbUpdateActions(
- DeviceIntPtr /* pXDev */,
- KeyCode /* first */,
- CARD8 /* num */,
- XkbChangesPtr /* pChanges */,
- unsigned int * /* needChecksRtrn */,
- XkbEventCausePtr /* cause */
+ DeviceIntPtr pXDev,
+ KeyCode first,
+ CARD8 num,
+ XkbChangesPtr pChanges,
+ unsigned int * needChecksRtrn,
+ XkbEventCausePtr cause
);
extern _X_EXPORT KeySymsPtr XkbGetCoreMap(
- DeviceIntPtr /* keybd */
+ DeviceIntPtr keybd
);
extern _X_EXPORT void XkbApplyMappingChange(
- DeviceIntPtr /* pXDev */,
- KeySymsPtr /* map */,
- KeyCode /* firstKey */,
- CARD8 /* num */,
- CARD8 * /* modmap */,
- ClientPtr /* client */
+ DeviceIntPtr pXDev,
+ KeySymsPtr map,
+ KeyCode firstKey,
+ CARD8 num,
+ CARD8 * modmap,
+ ClientPtr client
);
extern _X_EXPORT void XkbSetIndicators(
- DeviceIntPtr /* pXDev */,
- CARD32 /* affect */,
- CARD32 /* values */,
- XkbEventCausePtr /* cause */
+ DeviceIntPtr pXDev,
+ CARD32 affect,
+ CARD32 values,
+ XkbEventCausePtr cause
);
extern _X_EXPORT void XkbUpdateIndicators(
- DeviceIntPtr /* keybd */,
- CARD32 /* changed */,
- Bool /* check_edevs */,
- XkbChangesPtr /* pChanges */,
- XkbEventCausePtr /* cause */
+ DeviceIntPtr keybd,
+ CARD32 changed,
+ Bool check_edevs,
+ XkbChangesPtr pChanges,
+ XkbEventCausePtr cause
);
extern _X_EXPORT XkbSrvLedInfoPtr XkbAllocSrvLedInfo(
- DeviceIntPtr /* dev */,
- KbdFeedbackPtr /* kf */,
- LedFeedbackPtr /* lf */,
- unsigned int /* needed_parts */
+ DeviceIntPtr dev,
+ KbdFeedbackPtr kf,
+ LedFeedbackPtr lf,
+ unsigned int needed_parts
);
extern _X_EXPORT XkbSrvLedInfoPtr XkbCopySrvLedInfo(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* src */,
- KbdFeedbackPtr /* kf */,
- LedFeedbackPtr /* lf */
+ DeviceIntPtr dev,
+ XkbSrvLedInfoPtr src,
+ KbdFeedbackPtr kf,
+ LedFeedbackPtr lf
);
extern _X_EXPORT XkbSrvLedInfoPtr XkbFindSrvLedInfo(
- DeviceIntPtr /* dev */,
- unsigned int /* class */,
- unsigned int /* id */,
- unsigned int /* needed_parts */
+ DeviceIntPtr dev,
+ unsigned int class,
+ unsigned int id,
+ unsigned int needed_parts
);
extern _X_EXPORT void XkbApplyLedNameChanges(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* changed_names */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
+ DeviceIntPtr dev,
+ XkbSrvLedInfoPtr sli,
+ unsigned int changed_names,
+ xkbExtensionDeviceNotify * ed,
+ XkbChangesPtr changes,
+ XkbEventCausePtr cause
);
extern _X_EXPORT void XkbApplyLedMapChanges(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* changed_maps */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
+ DeviceIntPtr dev,
+ XkbSrvLedInfoPtr sli,
+ unsigned int changed_maps,
+ xkbExtensionDeviceNotify * ed,
+ XkbChangesPtr changes,
+ XkbEventCausePtr cause
);
extern _X_EXPORT void XkbApplyLedStateChanges(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* changed_leds */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
+ DeviceIntPtr dev,
+ XkbSrvLedInfoPtr sli,
+ unsigned int changed_leds,
+ xkbExtensionDeviceNotify * ed,
+ XkbChangesPtr changes,
+ XkbEventCausePtr cause
);
extern _X_EXPORT void XkbFlushLedEvents(
- DeviceIntPtr /* dev */,
- DeviceIntPtr /* kbd */,
- XkbSrvLedInfoPtr /* sli */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
+ DeviceIntPtr dev,
+ DeviceIntPtr kbd,
+ XkbSrvLedInfoPtr sli,
+ xkbExtensionDeviceNotify * ed,
+ XkbChangesPtr changes,
+ XkbEventCausePtr cause
);
extern _X_EXPORT unsigned int XkbIndicatorsToUpdate(
- DeviceIntPtr /* dev */,
- unsigned long /* state_changes */,
- Bool /* enabled_ctrl_changes */
+ DeviceIntPtr dev,
+ unsigned long state_changes,
+ Bool enabled_ctrl_changes
);
extern _X_EXPORT void XkbComputeDerivedState(
- XkbSrvInfoPtr /* xkbi */
+ XkbSrvInfoPtr xkbi
);
extern _X_EXPORT void XkbCheckSecondaryEffects(
- XkbSrvInfoPtr /* xkbi */,
- unsigned int /* which */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
+ XkbSrvInfoPtr xkbi,
+ unsigned int which,
+ XkbChangesPtr changes,
+ XkbEventCausePtr cause
);
extern _X_EXPORT void XkbCheckIndicatorMaps(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* which */
+ DeviceIntPtr dev,
+ XkbSrvLedInfoPtr sli,
+ unsigned int which
);
extern _X_EXPORT unsigned int XkbStateChangedFlags(
- XkbStatePtr /* old */,
- XkbStatePtr /* new */
+ XkbStatePtr old,
+ XkbStatePtr new
);
extern _X_EXPORT void XkbSendStateNotify(
- DeviceIntPtr /* kbd */,
- xkbStateNotify * /* pSN */
+ DeviceIntPtr kbd,
+ xkbStateNotify * pSN
);
extern _X_EXPORT void XkbSendMapNotify(
- DeviceIntPtr /* kbd */,
- xkbMapNotify * /* ev */
+ DeviceIntPtr kbd,
+ xkbMapNotify * ev
);
extern _X_EXPORT int XkbComputeControlsNotify(
- DeviceIntPtr /* kbd */,
- XkbControlsPtr /* old */,
- XkbControlsPtr /* new */,
- xkbControlsNotify * /* pCN */,
- Bool /* forceCtrlProc */
+ DeviceIntPtr kbd,
+ XkbControlsPtr old,
+ XkbControlsPtr new,
+ xkbControlsNotify * pCN,
+ Bool forceCtrlProc
);
extern _X_EXPORT void XkbSendControlsNotify(
- DeviceIntPtr /* kbd */,
- xkbControlsNotify * /* ev */
+ DeviceIntPtr kbd,
+ xkbControlsNotify * ev
);
extern _X_EXPORT void XkbSendCompatMapNotify(
- DeviceIntPtr /* kbd */,
- xkbCompatMapNotify * /* ev */
+ DeviceIntPtr kbd,
+ xkbCompatMapNotify * ev
);
extern _X_EXPORT void XkbHandleBell(
- BOOL /* force */,
- BOOL /* eventOnly */,
- DeviceIntPtr /* kbd */,
- CARD8 /* percent */,
- pointer /* ctrl */,
- CARD8 /* class */,
- Atom /* name */,
- WindowPtr /* pWin */,
- ClientPtr /* pClient */
+ BOOL force,
+ BOOL eventOnly,
+ DeviceIntPtr kbd,
+ CARD8 percent,
+ pointer ctrl,
+ CARD8 class,
+ Atom name,
+ WindowPtr pWin,
+ ClientPtr pClient
);
extern _X_EXPORT void XkbSendAccessXNotify(
- DeviceIntPtr /* kbd */,
- xkbAccessXNotify * /* pEv */
+ DeviceIntPtr kbd,
+ xkbAccessXNotify * pEv
);
extern _X_EXPORT void XkbSendNamesNotify(
- DeviceIntPtr /* kbd */,
- xkbNamesNotify * /* ev */
+ DeviceIntPtr kbd,
+ xkbNamesNotify * ev
);
extern _X_EXPORT void XkbSendActionMessage(
- DeviceIntPtr /* kbd */,
- xkbActionMessage * /* ev */
+ DeviceIntPtr kbd,
+ xkbActionMessage * ev
);
extern _X_EXPORT void XkbSendExtensionDeviceNotify(
- DeviceIntPtr /* kbd */,
- ClientPtr /* client */,
- xkbExtensionDeviceNotify * /* ev */
+ DeviceIntPtr kbd,
+ ClientPtr client,
+ xkbExtensionDeviceNotify * ev
);
extern _X_EXPORT void XkbSendNotification(
- DeviceIntPtr /* kbd */,
- XkbChangesPtr /* pChanges */,
- XkbEventCausePtr /* cause */
+ DeviceIntPtr kbd,
+ XkbChangesPtr pChanges,
+ XkbEventCausePtr cause
);
extern _X_EXPORT void XkbProcessKeyboardEvent(
- DeviceEvent* /* event */,
- DeviceIntPtr /* keybd */
+ DeviceEvent* event,
+ DeviceIntPtr keybd
);
extern _X_EXPORT void XkbHandleActions(
- DeviceIntPtr /* dev */,
- DeviceIntPtr /* kbd */,
- DeviceEvent* /* event */
+ DeviceIntPtr dev,
+ DeviceIntPtr kbd,
+ DeviceEvent* event
);
extern _X_EXPORT Bool XkbEnableDisableControls(
- XkbSrvInfoPtr /* xkbi */,
- unsigned long /* change */,
- unsigned long /* newValues */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
+ XkbSrvInfoPtr xkbi,
+ unsigned long change,
+ unsigned long newValues,
+ XkbChangesPtr changes,
+ XkbEventCausePtr cause
);
extern _X_EXPORT void AccessXInit(
- DeviceIntPtr /* dev */
+ DeviceIntPtr dev
);
extern _X_EXPORT Bool AccessXFilterPressEvent(
- DeviceEvent* /* event */,
- DeviceIntPtr /* keybd */
+ DeviceEvent* event,
+ DeviceIntPtr keybd
);
extern _X_EXPORT Bool AccessXFilterReleaseEvent(
- DeviceEvent* /* event */,
- DeviceIntPtr /* keybd */
+ DeviceEvent* event,
+ DeviceIntPtr keybd
);
extern _X_EXPORT void AccessXCancelRepeatKey(
- XkbSrvInfoPtr /* xkbi */,
- KeyCode /* key */
+ XkbSrvInfoPtr xkbi,
+ KeyCode key
);
extern _X_EXPORT void AccessXComputeCurveFactor(
- XkbSrvInfoPtr /* xkbi */,
- XkbControlsPtr /* ctrls */
+ XkbSrvInfoPtr xkbi,
+ XkbControlsPtr ctrls
);
extern _X_EXPORT XkbInterestPtr XkbFindClientResource(
- DevicePtr /* inDev */,
- ClientPtr /* client */
+ DevicePtr inDev,
+ ClientPtr client
);
extern _X_EXPORT XkbInterestPtr XkbAddClientResource(
- DevicePtr /* inDev */,
- ClientPtr /* client */,
- XID /* id */
+ DevicePtr inDev,
+ ClientPtr client,
+ XID id
);
extern _X_EXPORT int XkbRemoveResourceClient(
- DevicePtr /* inDev */,
- XID /* id */
+ DevicePtr inDev,
+ XID id
);
extern _X_EXPORT int XkbDDXAccessXBeep(
- DeviceIntPtr /* dev */,
- unsigned int /* what */,
- unsigned int /* which */
+ DeviceIntPtr dev,
+ unsigned int what,
+ unsigned int which
);
extern _X_EXPORT int XkbDDXUsesSoftRepeat(
- DeviceIntPtr /* dev */
+ DeviceIntPtr dev
);
extern _X_EXPORT void XkbDDXKeybdCtrlProc(
- DeviceIntPtr /* dev */,
- KeybdCtrl * /* ctrl */
+ DeviceIntPtr dev,
+ KeybdCtrl * ctrl
);
extern _X_EXPORT void XkbDDXChangeControls(
- DeviceIntPtr /* dev */,
- XkbControlsPtr /* old */,
- XkbControlsPtr /* new */
+ DeviceIntPtr dev,
+ XkbControlsPtr old,
+ XkbControlsPtr new
);
extern _X_EXPORT void XkbDDXUpdateDeviceIndicators(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- CARD32 /* newState */
+ DeviceIntPtr dev,
+ XkbSrvLedInfoPtr sli,
+ CARD32 newState
);
extern _X_EXPORT int XkbDDXTerminateServer(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
- XkbAction * /* act */
+ DeviceIntPtr dev,
+ KeyCode key,
+ XkbAction * act
);
extern _X_EXPORT int XkbDDXSwitchScreen(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
- XkbAction * /* act */
+ DeviceIntPtr dev,
+ KeyCode key,
+ XkbAction * act
);
extern _X_EXPORT int XkbDDXPrivate(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
- XkbAction * /* act */
+ DeviceIntPtr dev,
+ KeyCode key,
+ XkbAction * act
);
extern _X_EXPORT void XkbDisableComputedAutoRepeats(
- DeviceIntPtr /* pXDev */,
- unsigned int /* key */
+ DeviceIntPtr pXDev,
+ unsigned int key
);
extern _X_EXPORT void XkbSetRepeatKeys(
- DeviceIntPtr /* pXDev */,
- int /* key */,
- int /* onoff */
+ DeviceIntPtr pXDev,
+ int key,
+ int onoff
);
extern _X_EXPORT int XkbLatchModifiers(
- DeviceIntPtr /* pXDev */,
- CARD8 /* mask */,
- CARD8 /* latches */
+ DeviceIntPtr pXDev,
+ CARD8 mask,
+ CARD8 latches
);
extern _X_EXPORT int XkbLatchGroup(
- DeviceIntPtr /* pXDev */,
- int /* group */
+ DeviceIntPtr pXDev,
+ int group
);
extern _X_EXPORT void XkbClearAllLatchesAndLocks(
- DeviceIntPtr /* dev */,
- XkbSrvInfoPtr /* xkbi */,
- Bool /* genEv */,
- XkbEventCausePtr /* cause */
+ DeviceIntPtr dev,
+ XkbSrvInfoPtr xkbi,
+ Bool genEv,
+ XkbEventCausePtr cause
);
extern _X_EXPORT void XkbGetRulesDflts(
- XkbRMLVOSet * /* rmlvo */
+ XkbRMLVOSet * rmlvo
);
extern _X_EXPORT void XkbFreeRMLVOSet(
- XkbRMLVOSet * /* rmlvo */,
- Bool /* freeRMLVO */
+ XkbRMLVOSet * rmlvo,
+ Bool freeRMLVO
);
extern _X_EXPORT void XkbSetRulesDflts(
- XkbRMLVOSet * /* rmlvo */
+ XkbRMLVOSet * rmlvo
);
extern _X_EXPORT void XkbDeleteRulesDflts(
@@ -837,100 +837,100 @@ extern _X_EXPORT void XkbDeleteRulesDflts(
);
extern _X_EXPORT int SProcXkbDispatch(
- ClientPtr /* client */
+ ClientPtr client
);
extern _X_EXPORT XkbGeometryPtr XkbLookupNamedGeometry(
- DeviceIntPtr /* dev */,
- Atom /* name */,
- Bool * /* shouldFree */
+ DeviceIntPtr dev,
+ Atom name,
+ Bool * shouldFree
);
extern _X_EXPORT char * _XkbDupString(
- const char * /* str */
+ const char * str
);
extern _X_EXPORT void XkbConvertCase(
- KeySym /* sym */,
- KeySym * /* lower */,
- KeySym * /* upper */
+ KeySym sym,
+ KeySym * lower,
+ KeySym * upper
);
extern _X_EXPORT Status XkbChangeKeycodeRange(
- XkbDescPtr /* xkb */,
- int /* minKC */,
- int /* maxKC */,
- XkbChangesPtr /* changes */
+ XkbDescPtr xkb,
+ int minKC,
+ int maxKC,
+ XkbChangesPtr changes
);
extern _X_EXPORT void XkbFreeSrvLedInfo(
- XkbSrvLedInfoPtr /* sli */
+ XkbSrvLedInfoPtr sli
);
extern _X_EXPORT void XkbFreeInfo(
- XkbSrvInfoPtr /* xkbi */
+ XkbSrvInfoPtr xkbi
);
extern _X_EXPORT Status XkbChangeTypesOfKey(
- XkbDescPtr /* xkb */,
- int /* key */,
- int /* nGroups */,
- unsigned int /* groups */,
- int * /* newTypesIn */,
- XkbMapChangesPtr /* changes */
+ XkbDescPtr xkb,
+ int key,
+ int nGroups,
+ unsigned int groups,
+ int * newTypesIn,
+ XkbMapChangesPtr changes
);
extern _X_EXPORT int XkbKeyTypesForCoreSymbols(
- XkbDescPtr /* xkb */,
- int /* map_width */,
- KeySym * /* core_syms */,
- unsigned int /* protected */,
- int * /* types_inout */,
- KeySym * /* xkb_syms_rtrn */
+ XkbDescPtr xkb,
+ int map_width,
+ KeySym * core_syms,
+ unsigned int protected,
+ int * types_inout,
+ KeySym * xkb_syms_rtrn
);
extern _X_EXPORT Bool XkbApplyCompatMapToKey(
- XkbDescPtr /* xkb */,
- KeyCode /* key */,
- XkbChangesPtr /* changes */
+ XkbDescPtr xkb,
+ KeyCode key,
+ XkbChangesPtr changes
);
extern _X_EXPORT Bool XkbApplyVirtualModChanges(
- XkbDescPtr /* xkb */,
- unsigned int /* changed */,
- XkbChangesPtr /* changes */
+ XkbDescPtr xkb,
+ unsigned int changed,
+ XkbChangesPtr changes
);
extern _X_EXPORT void XkbSendNewKeyboardNotify(
- DeviceIntPtr /* kbd */,
- xkbNewKeyboardNotify * /* pNKN */
+ DeviceIntPtr kbd,
+ xkbNewKeyboardNotify * pNKN
);
extern Bool XkbCopyKeymap(
- XkbDescPtr /* dst */,
- XkbDescPtr /* src */);
+ XkbDescPtr dst,
+ XkbDescPtr src);
extern _X_EXPORT Bool XkbCopyDeviceKeymap(
- DeviceIntPtr /* dst */,
- DeviceIntPtr /* src */);
+ DeviceIntPtr dst,
+ DeviceIntPtr src);
extern void XkbFilterEvents(
- ClientPtr /* pClient */,
- int /* nEvents */,
- xEvent* /* xE */);
+ ClientPtr pClient,
+ int nEvents,
+ xEvent* xE);
extern int XkbGetEffectiveGroup(
- XkbSrvInfoPtr /* xkbi */,
- XkbStatePtr /* xkbstate */,
- CARD8 /* keycode */);
+ XkbSrvInfoPtr xkbi,
+ XkbStatePtr xkbstate,
+ CARD8 keycode);
extern void XkbMergeLockedPtrBtns(
- DeviceIntPtr /* master */);
+ DeviceIntPtr master);
extern void XkbFakeDeviceButton(
- DeviceIntPtr /* dev */,
- int /* press */,
- int /* button */);
+ DeviceIntPtr dev,
+ int press,
+ int button);
#include "xkbfile.h"
@@ -956,31 +956,31 @@ typedef struct _XkbSrvListInfo {
} XkbSrvListInfoRec,*XkbSrvListInfoPtr;
extern _X_EXPORT Status XkbDDXList(
- DeviceIntPtr /* dev */,
- XkbSrvListInfoPtr /* listing */,
- ClientPtr /* client */
+ DeviceIntPtr dev,
+ XkbSrvListInfoPtr listing,
+ ClientPtr client
);
extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(
- DeviceIntPtr /* keybd */,
- XkbComponentNamesPtr /* names */,
- unsigned int /* want */,
- unsigned int /* need */,
- XkbDescPtr * /* finfoRtrn */,
- char * /* keymapNameRtrn */,
- int /* keymapNameRtrnLen */
+ DeviceIntPtr keybd,
+ XkbComponentNamesPtr names,
+ unsigned int want,
+ unsigned int need,
+ XkbDescPtr * finfoRtrn,
+ char * keymapNameRtrn,
+ int keymapNameRtrnLen
);
extern _X_EXPORT Bool XkbDDXNamesFromRules(
- DeviceIntPtr /* keybd */,
- char * /* rules */,
- XkbRF_VarDefsPtr /* defs */,
- XkbComponentNamesPtr /* names */
+ DeviceIntPtr keybd,
+ char * rules,
+ XkbRF_VarDefsPtr defs,
+ XkbComponentNamesPtr names
);
extern _X_EXPORT XkbDescPtr XkbCompileKeymap(
- DeviceIntPtr /* dev */,
- XkbRMLVOSet * /* rmlvo */
+ DeviceIntPtr dev,
+ XkbRMLVOSet * rmlvo
);
#endif /* _XKBSRV_H_ */
--
1.7.3.4
More information about the xorg-devel
mailing list