Merge "ui: Remove the "-scale" flag and "window scale" command." into emu-master-dev

Evan Birenbaum · Gerrit Code Review · commit d3761a035eae · 2016-02-01T22:07:42.000Z
diff --git a/android/cmdline-options.h b/android/cmdline-options.h
@@ -123,7 +123,6 @@ OPT_PARAM( onion, "<image>", "use overlay PNG image over screen" )
 OPT_PARAM( onion_alpha, "<%age>", "specify onion-skin translucency" )
 OPT_PARAM( onion_rotation, "0|1|2|3", "specify onion-skin rotation" )
 
-OPT_PARAM( scale, "<scale>", "scale emulator window" )
 OPT_PARAM( dpi_device, "<dpi>", "specify device's resolution in dpi (default "
             STRINGIFY(DEFAULT_DEVICE_DPI) ")" )
 
diff --git a/android/console.c b/android/console.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2015 The Android Open Source Project
+/* Copyright (C) 2007-2016 The Android Open Source Project
 **
 ** This software is licensed under the terms of the GNU General Public
 ** License version 2, as published by the Free Software Foundation, and
@@ -53,8 +53,6 @@
 #include <string.h>
 #include <unistd.h>
 
-extern void android_emulator_set_window_scale(double, int);
-
 #define  DEBUG  1
 
 #if 1
@@ -2567,53 +2565,6 @@ static const CommandDefRec fingerprint_commands[] =
     { NULL, NULL, NULL, NULL, NULL, NULL }
 };
 
-/********************************************************************************************/
-/********************************************************************************************/
-/*****                                                                                 ******/
-/*****                           M A I N   C O M M A N D S                             ******/
-/*****                                                                                 ******/
-/********************************************************************************************/
-/********************************************************************************************/
-
-static int
-do_window_scale( ControlClient  client, char*  args )
-{
-    double  scale;
-    int     is_dpi = 0;
-    char*   end;
-
-    if (!args) {
-        control_write( client, "KO: argument missing, try 'window scale <scale>'\r\n" );
-        return -1;
-    }
-
-    scale = strtol( args, &end, 10 );
-    if (end > args && !memcmp( end, "dpi", 4 )) {
-        is_dpi = 1;
-    }
-    else {
-        scale = strtod( args, &end );
-        if (end == args || end[0]) {
-            control_write( client, "KO: argument <scale> must be a real number, or an integer followed by 'dpi'\r\n" );
-            return -1;
-        }
-    }
-
-    android_emulator_set_window_scale(scale, is_dpi);
-    return 0;
-}
-
-static const CommandDefRec  window_commands[] =
-{
-    { "scale", "change the window scale",
-    "'window scale <scale>' allows you to change the scale of the emulator window at runtime\r\n"
-    "<scale> must be either a real number between 0.1 and 3.0, or an integer followed by\r\n"
-    "the 'dpi' prefix (as in '120dpi')\r\n",
-    NULL, do_window_scale, NULL },
-
-    { NULL, NULL, NULL, NULL, NULL, NULL }
-};
-
 /********************************************************************************************/
 /********************************************************************************************/
 /*****                                                                                 ******/
@@ -2715,10 +2666,6 @@ static const CommandDefRec   main_commands[] =
     "allows you to control (e.g. start/stop) the execution of the virtual device\r\n", NULL,
     NULL, vm_commands },
 
-    { "window", "manage emulator window",
-    "allows you to modify the emulator window\r\n", NULL,
-    NULL, window_commands },
-
     { "qemu", "QEMU-specific commands",
     "allows to connect to the QEMU virtual machine monitor\r\n", NULL,
     NULL, qemu_commands },
diff --git a/android/emulator-window.c b/android/emulator-window.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2015 The Android Open Source Project
+/* Copyright (C) 2006-2016 The Android Open Source Project
 **
 ** This software is licensed under the terms of the GNU General Public
 ** License version 2, as published by the Free Software Foundation, and
@@ -33,8 +33,6 @@
 
 #define  D(...)  do {  if (VERBOSE_CHECK(init)) dprint(__VA_ARGS__); } while (0)
 
-static double get_default_scale( AndroidOptions*  opts );
-
 int qemu_net_disable = 0;
 
 /* EmulatorWindow structure instance. */
@@ -203,7 +201,6 @@ emulator_window_setup( EmulatorWindow*  emulator )
 
         .window_x = emulator->win_x,
         .window_y = emulator->win_y,
-        .window_scale = get_default_scale(emulator->opts),
 
         .keyboard_charmap = emulator->opts->charmap,
         .keyboard_raw_keys = emulator->opts->raw_keys != 0,
@@ -432,66 +429,6 @@ get_device_dpi( AndroidOptions*  opts )
     return  dpi_device;
 }
 
-static double
-get_default_scale( AndroidOptions*  opts )
-{
-    int     dpi_device  = get_device_dpi( opts );
-    int     dpi_monitor = -1;
-    double  scale       = 0.0;
-
-    /* possible values for the 'scale' option are
-     *   'auto'        : try to determine the scale automatically
-     *   '<number>dpi' : indicates the host monitor dpi, compute scale accordingly
-     *   '<fraction>'  : use direct scale coefficient
-     */
-
-    if (opts->scale) {
-        if (!strcmp(opts->scale, "auto"))
-        {
-            /* we need to get the host dpi resolution ? */
-            int   xdpi, ydpi;
-
-            if (skin_winsys_get_monitor_dpi(&xdpi, &ydpi) < 0) {
-                fprintf(stderr, "could not get monitor DPI resolution from system. please use -dpi-monitor to specify one\n" );
-                exit(1);
-            }
-            D( "system reported monitor resolutions: xdpi=%d ydpi=%d\n", xdpi, ydpi);
-            dpi_monitor = (xdpi + ydpi+1)/2;
-        }
-        else
-        {
-            char*   end;
-            scale = strtod( opts->scale, &end );
-
-            if (end && end[0] == 'd' && end[1] == 'p' && end[2] == 'i' && end[3] == 0) {
-                if ( scale < 20 || scale > 1000 ) {
-                    fprintf(stderr, "emulator: ignoring bad -scale argument '%s': %s\n", opts->scale,
-                            "host dpi number must be between 20 and 1000" );
-                    exit(1);
-                }
-                dpi_monitor = scale;
-                scale       = 0.0;
-            }
-            else if (end == NULL || *end != 0) {
-                fprintf(stderr, "emulator: ignoring bad -scale argument '%s': %s\n", opts->scale,
-                        "not a number or the 'auto' keyword" );
-                exit(1);
-            }
-            else if ( scale < 0.1 || scale > 3. ) {
-                fprintf(stderr, "emulator: ignoring bad -window-scale argument '%s': %s\n", opts->scale,
-                        "must be between 0.1 and 3.0" );
-                exit(1);
-            }
-        }
-    }
-
-    if (scale == 0.0 && dpi_monitor > 0)
-        scale = dpi_monitor*1.0/dpi_device;
-
-    return scale;
-}
-
-
 /* called periodically to poll for user input events */
 static void emulator_window_refresh(EmulatorWindow* emulator)
 {
@@ -509,23 +446,6 @@ static void emulator_window_refresh(EmulatorWindow* emulator)
     }
 }
 
-/*
- * android-qemu1-glue/console.c helper routines.
- */
-
-void
-android_emulator_set_window_scale(double  scale, int  is_dpi)
-{
-    EmulatorWindow*  emulator = qemulator;
-
-    if (is_dpi)
-        scale /= get_device_dpi( emulator->opts );
-
-    if (emulator->ui) {
-        skin_ui_set_scale(emulator->ui, scale);
-    }
-}
-
 
 void
 android_emulator_set_base_port( int  port )
diff --git a/android/emulator-window.h b/android/emulator-window.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2010 The Android Open Source Project
+/* Copyright (C) 2006-2016 The Android Open Source Project
 **
 ** This software is licensed under the terms of the GNU General Public
 ** License version 2, as published by the Free Software Foundation, and
@@ -42,9 +42,6 @@ typedef struct {
 EmulatorWindow*
 emulator_window_get(void);
 
-void
-android_emulator_set_window_scale(double  scale, int  is_dpi);
-
 /* Initializes EmulatorWindow structure instance. */
 int
 emulator_window_init(EmulatorWindow*   emulator,
diff --git a/android/skin/ui.c b/android/skin/ui.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2015 The Android Open Source Project
+/* Copyright (C) 2006-2016 The Android Open Source Project
 **
 ** This software is licensed under the terms of the GNU General Public
 ** License version 2, as published by the Free Software Foundation, and
@@ -97,8 +97,7 @@ SkinUI* skin_ui_create(SkinFile* layout_file,
 
     ui->window = skin_window_create(
             ui->layout, ui->ui_params.window_x, ui->ui_params.window_y,
-            ui->ui_params.window_scale, 0, use_emugl_subwindow,
-            ui->ui_funcs->window_funcs);
+            0, use_emugl_subwindow, ui->ui_funcs->window_funcs);
     if (!ui->window) {
         skin_ui_free(ui);
         return NULL;
diff --git a/android/skin/ui.h b/android/skin/ui.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2010 The Android Open Source Project
+/* Copyright (C) 2006-2016 The Android Open Source Project
 **
 ** This software is licensed under the terms of the GNU General Public
 ** License version 2, as published by the Free Software Foundation, and
@@ -67,7 +67,6 @@ typedef struct SkinUIParams {
     char window_name[64];
     int window_x;
     int window_y;
-    double window_scale;
 
     bool enable_touch;
     bool enable_dpad;
diff --git a/android/skin/window.c b/android/skin/window.c
@@ -1330,46 +1330,14 @@ static int  skin_window_reset_internal (SkinWindow*, SkinLayout*);
 SkinWindow* skin_window_create(SkinLayout* slayout,
                                int x,
                                int y,
-                               double scale,
                                int no_display,
                                bool use_emugl_subwindow,
                                const SkinWindowFuncs* win_funcs) {
     SkinWindow*  window;
 
-    /* If scale is <= 0, we want to check that the window's default size if
-     * not larger than the current screen. Otherwise, we need to compute
-     * a new scale to ensure it is.
-     */
-    if (scale <= 0) {
-        SkinRect  monitor;
-        int       screen_w, screen_h;
-        int       win_w = slayout->size.w;
-        int       win_h = slayout->size.h;
-        double    scale_w, scale_h;
-
-        /* To account for things like menu bars, window decorations etc..
-         * We only compute 85% of the real screen size. */
-        skin_winsys_get_monitor_rect(&monitor);
-        screen_w = monitor.size.w * 0.85;
-        screen_h = monitor.size.h * 0.85;
-
-        scale_w = 1.0;
-        scale_h = 1.0;
-
-        if (screen_w < win_w && win_w > 1.)
-            scale_w = 1.0 * screen_w / win_w;
-        if (screen_h < win_h && win_h > 1.)
-            scale_h = 1.0 * screen_h / win_h;
-
-        scale = (scale_w <= scale_h) ? scale_w : scale_h;
-
-        VERBOSE_PRINT(init,"autoconfig: -scale %g", scale);
-    }
-
     ANEW0(window);
 
     window->win_funcs    = win_funcs;
-    window->scale = scale;
     window->no_display   = no_display;
     window->use_emugl_subwindow = use_emugl_subwindow;
     window->surface = NULL;
@@ -1384,6 +1352,26 @@ SkinWindow* skin_window_create(SkinLayout* slayout,
     window->y_pos = y;
     window->scroll_h = 0;
 
+    SkinRect  monitor;
+    int       screen_w, screen_h;
+    int       win_w = slayout->size.w;
+    int       win_h = slayout->size.h;
+    double    scale_w = 1.0;
+    double    scale_h = 1.0;
+
+    /* To account for things like menu bars, window decorations etc..
+     * We only compute 85% of the real screen size. */
+    skin_winsys_get_monitor_rect(&monitor);
+    screen_w = monitor.size.w * 0.85;
+    screen_h = monitor.size.h * 0.85;
+
+    if (screen_w < win_w && win_w > 1.)
+        scale_w = 1.0 * screen_w / win_w;
+    if (screen_h < win_h && win_h > 1.)
+        scale_h = 1.0 * screen_h / win_h;
+
+    window->scale = (scale_w <= scale_h) ? scale_w : scale_h;
+
     if (skin_window_reset_internal(window, slayout) < 0) {
         skin_window_free(window);
         return NULL;
diff --git a/android/skin/window.h b/android/skin/window.h
@@ -46,7 +46,6 @@ typedef struct SkinWindowFuncs {
 extern SkinWindow* skin_window_create(SkinLayout* layout,
                                       int x,
                                       int y,
-                                      double scale,
                                       int no_display,
                                       bool use_emugl_subwindow,
                                       const SkinWindowFuncs* win_funcs);
