X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=1fa9a01ec4fcd24eda37ab34e189d15dbb808b82;hp=dc4613a6e88f39df9e375093b3181c7220985b94;hb=7732b3bda99e3cafc7db8718f2cac1f507c978e8;hpb=64e7c54dce6ea8c063f04198c64c5057d751c928

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index dc4613a6..1fa9a01e 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -13,9 +13,9 @@
 #include "main.h"
 
 
-/* List values that are not defined in the configuration file are set to
-   reliable default values. If that value is GFX_ARG_UNDEFINED, it will
-   be dynamically determined, using some of the other list values. */
+// List values that are not defined in the configuration file are set to
+// reliable default values. If that value is GFX_ARG_UNDEFINED, it will
+// be dynamically determined, using some of the other list values.
 
 struct ConfigTypeInfo image_config_suffix[] =
 {
@@ -7354,8 +7354,8 @@ struct ConfigInfo image_config[] =
   { "door_2.top_border_correction.width",	"108"			},
   { "door_2.top_border_correction.height",	"8"			},
 
-  /* the last image entry apparently gets overwritten by very last entry
-     of "image_config[]"; so far this bug could not be found and fixed */
+  // the last image entry apparently gets overwritten by very last entry
+  // of "image_config[]"; so far this bug could not be found and fixed
   { "last_image_entry_bug",			UNDEFINED_FILENAME	},
 
 
@@ -7363,8 +7363,8 @@ struct ConfigInfo image_config[] =
   // non-image definitions
   // ==========================================================================
 
-  /* the following directives are not associated with an image, but
-     probably make sense to be defined in "graphicsinfo.conf", too */
+  // the following directives are not associated with an image, but
+  // probably make sense to be defined in "graphicsinfo.conf", too
 
   // keyword to start parser: "CONFIG_VARS_START" <-- do not change!
 
@@ -9446,6 +9446,10 @@ struct ConfigInfo image_config[] =
 
   { "viewport.window.width",			"672"			},
   { "viewport.window.height",			"560"			},
+  { "viewport.window.min_width",		"-1"			},
+  { "viewport.window.min_height",		"-1"			},
+  { "viewport.window.max_width",		"-1"			},
+  { "viewport.window.max_height",		"-1"			},
   { "viewport.window.TITLE.width",		ARG_DEFAULT		},
   { "viewport.window.TITLE.height",		ARG_DEFAULT		},
 
@@ -9453,79 +9457,174 @@ struct ConfigInfo image_config[] =
   { "viewport.playfield.y",			"6"			},
   { "viewport.playfield.width",			"548"			},
   { "viewport.playfield.height",		"548"			},
+  { "viewport.playfield.min_width",		"-1"			},
+  { "viewport.playfield.min_height",		"-1"			},
+  { "viewport.playfield.max_width",		"-1"			},
+  { "viewport.playfield.max_height",		"-1"			},
+  { "viewport.playfield.margin_left",		"0"			},
+  { "viewport.playfield.margin_right",		"0"			},
+  { "viewport.playfield.margin_top",		"0"			},
+  { "viewport.playfield.margin_bottom",		"0"			},
+  { "viewport.playfield.border_left",		"-1"			},
+  { "viewport.playfield.border_right",		"-1"			},
+  { "viewport.playfield.border_top",		"-1"			},
+  { "viewport.playfield.border_bottom",		"-1"			},
   { "viewport.playfield.border_size",		"2"			},
+  { "viewport.playfield.align_size",		"16"			},
+  { "viewport.playfield.align",			"left"			},
+  { "viewport.playfield.valign",		"top"			},
   { "viewport.playfield.MAIN.x",		ARG_DEFAULT		},
   { "viewport.playfield.MAIN.y",		ARG_DEFAULT		},
   { "viewport.playfield.MAIN.width",		ARG_DEFAULT		},
   { "viewport.playfield.MAIN.height",		ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.min_width",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.min_height",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.max_width",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.max_height",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.margin_left",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.margin_right",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.margin_top",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.margin_bottom",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.border_left",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.border_right",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.border_top",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.border_bottom",	ARG_DEFAULT		},
   { "viewport.playfield.MAIN.border_size",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.align_size",	ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.align",		ARG_DEFAULT		},
+  { "viewport.playfield.MAIN.valign",		ARG_DEFAULT		},
   { "viewport.playfield.SCORES.x",		ARG_DEFAULT		},
   { "viewport.playfield.SCORES.y",		ARG_DEFAULT		},
   { "viewport.playfield.SCORES.width",		ARG_DEFAULT		},
   { "viewport.playfield.SCORES.height",		ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.min_width",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.min_height",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.max_width",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.max_height",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.margin_left",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.margin_right",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.margin_top",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.margin_bottom",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.border_left",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.border_right",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.border_top",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.border_bottom",	ARG_DEFAULT		},
   { "viewport.playfield.SCORES.border_size",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.align_size",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.align",		ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.valign",		ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.x",		ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.y",		ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.width",		ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.height",		ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.min_width",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.min_height",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.max_width",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.max_height",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.margin_left",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.margin_right",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.margin_top",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.margin_bottom",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.border_left",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.border_right",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.border_top",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.border_bottom",	ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.border_size",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.align_size",	ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.align",		ARG_DEFAULT		},
+  { "viewport.playfield.EDITOR.valign",		ARG_DEFAULT		},
   { "viewport.playfield.PLAYING.x",		ARG_DEFAULT		},
   { "viewport.playfield.PLAYING.y",		ARG_DEFAULT		},
   { "viewport.playfield.PLAYING.width",		ARG_DEFAULT		},
   { "viewport.playfield.PLAYING.height",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.min_width",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.min_height",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.max_width",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.max_height",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.margin_left",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.margin_right",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.margin_top",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.margin_bottom",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.border_left",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.border_right",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.border_top",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.border_bottom",	ARG_DEFAULT		},
   { "viewport.playfield.PLAYING.border_size",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.align_size",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.align",		ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.valign",	ARG_DEFAULT		},
 
   { "viewport.door_1.x",			"566"			},
   { "viewport.door_1.y",			"60"			},
   { "viewport.door_1.width",			"100"			},
   { "viewport.door_1.height",			"280"			},
   { "viewport.door_1.border_size",		"4"			},
+  { "viewport.door_1.align",			"left"			},
+  { "viewport.door_1.valign",			"top"			},
   { "viewport.door_1.MAIN.x",			ARG_DEFAULT		},
   { "viewport.door_1.MAIN.y",			ARG_DEFAULT		},
   { "viewport.door_1.MAIN.width",		ARG_DEFAULT		},
   { "viewport.door_1.MAIN.height",		ARG_DEFAULT		},
   { "viewport.door_1.MAIN.border_size",		ARG_DEFAULT		},
+  { "viewport.door_1.MAIN.align",		ARG_DEFAULT		},
+  { "viewport.door_1.MAIN.valign",		ARG_DEFAULT		},
   { "viewport.door_1.SCORES.x",			ARG_DEFAULT		},
   { "viewport.door_1.SCORES.y",			ARG_DEFAULT		},
   { "viewport.door_1.SCORES.width",		ARG_DEFAULT		},
   { "viewport.door_1.SCORES.height",		ARG_DEFAULT		},
   { "viewport.door_1.SCORES.border_size",	ARG_DEFAULT		},
+  { "viewport.door_1.SCORES.align",		ARG_DEFAULT		},
+  { "viewport.door_1.SCORES.valign",		ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.x",			ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.y",			ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.width",		ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.height",		ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.border_size",	ARG_DEFAULT		},
+  { "viewport.door_1.EDITOR.align",		ARG_DEFAULT		},
+  { "viewport.door_1.EDITOR.valign",		ARG_DEFAULT		},
   { "viewport.door_1.PLAYING.x",		ARG_DEFAULT		},
   { "viewport.door_1.PLAYING.y",		ARG_DEFAULT		},
   { "viewport.door_1.PLAYING.width",		ARG_DEFAULT		},
   { "viewport.door_1.PLAYING.height",		ARG_DEFAULT		},
   { "viewport.door_1.PLAYING.border_size",	ARG_DEFAULT		},
+  { "viewport.door_1.PLAYING.align",		ARG_DEFAULT		},
+  { "viewport.door_1.PLAYING.valign",		ARG_DEFAULT		},
 
   { "viewport.door_2.x",			"566"			},
   { "viewport.door_2.y",			"400"			},
   { "viewport.door_2.width",			"100"			},
   { "viewport.door_2.height",			"100"			},
   { "viewport.door_2.border_size",		"4"			},
+  { "viewport.door_2.align",			"left"			},
+  { "viewport.door_2.valign",			"top"			},
   { "viewport.door_2.MAIN.x",			ARG_DEFAULT		},
   { "viewport.door_2.MAIN.y",			ARG_DEFAULT		},
   { "viewport.door_2.MAIN.width",		ARG_DEFAULT		},
   { "viewport.door_2.MAIN.height",		ARG_DEFAULT		},
   { "viewport.door_2.MAIN.border_size",		ARG_DEFAULT		},
+  { "viewport.door_2.MAIN.align",		ARG_DEFAULT		},
+  { "viewport.door_2.MAIN.valign",		ARG_DEFAULT		},
   { "viewport.door_2.SCORES.x",			ARG_DEFAULT		},
   { "viewport.door_2.SCORES.y",			ARG_DEFAULT		},
   { "viewport.door_2.SCORES.width",		ARG_DEFAULT		},
   { "viewport.door_2.SCORES.height",		ARG_DEFAULT		},
   { "viewport.door_2.SCORES.border_size",	ARG_DEFAULT		},
+  { "viewport.door_2.SCORES.align",		ARG_DEFAULT		},
+  { "viewport.door_2.SCORES.valign",		ARG_DEFAULT		},
   { "viewport.door_2.EDITOR.x",			"566"			},
   { "viewport.door_2.EDITOR.y",			"356"			},
   { "viewport.door_2.EDITOR.width",		"100"			},
   { "viewport.door_2.EDITOR.height",		"144"			},
   { "viewport.door_2.EDITOR.border_size",	"4"			},
+  { "viewport.door_2.EDITOR.align",		"left"			},
+  { "viewport.door_2.EDITOR.valign",		"top"			},
   { "viewport.door_2.PLAYING.x",		ARG_DEFAULT		},
   { "viewport.door_2.PLAYING.y",		ARG_DEFAULT		},
   { "viewport.door_2.PLAYING.width",		ARG_DEFAULT		},
   { "viewport.door_2.PLAYING.height",		ARG_DEFAULT		},
   { "viewport.door_2.PLAYING.border_size",	ARG_DEFAULT		},
+  { "viewport.door_2.PLAYING.align",		ARG_DEFAULT		},
+  { "viewport.door_2.PLAYING.valign",		ARG_DEFAULT		},
 
   { NULL,					NULL			}
 };