X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=1fa9a01ec4fcd24eda37ab34e189d15dbb808b82;hp=cc4e3fcb6136fef2d91e59b24f067c28d91a9465;hb=063fcfffebc7960fedb0e468a6b20821e387d403;hpb=f0b6179ac5fd4ff548d4263488373408f92874e8

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index cc4e3fcb..1fa9a01e 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -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			}
 };