We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch porting testjoystick to SDL 2 and drawing hat status

testjoystick_sdl2_and_hats.patch (text/plain), 5.44 KB, created by Ondra Hošek on 2012-08-14 09:15:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ondra Hošek

Created: 2012-08-14 09:15:41 UTC

Size: 5.44 KB

patch

obsolete

>diff -r 9612bcd79130 test/testjoystick.c
>--- a/test/testjoystick.c	Sun Aug 12 23:10:16 2012 -0700
>+++ b/test/testjoystick.c	Tue Aug 14 18:13:48 2012 +0200
>@@ -12,15 +12,6 @@
> 
> /* Simple program to test the SDL joystick routines */
> 
>-#if 1 /* FIXME: Rework this using the 2.0 API */
>-#include <stdio.h>
>-
>-int main(int argc, char *argv[])
>-{
>-    printf("FIXME\n");
>-    return 0;
>-}
>-#else
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
>@@ -35,23 +26,45 @@
> #define SCREEN_HEIGHT	480
> #endif
> 
>+#define MAX_NUM_AXES 6
>+#define MAX_NUM_HATS 2
>+
> void
> WatchJoystick(SDL_Joystick * joystick)
> {
>+    SDL_Window *window;
>     SDL_Surface *screen;
>     const char *name;
>     int i, done;
>     SDL_Event event;
>-    int x, y, draw;
>-    SDL_Rect axis_area[6][2];
>+    int x, y;
>+    SDL_Rect axis_area[MAX_NUM_AXES][2];
>+    int axis_draw[MAX_NUM_AXES];
>+    SDL_Rect hat_area[MAX_NUM_HATS][2];
>+    int hat_draw[MAX_NUM_HATS];
>+    Uint8 hat_pos;
>+    Uint32 black;
>+    Uint32 white;
> 
>-    /* Set a video mode to display joystick axis position */
>-    screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 16, 0);
>-    if (screen == NULL) {
>-        fprintf(stderr, "Couldn't set video mode: %s\n", SDL_GetError());
>+    /* Create a window to display joystick axis position */
>+    window = SDL_CreateWindow("Joystick Test", SDL_WINDOWPOS_CENTERED,
>+                              SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH,
>+                              SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
>+    if (window == NULL) {
>+        fprintf(stderr, "Couldn't create window: %s\n", SDL_GetError());
>         return;
>     }
> 
>+    screen = SDL_GetWindowSurface(window);
>+    if (screen == NULL) {
>+        fprintf(stderr, "Couldn't get surface: %s\n", SDL_GetError());
>+        SDL_DestroyWindow(window);
>+        return;
>+    }
>+
>+    black = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
>+    white = SDL_MapRGB(screen->format, 0xFF, 0xFF, 0xFF);
>+
>     /* Print info about the joystick we are watching */
>     name = SDL_JoystickName(SDL_JoystickIndex(joystick));
>     printf("Watching joystick %d: (%s)\n", SDL_JoystickIndex(joystick),
>@@ -62,7 +75,9 @@
> 
>     /* Initialize drawing rectangles */
>     memset(axis_area, 0, (sizeof axis_area));
>-    draw = 0;
>+    memset(axis_draw, 0, (sizeof axis_draw));
>+    memset(hat_area, 0, (sizeof hat_area));
>+    memset(hat_draw, 0, (sizeof hat_draw));
> 
>     /* Loop, getting joystick events! */
>     done = 0;
>@@ -123,21 +138,22 @@
>             area.w = 32;
>             area.h = 32;
>             if (SDL_JoystickGetButton(joystick, i) == SDL_PRESSED) {
>-                SDL_FillRect(screen, &area, 0xFFFF);
>+                SDL_FillRect(screen, &area, white);
>             } else {
>-                SDL_FillRect(screen, &area, 0x0000);
>+                SDL_FillRect(screen, &area, black);
>             }
>-            SDL_UpdateRects(screen, 1, &area);
>+            SDL_UpdateWindowSurfaceRects(window, &area, 1);
>         }
> 
>         for (i = 0;
>              i < SDL_JoystickNumAxes(joystick) / 2
>              && i < SDL_arraysize(axis_area); ++i) {
>+
>             /* Erase previous axes */
>-            SDL_FillRect(screen, &axis_area[i][draw], 0x0000);
>+            SDL_FillRect(screen, &axis_area[i][axis_draw[i]], black);
> 
>             /* Draw the X/Y axis */
>-            draw = !draw;
>+            axis_draw[i] = !axis_draw[i];
>             x = (((int) SDL_JoystickGetAxis(joystick, i * 2 + 0)) + 32768);
>             x *= SCREEN_WIDTH;
>             x /= 65535;
>@@ -155,15 +171,51 @@
>                 y = SCREEN_HEIGHT - 16;
>             }
> 
>-            axis_area[i][draw].x = (Sint16) x;
>-            axis_area[i][draw].y = (Sint16) y;
>-            axis_area[i][draw].w = 16;
>-            axis_area[i][draw].h = 16;
>-            SDL_FillRect(screen, &axis_area[i][draw], 0xFFFF);
>+            axis_area[i][axis_draw[i]].x = (Sint16) x;
>+            axis_area[i][axis_draw[i]].y = (Sint16) y;
>+            axis_area[i][axis_draw[i]].w = 16;
>+            axis_area[i][axis_draw[i]].h = 16;
>+            SDL_FillRect(screen, &axis_area[i][axis_draw[i]], white);
> 
>-            SDL_UpdateRects(screen, 2, axis_area[i]);
>+            SDL_UpdateWindowSurfaceRects(window, axis_area[i], 2);
>+        }
>+
>+        for (i = 0;
>+             i < SDL_JoystickNumHats(joystick)
>+             && i < SDL_arraysize(hat_area); ++i) {
>+
>+            /* Erase previous hat position */
>+            SDL_FillRect(screen, &hat_area[i][hat_draw[i]], black);
>+
>+            hat_draw[i] = !hat_draw[i];
>+
>+            /* Derive the new position */
>+            hat_pos = SDL_JoystickGetHat(joystick, i);
>+
>+            hat_area[i][hat_draw[i]].x = SCREEN_WIDTH/2;
>+            hat_area[i][hat_draw[i]].y = SCREEN_HEIGHT/2;
>+            hat_area[i][hat_draw[i]].w = 8;
>+            hat_area[i][hat_draw[i]].h = 8;
>+
>+            if (hat_pos & SDL_HAT_UP) {
>+                hat_area[i][hat_draw[i]].y = 0;
>+            } else if (hat_pos & SDL_HAT_DOWN) {
>+                hat_area[i][hat_draw[i]].y = SCREEN_HEIGHT-8;
>+            }
>+
>+            if (hat_pos & SDL_HAT_LEFT) {
>+                hat_area[i][hat_draw[i]].x = 0;
>+            } else if (hat_pos & SDL_HAT_RIGHT) {
>+                hat_area[i][hat_draw[i]].x = SCREEN_WIDTH-8;
>+            }
>+
>+            /* Draw it */
>+            SDL_FillRect(screen, &hat_area[i][hat_draw[i]], white);
>+            SDL_UpdateWindowSurfaceRects(window, hat_area[i], 2);
>         }
>     }
>+
>+    SDL_DestroyWindow(window);
> }
> 
> int
>@@ -211,4 +263,3 @@
> 
>     return (0);
> }
>-#endif

Actions: View | Diff

Attachments on bug 1570: 925 | 926 | 927

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.