ToggleFullscreenPatch

Index: source/ref_gl/r_local.h
===================================================================
--- source/ref_gl/r_local.h (revision 5263)
+++ source/ref_gl/r_local.h (working copy)
@@ -146,6 +146,7 @@
 extern cvar_t  *gl_vlights;

 extern cvar_t  *vid_fullscreen;
+extern cvar_t  *vid_preferred_fullscreen;
 extern cvar_t  *vid_gamma;
 extern  cvar_t *vid_contrast;

Index: source/ref_gl/r_main.c
===================================================================
--- source/ref_gl/r_main.c  (revision 5263)
+++ source/ref_gl/r_main.c  (working copy)
@@ -134,6 +134,7 @@
 cvar_t *gl_lockpvs;

 cvar_t *vid_fullscreen;
+cvar_t *vid_preferred_fullscreen;
 cvar_t *vid_gamma;
 cvar_t  *vid_contrast;
 cvar_t *vid_ref;
@@ -1348,10 +1349,14 @@

    // see windowmode_t:
    // 0 = windowed
-   // 1 = full screen
-   // 2 = borderless fullscreen
+   // 1 = borderless windowed
+   // 2 = exclusive fullscreen
    vid_fullscreen = Cvar_Get( "vid_fullscreen", "1", CVAR_ARCHIVE|CVARDOC_INT);

+   // Last used fullscreen mode: borderless windowed (1) or exclusive fullscreen (2).
+   // Used for toggling between fullscreen and windowed with alt-enter.
+   vid_preferred_fullscreen = Cvar_Get( "vid_preferred_fullscreen", "1", CVAR_ARCHIVE|CVARDOC_INT);
+
    vid_gamma = Cvar_Get( "vid_gamma", "1.0", CVAR_ARCHIVE );
    vid_contrast = Cvar_Get( "vid_contrast", "1.0", CVAR_ARCHIVE);
    //TODO: remove, unless we decide to add GL ES support or something.
Index: source/unix/gl_glx.c
===================================================================
--- source/unix/gl_glx.c    (revision 5263)
+++ source/unix/gl_glx.c    (working copy)
@@ -318,22 +318,31 @@

    case XK_KP_Enter:
        key = K_KP_ENTER;
-       break;
-
-   case XK_Return:
-       if (ev->state & Mod1Mask)
-       {   // ALT-ENTER
-           if ( vid_fullscreen )
-           {
-               Cvar_SetValue( "vid_fullscreen", !vid_fullscreen->value ); // TODO: update for the fact that this isn't boolean anymore!
-           }
-       } else
-       {
-           key = K_ENTER;
-       }
-       break;
-
-   case XK_Tab:
+       break;
+
+   case XK_Return:
+       if ( ev->state & Mod1Mask )
+       {   // ALT-ENTER
+           if ( vid_fullscreen )
+           {
+               switch ( vid_fullscreen->integer ) {
+                   case windowmode_windowed:
+                       Cvar_SetValue( "vid_fullscreen", vid_preferred_fullscreen->value );
+                       break;
+                   case windowmode_borderless_windowed:
+                   case windowmode_exclusive_fullscreen:
+                       Cvar_SetValue( "vid_preferred_fullscreen", vid_fullscreen->value );
+                       Cvar_SetValue( "vid_fullscreen", windowmode_windowed );
+                       break;
+               }
+           }
+       } else
+       {
+           key = K_ENTER;
+       }
+       break;
+
+   case XK_Tab:
        key = K_TAB;
        break;

Index: source/unix/vid_so.c
===================================================================
--- source/unix/vid_so.c    (revision 5263)
+++ source/unix/vid_so.c    (working copy)
@@ -40,6 +40,7 @@
 cvar_t     *vid_xpos;          // X coordinate of window position
 cvar_t     *vid_ypos;          // Y coordinate of window position
 cvar_t     *vid_fullscreen;
+cvar_t     *vid_preferred_fullscreen;
 cvar_t     *vid_width;
 cvar_t     *vid_height;
 extern cvar_t  *vid_ref;
@@ -206,7 +207,8 @@
    vid_ref = Cvar_Get ("vid_ref", "glx", CVAR_ARCHIVE);
    vid_xpos = Cvar_Get ("vid_xpos", "0", CVAR_ARCHIVE);
    vid_ypos = Cvar_Get ("vid_ypos", "0", CVAR_ARCHIVE);
-   vid_fullscreen = Cvar_Get ("vid_fullscreen", "0", CVAR_ARCHIVE);
+   vid_fullscreen = Cvar_Get ("vid_fullscreen", "1", CVAR_ARCHIVE);
+   vid_preferred_fullscreen = Cvar_Get ("vid_preferred_fullscreen", "1", CVAR_ARCHIVE);
    vid_gamma = Cvar_Get( "vid_gamma", "1", CVAR_ARCHIVE );
    vid_width = Cvar_Get ( "vid_width", "1024", CVAR_ARCHIVE );
    vid_height = Cvar_Get ( "vid_height", "768", CVAR_ARCHIVE );
Index: source/win32/vid_dll.c
===================================================================
--- source/win32/vid_dll.c  (revision 5263)
+++ source/win32/vid_dll.c  (working copy)
@@ -46,6 +46,7 @@
 cvar_t     *vid_xpos;          // X coordinate of window position
 cvar_t     *vid_ypos;          // Y coordinate of window position
 cvar_t     *vid_fullscreen;
+cvar_t     *vid_preferred_fullscreen;
 cvar_t     *vid_width;
 cvar_t     *vid_height;
 cvar_t     *vid_displayfrequency;
@@ -408,7 +409,16 @@
        {
            if ( vid_fullscreen )
            {
-               Cvar_SetValue( "vid_fullscreen", !vid_fullscreen->value ); // TODO: update for the fact that this isn't boolean anymore!
+               switch ( vid_fullscreen->integer ) {
+                   case windowmode_windowed:
+                       Cvar_SetValue( "vid_fullscreen", vid_preferred_fullscreen->value );
+                       break;
+                   case windowmode_borderless_windowed:
+                   case windowmode_exclusive_fullscreen:
+                       Cvar_SetValue( "vid_preferred_fullscreen", vid_fullscreen->value );
+                       Cvar_SetValue( "vid_fullscreen", windowmode_windowed );
+                       break;
+               }
            }
            return 0;
        }