[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.193,1.194 mplayer.c,1.673,1.674

[Filip Kalinski CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv18086

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
- help (-fstype help) also availabible
- support state BELOW (someone may want to use it...) and by -fstype none forcing of
   not changing window layer (user request)
- drop icelayer option, it can be set by -fstype layer=<number>
- simplify vo_x11_fullscreen
- fs change code cleanup


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- cfg-mplayer.h	7 Feb 2003 18:05:38 -0000	1.193
+++ cfg-mplayer.h	7 Feb 2003 19:38:37 -0000	1.194
@@ -80,9 +80,10 @@
 #ifdef HAVE_X11
 extern char *mDisplayName;
 extern int WinID;
-extern int ice_layer;
+extern int fs_layer;
 extern int stop_xscreensaver;
 extern int vo_x11_keepaspect;
+extern char **vo_fstype_list;
 #endif
 
 #ifdef HAVE_AA
@@ -274,6 +275,7 @@
 	// start in fullscreen mode:
 	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 	// set fullscreen switch method (workaround for buggy WMs)
 	{"fsmode", "option 'fsmode' is obsolete, avoid using it! if you really want it, try -fsmode-dontuse, but don't report bugs with this option used!", CONF_TYPE_PRINT, CONF_RANGE, 0, 31, NULL},
 	{"fsmode-dontuse", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
@@ -294,7 +296,7 @@
 	// x11,xv,xmga,xvidix
 	{"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL},
-	{"icelayer", &ice_layer, CONF_TYPE_INT, CONF_RANGE, 0, 15, NULL},
+	{"icelayer", "Use -fstype layer:<number> instead. -icelayer was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"stop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nostop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"keepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL},

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.673
retrieving revision 1.674
diff -u -r1.673 -r1.674
--- mplayer.c	7 Feb 2003 18:09:29 -0000	1.673
+++ mplayer.c	7 Feb 2003 19:38:37 -0000	1.674
@@ -835,6 +835,11 @@
       printf("\n");
       exit(0);
     }
+    if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){
+      fstype_help();
+      printf("\n");
+      exit(0);
+    }
 
 #ifdef USE_EDL
  {