[Xineliboutput-cvslog] vdr-xineliboutput xine_frontend_main.c, 1.75, 1.76

[Petri H. <phi...@us...>]

Update of /cvsroot/xineliboutput/vdr-xineliboutput
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16339

Modified Files:
	xine_frontend_main.c 
Log Message:
Added --geometry option


Index: xine_frontend_main.c
===================================================================
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/xine_frontend_main.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- xine_frontend_main.c	31 May 2009 16:51:26 -0000	1.75
+++ xine_frontend_main.c	31 May 2009 18:53:32 -0000	1.76
@@ -389,6 +389,7 @@
 #endif
     "   --width=x                     Video window width\n"
     "   --height=x                    Video window height\n"
+    "   --geometry=WxH[+X+Y]          Set output window geometry (X style)\n"
     "   --noscaling                   Disable all video scaling\n"
     "   --post=name[:arg=val[,arg=val]] Load and use xine post plugin(s)\n"
     "                                 examples:\n"
@@ -416,7 +417,7 @@
     "                                 are tried in following order:\n"
     "                                 local pipe, rtp, udp, tcp\n\n";
 
-static const char short_options[] = "HA:V:d:W:a:fDw:h:nP:L:C:vsxlkobSRtur";
+static const char short_options[] = "HA:V:d:W:a:fg:Dw:h:nP:L:C:vsxlkobSRtur";
 
 static const struct option long_options[] = {
   { "help",       no_argument,       NULL, 'H' },
@@ -426,6 +427,7 @@
   { "wid",        required_argument, NULL, 'W' },
   { "aspect",     required_argument, NULL, 'a' },
   { "fullscreen", no_argument,       NULL, 'f' },
+  { "geometry",   required_argument, NULL, 'g' },
   { "hud",        no_argument,       NULL, 'D' },
   { "width",      required_argument, NULL, 'w' },
   { "height",     required_argument, NULL, 'h' },
@@ -456,7 +458,7 @@
 {
   char *mrl = NULL, *gdrv = NULL, *adrv = NULL, *adev = NULL;
   int ftcp = 0, fudp = 0, frtp = 0, reconnect = 0, firsttry = 1;
-  int fullscreen = 0, hud = 0, width = 720, height = 576;
+  int fullscreen = 0, hud = 0, xpos = 0, ypos = 0, width = 720, height = 576;
   int scale_video = 1, aspect = 1;
   int daemon_mode = 0, nokbd = 0, noxkbd = 0, slave_mode = 0;
   char *video_port = NULL;
@@ -549,6 +551,9 @@
     case 'w': width = atoi(optarg);
               PRINTF("Width: %d\n", width);
               break;
+    case 'g': sscanf (optarg, "%dx%d+%d+%d", &width, &height, &xpos, &ypos);
+              PRINTF("Geometry: %dx%d+%d+%d\n", width, height, xpos, ypos);
+              break;
     case 'h': height = atoi(optarg);
               PRINTF("Height: %d\n", height);
               break;
@@ -702,7 +707,7 @@
   }
 
   /* Initialize display */
-  if (!fe->fe_display_open(fe, 0, 0, width, height, fullscreen, hud, 0,
+  if (!fe->fe_display_open(fe, xpos, ypos, width, height, fullscreen, hud, 0,
                            "", aspect, NULL, noxkbd, gui_hotkeys,
                            video_port, scale_video, 0,
                            aspect_controller, window_id)) {