Support for HID devices (mice and keyboards only for now) has been added

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403589

src/video/qnxgf/SDL_gf_input.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2009 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+
+    QNX Graphics Framework SDL driver
+    Copyright (C) 2009 Mike Gorchak
+    (mike@malva.ua, lestat@i.com.ua)
+*/
+
+#ifndef __SDL_GF_INPUT_H__
+#define __SDL_GF_INPUT_H__
+
+#include "SDL_config.h"
+#include "SDL_video.h"
+#include "../SDL_sysvideo.h"
+
+#include <errno.h>
+
+#include <gf/gf.h>
+
+#include <sys/hiddi.h>
+#include <sys/hidut.h>
+
+#include "SDL_qnxgf.h"
+
+typedef struct SDL_MouseData
+{
+   SDL_DisplayData* didata;
+} SDL_MouseData;
+
+int32_t gf_addinputdevices(_THIS);
+int32_t gf_delinputdevices(_THIS);
+
+#define SDL_GF_MOUSE_COLOR_BLACK 0xFF000000
+#define SDL_GF_MOUSE_COLOR_WHITE 0xFFFFFFFF
+#define SDL_GF_MOUSE_COLOR_TRANS 0x00000000
+
+/*****************************************************************************/
+/* This is HIDDI closed interface declarations                               */
+/*****************************************************************************/
+#define HID_TYPE_MAIN      0x0
+#define HID_TYPE_GLOBAL    0x1
+#define HID_TYPE_LOCAL     0x2
+#define HID_TYPE_RESERVED  0x3
+
+#define HID_GLOBAL_USAGE_PAGE 0x0
+#define HID_LOCAL_USAGE       0x0
+
+typedef struct _hid_byte
+{
+   uint8_t HIDB_Length;
+   uint8_t HIDB_Type;
+   uint8_t HIDB_Tag;
+   uint8_t reserved[1];
+} hid_byte_t;
+
+typedef struct _hidd_global_item
+{
+   uint16_t usage_page;
+   uint16_t logical_min;
+   uint16_t logical_max;
+   uint16_t physical_min;
+   uint16_t physical_max;
+   uint16_t unit_expo;
+   uint16_t unit;
+   uint16_t report_size;
+   uint16_t report_id;
+   uint16_t report_count;
+} hidd_global_item_t;
+
+typedef struct _hidd_local_item
+{
+   uint16_t type;
+   uint8_t  reserved[2];
+   uint32_t value;
+   struct _hidd_local_item* next_local;
+   struct _hidd_local_item* alt_local;
+} hidd_local_item_t;
+
+typedef struct _hidd_local_table
+{
+   hidd_local_item_t* usage_info;
+   hidd_local_item_t* designator_info;
+   hidd_local_item_t* string_info;
+   uint8_t delimiter;
+   uint8_t reserved[3];
+} hidd_local_table_t;
+
+typedef struct _hidd_field
+{
+   struct hidd_report_instance* report;
+   struct hidd_collection* collection;
+   uint16_t report_offset;
+   uint16_t flags;
+   hidd_global_item_t  gitem;
+   hidd_local_table_t* ltable;
+   struct _hidd_field* next_field;
+   void* user;
+} hidd_field_t;
+
+typedef struct hidd_report_instance
+{
+   uint8_t       report_id;
+   uint8_t       reserved[1];
+   uint16_t      report_type;
+   hidd_field_t* field;
+   uint16_t      num_field;
+   uint16_t      byte_len;
+   uint16_t      bit_len;
+   uint8_t       reserved2[2];
+   struct hidd_collection* collection;
+   struct hidd_report_instance* next_col_report;
+   struct hidd_report_instance* next_report;
+} hidd_report_instance_t;
+
+typedef struct hidd_report
+{
+   TAILQ_ENTRY(hidd_report) link;
+   hidd_report_instance_t* rinst;
+   hidd_device_instance_t* dev_inst;
+   uint32_t flags;
+   struct hidd_connection* connection;
+   void* user;
+} hidd_report_t;
+
+typedef struct hidview_device
+{
+   struct hidd_report_instance* instance;
+   struct hidd_report* report;
+} hidview_device_t;
+
+/*****************************************************************************/
+/* Closed HIDDI interface declarations end                                   */
+/*****************************************************************************/
+
+/* Maximum devices and subdevices amount per host */
+#define SDL_HIDDI_MAX_DEVICES 64
+
+/* Detected device/subdevice type for SDL */
+#define SDL_GF_HIDDI_NONE     0x00000000
+#define SDL_GF_HIDDI_MOUSE    0x00000001
+#define SDL_GF_HIDDI_KEYBOARD 0x00000002
+#define SDL_GF_HIDDI_JOYSTICK 0x00000003
+
+extern void hiddi_enable_mouse();
+extern void hiddi_disable_mouse();
+
+#endif /* __SDL_GF_INPUT_H__ */

src/video/qnxgf/SDL_gf_opengles.c

-Date: Mon, 23 Mar 2009 09:17:24 +0200
-From: "Mike Gorchak" <mike@malva.ua>
-To: "Sam Lantinga" <slouken@devolution.com>
-Subject: New QNX patches
-
 /*
     SDL - Simple DirectMedia Layer
     Copyright (C) 1997-2009 Sam Lantinga
@@ -53,4 +48,3 @@ GLAPI void APIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte
    glColor4f(((GLfloat)red)/255.f, ((GLfloat)green)/255.f, ((GLfloat)blue)/255.f, ((GLfloat)alpha)/255.f);
    return;
 }
-

src/video/qnxgf/SDL_gf_opengles.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2009 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+
+    QNX Graphics Framework SDL driver
+    Copyright (C) 2009 Mike Gorchak
+    (mike@malva.ua, lestat@i.com.ua)
+*/
+
+#ifndef __SDL_GF_OPENGLES_H__
+#define __SDL_GF_OPENGLES_H__
+
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+
+GLAPI void APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint* params);
+GLAPI void APIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
+
+#endif /* __SDL_GF_OPENGLES_H__ */

src/video/qnxgf/SDL_gf_render.c

@@ -222,7 +222,6 @@ static SDL_Renderer* gf_createrenderer(SDL_Window* window, Uint32 flags)
    for (it=0; it<rdata->surfaces_count; it++)
    {
       /* TODO: add palette creation */
-      /*       do not waste surfaces when using GL ES */
 
       /* Create displayable surfaces */
       status=gf_surface_create_layer(&rdata->surface[it], &didata->layer, 1, 0,
@@ -236,6 +235,7 @@ static SDL_Renderer* gf_createrenderer(SDL_Window* window, Uint32 flags)
          for (jt=it-1; jt>0; jt--)
          {
             gf_surface_free(rdata->surface[jt]);
+            rdata->surface[jt]=NULL;
          }
          SDL_free(rdata);
          SDL_free(renderer);
@@ -288,10 +288,10 @@ static int gf_activaterenderer(SDL_Renderer* renderer)
    SDL_DisplayData* didata = (SDL_DisplayData*)display->driverdata;
 
    /* Setup current surface as visible */
-   gf_layer_set_surfaces(didata->layer, &rdata->surface[rdata->surface_visible_idx], 1);
+//   gf_layer_set_surfaces(didata->layer, &rdata->surface[rdata->surface_visible_idx], 1);
 
    /* Set visible surface when hardware in idle state */
-   gf_layer_update(didata->layer, GF_LAYER_UPDATE_NO_WAIT_IDLE);
+//   gf_layer_update(didata->layer, GF_LAYER_UPDATE_NO_WAIT_IDLE);
 
    return 0;
 }
@@ -390,9 +390,12 @@ static void gf_destroyrenderer(SDL_Renderer* renderer)
    uint32_t it;
 
    for (it=0; it<rdata->surfaces_count; it++)
+   {
+      if (rdata->surface[it]!=NULL)
       {
          gf_surface_free(rdata->surface[it]);
       }
+   }
 }
 
 /* vi: set ts=4 sw=4 expandtab: */

src/video/qnxgf/SDL_hiddi_joystick.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2009 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+
+    QNX Graphics Framework SDL driver
+    Copyright (C) 2009 Mike Gorchak
+    (mike@malva.ua, lestat@i.com.ua)
+*/
+
+#ifndef __SDL_HIDDI_JOYSTICK_H__
+#define __SDL_HIDDI_JOYSTICK_H__
+
+#include <inttypes.h>
+
+
+
+#endif /* __SDL_HIDDI_JOYSTICK_H__ */

src/video/qnxgf/SDL_hiddi_keyboard.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2009 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+
+    QNX Graphics Framework SDL driver
+    Copyright (C) 2009 Mike Gorchak
+    (mike@malva.ua, lestat@i.com.ua)
+*/
+
+#ifndef __SDL_HIDDI_KEYBOARD_H__
+#define __SDL_HIDDI_KEYBOARD_H__
+
+#include <inttypes.h>
+
+/* PS/2 and USB keyboards are generating this packet */
+typedef struct key_packet
+{
+   uint8_t modifiers;
+   uint8_t data;
+   uint8_t codes[6];
+} key_packet;
+
+/* Key modifier codes */
+#define HIDDI_MKEY_LEFT_CTRL            0x00000001
+#define HIDDI_MKEY_LEFT_SHIFT           0x00000002
+#define HIDDI_MKEY_LEFT_ALT             0x00000004
+#define HIDDI_MKEY_LEFT_WFLAG           0x00000008
+#define HIDDI_MKEY_RIGHT_CTRL           0x00000010
+#define HIDDI_MKEY_RIGHT_SHIFT          0x00000020
+#define HIDDI_MKEY_RIGHT_ALT            0x00000040
+#define HIDDI_MKEY_RIGHT_WFLAG          0x00000080
+
+/* Key codes */
+#define HIDDI_KEY_UNPRESSED             0x00000000
+#define HIDDI_KEY_OVERFLOW              0x00000001
+#define HIDDI_KEY_ESC                   0x00000029
+#define HIDDI_KEY_F1                    0x0000003A
+#define HIDDI_KEY_F2                    0x0000003B
+#define HIDDI_KEY_F3                    0x0000003C
+#define HIDDI_KEY_F4                    0x0000003D
+#define HIDDI_KEY_F5                    0x0000003E
+#define HIDDI_KEY_F6                    0x0000003F
+#define HIDDI_KEY_F7                    0x00000040
+#define HIDDI_KEY_F8                    0x00000041
+#define HIDDI_KEY_F9                    0x00000042
+#define HIDDI_KEY_F10                   0x00000043
+#define HIDDI_KEY_F11                   0x00000044
+#define HIDDI_KEY_F12                   0x00000045
+
+#define HIDDI_KEY_BACKQUOTE             0x00000035
+#define HIDDI_KEY_1                     0x0000001E
+#define HIDDI_KEY_2                     0x0000001F
+#define HIDDI_KEY_3                     0x00000020
+#define HIDDI_KEY_4                     0x00000021
+#define HIDDI_KEY_5                     0x00000022
+#define HIDDI_KEY_6                     0x00000023
+#define HIDDI_KEY_7                     0x00000024
+#define HIDDI_KEY_8                     0x00000025
+#define HIDDI_KEY_9                     0x00000026
+#define HIDDI_KEY_0                     0x00000027
+#define HIDDI_KEY_MINUS                 0x0000002D
+#define HIDDI_KEY_EQUAL                 0x0000002E
+#define HIDDI_KEY_BACKSPACE             0x0000002A
+
+#define HIDDI_KEY_TAB                   0x0000002B
+#define HIDDI_KEY_Q                     0x00000014
+#define HIDDI_KEY_W                     0x0000001A
+#define HIDDI_KEY_E                     0x00000008
+#define HIDDI_KEY_R                     0x00000015
+#define HIDDI_KEY_T                     0x00000017
+#define HIDDI_KEY_Y                     0x0000001C
+#define HIDDI_KEY_U                     0x00000018
+#define HIDDI_KEY_I                     0x0000000C
+#define HIDDI_KEY_O                     0x00000012
+#define HIDDI_KEY_P                     0x00000013
+#define HIDDI_KEY_LEFT_SQ_BRACKET       0x0000002F
+#define HIDDI_KEY_RIGHT_SQ_BRACKET      0x00000030
+#define HIDDI_KEY_BACKSLASH             0x00000031
+
+#define HIDDI_KEY_CAPSLOCK              0x00000039
+#define HIDDI_KEY_A                     0x00000004
+#define HIDDI_KEY_S                     0x00000016
+#define HIDDI_KEY_D                     0x00000007
+#define HIDDI_KEY_F                     0x00000009
+#define HIDDI_KEY_G                     0x0000000A
+#define HIDDI_KEY_H                     0x0000000B
+#define HIDDI_KEY_J                     0x0000000D
+#define HIDDI_KEY_K                     0x0000000E
+#define HIDDI_KEY_L                     0x0000000F
+#define HIDDI_KEY_SEMICOLON             0x00000033
+#define HIDDI_KEY_QUOTE                 0x00000034
+#define HIDDI_KEY_ENTER                 0x00000028
+
+#define HIDDI_KEY_Z                     0x0000001D
+#define HIDDI_KEY_X                     0x0000001B
+#define HIDDI_KEY_C                     0x00000006
+#define HIDDI_KEY_V                     0x00000019
+#define HIDDI_KEY_B                     0x00000005
+#define HIDDI_KEY_N                     0x00000011
+#define HIDDI_KEY_M                     0x00000010
+#define HIDDI_KEY_COMMA                 0x00000036
+#define HIDDI_KEY_POINT                 0x00000037
+#define HIDDI_KEY_SLASH                 0x00000038
+
+#define HIDDI_KEY_SPACE                 0x0000002C
+#define HIDDI_KEY_MENU                  0x00000065
+
+#define HIDDI_KEY_PRINTSCREEN           0x00000046
+#define HIDDI_KEY_SCROLLLOCK            0x00000047
+#define HIDDI_KEY_PAUSE                 0x00000048
+
+#define HIDDI_KEY_INSERT                0x00000049
+#define HIDDI_KEY_HOME                  0x0000004A
+#define HIDDI_KEY_PAGEUP                0x0000004B
+#define HIDDI_KEY_DELETE                0x0000004C
+#define HIDDI_KEY_END                   0x0000004D
+#define HIDDI_KEY_PAGEDOWN              0x0000004E
+
+#define HIDDI_KEY_UP                    0x00000052
+#define HIDDI_KEY_LEFT                  0x00000050
+#define HIDDI_KEY_DOWN                  0x00000051
+#define HIDDI_KEY_RIGHT                 0x0000004F
+
+#define HIDDI_KEY_NUMLOCK               0x00000053
+#define HIDDI_KEY_GR_SLASH              0x00000054
+#define HIDDI_KEY_GR_ASTERISK           0x00000055
+#define HIDDI_KEY_GR_MINUS              0x00000056
+#define HIDDI_KEY_GR_7                  0x0000005F
+#define HIDDI_KEY_GR_8                  0x00000060
+#define HIDDI_KEY_GR_9                  0x00000061
+#define HIDDI_KEY_GR_PLUS               0x00000057
+#define HIDDI_KEY_GR_4                  0x0000005C
+#define HIDDI_KEY_GR_5                  0x0000005D
+#define HIDDI_KEY_GR_6                  0x0000005E
+#define HIDDI_KEY_GR_1                  0x00000059
+#define HIDDI_KEY_GR_2                  0x0000005A
+#define HIDDI_KEY_GR_3                  0x0000005B
+#define HIDDI_KEY_GR_ENTER              0x00000058
+#define HIDDI_KEY_GR_0                  0x00000062
+#define HIDDI_KEY_GR_DELETE             0x00000063
+
+#endif /* __SDL_HIDDI_KEYBOARD_H__ */

src/video/qnxgf/SDL_hiddi_mouse.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2009 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+
+    QNX Graphics Framework SDL driver
+    Copyright (C) 2009 Mike Gorchak
+    (mike@malva.ua, lestat@i.com.ua)
+*/
+
+#ifndef __SDL_HIDDI_MOUSE_H__
+#define __SDL_HIDDI_MOUSE_H__
+
+#include <inttypes.h>
+
+/* USB keyboard multimedia keys are generating this packet */
+typedef struct mouse_packet2
+{
+   uint8_t buttons;
+   int8_t  wheel;
+} mouse_packet2;
+
+/* PS/2 mice are generating this packet */
+typedef struct mouse_packet4
+{
+   uint8_t buttons;
+   int8_t  horizontal;
+   int8_t  vertical;
+   int8_t  wheel;
+} mouse_packet4;
+
+/* USB keyboard with mice wheel onboard generating this packet */
+typedef struct mouse_packet5
+{
+   uint8_t buttons;
+   int8_t  horizontal;
+   int8_t  vertical;
+   int8_t  wheel;
+   uint8_t state;
+} mouse_packet5;
+
+/* USB multi-button mice are generating this packet */
+typedef struct mouse_packet8
+{
+   uint8_t buttons;
+   int8_t  horizontal;
+   int8_t  vertical;
+   int8_t  wheel;
+   int16_t horizontal_precision;
+   int16_t vertical_precision;
+} mouse_packet8;
+
+#endif /* __SDL_HIDDI_MOUSE_H__ */

src/video/qnxgf/SDL_qnxgf.h

@@ -49,6 +49,7 @@ typedef struct SDL_VideoData
 } SDL_VideoData;
 
 #define SDL_VIDEO_GF_DEVICENAME_MAX  257
+#define SDL_VIDEO_GF_MAX_CURSOR_SIZE 128
 
 typedef struct SDL_DisplayData
 {
@@ -61,15 +62,23 @@ typedef struct SDL_DisplayData
    uint32_t          caps;             /* Device capabilities                */
    SDL_bool          layer_attached;   /* Layer attach status                */
    gf_layer_t        layer;            /* Graphics layer to which attached   */
+   gf_surface_t      surface[3];       /* Visible surface on the display     */
+   SDL_bool          cursor_visible;   /* SDL_TRUE if cursor visible         */
+   gf_cursor_t       cursor;           /* Cursor shape which was set last    */
 } SDL_DisplayData;
 
+/* Maximum amount of OpenGL ES framebuffer configurations */
+#define SDL_VIDEO_GF_OPENGLES_CONFS 32
+
 typedef struct SDL_WindowData
 {
    SDL_bool   uses_gles;               /* true if window support OpenGL ES   */
    #if defined(SDL_VIDEO_OPENGL_ES)
       gf_3d_target_t target;           /* OpenGL ES window target            */
       SDL_bool   target_created;       /* GF 3D target is created if true    */
-      EGLConfig  gles_config;          /* OpenGL ES framebuffer configuration*/
+      EGLConfig  gles_configs[SDL_VIDEO_GF_OPENGLES_CONFS];
+                                       /* OpenGL ES framebuffer confs        */
+      EGLint     gles_config;          /* Config index in the array of cfgs  */
       EGLContext gles_context;         /* OpenGL ES context                  */
       EGLint     gles_attributes[256]; /* OpenGL ES attributes for context   */
       EGLSurface gles_surface;         /* OpenGL ES target rendering surface */