--- uae/src/ggi.c	2018/04/24 16:40:07	1.1
+++ uae/src/ggi.c	2018/04/24 16:42:14	1.1.1.2
@@ -91,7 +91,7 @@ int graphics_setup(void)
 	for(j=0;j<MAX_GGI_COLOR_MODES;j++) {
 	    if (ggiCheckGraphMode(vis, x_size_table[i], y_size_table[i],
 				  x_size_table[i], y_size_table[i],
-				  color_table[j]) != 0)
+				  color_table[j],NULL,NULL) != 0)
 	      continue;
 
 	    dummy=(struct ggi_graphmodes *)malloc(sizeof(struct ggi_graphmodes));
@@ -200,8 +200,6 @@ static int set_amiga_mode (void)
     ggi_directbuffer_t gbuf=NULL;
     ggi_pixellinearbuffer *plb;   
 
-    ggiSetFocus(vis);
-
     if (ggiSetGraphMode (vis, sx, sy, sx, sy, amiga_modetype) != 0) {
 	fprintf(stderr,"Can't set graphics mode\n");
 	return 0;
@@ -423,8 +421,8 @@ void handle_events (void)
 	    state=ev.pbutton.state;
 	    button=ev.pbutton.button;
 	    switch(button) {
-	     case 1 : buttonstate[2]=state&button;break;
-	     case 2 : buttonstate[0]=(state&button)>>1;break;
+	     case 1 : buttonstate[0]=state&button;break;
+	     case 2 : buttonstate[2]=(state&button)>>1;break;
 	     case 4 : buttonstate[1]=(state&button)>>2;break;
 	     default: break;
 	    }
@@ -454,7 +452,7 @@ void handle_events (void)
 	     default           : break;
 	    }
 	  default:  
-	    printf("Ugh\n");
+/*	    printf("Ugh\n");*/
 	}
     }
     
@@ -476,19 +474,19 @@ void handle_events (void)
     return;
 }
 
-void write_log(const char *buf)
+int check_prefs_changed_gfx (void)
 {
-	fprintf(stderr,buf);
+    return 0;
 }
 
 int debuggable(void)
 {
-	return 0;
+    return 0;
 }
 
 int needmousehack(void)
 {
-	return 0;
+    return 0;
 }
 
 /* This is not implemented yet as GGI is not that far */
@@ -536,7 +534,7 @@ int DX_FillResolutions (uae_u16 *ppixel_
     for (i = 0; i < MAX_SCREEN_MODES; i++) {
 	if (ggiCheckGraphMode (vis, x_size_table[i], y_size_table[i],
 			       x_size_table[i], y_size_table[i],
-			       GT_8BIT) == 0) {
+			       GT_8BIT,NULL,NULL) == 0) {
 	    DisplayModes[count].res.width = x_size_table[i];
 	    DisplayModes[count].res.height = y_size_table[i];
 	    DisplayModes[count].depth = 1;
@@ -546,7 +544,7 @@ int DX_FillResolutions (uae_u16 *ppixel_
 	}
 	if (ggiCheckGraphMode (vis, x_size_table[i], y_size_table[i],
 			       x_size_table[i], y_size_table[i],
-			       GT_16BIT) == 0) {
+			       GT_16BIT,NULL,NULL) == 0) {
 	    DisplayModes[count].res.width = x_size_table[i];
 	    DisplayModes[count].res.height = y_size_table[i];
 	    DisplayModes[count].depth = 2;
@@ -556,7 +554,7 @@ int DX_FillResolutions (uae_u16 *ppixel_
 	}
 	if (ggiCheckGraphMode (vis, x_size_table[i], y_size_table[i],
 			       x_size_table[i], y_size_table[i],
-			       GT_32BIT) == 0) {
+			       GT_32BIT,NULL,NULL) == 0) {
 	    DisplayModes[count].res.width = x_size_table[i];
 	    DisplayModes[count].res.height = y_size_table[i];
 	    DisplayModes[count].depth = 4;
@@ -613,7 +611,7 @@ void gfx_set_picasso_modeinfo (int w, in
     picasso_vidinfo.height = h;
     picasso_vidinfo.depth = depth;
     picasso_vidinfo.pixbytes = depth >> 3;
-    picasso_vidinfo.rowbytes = w /* @@@ */;
+    picasso_vidinfo.rowbytes = w * picasso_vidinfo.pixbytes;
     picasso_modetype = (depth == 8 ? GT_8BIT
 			: depth == 16 ? GT_16BIT
 			: GT_32BIT);
@@ -637,11 +635,23 @@ void gfx_set_picasso_state (int on)
 	set_window_for_amiga ();
 }
 
-uae_u8 *lockscr (void)
+uae_u8 *gfx_lock_picasso (void)
 {
     return linear;
 }
-void unlockscr (void)
+void gfx_unlock_picasso (void)
 {
 }
 #endif
+
+int lockscr (void)
+{
+    return 1;
+}
+
+void unlockscr (void)
+{
+}
+
+
+