jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update xlib.nim

Browse source 
remove -d:MACROS requirement for xlib shortcut functions
This commit is contained in:
Billingsly Wetherfordshire 2013-10-08 18:02:52 -07:00
commit b226c8ca79
1 changed files with 162 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

113
lib/wrappers/x11/xlib.nim
View file

@ -1811,7 +1811,7 @@ 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
@ -1865,156 +1865,163 @@ when defined(MACROS):
proc XAllocID*(dpy: PDisplay): TXID proc XAllocID*(dpy: PDisplay): TXID
# implementation # implementation
when defined(MACROS): #when defined(MACROS):
template privDisp : expr = cast[PXPrivDisplay](dpy)
proc ConnectionNumber(dpy: PDisplay): cint = proc ConnectionNumber(dpy: PDisplay): cint =
ConnectionNumber = (PXPrivDisplay(dpy))[] .fd privDisp.fd
proc RootWindow(dpy: PDisplay, scr: cint): TWindow = proc RootWindow(dpy: PDisplay, scr: cint): TWindow =
RootWindow = (ScreenOfDisplay(dpy, scr))[] .root ScreenOfDisplay(dpy, scr).root
proc DefaultScreen(dpy: PDisplay): cint = proc DefaultScreen(dpy: PDisplay): cint =
DefaultScreen = (PXPrivDisplay(dpy))[] .default_screen privDisp.default_screen
proc DefaultRootWindow(dpy: PDisplay): TWindow = proc DefaultRootWindow(dpy: PDisplay): TWindow =
DefaultRootWindow = (ScreenOfDisplay(dpy, DefaultScreen(dpy)))[] .root ScreenOfDisplay(dpy, DefaultScreen(dpy)).root
proc DefaultVisual(dpy: PDisplay, scr: cint): PVisual = proc DefaultVisual(dpy: PDisplay, scr: cint): PVisual =
DefaultVisual = (ScreenOfDisplay(dpy, scr))[] .root_visual ScreenOfDisplay(dpy, scr).root_visual
proc DefaultGC(dpy: PDisplay, scr: cint): TGC = proc DefaultGC(dpy: PDisplay, scr: cint): TGC =
DefaultGC = (ScreenOfDisplay(dpy, scr))[] .default_gc ScreenOfDisplay(dpy, scr).default_gc
proc BlackPixel(dpy: PDisplay, scr: cint): culong = proc BlackPixel(dpy: PDisplay, scr: cint): culong =
BlackPixel = (ScreenOfDisplay(dpy, scr))[] .black_pixel ScreenOfDisplay(dpy, scr).black_pixel
proc WhitePixel(dpy: PDisplay, scr: cint): culong = proc WhitePixel(dpy: PDisplay, scr: cint): culong =
WhitePixel = (ScreenOfDisplay(dpy, scr))[] .white_pixel ScreenOfDisplay(dpy, scr).white_pixel
proc QLength(dpy: PDisplay): cint = proc QLength(dpy: PDisplay): cint =
QLength = (PXPrivDisplay(dpy))[] .qlen privDisp.qlen
proc DisplayWidth(dpy: PDisplay, scr: cint): cint = proc DisplayWidth(dpy: PDisplay, scr: cint): cint =
DisplayWidth = (ScreenOfDisplay(dpy, scr))[] .width ScreenOfDisplay(dpy, scr).width
proc DisplayHeight(dpy: PDisplay, scr: cint): cint = proc DisplayHeight(dpy: PDisplay, scr: cint): cint =
DisplayHeight = (ScreenOfDisplay(dpy, scr))[] .height ScreenOfDisplay(dpy, scr).height
proc DisplayWidthMM(dpy: PDisplay, scr: cint): cint = proc DisplayWidthMM(dpy: PDisplay, scr: cint): cint =
DisplayWidthMM = (ScreenOfDisplay(dpy, scr))[] .mwidth ScreenOfDisplay(dpy, scr).mwidth
proc DisplayHeightMM(dpy: PDisplay, scr: cint): cint = proc DisplayHeightMM(dpy: PDisplay, scr: cint): cint =
DisplayHeightMM = (ScreenOfDisplay(dpy, scr))[] .mheight ScreenOfDisplay(dpy, scr).mheight
proc DisplayPlanes(dpy: PDisplay, scr: cint): cint = proc DisplayPlanes(dpy: PDisplay, scr: cint): cint =
DisplayPlanes = (ScreenOfDisplay(dpy, scr))[] .root_depth ScreenOfDisplay(dpy, scr).root_depth
proc DisplayCells(dpy: PDisplay, scr: cint): cint = proc DisplayCells(dpy: PDisplay, scr: cint): cint =
DisplayCells = (DefaultVisual(dpy, scr))[] .map_entries DefaultVisual(dpy, scr).map_entries
proc ScreenCount(dpy: PDisplay): cint = proc ScreenCount(dpy: PDisplay): cint =
ScreenCount = (PXPrivDisplay(dpy))[] .nscreens privDisp.nscreens
proc ServerVendor(dpy: PDisplay): cstring = proc ServerVendor(dpy: PDisplay): cstring =
ServerVendor = (PXPrivDisplay(dpy))[] .vendor privDisp.vendor
proc ProtocolVersion(dpy: PDisplay): cint = proc ProtocolVersion(dpy: PDisplay): cint =
ProtocolVersion = (PXPrivDisplay(dpy))[] .proto_major_version privDisp.proto_major_version
proc ProtocolRevision(dpy: PDisplay): cint = proc ProtocolRevision(dpy: PDisplay): cint =
ProtocolRevision = (PXPrivDisplay(dpy))[] .proto_minor_version privDisp.proto_minor_version
proc VendorRelease(dpy: PDisplay): cint = proc VendorRelease(dpy: PDisplay): cint =
VendorRelease = (PXPrivDisplay(dpy))[] .release privDisp.release
proc DisplayString(dpy: PDisplay): cstring = proc DisplayString(dpy: PDisplay): cstring =
DisplayString = (PXPrivDisplay(dpy))[] .display_name privDisp.display_name
proc DefaultDepth(dpy: PDisplay, scr: cint): cint = proc DefaultDepth(dpy: PDisplay, scr: cint): cint =
DefaultDepth = (ScreenOfDisplay(dpy, scr))[] .root_depth ScreenOfDisplay(dpy, scr).root_depth
proc DefaultColormap(dpy: PDisplay, scr: cint): TColormap = proc DefaultColormap(dpy: PDisplay, scr: cint): TColormap =
DefaultColormap = (ScreenOfDisplay(dpy, scr))[] .cmap ScreenOfDisplay(dpy, scr).cmap
proc BitmapUnit(dpy: PDisplay): cint = proc BitmapUnit(dpy: PDisplay): cint =
BitmapUnit = (PXPrivDisplay(dpy))[] .bitmap_unit privDisp.bitmap_unit
proc BitmapBitOrder(dpy: PDisplay): cint = proc BitmapBitOrder(dpy: PDisplay): cint =
BitmapBitOrder = (PXPrivDisplay(dpy))[] .bitmap_bit_order privDisp.bitmap_bit_order
proc BitmapPad(dpy: PDisplay): cint = proc BitmapPad(dpy: PDisplay): cint =
BitmapPad = (PXPrivDisplay(dpy))[] .bitmap_pad privDisp.bitmap_pad
proc ImageByteOrder(dpy: PDisplay): cint = proc ImageByteOrder(dpy: PDisplay): cint =
ImageByteOrder = (PXPrivDisplay(dpy))[] .byte_order privDisp.byte_order
import unsigned
proc NextRequest(dpy: PDisplay): culong = proc NextRequest(dpy: PDisplay): culong =
NextRequest = ((PXPrivDisplay(dpy))[] .request) + 1 privDisp.request + 1.culong
proc LastKnownRequestProcessed(dpy: PDisplay): culong = proc LastKnownRequestProcessed(dpy: PDisplay): culong =
LastKnownRequestProcessed = (PXPrivDisplay(dpy))[] .last_request_read privDisp.last_request_read
# from fowltek/pointer_arithm, required for ScreenOfDisplay()
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 = proc ScreenOfDisplay(dpy: PDisplay, scr: cint): PScreen =
ScreenOfDisplay = addr((((PXPrivDisplay(dpy))[] .screens)[scr])) #addr(((privDisp.screens)[scr]))
privDisp.screens.offset(scr.int)
proc DefaultScreenOfDisplay(dpy: PDisplay): PScreen = proc DefaultScreenOfDisplay(dpy: PDisplay): PScreen =
DefaultScreenOfDisplay = ScreenOfDisplay(dpy, DefaultScreen(dpy)) ScreenOfDisplay(dpy, DefaultScreen(dpy))
proc DisplayOfScreen(s: PScreen): PDisplay = proc DisplayOfScreen(s: PScreen): PDisplay =
DisplayOfScreen = s[] .display s.display
proc RootWindowOfScreen(s: PScreen): TWindow = proc RootWindowOfScreen(s: PScreen): TWindow =
RootWindowOfScreen = s[] .root s.root
proc BlackPixelOfScreen(s: PScreen): culong = proc BlackPixelOfScreen(s: PScreen): culong =
BlackPixelOfScreen = s[] .black_pixel s.black_pixel
proc WhitePixelOfScreen(s: PScreen): culong = proc WhitePixelOfScreen(s: PScreen): culong =
WhitePixelOfScreen = s[] .white_pixel s.white_pixel
proc DefaultColormapOfScreen(s: PScreen): TColormap = proc DefaultColormapOfScreen(s: PScreen): TColormap =
DefaultColormapOfScreen = s[] .cmap s.cmap
proc DefaultDepthOfScreen(s: PScreen): cint = proc DefaultDepthOfScreen(s: PScreen): cint =
DefaultDepthOfScreen = s[] .root_depth s.root_depth
proc DefaultGCOfScreen(s: PScreen): TGC = proc DefaultGCOfScreen(s: PScreen): TGC =
DefaultGCOfScreen = s[] .default_gc s.default_gc
proc DefaultVisualOfScreen(s: PScreen): PVisual = proc DefaultVisualOfScreen(s: PScreen): PVisual =
DefaultVisualOfScreen = s[] .root_visual s.root_visual
proc WidthOfScreen(s: PScreen): cint = proc WidthOfScreen(s: PScreen): cint =
WidthOfScreen = s[] .width s.width
proc HeightOfScreen(s: PScreen): cint = proc HeightOfScreen(s: PScreen): cint =
HeightOfScreen = s[] .height s.height
proc WidthMMOfScreen(s: PScreen): cint = proc WidthMMOfScreen(s: PScreen): cint =
WidthMMOfScreen = s[] .mwidth s.mwidth
proc HeightMMOfScreen(s: PScreen): cint = proc HeightMMOfScreen(s: PScreen): cint =
HeightMMOfScreen = s[] .mheight s.mheight
proc PlanesOfScreen(s: PScreen): cint = proc PlanesOfScreen(s: PScreen): cint =
PlanesOfScreen = s[] .root_depth s.root_depth
proc CellsOfScreen(s: PScreen): cint = proc CellsOfScreen(s: PScreen): cint =
CellsOfScreen = (DefaultVisualOfScreen(s))[] .map_entries DefaultVisualOfScreen(s).map_entries
proc MinCmapsOfScreen(s: PScreen): cint = proc MinCmapsOfScreen(s: PScreen): cint =
MinCmapsOfScreen = s[] .min_maps s.min_maps
proc MaxCmapsOfScreen(s: PScreen): cint = proc MaxCmapsOfScreen(s: PScreen): cint =
MaxCmapsOfScreen = s[] .max_maps s.max_maps
proc DoesSaveUnders(s: PScreen): TBool = proc DoesSaveUnders(s: PScreen): TBool =
DoesSaveUnders = s[] .save_unders s.save_unders
proc DoesBackingStore(s: PScreen): cint = proc DoesBackingStore(s: PScreen): cint =
DoesBackingStore = s[] .backing_store s.backing_store
proc EventMaskOfScreen(s: PScreen): clong = proc EventMaskOfScreen(s: PScreen): clong =
EventMaskOfScreen = s[] .root_input_mask s.root_input_mask
proc XAllocID(dpy: PDisplay): TXID = proc XAllocID(dpy: PDisplay): TXID =
XAllocID = (PXPrivDisplay(dpy))[] .resource_alloc(dpy) privDisp.resource_alloc(dpy)