X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=vid_agl.c;h=ae4e871b12ab9b0ae2adc5cc77b696e374472925;hb=refs%2Fheads%2F63-path-to-session-lock-broken-by-non-ascii-characters-on-windows;hp=d21ffc063193ab1078fc0f3c9624fae4bf358e4f;hpb=5737591d891d69836735abb645a1b173baaabe96;p=xonotic%2Fdarkplaces.git

diff --git a/vid_agl.c b/vid_agl.c
index d21ffc06..ae4e871b 100644
--- a/vid_agl.c
+++ b/vid_agl.c
@@ -190,7 +190,6 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso
 	}
 }
 
-#define GAMMA_TABLE_SIZE 256
 void VID_Finish (void)
 {
 	qboolean vid_usevsync;
@@ -216,7 +215,7 @@ void VID_Finish (void)
 			GL_Finish();
 		qaglSwapBuffers(context);
 	}
-	VID_UpdateGamma(false, GAMMA_TABLE_SIZE);
+	VID_UpdateGamma();
 
 	if (apple_multithreadedgl.integer)
 	{
@@ -255,65 +254,9 @@ void VID_Finish (void)
 	}
 }
 
-int VID_SetGamma(unsigned short *ramps, int rampsize)
-{
-	CGGammaValue table_red [GAMMA_TABLE_SIZE];
-	CGGammaValue table_green [GAMMA_TABLE_SIZE];
-	CGGammaValue table_blue [GAMMA_TABLE_SIZE];
-	int i;
-
-	// Convert the unsigned short table into 3 float tables
-	for (i = 0; i < rampsize; i++)
-		table_red[i] = (float)ramps[i] / 65535.0f;
-	for (i = 0; i < rampsize; i++)
-		table_green[i] = (float)ramps[i + rampsize] / 65535.0f;
-	for (i = 0; i < rampsize; i++)
-		table_blue[i] = (float)ramps[i + 2 * rampsize] / 65535.0f;
-
-	if (CGSetDisplayTransferByTable(CGMainDisplayID(), rampsize, table_red, table_green, table_blue) != CGDisplayNoErr)
-	{
-		Con_Print("VID_SetGamma: ERROR: CGSetDisplayTransferByTable failed!\n");
-		return false;
-	}
-
-	return true;
-}
-
-int VID_GetGamma(unsigned short *ramps, int rampsize)
-{
-	CGGammaValue table_red [GAMMA_TABLE_SIZE];
-	CGGammaValue table_green [GAMMA_TABLE_SIZE];
-	CGGammaValue table_blue [GAMMA_TABLE_SIZE];
-	CGTableCount actualsize = 0;
-	int i;
-
-	// Get the gamma ramps from the system
-	if (CGGetDisplayTransferByTable(CGMainDisplayID(), rampsize, table_red, table_green, table_blue, &actualsize) != CGDisplayNoErr)
-	{
-		Con_Print("VID_GetGamma: ERROR: CGGetDisplayTransferByTable failed!\n");
-		return false;
-	}
-	if (actualsize != (unsigned int)rampsize)
-	{
-		Con_Printf("VID_GetGamma: ERROR: invalid gamma table size (%u != %u)\n", actualsize, rampsize);
-		return false;
-	}
-
-	// Convert the 3 float tables into 1 unsigned short table
-	for (i = 0; i < rampsize; i++)
-		ramps[i] = table_red[i] * 65535.0f;
-	for (i = 0; i < rampsize; i++)
-		ramps[i + rampsize] = table_green[i] * 65535.0f;
-	for (i = 0; i < rampsize; i++)
-		ramps[i + 2 * rampsize] = table_blue[i] * 65535.0f;
-
-	return true;
-}
-
 void signal_handler(int sig)
 {
-	printf("Received signal %d, exiting...\n", sig);
-	VID_RestoreSystemGamma();
+	Sys_PrintfToTerminal("Received signal %d, exiting...\n", sig);
 	Sys_Quit(1);
 }
 
@@ -398,7 +341,6 @@ void VID_Shutdown(void)
 
 	VID_EnableJoystick(false);
 	VID_SetMouse(false, false, false);
-	VID_RestoreSystemGamma();
 
 	if (context != NULL)
 	{
@@ -419,7 +361,6 @@ void VID_Shutdown(void)
 	vid_isfullscreen = false;
 
 	GL_CloseLibrary();
-	Key_ClearStates ();
 }
 
 // Since the event handler can be called at any time, we store the events for later processing
@@ -456,11 +397,7 @@ static OSStatus MainWindowEventHandler (EventHandlerCallRef nextHandler, EventRe
 static void VID_AppFocusChanged(qboolean windowIsActive)
 {
 	if (vid_activewindow != windowIsActive)
-	{
 		vid_activewindow = windowIsActive;
-		if (!vid_activewindow)
-			VID_RestoreSystemGamma();
-	}
 
 	if (windowIsActive || !snd_mutewhenidle.integer)
 	{
@@ -1158,6 +1095,11 @@ long GetDictionaryLong(CFDictionaryRef d, const void *key)
     return value;
 }
 
+vid_mode_t *VID_GetDesktopMode(void)
+{
+	return NULL; // FIXME add desktopfullscreen
+}
+
 size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
 {
 	CGDirectDisplayID mainDisplay = CGMainDisplayID();