This program 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.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
*/
+
#include <termios.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <X11/keysym.h>
#include <X11/cursorfont.h>
+#include <X11/extensions/XShm.h>
#include <X11/extensions/xf86dga.h>
#include <X11/extensions/xf86vmode.h>
-#define WARP_WIDTH 320
-#define WARP_HEIGHT 200
-
-static Display *dpy = NULL;
+static Display *vidx11_display = NULL;
static int scrnum;
static Window win;
static GLXContext ctx = NULL;
#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask )
-unsigned short d_8to16table[256];
-unsigned d_8to24table[256];
-unsigned char d_15to8table[65536];
-
-cvar_t vid_mode = {"vid_mode","0",false};
-
viddef_t vid; // global video state
-static qboolean mouse_avail;
-static qboolean mouse_active;
-static int mx, my;
-static int old_mouse_x, old_mouse_y;
+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;
-static cvar_t in_mouse = {"in_mouse", "1", false};
-static cvar_t in_dgamouse = {"in_dgamouse", "1", false};
-static cvar_t m_filter = {"m_filter", "0"};
+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 dgamouse = false;
qboolean vidmode_ext = false;
static int win_x, win_y;
static int num_vidmodes;
static qboolean vidmode_active = false;
-/*-----------------------------------------------------------------------*/
-
-//int texture_mode = GL_NEAREST;
-//int texture_mode = GL_NEAREST_MIPMAP_NEAREST;
-//int texture_mode = GL_NEAREST_MIPMAP_LINEAR;
-int texture_mode = GL_LINEAR;
-//int texture_mode = GL_LINEAR_MIPMAP_NEAREST;
-//int texture_mode = GL_LINEAR_MIPMAP_LINEAR;
+static Visual *vidx11_visual;
+static Colormap vidx11_colormap;
-int texture_extension_number = 1;
+/*-----------------------------------------------------------------------*/
float gldepthmin, gldepthmax;
const char *gl_version;
const char *gl_extensions;
-void (*qglColorTableEXT) (int, int, int, int, int, const void*);
-void (*qgl3DfxSetPaletteEXT) (GLuint *);
-void (*qglMTexCoord2f) (GLenum, GLfloat, GLfloat);
-void (*qglSelectTexture) (GLenum);
-
-//static float vid_gamma = 1.0;
-
-// LordHavoc: ARB multitexture support
-int gl_mtex_enum = 0;
-
-// LordHavoc: in GLX these are never set, simply provided to make the rest of the code work
-qboolean is8bit = false;
-qboolean isPermedia = false;
-qboolean isATI = false;
-qboolean isG200 = false;
-qboolean isRagePro = false;
-qboolean gl_mtexable = false;
-qboolean gl_arrays = false;
-
/*-----------------------------------------------------------------------*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
+static int
+XLateKey(XKeyEvent *ev/*, qboolean modified*/)
{
-}
-
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-}
-
-static int XLateKey(XKeyEvent *ev)
-{
-
- int key;
- char buf[64];
+// char tmp[2];
+ int key = 0;
KeySym keysym;
- key = 0;
-
- XLookupString(ev, buf, sizeof buf, &keysym, 0);
+ keysym = XLookupKeysym(ev, 0);
switch(keysym)
{
- case XK_KP_Page_Up:
- case XK_Page_Up: key = K_PGUP; break;
-
- case XK_KP_Page_Down:
- case XK_Page_Down: key = K_PGDN; break;
-
- case XK_KP_Home:
- case XK_Home: key = K_HOME; break;
-
- case XK_KP_End:
- case XK_End: key = K_END; break;
+ case XK_KP_Page_Up: key = KP_PGUP; break;
+ case XK_Page_Up: key = K_PGUP; break;
- case XK_KP_Left:
- case XK_Left: key = K_LEFTARROW; break;
+ case XK_KP_Page_Down: key = KP_PGDN; break;
+ case XK_Page_Down: key = K_PGDN; break;
- case XK_KP_Right:
- case XK_Right: key = K_RIGHTARROW; break;
+ case XK_KP_Home: key = KP_HOME; break;
+ case XK_Home: key = K_HOME; break;
- case XK_KP_Down:
- case XK_Down: key = K_DOWNARROW; break;
+ case XK_KP_End: key = KP_END; break;
+ case XK_End: key = K_END; break;
- case XK_KP_Up:
- case XK_Up: key = K_UPARROW; break;
+ case XK_KP_Left: key = KP_LEFTARROW; break;
+ case XK_Left: key = K_LEFTARROW; break;
- case XK_Escape: key = K_ESCAPE; break;
+ case XK_KP_Right: key = KP_RIGHTARROW; break;
+ case XK_Right: key = K_RIGHTARROW; break;
- case XK_KP_Enter:
- case XK_Return: key = K_ENTER; break;
+ case XK_KP_Down: key = KP_DOWNARROW; break;
+ case XK_Down: key = K_DOWNARROW; break;
- case XK_Tab: key = K_TAB; break;
+ case XK_KP_Up: key = KP_UPARROW; break;
+ case XK_Up: key = K_UPARROW; break;
- case XK_F1: key = K_F1; break;
+ case XK_Escape: key = K_ESCAPE; break;
- case XK_F2: key = K_F2; break;
+ case XK_KP_Enter: key = KP_ENTER; break;
+ case XK_Return: key = K_ENTER; break;
- case XK_F3: key = K_F3; break;
+ case XK_Tab: key = K_TAB; break;
- case XK_F4: key = K_F4; break;
+ case XK_F1: key = K_F1; break;
+ case XK_F2: key = K_F2; break;
+ case XK_F3: key = K_F3; break;
+ case XK_F4: key = K_F4; break;
+ case XK_F5: key = K_F5; break;
+ case XK_F6: key = K_F6; break;
+ case XK_F7: key = K_F7; break;
+ case XK_F8: key = K_F8; break;
+ case XK_F9: key = K_F9; break;
+ case XK_F10: key = K_F10; break;
+ case XK_F11: key = K_F11; break;
+ case XK_F12: key = K_F12; break;
- case XK_F5: key = K_F5; break;
+ case XK_BackSpace: key = K_BACKSPACE; break;
- case XK_F6: key = K_F6; break;
+ case XK_KP_Delete: key = KP_DEL; break;
+ case XK_Delete: key = K_DEL; break;
- case XK_F7: key = K_F7; break;
-
- case XK_F8: key = K_F8; break;
-
- case XK_F9: key = K_F9; break;
-
- case XK_F10: key = K_F10; break;
-
- case XK_F11: key = K_F11; break;
-
- case XK_F12: key = K_F12; break;
-
- case XK_BackSpace: key = K_BACKSPACE; break;
-
- case XK_KP_Delete:
- case XK_Delete: key = K_DEL; break;
-
- case XK_Pause: key = K_PAUSE; break;
+ case XK_Pause: key = K_PAUSE; break;
case XK_Shift_L:
- case XK_Shift_R: key = K_SHIFT; break;
+ case XK_Shift_R: key = K_SHIFT; break;
- case XK_Execute:
- case XK_Control_L:
- case XK_Control_R: key = K_CTRL; break;
+ case XK_Execute:
+ case XK_Control_L:
+ case XK_Control_R: key = K_CTRL; break;
- case XK_Alt_L:
- case XK_Meta_L:
- case XK_Alt_R:
- case XK_Meta_R: key = K_ALT; break;
+ case XK_Mode_switch:
+ case XK_Alt_L:
+ case XK_Meta_L:
+ case XK_Alt_R:
+ case XK_Meta_R: key = K_ALT; break;
- case XK_KP_Begin: key = '5'; break;
+ case XK_Caps_Lock: key = K_CAPSLOCK; break;
+ case XK_KP_Begin: key = KP_5; break;
- case XK_KP_Insert:
- case XK_Insert:key = K_INS; break;
+ case XK_Insert: key = K_INS; break;
+ case XK_KP_Insert: key = KP_INS; break;
- case XK_KP_Multiply: key = '*'; break;
- case XK_KP_Add: key = '+'; break;
- case XK_KP_Subtract: key = '-'; break;
- case XK_KP_Divide: key = '/'; break;
+ case XK_KP_Multiply: key = KP_MULTIPLY; break;
+ case XK_KP_Add: key = KP_PLUS; break;
+ case XK_KP_Subtract: key = KP_MINUS; break;
+ case XK_KP_Divide: key = KP_DIVIDE; 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
+ /* For Sun keyboards */
+ case XK_F27: key = K_HOME; break;
+ case XK_F29: key = K_PGUP; break;
+ case XK_F33: key = K_END; break;
+ case XK_F35: key = K_PGDN; break;
default:
- key = *(unsigned char*)buf;
- if (key >= 'A' && key <= 'Z')
- key = key - 'A' + 'a';
+ if (keysym < 128)
+ {
+ /* ASCII keys */
+ key = keysym;
+ if (/*!modified && */((key >= 'A') && (key <= 'Z')))
+ key = key + ('a' - 'A');
+ }
break;
- }
+ }
return key;
}
static Cursor CreateNullCursor(Display *display, Window root)
{
- Pixmap cursormask;
- XGCValues xgc;
- GC gc;
- XColor dummycolour;
- Cursor cursor;
-
- cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/);
- xgc.function = GXclear;
- gc = XCreateGC(display, cursormask, GCFunction, &xgc);
- XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
- dummycolour.pixel = 0;
- dummycolour.red = 0;
- dummycolour.flags = 04;
- cursor = XCreatePixmapCursor(display, cursormask, cursormask,
- &dummycolour,&dummycolour, 0,0);
- XFreePixmap(display,cursormask);
- XFreeGC(display,gc);
- return cursor;
+ Pixmap cursormask;
+ XGCValues xgc;
+ GC gc;
+ XColor dummycolour;
+ Cursor cursor;
+
+ cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/);
+ xgc.function = GXclear;
+ gc = XCreateGC(display, cursormask, GCFunction, &xgc);
+ XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
+ dummycolour.pixel = 0;
+ dummycolour.red = 0;
+ dummycolour.flags = 04;
+ cursor = XCreatePixmapCursor(display, cursormask, cursormask, &dummycolour,&dummycolour, 0,0);
+ XFreePixmap(display,cursormask);
+ XFreeGC(display,gc);
+ return cursor;
}
static void install_grabs(void)
{
+ XWindowAttributes attribs_1;
+ XSetWindowAttributes attribs_2;
+
+ XGetWindowAttributes(vidx11_display, win, &attribs_1);
+ attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK;
+ XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2);
// inviso cursor
- XDefineCursor(dpy, win, CreateNullCursor(dpy, win));
+ XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win));
- XGrabPointer(dpy, win,
- True,
- 0,
- GrabModeAsync, GrabModeAsync,
- win,
- None,
- CurrentTime);
+ XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
- if (in_dgamouse.value) {
+ if (vid_dga.integer)
+ {
int MajorVersion, MinorVersion;
- if (!XF86DGAQueryVersion(dpy, &MajorVersion, &MinorVersion)) {
+ if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
+ {
// unable to query, probalby not supported
Con_Printf( "Failed to detect XF86DGA Mouse\n" );
- in_dgamouse.value = 0;
- } else {
- dgamouse = true;
- XF86DGADirectVideo(dpy, DefaultScreen(dpy), XF86DGADirectMouse);
- XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0);
+ vid_dga.integer = 0;
+ }
+ else
+ {
+ vid_dga.integer = 1;
+ XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), XF86DGADirectMouse);
+ XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
}
- } else {
- XWarpPointer(dpy, None, win,
- 0, 0, 0, 0,
- vid.width / 2, vid.height / 2);
}
+ else
+ XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2);
- XGrabKeyboard(dpy, win,
- False,
- GrabModeAsync, GrabModeAsync,
- CurrentTime);
+ XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
mouse_active = true;
+ mouse_x = mouse_y = 0;
-// XSync(dpy, True);
+// XSync(vidx11_display, True);
}
static void uninstall_grabs(void)
{
- if (!dpy || !win)
+ if (!vidx11_display || !win)
return;
- if (dgamouse) {
- dgamouse = false;
- XF86DGADirectVideo(dpy, DefaultScreen(dpy), 0);
- }
+ if (vid_dga.integer == 1)
+ XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
- XUngrabPointer(dpy, CurrentTime);
- XUngrabKeyboard(dpy, CurrentTime);
+ XUngrabPointer(vidx11_display, CurrentTime);
+ XUngrabKeyboard(vidx11_display, CurrentTime);
// inviso cursor
- XUndefineCursor(dpy, win);
+ XUndefineCursor(vidx11_display, win);
mouse_active = false;
}
{
XEvent event;
// KeySym ks;
- int b;
qboolean dowarp = false;
- int mwx = vid.width/2;
- int mwy = vid.height/2;
- if (!dpy)
+ if (!vidx11_display)
return;
- while (XPending(dpy)) {
- XNextEvent(dpy, &event);
+ while (XPending(vidx11_display))
+ {
+ XNextEvent(vidx11_display, &event);
- switch (event.type) {
+ switch (event.type)
+ {
case KeyPress:
case KeyRelease:
Key_Event(XLateKey(&event.xkey), event.type == KeyPress);
break;
case MotionNotify:
- if (mouse_active) {
- if (dgamouse) {
- mx += (event.xmotion.x + win_x) * 2;
- my += (event.xmotion.y + win_y) * 2;
- }
- else
+ if (usingmouse)
+ {
+ if (vid_dga.integer == 1)
{
- mx += ((int)event.xmotion.x - mwx) * 2;
- my += ((int)event.xmotion.y - mwy) * 2;
- mwx = event.xmotion.x;
- mwy = event.xmotion.y;
-
- if (mx || my)
- dowarp = true;
+ mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value;
+ mouse_y += event.xmotion.y_root * vid_dga_mouseaccel.value;
+ }
+ 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
+ {
+ mouse_x += (event.xmotion.x - p_mouse_x);
+ mouse_y += (event.xmotion.y - p_mouse_y);
+ }
+ */
+ p_mouse_x = event.xmotion.x;
+ p_mouse_y = event.xmotion.y;
}
}
- break;
-
+ else
+ ui_mouseupdate(event.xmotion.x, event.xmotion.y);
break;
case ButtonPress:
- b=-1;
- if (event.xbutton.button == 1)
- b = 0;
- else if (event.xbutton.button == 2)
- b = 2;
- else if (event.xbutton.button == 3)
- b = 1;
- if (b>=0)
- Key_Event(K_MOUSE1 + b, true);
+ switch(event.xbutton.button)
+ {
+ case 1:
+ Key_Event(K_MOUSE1, true);
+ break;
+ case 2:
+ Key_Event(K_MOUSE3, true);
+ break;
+ case 3:
+ Key_Event(K_MOUSE2, true);
+ break;
+ case 4:
+ Key_Event(K_MWHEELUP, true);
+ break;
+ case 5:
+ Key_Event(K_MWHEELDOWN, true);
+ break;
+ default:
+ Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button);
+ break;
+ }
break;
case ButtonRelease:
- b=-1;
- if (event.xbutton.button == 1)
- b = 0;
- else if (event.xbutton.button == 2)
- b = 2;
- else if (event.xbutton.button == 3)
- b = 1;
- if (b>=0)
- Key_Event(K_MOUSE1 + b, false);
+ switch(event.xbutton.button)
+ {
+ case 1:
+ Key_Event(K_MOUSE1, false);
+ break;
+ case 2:
+ Key_Event(K_MOUSE3, false);
+ break;
+ case 3:
+ Key_Event(K_MOUSE2, false);
+ break;
+ case 4:
+ Key_Event(K_MWHEELUP, false);
+ break;
+ case 5:
+ Key_Event(K_MWHEELDOWN, false);
+ break;
+ default:
+ Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button);
+ break;
+ }
break;
case CreateNotify :
}
}
- if (dowarp) {
+ if (dowarp)
+ {
/* move the mouse to the window center again */
- XWarpPointer(dpy, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
+ p_mouse_x = scr_width / 2;
+ p_mouse_y = scr_height / 2;
+ XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y);
}
}
-static void IN_DeactivateMouse( void )
+static void IN_DeactivateMouse( void )
{
- if (!mouse_avail || !dpy || !win)
+ if (!mouse_avail || !vidx11_display || !win)
return;
- if (mouse_active) {
+ if (mouse_active)
+ {
uninstall_grabs();
mouse_active = false;
}
}
-static void IN_ActivateMouse( void )
+static void IN_ActivateMouse( void )
{
- if (!mouse_avail || !dpy || !win)
+ if (!mouse_avail || !vidx11_display || !win)
return;
- if (!mouse_active) {
- mx = my = 0; // don't spazz
+ if (!mouse_active)
+ {
+ mouse_x = mouse_y = 0; // don't spazz
install_grabs();
mouse_active = true;
}
void VID_Shutdown(void)
{
- if (!ctx || !dpy)
+ if (!ctx || !vidx11_display)
return;
- IN_DeactivateMouse();
- if (dpy) {
+
+ if (vidx11_display)
+ {
+ uninstall_grabs();
+
+ if (vidmode_active)
+ XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[0]);
+/* Disabled, causes a segfault during shutdown.
if (ctx)
- glXDestroyContext(dpy, ctx);
+ glXDestroyContext(vidx11_display, ctx);
+*/
if (win)
- XDestroyWindow(dpy, win);
- if (vidmode_active)
- XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[0]);
- XCloseDisplay(dpy);
+ XDestroyWindow(vidx11_display, win);
+ XCloseDisplay(vidx11_display);
}
vidmode_active = false;
- dpy = NULL;
+ vidx11_display = NULL;
win = 0;
ctx = NULL;
}
signal(SIGTERM, signal_handler);
}
-/*
-void (*qglVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (*qglColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (*qglTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (*qglArrayElement)(GLint i);
-void (*qglDrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-void (*qglMTexCoord2f)(GLenum, GLfloat, GLfloat);
-void (*qglSelectTexture)(GLenum);
-void (*glColorTableEXT)(int, int, int, int, int, const void*);
-
-void CheckVertexArrays (void)
-{
- void *prjobj;
- if (COM_CheckParm("-novertex"))
- {
- Con_Printf("...vertex array support disabled\n");
- return;
- }
- if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL)
- {
- Con_Printf("Unable to open symbol list for main program.\n");
- return;
- }
- qglMTexCoord2fSGIS = (void *) dlsym(prjobj, "glMTexCoord2fSGIS");
- if ((qglArrayElement = (void *) dlsym(prjobj, "glArrayElement"))
- && (qglColorPointer = (void *) dlsym(prjobj, "glColorPointer"))
-// && (qglDrawArrays = (void *) dlsym(prjobj, "glDrawArrays"))
- && (qglDrawElements = (void *) dlsym(prjobj, "glDrawElements"))
-// && (qglInterleavedArrays = (void *) dlsym(prjobj, "glInterleavedArrays"))
- && (qglTexCoordPointer = (void *) dlsym(prjobj, "glTexCoordPointer"))
- && (qglVertexPointer = (void *) dlsym(prjobj, "glVertexPointer"))
- )
- {
- Con_Printf("...vertex array support detected\n");
- gl_arrays = true;
- dlclose(prjobj);
- return;
- }
-
- Con_Printf("...vertex array support disabled (not detected - get a better driver)\n");
- dlclose(prjobj);
-}
-*/
-
-void CheckMultiTexture(void)
-{
- void *prjobj;
- qglMTexCoord2f = NULL;
- qglSelectTexture = NULL;
- // Check to see if multitexture is disabled
- if (COM_CheckParm("-nomtex"))
- {
- Con_Printf("...multitexture disabled\n");
- return;
- }
- if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL)
- {
- Con_Printf("Unable to open symbol list for main program.\n");
- return;
- }
- // Test for ARB_multitexture
- if (!COM_CheckParm("-SGISmtex") && strstr(gl_extensions, "GL_ARB_multitexture "))
- {
- Con_Printf("...using GL_ARB_multitexture\n");
- qglMTexCoord2f = (void *) dlsym(prjobj, "glMultiTexCoord2fARB");
- qglSelectTexture = (void *) dlsym(prjobj, "glActiveTextureARB");
- gl_mtexable = true;
- gl_mtex_enum = GL_TEXTURE0_ARB;
- }
- else if (strstr(gl_extensions, "GL_SGIS_multitexture ")) // Test for SGIS_multitexture (if ARB_multitexture not found)
- {
- Con_Printf("...using GL_SGIS_multitexture\n");
- qglMTexCoord2f = (void *) dlsym(prjobj, "glMTexCoord2fSGIS");
- qglSelectTexture = (void *) dlsym(prjobj, "glSelectTextureSGIS");
- gl_mtexable = true;
- gl_mtex_enum = TEXTURE0_SGIS;
- }
- if (!gl_mtexable)
- Con_Printf("...multitexture disabled (not detected)\n");
- dlclose(prjobj);
-}
-
-/*
-===============
-GL_Init
-===============
-*/
-extern char *QSG_EXTENSIONS;
-void GL_Init (void)
-{
- gl_vendor = glGetString (GL_VENDOR);
- Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
- gl_renderer = glGetString (GL_RENDERER);
- Con_Printf ("GL_RENDERER: %s\n", gl_renderer);
-
- gl_version = glGetString (GL_VERSION);
- Con_Printf ("GL_VERSION: %s\n", gl_version);
- gl_extensions = glGetString (GL_EXTENSIONS);
- Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
-
-// Con_Printf ("%s %s\n", gl_renderer, gl_version);
-
- CheckMultiTexture();
-// CheckVertexArrays();
-
- // LordHavoc: report supported extensions
- Con_Printf ("\nQSG extensions: %s\n", QSG_EXTENSIONS);
-
-// glClearColor (1,0,0,0);
- glCullFace(GL_FRONT);
-// glEnable(GL_TEXTURE_2D);
-//
-// glEnable(GL_ALPHA_TEST);
- glAlphaFunc(GL_GREATER, 0.5);
-//
-// glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-// glShadeModel (GL_FLAT);
-//
-// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-//
-// glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-//
-// glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-// glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-}
-
/*
=================
GL_BeginRendering
*width = scr_width;
*height = scr_height;
-// if (!wglMakeCurrent( maindc, baseRC ))
-// Sys_Error ("wglMakeCurrent failed");
-
// glViewport (*x, *y, *width, *height);
}
void GL_EndRendering (void)
{
+ int usemouse;
+ if (!r_render.integer)
+ return;
glFlush();
- glXSwapBuffers(dpy, win);
+ glXSwapBuffers(vidx11_display, win);
+
+// handle the mouse state when windowed if that's changed
+ usemouse = false;
+ if (vid_mouse.integer && key_dest == key_game)
+ usemouse = true;
+ if (vidmode_active)
+ usemouse = true;
+ if (usemouse)
+ {
+ if (!usingmouse)
+ {
+ usingmouse = true;
+ IN_ActivateMouse ();
+ }
+ }
+ else
+ {
+ if (usingmouse)
+ {
+ usingmouse = false;
+ IN_DeactivateMouse ();
+ }
+ }
}
-qboolean VID_Is8bit(void)
+// LordHavoc: ported from SDL 1.2.2, this was far more difficult to port from
+// SDL than to simply use the XFree gamma ramp extension, but that affects the
+// whole screen even when the game window is inactive, this only affects the
+// screen while the window is active, very desirable behavior :)
+int VID_SetGamma(float prescale, float gamma, float scale, float base)
{
- return is8bit;
-}
+// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
+#if 1
+ return FALSE;
+#else
+ int i, ncolors, c;
+ unsigned int Rmask, Gmask, Bmask, Rloss, Gloss, Bloss, Rshift, Gshift, Bshift, mask;
+ XColor xcmap[256];
+ unsigned short ramp[256];
+
+ if (COM_CheckParm("-nogamma"))
+ return FALSE;
+
+ if (vidx11_visual->class != DirectColor)
+ {
+ Con_Printf("X11 Visual class is %d, can only do gamma on %d\n", vidx11_visual->class, DirectColor);
+ return FALSE;
+ }
-void VID_Init8bitPalette(void)
-{
- // Check for 8bit Extensions and initialize them.
- int i;
- void *prjobj;
+ Rmask = vidx11_visual->red_mask;
+ Gmask = vidx11_visual->green_mask;
+ Bmask = vidx11_visual->blue_mask;
- if (!COM_CheckParm("-8bit"))
- return;
- if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL)
+ Rshift = 0;
+ Rloss = 8;
+ if ((mask = Rmask))
{
- Con_Printf("Unable to open symbol list for main program.\n");
- return;
+ for (;!(mask & 1);mask >>= 1)
+ ++Rshift;
+ for (;(mask & 1);mask >>= 1)
+ --Rloss;
}
-
- if (strstr(gl_extensions, "3DFX_set_global_palette") && (qgl3DfxSetPaletteEXT = dlsym(prjobj, "gl3DfxSetPaletteEXT")) != NULL)
+ Gshift = 0;
+ Gloss = 8;
+ if ((mask = Gmask))
{
- GLubyte table[256][4];
- char *oldpal;
+ for (;!(mask & 1);mask >>= 1)
+ ++Gshift;
+ for (;(mask & 1);mask >>= 1)
+ --Gloss;
+ }
+ Bshift = 0;
+ Bloss = 8;
+ if ((mask = Bmask))
+ {
+ for (;!(mask & 1);mask >>= 1)
+ ++Bshift;
+ for (;(mask & 1);mask >>= 1)
+ --Bloss;
+ }
- Con_SafePrintf("8-bit GL extensions enabled.\n");
- glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
- oldpal = (char *) d_8to24table; //d_8to24table3dfx;
- for (i=0;i<256;i++)
- {
- table[i][2] = *oldpal++;
- table[i][1] = *oldpal++;
- table[i][0] = *oldpal++;
- table[i][3] = 255;
- oldpal++;
- }
- qgl3DfxSetPaletteEXT((GLuint *)table);
- is8bit = true;
+ BuildGammaTable16(prescale, gamma, scale, base, ramp);
- }
- else if (strstr(gl_extensions, "GL_EXT_shared_texture_palette") && (qglColorTableEXT = dlsym(prjobj, "glColorTableEXT")) != NULL)
+ // convert gamma ramp to palette (yes this seems odd)
+ ncolors = vidx11_visual->map_entries;
+ for (i = 0;i < ncolors;i++)
{
- char thePalette[256*3];
- char *oldPalette, *newPalette;
-
- Con_SafePrintf("8-bit GL extensions enabled.\n");
- glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
- oldPalette = (char *) d_8to24table; //d_8to24table3dfx;
- newPalette = thePalette;
- for (i=0;i<256;i++)
- {
- *newPalette++ = *oldPalette++;
- *newPalette++ = *oldPalette++;
- *newPalette++ = *oldPalette++;
- oldPalette++;
- }
- qglColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
- is8bit = true;
+ c = (256 * i / ncolors);
+ xcmap[i].pixel = ((c >> Rloss) << Rshift) | ((c >> Gloss) << Gshift) | ((c >> Bloss) << Bshift);
+ xcmap[i].red = ramp[c];
+ xcmap[i].green = ramp[c];
+ xcmap[i].blue = ramp[c];
+ xcmap[i].flags = (DoRed|DoGreen|DoBlue);
}
-
- dlclose(prjobj);
+ XStoreColors(vidx11_display, vidx11_colormap, xcmap, ncolors);
+ XSync(vidx11_display, false);
+ // FIXME: should this check for BadAccess/BadColor/BadValue errors produced by XStoreColors before setting this true?
+ return TRUE;
+#endif
}
-extern void Check_Gamma (unsigned char *pal);
-void VID_Setup15to8Palette ();
-
-void VID_Init(unsigned char *palette)
+void VID_Init(void)
{
int i;
- int attrib[] = {
+// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
+#if 0
+ int gammaattrib[] =
+ {
+ GLX_RGBA,
+ GLX_RED_SIZE, 1,
+ GLX_GREEN_SIZE, 1,
+ GLX_BLUE_SIZE, 1,
+ GLX_DOUBLEBUFFER,
+ GLX_DEPTH_SIZE, 1,
+ GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR,
+ None
+ };
+#endif
+ int nogammaattrib[] =
+ {
GLX_RGBA,
GLX_RED_SIZE, 1,
GLX_GREEN_SIZE, 1,
XVisualInfo *visinfo;
qboolean fullscreen = true;
int MajorVersion, MinorVersion;
- int actualWidth, actualHeight;
- Cvar_RegisterVariable (&vid_mode);
- Cvar_RegisterVariable (&in_mouse);
- Cvar_RegisterVariable (&in_dgamouse);
+ Cvar_RegisterVariable (&vid_mouse);
+ Cvar_RegisterVariable (&vid_dga);
+ Cvar_RegisterVariable (&vid_dga_mouseaccel);
Cvar_RegisterVariable (&m_filter);
-
- vid.maxwarpwidth = WARP_WIDTH;
- vid.maxwarpheight = WARP_HEIGHT;
- vid.colormap = host_colormap;
- vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
// interpret command-line params
if (vid.conheight < 200)
vid.conheight = 200;
- if (!(dpy = XOpenDisplay(NULL))) {
+ if (!(vidx11_display = XOpenDisplay(NULL)))
+ {
fprintf(stderr, "Error couldn't open the X display\n");
exit(1);
}
- scrnum = DefaultScreen(dpy);
- root = RootWindow(dpy, scrnum);
+ scrnum = DefaultScreen(vidx11_display);
+ root = RootWindow(vidx11_display, scrnum);
// Get video mode list
MajorVersion = MinorVersion = 0;
- if (!XF86VidModeQueryVersion(dpy, &MajorVersion, &MinorVersion)) {
+ if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
vidmode_ext = false;
- } else {
+ else
+ {
Con_Printf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion);
vidmode_ext = true;
}
- visinfo = glXChooseVisual(dpy, scrnum, attrib);
- if (!visinfo) {
- fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n");
- exit(1);
+ 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);
+#endif
+ if (!visinfo)
+ {
+ visinfo = glXChooseVisual(vidx11_display, scrnum, nogammaattrib);
+ if (!visinfo)
+ {
+ fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n");
+ exit(1);
+ }
}
- if (vidmode_ext) {
+ if (vidmode_ext)
+ {
int best_fit, best_dist, dist, x, y;
-
- XF86VidModeGetAllModeLines(dpy, scrnum, &num_vidmodes, &vidmodes);
+
+ XF86VidModeGetAllModeLines(vidx11_display, scrnum, &num_vidmodes, &vidmodes);
// Are we going fullscreen? If so, let's change video mode
- if (fullscreen) {
+ if (fullscreen)
+ {
best_dist = 9999999;
best_fit = -1;
- for (i = 0; i < num_vidmodes; i++) {
- if (width > vidmodes[i]->hdisplay ||
- height > vidmodes[i]->vdisplay)
+ for (i = 0; i < num_vidmodes; i++)
+ {
+ if (width > vidmodes[i]->hdisplay || height > vidmodes[i]->vdisplay)
continue;
x = width - vidmodes[i]->hdisplay;
y = height - vidmodes[i]->vdisplay;
dist = (x * x) + (y * y);
- if (dist < best_dist) {
+ if (dist < best_dist)
+ {
best_dist = dist;
best_fit = i;
}
}
- if (best_fit != -1) {
- actualWidth = vidmodes[best_fit]->hdisplay;
- actualHeight = vidmodes[best_fit]->vdisplay;
+ if (best_fit != -1)
+ {
+ // LordHavoc: changed from ActualWidth/ActualHeight =,
+ // to width/height =, so the window will take the full area of
+ // the mode chosen
+ width = vidmodes[best_fit]->hdisplay;
+ height = vidmodes[best_fit]->vdisplay;
// change to the mode
- XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[best_fit]);
+ XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[best_fit]);
vidmode_active = true;
// Move the viewport to top left
- XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
- } else
+ XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0);
+ }
+ else
fullscreen = 0;
}
}
+ // LordHavoc: save the visual for use in gamma ramp settings later
+ vidx11_visual = visinfo->visual;
+
/* window attributes */
attr.background_pixel = 0;
attr.border_pixel = 0;
- attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
+ // LordHavoc: save the colormap for later, too
+ vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, visinfo->visual, AllocNone);
attr.event_mask = X_MASK;
- if (vidmode_active) {
- mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore |
- CWEventMask | CWOverrideRedirect;
+ if (vidmode_active)
+ {
+ mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect;
attr.override_redirect = True;
attr.backing_store = NotUseful;
attr.save_under = False;
- } else
+ }
+ else
mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
- win = XCreateWindow(dpy, root, 0, 0, width, height,
- 0, visinfo->depth, InputOutput,
- visinfo->visual, mask, &attr);
- XMapWindow(dpy, win);
+ win = XCreateWindow(vidx11_display, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
+ XStoreName(vidx11_display, win, gamename);
+ XMapWindow(vidx11_display, win);
- if (vidmode_active) {
- XMoveWindow(dpy, win, 0, 0);
- XRaiseWindow(dpy, win);
- XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0);
- XFlush(dpy);
+ if (vidmode_active)
+ {
+ XMoveWindow(vidx11_display, win, 0, 0);
+ XRaiseWindow(vidx11_display, win);
+ XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
+ XFlush(vidx11_display);
// Move the viewport to top left
- XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
+ XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0);
}
- XFlush(dpy);
+ XFlush(vidx11_display);
- ctx = glXCreateContext(dpy, visinfo, NULL, True);
+ ctx = glXCreateContext(vidx11_display, visinfo, NULL, True);
- glXMakeCurrent(dpy, win, ctx);
+ glXMakeCurrent(vidx11_display, win, ctx);
scr_width = width;
scr_height = height;
vid.conheight = height;
if (vid.conwidth > width)
vid.conwidth = width;
- vid.width = vid.conwidth;
- vid.height = vid.conheight;
-
- vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0);
- vid.numpages = 2;
InitSig(); // trap evil signals
GL_Init();
-// sprintf (gldir, "%s/glquake", com_gamedir);
-// Sys_mkdir (gldir);
-
- VID_SetPalette(palette);
-
- Check_Gamma(palette);
-
- VID_Init8bitPalette();
-
- if (is8bit) // LordHavoc: avoid calculating 15to8 table if it won't be used
- VID_Setup15to8Palette ();
-
Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
- vid.recalc_refdef = 1; // force a surface cache flush
+ // force a surface cache flush
+// vid.recalc_refdef = 1;
}
void Sys_SendKeyEvents(void)
HandleEvents();
}
-void Force_CenterView_f (void)
-{
- cl.viewangles[PITCH] = 0;
-}
-
void IN_Init(void)
{
+ if (COM_CheckParm ("-nomouse"))
+ mouse_avail = false;
}
void IN_Shutdown(void)
*/
void IN_Commands (void)
{
- if (!dpy || !win)
- return;
-
- if (vidmode_active || key_dest == key_game)
- IN_ActivateMouse();
- else
- IN_DeactivateMouse ();
}
/*
{
if (!mouse_avail)
return;
-
- if (m_filter.value)
+
+ if (m_filter.integer)
{
- mx = (mx + old_mouse_x) * 0.5;
- my = (my + old_mouse_y) * 0.5;
+ 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;
}
- old_mouse_x = mx;
- old_mouse_y = my;
- mx *= sensitivity.value;
- my *= sensitivity.value;
+ mouse_x *= sensitivity.value;
+ mouse_y *= sensitivity.value;
-// add mouse X/Y movement to cmd
- if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
- cmd->sidemove += m_side.value * mx;
+ if (in_strafe.state & 1)
+ cmd->sidemove += m_side.value * mouse_x;
else
- cl.viewangles[YAW] -= m_yaw.value * mx;
-
- if (in_mlook.state & 1)
+ cl.viewangles[YAW] -= m_yaw.value * mouse_x;
+
+ //if (freelook)
V_StopPitchDrift ();
-
- if ( (in_mlook.state & 1) && !(in_strafe.state & 1))
+
+ if (/*freelook && */!(in_strafe.state & 1))
{
- cl.viewangles[PITCH] += m_pitch.value * my;
- if (cl.viewangles[PITCH] > 80)
- cl.viewangles[PITCH] = 80;
- if (cl.viewangles[PITCH] < -70)
- cl.viewangles[PITCH] = -70;
+ 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 * my;
+ cmd->upmove -= m_forward.value * mouse_y;
else
- cmd->forwardmove -= m_forward.value * my;
+ cmd->forwardmove -= m_forward.value * mouse_y;
}
- mx = my = 0;
+ mouse_x = mouse_y = 0.0;
}
void IN_Move (usercmd_t *cmd)
projects / xonotic / darkplaces.git / blobdiff