Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS)
+//#define USEDGA
+#endif
+
#include <signal.h>
#include <dlfcn.h>
#include <X11/xpm.h>
#include <X11/extensions/XShm.h>
-#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS)
+#ifdef USEDGA
#include <X11/extensions/xf86dga.h>
#endif
#include <X11/extensions/xf86vmode.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+
// get the Uchar type
#include "utf8lib.h"
#include "image.h"
static Window win, root;
static GLXContext ctx = NULL;
static GC vidx11_gc = NULL;
-static XImage *vidx11_ximage = 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;
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 XF86VidModeModeInfo init_vidmode, game_vidmode;
static qboolean vid_isfullscreen = false;
static qboolean vid_isvidmodefullscreen = false;
-static qboolean vid_isnetwmfullscreen = 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;
/*-----------------------------------------------------------------------*/
//
-long keysym2ucs(KeySym keysym);
-void DP_Xutf8LookupString(XKeyEvent * ev,
+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)
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)
static int originalmouseparms_threshold;
static qboolean restore_spi;
-#if !defined(__APPLE__) && !defined(SUNOS)
+#ifdef USEDGA
qboolean usedgamouse;
#endif
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;
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)
{
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"))
{
if (vid_usingmouse)
{
-#if !defined(__APPLE__) && !defined(SUNOS)
+#ifdef USEDGA
if (vid_usingdgamouse)
XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
vid_usingdgamouse = false;
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;
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);
// mouse moved
if (vid_usingmouse)
{
-#if !defined(__APPLE__) && !defined(SUNOS)
+#ifdef USEDGA
if (vid_usingdgamouse)
{
in_mouse_x += event.xmotion.x_root;
// window changed size/location
win_x = event.xconfigure.x;
win_y = event.xconfigure.y;
- if(vid_resizable.integer < 2 || vid_isnetwmfullscreen)
+ // 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_isnetwmfullscreen)
+ 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 (vidx11_ximage)
+ if(vid.renderpath == RENDERPATH_SOFT)
{
- XDestroyImage(vidx11_ximage);
+ DPSOFTRAST_Flush();
if(vid.softdepthpixels)
free(vid.softdepthpixels);
- vid.softpixels = (unsigned int *)calloc(1, vid.width * vid.height * 4);
- vid.softdepthpixels = (unsigned int *)calloc(1, vid.width * vid.height * 4);
- vidx11_ximage = XCreateImage(vidx11_display, vidx11_visual, DefaultDepth(vidx11_display, vidx11_screen), ZPixmap, 0, (char*)vid.softpixels, vid.width, vid.height, 8, 0);
-
- // FIXME inform softrast!
+ 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;
break;
// window restored
vid_hidden = false;
- VID_RestoreSystemGamma();
if(vid_isvidmodefullscreen)
{
XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
}
- if(vid_isnetwmfullscreen)
+ if(vid_isdesktopfullscreen)
{
// make sure it's fullscreen
XEvent event;
break;
// window iconified/rolledup/whatever
vid_hidden = true;
- VID_RestoreSystemGamma();
if(vid_isvidmodefullscreen)
XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
if (vid_isoverrideredirect)
break;
- if(vid_isnetwmfullscreen && event.xfocus.mode == NotifyNormal)
+ 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
// window is no longer the input focus
vid_activewindow = false;
- VID_RestoreSystemGamma();
break;
case EnterNotify:
case LeaveNotify:
// mouse left window
break;
+ default:
+ if(vidx11_shmevent >= 0 && event.type == vidx11_shmevent)
+ --vidx11_shmwait;
+ break;
}
}
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_isvidmodefullscreen)
XFreeGC(vidx11_display, vidx11_gc);
vidx11_gc = NULL;
- if(vidx11_ximage)
- XDestroyImage(vidx11_ximage);
- vidx11_ximage = 0;
+ DestroyXImages();
+ vidx11_shmevent = -1;
vid.softpixels = NULL;
if (vid.softdepthpixels)
free(vid.softdepthpixels);
+ vid.softdepthpixels = NULL;
if (win)
XDestroyWindow(vidx11_display, win);
vid_hidden = true;
vid_isfullscreen = false;
- vid_isnetwmfullscreen = false;
+ vid_isdesktopfullscreen = false;
vid_isvidmodefullscreen = false;
vid_isoverrideredirect = false;
vidx11_display = NULL;
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);
switch(vid.renderpath)
{
case RENDERPATH_SOFT:
- XPutImage(vidx11_display, win, vidx11_gc, vidx11_ximage, 0, 0, 0, 0, vid.width, vid.height);
+ 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;
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 (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");
}
break;
}
- if (vid_x11_hardwaregammasupported)
- VID_UpdateGamma(false, vid_x11_gammarampsize);
-}
-
-int VID_SetGamma(unsigned short *ramps, int rampsize)
-{
- return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2);
-}
-
-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;
*attrib++ = None;
}
-qboolean VID_InitModeSoft(viddef_mode_t *mode)
+static qboolean VID_InitModeSoft(viddef_mode_t *mode)
{
int i, j;
XSetWindowAttributes attr;
char **idata;
unsigned char *data;
XGCValues gcval;
+ const char *dpyname;
+ char vabuf[1024];
vid_isfullscreen = false;
- vid_isnetwmfullscreen = false;
+ vid_isdesktopfullscreen = false;
vid_isvidmodefullscreen = false;
vid_isoverrideredirect = false;
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...
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))
if (mode->fullscreen)
{
- if(vid_netwmfullscreen.integer)
+ if(vid_desktopfullscreen.integer)
{
// TODO detect WM support
- vid_isnetwmfullscreen = true;
+ vid_isdesktopfullscreen = true;
vid_isfullscreen = true;
// width and height will be filled in later
Con_DPrintf("Using NetWM fullscreen mode\n");
if (mode->fullscreen)
{
- if(vid_isnetwmfullscreen)
+ if(vid_isdesktopfullscreen)
{
mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask;
attr.backing_store = NotUseful;
}
++i;
Mem_Free(data);
- data = loadimagepixelsbgra(va("darkplaces-icon%d", i), false, false, false, NULL);
+ 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);
}
clshints->res_class = strdup("DarkPlaces");
szhints = XAllocSizeHints();
- if(vid_resizable.integer == 0 && !vid_isnetwmfullscreen)
+ if(vid_resizable.integer == 0 && !vid_isdesktopfullscreen)
{
szhints->min_width = szhints->max_width = mode->width;
szhints->min_height = szhints->max_height = mode->height;
//XSync(vidx11_display, False);
- // TODO XShm
- vid.softpixels = (unsigned int *)calloc(1, mode->width * mode->height * 4);
- vid.softdepthpixels = (unsigned int *)calloc(1, mode->width * mode->height * 4);
- vidx11_ximage = XCreateImage(vidx11_display, vidx11_visual, DefaultDepth(vidx11_display, vidx11_screen), ZPixmap, 0, (char*)vid.softpixels, mode->width, mode->height, 8, 0);
- if(!vidx11_ximage)
+ // 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("Failed to initialize an XImage\n");
- VID_Shutdown();
- return false;
+ 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);
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" );
return true;
}
-qboolean VID_InitModeGL(viddef_mode_t *mode)
+
+static qboolean VID_InitModeGL(viddef_mode_t *mode)
{
int i, j;
int attrib[32];
char *xpm;
char **idata;
unsigned char *data;
+ char vabuf[1024];
vid_isfullscreen = false;
- vid_isnetwmfullscreen = false;
+ vid_isdesktopfullscreen = false;
vid_isvidmodefullscreen = false;
vid_isoverrideredirect = false;
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))
if (mode->fullscreen)
{
- if(vid_netwmfullscreen.integer)
+ if(vid_desktopfullscreen.integer)
{
// TODO detect WM support
- vid_isnetwmfullscreen = true;
+ vid_isdesktopfullscreen = true;
vid_isfullscreen = true;
// width and height will be filled in later
Con_DPrintf("Using NetWM fullscreen mode\n");
if (mode->fullscreen)
{
- if(vid_isnetwmfullscreen)
+ if(vid_isdesktopfullscreen)
{
mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask;
attr.backing_store = NotUseful;
}
++i;
Mem_Free(data);
- data = loadimagepixelsbgra(va("darkplaces-icon%d", i), false, false, false, NULL);
+ 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);
}
clshints->res_class = strdup("DarkPlaces");
szhints = XAllocSizeHints();
- if(vid_resizable.integer == 0 && !vid_isnetwmfullscreen)
+ if(vid_resizable.integer == 0 && !vid_isdesktopfullscreen)
{
szhints->min_width = szhints->max_width = mode->width;
szhints->min_height = szhints->max_height = mode->height;
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" );
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)
projects / xonotic / darkplaces.git / blobdiff