--- uae/src/svga.c	2018/04/24 16:42:10	1.1.1.4
+++ uae/src/svga.c	2018/04/24 16:44:51	1.1.1.6
@@ -438,7 +438,7 @@ static void my_kbd_handler (int scancode
 	record_key ((akey << 1) | 1);
 
     /* "Affengriff" */
-    if(keystate[AK_CTRL] && keystate[AK_LAMI] && keystate[AK_RAMI])
+    if ((keystate[AK_CTRL] || keystate[AK_RCTRL]) && keystate[AK_LAMI] && keystate[AK_RAMI])
 	uae_reset ();
 }
 
@@ -482,7 +482,7 @@ static int enter_graphics_mode (int whic
     current_vgamode = which;
 
     linear_mem = 0;
-    if ((modeinfo.flags & CAPABLE_LINEAR) && !currprefs.no_xhair) {
+    if ((modeinfo.flags & CAPABLE_LINEAR) && ! currprefs.svga_no_linear) {
 	int val = vga_setlinearaddressing ();
 	int new_ul = val != -1 ? !need_dither : 0;
 	if (using_linear == -1)
@@ -517,7 +517,7 @@ static int enter_graphics_mode_picasso (
     current_vgamode = which;
 
     linear_mem = 0;
-    if ((modeinfo.flags & CAPABLE_LINEAR) && !currprefs.no_xhair) {
+    if ((modeinfo.flags & CAPABLE_LINEAR) && ! currprefs.svga_no_linear) {
 	int val = vga_setlinearaddressing ();
 	if (val != -1) {
 	    linear_mem = (char *)vga_getgraphmem ();
@@ -861,7 +861,7 @@ static void set_window_for_amiga (void)
     restore_vga_colors ();
 }
 
-void gfx_set_picasso_modeinfo (int w, int h, int depth)
+void gfx_set_picasso_modeinfo (int w, int h, int depth, int rgbfmt)
 {
     vga_modeinfo *info;
     int i, mode;
@@ -910,14 +910,6 @@ void gfx_set_picasso_state (int on)
 	set_window_for_amiga ();
 }
 
-void begindrawing (void)
-{
-}
-
-void enddrawing (void)
-{
-}
-
 uae_u8 *gfx_lock_picasso (void)
 {
     return linear_mem;
@@ -935,3 +927,13 @@ int lockscr (void)
 void unlockscr (void)
 {
 }
+
+void target_save_options (FILE *f, struct uae_prefs *p)
+{
+    fprintf (f, "svga.no_linear=%s\n", p->svga_no_linear ? "true" : "false");
+}
+
+int target_parse_option (struct uae_prefs *p, char *option, char *value)
+{
+    return (cfgfile_yesno (option, value, "no_linear", &p->svga_no_linear));
+}