src/video/x11/SDL_x11xinput2.c
changeset 7827 a03ec8de0426
parent 7679 b1fe132bc6a4
child 7836 b7c1c84c33e3
     1.1 --- a/src/video/x11/SDL_x11xinput2.c	Thu Oct 17 20:49:30 2013 -0700
     1.2 +++ b/src/video/x11/SDL_x11xinput2.c	Fri Oct 18 01:36:41 2013 -0400
     1.3 @@ -36,7 +36,7 @@
     1.4  static int xinput2_multitouch_supported = 0;
     1.5  #endif
     1.6  
     1.7 -/* Opcode returned XQueryExtension
     1.8 +/* Opcode returned X11_XQueryExtension
     1.9   * It will be used in event processing
    1.10   * to know that the event came from
    1.11   * this extension */
    1.12 @@ -82,16 +82,16 @@
    1.13      * "As XI2 progresses it becomes important that you use this call as the server may treat the client
    1.14      * differently depending on the supported version".
    1.15      *
    1.16 -    * FIXME:event and err are not needed but if not passed XQueryExtension returns SegmentationFault
    1.17 +    * FIXME:event and err are not needed but if not passed X11_XQueryExtension returns SegmentationFault
    1.18      */
    1.19      if (!SDL_X11_HAVE_XINPUT2 ||
    1.20 -        !XQueryExtension(data->display, "XInputExtension", &xinput2_opcode, &event, &err)) {
    1.21 +        !X11_XQueryExtension(data->display, "XInputExtension", &xinput2_opcode, &event, &err)) {
    1.22          return;
    1.23      }
    1.24  
    1.25      outmajor = major;
    1.26      outminor = minor;
    1.27 -    if (XIQueryVersion(data->display, &outmajor, &outminor) != Success) {
    1.28 +    if (X11_XIQueryVersion(data->display, &outmajor, &outminor) != Success) {
    1.29          return;
    1.30      }
    1.31  
    1.32 @@ -115,7 +115,7 @@
    1.33  
    1.34      XISetMask(mask, XI_RawMotion);
    1.35  
    1.36 -    if (XISelectEvents(data->display,DefaultRootWindow(data->display),&eventmask,1) != Success) {
    1.37 +    if (X11_XISelectEvents(data->display,DefaultRootWindow(data->display),&eventmask,1) != Success) {
    1.38          return;
    1.39      }
    1.40  #endif
    1.41 @@ -226,7 +226,7 @@
    1.42      XISetMask(mask, XI_TouchUpdate);
    1.43      XISetMask(mask, XI_TouchEnd);
    1.44  
    1.45 -    XISelectEvents(data->display,window_data->xwindow,&eventmask,1);
    1.46 +    X11_XISelectEvents(data->display,window_data->xwindow,&eventmask,1);
    1.47  #endif
    1.48  }
    1.49