static GLXContext ctx = NULL;
static GC vidx11_gc = NULL;
static XImage *vidx11_ximage[2] = { NULL, NULL };
-static int vidx11_ximage_pos;
+static int vidx11_ximage_pos = 0;
static XShmSegmentInfo vidx11_shminfo[2];
static int vidx11_shmevent = -1;
static int vidx11_shmwait = 0; // number of frames outstanding
case XK_KP_Subtract: key = K_KP_MINUS; break;
case XK_KP_Divide: key = K_KP_SLASH; break;
- case XK_section: key = '~'; break;
+ case XK_asciicircum: *ascii = key = '^'; break; // for some reason, XLookupString returns "" on this one for Grunt|2
+
+ case XK_section: *ascii = key = '~'; break;
default:
if (keysym < 32)
void VID_Shutdown(void)
{
- if (!ctx || !vidx11_display)
+ if (!vidx11_display)
return;
+ VID_EnableJoystick(false);
VID_SetMouse(false, false, false);
VID_RestoreSystemGamma();
if (vid.softdepthpixels)
free(vid.softdepthpixels);
+ vid.softdepthpixels = NULL;
if (win)
XDestroyWindow(vidx11_display, win);
case RENDERPATH_GL11:
case RENDERPATH_GL13:
case RENDERPATH_GL20:
+ case RENDERPATH_GLES1:
case RENDERPATH_GLES2:
if (vid_usingvsync != vid_usevsync)
{
HandleEvents();
}
+void VID_BuildJoyState(vid_joystate_t *joystate)
+{
+ VID_Shared_BuildJoyState_Begin(joystate);
+ VID_Shared_BuildJoyState_Finish(joystate);
+}
+
+void VID_EnableJoystick(qboolean enable)
+{
+ int index = joy_enable.integer > 0 ? joy_index.integer : -1;
+ qboolean success = false;
+ int sharedcount = 0;
+ sharedcount = VID_Shared_SetJoystick(index);
+ if (index >= 0 && index < sharedcount)
+ success = true;
+
+ // update cvar containing count of XInput joysticks
+ if (joy_detected.integer != sharedcount)
+ Cvar_SetValueQuick(&joy_detected, sharedcount);
+
+ Cvar_SetValueQuick(&joy_active, success ? 1 : 0);
+}
+
void IN_Move (void)
{
+ vid_joystate_t joystate;
+ VID_EnableJoystick(true);
+ VID_BuildJoyState(&joystate);
+ VID_ApplyJoyState(&joystate);
}
size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)