Fix registered/shareware detection.

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 2016762df59d514c6cac69b51f295badc5b603c2..942cbdd24bea465bcf19374ce0f29681b1a7cfc6 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -23,6 +23,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
@@ -100,6 +101,7 @@ static vid_mode_t desktop_mode;
 
 #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
@@ -114,6 +116,7 @@ static vid_mode_t desktop_mode;
 #define SDLK_KP_9 SDLK_KP9
 #define SDLK_KP_0 SDLK_KP0
 #endif
+#endif
 
 static int MapKey( unsigned int sdlkey )
 {
@@ -203,10 +206,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;
@@ -222,15 +223,12 @@ 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 ((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);
@@ -241,7 +239,6 @@ static int MapKey( unsigned int sdlkey )
        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);
-#endif
        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;
@@ -1217,8 +1214,7 @@ void Sys_SendKeyEvents( void )
        static qboolean sound_active = true;
        int keycode;
        int i;
-       int j;
-       int unicode;
+       Uchar unicode;
        SDL_Event event;
 
        VID_EnableJoystick(true);
@@ -1235,9 +1231,9 @@ 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);
                                if (!VID_JoyBlockEmulatedKeys(keycode))
@@ -1357,30 +1353,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;
@@ -2529,7 +2506,12 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
        {
                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;
@@ -2865,6 +2847,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