detail texturing added (although with just one generated texture applied to everything)

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index 6445cbac8c6221825b22bdf67d356d7181254da5..07104c14adf49155653176979b390f7a818039ce 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -17,18 +17,18 @@ 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 <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>
@@ -38,11 +38,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #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 )
@@ -74,12 +85,6 @@ static Colormap vidx11_colormap;
 
 /*-----------------------------------------------------------------------*/
 
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
-
-/*-----------------------------------------------------------------------*/
 static int
 XLateKey(XKeyEvent *ev)
 {
@@ -278,11 +283,17 @@ static void HandleEvents(void)
                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)
@@ -292,7 +303,7 @@ static void HandleEvents(void)
                                }
                                else
                                {
-                                       
+
                                        if (!event.xmotion.send_event)
                                        {
                                                mouse_x += event.xmotion.x - p_mouse_x;
@@ -309,6 +320,7 @@ static void HandleEvents(void)
                        break;
 
                case ButtonPress:
+                       // mouse button pressed
                        switch(event.xbutton.button)
                        {
                        case 1:
@@ -333,6 +345,7 @@ static void HandleEvents(void)
                        break;
 
                case ButtonRelease:
+                       // mouse button released
                        switch(event.xbutton.button)
                        {
                        case 1:
@@ -356,15 +369,46 @@ static void HandleEvents(void)
                        }
                        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;
                }
        }
 
@@ -423,6 +467,8 @@ void VID_Shutdown(void)
        vidx11_display = NULL;
        win = 0;
        ctx = NULL;
+
+       GL_CloseLibrary();
 }
 
 void signal_handler(int sig)
@@ -464,7 +510,7 @@ void VID_Finish (void)
        if (r_render.integer)
        {
                qglFinish();
-               glXSwapBuffers(vidx11_display, win);
+               qglXSwapBuffers(vidx11_display, win);
        }
 
 // handle the mouse state when windowed if that's changed
@@ -602,6 +648,8 @@ void VID_Init(void)
        qboolean fullscreen = true;
        int MajorVersion, MinorVersion;
 
+       GL_OpenLibrary();
+
        Cvar_RegisterVariable (&vid_dga);
        Cvar_RegisterVariable (&vid_dga_mouseaccel);
 
@@ -654,18 +702,24 @@ void VID_Init(void)
                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);
                }
        }
@@ -740,6 +794,11 @@ void VID_Init(void)
        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);
@@ -752,9 +811,9 @@ void VID_Init(void)
 
        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;
@@ -766,6 +825,8 @@ void VID_Init(void)
 
        InitSig(); // trap evil signals
 
+       vid_hidden = false;
+
        GL_Init();
 
        Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);