Update xlib.nim
remove -d:MACROS requirement for xlib shortcut functions
This commit is contained in:
Billingsly Wetherfordshire
parent
96529063bf
commit
b226c8ca79
1 changed files with 162 additions and 155 deletions
|
|
@ -1811,210 +1811,217 @@ proc XSetAuthorization*(para1: cstring, para2: cint, para3: cstring, para4: cint
|
||||||
# _Xmbtowc?
|
# _Xmbtowc?
|
||||||
# _Xwctomb?
|
# _Xwctomb?
|
||||||
#
|
#
|
||||||
when defined(MACROS):
|
#when defined(MACROS):
|
||||||
proc ConnectionNumber*(dpy: PDisplay): cint
|
proc ConnectionNumber*(dpy: PDisplay): cint
|
||||||
proc RootWindow*(dpy: PDisplay, scr: cint): TWindow
|
proc RootWindow*(dpy: PDisplay, scr: cint): TWindow
|
||||||
proc DefaultScreen*(dpy: PDisplay): cint
|
proc DefaultScreen*(dpy: PDisplay): cint
|
||||||
proc DefaultRootWindow*(dpy: PDisplay): TWindow
|
proc DefaultRootWindow*(dpy: PDisplay): TWindow
|
||||||
proc DefaultVisual*(dpy: PDisplay, scr: cint): PVisual
|
proc DefaultVisual*(dpy: PDisplay, scr: cint): PVisual
|
||||||
proc DefaultGC*(dpy: PDisplay, scr: cint): TGC
|
proc DefaultGC*(dpy: PDisplay, scr: cint): TGC
|
||||||
proc BlackPixel*(dpy: PDisplay, scr: cint): culong
|
proc BlackPixel*(dpy: PDisplay, scr: cint): culong
|
||||||
proc WhitePixel*(dpy: PDisplay, scr: cint): culong
|
proc WhitePixel*(dpy: PDisplay, scr: cint): culong
|
||||||
proc QLength*(dpy: PDisplay): cint
|
proc QLength*(dpy: PDisplay): cint
|
||||||
proc DisplayWidth*(dpy: PDisplay, scr: cint): cint
|
proc DisplayWidth*(dpy: PDisplay, scr: cint): cint
|
||||||
proc DisplayHeight*(dpy: PDisplay, scr: cint): cint
|
proc DisplayHeight*(dpy: PDisplay, scr: cint): cint
|
||||||
proc DisplayWidthMM*(dpy: PDisplay, scr: cint): cint
|
proc DisplayWidthMM*(dpy: PDisplay, scr: cint): cint
|
||||||
proc DisplayHeightMM*(dpy: PDisplay, scr: cint): cint
|
proc DisplayHeightMM*(dpy: PDisplay, scr: cint): cint
|
||||||
proc DisplayPlanes*(dpy: PDisplay, scr: cint): cint
|
proc DisplayPlanes*(dpy: PDisplay, scr: cint): cint
|
||||||
proc DisplayCells*(dpy: PDisplay, scr: cint): cint
|
proc DisplayCells*(dpy: PDisplay, scr: cint): cint
|
||||||
proc ScreenCount*(dpy: PDisplay): cint
|
proc ScreenCount*(dpy: PDisplay): cint
|
||||||
proc ServerVendor*(dpy: PDisplay): cstring
|
proc ServerVendor*(dpy: PDisplay): cstring
|
||||||
proc ProtocolVersion*(dpy: PDisplay): cint
|
proc ProtocolVersion*(dpy: PDisplay): cint
|
||||||
proc ProtocolRevision*(dpy: PDisplay): cint
|
proc ProtocolRevision*(dpy: PDisplay): cint
|
||||||
proc VendorRelease*(dpy: PDisplay): cint
|
proc VendorRelease*(dpy: PDisplay): cint
|
||||||
proc DisplayString*(dpy: PDisplay): cstring
|
proc DisplayString*(dpy: PDisplay): cstring
|
||||||
proc DefaultDepth*(dpy: PDisplay, scr: cint): cint
|
proc DefaultDepth*(dpy: PDisplay, scr: cint): cint
|
||||||
proc DefaultColormap*(dpy: PDisplay, scr: cint): TColormap
|
proc DefaultColormap*(dpy: PDisplay, scr: cint): TColormap
|
||||||
proc BitmapUnit*(dpy: PDisplay): cint
|
proc BitmapUnit*(dpy: PDisplay): cint
|
||||||
proc BitmapBitOrder*(dpy: PDisplay): cint
|
proc BitmapBitOrder*(dpy: PDisplay): cint
|
||||||
proc BitmapPad*(dpy: PDisplay): cint
|
proc BitmapPad*(dpy: PDisplay): cint
|
||||||
proc ImageByteOrder*(dpy: PDisplay): cint
|
proc ImageByteOrder*(dpy: PDisplay): cint
|
||||||
proc NextRequest*(dpy: PDisplay): culong
|
proc NextRequest*(dpy: PDisplay): culong
|
||||||
proc LastKnownRequestProcessed*(dpy: PDisplay): culong
|
proc LastKnownRequestProcessed*(dpy: PDisplay): culong
|
||||||
proc ScreenOfDisplay*(dpy: PDisplay, scr: cint): PScreen
|
proc ScreenOfDisplay*(dpy: PDisplay, scr: cint): PScreen
|
||||||
proc DefaultScreenOfDisplay*(dpy: PDisplay): PScreen
|
proc DefaultScreenOfDisplay*(dpy: PDisplay): PScreen
|
||||||
proc DisplayOfScreen*(s: PScreen): PDisplay
|
proc DisplayOfScreen*(s: PScreen): PDisplay
|
||||||
proc RootWindowOfScreen*(s: PScreen): TWindow
|
proc RootWindowOfScreen*(s: PScreen): TWindow
|
||||||
proc BlackPixelOfScreen*(s: PScreen): culong
|
proc BlackPixelOfScreen*(s: PScreen): culong
|
||||||
proc WhitePixelOfScreen*(s: PScreen): culong
|
proc WhitePixelOfScreen*(s: PScreen): culong
|
||||||
proc DefaultColormapOfScreen*(s: PScreen): TColormap
|
proc DefaultColormapOfScreen*(s: PScreen): TColormap
|
||||||
proc DefaultDepthOfScreen*(s: PScreen): cint
|
proc DefaultDepthOfScreen*(s: PScreen): cint
|
||||||
proc DefaultGCOfScreen*(s: PScreen): TGC
|
proc DefaultGCOfScreen*(s: PScreen): TGC
|
||||||
proc DefaultVisualOfScreen*(s: PScreen): PVisual
|
proc DefaultVisualOfScreen*(s: PScreen): PVisual
|
||||||
proc WidthOfScreen*(s: PScreen): cint
|
proc WidthOfScreen*(s: PScreen): cint
|
||||||
proc HeightOfScreen*(s: PScreen): cint
|
proc HeightOfScreen*(s: PScreen): cint
|
||||||
proc WidthMMOfScreen*(s: PScreen): cint
|
proc WidthMMOfScreen*(s: PScreen): cint
|
||||||
proc HeightMMOfScreen*(s: PScreen): cint
|
proc HeightMMOfScreen*(s: PScreen): cint
|
||||||
proc PlanesOfScreen*(s: PScreen): cint
|
proc PlanesOfScreen*(s: PScreen): cint
|
||||||
proc CellsOfScreen*(s: PScreen): cint
|
proc CellsOfScreen*(s: PScreen): cint
|
||||||
proc MinCmapsOfScreen*(s: PScreen): cint
|
proc MinCmapsOfScreen*(s: PScreen): cint
|
||||||
proc MaxCmapsOfScreen*(s: PScreen): cint
|
proc MaxCmapsOfScreen*(s: PScreen): cint
|
||||||
proc DoesSaveUnders*(s: PScreen): TBool
|
proc DoesSaveUnders*(s: PScreen): TBool
|
||||||
proc DoesBackingStore*(s: PScreen): cint
|
proc DoesBackingStore*(s: PScreen): cint
|
||||||
proc EventMaskOfScreen*(s: PScreen): clong
|
proc EventMaskOfScreen*(s: PScreen): clong
|
||||||
proc XAllocID*(dpy: PDisplay): TXID
|
proc XAllocID*(dpy: PDisplay): TXID
|
||||||
# implementation
|
# implementation
|
||||||
|
|
||||||
when defined(MACROS):
|
#when defined(MACROS):
|
||||||
proc ConnectionNumber(dpy: PDisplay): cint =
|
template privDisp : expr = cast[PXPrivDisplay](dpy)
|
||||||
ConnectionNumber = (PXPrivDisplay(dpy))[] .fd
|
|
||||||
|
|
||||||
proc RootWindow(dpy: PDisplay, scr: cint): TWindow =
|
proc ConnectionNumber(dpy: PDisplay): cint =
|
||||||
RootWindow = (ScreenOfDisplay(dpy, scr))[] .root
|
privDisp.fd
|
||||||
|
|
||||||
proc DefaultScreen(dpy: PDisplay): cint =
|
proc RootWindow(dpy: PDisplay, scr: cint): TWindow =
|
||||||
DefaultScreen = (PXPrivDisplay(dpy))[] .default_screen
|
ScreenOfDisplay(dpy, scr).root
|
||||||
|
|
||||||
proc DefaultRootWindow(dpy: PDisplay): TWindow =
|
proc DefaultScreen(dpy: PDisplay): cint =
|
||||||
DefaultRootWindow = (ScreenOfDisplay(dpy, DefaultScreen(dpy)))[] .root
|
privDisp.default_screen
|
||||||
|
|
||||||
proc DefaultVisual(dpy: PDisplay, scr: cint): PVisual =
|
proc DefaultRootWindow(dpy: PDisplay): TWindow =
|
||||||
DefaultVisual = (ScreenOfDisplay(dpy, scr))[] .root_visual
|
ScreenOfDisplay(dpy, DefaultScreen(dpy)).root
|
||||||
|
|
||||||
proc DefaultGC(dpy: PDisplay, scr: cint): TGC =
|
proc DefaultVisual(dpy: PDisplay, scr: cint): PVisual =
|
||||||
DefaultGC = (ScreenOfDisplay(dpy, scr))[] .default_gc
|
ScreenOfDisplay(dpy, scr).root_visual
|
||||||
|
|
||||||
proc BlackPixel(dpy: PDisplay, scr: cint): culong =
|
proc DefaultGC(dpy: PDisplay, scr: cint): TGC =
|
||||||
BlackPixel = (ScreenOfDisplay(dpy, scr))[] .black_pixel
|
ScreenOfDisplay(dpy, scr).default_gc
|
||||||
|
|
||||||
proc WhitePixel(dpy: PDisplay, scr: cint): culong =
|
proc BlackPixel(dpy: PDisplay, scr: cint): culong =
|
||||||
WhitePixel = (ScreenOfDisplay(dpy, scr))[] .white_pixel
|
ScreenOfDisplay(dpy, scr).black_pixel
|
||||||
|
|
||||||
proc QLength(dpy: PDisplay): cint =
|
proc WhitePixel(dpy: PDisplay, scr: cint): culong =
|
||||||
QLength = (PXPrivDisplay(dpy))[] .qlen
|
ScreenOfDisplay(dpy, scr).white_pixel
|
||||||
|
|
||||||
proc DisplayWidth(dpy: PDisplay, scr: cint): cint =
|
proc QLength(dpy: PDisplay): cint =
|
||||||
DisplayWidth = (ScreenOfDisplay(dpy, scr))[] .width
|
privDisp.qlen
|
||||||
|
|
||||||
proc DisplayHeight(dpy: PDisplay, scr: cint): cint =
|
proc DisplayWidth(dpy: PDisplay, scr: cint): cint =
|
||||||
DisplayHeight = (ScreenOfDisplay(dpy, scr))[] .height
|
ScreenOfDisplay(dpy, scr).width
|
||||||
|
|
||||||
proc DisplayWidthMM(dpy: PDisplay, scr: cint): cint =
|
proc DisplayHeight(dpy: PDisplay, scr: cint): cint =
|
||||||
DisplayWidthMM = (ScreenOfDisplay(dpy, scr))[] .mwidth
|
ScreenOfDisplay(dpy, scr).height
|
||||||
|
|
||||||
proc DisplayHeightMM(dpy: PDisplay, scr: cint): cint =
|
proc DisplayWidthMM(dpy: PDisplay, scr: cint): cint =
|
||||||
DisplayHeightMM = (ScreenOfDisplay(dpy, scr))[] .mheight
|
ScreenOfDisplay(dpy, scr).mwidth
|
||||||
|
|
||||||
proc DisplayPlanes(dpy: PDisplay, scr: cint): cint =
|
proc DisplayHeightMM(dpy: PDisplay, scr: cint): cint =
|
||||||
DisplayPlanes = (ScreenOfDisplay(dpy, scr))[] .root_depth
|
ScreenOfDisplay(dpy, scr).mheight
|
||||||
|
|
||||||
proc DisplayCells(dpy: PDisplay, scr: cint): cint =
|
proc DisplayPlanes(dpy: PDisplay, scr: cint): cint =
|
||||||
DisplayCells = (DefaultVisual(dpy, scr))[] .map_entries
|
ScreenOfDisplay(dpy, scr).root_depth
|
||||||
|
|
||||||
proc ScreenCount(dpy: PDisplay): cint =
|
proc DisplayCells(dpy: PDisplay, scr: cint): cint =
|
||||||
ScreenCount = (PXPrivDisplay(dpy))[] .nscreens
|
DefaultVisual(dpy, scr).map_entries
|
||||||
|
|
||||||
proc ServerVendor(dpy: PDisplay): cstring =
|
proc ScreenCount(dpy: PDisplay): cint =
|
||||||
ServerVendor = (PXPrivDisplay(dpy))[] .vendor
|
privDisp.nscreens
|
||||||
|
|
||||||
proc ProtocolVersion(dpy: PDisplay): cint =
|
proc ServerVendor(dpy: PDisplay): cstring =
|
||||||
ProtocolVersion = (PXPrivDisplay(dpy))[] .proto_major_version
|
privDisp.vendor
|
||||||
|
|
||||||
proc ProtocolRevision(dpy: PDisplay): cint =
|
proc ProtocolVersion(dpy: PDisplay): cint =
|
||||||
ProtocolRevision = (PXPrivDisplay(dpy))[] .proto_minor_version
|
privDisp.proto_major_version
|
||||||
|
|
||||||
proc VendorRelease(dpy: PDisplay): cint =
|
proc ProtocolRevision(dpy: PDisplay): cint =
|
||||||
VendorRelease = (PXPrivDisplay(dpy))[] .release
|
privDisp.proto_minor_version
|
||||||
|
|
||||||
proc DisplayString(dpy: PDisplay): cstring =
|
proc VendorRelease(dpy: PDisplay): cint =
|
||||||
DisplayString = (PXPrivDisplay(dpy))[] .display_name
|
privDisp.release
|
||||||
|
|
||||||
proc DefaultDepth(dpy: PDisplay, scr: cint): cint =
|
proc DisplayString(dpy: PDisplay): cstring =
|
||||||
DefaultDepth = (ScreenOfDisplay(dpy, scr))[] .root_depth
|
privDisp.display_name
|
||||||
|
|
||||||
proc DefaultColormap(dpy: PDisplay, scr: cint): TColormap =
|
proc DefaultDepth(dpy: PDisplay, scr: cint): cint =
|
||||||
DefaultColormap = (ScreenOfDisplay(dpy, scr))[] .cmap
|
ScreenOfDisplay(dpy, scr).root_depth
|
||||||
|
|
||||||
proc BitmapUnit(dpy: PDisplay): cint =
|
proc DefaultColormap(dpy: PDisplay, scr: cint): TColormap =
|
||||||
BitmapUnit = (PXPrivDisplay(dpy))[] .bitmap_unit
|
ScreenOfDisplay(dpy, scr).cmap
|
||||||
|
|
||||||
proc BitmapBitOrder(dpy: PDisplay): cint =
|
proc BitmapUnit(dpy: PDisplay): cint =
|
||||||
BitmapBitOrder = (PXPrivDisplay(dpy))[] .bitmap_bit_order
|
privDisp.bitmap_unit
|
||||||
|
|
||||||
proc BitmapPad(dpy: PDisplay): cint =
|
proc BitmapBitOrder(dpy: PDisplay): cint =
|
||||||
BitmapPad = (PXPrivDisplay(dpy))[] .bitmap_pad
|
privDisp.bitmap_bit_order
|
||||||
|
|
||||||
proc ImageByteOrder(dpy: PDisplay): cint =
|
proc BitmapPad(dpy: PDisplay): cint =
|
||||||
ImageByteOrder = (PXPrivDisplay(dpy))[] .byte_order
|
privDisp.bitmap_pad
|
||||||
|
|
||||||
proc NextRequest(dpy: PDisplay): culong =
|
proc ImageByteOrder(dpy: PDisplay): cint =
|
||||||
NextRequest = ((PXPrivDisplay(dpy))[] .request) + 1
|
privDisp.byte_order
|
||||||
|
|
||||||
proc LastKnownRequestProcessed(dpy: PDisplay): culong =
|
import unsigned
|
||||||
LastKnownRequestProcessed = (PXPrivDisplay(dpy))[] .last_request_read
|
proc NextRequest(dpy: PDisplay): culong =
|
||||||
|
privDisp.request + 1.culong
|
||||||
|
|
||||||
proc ScreenOfDisplay(dpy: PDisplay, scr: cint): PScreen =
|
proc LastKnownRequestProcessed(dpy: PDisplay): culong =
|
||||||
ScreenOfDisplay = addr((((PXPrivDisplay(dpy))[] .screens)[scr]))
|
privDisp.last_request_read
|
||||||
|
|
||||||
proc DefaultScreenOfDisplay(dpy: PDisplay): PScreen =
|
# from fowltek/pointer_arithm, required for ScreenOfDisplay()
|
||||||
DefaultScreenOfDisplay = ScreenOfDisplay(dpy, DefaultScreen(dpy))
|
proc offset[A] (some: ptr A; b: int): ptr A =
|
||||||
|
cast[ptr A](cast[int](some) + (b * sizeof(A)))
|
||||||
|
proc ScreenOfDisplay(dpy: PDisplay, scr: cint): PScreen =
|
||||||
|
#addr(((privDisp.screens)[scr]))
|
||||||
|
privDisp.screens.offset(scr.int)
|
||||||
|
|
||||||
proc DisplayOfScreen(s: PScreen): PDisplay =
|
proc DefaultScreenOfDisplay(dpy: PDisplay): PScreen =
|
||||||
DisplayOfScreen = s[] .display
|
ScreenOfDisplay(dpy, DefaultScreen(dpy))
|
||||||
|
|
||||||
proc RootWindowOfScreen(s: PScreen): TWindow =
|
proc DisplayOfScreen(s: PScreen): PDisplay =
|
||||||
RootWindowOfScreen = s[] .root
|
s.display
|
||||||
|
|
||||||
proc BlackPixelOfScreen(s: PScreen): culong =
|
proc RootWindowOfScreen(s: PScreen): TWindow =
|
||||||
BlackPixelOfScreen = s[] .black_pixel
|
s.root
|
||||||
|
|
||||||
proc WhitePixelOfScreen(s: PScreen): culong =
|
proc BlackPixelOfScreen(s: PScreen): culong =
|
||||||
WhitePixelOfScreen = s[] .white_pixel
|
s.black_pixel
|
||||||
|
|
||||||
proc DefaultColormapOfScreen(s: PScreen): TColormap =
|
proc WhitePixelOfScreen(s: PScreen): culong =
|
||||||
DefaultColormapOfScreen = s[] .cmap
|
s.white_pixel
|
||||||
|
|
||||||
proc DefaultDepthOfScreen(s: PScreen): cint =
|
proc DefaultColormapOfScreen(s: PScreen): TColormap =
|
||||||
DefaultDepthOfScreen = s[] .root_depth
|
s.cmap
|
||||||
|
|
||||||
proc DefaultGCOfScreen(s: PScreen): TGC =
|
proc DefaultDepthOfScreen(s: PScreen): cint =
|
||||||
DefaultGCOfScreen = s[] .default_gc
|
s.root_depth
|
||||||
|
|
||||||
proc DefaultVisualOfScreen(s: PScreen): PVisual =
|
proc DefaultGCOfScreen(s: PScreen): TGC =
|
||||||
DefaultVisualOfScreen = s[] .root_visual
|
s.default_gc
|
||||||
|
|
||||||
proc WidthOfScreen(s: PScreen): cint =
|
proc DefaultVisualOfScreen(s: PScreen): PVisual =
|
||||||
WidthOfScreen = s[] .width
|
s.root_visual
|
||||||
|
|
||||||
proc HeightOfScreen(s: PScreen): cint =
|
proc WidthOfScreen(s: PScreen): cint =
|
||||||
HeightOfScreen = s[] .height
|
s.width
|
||||||
|
|
||||||
proc WidthMMOfScreen(s: PScreen): cint =
|
proc HeightOfScreen(s: PScreen): cint =
|
||||||
WidthMMOfScreen = s[] .mwidth
|
s.height
|
||||||
|
|
||||||
proc HeightMMOfScreen(s: PScreen): cint =
|
proc WidthMMOfScreen(s: PScreen): cint =
|
||||||
HeightMMOfScreen = s[] .mheight
|
s.mwidth
|
||||||
|
|
||||||
proc PlanesOfScreen(s: PScreen): cint =
|
proc HeightMMOfScreen(s: PScreen): cint =
|
||||||
PlanesOfScreen = s[] .root_depth
|
s.mheight
|
||||||
|
|
||||||
proc CellsOfScreen(s: PScreen): cint =
|
proc PlanesOfScreen(s: PScreen): cint =
|
||||||
CellsOfScreen = (DefaultVisualOfScreen(s))[] .map_entries
|
s.root_depth
|
||||||
|
|
||||||
proc MinCmapsOfScreen(s: PScreen): cint =
|
proc CellsOfScreen(s: PScreen): cint =
|
||||||
MinCmapsOfScreen = s[] .min_maps
|
DefaultVisualOfScreen(s).map_entries
|
||||||
|
|
||||||
proc MaxCmapsOfScreen(s: PScreen): cint =
|
proc MinCmapsOfScreen(s: PScreen): cint =
|
||||||
MaxCmapsOfScreen = s[] .max_maps
|
s.min_maps
|
||||||
|
|
||||||
proc DoesSaveUnders(s: PScreen): TBool =
|
proc MaxCmapsOfScreen(s: PScreen): cint =
|
||||||
DoesSaveUnders = s[] .save_unders
|
s.max_maps
|
||||||
|
|
||||||
proc DoesBackingStore(s: PScreen): cint =
|
proc DoesSaveUnders(s: PScreen): TBool =
|
||||||
DoesBackingStore = s[] .backing_store
|
s.save_unders
|
||||||
|
|
||||||
proc EventMaskOfScreen(s: PScreen): clong =
|
proc DoesBackingStore(s: PScreen): cint =
|
||||||
EventMaskOfScreen = s[] .root_input_mask
|
s.backing_store
|
||||||
|
|
||||||
proc XAllocID(dpy: PDisplay): TXID =
|
proc EventMaskOfScreen(s: PScreen): clong =
|
||||||
XAllocID = (PXPrivDisplay(dpy))[] .resource_alloc(dpy)
|
s.root_input_mask
|
||||||
|
|
||||||
|
proc XAllocID(dpy: PDisplay): TXID =
|
||||||
|
privDisp.resource_alloc(dpy)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue