src/video/x11/SDL_x11sym.h
changeset 6723 7c464a9ecf48
parent 6675 20f3cdea0fd2
child 6796 424a12862805
     1.1 --- a/src/video/x11/SDL_x11sym.h	Fri Dec 07 19:59:30 2012 -0500
     1.2 +++ b/src/video/x11/SDL_x11sym.h	Fri Dec 07 20:00:42 2012 -0500
     1.3 @@ -37,6 +37,7 @@
     1.4  SDL_X11_SYM(Colormap,XCreateColormap,(Display* a,Window b,Visual* c,int d),(a,b,c,d),return)
     1.5  SDL_X11_SYM(Cursor,XCreatePixmapCursor,(Display* a,Pixmap b,Pixmap c,XColor* d,XColor* e,unsigned int f,unsigned int g),(a,b,c,d,e,f,g),return)
     1.6  SDL_X11_SYM(Cursor,XCreateFontCursor,(Display* a,unsigned int b),(a,b),return)
     1.7 +SDL_X11_SYM(XFontSet,XCreateFontSet,(Display* a, _Xconst char* b, char*** c, int* d, char**	e),(a,b,c,d,e),return)
     1.8  SDL_X11_SYM(GC,XCreateGC,(Display* a,Drawable b,unsigned long c,XGCValues* d),(a,b,c,d),return)
     1.9  SDL_X11_SYM(XImage*,XCreateImage,(Display* a,Visual* b,unsigned int c,int d,int e,char* f,unsigned int g,unsigned int h,int i,int j),(a,b,c,d,e,f,g,h,i,j),return)
    1.10  SDL_X11_SYM(Window,XCreateWindow,(Display* a,Window b,int c,int d,unsigned int e,unsigned int f,unsigned int g,int h,unsigned int i,Visual* j,unsigned long k,XSetWindowAttributes* l),(a,b,c,d,e,f,g,h,i,j,k,l),return)
    1.11 @@ -53,10 +54,12 @@
    1.12  SDL_X11_SYM(int,XFlush,(Display* a),(a),return)
    1.13  SDL_X11_SYM(int,XFree,(void*a),(a),return)
    1.14  SDL_X11_SYM(int,XFreeCursor,(Display* a,Cursor b),(a,b),return)
    1.15 +SDL_X11_SYM(void,XFreeFontSet,(Display* a, XFontSet b),(a,b),)
    1.16  SDL_X11_SYM(int,XFreeGC,(Display* a,GC b),(a,b),return)
    1.17 -SDL_X11_SYM(int,XFreeFontInfo,(char** a,XFontStruct* b,int c),(a,b,c),return)
    1.18 +SDL_X11_SYM(int,XFreeFont,(Display* a, XFontStruct* b),(a,b),return)
    1.19  SDL_X11_SYM(int,XFreeModifiermap,(XModifierKeymap* a),(a),return)
    1.20  SDL_X11_SYM(int,XFreePixmap,(Display* a,Pixmap b),(a,b),return)
    1.21 +SDL_X11_SYM(void,XFreeStringList,(char** a),(a),)
    1.22  SDL_X11_SYM(char*,XGetAtomName,(Display *a,Atom b),(a,b),return)
    1.23  SDL_X11_SYM(int,XGetInputFocus,(Display *a,Window *b,int *c),(a,b,c),return)
    1.24  SDL_X11_SYM(int,XGetErrorDatabaseText,(Display* a,_Xconst char* b,_Xconst char* c,_Xconst char* d,char* e,int f),(a,b,c,d,e,f),return)
    1.25 @@ -78,7 +81,7 @@
    1.26  SDL_X11_SYM(int,XInstallColormap,(Display* a,Colormap b),(a,b),return)
    1.27  SDL_X11_SYM(Atom,XInternAtom,(Display* a,_Xconst char* b,Bool c),(a,b,c),return)
    1.28  SDL_X11_SYM(XPixmapFormatValues*,XListPixmapFormats,(Display* a,int* b),(a,b),return)
    1.29 -SDL_X11_SYM(Font,XLoadFont,(Display* a,_Xconst char* b),(a,b),return)
    1.30 +SDL_X11_SYM(XFontStruct*,XLoadQueryFont,(Display* a,_Xconst char* b),(a,b),return)
    1.31  SDL_X11_SYM(KeySym,XLookupKeysym,(XKeyEvent* a,int b),(a,b),return)
    1.32  SDL_X11_SYM(int,XLookupString,(XKeyEvent* a,char* b,int c,KeySym* d,XComposeStatus* e),(a,b,c,d,e),return)
    1.33  SDL_X11_SYM(int,XMapRaised,(Display* a,Window b),(a,b),return)
    1.34 @@ -91,7 +94,6 @@
    1.35  SDL_X11_SYM(int,XPeekEvent,(Display* a,XEvent* b),(a,b),return)
    1.36  SDL_X11_SYM(int,XPending,(Display* a),(a),return)
    1.37  SDL_X11_SYM(int,XPutImage,(Display* a,Drawable b,GC c,XImage* d,int e,int f,int g,int h,unsigned int i,unsigned int j),(a,b,c,d,e,f,g,h,i,j),return)
    1.38 -SDL_X11_SYM(XFontStruct*,XQueryFont,(Display* a,XID b),(a,b),return)
    1.39  SDL_X11_SYM(int,XQueryKeymap,(Display* a,char *b),(a,b),return)
    1.40  SDL_X11_SYM(Bool,XQueryPointer,(Display* a,Window b,Window* c,Window* d,int* e,int* f,int* g,int* h,unsigned int* i),(a,b,c,d,e,f,g,h,i),return)
    1.41  SDL_X11_SYM(int,XRaiseWindow,(Display* a,Window b),(a,b),return)
    1.42 @@ -181,6 +183,8 @@
    1.43  SDL_X11_SYM(void,XUnsetICFocus,(XIC a),(a),)
    1.44  SDL_X11_SYM(XIM,XOpenIM,(Display* a,struct _XrmHashBucketRec* b,char* c,char* d),(a,b,c,d),return)
    1.45  SDL_X11_SYM(Status,XCloseIM,(XIM a),(a),return)
    1.46 +SDL_X11_SYM(void,Xutf8DrawString,(Display *a, Drawable b, XFontSet c, GC d, int e, int f, _Xconst char *g, int h),(a,b,c,d,e,f,g,h),)
    1.47 +SDL_X11_SYM(int,Xutf8TextExtents,(XFontSet a, _Xconst char*	b, int c, XRectangle* d, XRectangle* e),(a,b,c,d,e),return)
    1.48  #endif
    1.49  
    1.50  #ifndef NO_SHARED_MEMORY