Author: ArcRiley
Date: 2008-02-13 01:24:51 -0500 (Wed, 13 Feb 2008)
New Revision: 874
Modified:
trunk/pysoy/include/glx.pxd
Log:
... and a few fixes to glx.pxd
Modified: trunk/pysoy/include/glx.pxd
===================================================================
--- trunk/pysoy/include/glx.pxd 2008-02-13 06:13:50 UTC (rev 873)
+++ trunk/pysoy/include/glx.pxd 2008-02-13 06:24:51 UTC (rev 874)
@@ -116,6 +116,10 @@
GLX_SAMPLE_BUFFERS
GLX_SAMPLES
#
+ # Xlib Misc
+ GXcopy
+ GCFunction
+ #
# Xlib Window Classes
InputOutput
InputOnly
@@ -290,7 +294,7 @@
FirstExtensionError
LastExtensionError
-
+ ctypedef char* XPointer
ctypedef int Bool
ctypedef unsigned long XID
ctypedef XID Window
@@ -312,10 +316,38 @@
ctypedef XID GLXContextID
ctypedef XID GLXWindow
ctypedef XID GLXPbuffer
- ctypedef void* GC
- ctypedef void Display
- ctypedef void Visual
+
+ ctypedef struct XGCValues :
+ int function
+ unsigned long plane_mask
+ unsigned long foreground
+ unsigned long background
+ int line_width
+ int line_style
+ int cap_style
+ int join_style
+ int fill_style
+ int fill_rule
+ int arc_mode
+ Pixmap tile
+ Pixmap stipple
+ int ts_x_origin
+ int ts_y_origin
+ int subwindow_mode
+ Bool graphics_exposures
+ int clip_x_origin
+ int clip_y_origin
+ Pixmap clip_mask
+ int dash_offset
+ char dashes
+
+
+ ctypedef void* GC
+ ctypedef void Display
+ ctypedef void Visual
+
+
ctypedef struct Depth :
int depth
int nvisuals
@@ -395,6 +427,24 @@
Cursor cursor
+ ctypedef struct XImage :
+ int width, height
+ int xoffset
+ int format
+ char *data
+ int byte_order
+ int bitmap_unit
+ int bitmap_bit_order
+ int bitmap_pad
+ int depth
+ int bytes_per_line
+ int bits_per_pixel
+ unsigned long red_mask
+ unsigned long green_mask
+ unsigned long blue_mask
+ XPointer obdata
+
+
ctypedef struct XAnyEvent :
int type
unsigned long serial
@@ -794,9 +844,6 @@
-
-
-
cdef extern from "X11/extensions/xf86vmode.h" :
ctypedef int INT32
ctypedef struct XF86VidModeModeInfo :
@@ -819,58 +866,3 @@
cdef Bool XF86VidModeSwitchToMode ( Display*, int,
XF86VidModeModeInfo* )
cdef Bool XF86VidModeSetViewPort ( Display*, int, int, int )
-
-
-
-
-cdef extern from "X11/X.h" :
- cdef enum :
- GXcopy
- GCFunction
-
-
-
-cdef extern from "X11/Xlib.h" :
- ctypedef char *XPointer
- ctypedef void _XDisplay
-
- ctypedef struct XImage :
- int width, height
- int xoffset
- int format
- char *data
- int byte_order
- int bitmap_unit
- int bitmap_bit_order
- int bitmap_pad
- int depth
- int bytes_per_line
- int bits_per_pixel
- unsigned long red_mask
- unsigned long green_mask
- unsigned long blue_mask
- XPointer obdata
-
- ctypedef struct XGCValues :
- int function
- unsigned long plane_mask
- unsigned long foreground
- unsigned long background
- int line_width
- int line_style
- int cap_style
- int join_style
- int fill_style
- int fill_rule
- int arc_mode
- Pixmap tile
- Pixmap stipple
- int ts_x_origin
- int ts_y_origin
- int subwindow_mode
- Bool graphics_exposures
- int clip_x_origin
- int clip_y_origin
- Pixmap clip_mask
- int dash_offset
- char dashes
_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn
