X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_sdl.c;h=70032371e1ad016e70d5fdce14226d6fbc709193;hp=3211eaa17f55814a48b5dfdbdd9d800a5c6392a3;hb=33a718ecc3619f6e4fb485c68a73f9b118473027;hpb=90d40131f6af428615cd0c0531c3e94f3c1cb792 diff --git a/vid_sdl.c b/vid_sdl.c index 3211eaa1..70032371 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "image.h" -#include "dpsoftrast.h" +#include "utf8lib.h" #ifndef __IPHONEOS__ #ifdef MACOSX @@ -83,14 +83,14 @@ static int win_half_height = 50; static int video_bpp; #if SDL_MAJOR_VERSION == 1 -static SDL_Surface *screen; +static SDL_Surface *video_screen; static int video_flags; #else -static SDL_GLContext *context; +static SDL_GLContext context; static SDL_Window *window; static int window_flags; #endif -static SDL_Surface *vid_softsurface; +static vid_mode_t desktop_mode; ///////////////////////// // Input handling @@ -99,6 +99,7 @@ static SDL_Surface *vid_softsurface; #ifndef SDLK_PERCENT #define SDLK_PERCENT '%' +#if SDL_MAJOR_VERSION == 1 #define SDLK_PRINTSCREEN SDLK_PRINT #define SDLK_SCROLLLOCK SDLK_SCROLLOCK #define SDLK_NUMLOCKCLEAR SDLK_NUMLOCK @@ -113,6 +114,7 @@ static SDL_Surface *vid_softsurface; #define SDLK_KP_9 SDLK_KP9 #define SDLK_KP_0 SDLK_KP0 #endif +#endif static int MapKey( unsigned int sdlkey ) { @@ -202,10 +204,8 @@ static int MapKey( unsigned int sdlkey ) case SDLK_F10: return K_F10; case SDLK_F11: return K_F11; case SDLK_F12: return K_F12; -#if SDL_MAJOR_VERSION == 1 case SDLK_PRINTSCREEN: return K_PRINTSCREEN; case SDLK_SCROLLLOCK: return K_SCROLLOCK; -#endif case SDLK_PAUSE: return K_PAUSE; case SDLK_INSERT: return K_INS; case SDLK_HOME: return K_HOME; @@ -221,27 +221,23 @@ static int MapKey( unsigned int sdlkey ) case SDLK_LEFT: return K_LEFTARROW; case SDLK_DOWN: return K_DOWNARROW; case SDLK_UP: return K_UPARROW; -#if SDL_MAJOR_VERSION == 1 case SDLK_NUMLOCKCLEAR: return K_NUMLOCK; -#endif case SDLK_KP_DIVIDE: return K_KP_DIVIDE; case SDLK_KP_MULTIPLY: return K_KP_MULTIPLY; case SDLK_KP_MINUS: return K_KP_MINUS; case SDLK_KP_PLUS: return K_KP_PLUS; case SDLK_KP_ENTER: return K_KP_ENTER; -#if SDL_MAJOR_VERSION == 1 - case SDLK_KP_1: return K_KP_1; - case SDLK_KP_2: return K_KP_2; - case SDLK_KP_3: return K_KP_3; - case SDLK_KP_4: return K_KP_4; + case SDLK_KP_1: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_1 : K_END); + case SDLK_KP_2: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_2 : K_DOWNARROW); + case SDLK_KP_3: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_3 : K_PGDN); + case SDLK_KP_4: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_4 : K_LEFTARROW); case SDLK_KP_5: return K_KP_5; - case SDLK_KP_6: return K_KP_6; - case SDLK_KP_7: return K_KP_7; - case SDLK_KP_8: return K_KP_8; - case SDLK_KP_9: return K_KP_9; - case SDLK_KP_0: return K_KP_0; -#endif - case SDLK_KP_PERIOD: return K_KP_PERIOD; + case SDLK_KP_6: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_6 : K_RIGHTARROW); + case SDLK_KP_7: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_7 : K_HOME); + case SDLK_KP_8: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_8 : K_UPARROW); + case SDLK_KP_9: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_9 : K_PGUP); + case SDLK_KP_0: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_0 : K_INS); + case SDLK_KP_PERIOD: return ((SDL_GetModState() & KMOD_NUM) ? K_KP_PERIOD : K_DEL); // case SDLK_APPLICATION: return K_APPLICATION; // case SDLK_POWER: return K_POWER; case SDLK_KP_EQUALS: return K_KP_EQUALS; @@ -789,7 +785,6 @@ static void IN_Move_TouchScreen_SteelStorm(void) float move[3], aim[3]; static qboolean oldbuttons[128]; static qboolean buttons[128]; - static keydest_t oldkeydest; keydest_t keydest = (key_consoleactive & KEY_CONSOLEACTIVE_USER) ? key_console : key_dest; memcpy(oldbuttons, buttons, sizeof(oldbuttons)); memset(multitouchs, 0, sizeof(multitouchs)); @@ -812,17 +807,6 @@ static void IN_Move_TouchScreen_SteelStorm(void) multitouch[MAXFINGERS-1][0] = 0; }*/ - if (oldkeydest != keydest) - { - switch(keydest) - { - case key_game: VID_ShowKeyboard(false);break; - case key_console: VID_ShowKeyboard(true);break; - case key_message: VID_ShowKeyboard(true);break; - default: break; /* qc extensions control the other cases */ - } - } - oldkeydest = keydest; // TODO: make touchscreen areas controlled by a config file or the VMs. THIS IS A MESS! // TODO: can't just clear buttons[] when entering a new keydest, some keys would remain pressed // SS:BR menuqc has many peculiarities, including that it can't accept more than one command per frame and pressing and releasing on the same frame @@ -981,11 +965,27 @@ void IN_Move( void ) { static int old_x = 0, old_y = 0; static int stuck = 0; + static keydest_t oldkeydest; + static qboolean oldshowkeyboard; int x, y; vid_joystate_t joystate; + keydest_t keydest = (key_consoleactive & KEY_CONSOLEACTIVE_USER) ? key_console : key_dest; scr_numtouchscreenareas = 0; + // Only apply the new keyboard state if the input changes. + if (keydest != oldkeydest || !!vid_touchscreen_showkeyboard.integer != oldshowkeyboard) + { + switch(keydest) + { + case key_console: VID_ShowKeyboard(true);break; + case key_message: VID_ShowKeyboard(true);break; + default: VID_ShowKeyboard(!!vid_touchscreen_showkeyboard.integer); break; + } + } + oldkeydest = keydest; + oldshowkeyboard = !!vid_touchscreen_showkeyboard.integer; + if (vid_touchscreen.integer) { switch(gamemode) @@ -1065,13 +1065,19 @@ static void sdl_newmap(void) } #endif -static keynum_t buttonremap[18] = +static keynum_t buttonremap[] = { K_MOUSE1, K_MOUSE3, K_MOUSE2, +#if SDL_MAJOR_VERSION == 1 + // TODO Find out how SDL maps these buttons. It looks like we should + // still include these for sdl2? At least the button indexes don't + // differ between SDL1 and SDL2 for me, thus this array should stay the + // same (in X11 button order). K_MWHEELUP, K_MWHEELDOWN, +#endif K_MOUSE4, K_MOUSE5, K_MOUSE6, @@ -1106,7 +1112,16 @@ void Sys_SendKeyEvents( void ) case SDL_KEYUP: keycode = MapKey(event.key.keysym.sym); if (!VID_JoyBlockEmulatedKeys(keycode)) + { + if(keycode == K_NUMLOCK || keycode == K_CAPSLOCK) + { + // simulate down followed by up + Key_Event(keycode, event.key.keysym.unicode, true); + Key_Event(keycode, event.key.keysym.unicode, false); + break; + } Key_Event(keycode, event.key.keysym.unicode, (event.key.state == SDL_PRESSED)); + } break; case SDL_ACTIVEEVENT: if( event.active.state & SDL_APPACTIVE ) @@ -1120,7 +1135,7 @@ void Sys_SendKeyEvents( void ) case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: if (!vid_touchscreen.integer) - if (event.button.button <= 18) + if (event.button.button > 0 && event.button.button <= ARRAY_SIZE(buttonremap)) Key_Event( buttonremap[event.button.button - 1], 0, event.button.state == SDL_PRESSED ); break; case SDL_JOYBUTTONDOWN: @@ -1132,21 +1147,12 @@ void Sys_SendKeyEvents( void ) case SDL_VIDEOEXPOSE: break; case SDL_VIDEORESIZE: - if(vid_resizable.integer < 2) + if(vid_resizable.integer < 2 || vid_isfullscreen) { vid.width = event.resize.w; vid.height = event.resize.h; - screen = SDL_SetVideoMode(vid.width, vid.height, video_bpp, video_flags); - if (vid_softsurface) - { - SDL_FreeSurface(vid_softsurface); - vid_softsurface = SDL_CreateRGBSurface(SDL_SWSURFACE, vid.width, vid.height, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000); - vid.softpixels = (unsigned int *)vid_softsurface->pixels; - SDL_SetAlpha(vid_softsurface, 0, 255); - if (vid.softdepthpixels) - free(vid.softdepthpixels); - vid.softdepthpixels = (unsigned int*)calloc(1, vid.width * vid.height * 4); - } + if (!vid_isfullscreen) + video_screen = SDL_SetVideoMode(vid.width, vid.height, video_bpp, video_flags); #ifdef SDL_R_RESTART // better not call R_Modules_Restart from here directly, as this may wreak havoc... // so, let's better queue it for next frame @@ -1200,13 +1206,14 @@ void Sys_SendKeyEvents( void ) static qboolean sound_active = true; int keycode; int i; - int j; - int unicode; + qboolean isdown; + Uchar unicode; SDL_Event event; VID_EnableJoystick(true); while( SDL_PollEvent( &event ) ) + loop_start: switch( event.type ) { case SDL_QUIT: #ifdef DEBUGSDLEVENTS @@ -1218,13 +1225,36 @@ void Sys_SendKeyEvents( void ) case SDL_KEYUP: #ifdef DEBUGSDLEVENTS if (event.type == SDL_KEYDOWN) - Con_DPrintf("SDL_Event: SDL_KEYDOWN %i unicode %i\n", event.key.keysym.sym, event.key.keysym.unicode); + Con_DPrintf("SDL_Event: SDL_KEYDOWN %i\n", event.key.keysym.sym); else - Con_DPrintf("SDL_Event: SDL_KEYUP %i unicode %i\n", event.key.keysym.sym, event.key.keysym.unicode); + Con_DPrintf("SDL_Event: SDL_KEYUP %i\n", event.key.keysym.sym); #endif keycode = MapKey(event.key.keysym.sym); + isdown = (event.key.state == SDL_PRESSED); + unicode = 0; + if(isdown) + { + if(SDL_PollEvent(&event)) + { + if(event.type == SDL_TEXTINPUT) + { + // combine key code from SDL_KEYDOWN event and character + // from SDL_TEXTINPUT event in a single Key_Event call +#ifdef DEBUGSDLEVENTS + Con_DPrintf("SDL_Event: SDL_TEXTINPUT - text: %s\n", event.text.text); +#endif + unicode = u8_getchar_utf8_enabled(event.text.text + (int)u8_bytelen(event.text.text, 0), NULL); + } + else + { + if (!VID_JoyBlockEmulatedKeys(keycode)) + Key_Event(keycode, 0, isdown); + goto loop_start; + } + } + } if (!VID_JoyBlockEmulatedKeys(keycode)) - Key_Event(keycode, 0, (event.key.state == SDL_PRESSED)); + Key_Event(keycode, unicode, isdown); break; case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: @@ -1235,9 +1265,23 @@ void Sys_SendKeyEvents( void ) Con_DPrintf("SDL_Event: SDL_MOUSEBUTTONUP\n"); #endif if (!vid_touchscreen.integer) - if (event.button.button <= 18) + if (event.button.button > 0 && event.button.button <= ARRAY_SIZE(buttonremap)) Key_Event( buttonremap[event.button.button - 1], 0, event.button.state == SDL_PRESSED ); break; + case SDL_MOUSEWHEEL: + // TODO support wheel x direction. + i = event.wheel.y; + while (i > 0) { + --i; + Key_Event( K_MWHEELUP, 0, true ); + Key_Event( K_MWHEELUP, 0, false ); + } + while (i < 0) { + ++i; + Key_Event( K_MWHEELDOWN, 0, true ); + Key_Event( K_MWHEELDOWN, 0, false ); + } + break; case SDL_JOYBUTTONDOWN: case SDL_JOYBUTTONUP: case SDL_JOYAXISMOTION: @@ -1273,15 +1317,6 @@ void Sys_SendKeyEvents( void ) { vid.width = event.window.data1; vid.height = event.window.data2; - if (vid_softsurface) - { - SDL_FreeSurface(vid_softsurface); - vid_softsurface = SDL_CreateRGBSurface(SDL_SWSURFACE, vid.width, vid.height, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000); - vid.softpixels = (unsigned int *)vid_softsurface->pixels; - if (vid.softdepthpixels) - free(vid.softdepthpixels); - vid.softdepthpixels = (unsigned int*)calloc(1, vid.width * vid.height * 4); - } #ifdef SDL_R_RESTART // better not call R_Modules_Restart from here directly, as this may wreak havoc... // so, let's better queue it for next frame @@ -1325,30 +1360,11 @@ void Sys_SendKeyEvents( void ) #ifdef DEBUGSDLEVENTS Con_DPrintf("SDL_Event: SDL_TEXTINPUT - text: %s\n", event.text.text); #endif - // we have some characters to parse - { - unicode = 0; - for (i = 0;event.text.text[i];) - { - unicode = event.text.text[i++]; - if (unicode & 0x80) - { - // UTF-8 character - // strip high bits (we could count these to validate character length but we don't) - for (j = 0x80;unicode & j;j >>= 1) - unicode ^= j; - for (;(event.text.text[i] & 0xC0) == 0x80;i++) - unicode = (unicode << 6) | (event.text.text[i] & 0x3F); - // low characters are invalid and could be bad, so replace them - if (unicode < 0x80) - unicode = '?'; // we could use 0xFFFD instead, the unicode substitute character - } - //Con_DPrintf("SDL_TEXTINPUT: K_TEXT %i \n", unicode); - - Key_Event(K_TEXT, unicode, true); - Key_Event(K_TEXT, unicode, false); - } - } + // convert utf8 string to char + // NOTE: this code is supposed to run even if utf8enable is 0 + unicode = u8_getchar_utf8_enabled(event.text.text + (int)u8_bytelen(event.text.text, 0), NULL); + Key_Event(K_TEXT, unicode, true); + Key_Event(K_TEXT, unicode, false); break; case SDL_MOUSEMOTION: break; @@ -1460,10 +1476,8 @@ GLint wrapglGetUniformLocation(GLuint programObj, const GLchar *name) {PRECALL;r const GLubyte* wrapglGetString(GLenum name) {PRECALL;return (const GLubyte*)glGetString(name);POSTCALL;} void wrapglActiveStencilFace(GLenum e) {PRECALL;Con_Printf("glActiveStencilFace(e)\n");POSTCALL;} void wrapglActiveTexture(GLenum e) {PRECALL;glActiveTexture(e);POSTCALL;} -void wrapglAlphaFunc(GLenum func, GLclampf ref) {PRECALL;Con_Printf("glAlphaFunc(func, ref)\n");POSTCALL;} void wrapglArrayElement(GLint i) {PRECALL;Con_Printf("glArrayElement(i)\n");POSTCALL;} void wrapglAttachShader(GLuint containerObj, GLuint obj) {PRECALL;glAttachShader(containerObj, obj);POSTCALL;} -//void wrapglBegin(GLenum mode) {PRECALL;Con_Printf("glBegin(mode)\n");POSTCALL;} //void wrapglBeginQuery(GLenum target, GLuint qid) {PRECALL;glBeginQuery(target, qid);POSTCALL;} void wrapglBindAttribLocation(GLuint programObj, GLuint index, const GLchar *name) {PRECALL;glBindAttribLocation(programObj, index, name);POSTCALL;} //void wrapglBindFragDataLocation(GLuint programObj, GLuint index, const GLchar *name) {PRECALL;glBindFragDataLocation(programObj, index, name);POSTCALL;} @@ -1479,11 +1493,7 @@ void wrapglClear(GLbitfield mask) {PRECALL;glClear(mask);POSTCALL;} void wrapglClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {PRECALL;glClearColor(red, green, blue, alpha);POSTCALL;} void wrapglClearDepth(GLclampd depth) {PRECALL;/*Con_Printf("glClearDepth(%f)\n", depth);glClearDepthf((float)depth);*/POSTCALL;} void wrapglClearStencil(GLint s) {PRECALL;glClearStencil(s);POSTCALL;} -void wrapglClientActiveTexture(GLenum target) {PRECALL;Con_Printf("glClientActiveTexture(target)\n");POSTCALL;} -void wrapglColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) {PRECALL;Con_Printf("glColor4f(red, green, blue, alpha)\n");POSTCALL;} -void wrapglColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) {PRECALL;Con_Printf("glColor4ub(red, green, blue, alpha)\n");POSTCALL;} void wrapglColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) {PRECALL;glColorMask(red, green, blue, alpha);POSTCALL;} -void wrapglColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) {PRECALL;Con_Printf("glColorPointer(size, type, stride, ptr)\n");POSTCALL;} void wrapglCompileShader(GLuint shaderObj) {PRECALL;glCompileShader(shaderObj);POSTCALL;} void wrapglCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data) {PRECALL;glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);POSTCALL;} void wrapglCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data) {PRECALL;Con_Printf("glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data)\n");POSTCALL;} @@ -1506,7 +1516,6 @@ void wrapglDepthMask(GLboolean flag) {PRECALL;glDepthMask(flag);POSTCALL;} void wrapglDepthRangef(GLclampf near_val, GLclampf far_val) {PRECALL;glDepthRangef(near_val, far_val);POSTCALL;} void wrapglDetachShader(GLuint containerObj, GLuint attachedObj) {PRECALL;glDetachShader(containerObj, attachedObj);POSTCALL;} void wrapglDisable(GLenum cap) {PRECALL;glDisable(cap);POSTCALL;} -void wrapglDisableClientState(GLenum cap) {PRECALL;Con_Printf("glDisableClientState(cap)\n");POSTCALL;} void wrapglDisableVertexAttribArray(GLuint index) {PRECALL;glDisableVertexAttribArray(index);POSTCALL;} void wrapglDrawArrays(GLenum mode, GLint first, GLsizei count) {PRECALL;glDrawArrays(mode, first, count);POSTCALL;} void wrapglDrawBuffer(GLenum mode) {PRECALL;Con_Printf("glDrawBuffer(mode)\n");POSTCALL;} @@ -1515,9 +1524,7 @@ void wrapglDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *i //void wrapglDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) {PRECALL;glDrawRangeElements(mode, start, end, count, type, indices);POSTCALL;} //void wrapglDrawRangeElementsEXT(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) {PRECALL;glDrawRangeElements(mode, start, end, count, type, indices);POSTCALL;} void wrapglEnable(GLenum cap) {PRECALL;glEnable(cap);POSTCALL;} -void wrapglEnableClientState(GLenum cap) {PRECALL;Con_Printf("glEnableClientState(cap)\n");POSTCALL;} void wrapglEnableVertexAttribArray(GLuint index) {PRECALL;glEnableVertexAttribArray(index);POSTCALL;} -//void wrapglEnd(void) {PRECALL;Con_Printf("glEnd()\n");POSTCALL;} //void wrapglEndQuery(GLenum target) {PRECALL;glEndQuery(target);POSTCALL;} void wrapglFinish(void) {PRECALL;glFinish();POSTCALL;} void wrapglFlush(void) {PRECALL;glFlush();POSTCALL;} @@ -1556,16 +1563,7 @@ void wrapglGetTexParameteriv(GLenum target, GLenum pname, GLint *params) {PRECAL void wrapglGetUniformfv(GLuint programObj, GLint location, GLfloat *params) {PRECALL;glGetUniformfv(programObj, location, params);POSTCALL;} void wrapglGetUniformiv(GLuint programObj, GLint location, GLint *params) {PRECALL;glGetUniformiv(programObj, location, params);POSTCALL;} void wrapglHint(GLenum target, GLenum mode) {PRECALL;glHint(target, mode);POSTCALL;} -void wrapglLineWidth(GLfloat width) {PRECALL;glLineWidth(width);POSTCALL;} void wrapglLinkProgram(GLuint programObj) {PRECALL;glLinkProgram(programObj);POSTCALL;} -void wrapglLoadIdentity(void) {PRECALL;Con_Printf("glLoadIdentity()\n");POSTCALL;} -void wrapglLoadMatrixf(const GLfloat *m) {PRECALL;Con_Printf("glLoadMatrixf(m)\n");POSTCALL;} -void wrapglMatrixMode(GLenum mode) {PRECALL;Con_Printf("glMatrixMode(mode)\n");POSTCALL;} -void wrapglMultiTexCoord1f(GLenum target, GLfloat s) {PRECALL;Con_Printf("glMultiTexCoord1f(target, s)\n");POSTCALL;} -void wrapglMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t) {PRECALL;Con_Printf("glMultiTexCoord2f(target, s, t)\n");POSTCALL;} -void wrapglMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r) {PRECALL;Con_Printf("glMultiTexCoord3f(target, s, t, r)\n");POSTCALL;} -void wrapglMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) {PRECALL;Con_Printf("glMultiTexCoord4f(target, s, t, r, q)\n");POSTCALL;} -void wrapglNormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr) {PRECALL;Con_Printf("glNormalPointer(type, stride, ptr)\n");POSTCALL;} void wrapglPixelStorei(GLenum pname, GLint param) {PRECALL;glPixelStorei(pname, param);POSTCALL;} void wrapglPointSize(GLfloat size) {PRECALL;Con_Printf("glPointSize(size)\n");POSTCALL;} //void wrapglPolygonMode(GLenum face, GLenum mode) {PRECALL;Con_Printf("glPolygonMode(face, mode)\n");POSTCALL;} @@ -1581,14 +1579,6 @@ void wrapglStencilFuncSeparate(GLenum func1, GLenum func2, GLint ref, GLuint mas void wrapglStencilMask(GLuint mask) {PRECALL;glStencilMask(mask);POSTCALL;} void wrapglStencilOp(GLenum fail, GLenum zfail, GLenum zpass) {PRECALL;glStencilOp(fail, zfail, zpass);POSTCALL;} void wrapglStencilOpSeparate(GLenum e1, GLenum e2, GLenum e3, GLenum e4) {PRECALL;Con_Printf("glStencilOpSeparate(e1, e2, e3, e4)\n");POSTCALL;} -void wrapglTexCoord1f(GLfloat s) {PRECALL;Con_Printf("glTexCoord1f(s)\n");POSTCALL;} -void wrapglTexCoord2f(GLfloat s, GLfloat t) {PRECALL;Con_Printf("glTexCoord2f(s, t)\n");POSTCALL;} -void wrapglTexCoord3f(GLfloat s, GLfloat t, GLfloat r) {PRECALL;Con_Printf("glTexCoord3f(s, t, r)\n");POSTCALL;} -void wrapglTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q) {PRECALL;Con_Printf("glTexCoord4f(s, t, r, q)\n");POSTCALL;} -void wrapglTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) {PRECALL;Con_Printf("glTexCoordPointer(size, type, stride, ptr)\n");POSTCALL;} -void wrapglTexEnvf(GLenum target, GLenum pname, GLfloat param) {PRECALL;Con_Printf("glTexEnvf(target, pname, param)\n");POSTCALL;} -void wrapglTexEnvfv(GLenum target, GLenum pname, const GLfloat *params) {PRECALL;Con_Printf("glTexEnvfv(target, pname, params)\n");POSTCALL;} -void wrapglTexEnvi(GLenum target, GLenum pname, GLint param) {PRECALL;Con_Printf("glTexEnvi(target, pname, param)\n");POSTCALL;} void wrapglTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels) {PRECALL;glTexImage2D(target, level, internalFormat, width, height, border, format, type, pixels);POSTCALL;} void wrapglTexImage3D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels) {PRECALL;Con_Printf("glTexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels)\n");POSTCALL;} void wrapglTexParameterf(GLenum target, GLenum pname, GLfloat param) {PRECALL;glTexParameterf(target, pname, param);POSTCALL;} @@ -1689,10 +1679,8 @@ void GLES_Init(void) qglGetString = wrapglGetString; // qglActiveStencilFaceEXT = wrapglActiveStencilFace; qglActiveTexture = wrapglActiveTexture; - qglAlphaFunc = wrapglAlphaFunc; qglArrayElement = wrapglArrayElement; qglAttachShader = wrapglAttachShader; -// qglBegin = wrapglBegin; // qglBeginQueryARB = wrapglBeginQuery; qglBindAttribLocation = wrapglBindAttribLocation; // qglBindFragDataLocation = wrapglBindFragDataLocation; @@ -1708,11 +1696,7 @@ void GLES_Init(void) qglClearColor = wrapglClearColor; qglClearDepth = wrapglClearDepth; qglClearStencil = wrapglClearStencil; - qglClientActiveTexture = wrapglClientActiveTexture; - qglColor4f = wrapglColor4f; - qglColor4ub = wrapglColor4ub; qglColorMask = wrapglColorMask; - qglColorPointer = wrapglColorPointer; qglCompileShader = wrapglCompileShader; qglCompressedTexImage2DARB = wrapglCompressedTexImage2D; qglCompressedTexImage3DARB = wrapglCompressedTexImage3D; @@ -1734,7 +1718,6 @@ void GLES_Init(void) qglDepthRangef = wrapglDepthRangef; qglDetachShader = wrapglDetachShader; qglDisable = wrapglDisable; - qglDisableClientState = wrapglDisableClientState; qglDisableVertexAttribArray = wrapglDisableVertexAttribArray; qglDrawArrays = wrapglDrawArrays; // qglDrawBuffer = wrapglDrawBuffer; @@ -1742,9 +1725,7 @@ void GLES_Init(void) qglDrawElements = wrapglDrawElements; // qglDrawRangeElements = wrapglDrawRangeElements; qglEnable = wrapglEnable; - qglEnableClientState = wrapglEnableClientState; qglEnableVertexAttribArray = wrapglEnableVertexAttribArray; -// qglEnd = wrapglEnd; // qglEndQueryARB = wrapglEndQuery; qglFinish = wrapglFinish; qglFlush = wrapglFlush; @@ -1783,16 +1764,7 @@ void GLES_Init(void) qglGetUniformfv = wrapglGetUniformfv; qglGetUniformiv = wrapglGetUniformiv; qglHint = wrapglHint; - qglLineWidth = wrapglLineWidth; qglLinkProgram = wrapglLinkProgram; - qglLoadIdentity = wrapglLoadIdentity; - qglLoadMatrixf = wrapglLoadMatrixf; - qglMatrixMode = wrapglMatrixMode; - qglMultiTexCoord1f = wrapglMultiTexCoord1f; - qglMultiTexCoord2f = wrapglMultiTexCoord2f; - qglMultiTexCoord3f = wrapglMultiTexCoord3f; - qglMultiTexCoord4f = wrapglMultiTexCoord4f; - qglNormalPointer = wrapglNormalPointer; qglPixelStorei = wrapglPixelStorei; qglPointSize = wrapglPointSize; // qglPolygonMode = wrapglPolygonMode; @@ -1808,14 +1780,6 @@ void GLES_Init(void) qglStencilMask = wrapglStencilMask; qglStencilOp = wrapglStencilOp; qglStencilOpSeparate = wrapglStencilOpSeparate; - qglTexCoord1f = wrapglTexCoord1f; - qglTexCoord2f = wrapglTexCoord2f; - qglTexCoord3f = wrapglTexCoord3f; - qglTexCoord4f = wrapglTexCoord4f; - qglTexCoordPointer = wrapglTexCoordPointer; - qglTexEnvf = wrapglTexEnvf; - qglTexEnvfv = wrapglTexEnvfv; - qglTexEnvi = wrapglTexEnvi; qglTexImage2D = wrapglTexImage2D; qglTexImage3D = wrapglTexImage3D; qglTexParameterf = wrapglTexParameterf; @@ -1920,6 +1884,7 @@ void GLES_Init(void) vid.support.arb_draw_buffers = false; vid.support.arb_multitexture = false; vid.support.arb_occlusion_query = false; + vid.support.arb_query_buffer_object = false; vid.support.arb_shadow = false; vid.support.arb_texture_compression = false; // different (vendor-specific) formats than on desktop OpenGL... vid.support.arb_texture_cube_map = SDL_GL_ExtensionSupported("GL_OES_texture_cube_map") != 0; @@ -1938,7 +1903,8 @@ void GLES_Init(void) Calling them just threw an exception. Android developer relations confirmed that they forgot to implement these. (yeah...) It's apparently been fixed in 2.2, though I haven't tested." */ - vid.support.ext_framebuffer_object = false;//true; + // LadyHavoc: Android 2.1 is way old now, enabling this again, it's going to be required soon. + vid.support.ext_framebuffer_object = true; vid.support.ext_packed_depth_stencil = false; vid.support.ext_stencil_two_side = false; @@ -1947,6 +1913,9 @@ void GLES_Init(void) vid.support.ext_texture_edge_clamp = true; // GLES2 core vid.support.ext_texture_filter_anisotropic = false; // probably don't want to use it... vid.support.ext_texture_srgb = false; + vid.support.arb_texture_float = SDL_GL_ExtensionSupported("GL_OES_texture_float") != 0; + vid.support.arb_half_float_pixel = SDL_GL_ExtensionSupported("GL_OES_texture_half_float") != 0; + vid.support.arb_half_float_vertex = SDL_GL_ExtensionSupported("GL_OES_vertex_half_float") != 0; // NOTE: On some devices, a value of 512 gives better FPS than the maximum. qglGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint*)&vid.maxtexturesize_2d); @@ -2404,6 +2373,50 @@ static void VID_OutputVersion(void) version.major, version.minor, version.patch ); } +#ifdef WIN32 +static void AdjustWindowBounds(viddef_mode_t *mode, RECT *rect) +{ + LONG width = mode->width; // vid_width + LONG height = mode->height; // vid_height + + // adjust width and height for the space occupied by window decorators (title bar, borders) + rect->top = 0; + rect->left = 0; + rect->right = width; + rect->bottom = height; + AdjustWindowRectEx(rect, WS_CAPTION|WS_THICKFRAME, false, 0); + + RECT workArea; + SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0); + int workWidth = workArea.right - workArea.left; + int workHeight = workArea.bottom - workArea.top; + + // SDL forces the window height to be <= screen height - 27px (on Win8.1 - probably intended for the title bar) + // If the task bar is docked to the the left screen border and we move the window to negative y, + // there would be some part of the regular desktop visible on the bottom of the screen. + int titleBarPixels = 2; + int screenHeight = GetSystemMetrics(SM_CYSCREEN); + if (screenHeight == workHeight) + titleBarPixels = -rect->top; + + //Con_Printf("window mode: %dx%d, workArea: %d/%d-%d/%d (%dx%d), title: %d\n", width, height, workArea.left, workArea.top, workArea.right, workArea.bottom, workArea.right - workArea.left, workArea.bottom - workArea.top, titleBarPixels); + + // if height and width matches the physical or previously adjusted screen height and width, adjust it to available desktop area + if ((width == GetSystemMetrics(SM_CXSCREEN) || width == workWidth) && (height == screenHeight || height == workHeight - titleBarPixels)) + { + rect->left = workArea.left; + mode->width = workWidth; + rect->top = workArea.top + titleBarPixels; + mode->height = workHeight - titleBarPixels; + } + else + { + rect->left = workArea.left + max(0, (workWidth - width) / 2); + rect->top = workArea.top + max(0, (workHeight - height) / 2); + } +} +#endif + static qboolean VID_InitModeGL(viddef_mode_t *mode) { #if SDL_MAJOR_VERSION == 1 @@ -2411,6 +2424,8 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) int flags = SDL_OPENGL; #else int windowflags = SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL; + int xPos = SDL_WINDOWPOS_UNDEFINED; + int yPos = SDL_WINDOWPOS_UNDEFINED; #endif #ifndef USE_GLES2 int i; @@ -2473,14 +2488,49 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) // Knghtbrd: should do platform-specific extension string function here vid_isfullscreen = false; - if (mode->fullscreen) { #if SDL_MAJOR_VERSION == 1 - flags |= SDL_FULLSCREEN; + { + const SDL_VideoInfo *vi = SDL_GetVideoInfo(); + desktop_mode.width = vi->current_w; + desktop_mode.height = vi->current_h; + desktop_mode.bpp = vi->vfmt->BitsPerPixel; + desktop_mode.pixelheight_num = 1; + desktop_mode.pixelheight_denom = 1; // SDL does not provide this + if (mode->fullscreen) { + if (vid_desktopfullscreen.integer) + { + mode->width = vi->current_w; + mode->height = vi->current_h; + mode->bitsperpixel = vi->vfmt->BitsPerPixel; + } + flags |= SDL_FULLSCREEN; + vid_isfullscreen = true; + } + } #else - windowflags |= SDL_WINDOW_FULLSCREEN; + { + if (mode->fullscreen) { + if (vid_desktopfullscreen.integer) + { + vid_mode_t *m = VID_GetDesktopMode(); + mode->width = m->width; + mode->height = m->height; + windowflags |= SDL_WINDOW_FULLSCREEN_DESKTOP; + } + else + windowflags |= SDL_WINDOW_FULLSCREEN; + vid_isfullscreen = true; + } + else { +#ifdef WIN32 + RECT rect; + AdjustWindowBounds(mode, &rect); + xPos = rect.left; + yPos = rect.top; #endif - vid_isfullscreen = true; + } } +#endif //flags |= SDL_HWSURFACE; SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); @@ -2524,18 +2574,18 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) video_bpp = mode->bitsperpixel; #if SDL_MAJOR_VERSION == 1 video_flags = flags; - screen = VID_WrapSDL_SetVideoMode(mode->width, mode->height, mode->bitsperpixel, flags); - if (screen == NULL) + video_screen = VID_WrapSDL_SetVideoMode(mode->width, mode->height, mode->bitsperpixel, flags); + if (video_screen == NULL) { Con_Printf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError()); VID_Shutdown(); return false; } - mode->width = screen->w; - mode->height = screen->h; + mode->width = video_screen->w; + mode->height = video_screen->h; #else window_flags = windowflags; - window = SDL_CreateWindow(gamename, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, mode->width, mode->height, windowflags); + window = SDL_CreateWindow(gamename, xPos, yPos, mode->width, mode->height, windowflags); if (window == NULL) { Con_Printf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError()); @@ -2552,9 +2602,6 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) } #endif - vid_softsurface = NULL; - vid.softpixels = NULL; - #if SDL_MAJOR_VERSION == 1 // init keyboard SDL_EnableUNICODE( SDL_ENABLE ); @@ -2595,103 +2642,6 @@ extern cvar_t gl_info_version; extern cvar_t gl_info_platform; extern cvar_t gl_info_driver; -static qboolean VID_InitModeSoft(viddef_mode_t *mode) -{ -#if SDL_MAJOR_VERSION == 1 - int flags = SDL_HWSURFACE; - if(!COM_CheckParm("-noasyncblit")) flags |= SDL_ASYNCBLIT; -#else - int windowflags = SDL_WINDOW_SHOWN; -#endif - - win_half_width = mode->width>>1; - win_half_height = mode->height>>1; - - if(vid_resizable.integer) -#if SDL_MAJOR_VERSION == 1 - flags |= SDL_RESIZABLE; -#else - windowflags |= SDL_WINDOW_RESIZABLE; -#endif - - VID_OutputVersion(); - - vid_isfullscreen = false; - if (mode->fullscreen) { -#if SDL_MAJOR_VERSION == 1 - flags |= SDL_FULLSCREEN; -#else - windowflags |= SDL_WINDOW_FULLSCREEN; -#endif - vid_isfullscreen = true; - } - - video_bpp = mode->bitsperpixel; -#if SDL_MAJOR_VERSION == 1 - video_flags = flags; - screen = VID_WrapSDL_SetVideoMode(mode->width, mode->height, mode->bitsperpixel, flags); - if (screen == NULL) - { - Con_Printf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError()); - VID_Shutdown(); - return false; - } - mode->width = screen->w; - mode->height = screen->h; -#else - window_flags = windowflags; - window = SDL_CreateWindow(gamename, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, mode->width, mode->height, windowflags); - if (window == NULL) - { - Con_Printf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError()); - VID_Shutdown(); - return false; - } - SDL_GetWindowSize(window, &mode->width, &mode->height); -#endif - - // create a framebuffer using our specific color format, we let the SDL blit function convert it in VID_Finish - vid_softsurface = SDL_CreateRGBSurface(SDL_SWSURFACE, mode->width, mode->height, 32, 0x00FF0000, 0x0000FF00, 0x00000000FF, 0xFF000000); - if (vid_softsurface == NULL) - { - Con_Printf("Failed to setup software rasterizer framebuffer %ix%ix32bpp: %s\n", mode->width, mode->height, SDL_GetError()); - VID_Shutdown(); - return false; - } -#if SDL_MAJOR_VERSION == 1 - SDL_SetAlpha(vid_softsurface, 0, 255); -#endif - - vid.softpixels = (unsigned int *)vid_softsurface->pixels; - vid.softdepthpixels = (unsigned int *)calloc(1, mode->width * mode->height * 4); - if (DPSOFTRAST_Init(mode->width, mode->height, vid_soft_threads.integer, vid_soft_interlace.integer, (unsigned int *)vid_softsurface->pixels, (unsigned int *)vid.softdepthpixels) < 0) - { - Con_Printf("Failed to initialize software rasterizer\n"); - VID_Shutdown(); - return false; - } - -#if SDL_MAJOR_VERSION == 1 - // init keyboard - SDL_EnableUNICODE( SDL_ENABLE ); - // enable key repeat since everyone expects it - SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); -#endif - - VID_Soft_SharedSetup(); - - vid_hidden = false; - vid_activewindow = false; - vid_hasfocus = true; - vid_usingmouse = false; - vid_usinghidecursor = false; - -#if SDL_MAJOR_VERSION == 1 - SDL_WM_GrabInput(SDL_GRAB_OFF); -#endif - return true; -} - qboolean VID_InitMode(viddef_mode_t *mode) { // GAME_STEELSTORM specific @@ -2704,19 +2654,13 @@ qboolean VID_InitMode(viddef_mode_t *mode) #if SDL_MAJOR_VERSION != 1 Cvar_SetValueQuick(&vid_touchscreen_supportshowkeyboard, SDL_HasScreenKeyboardSupport() ? 1 : 0); #endif -#ifdef SSE_POSSIBLE - if (vid_soft.integer) - return VID_InitModeSoft(mode); - else -#endif - return VID_InitModeGL(mode); + return VID_InitModeGL(mode); } void VID_Shutdown (void) { VID_EnableJoystick(false); VID_SetMouse(false, false, false); - VID_RestoreSystemGamma(); #if SDL_MAJOR_VERSION == 1 #ifndef WIN32 @@ -2728,14 +2672,6 @@ void VID_Shutdown (void) #endif #endif - if (vid_softsurface) - SDL_FreeSurface(vid_softsurface); - vid_softsurface = NULL; - vid.softpixels = NULL; - if (vid.softdepthpixels) - free(vid.softdepthpixels); - vid.softdepthpixels = NULL; - #if SDL_MAJOR_VERSION != 1 SDL_DestroyWindow(window); window = NULL; @@ -2749,24 +2685,6 @@ void VID_Shutdown (void) gl_platformextensions = ""; } -int VID_SetGamma (unsigned short *ramps, int rampsize) -{ -#if SDL_MAJOR_VERSION == 1 - return !SDL_SetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2); -#else - return !SDL_SetWindowGammaRamp (window, ramps, ramps + rampsize, ramps + rampsize*2); -#endif -} - -int VID_GetGamma (unsigned short *ramps, int rampsize) -{ -#if SDL_MAJOR_VERSION == 1 - return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2); -#else - return !SDL_GetWindowGammaRamp (window, ramps, ramps + rampsize, ramps + rampsize*2); -#endif -} - void VID_Finish (void) { #if SDL_MAJOR_VERSION == 1 @@ -2780,16 +2698,13 @@ void VID_Finish (void) #endif vid_activewindow = !vid_hidden && vid_hasfocus; - VID_UpdateGamma(false, 256); + VID_UpdateGamma(); if (!vid_hidden) { switch(vid.renderpath) { - case RENDERPATH_GL11: - case RENDERPATH_GL13: case RENDERPATH_GL20: - case RENDERPATH_GLES1: case RENDERPATH_GLES2: CHECKGLERROR if (r_speeds.integer == 2 || gl_finish.integer) @@ -2801,6 +2716,7 @@ void VID_Finish (void) vid_usevsync = (vid_vsync.integer && !cls.timedemo); if (vid_usingvsync != vid_usevsync) { + vid_usingvsync = vid_usevsync; if (SDL_GL_SetSwapInterval(vid_usevsync != 0) >= 0) Con_DPrintf("Vsync %s\n", vid_usevsync ? "activated" : "deactivated"); else @@ -2814,40 +2730,44 @@ void VID_Finish (void) SDL_GL_SwapWindow(window); #endif break; - case RENDERPATH_SOFT: - DPSOFTRAST_Finish(); -#if SDL_MAJOR_VERSION == 1 -// if (!r_test.integer) - { - SDL_BlitSurface(vid_softsurface, NULL, screen, NULL); - SDL_Flip(screen); - } -#else - { - SDL_Surface *screen = SDL_GetWindowSurface(window); - SDL_BlitSurface(vid_softsurface, NULL, screen, NULL); - SDL_UpdateWindowSurface(window); - } -#endif - break; - case RENDERPATH_D3D9: - case RENDERPATH_D3D10: - case RENDERPATH_D3D11: - if (r_speeds.integer == 2 || gl_finish.integer) - GL_Finish(); - break; } } } +vid_mode_t *VID_GetDesktopMode(void) +{ +#if SDL_MAJOR_VERSION != 1 + SDL_DisplayMode mode; + int bpp; + Uint32 rmask, gmask, bmask, amask; + SDL_GetDesktopDisplayMode(0, &mode); + SDL_PixelFormatEnumToMasks(mode.format, &bpp, &rmask, &gmask, &bmask, &amask); + desktop_mode.width = mode.w; + desktop_mode.height = mode.h; + desktop_mode.bpp = bpp; + desktop_mode.refreshrate = mode.refresh_rate; + desktop_mode.pixelheight_num = 1; + desktop_mode.pixelheight_denom = 1; // SDL does not provide this + // TODO check whether this actually works, or whether we do still need + // a read-window-size-after-entering-desktop-fullscreen hack for + // multiscreen setups. +#endif + return &desktop_mode; +} + size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) { size_t k = 0; #if SDL_MAJOR_VERSION == 1 SDL_Rect **vidmodes; int bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel; +#ifdef WIN64 + SDL_Rect **ENDRECT = (SDL_Rect**)-1LL; +#else + SDL_Rect **ENDRECT = (SDL_Rect**)-1; +#endif - for(vidmodes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE); vidmodes && vidmodes != (SDL_Rect**)(-1) && *vidmodes; ++vidmodes) + for(vidmodes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE); vidmodes && vidmodes != ENDRECT && *vidmodes; ++vidmodes) { if(k >= maxcount) break; @@ -2871,9 +2791,9 @@ size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) continue; modes[k].width = mode.w; modes[k].height = mode.h; + // FIXME bpp? modes[k].refreshrate = mode.refresh_rate; modes[k].pixelheight_num = 1; - modes[k].pixelheight_num = 1; modes[k].pixelheight_denom = 1; // SDL does not provide this k++; }