Sam Lantinga 1 anno fa
parent
commit
d777becd9d
3 ha cambiato i file con 21 aggiunte e 21 eliminazioni
  1. 3 3
      src/video/x11/SDL_x11pen.c
  2. 1 1
      src/video/x11/SDL_x11xfixes.c
  3. 17 17
      src/video/x11/SDL_x11xinput2.c

+ 3 - 3
src/video/x11/SDL_x11pen.c

@@ -494,9 +494,9 @@ void X11_InitPen(SDL_VideoDevice *_this)
 
                 if (axis == -1 && valuator_nr == 5) {
                     /* Wacom model-specific axis support */
-		    /* The meaning of the various axes is highly underspecitied in Xinput2.
-		     * As of 2023-08-26, Wacom seems to be the only vendor to support these axes, so the code below
-		     * captures the de-facto standard. */
+                    /* The meaning of the various axes is highly underspecitied in Xinput2.
+                     * As of 2023-08-26, Wacom seems to be the only vendor to support these axes, so the code below
+                     * captures the de-facto standard. */
                     axis = valuator_5_axis;
 
                     switch (axis) {

+ 1 - 1
src/video/x11/SDL_x11xfixes.c

@@ -81,7 +81,7 @@ int X11_XfixesIsInitialized(void)
 
 int X11_GetXFixesSelectionNotifyEvent()
 {
-	return xfixes_selection_notify_event;
+    return xfixes_selection_notify_event;
 }
 
 void X11_SetWindowMouseRect(SDL_VideoDevice *_this, SDL_Window *window)

+ 17 - 17
src/video/x11/SDL_x11xinput2.c

@@ -390,23 +390,23 @@ int X11_HandleXinput2Event(SDL_VideoDevice *_this, XGenericEventCookie *cookie)
 
             /* Only report button event; if there was also pen movement / pressure changes, we expect
                an XI_Motion event first anyway */
-	    if (button == 1) {
-		/* button 1 is the pen tip */
-		if (pressed && SDL_PenPerformHitTest()) {
-		    /* Check whether we should handle window resize / move events */
-		    SDL_WindowData *windowdata = X11_FindWindow(_this, xev->event);
-		    if (windowdata && X11_TriggerHitTestAction(_this, windowdata, pen->last.x, pen->last.y)) {
-                SDL_SendWindowEvent(windowdata->window, SDL_EVENT_WINDOW_HIT_TEST, 0, 0);
-                return 1; /* Don't pass on this event */
-		    }
-		}
-		SDL_SendPenTipEvent(0, pen->header.id,
-				    pressed ? SDL_PRESSED : SDL_RELEASED);
-	    } else {
-		SDL_SendPenButton(0, pen->header.id,
-				  pressed ? SDL_PRESSED : SDL_RELEASED,
-				  button - 1);
-	    }
+            if (button == 1) {
+                /* button 1 is the pen tip */
+                if (pressed && SDL_PenPerformHitTest()) {
+                    /* Check whether we should handle window resize / move events */
+                    SDL_WindowData *windowdata = X11_FindWindow(_this, xev->event);
+                    if (windowdata && X11_TriggerHitTestAction(_this, windowdata, pen->last.x, pen->last.y)) {
+                        SDL_SendWindowEvent(windowdata->window, SDL_EVENT_WINDOW_HIT_TEST, 0, 0);
+                        return 1; /* Don't pass on this event */
+                    }
+                }
+                SDL_SendPenTipEvent(0, pen->header.id,
+                                    pressed ? SDL_PRESSED : SDL_RELEASED);
+            } else {
+                SDL_SendPenButton(0, pen->header.id,
+                                  pressed ? SDL_PRESSED : SDL_RELEASED,
+                                  button - 1);
+            }
             return 1;
         } else {
             /* Otherwise assume a regular mouse */