From 220e773657240e8c36b1ae70be8665aebb923b1d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 30 Jun 2017 11:41:57 +0200 Subject: rename: bin/forkedmmoverlay.pl -> bin/arctica-browser-overlay --- bin/arctica-browser-overlay | 203 +++++++++++++++++++++++++++++++++ bin/forkedmmoverlay.pl | 203 --------------------------------- debian/arctica-browser-overlay.install | 3 +- 3 files changed, 204 insertions(+), 205 deletions(-) create mode 100755 bin/arctica-browser-overlay delete mode 100755 bin/forkedmmoverlay.pl diff --git a/bin/arctica-browser-overlay b/bin/arctica-browser-overlay new file mode 100755 index 0000000..038ed92 --- /dev/null +++ b/bin/arctica-browser-overlay @@ -0,0 +1,203 @@ +#!/usr/bin/perl -X -T + +################################################################################ +# _____ _ +# |_ _| |_ ___ +# | | | ' \/ -_) +# |_| |_||_\___| +# _ _ ____ _ _ +# / \ _ __ ___| |_(_) ___ __ _ | _ \ _ __ ___ (_) ___ ___| |_ +# / _ \ | '__/ __| __| |/ __/ _` | | |_) | '__/ _ \| |/ _ \/ __| __| +# / ___ \| | | (__| |_| | (_| (_| | | __/| | | (_) | | __/ (__| |_ +# /_/ \_\_| \___|\__|_|\___\__,_| |_| |_| \___// |\___|\___|\__| +# |__/ +# The Arctica Modular Remote Computing Framework +# +################################################################################ +# +# Copyright (C) 2015-2016 The Arctica Project +# http://http://arctica-project.org/ +# +# This code is dual licensed: strictly GPL-2 or AGPL-3+ +# +# GPL-2 +# ----- +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# AGPL-3+ +# ------- +# This programm is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This programm is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2015-2016 Guangzhou Nianguan Electronics Technology Co.Ltd. +# +# Copyright (C) 2015-2016 Mike Gabriel +# +################################################################################ + +use strict; +use Data::Dumper; +use Arctica::Core::eventInit qw(genARandom BugOUT); +use Arctica::Core::JABus::Socket; +use POSIX qw(mkfifo); +use Gtk3 -init; +use Glib; +use Glib::Object::Introspection; +use Glib qw(TRUE FALSE); + +use Arctica::Browser::ToolBar; +use Arctica::Browser::WebView; +use Arctica::Browser::Proxy; + +Glib::Object::Introspection->setup( + basename => "GdkX11", + version => "3.0", + package => "Gtk3::Gdk"); + +my $proxy = Arctica::Browser::Proxy->new; + +my $gnx_xid = `/usr/bin/xwininfo -root -all|/bin/grep NXAgent`; +if ($gnx_xid =~ /^\s*(0x[0-9a-f]*)\s.*/) { + $gnx_xid = $1; +} else { + die; +} + + +my $lastcontact = (time + 5); + +my $ACO = Arctica::Core::eventInit->new({ + app_name=>'forked-overlay-test', + app_class =>'amoduletester', + app_version=>'0.0.1.1'}); + +my $app_id = @ARGV[0]; +my $ttid = @ARGV[1]; +my $sock_id; + +if (@ARGV[2] =~ /^([a-zA-Z0-9]*)$/) { + $sock_id = $1; + BugOUT(8,"SOC:\t$sock_id"); +} else {die("YOU SOCK!");} + + + + +my $TeKi = Arctica::Core::JABus::Socket->new($ACO,{ + type => "unix", + destination => "local", # FIX ME (change to remote!!!) + is_client => 1, + connect_to => $sock_id, + handle_in_dispatch => { + chtstate => sub {\&chtargetstate(@_)}, +# srvcneg => sub {$TeKiClient->c2s_service_neg(@_)}, +# appctrl => \&teki_client2s_appctrl, + }, + hooks => { + on_ready => sub {my_ready($app_id,$ttid);}, + on_client_errhup => sub {die("\tLOST CONN!\n");}, + }, +}); + +my $timeout = Glib::Timeout->add(100, sub { +#print "\tTime:\t",time,"\n\tLast:\t$lastcontact\n"; + if ($lastcontact < (time-2)) { + die("We're an orphan?"); + } + return 1; +}); + + +my $window = Gtk3::Window->new('popup'); +$window->set_default_size(80, 60); +$window->set_title('Browser'); +$window->signal_connect(destroy => sub { Gtk3->main_quit() }); + +my $toolbar = Arctica::Browser::ToolBar->new; +my $webview = Arctica::Browser::WebView->new($toolbar); + +my $vbox = Gtk3::Box->new( 'vertical', 0); +$vbox->set_border_width(0); +$vbox->pack_start($toolbar->return_toolbar,FALSE,FALSE,0); +$vbox->pack_start($webview->return_webview,TRUE,TRUE,0); +$window->add($vbox); + +$window->show_all(); +$window->unmap(); + +system("/usr/bin/xdotool","windowreparent",$window->get_window->get_xid,$gnx_xid); + + +$ACO->{'Glib'}{'MainLoop'}->run; + + +sub chtargetstate { + my $data = $_[0]; + $lastcontact = time(); + warn(Dumper($data)); + my $x = $data->{'apx'}; + my $y = $data->{'apy'}; +#warn("CH:\t$x,$y\t$data->{'w'} * $data->{'h'} [$data->{'alive'}]"); + + if ($data->{'w'} and $data->{'h'}) { + $window->resize($data->{'w'},$data->{'h'}); + + } + + if ((defined $x) and (defined $y)) { + $window->move($x,$y); + } + + + if ($data->{'visible'} eq 1) { + $window->map(); + } else { + $window->unmap(); + } +} + +sub my_ready { + BugOUT(8,"MY READY?"); + my $app_id = $_[0]; + my $ttid = $_[1]; + $TeKi->client_send('treg',{ + app_id => $app_id, + ttid => $ttid, + }); +} + +sub daemonize { + fork and exit; + POSIX::setsid(); + fork and exit; + umask 0; + chdir '/'; + close STDIN; + close STDOUT; + close STDERR; +} diff --git a/bin/forkedmmoverlay.pl b/bin/forkedmmoverlay.pl deleted file mode 100755 index 038ed92..0000000 --- a/bin/forkedmmoverlay.pl +++ /dev/null @@ -1,203 +0,0 @@ -#!/usr/bin/perl -X -T - -################################################################################ -# _____ _ -# |_ _| |_ ___ -# | | | ' \/ -_) -# |_| |_||_\___| -# _ _ ____ _ _ -# / \ _ __ ___| |_(_) ___ __ _ | _ \ _ __ ___ (_) ___ ___| |_ -# / _ \ | '__/ __| __| |/ __/ _` | | |_) | '__/ _ \| |/ _ \/ __| __| -# / ___ \| | | (__| |_| | (_| (_| | | __/| | | (_) | | __/ (__| |_ -# /_/ \_\_| \___|\__|_|\___\__,_| |_| |_| \___// |\___|\___|\__| -# |__/ -# The Arctica Modular Remote Computing Framework -# -################################################################################ -# -# Copyright (C) 2015-2016 The Arctica Project -# http://http://arctica-project.org/ -# -# This code is dual licensed: strictly GPL-2 or AGPL-3+ -# -# GPL-2 -# ----- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# AGPL-3+ -# ------- -# This programm is free software; you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This programm is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2015-2016 Guangzhou Nianguan Electronics Technology Co.Ltd. -# -# Copyright (C) 2015-2016 Mike Gabriel -# -################################################################################ - -use strict; -use Data::Dumper; -use Arctica::Core::eventInit qw(genARandom BugOUT); -use Arctica::Core::JABus::Socket; -use POSIX qw(mkfifo); -use Gtk3 -init; -use Glib; -use Glib::Object::Introspection; -use Glib qw(TRUE FALSE); - -use Arctica::Browser::ToolBar; -use Arctica::Browser::WebView; -use Arctica::Browser::Proxy; - -Glib::Object::Introspection->setup( - basename => "GdkX11", - version => "3.0", - package => "Gtk3::Gdk"); - -my $proxy = Arctica::Browser::Proxy->new; - -my $gnx_xid = `/usr/bin/xwininfo -root -all|/bin/grep NXAgent`; -if ($gnx_xid =~ /^\s*(0x[0-9a-f]*)\s.*/) { - $gnx_xid = $1; -} else { - die; -} - - -my $lastcontact = (time + 5); - -my $ACO = Arctica::Core::eventInit->new({ - app_name=>'forked-overlay-test', - app_class =>'amoduletester', - app_version=>'0.0.1.1'}); - -my $app_id = @ARGV[0]; -my $ttid = @ARGV[1]; -my $sock_id; - -if (@ARGV[2] =~ /^([a-zA-Z0-9]*)$/) { - $sock_id = $1; - BugOUT(8,"SOC:\t$sock_id"); -} else {die("YOU SOCK!");} - - - - -my $TeKi = Arctica::Core::JABus::Socket->new($ACO,{ - type => "unix", - destination => "local", # FIX ME (change to remote!!!) - is_client => 1, - connect_to => $sock_id, - handle_in_dispatch => { - chtstate => sub {\&chtargetstate(@_)}, -# srvcneg => sub {$TeKiClient->c2s_service_neg(@_)}, -# appctrl => \&teki_client2s_appctrl, - }, - hooks => { - on_ready => sub {my_ready($app_id,$ttid);}, - on_client_errhup => sub {die("\tLOST CONN!\n");}, - }, -}); - -my $timeout = Glib::Timeout->add(100, sub { -#print "\tTime:\t",time,"\n\tLast:\t$lastcontact\n"; - if ($lastcontact < (time-2)) { - die("We're an orphan?"); - } - return 1; -}); - - -my $window = Gtk3::Window->new('popup'); -$window->set_default_size(80, 60); -$window->set_title('Browser'); -$window->signal_connect(destroy => sub { Gtk3->main_quit() }); - -my $toolbar = Arctica::Browser::ToolBar->new; -my $webview = Arctica::Browser::WebView->new($toolbar); - -my $vbox = Gtk3::Box->new( 'vertical', 0); -$vbox->set_border_width(0); -$vbox->pack_start($toolbar->return_toolbar,FALSE,FALSE,0); -$vbox->pack_start($webview->return_webview,TRUE,TRUE,0); -$window->add($vbox); - -$window->show_all(); -$window->unmap(); - -system("/usr/bin/xdotool","windowreparent",$window->get_window->get_xid,$gnx_xid); - - -$ACO->{'Glib'}{'MainLoop'}->run; - - -sub chtargetstate { - my $data = $_[0]; - $lastcontact = time(); - warn(Dumper($data)); - my $x = $data->{'apx'}; - my $y = $data->{'apy'}; -#warn("CH:\t$x,$y\t$data->{'w'} * $data->{'h'} [$data->{'alive'}]"); - - if ($data->{'w'} and $data->{'h'}) { - $window->resize($data->{'w'},$data->{'h'}); - - } - - if ((defined $x) and (defined $y)) { - $window->move($x,$y); - } - - - if ($data->{'visible'} eq 1) { - $window->map(); - } else { - $window->unmap(); - } -} - -sub my_ready { - BugOUT(8,"MY READY?"); - my $app_id = $_[0]; - my $ttid = $_[1]; - $TeKi->client_send('treg',{ - app_id => $app_id, - ttid => $ttid, - }); -} - -sub daemonize { - fork and exit; - POSIX::setsid(); - fork and exit; - umask 0; - chdir '/'; - close STDIN; - close STDOUT; - close STDERR; -} diff --git a/debian/arctica-browser-overlay.install b/debian/arctica-browser-overlay.install index 0077164..7530b62 100644 --- a/debian/arctica-browser-overlay.install +++ b/debian/arctica-browser-overlay.install @@ -1,2 +1 @@ -# FIXME: this is far from suboptimal... -bin/forkedmmoverlay.pl usr/bin/ +bin/arctica-browser-overlay usr/bin/ -- cgit v1.2.3