#include <X11/cursorfont.h>
#include <X11/extensions/XShm.h>
+#if !defined(__APPLE__) && !defined(__MACH__)
#include <X11/extensions/xf86dga.h>
+#endif
#include <X11/extensions/xf86vmode.h>
#include "quakedef.h"
+// Tell startup code that we have a client
int cl_available = true;
//GLX prototypes
//GLX_SGI_video_sync
GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count);
-GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(int divisor, int remainder, unsigned int *count);
+GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(GLint divisor, GLint remainder, GLuint *count);
static dllfunction_t videosyncfuncs[] =
{
#define KEY_MASK (KeyPressMask | KeyReleaseMask)
#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
- PointerMotionMask | ButtonMotionMask )
-#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask )
+ PointerMotionMask | ButtonMotionMask)
+#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | \
+ StructureNotifyMask | FocusChangeMask | EnterWindowMask | \
+ LeaveWindowMask)
static qboolean mouse_avail = true;
static float mouse_x, mouse_y;
static int p_mouse_x, p_mouse_y;
+#ifndef __APPLE__
cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"};
cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"};
+#endif
qboolean vidmode_ext = false;
/*-----------------------------------------------------------------------*/
-static int XLateKey(XKeyEvent *ev)
+static int XLateKey(XKeyEvent *ev, char *ascii)
{
int key = 0;
char buf[64];
- KeySym keysym;
+ KeySym keysym, shifted;
- XLookupString(ev, buf, sizeof buf, &keysym, 0);
+ keysym = XLookupKeysym (ev, 0);
+ XLookupString(ev, buf, sizeof buf, &shifted, 0);
+ *ascii = buf[0];
switch(keysym)
{
case XK_KP_Subtract: key = K_KP_MINUS; break;
case XK_KP_Divide: key = K_KP_SLASH; break;
-#if 0
- case 0x021: key = '1';break;/* [!] */
- case 0x040: key = '2';break;/* [@] */
- case 0x023: key = '3';break;/* [#] */
- case 0x024: key = '4';break;/* [$] */
- case 0x025: key = '5';break;/* [%] */
- case 0x05e: key = '6';break;/* [^] */
- case 0x026: key = '7';break;/* [&] */
- case 0x02a: key = '8';break;/* [*] */
- case 0x028: key = '9';;break;/* [(] */
- case 0x029: key = '0';break;/* [)] */
- case 0x05f: key = '-';break;/* [_] */
- case 0x02b: key = '=';break;/* [+] */
- case 0x07c: key = '\'';break;/* [|] */
- case 0x07d: key = '[';break;/* [}] */
- case 0x07b: key = ']';break;/* [{] */
- case 0x022: key = '\'';break;/* ["] */
- case 0x03a: key = ';';break;/* [:] */
- case 0x03f: key = '/';break;/* [?] */
- case 0x03e: key = '.';break;/* [>] */
- case 0x03c: key = ',';break;/* [<] */
-#endif
-
default:
- key = *(unsigned char*)buf;
- if (key >= 'A' && key <= 'Z')
- key = key - 'A' + 'a';
+ if (keysym < 32 && keysym > 126)
+ break;
+
+ if (keysym >= 'A' && keysym <= 'Z')
+ key = keysym - 'A' + 'a';
+ else
+ key = keysym;
+
break;
}
XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
+#ifndef __APPLE__
if (vid_dga.integer)
{
int MajorVersion, MinorVersion;
if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
{
// unable to query, probalby not supported
- Con_Printf( "Failed to detect XF86DGA Mouse\n" );
+ Con_Print( "Failed to detect XF86DGA Mouse\n" );
vid_dga.integer = 0;
}
else
}
}
else
+#endif
XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2);
XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
if (!vidx11_display || !win)
return;
+#ifndef __APPLE__
if (vid_dga.integer == 1)
XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
+#endif
XUngrabPointer(vidx11_display, CurrentTime);
XUngrabKeyboard(vidx11_display, CurrentTime);
static void HandleEvents(void)
{
XEvent event;
+ int key;
+ char ascii;
qboolean dowarp = false;
if (!vidx11_display)
{
case KeyPress:
// key pressed
- Key_Event(XLateKey(&event.xkey), true);
+ key = XLateKey (&event.xkey, &ascii);
+ Key_Event(key, ascii, true);
break;
case KeyRelease:
// key released
- Key_Event(XLateKey(&event.xkey), false);
+ key = XLateKey (&event.xkey, &ascii);
+ Key_Event(key, ascii, false);
break;
case MotionNotify:
// mouse moved
if (usingmouse)
{
+#ifndef __APPLE__
if (vid_dga.integer == 1)
{
mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value;
mouse_y += event.xmotion.y_root * vid_dga_mouseaccel.value;
}
else
+#endif
{
if (!event.xmotion.send_event)
p_mouse_y = event.xmotion.y;
}
}
- else
- ui_mouseupdate(event.xmotion.x, event.xmotion.y);
+ //else
+ // ui_mouseupdate(event.xmotion.x, event.xmotion.y);
break;
case ButtonPress:
switch(event.xbutton.button)
{
case 1:
- Key_Event(K_MOUSE1, true);
+ Key_Event(K_MOUSE1, 0, true);
break;
case 2:
- Key_Event(K_MOUSE3, true);
+ Key_Event(K_MOUSE3, 0, true);
break;
case 3:
- Key_Event(K_MOUSE2, true);
+ Key_Event(K_MOUSE2, 0, true);
break;
case 4:
- Key_Event(K_MWHEELUP, true);
+ Key_Event(K_MWHEELUP, 0, true);
break;
case 5:
- Key_Event(K_MWHEELDOWN, true);
+ Key_Event(K_MWHEELDOWN, 0, true);
+ break;
+ case 6:
+ Key_Event(K_MOUSE4, 0, true);
+ break;
+ case 7:
+ Key_Event(K_MOUSE5, 0, true);
+ break;
+ case 8:
+ Key_Event(K_MOUSE6, 0, true);
+ break;
+ case 9:
+ Key_Event(K_MOUSE7, 0, true);
+ break;
+ case 10:
+ Key_Event(K_MOUSE8, 0, true);
+ break;
+ case 11:
+ Key_Event(K_MOUSE9, 0, true);
+ break;
+ case 12:
+ Key_Event(K_MOUSE10, 0, true);
break;
default:
- Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button);
+ Con_Printf("HandleEvents: ButtonPress gave value %d, 1-12 expected\n", event.xbutton.button);
break;
}
break;
switch(event.xbutton.button)
{
case 1:
- Key_Event(K_MOUSE1, false);
+ Key_Event(K_MOUSE1, 0, false);
break;
case 2:
- Key_Event(K_MOUSE3, false);
+ Key_Event(K_MOUSE3, 0, false);
break;
case 3:
- Key_Event(K_MOUSE2, false);
+ Key_Event(K_MOUSE2, 0, false);
break;
case 4:
- Key_Event(K_MWHEELUP, false);
+ Key_Event(K_MWHEELUP, 0, false);
break;
case 5:
- Key_Event(K_MWHEELDOWN, false);
+ Key_Event(K_MWHEELDOWN, 0, false);
+ break;
+ case 6:
+ Key_Event(K_MOUSE4, 0, false);
+ break;
+ case 7:
+ Key_Event(K_MOUSE5, 0, false);
+ break;
+ case 8:
+ Key_Event(K_MOUSE6, 0, false);
+ break;
+ case 9:
+ Key_Event(K_MOUSE7, 0, false);
+ break;
+ case 10:
+ Key_Event(K_MOUSE8, 0, false);
+ break;
+ case 11:
+ Key_Event(K_MOUSE9, 0, false);
+ break;
+ case 12:
+ Key_Event(K_MOUSE10, 0, false);
break;
default:
- Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button);
+ Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-12 expected\n", event.xbutton.button);
break;
}
break;
break;
case ClientMessage:
// window manager messages
- if ((event.xclient.format == 32) && (event.xclient.data.l[0] == wm_delete_window_atom))
+ if ((event.xclient.format == 32) && ((unsigned int)event.xclient.data.l[0] == wm_delete_window_atom))
Sys_Quit();
break;
case MapNotify:
// window restored
vid_hidden = false;
- vid_allowhwgamma = true;
+ vid_activewindow = false;
+ VID_RestoreSystemGamma();
break;
case UnmapNotify:
// window iconified/rolledup/whatever
vid_hidden = true;
- vid_allowhwgamma = false;
+ vid_activewindow = false;
VID_RestoreSystemGamma();
break;
case FocusIn:
// window is now the input focus
- vid_allowhwgamma = true;
+ vid_activewindow = true;
break;
case FocusOut:
// window is no longer the input focus
- vid_allowhwgamma = false;
+ vid_activewindow = false;
VID_RestoreSystemGamma();
break;
case EnterNotify:
// mouse entered window
- vid_allowhwgamma = true;
break;
case LeaveNotify:
// mouse left window
- vid_allowhwgamma = false;
- VID_RestoreSystemGamma();
break;
}
}
ctx = NULL;
GL_CloseLibrary();
+ Key_ClearStates ();
}
void signal_handler(int sig)
void VID_Init(void)
{
+#ifndef __APPLE__
Cvar_RegisterVariable (&vid_dga);
Cvar_RegisterVariable (&vid_dga_mouseaccel);
+#endif
InitSig(); // trap evil signals
if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
mouse_avail = false;
*attrib++ = None;
}
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
+int VID_InitMode(int fullscreen, int width, int height, int bpp)
{
int i;
int attrib[32];
int MajorVersion, MinorVersion;
const char *drivername;
+#if defined(__APPLE__) && defined(__MACH__)
+ drivername = "/usr/X11R6/lib/libGL.1.dylib";
+#else
drivername = "libGL.so.1";
+#endif
i = COM_CheckParm("-gl_driver");
if (i && i < com_argc - 1)
drivername = com_argv[i + 1];
if (!(vidx11_display = XOpenDisplay(NULL)))
{
- Con_Printf("Couldn't open the X display\n");
+ Con_Print("Couldn't open the X display\n");
return false;
}
vidmode_ext = false;
else
{
- Con_Printf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion);
+ Con_DPrintf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion);
vidmode_ext = true;
}
return false;
}
- VID_BuildGLXAttrib(attrib, stencil);
+ VID_BuildGLXAttrib(attrib, bpp == 32);
visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
if (!visinfo)
{
- Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n");
+ Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n");
return false;
}
usingmouse = false;
vid_hidden = false;
- vid_allowhwgamma = true;
+ vid_activewindow = true;
GL_Init();
return true;
}
int GL_OpenLibrary(const char *name)
{
- Con_Printf("Loading GL driver %s\n", name);
+ Con_Printf("Loading OpenGL driver %s\n", name);
GL_CloseLibrary();
if (!(prjobj = dlopen(name, RTLD_LAZY)))
{
p = (void *) dlsym(prjobj, name);
return p;
}
+
projects / xonotic / darkplaces.git / blobdiff