puae 2.3.1

src/cfgfile.c

@@ -84,15 +84,6 @@ static const struct cfg_lines opttable[] =
     {"gfx_center_horizontal", "Center display horizontally?" },
     {"gfx_center_vertical", "Center display vertically?" },
 
-    {"gfx_gl_x_offset", "horizontal panning in gl mode (+/- integer hint: -37" },//koko
-    {"gfx_gl_y_offset", "vertical panning in gl mode (+/- integer hint: -2)" }, 	//koko
-    {"gfx_gl_panscan", "Zoom in/out in gl mode (+/- integer)" }, 	//koko
-  /*{"gfx_gl_top_crop", "crop image in gl mode (+ integer)" }, 		//koko
-    {"gfx_gl_bottom_crop", "crop image in gl mode (+ integer)" },	//koko
-    {"gfx_gl_left_crop", "crop image in gl mode (+ integer)" },		//koko
-    {"gfx_gl_right_crop", "crop image in gl mode (+ integer)" },*/	//koko
-    {"gfx_gl_smoothing", "Linear smoothing in gl mode (true/false)" },	//koko
-
     {"gfx_colour_mode", "" },
     {"32bit_blits", "Enable 32 bit blitter emulation" },
     {"immediate_blits", "Perform blits immediately" },
@@ -1384,11 +1375,6 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
 		|| cfgfile_yesno (option, value, "bsdsocket_emu", &p->socket_emu))
 		return 1;
 
-	if    (cfgfile_intval (option, value, "gfx_gl_x_offset", &p->gfx_gl_x_offset, 1)   //koko
-		|| cfgfile_intval (option, value, "gfx_gl_y_offset", &p->gfx_gl_y_offset, 1)  //koko
-		|| cfgfile_intval (option, value, "gfx_gl_panscan", &p->gfx_gl_panscan, 1))  //koko
-		return 1;
-
 	if (cfgfile_strval (option, value, "sound_output", &p->produce_sound, soundmode1, 1)
 		|| cfgfile_strval (option, value, "sound_output", &p->produce_sound, soundmode2, 0)
 		|| cfgfile_strval (option, value, "sound_interpol", &p->sound_interpol, interpolmode, 0)

src/drawing.c

@@ -2549,7 +2549,7 @@ void finish_drawing_frame (void)
 
 	if (currprefs.leds_on_screen) {
 		for (i = 0; i < TD_TOTAL_HEIGHT; i++) {
-			int line = gfxvidinfo.height - TD_TOTAL_HEIGHT + i - bottom_crop_global;//koko
+			int line = gfxvidinfo.height - TD_TOTAL_HEIGHT + i;
 			draw_status_line (line);
 			do_flush_line (line);
 		}

src/gfx-sdl/sdlgfx.c

@@ -635,14 +635,6 @@ static int alloc_gl_buffer (struct gl_buffer_t *buffer, int width, int height, i
 		glPixelStorei (GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
     if (have_apple_texture_range)
 		glTexParameteri (buffer->target, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_SHARED_APPLE);
-    
-    if (currprefs.gfx_gl_smoothing) {						//KOKO
-		glTexParameteri (buffer->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);  	//KOKO
-		glTexParameteri (buffer->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);	//KOKO
-    } else {
-    	glTexParameteri (buffer->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    	glTexParameteri (buffer->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    }  
 
     glTexParameteri (buffer->target, GL_TEXTURE_WRAP_S, GL_CLAMP);
     glTexParameteri (buffer->target, GL_TEXTURE_WRAP_T, GL_CLAMP);
@@ -684,8 +676,6 @@ STATIC_INLINE void flush_gl_buffer (const struct gl_buffer_t *buffer, int first_
 
 STATIC_INLINE void render_gl_buffer (const struct gl_buffer_t *buffer, int first_line, int last_line)
 {
-    //ToFix: Disable vsync make this function mad and put garbage on the screen KOKO.
-    
     float tx0, ty0, tx1, ty1; //source buffer coords
     float wx0, wy0, wx1, wy1; //destination text coords
     float left_crop, right_crop, top_crop, bottom_crop;  //buffer cropping

src/gfx-sdl/sdlkeys.c

@@ -513,7 +513,7 @@ static struct uae_hotkeyseq sdl_hotkeys[] =
     { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_LSHIFT, SDLK_r, -1,  INPUTEVENT_SPC_HARDRESET)}, \
     { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_d, -1, -1,           INPUTEVENT_SPC_ENTERDEBUGGER)}, \
     { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_s, -1, -1,           INPUTEVENT_SPC_TOGGLEFULLSCREEN) },
-    { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_m, -1, -1,           INPUTEVENT_SPC_TOGGLEMOUSEGRAB) }, /*Koko (g->m)*/
+    { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_g, -1, -1,           INPUTEVENT_SPC_TOGGLEMOUSEGRAB) },
     { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_i, -1, -1,           INPUTEVENT_SPC_INHIBITSCREEN) },
     { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_p, -1, -1,           INPUTEVENT_SPC_SCREENSHOT) },
     { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_a, -1, -1,           INPUTEVENT_SPC_SWITCHINTERPOL) },
@@ -527,12 +527,6 @@ static struct uae_hotkeyseq sdl_hotkeys[] =
     { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_LSHIFT, SDLK_F4, -1, INPUTEVENT_SPC_EFLOPPY3) },
     { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_RETURN, -1, -1,      INPUTEVENT_SPC_ENTERGUI) },
     { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_f, -1, -1,		  INPUTEVENT_SPC_FREEZEBUTTON) },
-    { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_g, -1, -1,	  	  INPUTEVENT_SPC_GLPANLEFT)	}, /*koko*/
-    { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_j, -1, -1,	  	  INPUTEVENT_SPC_GLPANRIGHT)	}, /*koko*/
-    { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_y, -1, -1,	  	  INPUTEVENT_SPC_GLPANUP) 	}, /*koko*/
-    { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_h, -1, -1,	  	  INPUTEVENT_SPC_GLPANDOWN) 	}, /*koko*/
-    { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_t, -1, -1,	  	  INPUTEVENT_SPC_GLPANSCANLESS)	}, /*koko*/
-    { MAKE_HOTKEYSEQ (SDLK_F12, SDLK_u, -1, -1,	  	  INPUTEVENT_SPC_GLPANSCANMORE)	}, /*koko*/
     { HOTKEYS_END }
 };
 

src/include/drawing.h

@@ -295,5 +295,3 @@ STATIC_INLINE void toggle_inhibit_frame (int bit)
 	inhibit_frame ^= 1 << bit;
 }
 
-int bottom_crop_global; //koko
-int right_crop_global; //koko

src/include/keyboard.h

@@ -164,8 +164,7 @@ enum aks { AKS_ENTERGUI = 0x200, AKS_SCREENSHOT_FILE, AKS_SCREENSHOT_CLIPBOARD,
 	AKS_DISK_PREV0, AKS_DISK_PREV1, AKS_DISK_PREV2, AKS_DISK_PREV3,
 	AKS_DISK_NEXT0, AKS_DISK_NEXT1, AKS_DISK_NEXT2, AKS_DISK_NEXT3,
 	AKS_CDTV_FRONT_PANEL_STOP, AKS_CDTV_FRONT_PANEL_PLAYPAUSE, AKS_CDTV_FRONT_PANEL_PREV,
-	AKS_CDTV_FRONT_PANEL_NEXT, AKS_CDTV_FRONT_PANEL_REW, AKS_CDTV_FRONT_PANEL_FF,
-	AKS_GLPANLEFT,AKS_GLPANRIGHT,AKS_GLPANUP,AKS_GLPANDOWN,AKS_GLPANSCANMORE,AKS_GLPANSCANLESS /*koko*/
+	AKS_CDTV_FRONT_PANEL_NEXT, AKS_CDTV_FRONT_PANEL_REW, AKS_CDTV_FRONT_PANEL_FF
 };
 
 extern int target_checkcapslock (int, int *);

src/include/options.h

@@ -228,10 +228,6 @@ struct uae_prefs {
 	int gfx_backbuffers;
 	int gfx_api;
 	int color_mode;
-	int gfx_gl_x_offset; //koko
-	int gfx_gl_y_offset; //koko
-	int gfx_gl_smoothing; //koko
-	int gfx_gl_panscan; //koko
 
 	int gfx_filter;
 	TCHAR gfx_filtershader[MAX_DPATH];

src/inputdevice.c

@@ -82,7 +82,7 @@ int inputdevice_logging = 0;
 #define JOYMOUSE_CDTV 8
 
 #define DEFEVENT(A, B, C, D, E, F) {#A, B, C, D, E, F },
-const struct inputevent events[] = {
+static struct inputevent events[] = {
 	{0, 0, AM_K,0,0,0},
 #include "inputevents.def"
 	{0, 0, 0, 0, 0, 0}
@@ -2539,30 +2539,6 @@ void inputdevice_handle_inputcode (void)
 			config_changed = 1;
 		}
 		break;
-    case AKS_GLPANLEFT:									//koko
-	    currprefs.gfx_gl_x_offset = currprefs.gfx_gl_x_offset - 2;			//koko (fixme, make "-2" a variable)
-	    printf("Pan left  : gfx_gl_x_offset=%i.\n" , currprefs.gfx_gl_x_offset);	//koko
-	    break;
-    case AKS_GLPANRIGHT:								//koko
-	    currprefs.gfx_gl_x_offset = currprefs.gfx_gl_x_offset + 2;			//koko (fixme, make "+2" a variable)
-		printf("Pan right : gfx_gl_x_offset=%i.\n" , currprefs.gfx_gl_x_offset);//koko
-	    break;
-    case AKS_GLPANUP:									//koko
-	    currprefs.gfx_gl_y_offset = currprefs.gfx_gl_y_offset - 2;			//koko
-	    printf("Pan up    : gfx_gl_y_offset=%i.\n" , currprefs.gfx_gl_y_offset);	//koko
-	    break;
-    case AKS_GLPANDOWN:									//koko
-	    currprefs.gfx_gl_y_offset = currprefs.gfx_gl_y_offset + 2;			//koko
-	    printf("Pan down  : gfx_gl_y_offset=%i.\n" , currprefs.gfx_gl_y_offset);	//koko
-	    break;
-    case AKS_GLPANSCANMORE:								//koko
-	    currprefs.gfx_gl_panscan = currprefs.gfx_gl_panscan + 2;			//koko
-	    printf("PanScan + : gfx_gl_panscan=%i.\n" , currprefs.gfx_gl_panscan);	//koko
-	    break;
-    case AKS_GLPANSCANLESS:								//koko
-	    currprefs.gfx_gl_panscan = currprefs.gfx_gl_panscan - 2;			//koko
-	    printf("PanScan - : gfx_gl_panscan=%i.\n" , currprefs.gfx_gl_panscan);	//koko
-	    break;
 	case AKS_DISKSWAPPER_NEXT:
 		swapperslot++;
 		if (swapperslot >= MAX_SPARE_DRIVES || currprefs.dfxlist[swapperslot][0] == 0)

src/inputevents.def

@@ -375,9 +375,3 @@ DEFEVENT(SPC_CDTV_FRONT_PANEL_NEXT,"CDTV Front Panel Next",AM_K,0,0,AKS_CDTV_FRO
 DEFEVENT(SPC_CDTV_FRONT_PANEL_REW,"CDTV Front Panel Rewind",AM_K,0,0,AKS_CDTV_FRONT_PANEL_REW)
 DEFEVENT(SPC_CDTV_FRONT_PANEL_FF,"CDTV Front Panel Fast Forward",AM_K,0,0,AKS_CDTV_FRONT_PANEL_FF)
 
-DEFEVENT(SPC_GLPANLEFT,"Pan opengl texture to the left",AM_K,0,0,AKS_GLPANLEFT)		/*Koko*/
-DEFEVENT(SPC_GLPANRIGHT,"Pan opengl texture to the left",AM_K,0,0,AKS_GLPANRIGHT) 	/*Koko*/
-DEFEVENT(SPC_GLPANUP,"Pan opengl texture to the left",AM_K,0,0,AKS_GLPANUP) 		/*Koko*/
-DEFEVENT(SPC_GLPANDOWN,"Pan opengl texture to the left",AM_K,0,0,AKS_GLPANDOWN) 	/*Koko*/
-DEFEVENT(SPC_GLPANSCANMORE,"ZoomIn opengl texture",AM_K,0,0,AKS_GLPANSCANMORE) 		/*Koko*/
-DEFEVENT(SPC_GLPANSCANLESS,"ZoomOut opengl texture",AM_K,0,0,AKS_GLPANSCANLESS) 	/*Koko*/