Mercurial > mplayer.hg

changeset 33465:b0430e293333

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Take notice of MPlayer option '-display'. If option '-display' is given, initialize GTK in a way that the GUI will run on that display.
author ib
date Fri, 03 Jun 2011 15:15:19 +0000
parents 2a25b5db0e7e
children 45d8bfbd27bc
files gui/mplayer/widgets.c
diffstat 1 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gui/mplayer/widgets.c	Fri Jun 03 14:35:44 2011 +0000
+++ b/gui/mplayer/widgets.c	Fri Jun 03 15:15:19 2011 +0000
@@ -35,6 +35,7 @@
 #include "config.h"
 #include "help_mp.h"
 #include "mp_msg.h"
+#include "libvo/x11_common.h"
 
 #include "widgets.h"
 #include "gui/app.h"
@@ -74,11 +75,22 @@
 
 void gtkInit( void )
 {
+ int argc = 0;
+ char *arg[3], **argv = arg;
+
+ arg[argc++] = "gmplayer";
+
+ if (mDisplayName)                 // MPlayer option '-display' was given
+ {
+   arg[argc++] = "--display";      // Pass corresponding command line arguments to GTK,
+   arg[argc++] = mDisplayName;     // to open the requested display for the GUI, too.
+ }
+
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init GTK ...\n" );
 #ifdef CONFIG_GTK2
  gtk_disable_setlocale();
 #endif
- gtk_init( 0,NULL );
+ gtk_init( &argc, &argv );
 // gdk_set_use_xshm( TRUE );
 
  {