Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/vt.h>
-#include <stdarg.h>
-#include <stdio.h>
+//#include <termios.h>
+//#include <sys/ioctl.h>
+//#include <sys/stat.h>
+//#include <sys/vt.h>
+//#include <stdarg.h>
+//#include <stdio.h>
#include <signal.h>
-#include <dlfcn.h>
-
-#include "quakedef.h"
+//#include <dlfcn.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
#include <GL/glx.h>
#include <X11/keysym.h>
#include <X11/extensions/xf86dga.h>
#include <X11/extensions/xf86vmode.h>
+#include "quakedef.h"
+
+XVisualInfo *(GLAPIENTRY *qglXChooseVisual)(Display *dpy, int screen, int *attribList);
+GLXContext (GLAPIENTRY *qglXCreateContext)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct);
+void (GLAPIENTRY *qglXDestroyContext)(Display *dpy, GLXContext ctx);
+Bool (GLAPIENTRY *qglXMakeCurrent)(Display *dpy, GLXDrawable drawable, GLXContext ctx);
+void (GLAPIENTRY *qglXSwapBuffers)(Display *dpy, GLXDrawable drawable);
+
+
static Display *vidx11_display = NULL;
static int scrnum;
static Window win;
static GLXContext ctx = NULL;
+Atom wm_delete_window_atom;
+
#define KEY_MASK (KeyPressMask | KeyReleaseMask)
#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
PointerMotionMask | ButtonMotionMask )
static qboolean mouse_avail = true;
static qboolean mouse_active = false, usingmouse = false;
-// static qboolean dga_active;
static float mouse_x, mouse_y;
-static float old_mouse_x, old_mouse_y;
static int p_mouse_x, p_mouse_y;
cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"};
cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"};
-cvar_t m_filter = {0, "m_filter", "0"};
qboolean vidmode_ext = false;
static int scr_width, scr_height;
static XF86VidModeModeInfo **vidmodes;
-//static int default_dotclock_vidmode;
static int num_vidmodes;
static qboolean vidmode_active = false;
/*-----------------------------------------------------------------------*/
-float gldepthmin, gldepthmax;
-
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
-
-/*-----------------------------------------------------------------------*/
static int
-XLateKey(XKeyEvent *ev/*, qboolean modified*/)
+XLateKey(XKeyEvent *ev)
{
-// char tmp[2];
int key = 0;
KeySym keysym;
{
/* ASCII keys */
key = keysym;
- if (/*!modified && */((key >= 'A') && (key <= 'Z')))
+ if ((key >= 'A') && (key <= 'Z'))
key = key + ('a' - 'A');
}
break;
XColor dummycolour;
Cursor cursor;
- cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/);
+ cursormask = XCreatePixmap(display, root, 1, 1, 1);
xgc.function = GXclear;
gc = XCreateGC(display, cursormask, GCFunction, &xgc);
XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
mouse_active = true;
mouse_x = mouse_y = 0;
-
-// XSync(vidx11_display, True);
}
static void uninstall_grabs(void)
static void HandleEvents(void)
{
XEvent event;
-// KeySym ks;
qboolean dowarp = false;
if (!vidx11_display)
switch (event.type)
{
case KeyPress:
+ // key pressed
+ Key_Event(XLateKey(&event.xkey), true);
+ break;
+
case KeyRelease:
- Key_Event(XLateKey(&event.xkey), event.type == KeyPress);
+ // key released
+ Key_Event(XLateKey(&event.xkey), false);
break;
case MotionNotify:
+ // mouse moved
if (usingmouse)
{
if (vid_dga.integer == 1)
}
else
{
- /*
- if (!p_mouse_x && !p_mouse_y)
- {
- Con_Printf("event->xmotion.x: %d\n", event.xmotion.x);
- Con_Printf("event->xmotion.y: %d\n", event.xmotion.y);
- }
- */
- //if (usingmouse)
- {
- if (!event.xmotion.send_event)
- {
- mouse_x += event.xmotion.x - p_mouse_x;
- mouse_y += event.xmotion.y - p_mouse_y;
- if (abs(scr_width/2 - event.xmotion.x) > scr_width / 4 || abs(scr_height/2 - event.xmotion.y) > scr_height / 4)
- dowarp = true;
- }
- }
- /*
- else
+
+ if (!event.xmotion.send_event)
{
- mouse_x += (event.xmotion.x - p_mouse_x);
- mouse_y += (event.xmotion.y - p_mouse_y);
+ mouse_x += event.xmotion.x - p_mouse_x;
+ mouse_y += event.xmotion.y - p_mouse_y;
+ if (abs(scr_width/2 - event.xmotion.x) > scr_width / 4 || abs(scr_height/2 - event.xmotion.y) > scr_height / 4)
+ dowarp = true;
}
- */
p_mouse_x = event.xmotion.x;
p_mouse_y = event.xmotion.y;
}
break;
case ButtonPress:
+ // mouse button pressed
switch(event.xbutton.button)
{
case 1:
break;
case ButtonRelease:
+ // mouse button released
switch(event.xbutton.button)
{
case 1:
}
break;
- case CreateNotify :
+ case CreateNotify:
+ // window created
win_x = event.xcreatewindow.x;
win_y = event.xcreatewindow.y;
break;
- case ConfigureNotify :
+ case ConfigureNotify:
+ // window changed size/location
win_x = event.xconfigure.x;
win_y = event.xconfigure.y;
break;
+ case DestroyNotify:
+ // window has been destroyed
+ Sys_Quit();
+ break;
+ case ClientMessage:
+ // window manager messages
+ if ((event.xclient.format == 32) && (event.xclient.data.l[0] == wm_delete_window_atom))
+ Sys_Quit();
+ break;
+ case MapNotify:
+ // window restored
+ vid_hidden = false;
+ break;
+ case UnmapNotify:
+ // window iconified/rolledup/whatever
+ vid_hidden = true;
+ break;
+ case FocusIn:
+ // window is now the input focus
+ break;
+ case FocusOut:
+ // window is no longer the input focus
+ break;
+ case EnterNotify:
+ // mouse entered window
+ break;
+ case LeaveNotify:
+ // mouse left window
+ break;
}
}
if (vidmode_active)
XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[0]);
-/* Disabled, causes a segfault during shutdown.
- if (ctx)
- glXDestroyContext(vidx11_display, ctx);
-*/
if (win)
XDestroyWindow(vidx11_display, win);
XCloseDisplay(vidx11_display);
vidx11_display = NULL;
win = 0;
ctx = NULL;
+
+ GL_CloseLibrary();
}
void signal_handler(int sig)
int usemouse;
if (r_render.integer)
{
- glFinish();
- glXSwapBuffers(vidx11_display, win);
+ qglFinish();
+ qglXSwapBuffers(vidx11_display, win);
}
// handle the mouse state when windowed if that's changed
GLX_DEPTH_SIZE, 1,
None
};
-// char gldir[MAX_OSPATH];
int width = 640, height = 480;
XSetWindowAttributes attr;
unsigned long mask;
qboolean fullscreen = true;
int MajorVersion, MinorVersion;
+ GL_OpenLibrary();
+
Cvar_RegisterVariable (&vid_dga);
Cvar_RegisterVariable (&vid_dga_mouseaccel);
- Cvar_RegisterVariable (&m_filter);
// interpret command-line params
vidmode_ext = true;
}
+ if ((qglXChooseVisual = GL_GetProcAddress("glXChooseVisual")) == NULL
+ || (qglXCreateContext = GL_GetProcAddress("glXCreateContext")) == NULL
+ || (qglXMakeCurrent = GL_GetProcAddress("glXMakeCurrent")) == NULL
+ || (qglXSwapBuffers = GL_GetProcAddress("glXSwapBuffers")) == NULL)
+ Sys_Error("glX functions not found in libGL.so.1\n");
+
visinfo = NULL;
// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
#if 0
if (!COM_CheckParm("-nogamma"))
- visinfo = glXChooseVisual(vidx11_display, scrnum, gammaattrib);
+ visinfo = qglXChooseVisual(vidx11_display, scrnum, gammaattrib);
#endif
if (!visinfo)
{
- visinfo = glXChooseVisual(vidx11_display, scrnum, nogammaattrib);
+ visinfo = qglXChooseVisual(vidx11_display, scrnum, nogammaattrib);
if (!visinfo)
{
- fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n");
+ Sys_Error("couldn't get an RGB, Double-buffered, Depth visual\n");
exit(1);
}
}
XStoreName(vidx11_display, win, gamename);
XMapWindow(vidx11_display, win);
+ // LordHavoc: making the close button on a window do the right thing
+ // seems to involve this mess, sigh...
+ wm_delete_window_atom = XInternAtom(vidx11_display, "WM_DELETE_WINDOW", false);
+ XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1);
+
if (vidmode_active)
{
XMoveWindow(vidx11_display, win, 0, 0);
XFlush(vidx11_display);
- ctx = glXCreateContext(vidx11_display, visinfo, NULL, True);
+ ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True);
- glXMakeCurrent(vidx11_display, win, ctx);
+ qglXMakeCurrent(vidx11_display, win, ctx);
scr_width = width;
scr_height = height;
InitSig(); // trap evil signals
+ vid_hidden = false;
+
GL_Init();
Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
-
- // force a surface cache flush
-// vid.recalc_refdef = 1;
}
void Sys_SendKeyEvents(void)
{
}
-/*
-===========
-IN_Move
-===========
-*/
-void IN_MouseMove (usercmd_t *cmd)
-{
- if (!mouse_avail)
- return;
-
- if (m_filter.integer)
- {
- mouse_x = (mouse_x + old_mouse_x) * 0.5;
- mouse_y = (mouse_y + old_mouse_y) * 0.5;
-
- old_mouse_x = mouse_x;
- old_mouse_y = mouse_y;
- }
-
- mouse_x *= sensitivity.value;
- mouse_y *= sensitivity.value;
-
- if (in_strafe.state & 1)
- cmd->sidemove += m_side.value * mouse_x;
- else
- cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-
- //if (freelook)
- V_StopPitchDrift ();
-
- if (/*freelook && */!(in_strafe.state & 1))
- {
- cl.viewangles[PITCH] += m_pitch.value * mouse_y;
- cl.viewangles[PITCH] = bound (-90, cl.viewangles[PITCH], 90);
- }
- else
- {
- if ((in_strafe.state & 1) && noclip_anglehack)
- cmd->upmove -= m_forward.value * mouse_y;
- else
- cmd->forwardmove -= m_forward.value * mouse_y;
- }
- mouse_x = mouse_y = 0.0;
-}
-
void IN_Move (usercmd_t *cmd)
{
- IN_MouseMove(cmd);
+ if (mouse_avail)
+ IN_Mouse(cmd, mouse_x, mouse_y);
+ mouse_x = 0;
+ mouse_y = 0;
}
-
projects / xonotic / darkplaces.git / blobdiff