[Freeciv-Dev] (PR#8998) Small map meets large screen, they have problems together.

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=8998 >

Yet another possibility is to make the "faster" drawing system optional.
 If the user wants to use a big mapview they can disable it.  Of course
first they have to know that they have to disable it.  And naturally
they will get much slower drawing, which is an even bigger problem for
them since they have a big mapview.

jason

? diff
? newtiles
Index: client/mapview_common.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/mapview_common.c,v
retrieving revision 1.151
diff -u -r1.151 mapview_common.c
--- client/mapview_common.c     1 Oct 2004 17:53:01 -0000       1.151
+++ client/mapview_common.c     5 Oct 2004 22:44:17 -0000
@@ -435,7 +435,8 @@
     common_y0 = MAX(old_gui_y0, gui_y0);
     common_y1 = MIN(old_gui_y0, gui_y0) + height;
 
-    if (common_x1 > common_x0 && common_y1 > common_y0) {
+    if (faster_mapview_drawing
+       && common_x1 > common_x0 && common_y1 > common_y0) {
       /* Do a partial redraw only.  This means the area of overlap (a
        * rectangle) is copied.  Then the remaining areas (two rectangles)
        * are updated through update_map_canvas. */
Index: client/options.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.c,v
retrieving revision 1.103
diff -u -r1.103 options.c
--- client/options.c    26 Aug 2004 07:59:01 -0000      1.103
+++ client/options.c    5 Oct 2004 22:44:18 -0000
@@ -71,6 +71,7 @@
 bool popup_new_cities = TRUE;
 bool keyboardless_goto = TRUE;
 bool show_task_icons = TRUE;
+bool faster_mapview_drawing = TRUE;
 
 /* This option is currently set by the client - not by the user. */
 bool update_city_text_in_refresh_tile = TRUE;
@@ -99,6 +100,7 @@
   GEN_BOOL_OPTION(ai_manual_turn_done,      N_("Manual Turn Done in AI Mode")),
   GEN_BOOL_OPTION(auto_center_on_unit,      N_("Auto Center on Units")),
   GEN_BOOL_OPTION(auto_center_on_combat,    N_("Auto Center on Combat")),
+  GEN_BOOL_OPTION(faster_mapview_drawing, N_("Do mapview drawing faster")),
   GEN_BOOL_OPTION(wakeup_focus,             N_("Focus on Awakened Units")),
   GEN_BOOL_OPTION(center_when_popup_city,   N_("Center map when Popup city")),
   GEN_BOOL_OPTION(concise_city_production,  N_("Concise City Production")),
Index: client/options.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.h,v
retrieving revision 1.38
diff -u -r1.38 options.h
--- client/options.h    3 Aug 2004 00:09:44 -0000       1.38
+++ client/options.h    5 Oct 2004 22:44:18 -0000
@@ -46,6 +46,7 @@
 extern bool update_city_text_in_refresh_tile;
 extern bool keyboardless_goto;
 extern bool show_task_icons;
+extern bool faster_mapview_drawing;
 
 enum client_option_type {
   COT_BOOL,