Added FUNKEY_FAST_BLIT option and handling aspect ratios

Author: Vincent-FK

src/drivers/input.cpp

@@ -836,16 +836,76 @@ void Input_Event(const SDL_Event *event)
 	 //printf("Down: %3u\n", event->key.keysym.sym);
 	 size_t s = event->key.keysym.sym;
 
-	   /// Special case: menu FunKey
-	   if(s == SDLK_q){
-	    printf("Launching menu\n");
-	    run_menu_loop();
-	    break;
-	   }
+   /* Special cases: */
+   /* Menu FunKey */
+   if(s == SDLK_q){
+    printf("Launching menu\n");
+    run_menu_loop();
+    break;
+   }
+   /* Quick shortcut: Changing aspect Ratio */
+   else if(s == SDLK_h){
+    char shell_cmd[100];
+    aspect_ratio = (aspect_ratio+1)%NB_ASPECT_RATIOS_TYPES;
+    if(aspect_ratio == ASPECT_RATIOS_TYPE_MANUAL){
+      sprintf(shell_cmd, "%s %d \"DISPLAY MODE: MANUAL ZOOM %d%%%%\"",
+        SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, aspect_ratio_factor_percent);
+    }
+    else{
+      sprintf(shell_cmd, "%s %d \"     DISPLAY MODE: %s\"",
+        SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, aspect_ratio_name[aspect_ratio]);
+    }
+    //hud_new_msg = 4;
+    FILE *fp = popen(shell_cmd, "r");
+    if (fp == NULL) {
+      printf("Failed to run command %s\n", shell_cmd);
+    }
+    break;
+   }
+   /* Quick shortcut: Decrease manual aspect Ratio */
+   else if(s == SDLK_j){
+    if(aspect_ratio == ASPECT_RATIOS_TYPE_MANUAL){
+      aspect_ratio_factor_percent = (aspect_ratio_factor_percent>aspect_ratio_factor_step)?
+        aspect_ratio_factor_percent-aspect_ratio_factor_step:0;
+      need_screen_cleared = 1;
+    }
+    else{
+      aspect_ratio = ASPECT_RATIOS_TYPE_MANUAL;
+    }
+    char shell_cmd[100];
+    sprintf(shell_cmd, "%s %d \"DISPLAY MODE: MANUAL ZOOM %d%%%%\"",
+      SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, aspect_ratio_factor_percent);
+    FILE *fp = popen(shell_cmd, "r");
+    if (fp == NULL) {
+      printf("Failed to run command %s\n", shell_cmd);
+    }
+    break;
+   }
+   /* Quick shortcut: Increase manual aspect Ratio */
+   else if(s == SDLK_i){
+    if(aspect_ratio == ASPECT_RATIOS_TYPE_MANUAL){
+      aspect_ratio_factor_percent = (aspect_ratio_factor_percent+aspect_ratio_factor_step<100)?
+        aspect_ratio_factor_percent+aspect_ratio_factor_step:100;
+      need_screen_cleared = 1;
+    }
+    else{
+      aspect_ratio = ASPECT_RATIOS_TYPE_MANUAL;
+    }
+    aspect_ratio = ASPECT_RATIOS_TYPE_MANUAL;
+    char shell_cmd[100];
+    sprintf(shell_cmd, "%s %d \"DISPLAY MODE: MANUAL ZOOM %d%%%%\"",
+      SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, aspect_ratio_factor_percent);
+    FILE *fp = popen(shell_cmd, "r");
+    if (fp == NULL) {
+      printf("Failed to run command %s\n", shell_cmd);
+    }
+    break;
+   }
 
+   /** Normal Handling */
 	 if(s < MKK_COUNT)
 	 {
-          keys_untouched[s] = (keys_untouched[s] & 0x7F) | 0x01;
+    keys_untouched[s] = (keys_untouched[s] & 0x7F) | 0x01;
 	 }
 	}
 	break;

src/drivers/menu.cpp

@@ -124,7 +124,6 @@
 
 /// -------------- STATIC VARIABLES --------------
 extern SDL_Surface *screen;
-SDL_Surface *virtual_hw_screen;  // this one is not rotated
 extern SDL_Surface *hw_screen;
 SDL_Surface * draw_screen;
 extern int volatile pumpWrap_disabled;
@@ -158,6 +157,14 @@ static uint16_t y_brightness_bar = 0;
 int volume_percentage = 0;
 int brightness_percentage = 0;
 
+#undef X
+#define X(a, b) b,
+const char *aspect_ratio_name[] = {ASPECT_RATIOS};
+int aspect_ratio = ASPECT_RATIOS_TYPE_STRETCHED;
+int aspect_ratio_factor_percent = 50;
+int aspect_ratio_factor_step = 10;
+int need_screen_cleared = 0;
+
 #undef X
 #define X(a, b) b,
 const char *resume_options_str[] = {RESUME_OPTIONS};
@@ -191,15 +198,14 @@ void init_menu_SDL(){
         MENU_ERROR_PRINTF("ERROR in init_menu_SDL: Could not open menu font %s, %s\n", MENU_FONT_NAME_SMALL_INFO, SDL_GetError());
     }
 
-    /// ----- Copy virtual_hw_screen at init ------
-    virtual_hw_screen = screen;
+    /// ----- Create SDL surfaces ------
     backup_hw_screen = SDL_CreateRGBSurface(SDL_SWSURFACE,
-        virtual_hw_screen->w, virtual_hw_screen->h, 32, 0, 0, 0, 0);
+        hw_screen->w, hw_screen->h, 32, 0, 0, 0, 0);
     if(backup_hw_screen == NULL){
         MENU_ERROR_PRINTF("ERROR Could not create backup_hw_screen: %s\n", SDL_GetError());
     }
     draw_screen = SDL_CreateRGBSurface(SDL_SWSURFACE,
-        virtual_hw_screen->w, virtual_hw_screen->h, 32, 0, 0, 0, 0);
+        hw_screen->w, hw_screen->h, 32, 0, 0, 0, 0);
     if(draw_screen == NULL){
         MENU_ERROR_PRINTF("ERROR Could not create draw_screen: %s\n", SDL_GetError());
     }
@@ -411,7 +417,7 @@ void init_menu_zones(){
     /// Init Load Menu
     add_menu_zone(MENU_TYPE_LOAD);
     /// Init Aspect Ratio Menu
-    //add_menu_zone(MENU_TYPE_ASPECT_RATIO);
+    add_menu_zone(MENU_TYPE_ASPECT_RATIO);
     /// Init Exit Menu
     add_menu_zone(MENU_TYPE_EXIT);
     /// Init Powerdown Menu
@@ -491,7 +497,7 @@ void menu_screen_refresh(int menuItem, int prevItem, int scroll, uint8_t menu_co
     menu_blit_window.y = scroll;
     menu_blit_window.h = SCREEN_VERTICAL_SIZE;
     if(SDL_BlitSurface(menu_zone_surfaces[prevItem], &menu_blit_window, draw_screen, NULL)){
-        MENU_ERROR_PRINTF("ERROR Could not Blit surface on virtual_hw_screen: %s\n", SDL_GetError());
+        MENU_ERROR_PRINTF("ERROR Could not Blit surface on draw_screen: %s\n", SDL_GetError());
     }
 
     /// --------- Blit new menu Zone going in (only during animations) ----------
@@ -619,13 +625,13 @@ void menu_screen_refresh(int menuItem, int prevItem, int scroll, uint8_t menu_co
             SDL_BlitSurface(text_surface, NULL, draw_screen, &text_pos);
             break;
 
-        /*case MENU_TYPE_ASPECT_RATIO:
+        case MENU_TYPE_ASPECT_RATIO:
             sprintf(text_tmp, "<   %s   >", aspect_ratio_name[aspect_ratio]);
             text_surface = TTF_RenderText_Blended(menu_info_font, text_tmp, text_color);
             text_pos.x = (draw_screen->w - MENU_ZONE_WIDTH)/2 + (MENU_ZONE_WIDTH - text_surface->w)/2;
             text_pos.y = draw_screen->h - MENU_ZONE_HEIGHT/2 - text_surface->h/2 + padding_y_from_center_menu_zone;
             SDL_BlitSurface(text_surface, NULL, draw_screen, &text_pos);
-            break;*/
+            break;
 
         case MENU_TYPE_EXIT:
         case MENU_TYPE_POWERDOWN:
@@ -693,8 +699,8 @@ void run_menu_loop()
     int prevItem=menuItem;
 
     /// ------ Copy currently displayed screen -------
-    if(SDL_BlitSurface(virtual_hw_screen, NULL, backup_hw_screen, NULL)){
-        MENU_ERROR_PRINTF("ERROR Could not copy virtual_hw_screen: %s\n", SDL_GetError());
+    if(SDL_BlitSurface(hw_screen, NULL, backup_hw_screen, NULL)){
+        MENU_ERROR_PRINTF("ERROR Could not copy hw_screen: %s\n", SDL_GetError());
     }
     /*uint16_t *dst_virtual = (uint16_t*) sal_VirtualVideoGetBuffer();
     memcpy(backup_hw_screen->pixels, dst_virtual,
@@ -826,12 +832,12 @@ void run_menu_loop()
                             /// ------ Refresh screen ------
                             screen_refresh = 1;
                         }
-                        /*else if(idx_menus[menuItem] == MENU_TYPE_ASPECT_RATIO){
+                        else if(idx_menus[menuItem] == MENU_TYPE_ASPECT_RATIO){
                             MENU_DEBUG_PRINTF("Aspect Ratio DOWN\n");
                             aspect_ratio = (!aspect_ratio)?(NB_ASPECT_RATIOS_TYPES-1):(aspect_ratio-1);
                             /// ------ Refresh screen ------
                             screen_refresh = 1;
-                        }*/
+                        }
                         break;
 
                     case SDLK_r:
@@ -895,12 +901,12 @@ void run_menu_loop()
                             /// ------ Refresh screen ------
                             screen_refresh = 1;
                         }
-                        /*else if(idx_menus[menuItem] == MENU_TYPE_ASPECT_RATIO){
+                        else if(idx_menus[menuItem] == MENU_TYPE_ASPECT_RATIO){
                             MENU_DEBUG_PRINTF("Aspect Ratio UP\n");
                             aspect_ratio = (aspect_ratio+1)%NB_ASPECT_RATIOS_TYPES;
                             /// ------ Refresh screen ------
                             screen_refresh = 1;
-                        }*/
+                        }
                         break;
 
                     case SDLK_a:

src/drivers/menu.h

@@ -73,6 +73,7 @@ extern const char *aspect_ratio_name[];
 extern int aspect_ratio;
 extern int aspect_ratio_factor_percent;
 extern int aspect_ratio_factor_step;
+extern int need_screen_cleared;
 extern int stop_menu_loop;
 extern char *mRomName;
 extern char *mRomPath;

src/drivers/nongl.cpp

@@ -159,6 +159,7 @@ static void BlitIScale(const MDFN_Surface *src_surface, const MDFN_Rect &sr, MDF
 {
  //puts("IScale");
  const uint32 src_pitchinpix = src_surface->pitchinpix;
+ //printf("src_pitchinpix: %d\n", src_pitchinpix);
  int32 dpitch_diff;
 
  T *src_row, *dest_row;
@@ -402,7 +403,8 @@ void MDFN_StretchBlitSurface(const MDFN_Surface* src_surface, const MDFN_Rect& s
  o_sr = *original_src_rect;
  dr = dest_rect;
 
- //printf("%d:%d, %d:%d, %d:%d\n", sr.x, sr.w, sr.y, sr.h, src_surface->w, src_surface->h);
+ //printf("src %d:%d, %d:%d, %d:%d\n", sr.x, sr.w, sr.y, sr.h, src_surface->w, src_surface->h);
+ //printf("dst %d:%d, %d:%d, %d:%d\n", dr.x, dr.w, dr.y, dr.h, dest_surface->w, dest_surface->h);
 
  if(rotated != MDFN_ROTATE0)
  {
@@ -438,10 +440,14 @@ void MDFN_StretchBlitSurface(const MDFN_Surface* src_surface, const MDFN_Rect& s
  {
   switch(source_alpha ? (int)src_surface->format.Ashift : -1)
   {
-   case -1:  if((dw_to_sw_ratio == dh_to_sh_ratio) && dw_to_sw_ratio <= 5)
+   case -1:  
+       if((dw_to_sw_ratio == dh_to_sh_ratio) && dw_to_sw_ratio <= 5){
 	      nnx(dw_to_sw_ratio, src_surface, sr, dest_surface, dr);
-	     else	
+       }
+	     else{
 	      BlitIScale<uint32, 31>(src_surface, sr, dest_surface, dr, dw_to_sw_ratio, dh_to_sh_ratio);
+        //printf("BlitIScale %f, %f\n", dw_to_sw_ratio, dh_to_sh_ratio);
+       }
 	     break;
 
    case  0:  BlitIScale<uint32,  0>(src_surface, sr, dest_surface, dr, dw_to_sw_ratio, dh_to_sh_ratio);	break;