0030-gtk3.22-Drop-experimental-zoom-levels-support.patch - Freeciv - Freeciv Ticket System

Feature #1072 » 0030-gtk3.22-Drop-experimental-zoom-levels-support.patch

S3_2 - Marko Lindqvist, 11/08/2024 11:41 PM

       fc_fprintf(stderr,
                  _("-r, --resolution WIDTHxHEIGHT\tAssume given resolution "
                    "screen\n"));
     #ifdef EXP_ZOOM_LEVELS
       fc_fprintf(stderr,
                  /* TRANS: Keep word 'default' untranslated */
                  _("-z, --zoom LEVEL\tSet zoom level; use value 'default' "
                    "to reset\n\n"));
     #else
       fc_fprintf(stderr, "\n");
     #endif /* EXP_ZOOM_LEVELS */
                    "screen\n\n"));
       /* TRANS: No full stop after the URL, could cause confusion. */
       fc_fprintf(stderr, _("Report bugs at %s\n"), BUG_URL);
-...
           print_usage();
           return FALSE;
     #ifdef EXP_ZOOM_LEVELS
         } else if ((option = get_option_malloc("--zoom", argv, &i, argc, FALSE))) {
           char *endptr;
           if (strcmp("default", option)) {
             gui_options.zoom_set = TRUE;
             gui_options.zoom_default_level = strtof(option, &endptr);
           } else {
             gui_options.zoom_set = FALSE;
+          }
           free(option);
     #endif /* EXP_ZOOM_LEVELS */
         } else if ((option = get_option_malloc("--resolution", argv, &i, argc, FALSE))) {
           if (!string_to_video_mode(option, &vmode)) {
             fc_fprintf(stderr, _("Illegal video mode '%s'\n"), option);

     bool zoom_individual_tiles = TRUE;
     static float default_zoom_steps[] = {
     #ifdef EXP_ZOOM_LEVELS
       -1.0, 0.13, 0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 2.0, 2.5, 3.0, 4.0, -1.0
     #else
       -1.0, 1.0, 2.0, -1.0
     #endif /* EXP_ZOOM_LEVELS */
     };
     static float *zoom_steps = default_zoom_steps;

       fi
     done
     AC_ARG_WITH([zoom],
       [AS_HELP_STRING([--with-zoom], [expose experimental zoom levels support on gtk-clients to user])],
       [AC_DEFINE([EXP_ZOOM_LEVELS], [1], [Experimental zoom levels (other than 1.0 and 2.0)])])
     AC_ARG_ENABLE([gitrev],
       AS_HELP_STRING([--enable-gitrev], [get git revision to version information]),
     [case "${enableval}" in

(2-2/2)