comparison src/video/x11/SDL_x11sym.h @ 1248:d2c6881935be

Catch X11 extension errors...since most of these are notifications that we queried for a missing extension (such as the XiG vidmode one that most people don't have), and default Xlib behaviour is to write notification to stderr, this tends to generate incorrect bug reports. Since we'll actually deal with the missing extension when querying for it, we ignore these errors in our hook. The rest continue to pass through to the default handler. Fixes Bugzilla #42. --ryan.
author Ryan C. Gordon <icculus@icculus.org>
date Sat, 14 Jan 2006 08:15:38 +0000
parents a388f2b59044
children 2bf9dda618e5
comparison
equal deleted inserted replaced
1247:ff73ee89ff4b 1248:d2c6881935be
111 SDL_X11_SYM(1,XExtensionInfo*,XextCreateExtension,(void)) 111 SDL_X11_SYM(1,XExtensionInfo*,XextCreateExtension,(void))
112 SDL_X11_SYM(1,void,XextDestroyExtension,(XExtensionInfo*)) 112 SDL_X11_SYM(1,void,XextDestroyExtension,(XExtensionInfo*))
113 SDL_X11_SYM(1,XExtDisplayInfo*,XextFindDisplay,(XExtensionInfo*,Display*)) 113 SDL_X11_SYM(1,XExtDisplayInfo*,XextFindDisplay,(XExtensionInfo*,Display*))
114 SDL_X11_SYM(1,int,XextRemoveDisplay,(XExtensionInfo*,Display*)) 114 SDL_X11_SYM(1,int,XextRemoveDisplay,(XExtensionInfo*,Display*))
115 SDL_X11_SYM(1,Bool,XQueryExtension,(Display*,_Xconst char*,int*,int*,int*)) 115 SDL_X11_SYM(1,Bool,XQueryExtension,(Display*,_Xconst char*,int*,int*,int*))
116 SDL_X11_SYM(1,char *,XDisplayString,(Display*))
117 SDL_X11_SYM(1,int,XGetErrorText,(Display*,int,char*,int))
116 118
117 #ifdef X_HAVE_UTF8_STRING 119 #ifdef X_HAVE_UTF8_STRING
118 SDL_X11_SYM(1,int,Xutf8TextListToTextProperty,(Display*,char**,int,XICCEncodingStyle,XTextProperty*)) 120 SDL_X11_SYM(1,int,Xutf8TextListToTextProperty,(Display*,char**,int,XICCEncodingStyle,XTextProperty*))
119 SDL_X11_SYM(1,int,Xutf8LookupString,(XIC,XKeyPressedEvent*,char*,int,KeySym*,Status*)) 121 SDL_X11_SYM(1,int,Xutf8LookupString,(XIC,XKeyPressedEvent*,char*,int,KeySym*,Status*))
120 SDL_X11_SYM(1,XIC,XCreateIC,(XIM, ...)) 122 SDL_X11_SYM(1,XIC,XCreateIC,(XIM, ...))
157 #endif 159 #endif
158 160
159 SDL_X11_SYM(1,SDL_X11_XSynchronizeRetType,XSynchronize,(Display*,Bool)) 161 SDL_X11_SYM(1,SDL_X11_XSynchronizeRetType,XSynchronize,(Display*,Bool))
160 SDL_X11_SYM(1,SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display*,int,SDL_X11_XESetWireToEventRetType)) 162 SDL_X11_SYM(1,SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display*,int,SDL_X11_XESetWireToEventRetType))
161 SDL_X11_SYM(1,SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display*,int,SDL_X11_XESetEventToWireRetType)) 163 SDL_X11_SYM(1,SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display*,int,SDL_X11_XESetEventToWireRetType))
164 SDL_X11_SYM(1,SDL_X11_XSetExtensionErrorHandlerType,XSetExtensionErrorHandler,(SDL_X11_XSetExtensionErrorHandlerType))
162 165
163 /* end of SDL_x11sym.h ... */ 166 /* end of SDL_x11sym.h ... */
164 167