#include "quakedef.h"
#include "image.h"
+#ifdef MACOSX
+#include <Carbon/Carbon.h>
+#include <IOKit/hidsystem/IOHIDLib.h>
+#include <IOKit/hidsystem/IOHIDParameter.h>
+#include <IOKit/hidsystem/event_status_driver.h>
+static cvar_t apple_mouse_noaccel = {CVAR_SAVE, "apple_mouse_noaccel", "1", "disables mouse acceleration while DarkPlaces is active"};
+static qboolean vid_usingnoaccel;
+static double originalMouseSpeed = -1.0;
+io_connect_t IN_GetIOHandle(void)
+{
+ io_connect_t iohandle = MACH_PORT_NULL;
+ kern_return_t status;
+ io_service_t iohidsystem = MACH_PORT_NULL;
+ mach_port_t masterport;
+
+ status = IOMasterPort(MACH_PORT_NULL, &masterport);
+ if(status != KERN_SUCCESS)
+ return 0;
+
+ iohidsystem = IORegistryEntryFromPath(masterport, kIOServicePlane ":/IOResources/IOHIDSystem");
+ if(!iohidsystem)
+ return 0;
+
+ status = IOServiceOpen(iohidsystem, mach_task_self(), kIOHIDParamConnectType, &iohandle);
+ IOObjectRelease(iohidsystem);
+
+ return iohandle;
+}
+#endif
+
#ifdef WIN32
#define SDL_R_RESTART
#endif
cvar_t joy_sensitivitypitch = {0, "joy_sensitivitypitch", "1", "movement multiplier"};
cvar_t joy_sensitivityyaw = {0, "joy_sensitivityyaw", "-1", "movement multiplier"};
cvar_t joy_sensitivityroll = {0, "joy_sensitivityroll", "1", "movement multiplier"};
+cvar_t joy_axiskeyevents = {CVAR_SAVE, "joy_axiskeyevents", "0", "generate uparrow/leftarrow etc. keyevents for joystick axes, use if your joystick driver is not generating them"};
static qboolean vid_usingmouse = false;
static qboolean vid_usinghidecursor = false;
static SDL_Surface *screen;
+// joystick axes state
+#define MAX_JOYSTICK_AXES 16
+typedef struct
+{
+ float oldmove;
+ float move;
+ double keytime;
+}joy_axiscache_t;
+static joy_axiscache_t joy_axescache[MAX_JOYSTICK_AXES];
+
/////////////////////////
// Input handling
////
void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
{
+#ifdef MACOSX
+ if(relative)
+ if(vid_usingmouse && (vid_usingnoaccel != !!apple_mouse_noaccel.integer))
+ VID_SetMouse(false, false, false); // ungrab first!
+#endif
if (vid_usingmouse != relative)
{
vid_usingmouse = relative;
cl_ignoremousemoves = 2;
SDL_WM_GrabInput( relative ? SDL_GRAB_ON : SDL_GRAB_OFF );
+#ifdef MACOSX
+ if(relative)
+ {
+ // Save the status of mouse acceleration
+ originalMouseSpeed = -1.0; // in case of error
+ if(apple_mouse_noaccel.integer)
+ {
+ io_connect_t mouseDev = IN_GetIOHandle();
+ if(mouseDev != 0)
+ {
+ if(IOHIDGetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), &originalMouseSpeed) == kIOReturnSuccess)
+ {
+ Con_DPrintf("previous mouse acceleration: %f\n", originalMouseSpeed);
+ if(IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), -1.0) != kIOReturnSuccess)
+ {
+ Con_Print("Could not disable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n");
+ Cvar_SetValueQuick(&apple_mouse_noaccel, 0);
+ }
+ }
+ else
+ {
+ Con_Print("Could not disable mouse acceleration (failed at IOHIDGetAccelerationWithKey).\n");
+ Cvar_SetValueQuick(&apple_mouse_noaccel, 0);
+ }
+ IOServiceClose(mouseDev);
+ }
+ else
+ {
+ Con_Print("Could not disable mouse acceleration (failed at IO_GetIOHandle).\n");
+ Cvar_SetValueQuick(&apple_mouse_noaccel, 0);
+ }
+ }
+
+ vid_usingnoaccel = !!apple_mouse_noaccel.integer;
+ }
+ else
+ {
+ if(originalMouseSpeed != -1.0)
+ {
+ io_connect_t mouseDev = IN_GetIOHandle();
+ if(mouseDev != 0)
+ {
+ Con_DPrintf("restoring mouse acceleration to: %f\n", originalMouseSpeed);
+ if(IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), originalMouseSpeed) != kIOReturnSuccess)
+ Con_Print("Could not re-enable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n");
+ IOServiceClose(mouseDev);
+ }
+ else
+ Con_Print("Could not re-enable mouse acceleration (failed at IO_GetIOHandle).\n");
+ }
+ }
+#endif
}
if (vid_usinghidecursor != hidecursor)
{
return value * sensitivity;
}
+/////////////////////
+// Joystick axis keyevents
+// a sort of hack emulating Arrow keys for joystick axises
+// as some drives dont send such keyevents for them
+// additionally we should block drivers that do send arrow keyevents to prevent double events
+////
+
+static void IN_JoystickKeyeventForAxis(SDL_Joystick *joy, int axis, int key_pos, int key_neg)
+{
+ double joytime;
+
+ if (axis < 0 || axis >= SDL_JoystickNumAxes(joy))
+ return; // no such axis on this joystick
+
+ joytime = Sys_DoubleTime();
+ // no key event, continuous keydown event
+ if (joy_axescache[axis].move == joy_axescache[axis].oldmove)
+ {
+ if (joy_axescache[axis].move != 0 && joytime > joy_axescache[axis].keytime)
+ {
+ //Con_Printf("joy %s %i %f\n", Key_KeynumToString((joy_axescache[axis].move > 0) ? key_pos : key_neg), 1, cl.time);
+ Key_Event((joy_axescache[axis].move > 0) ? key_pos : key_neg, 0, 1);
+ joy_axescache[axis].keytime = joytime + 0.5 / 20;
+ }
+ return;
+ }
+ // generate key up event
+ if (joy_axescache[axis].oldmove)
+ {
+ //Con_Printf("joy %s %i %f\n", Key_KeynumToString((joy_axescache[axis].oldmove > 0) ? key_pos : key_neg), 1, cl.time);
+ Key_Event((joy_axescache[axis].oldmove > 0) ? key_pos : key_neg, 0, 0);
+ }
+ // generate key down event
+ if (joy_axescache[axis].move)
+ {
+ //Con_Printf("joy %s %i %f\n", Key_KeynumToString((joy_axescache[axis].move > 0) ? key_pos : key_neg), 1, cl.time);
+ Key_Event((joy_axescache[axis].move > 0) ? key_pos : key_neg, 0, 1);
+ joy_axescache[axis].keytime = joytime + 0.5;
+ }
+}
+
+static qboolean IN_JoystickBlockDoubledKeyEvents(int keycode)
+{
+ if (!joy_axiskeyevents.integer)
+ return false;
+
+ // block keyevent if it's going to be provided by joystick keyevent system
+ if (vid_numjoysticks && joy_enable.integer && joy_index.integer >= 0 && joy_index.integer < vid_numjoysticks)
+ {
+ SDL_Joystick *joy = vid_joysticks[joy_index.integer];
+
+ if (keycode == K_UPARROW || keycode == K_DOWNARROW)
+ if (IN_JoystickGetAxis(joy, joy_axisforward.integer, 1, 0.01) || joy_axescache[joy_axisforward.integer].move || joy_axescache[joy_axisforward.integer].oldmove)
+ return true;
+ if (keycode == K_RIGHTARROW || keycode == K_LEFTARROW)
+ if (IN_JoystickGetAxis(joy, joy_axisside.integer, 1, 0.01) || joy_axescache[joy_axisside.integer].move || joy_axescache[joy_axisside.integer].oldmove)
+ return true;
+ }
+
+ return false;
+}
+
+/////////////////////
+// Movement handling
+////
+
void IN_Move( void )
{
int j;
static int old_x = 0, old_y = 0;
static int stuck = 0;
- int x, y;
+ int x, y, numaxes, numballs;
+
if (vid_usingmouse)
{
if(vid_stick_mouse.integer)
if (vid_numjoysticks && joy_enable.integer && joy_index.integer >= 0 && joy_index.integer < vid_numjoysticks)
{
SDL_Joystick *joy = vid_joysticks[joy_index.integer];
- int numballs = SDL_JoystickNumBalls(joy);
+
+ // balls convert to mousemove
+ numballs = SDL_JoystickNumBalls(joy);
for (j = 0;j < numballs;j++)
{
SDL_JoystickGetBall(joy, j, &x, &y);
in_mouse_x += x;
in_mouse_y += y;
}
+
+ // axes
cl.cmd.forwardmove += IN_JoystickGetAxis(joy, joy_axisforward.integer, joy_sensitivityforward.value, joy_deadzoneforward.value) * cl_forwardspeed.value;
cl.cmd.sidemove += IN_JoystickGetAxis(joy, joy_axisside.integer, joy_sensitivityside.value, joy_deadzoneside.value) * cl_sidespeed.value;
cl.cmd.upmove += IN_JoystickGetAxis(joy, joy_axisup.integer, joy_sensitivityup.value, joy_deadzoneup.value) * cl_upspeed.value;
cl.viewangles[0] += IN_JoystickGetAxis(joy, joy_axispitch.integer, joy_sensitivitypitch.value, joy_deadzonepitch.value) * cl.realframetime * cl_pitchspeed.value;
cl.viewangles[1] += IN_JoystickGetAxis(joy, joy_axisyaw.integer, joy_sensitivityyaw.value, joy_deadzoneyaw.value) * cl.realframetime * cl_yawspeed.value;
//cl.viewangles[2] += IN_JoystickGetAxis(joy, joy_axisroll.integer, joy_sensitivityroll.value, joy_deadzoneroll.value) * cl.realframetime * cl_rollspeed.value;
+
+ // cache state of axes to emulate button events for them
+ numaxes = min(MAX_JOYSTICK_AXES, SDL_JoystickNumAxes(joy));
+ for (j = 0; j < numaxes; j++)
+ {
+ joy_axescache[j].oldmove = joy_axescache[j].move;
+ joy_axescache[j].move = IN_JoystickGetAxis(joy, j, 1, 0.01);
+ }
+
+ // run keyevents
+ if (joy_axiskeyevents.integer)
+ {
+ IN_JoystickKeyeventForAxis(joy, joy_axisforward.integer, K_DOWNARROW, K_UPARROW);
+ IN_JoystickKeyeventForAxis(joy, joy_axisside.integer, K_RIGHTARROW, K_LEFTARROW);
+ }
}
}
void Sys_SendKeyEvents( void )
{
static qboolean sound_active = true;
+ int keycode;
SDL_Event event;
while( SDL_PollEvent( &event ) )
break;
case SDL_KEYDOWN:
case SDL_KEYUP:
- Key_Event( MapKey( event.key.keysym.sym ), event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
+ keycode = MapKey(event.key.keysym.sym);
+ if (!IN_JoystickBlockDoubledKeyEvents(keycode))
+ Key_Event(keycode, event.key.keysym.unicode, (event.key.state == SDL_PRESSED));
break;
case SDL_ACTIVEEVENT:
if( event.active.state & SDL_APPACTIVE )
void VID_Init (void)
{
+#ifdef MACOSX
+ Cvar_RegisterVariable(&apple_mouse_noaccel);
+#endif
Cvar_RegisterVariable(&joy_detected);
Cvar_RegisterVariable(&joy_enable);
Cvar_RegisterVariable(&joy_index);
Cvar_RegisterVariable(&joy_sensitivitypitch);
Cvar_RegisterVariable(&joy_sensitivityyaw);
//Cvar_RegisterVariable(&joy_sensitivityroll);
+ Cvar_RegisterVariable(&joy_axiskeyevents);
#ifdef SDL_R_RESTART
R_RegisterModule("SDL", sdl_start, sdl_shutdown, sdl_newmap, NULL, NULL);
#endif
SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
}
-static void VID_SetIcon(void)
+static void VID_SetIcon_Pre(void)
+{
+}
+static void VID_SetIcon_Post(void)
{
}
#else
#include "darkplaces.xpm"
#include "nexuiz.xpm"
static SDL_Surface *icon = NULL;
-static void VID_SetIcon(void)
+static void VID_SetIcon_Pre(void)
{
/*
* Somewhat restricted XPM reader. Only supports XPMs saved by GIMP 2.4 at
icon->pixels = data;
}
}
-#if SDL_VIDEO_DRIVER_X11 && !SDL_VIDEO_DRIVER_QUARTZ
- // ugly hack to upload a good icon on X11 too
- else
- {
- SDL_SysWMinfo info;
- SDL_VERSION(&info.version);
- if(SDL_GetWMInfo(&info) == 1 && info.subsystem == SDL_SYSWM_X11)
- {
- data = (char *) loadimagepixelsbgra("darkplaces-icon", false, false, false, NULL);
- if(data)
- {
- // use _NET_WM_ICON too
- static long netwm_icon[MAX_NETWM_ICON];
- int pos = 0;
- int i = 1;
-
- while(data)
- {
- if(pos + 2 * image_width * image_height < MAX_NETWM_ICON)
- {
- netwm_icon[pos++] = image_width;
- netwm_icon[pos++] = image_height;
- for(i = 0; i < image_height; ++i)
- for(j = 0; j < image_width; ++j)
- netwm_icon[pos++] = BuffLittleLong((unsigned char *) &data[(i*image_width+j)*4]);
- }
- else
- {
- Con_Printf("Skipping NETWM icon #%d because there is no space left\n", i);
- }
- ++i;
- Mem_Free(data);
- data = (char *) loadimagepixelsbgra(va("darkplaces-icon%d", i), false, false, false, NULL);
- }
-
- info.info.x11.lock_func();
- {
- Atom net_wm_icon = XInternAtom(info.info.x11.display, "_NET_WM_ICON", false);
- XChangeProperty(info.info.x11.display, info.info.x11.wmwindow, net_wm_icon, XA_CARDINAL, 32, PropModeReplace, (const unsigned char *) netwm_icon, pos);
- }
- info.info.x11.unlock_func();
- }
- }
- }
-#endif
// we only get here if non-XPM icon was missing, or SDL version is not
// sufficient for transparent non-XPM icons
SDL_WM_SetIcon(icon, NULL);
}
+static void VID_SetIcon_Post(void)
+{
+#if SDL_VIDEO_DRIVER_X11 && !SDL_VIDEO_DRIVER_QUARTZ
+ int j;
+ char *data;
+ const SDL_version *version;
+
+ version = SDL_Linked_Version();
+ // only use non-XPM icon support in SDL v1.3 and higher
+ // SDL v1.2 does not support "smooth" transparency, and thus is better
+ // off the xpm way
+ if(!(version->major >= 2 || (version->major == 1 && version->minor >= 3)))
+ {
+ // in this case, we did not set the good icon yet
+ SDL_SysWMinfo info;
+ SDL_VERSION(&info.version);
+ if(SDL_GetWMInfo(&info) == 1 && info.subsystem == SDL_SYSWM_X11)
+ {
+ data = (char *) loadimagepixelsbgra("darkplaces-icon", false, false, false, NULL);
+ if(data)
+ {
+ // use _NET_WM_ICON too
+ static long netwm_icon[MAX_NETWM_ICON];
+ int pos = 0;
+ int i = 1;
+
+ while(data)
+ {
+ if(pos + 2 * image_width * image_height < MAX_NETWM_ICON)
+ {
+ netwm_icon[pos++] = image_width;
+ netwm_icon[pos++] = image_height;
+ for(i = 0; i < image_height; ++i)
+ for(j = 0; j < image_width; ++j)
+ netwm_icon[pos++] = BuffLittleLong((unsigned char *) &data[(i*image_width+j)*4]);
+ }
+ else
+ {
+ Con_Printf("Skipping NETWM icon #%d because there is no space left\n", i);
+ }
+ ++i;
+ Mem_Free(data);
+ data = (char *) loadimagepixelsbgra(va("darkplaces-icon%d", i), false, false, false, NULL);
+ }
+
+ info.info.x11.lock_func();
+ {
+ Atom net_wm_icon = XInternAtom(info.info.x11.display, "_NET_WM_ICON", false);
+ XChangeProperty(info.info.x11.display, info.info.x11.wmwindow, net_wm_icon, XA_CARDINAL, 32, PropModeReplace, (const unsigned char *) netwm_icon, pos);
+ }
+ info.info.x11.unlock_func();
+ }
+ }
+ }
+#endif
+}
static void VID_SetCaption(void)
video_bpp = mode->bitsperpixel;
video_flags = flags;
- VID_SetIcon();
+ VID_SetIcon_Pre();
screen = SDL_SetVideoMode(mode->width, mode->height, mode->bitsperpixel, flags);
+ VID_SetIcon_Post();
if (screen == NULL)
{
projects / xonotic / darkplaces.git / blobdiff