This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository mteleplayer. from 0be5174 LANG=C -> ensure that we talk to mplayer in English new 976fe97 Embedded overlay test... The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .../mteleplayer/bin/mteleplayer_clientside | 42 +++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository mteleplayer. commit 976fe97d8cd880e187056fffe7aeb0f36289978b Author: gznget <opensource@gznianguan.com> Date: Tue Sep 2 06:56:01 2014 +0200 Embedded overlay test... --- .../mteleplayer/bin/mteleplayer_clientside | 42 +++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside index 60d5a13..c039e5c 100755 --- a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside +++ b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside @@ -167,8 +167,29 @@ $vbox->set_border_width(0); $window->set_decorated(0); $window->set_keep_above(1); $window->signal_connect(event => \&windowEvent); +$window->set_focus_on_map(FALSE); +$window->set_accept_focus(FALSE); $window->show_all(); +my $X2GoCliWin; +my $X2GoCliWinID; +my $mTPWin; + if (-f "$X2GoSesHome/session.window") { + open(SWXID,"$X2GoSesHome/session.window"); + my ($tmpSwXid,undef) = <SWXID>; + close(SWXID); + if ($tmpSwXid =~ /ID:(\d*)/) { + dbugPrint("session.window file OK ($1)"); + my $gdkwin = $window->window; + my $ourXid= $gdkwin->XWINDOW; + $mTPWin = Gtk2::Gdk::Window->foreign_new($ourXid); + $X2GoCliWin = Gtk2::Gdk::Window->foreign_new($1); + $X2GoCliWinID = $1; + $mTPWin->reparent($X2GoCliWin,0,0); + $mTPWin->set_accept_focus(0); + } + } + &do_mplayer; doOverlayMagic('init'); @@ -261,7 +282,8 @@ sub handleTheLocalSocket { $sstatusi{'lastCOMtime'} = time(); if ($1 =~ /^HELLO/) { $sstatusi{'sockState'} = 3; - print $LocalSocket "CORE|LOCALSERVICES|mteleplayer|$selfSID|StateOfX2GoCliWin|\n"; +# print $LocalSocket "CORE|LOCALSERVICES|mteleplayer|$selfSID|StateOfX2GoCliWin|\n"; + doOverlayMagic('csseswin',1,1,0,0,0,0); } elsif ($1 =~ /^TERMINATE/) { doSelfTerminate(); } @@ -331,7 +353,7 @@ sub handleTheLocalSocket { } } elsif ($saneData =~ /^CORE\|SERVICES\|X2GOWINDOWSTATE\|(\d)\|(\d)\|(\-?\d*)\|(\-?\d*)\|(\d*)\|(\d*)\|/) { - doOverlayMagic('csseswin',$1,$2,$3,$4,$5,$6); +# doOverlayMagic('csseswin',$1,$2,$3,$4,$5,$6); } elsif ($saneData =~ /^TERMINATE\|([\w\_]*)\|$/) { my $vmessage; if ($1 =~ /NO_PAIR1/) { @@ -676,14 +698,14 @@ appDBugLog("WTF:$olMagic{'CsSesWin_FS'} ne $_[1]"); $window->hide_all; } } else { - if ($reTogVis eq 1) { - if ($window->visible) { - $window->hide_all; - } - } - if ($olMagic{'CsSesWin_FS'} eq 1) { - usleep(1000000); - } +# if ($reTogVis eq 1) { +# if ($window->visible) { +# $window->hide_all; +# } +# } +# if ($olMagic{'CsSesWin_FS'} eq 1) { +# usleep(1000000); +# } unless ($window->visible) { $window->move($olMagic{'overlay_X'},$olMagic{'overlay_Y'}); $window->resize($olMagic{'SsAppWin_Wdt'},$olMagic{'SsAppWin_Hgt'}); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git
-
git-admin＠x2go.org