X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_glx.c;h=4c5c9c9d02f6b5b852b5dce49712289cd66a015d;hp=a960a009850936321d3558210ddffb076d51cee7;hb=477b95bb0bd3ee638ceefd2fc3251a43ff4212d0;hpb=6d9278cdfd9243e42404a8132a4665bd1bf837a8 diff --git a/vid_glx.c b/vid_glx.c index a960a009..4c5c9c9d 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -17,6 +17,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS) +//#define USEDGA +#endif + #include #include @@ -28,17 +32,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include "quakedef.h" +#include "dpsoftrast.h" #include #include #include #include -#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS) +#ifdef USEDGA #include #endif #include +#include +#include +#include + +// get the Uchar type +#include "utf8lib.h" +#include "image.h" + #include "nexuiz.xpm" #include "darkplaces.xpm" @@ -76,10 +89,21 @@ static dllfunction_t swapcontrolfuncs[] = static Display *vidx11_display = NULL; static int vidx11_screen; -static Window win; +static Window win, root; static GLXContext ctx = NULL; +static GC vidx11_gc = NULL; +static XImage *vidx11_ximage[2] = { NULL, NULL }; +static int vidx11_ximage_pos = 0; +static XShmSegmentInfo vidx11_shminfo[2]; +static int vidx11_shmevent = -1; +static int vidx11_shmwait = 0; // number of frames outstanding Atom wm_delete_window_atom; +Atom net_wm_state_atom; +Atom net_wm_state_hidden_atom; +Atom net_wm_state_fullscreen_atom; +Atom net_wm_icon; +Atom cardinal; #define KEY_MASK (KeyPressMask | KeyReleaseMask) #define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \ @@ -95,37 +119,81 @@ static qboolean vid_usingmouse = false; static qboolean vid_usinghidecursor = false; static qboolean vid_usingvsync = false; static qboolean vid_usevsync = false; -static qboolean vid_x11_hardwaregammasupported = false; +#ifdef USEDGA static qboolean vid_x11_dgasupported = false; -static int vid_x11_gammarampsize = 0; +#endif -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA cvar_t vid_dgamouse = {CVAR_SAVE, "vid_dgamouse", "0", "make use of DGA mouse input"}; static qboolean vid_usingdgamouse = false; #endif -cvar_t vid_netwmfullscreen = {CVAR_SAVE, "vid_netwmfullscreen", "0", "make use _NET_WM_STATE_FULLSCREEN; turn this off if fullscreen does not work for you"}; qboolean vidmode_ext = false; static int win_x, win_y; -static XF86VidModeModeInfo init_vidmode; +static XF86VidModeModeInfo init_vidmode, game_vidmode; static qboolean vid_isfullscreen = false; +static qboolean vid_isvidmodefullscreen = false; +static qboolean vid_isdesktopfullscreen = false; +static qboolean vid_isoverrideredirect = false; +static vid_mode_t desktop_mode; static Visual *vidx11_visual; static Colormap vidx11_colormap; /*-----------------------------------------------------------------------*/ +// + +extern long keysym2ucs(KeySym keysym); // LordHavoc: suppress warning just in this case, it's not worth having a header file for this... +static void DP_Xutf8LookupString(XKeyEvent * ev, + Uchar *uch, + KeySym * keysym_return, + Status * status_return) +{ + int rc; + KeySym keysym; + int codepoint; + char buffer[64]; + int nbytes = sizeof(buffer); + + rc = XLookupString(ev, buffer, nbytes, &keysym, NULL); + + if (rc > 0) { + codepoint = buffer[0] & 0xFF; + } else { + codepoint = keysym2ucs(keysym); + } + + if (codepoint < 0) { + if (keysym == None) { + *status_return = XLookupNone; + } else { + *status_return = XLookupKeySym; + *keysym_return = keysym; + } + *uch = 0; + return; + } -static int XLateKey(XKeyEvent *ev, char *ascii) + *uch = codepoint; + + if (keysym != None) { + *keysym_return = keysym; + *status_return = XLookupBoth; + } else { + *status_return = XLookupChars; + } +} +static int XLateKey(XKeyEvent *ev, Uchar *ascii) { int key = 0; - char buf[64]; + //char buf[64]; KeySym keysym, shifted; + Status status; keysym = XLookupKeysym (ev, 0); - XLookupString(ev, buf, sizeof buf, &shifted, 0); - *ascii = buf[0]; + DP_Xutf8LookupString(ev, ascii, &shifted, &status); switch(keysym) { @@ -214,7 +282,13 @@ static int XLateKey(XKeyEvent *ev, char *ascii) case XK_KP_Subtract: key = K_KP_MINUS; break; case XK_KP_Divide: key = K_KP_SLASH; break; - case XK_section: key = '~'; break; + case XK_Num_Lock: key = K_NUMLOCK; break; + case XK_Caps_Lock: key = K_CAPSLOCK; break; + case XK_Scroll_Lock: key = K_SCROLLOCK; break; + + case XK_asciicircum: *ascii = key = '^'; break; // for some reason, XLookupString returns "" on this one for Grunt|2 + + case XK_section: *ascii = key = '~'; break; default: if (keysym < 32) @@ -259,7 +333,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso static int originalmouseparms_threshold; static qboolean restore_spi; -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA qboolean usedgamouse; #endif @@ -272,7 +346,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso if (!mouse_avail) fullscreengrab = relative = hidecursor = false; -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA usedgamouse = relative && vid_dgamouse.integer; if (!vid_x11_dgasupported) usedgamouse = false; @@ -287,7 +361,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso if (fullscreengrab) { XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); - if (vid_grabkeyboard.integer || (vid_isfullscreen && !vid_netwmfullscreen.integer)) + if (vid_grabkeyboard.integer || vid_isoverrideredirect) XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); } else @@ -308,7 +382,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK; XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2); -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA vid_usingdgamouse = usedgamouse; if (usedgamouse) { @@ -320,7 +394,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2); // COMMANDLINEOPTION: X11 Input: -noforcemparms disables setting of mouse parameters (not used with DGA, windows only) -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA if (!COM_CheckParm ("-noforcemparms") && !usedgamouse) #else if (!COM_CheckParm ("-noforcemparms")) @@ -341,7 +415,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso { if (vid_usingmouse) { -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA if (vid_usingdgamouse) XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); vid_usingdgamouse = false; @@ -388,16 +462,129 @@ static keynum_t buttonremap[18] = K_MOUSE16, }; +static qboolean BuildXImages(int w, int h) +{ + int i; + if(DefaultDepth(vidx11_display, vidx11_screen) != 32 && DefaultDepth(vidx11_display, vidx11_screen) != 24) + { + Con_Printf("Sorry, we only support 24bpp and 32bpp modes\n"); + VID_Shutdown(); + return false; + } + // match to dpsoftrast's specs + if(vidx11_visual->red_mask != 0x00FF0000) + { + Con_Printf("Sorry, we only support BGR visuals\n"); + VID_Shutdown(); + return false; + } + if(vidx11_visual->green_mask != 0x0000FF00) + { + Con_Printf("Sorry, we only support BGR visuals\n"); + VID_Shutdown(); + return false; + } + if(vidx11_visual->blue_mask != 0x000000FF) + { + Con_Printf("Sorry, we only support BGR visuals\n"); + VID_Shutdown(); + return false; + } + if(vidx11_shmevent >= 0) + { + for(i = 0; i < 2; ++i) + { + vidx11_shminfo[i].shmid = -1; + vidx11_ximage[i] = XShmCreateImage(vidx11_display, vidx11_visual, DefaultDepth(vidx11_display, vidx11_screen), ZPixmap, NULL, &vidx11_shminfo[i], w, h); + if(!vidx11_ximage[i]) + { + Con_Printf("Failed to get an XImage segment\n"); + VID_Shutdown(); + return false; + } + if(vidx11_ximage[i]->bytes_per_line != w * 4) + { + Con_Printf("Sorry, we only support linear pixel layout\n"); + VID_Shutdown(); + return false; + } + vidx11_shminfo[i].shmid = shmget(IPC_PRIVATE, vidx11_ximage[i]->bytes_per_line * vidx11_ximage[i]->height, IPC_CREAT|0777); + if(vidx11_shminfo[i].shmid < 0) + { + Con_Printf("Failed to get a shm segment\n"); + VID_Shutdown(); + return false; + } + vidx11_shminfo[i].shmaddr = vidx11_ximage[i]->data = shmat(vidx11_shminfo[i].shmid, NULL, 0); + if(!vidx11_shminfo[i].shmaddr) + { + Con_Printf("Failed to get a shm segment addresst\n"); + VID_Shutdown(); + return false; + } + vidx11_shminfo[i].readOnly = True; + XShmAttach(vidx11_display, &vidx11_shminfo[i]); + } + } + else + { + for(i = 0; i < 1; ++i) // we only need one buffer if we don't use Xshm + { + char *p = calloc(4, w * h); + vidx11_shminfo[i].shmid = -1; + vidx11_ximage[i] = XCreateImage(vidx11_display, vidx11_visual, DefaultDepth(vidx11_display, vidx11_screen), ZPixmap, 0, (char*)p, w, h, 8, 0); + if(!vidx11_ximage[i]) + { + Con_Printf("Failed to get an XImage segment\n"); + VID_Shutdown(); + return false; + } + if(vidx11_ximage[i]->bytes_per_line != w * 4) + { + Con_Printf("Sorry, we only support linear pixel layout\n"); + VID_Shutdown(); + return false; + } + } + } + return true; +} +static void DestroyXImages(void) +{ + int i; + for(i = 0; i < 2; ++i) + { + if(vidx11_shminfo[i].shmid >= 0) + { + XShmDetach(vidx11_display, &vidx11_shminfo[i]); + XDestroyImage(vidx11_ximage[i]); + vidx11_ximage[i] = NULL; + shmdt(vidx11_shminfo[i].shmaddr); + shmctl(vidx11_shminfo[i].shmid, IPC_RMID, 0); + vidx11_shminfo[i].shmid = -1; + } + if(vidx11_ximage[i]) + XDestroyImage(vidx11_ximage[i]); + vidx11_ximage[i] = 0; + } +} + +static int in_mouse_x_save = 0, in_mouse_y_save = 0; static void HandleEvents(void) { XEvent event; int key; - char ascii; + Uchar unicode; qboolean dowarp = false; if (!vidx11_display) return; + in_mouse_x += in_mouse_x_save; + in_mouse_y += in_mouse_y_save; + in_mouse_x_save = 0; + in_mouse_y_save = 0; + while (XPending(vidx11_display)) { XNextEvent(vidx11_display, &event); @@ -406,21 +593,21 @@ static void HandleEvents(void) { case KeyPress: // key pressed - key = XLateKey (&event.xkey, &ascii); - Key_Event(key, ascii, true); + key = XLateKey (&event.xkey, &unicode); + Key_Event(key, unicode, true); break; case KeyRelease: // key released - key = XLateKey (&event.xkey, &ascii); - Key_Event(key, ascii, false); + key = XLateKey (&event.xkey, &unicode); + Key_Event(key, unicode, false); break; case MotionNotify: // mouse moved if (vid_usingmouse) { -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA if (vid_usingdgamouse) { in_mouse_x += event.xmotion.x_root; @@ -469,10 +656,37 @@ static void HandleEvents(void) // window changed size/location win_x = event.xconfigure.x; win_y = event.xconfigure.y; - if(vid_resizable.integer < 2) + // HACK on X11, we just request fullscreen mode, but + // cannot guess what the window manager will do for us + // exactly. That is why we read back the resolution we + // actually got here. + if(vid_isdesktopfullscreen) + { + desktop_mode.width = event.xconfigure.width; + desktop_mode.height = event.xconfigure.height; + } + if((vid_resizable.integer < 2 || vid_isdesktopfullscreen) && (vid.width != event.xconfigure.width || vid.height != event.xconfigure.height)) { vid.width = event.xconfigure.width; vid.height = event.xconfigure.height; + if(vid_isdesktopfullscreen) + Con_Printf("NetWM fullscreen: actually using resolution %dx%d\n", vid.width, vid.height); + else + Con_DPrintf("Updating to ConfigureNotify resolution %dx%d\n", vid.width, vid.height); + + if(vid.renderpath == RENDERPATH_SOFT) + { + DPSOFTRAST_Flush(); + if(vid.softdepthpixels) + free(vid.softdepthpixels); + DestroyXImages(); + XSync(vidx11_display, False); + if(!BuildXImages(vid.width, vid.height)) + return; + XSync(vidx11_display, False); + vid.softpixels = (unsigned int *) vidx11_ximage[vidx11_ximage_pos]->data; + vid.softdepthpixels = (unsigned int *)calloc(4, vid.width * vid.height); + } } break; case DestroyNotify: @@ -485,31 +699,83 @@ static void HandleEvents(void) Sys_Quit(0); break; case MapNotify: - if (vid.fullscreen) + if (vid_isoverrideredirect) break; // window restored vid_hidden = false; - VID_RestoreSystemGamma(); + + if(vid_isvidmodefullscreen) + { + // set our video mode + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &game_vidmode); + + // Move the viewport to top left + XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); + } + + if(vid_isdesktopfullscreen) + { + // make sure it's fullscreen + XEvent event; + event.type = ClientMessage; + event.xclient.serial = 0; + event.xclient.send_event = True; + event.xclient.message_type = net_wm_state_atom; + event.xclient.window = win; + event.xclient.format = 32; + event.xclient.data.l[0] = 1; + event.xclient.data.l[1] = net_wm_state_fullscreen_atom; + event.xclient.data.l[2] = 0; + event.xclient.data.l[3] = 1; + event.xclient.data.l[4] = 0; + XSendEvent(vidx11_display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &event); + } + + dowarp = true; + break; case UnmapNotify: - if (vid.fullscreen) + if (vid_isoverrideredirect) break; // window iconified/rolledup/whatever vid_hidden = true; - VID_RestoreSystemGamma(); + + if(vid_isvidmodefullscreen) + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode); + break; case FocusIn: - if (vid.fullscreen) + if (vid_isoverrideredirect) break; // window is now the input focus vid_activewindow = true; break; case FocusOut: - if (vid.fullscreen) + if (vid_isoverrideredirect) break; + + if(vid_isdesktopfullscreen && event.xfocus.mode == NotifyNormal) + { + // iconify netwm fullscreen window when it loses focus + // when the user selects it in the taskbar, the window manager will map it again and send MapNotify + XEvent event; + event.type = ClientMessage; + event.xclient.serial = 0; + event.xclient.send_event = True; + event.xclient.message_type = net_wm_state_atom; + event.xclient.window = win; + event.xclient.format = 32; + event.xclient.data.l[0] = 1; + event.xclient.data.l[1] = net_wm_state_hidden_atom; + event.xclient.data.l[2] = 0; + event.xclient.data.l[3] = 1; + event.xclient.data.l[4] = 0; + XSendEvent(vidx11_display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &event); + } + // window is no longer the input focus vid_activewindow = false; - VID_RestoreSystemGamma(); + break; case EnterNotify: // mouse entered window @@ -517,6 +783,10 @@ static void HandleEvents(void) case LeaveNotify: // mouse left window break; + default: + if(vidx11_shmevent >= 0 && event.type == vidx11_shmevent) + --vidx11_shmwait; + break; } } @@ -575,37 +845,51 @@ void *GL_GetProcAddress(const char *name) void VID_Shutdown(void) { - if (!ctx || !vidx11_display) + if (!vidx11_display) return; + VID_EnableJoystick(false); VID_SetMouse(false, false, false); - VID_RestoreSystemGamma(); // FIXME: glXDestroyContext here? - if (vid_isfullscreen) + if (vid_isvidmodefullscreen) XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode); + + if(vidx11_gc) + XFreeGC(vidx11_display, vidx11_gc); + vidx11_gc = NULL; + + DestroyXImages(); + vidx11_shmevent = -1; + vid.softpixels = NULL; + + if (vid.softdepthpixels) + free(vid.softdepthpixels); + vid.softdepthpixels = NULL; + if (win) XDestroyWindow(vidx11_display, win); XCloseDisplay(vidx11_display); vid_hidden = true; vid_isfullscreen = false; + vid_isdesktopfullscreen = false; + vid_isvidmodefullscreen = false; + vid_isoverrideredirect = false; vidx11_display = NULL; win = 0; ctx = NULL; GL_CloseLibrary(); - Key_ClearStates (); } -void signal_handler(int sig) +static void signal_handler(int sig) { Con_Printf("Received signal %d, exiting...\n", sig); - VID_RestoreSystemGamma(); Sys_Quit(1); } -void InitSig(void) +static void InitSig(void) { signal(SIGHUP, signal_handler); signal(SIGINT, signal_handler); @@ -621,51 +905,79 @@ void InitSig(void) void VID_Finish (void) { - vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable; - if (vid_usingvsync != vid_usevsync && gl_videosyncavailable) + vid_usevsync = vid_vsync.integer && !cls.timedemo && qglXSwapIntervalSGI; + switch(vid.renderpath) { - vid_usingvsync = vid_usevsync; - if (qglXSwapIntervalSGI (vid_usevsync)) - Con_Print("glXSwapIntervalSGI didn't accept the vid_vsync change, it will take effect on next vid_restart (GLX_SGI_swap_control does not allow turning off vsync)\n"); - } + case RENDERPATH_SOFT: + if(vidx11_shmevent >= 0) { + vidx11_ximage_pos = !vidx11_ximage_pos; + vid.softpixels = (unsigned int *) vidx11_ximage[vidx11_ximage_pos]->data; + DPSOFTRAST_SetRenderTargets(vid.width, vid.height, vid.softdepthpixels, vid.softpixels, NULL, NULL, NULL); + + ++vidx11_shmwait; + XShmPutImage(vidx11_display, win, vidx11_gc, vidx11_ximage[!vidx11_ximage_pos], 0, 0, 0, 0, vid.width, vid.height, True); + + // save mouse motion so we can deal with it later + in_mouse_x = 0; + in_mouse_y = 0; + while(vidx11_shmwait > 1) + HandleEvents(); + in_mouse_x_save += in_mouse_x; + in_mouse_y_save += in_mouse_y; + in_mouse_x = 0; + in_mouse_y = 0; + } else { + // no buffer switching here, we just flush the renderer + DPSOFTRAST_Finish(); + XPutImage(vidx11_display, win, vidx11_gc, vidx11_ximage[vidx11_ximage_pos], 0, 0, 0, 0, vid.width, vid.height); + } + break; - if (r_render.integer) - { - CHECKGLERROR - if (r_speeds.integer || gl_finish.integer) - { - qglFinish();CHECKGLERROR - } - qglXSwapBuffers(vidx11_display, win);CHECKGLERROR - } + case RENDERPATH_GL11: + case RENDERPATH_GL13: + case RENDERPATH_GL20: + case RENDERPATH_GLES1: + case RENDERPATH_GLES2: + if (vid_usingvsync != vid_usevsync) + { + vid_usingvsync = vid_usevsync; + if (qglXSwapIntervalSGI && qglXSwapIntervalSGI (vid_usevsync)) + Con_Print("glXSwapIntervalSGI didn't accept the vid_vsync change, it will take effect on next vid_restart (GLX_SGI_swap_control does not allow turning off vsync)\n"); + } - if (vid_x11_hardwaregammasupported) - VID_UpdateGamma(false, vid_x11_gammarampsize); -} + if (!vid_hidden) + { + CHECKGLERROR + if (r_speeds.integer == 2 || gl_finish.integer) + GL_Finish(); + qglXSwapBuffers(vidx11_display, win);CHECKGLERROR + } + break; -int VID_SetGamma(unsigned short *ramps, int rampsize) -{ - return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2); -} + case RENDERPATH_D3D9: + case RENDERPATH_D3D10: + case RENDERPATH_D3D11: + break; + } -int VID_GetGamma(unsigned short *ramps, int rampsize) -{ - return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2); + VID_UpdateGamma(); } void VID_Init(void) { -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA Cvar_RegisterVariable (&vid_dgamouse); #endif - Cvar_RegisterVariable (&vid_netwmfullscreen); + Cvar_RegisterVariable (&vid_desktopfullscreen); InitSig(); // trap evil signals // COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) if (COM_CheckParm ("-nomouse")) mouse_avail = false; + vidx11_shminfo[0].shmid = -1; + vidx11_shminfo[1].shmid = -1; } -void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, int samples) +static void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, int samples) { *attrib++ = GLX_RGBA; *attrib++ = GLX_RED_SIZE;*attrib++ = stencil ? 8 : 5; @@ -691,19 +1003,332 @@ void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, in *attrib++ = None; } -int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples) +static qboolean VID_InitModeSoft(viddef_mode_t *mode) { - int i; + int i, j; + XSetWindowAttributes attr; + XClassHint *clshints; + XWMHints *wmhints; + XSizeHints *szhints; + unsigned long mask; + int MajorVersion, MinorVersion; + char *xpm; + char **idata; + unsigned char *data; + XGCValues gcval; + const char *dpyname; + char vabuf[1024]; + + vid_isfullscreen = false; + vid_isdesktopfullscreen = false; + vid_isvidmodefullscreen = false; + vid_isoverrideredirect = false; + + if (!(vidx11_display = XOpenDisplay(NULL))) + { + Con_Print("Couldn't open the X display\n"); + return false; + } + dpyname = XDisplayName(NULL); + + // 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); + net_wm_state_atom = XInternAtom(vidx11_display, "_NET_WM_STATE", false); + net_wm_state_fullscreen_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_FULLSCREEN", false); + net_wm_state_hidden_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_HIDDEN", false); + net_wm_icon = XInternAtom(vidx11_display, "_NET_WM_ICON", false); + cardinal = XInternAtom(vidx11_display, "CARDINAL", false); + + // make autorepeat send keypress/keypress/.../keyrelease instead of intervening keyrelease + XkbSetDetectableAutoRepeat(vidx11_display, true, NULL); + + vidx11_screen = DefaultScreen(vidx11_display); + root = RootWindow(vidx11_display, vidx11_screen); + + desktop_mode.width = DisplayWidth(vidx11_display, vidx11_screen); + desktop_mode.height = DisplayHeight(vidx11_display, vidx11_screen); + desktop_mode.bpp = DefaultDepth(vidx11_display, vidx11_screen); + desktop_mode.refreshrate = 60; // FIXME + desktop_mode.pixelheight_num = 1; // FIXME + desktop_mode.pixelheight_denom = 1; // FIXME + + // Get video mode list + MajorVersion = MinorVersion = 0; + if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) + vidmode_ext = false; + else + { + Con_DPrintf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion); + vidmode_ext = true; + } + + if (mode->fullscreen) + { + if(vid_desktopfullscreen.integer) + { + // TODO detect WM support + vid_isdesktopfullscreen = true; + vid_isfullscreen = true; + // width and height will be filled in later + Con_DPrintf("Using NetWM fullscreen mode\n"); + } + + if(!vid_isfullscreen && vidmode_ext) + { + int best_fit, best_dist, dist, x, y; + + // Are we going fullscreen? If so, let's change video mode + XF86VidModeModeLine *current_vidmode; + XF86VidModeModeInfo **vidmodes; + int num_vidmodes; + + // This nice hack comes from the SDL source code + current_vidmode = (XF86VidModeModeLine*)((char*)&init_vidmode + sizeof(init_vidmode.dotclock)); + XF86VidModeGetModeLine(vidx11_display, vidx11_screen, (int*)&init_vidmode.dotclock, current_vidmode); + + XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes); + best_dist = 0; + best_fit = -1; + + for (i = 0; i < num_vidmodes; i++) + { + if (mode->width > vidmodes[i]->hdisplay || mode->height > vidmodes[i]->vdisplay) + continue; + + x = mode->width - vidmodes[i]->hdisplay; + y = mode->height - vidmodes[i]->vdisplay; + dist = (x * x) + (y * y); + if (best_fit == -1 || dist < best_dist) + { + best_dist = dist; + best_fit = i; + } + } + + if (best_fit != -1) + { + // LordHavoc: changed from ActualWidth/ActualHeight =, + // to width/height =, so the window will take the full area of + // the mode chosen + mode->width = vidmodes[best_fit]->hdisplay; + mode->height = vidmodes[best_fit]->vdisplay; + + // change to the mode + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]); + memcpy(&game_vidmode, vidmodes[best_fit], sizeof(game_vidmode)); + vid_isvidmodefullscreen = true; + vid_isfullscreen = true; + + // Move the viewport to top left + XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); + Con_DPrintf("Using XVidMode fullscreen mode at %dx%d\n", mode->width, mode->height); + } + + free(vidmodes); + } + + if(!vid_isfullscreen) + { + // sorry, no FS available + // use the full desktop resolution + vid_isfullscreen = true; + // width and height will be filled in later + mode->width = DisplayWidth(vidx11_display, vidx11_screen); + mode->height = DisplayHeight(vidx11_display, vidx11_screen); + Con_DPrintf("Using X11 fullscreen mode at %dx%d\n", mode->width, mode->height); + } + } + + // LordHavoc: save the visual for use in gamma ramp settings later + vidx11_visual = DefaultVisual(vidx11_display, vidx11_screen); + + /* window attributes */ + attr.background_pixel = 0; + attr.border_pixel = 0; + // LordHavoc: save the colormap for later, too + vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, vidx11_visual, AllocNone); + attr.event_mask = X_MASK; + + if (mode->fullscreen) + { + if(vid_isdesktopfullscreen) + { + mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask; + attr.backing_store = NotUseful; + attr.save_under = False; + } + else + { + mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect; + attr.override_redirect = True; + attr.backing_store = NotUseful; + attr.save_under = False; + vid_isoverrideredirect = true; // so it knows to grab + } + } + else + { + mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; + } + + win = XCreateWindow(vidx11_display, root, 0, 0, mode->width, mode->height, 0, CopyFromParent, InputOutput, vidx11_visual, mask, &attr); + + data = 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(&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 = loadimagepixelsbgra(va(vabuf, sizeof(vabuf), "darkplaces-icon%d", i), false, false, false, NULL); + } + XChangeProperty(vidx11_display, win, net_wm_icon, cardinal, 32, PropModeReplace, (const unsigned char *) netwm_icon, pos); + } + + // fallthrough for old window managers + xpm = (char *) FS_LoadFile("darkplaces-icon.xpm", tempmempool, false, NULL); + idata = NULL; + if(xpm) + idata = XPM_DecodeString(xpm); + if(!idata) + idata = ENGINE_ICON; + + wmhints = XAllocWMHints(); + if(XpmCreatePixmapFromData(vidx11_display, win, + idata, + &wmhints->icon_pixmap, &wmhints->icon_mask, NULL) == XpmSuccess) + wmhints->flags |= IconPixmapHint | IconMaskHint; + + if(xpm) + Mem_Free(xpm); + + clshints = XAllocClassHint(); + clshints->res_name = strdup(gamename); + clshints->res_class = strdup("DarkPlaces"); + + szhints = XAllocSizeHints(); + if(vid_resizable.integer == 0 && !vid_isdesktopfullscreen) + { + szhints->min_width = szhints->max_width = mode->width; + szhints->min_height = szhints->max_height = mode->height; + szhints->flags |= PMinSize | PMaxSize; + } + + XmbSetWMProperties(vidx11_display, win, gamename, gamename, (char **) com_argv, com_argc, szhints, wmhints, clshints); + // strdup() allocates using malloc(), should be freed with free() + free(clshints->res_name); + free(clshints->res_class); + XFree(clshints); + XFree(wmhints); + XFree(szhints); + + //XStoreName(vidx11_display, win, gamename); + XMapWindow(vidx11_display, win); + + XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1); + + if (vid_isoverrideredirect) + { + XMoveWindow(vidx11_display, win, 0, 0); + XRaiseWindow(vidx11_display, win); + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); + XFlush(vidx11_display); + } + + if(vid_isvidmodefullscreen) + { + // Move the viewport to top left + XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); + } + + //XSync(vidx11_display, False); + + // COMMANDLINEOPTION: Unix GLX: -noshm disables XShm extensioon + if(dpyname && dpyname[0] == ':' && dpyname[1] && (dpyname[2] < '0' || dpyname[2] > '9') && !COM_CheckParm("-noshm") && XShmQueryExtension(vidx11_display)) + { + Con_Printf("Using XShm\n"); + vidx11_shmevent = XShmGetEventBase(vidx11_display) + ShmCompletion; + } + else + { + Con_Printf("Not using XShm\n"); + vidx11_shmevent = -1; + } + BuildXImages(mode->width, mode->height); + + vidx11_ximage_pos = 0; + vid.softpixels = (unsigned int *) vidx11_ximage[vidx11_ximage_pos]->data; + vidx11_shmwait = 0; + vid.softdepthpixels = (unsigned int *)calloc(1, mode->width * mode->height * 4); + + memset(&gcval, 0, sizeof(gcval)); + vidx11_gc = XCreateGC(vidx11_display, win, 0, &gcval); + + if (DPSOFTRAST_Init(mode->width, mode->height, vid_soft_threads.integer, vid_soft_interlace.integer, (unsigned int *)vid.softpixels, (unsigned int *)vid.softdepthpixels) < 0) + { + Con_Printf("Failed to initialize software rasterizer\n"); + VID_Shutdown(); + return false; + } + + XSync(vidx11_display, False); + + vid_usingmousegrab = false; + vid_usingmouse = false; + vid_usinghidecursor = false; + vid_usingvsync = false; + vid_hidden = false; + vid_activewindow = true; +#ifdef USEDGA + vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion); + if (!vid_x11_dgasupported) + Con_Print( "Failed to detect XF86DGA Mouse extension\n" ); +#endif + + VID_Soft_SharedSetup(); + + return true; +} + +static qboolean VID_InitModeGL(viddef_mode_t *mode) +{ + int i, j; int attrib[32]; XSetWindowAttributes attr; XClassHint *clshints; XWMHints *wmhints; XSizeHints *szhints; unsigned long mask; - Window root; XVisualInfo *visinfo; int MajorVersion, MinorVersion; const char *drivername; + char *xpm; + char **idata; + unsigned char *data; + char vabuf[1024]; + + vid_isfullscreen = false; + vid_isdesktopfullscreen = false; + vid_isvidmodefullscreen = false; + vid_isoverrideredirect = false; #if defined(__APPLE__) && defined(__MACH__) drivername = "/usr/X11R6/lib/libGL.1.dylib"; @@ -728,12 +1353,28 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate return false; } + // 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); + net_wm_state_atom = XInternAtom(vidx11_display, "_NET_WM_STATE", false); + net_wm_state_fullscreen_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_FULLSCREEN", false); + net_wm_state_hidden_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_HIDDEN", false); + net_wm_icon = XInternAtom(vidx11_display, "_NET_WM_ICON", false); + cardinal = XInternAtom(vidx11_display, "CARDINAL", false); + // make autorepeat send keypress/keypress/.../keyrelease instead of intervening keyrelease XkbSetDetectableAutoRepeat(vidx11_display, true, NULL); vidx11_screen = DefaultScreen(vidx11_display); root = RootWindow(vidx11_display, vidx11_screen); + desktop_mode.width = DisplayWidth(vidx11_display, vidx11_screen); + desktop_mode.height = DisplayHeight(vidx11_display, vidx11_screen); + desktop_mode.bpp = DefaultDepth(vidx11_display, vidx11_screen); + desktop_mode.refreshrate = 60; // FIXME + desktop_mode.pixelheight_num = 1; // FIXME + desktop_mode.pixelheight_denom = 1; // FIXME + // Get video mode list MajorVersion = MinorVersion = 0; if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) @@ -755,7 +1396,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate return false; } - VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer, samples); + VID_BuildGLXAttrib(attrib, mode->bitsperpixel == 32, mode->stereobuffer, mode->samples); visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib); if (!visinfo) { @@ -763,13 +1404,22 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate return false; } - if (vidmode_ext) + if (mode->fullscreen) { - int best_fit, best_dist, dist, x, y; + if(vid_desktopfullscreen.integer) + { + // TODO detect WM support + vid_isdesktopfullscreen = true; + vid_isfullscreen = true; + // width and height will be filled in later + Con_DPrintf("Using NetWM fullscreen mode\n"); + } - // Are we going fullscreen? If so, let's change video mode - if (fullscreen) + if(!vid_isfullscreen && vidmode_ext) { + int best_fit, best_dist, dist, x, y; + + // Are we going fullscreen? If so, let's change video mode XF86VidModeModeLine *current_vidmode; XF86VidModeModeInfo **vidmodes; int num_vidmodes; @@ -779,18 +1429,18 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate XF86VidModeGetModeLine(vidx11_display, vidx11_screen, (int*)&init_vidmode.dotclock, current_vidmode); XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes); - best_dist = 9999999; + best_dist = 0; best_fit = -1; for (i = 0; i < num_vidmodes; i++) { - if (width > vidmodes[i]->hdisplay || height > vidmodes[i]->vdisplay) + if (mode->width > vidmodes[i]->hdisplay || mode->height > vidmodes[i]->vdisplay) continue; - x = width - vidmodes[i]->hdisplay; - y = height - vidmodes[i]->vdisplay; + x = mode->width - vidmodes[i]->hdisplay; + y = mode->height - vidmodes[i]->vdisplay; dist = (x * x) + (y * y); - if (dist < best_dist) + if (best_fit == -1 || dist < best_dist) { best_dist = dist; best_fit = i; @@ -802,21 +1452,33 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate // 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; + mode->width = vidmodes[best_fit]->hdisplay; + mode->height = vidmodes[best_fit]->vdisplay; // change to the mode XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]); + memcpy(&game_vidmode, vidmodes[best_fit], sizeof(game_vidmode)); + vid_isvidmodefullscreen = true; vid_isfullscreen = true; // Move the viewport to top left XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); + Con_DPrintf("Using XVidMode fullscreen mode at %dx%d\n", mode->width, mode->height); } - else - fullscreen = 0; free(vidmodes); } + + if(!vid_isfullscreen) + { + // sorry, no FS available + // use the full desktop resolution + vid_isfullscreen = true; + // width and height will be filled in later + mode->width = DisplayWidth(vidx11_display, vidx11_screen); + mode->height = DisplayHeight(vidx11_display, vidx11_screen); + Con_DPrintf("Using X11 fullscreen mode at %dx%d\n", mode->width, mode->height); + } } // LordHavoc: save the visual for use in gamma ramp settings later @@ -828,71 +1490,112 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate // LordHavoc: save the colormap for later, too vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, visinfo->visual, AllocNone); attr.event_mask = X_MASK; - if (vid_isfullscreen) + + if (mode->fullscreen) { - if(vid_netwmfullscreen.integer) + if(vid_isdesktopfullscreen) { - mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect; - attr.override_redirect = True; + mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask; attr.backing_store = NotUseful; attr.save_under = False; } else { - mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask; + mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect; + attr.override_redirect = True; attr.backing_store = NotUseful; attr.save_under = False; + vid_isoverrideredirect = true; // so it knows to grab } } else + { mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; + } + + win = XCreateWindow(vidx11_display, root, 0, 0, mode->width, mode->height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr); - win = XCreateWindow(vidx11_display, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr); + data = 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(&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 = loadimagepixelsbgra(va(vabuf, sizeof(vabuf), "darkplaces-icon%d", i), false, false, false, NULL); + } + XChangeProperty(vidx11_display, win, net_wm_icon, cardinal, 32, PropModeReplace, (const unsigned char *) netwm_icon, pos); + } + + // fallthrough for old window managers + xpm = (char *) FS_LoadFile("darkplaces-icon.xpm", tempmempool, false, NULL); + idata = NULL; + if(xpm) + idata = XPM_DecodeString(xpm); + if(!idata) + idata = ENGINE_ICON; wmhints = XAllocWMHints(); if(XpmCreatePixmapFromData(vidx11_display, win, - (gamemode == GAME_NEXUIZ) ? nexuiz_xpm : darkplaces_xpm, + idata, &wmhints->icon_pixmap, &wmhints->icon_mask, NULL) == XpmSuccess) wmhints->flags |= IconPixmapHint | IconMaskHint; + if(xpm) + Mem_Free(xpm); + clshints = XAllocClassHint(); clshints->res_name = strdup(gamename); clshints->res_class = strdup("DarkPlaces"); szhints = XAllocSizeHints(); - if(vid_resizable.integer == 0) + if(vid_resizable.integer == 0 && !vid_isdesktopfullscreen) { - szhints->min_width = szhints->max_width = width; - szhints->min_height = szhints->max_height = height; + szhints->min_width = szhints->max_width = mode->width; + szhints->min_height = szhints->max_height = mode->height; szhints->flags |= PMinSize | PMaxSize; } XmbSetWMProperties(vidx11_display, win, gamename, gamename, (char **) com_argv, com_argc, szhints, wmhints, clshints); + // strdup() allocates using malloc(), should be freed with free() + free(clshints->res_name); + free(clshints->res_class); XFree(clshints); XFree(wmhints); XFree(szhints); - if(vid_isfullscreen && vid_netwmfullscreen.integer) - { - Atom net_wm_state_atom = XInternAtom(vidx11_display, "_NET_WM_STATE", false); - Atom net_wm_state_fullscreen_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_FULLSCREEN", false); - XChangeProperty(vidx11_display, win, net_wm_state_atom, XA_ATOM, 32, PropModeReplace, (unsigned char *) &net_wm_state_fullscreen_atom, 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 (vid_isfullscreen) + if (vid_isoverrideredirect) { XMoveWindow(vidx11_display, win, 0, 0); XRaiseWindow(vidx11_display, win); XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); XFlush(vidx11_display); + } + + if(vid_isvidmodefullscreen) + { // Move the viewport to top left XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); } @@ -900,6 +1603,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate //XSync(vidx11_display, False); ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True); + XFree(visinfo); // glXChooseVisual man page says to use XFree to free visinfo if (!ctx) { Con_Printf ("glXCreateContext failed\n"); @@ -924,8 +1628,6 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate gl_platform = "GLX"; gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen); - gl_videosyncavailable = false; - // COMMANDLINEOPTION: Linux GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) // COMMANDLINEOPTION: BSD GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) // COMMANDLINEOPTION: MacOSX GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) @@ -933,7 +1635,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate // COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_swap_control // COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_swap_control // COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_swap_control - gl_videosyncavailable = GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false); + GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false); vid_usingmousegrab = false; vid_usingmouse = false; @@ -941,22 +1643,32 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate vid_usingvsync = false; vid_hidden = false; vid_activewindow = true; - vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0; -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion); if (!vid_x11_dgasupported) Con_Print( "Failed to detect XF86DGA Mouse extension\n" ); #endif + GL_Init(); return true; } +qboolean VID_InitMode(viddef_mode_t *mode) +{ +#ifdef SSE_POSSIBLE + if (vid_soft.integer) + return VID_InitModeSoft(mode); + else +#endif + return VID_InitModeGL(mode); +} + void Sys_SendKeyEvents(void) { static qboolean sound_active = true; // enable/disable sound on focus gain/loss - if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer)) + if ((!vid_hidden && vid_activewindow) || !snd_mutewhenidle.integer) { if (!sound_active) { @@ -976,6 +1688,76 @@ void Sys_SendKeyEvents(void) HandleEvents(); } +void VID_BuildJoyState(vid_joystate_t *joystate) +{ + VID_Shared_BuildJoyState_Begin(joystate); + VID_Shared_BuildJoyState_Finish(joystate); +} + +void VID_EnableJoystick(qboolean enable) +{ + int index = joy_enable.integer > 0 ? joy_index.integer : -1; + qboolean success = false; + int sharedcount = 0; + sharedcount = VID_Shared_SetJoystick(index); + if (index >= 0 && index < sharedcount) + success = true; + + // update cvar containing count of XInput joysticks + if (joy_detected.integer != sharedcount) + Cvar_SetValueQuick(&joy_detected, sharedcount); + + Cvar_SetValueQuick(&joy_active, success ? 1 : 0); +} + void IN_Move (void) { + vid_joystate_t joystate; + VID_EnableJoystick(true); + VID_BuildJoyState(&joystate); + VID_ApplyJoyState(&joystate); +} + +vid_mode_t *VID_GetDesktopMode(void) +{ + return &desktop_mode; +} + +size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) +{ + if(vidmode_ext) + { + int i, bpp; + size_t k; + XF86VidModeModeInfo **vidmodes; + int num_vidmodes; + + XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes); + k = 0; + for (i = 0; i < num_vidmodes; i++) + { + if(k >= maxcount) + break; + // we don't get bpp info, so let's just assume all of 8, 15, 16, 24, 32 work + for(bpp = 8; bpp <= 32; bpp = ((bpp == 8) ? 15 : (bpp & 0xF8) + 8)) + { + if(k >= maxcount) + break; + modes[k].width = vidmodes[i]->hdisplay; + modes[k].height = vidmodes[i]->vdisplay; + modes[k].bpp = 8; + if(vidmodes[i]->dotclock && vidmodes[i]->htotal && vidmodes[i]->vtotal) + modes[k].refreshrate = vidmodes[i]->dotclock / vidmodes[i]->htotal / vidmodes[i]->vtotal; + else + modes[k].refreshrate = 60; + modes[k].pixelheight_num = 1; + modes[k].pixelheight_denom = 1; // xvidmode does not provide this + ++k; + } + } + // manpage of XF86VidModeGetAllModeLines says it should be freed by the caller + XFree(vidmodes); + return k; + } + return 0; // FIXME implement this }