Author: ArcRiley
Date: 2008-02-13 01:13:50 -0500 (Wed, 13 Feb 2008)
New Revision: 873

Modified:
   trunk/pysoy/include/glx.pxd
Log:
added quite a bit to glx.pxd


Modified: trunk/pysoy/include/glx.pxd
===================================================================
--- trunk/pysoy/include/glx.pxd 2008-02-12 20:53:04 UTC (rev 872)
+++ trunk/pysoy/include/glx.pxd 2008-02-13 06:13:50 UTC (rev 873)
@@ -291,22 +291,30 @@
     LastExtensionError
 
 
-  ctypedef int Bool
-  ctypedef unsigned long Window
-  ctypedef unsigned long Drawable
-  ctypedef unsigned long Pixmap
-  ctypedef unsigned long Cursor
-  ctypedef unsigned long Colormap
-  ctypedef unsigned long GContext
-  ctypedef unsigned long KeySym
+  ctypedef int           Bool
+  ctypedef unsigned long XID
+  ctypedef XID           Window
+  ctypedef XID           Drawable
+  ctypedef XID           Pixmap
+  ctypedef XID           Cursor
+  ctypedef XID           Colormap
+  ctypedef XID           GContext
+  ctypedef XID           KeySym
   ctypedef unsigned char KeyCode
   ctypedef unsigned long Atom
   ctypedef unsigned long VisualID
   ctypedef unsigned long Time
-  ctypedef void *GLXContext
-  ctypedef void *GC
-  ctypedef void Display
-  ctypedef void Visual
+  ctypedef void*         GLXContext
+  ctypedef XID           GLXPixmap
+  ctypedef XID           GLXDrawable
+  ctypedef void*         GLXFBConfig
+  ctypedef XID           GLXFBConfigID
+  ctypedef XID           GLXContextID
+  ctypedef XID           GLXWindow
+  ctypedef XID           GLXPbuffer
+  ctypedef void*         GC
+  ctypedef void          Display
+  ctypedef void          Visual
 
   ctypedef struct Depth :
     int depth
@@ -519,8 +527,6 @@
     XConfigureEvent xconfigure
     XClientMessageEvent xclient
 
-  cdef Display     *XOpenDisplay           ( char* )
-  cdef int          XCloseDisplay          ( Display* )
   cdef char        *DisplayString          ( Display* )
   cdef int          DefaultScreen          ( Display* )
   cdef int          ScreenCount            ( Display* )
@@ -543,7 +549,45 @@
   cdef void         glXDestroyContext      ( Display*, GLXContext )
   cdef Bool         glXMakeCurrent         ( Display*, Window, GLXContext )
   cdef void         glXSwapBuffers         ( Display*, Window )
+  cdef GLXPixmap    glXCreateGLXPixmap     ( Display*, XVisualInfo*, Pixmap )
+  cdef void         glXDestroyGLXPixmap    ( Display*, GLXPixmap )
+  cdef GLXContext   glXGetCurrentContext   ( )
+  #
+  ############################ from Xlib.h #############################
+  # XLoadQueryFont
+  # XQueryFont
+  # XGetMotionEvents
+  # XDeleteModifiermapEntry
+  # XGetModifierMapping
+  # XInsertModifiermapEntry
+  # XNewModifiermap
+  # XCreateImage
+  # XInitImage
+  # XGetImage
+  # XGetSubImage
+  cdef Display     *XOpenDisplay           ( char* )
+  # XrmInitialize
+  # XFetchBytes
+  # XFetchBuffer
+  # XGetAtomName
+  # XGetAtomNames
+  cdef char*        XGetDefault            ( Display*, char*, char* )
+  cdef char*        XDisplayName           ( char* )
+  # XKeysymToString
+  # XSynchronize
+  # XSetAfterFunction
+  # XInternAtom
+  # XInternAtoms
+  # XCopyColormapAndFree
   cdef Colormap     XCreateColormap        ( Display*, Window, Visual*, int )
+  # XCreatePixmapCursor
+  # XCreateGlyphCursor
+  # XCreateFontCursor
+  # XLoadFont
+  cdef GC           XCreateGC              ( Display*, Drawable, unsigned 
long, 
+                                             XGCValues* )
+  cdef GContext     XGContextFromGC        ( GC )
+  cdef void         XFlushGC               ( Display*, GC )
   cdef Pixmap       XCreatePixmap          ( Display*, Window, unsigned int,
                                              unsigned int, unsigned int )
   cdef Pixmap       XCreateBitmapFromData  ( Display*, Window, char*,
@@ -553,15 +597,183 @@
                                              unsigned int, unsigned int,
                                              unsigned long, unsigned long,
                                              unsigned int)
+  # XCreateSimpleWindow
+  # XGetSelectionOwner
   cdef Window       XCreateWindow          ( Display*, Window, int, int, 
                                              unsigned int, unsigned int, 
                                              unsigned int, int, 
                                              unsigned int, Visual*, 
                                              unsigned long,
                                              XSetWindowAttributes* )
+  # XListInstalledColormaps
+  # XListFonts
+  # XListFontsWithInfo
+  # XGetFontPath
+  cdef char**       XListExtensions        ( Display*, int* )
+  # XListProperties
+  # XListHosts
+  # XKeycodeToKeysym
+  cdef KeySym XLookupKeysym                ( XKeyEvent*, int )
+  # XGetKeyboardMapping
+  # XStringToKeysym
+  # XMaxRequestSize
+  # XExtendedMaxRequestSize
+  # XResourceManagerString
+  # XScreenResourceString
+  # XDisplayMotionBufferSize
+  # XVisualIDFromVisual
+  # XInitThreads
+  # XLockDisplay
+  # XUnlockDisplay
+  # XInitExtension
+  # XAddExtension
+  # XFindOnExtensionList
+  # XEHeadOfExtensionList
+  # XRootWindow
+  # XDefaultRootWindow
+  # XRootWindowOfScreen
+  # XDefaultVisual
+  # XDefaultVisualOfScreen
+  cdef GC           XDefaultGC             ( Display*, int )
+  cdef GC           XDefaultGCOfScreen     ( Screen* )
+  # XBlackPixel
+  # XWhitePixel
+  # XAllPlanes
+  # XBlackPixelOfScreen
+  # XWhitePixelOfScreen
+  # XNextRequest
+  # XLastKnownRequestProcessed
+  cdef char*        XServerVendor          ( Display* )
+  cdef char*        XDisplayString         ( Display* )
+  # XDefaultColormap
+  # XDefaultColormapOfScreen
+  # XDisplayOfScreen
+  # XScreenOfDisplay
+  # XDefaultScreenOfDisplay
+  # XEventMaskOfScreen
+  # XScreenNumberOfScreen
+  # XErrorHandler
+  # XSetErrorHandler
+  # XIOErrorHandler
+  # XSetIOErrorHandler
+  # XListPixmapFormats
+  cdef int*         XListDepths            ( Display*, int, int* )
+  # XReconfigureWMWindow
+  # XGetWMProtocols
+  cdef int          XSetWMProtocols        ( Display*, Window, Atom*, int )
+  cdef Status       XIconifyWindow         ( Display*, Window, int )
+  cdef Status       XWithdrawWindow        ( Display*, Window, int )
+  # XGetCommand
+  # XGetWMColormapWindows
+  # XSetWMColormapWindows
+  # XFreeStringList
+  # XSetTransientForHint
+  cdef int          XActivateScreenSaver   ( Display* )
+  # XAddHost
+  # XAddHosts
+  # XAddToExtensionList
+  # XAddToSaveSet
+  # XAllocColor
+  # XAllocColorCells
+  # XAllocColorPlanes
+  # XAllocNamedColor
+  # XAllowEvents
+  cdef int          XAutoRepeatOff         ( Display* )
+  cdef int          XAutoRepeatOn          ( Display* )
+  cdef int          XBell                  ( Display*, int )
+  # XBitmapBitOrder
+  # XBitmapPad
+  # XBitmapUnit
+  # XCellsOfScreen
+  # XChangeActivePointerGrab
+  # XChangeGC
+  # XChangeKeyboardControl
+  # XChangeKeyboardMapping
+  # XChangePointerControl
+  # XChangeProperty
+  # XChangeSaveSet
+  cdef Window       XChangeWindowAttributes( Display*, Window,
+                                             unsigned long,
+                                             XSetWindowAttributes* )
+  # XCheckIfEvent
+  # XCheckMaskEvent
+  # XCheckTypedEvent
+  # XCheckTypedWindowEvent
+  # XCheckWindowEvent
+  # XCirculateSubwindows
+  # XCirculateSubwindowsDown
+  # XCirculateSubwindowsUp
+  # XClearArea
+  # XClearWindow
+  cdef int          XCloseDisplay          ( Display* )
+  # XConfigureWindow
+  # XConnectionNumber
+  # XConvertSelection
+  cdef int          XCopyArea              ( Display*, Drawable, Drawable,
+                                             GC, int, int,
+                                             unsigned int, unsigned int,
+                                             int, int )
+  # XCopyGC
+  # XCopyPlane
+  # XDefaultDepth
+  # XDefaultDepthOfScreen
+  cdef int          XDefaultScreen         ( Display* )
+  # XDefineCursor
+  # XDeleteProperty
   cdef int          XDestroyWindow         ( Display*, Window )
+  # XDestroySubwindows
+  # XDoesBackingStore
+  # XDoesSaveUnders
+  # XDisableAccessControl
+  # XDisplayCells
+  # XDisplayHeight
+  # XDisplayHeightMM
+  # XDisplayKeycodes
+  # XDisplayPlanes
+  # XDisplayWidth
+  # XDisplayWidthMM
+  # XDrawArc
+  # XDrawArcs
+  # XDrawImageString
+  # XDrawImageString16
+  # XDrawLine
+  # XDrawLines
+  # XDrawPoint
+  # XDrawPoints
+  # XDrawRectangle
+  # XDrawRectangles
+  # XDrawSegments
+  # XDrawString
+  # XDrawString16
+  # XDrawText
+  # XDrawText16
+  # XEnableAccessControl
+  # XEventsQueued
+  # XFetchName
+  # XFillArc
+  # XFillArcs
+  # XFillPolygon
+  # XFillRectangle
+  # XFillRectangles
   cdef int          XFlush                 ( Display* )
+  # XForceScreenSaver
+  # XFree
+  # XFreeColormap
+  # XFreeColors
+  # XFreeCursor
+  # XFreeExtensionList
+  # XFreeFont
+  # XFreeFontInfo
+  # XFreeFontNames
+  # XFreeFontPath
+  cdef int          XFreeGC                ( Display*, GC )
+  # XFreeModifiermap
   cdef int          XFreePixmap            ( Display*, Pixmap )
+  # XGeometry
+  # XGetErrorDatabaseText
+  # XGetErrorText
+  # XGetFontProperty
+  # XGetGCValues
   cdef int          XGetGeometry           ( Display*, Window, Window*,
                                              int*, int*, 
                                              unsigned int*, unsigned int*,
@@ -575,17 +787,15 @@
   cdef int          XQueryTree             ( Display*, Window, Window*,
                                              Window*, Window**, unsigned int* )
   cdef int          XResizeWindow          ( Display*, Window, int, int )
-  cdef int          XSetWMProtocols        ( Display*, Window, Atom*, int )
+
   cdef int          XSetStandardProperties ( Display*, Window, char*, char*,
                                              Pixmap, char**, int, XSizeHints* )
   cdef int          XUnmapWindow           ( Display*, Window )
 
 
-  cdef Window       XChangeWindowAttributes( Display*, Window,
-                                             unsigned long,
-                                             XSetWindowAttributes* )
 
 
+
   
 cdef extern from "X11/extensions/xf86vmode.h" :
   ctypedef int INT32
@@ -610,7 +820,6 @@
                                              XF86VidModeModeInfo* )
   cdef Bool XF86VidModeSetViewPort         ( Display*, int, int, int )
   
-  cdef KeySym XLookupKeysym                ( XKeyEvent*, int )
 
 
 
@@ -665,13 +874,3 @@
     Pixmap clip_mask
     int dash_offset
     char dashes
-
-  cdef XImage*  XCreateImage    ( Display*, Visual*, unsigned int,
-                                  int, int, char*, unsigned int,
-                                  unsigned int, int, int )
-  cdef int      XPutImage       ( Display*, Drawable, GC, XImage*, int, int, 
-                                  int, int, unsigned int, unsigned int )
-  cdef GC       XCreateGC       ( Display*, Drawable, unsigned long, 
-                                  XGCValues* )
-  cdef int      XFillRectangle  ( Display*, Drawable, GC, int, int, 
-                                  unsigned int, unsigned int )

_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn

Reply via email to