X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/snom-frontend/blobdiff_plain/2c2eba100d0708fffdcce8cf1c15e327d599c3e0..2b127e29cae4de25b8fb79f05e0ef3d29df2538c:/snom.pl
diff --git a/snom.pl b/snom.pl
index 9dcd536..608e62f 100755
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,4 @@
#!/bin/sh
-#$Id: snom.pl,v 1.42 2006-05-22 13:06:47 michael Exp $
PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@"
@@ -12,11 +11,14 @@ use Glib qw/TRUE FALSE/;
use Gtk2 '-init';
use Gtk2::Gdk::Keysyms;
use LWP::UserAgent;
+use FindBin qw($Bin);
+
my %g_key = ();
my %g_arrows;
my $g_host = Gtk2::ComboBox->new_text();
my $g_identity = Gtk2::ComboBox->new_text();
+my $cbextern = Gtk2::CheckButton->new("extern");
my $ua = LWP::UserAgent->new;
open(INIFILE,"<$ENV{HOME}/.snomrc") || die("can't open config: $ENV{HOME}/.snomrc: $!");
@@ -55,9 +57,8 @@ for my $section (@sections) {
$g_host->set_active(0);
UpdatePhoneInfo();
$g_host->signal_connect(changed => \&UpdatePhoneInfo);
-$g_host->show();
+$g_host->show() if($#sections);
$g_identity->signal_connect(changed => \&SwitchIdentity);
-$g_identity->show();
set_locale Gtk2;
@@ -70,6 +71,7 @@ sub snom_key {
sub snom_number {
my $number = shift;
+ $number =~ s/[^\d]//g;
my $req = HTTP::Request->new(GET => "http://".${$Config{$sections[$g_host->get_active]}}{host}."/command.htm?number=${number}");
$ua->request($req);
}
@@ -149,8 +151,13 @@ $display->signal_connect(enter_notify_event => \&DisplayMouseOver, TRUE);
$display->signal_connect(leave_notify_event => \&DisplayMouseOver, FALSE);
$display->show();
+my $dialbox = Gtk2::HBox->new(0, 30);
+$dialbox->pack_start($display, 0, 0, 0);
+$dialbox->pack_start($cbextern, 0, 0, 0);
+$dialbox->show();
+
my $dispbox = Gtk2::VBox->new(0, 5);
-$dispbox->pack_start($display, 0, 0, 0);
+$dispbox->pack_start($dialbox, 0, 0, 0);
$dispbox->pack_start($softkeys, 0, 0, 0);
$dispbox->pack_start($navi, 0, 0, 0);
$dispbox->show();
@@ -191,7 +198,57 @@ $mainbox->pack_start($ubox, 0, 0, 0);
$mainbox->pack_start($lbox, 0, 0, 0);
$mainbox->show();
+
+
+#########################################################
+#
+# Tray Icon
+#
+#########################################################
+sub quit_cb {
+ my ($widget, $status_icon) = @_;
+
+ $status_icon->set_visible(0) if $status_icon;
+ Gtk2->main_quit();
+}
+
+sub popup_menu_cb {
+ my ($widget, $button, $time, $menu) = @_;
+
+ if ($button == 3) {
+ my ($x, $y, $push_in)
+ = Gtk2::StatusIcon::position_menu($menu, $widget);
+
+ $menu->show_all();
+ $menu->popup( undef, undef,
+ sub{return ($x,$y,0)} ,
+ undef, 0, $time );
+ }
+}
+
+sub activate_icon_cb {
+ if ($window->visible){
+ $window->hide();
+ } else {
+ $window->show();
+ }
+}
+
+my $status_icon = Gtk2::StatusIcon->new_from_file($Bin.'/snom.ico');
+my $menu = Gtk2::Menu->new();
+
+my $menuItem = Gtk2::ImageMenuItem->new_from_stock('gtk-quit');
+$menuItem->signal_connect('activate', \&quit_cb, $status_icon);
+$menu->append($menuItem);
+
+$status_icon->set_tooltip('Snom Tray');
+$status_icon->signal_connect('activate', \&activate_icon_cb);
+$status_icon->signal_connect('popup-menu', \&popup_menu_cb, $menu);
+$status_icon->set_visible(1);
+########################################################################333
+
$window->add($mainbox);
+$window->set_icon_from_file($Bin.'/snom.ico');
$window->show();
$g_key{OK}->grab_focus();
@@ -250,8 +307,13 @@ sub KeyPressed
sub DialNumber
{
my ($entry) = @_;
+ my ($num) = $entry->get_text();
+
+ if ($cbextern->get_active && defined(${$Config{$sections[$g_host->get_active]}}{extern})) {
+ $num = ${$Config{$sections[$g_host->get_active]}}{extern} . $num;
+ }
- snom_number($entry->get_text());
+ snom_number($num);
return TRUE;
}
@@ -289,7 +351,7 @@ sub KBDInput
}
}
- if (!$event->state || $event->state eq 'shift-mask') {
+ if (!$event->state || !($event->state & "control-mask" || $event->state & "mod1-mask")) {
if ($keyval == $Gtk2::Gdk::Keysyms{asterisk}) {snom_key('*'); return TRUE;}
if ($keyval == $Gtk2::Gdk::Keysyms{KP_Multiply}) {snom_key('*'); return TRUE;}
if ($keyval == $Gtk2::Gdk::Keysyms{numbersign}) {snom_key('#'); return TRUE;}
@@ -342,7 +404,7 @@ sub KBDInput
}
}
} else {
- if ($event->state eq 'mod1-mask') {
+ if ($event->state & "mod1-mask") {
for (my $i=1; $i<13; $i++) {
if ($keyval == $Gtk2::Gdk::Keysyms{"F${i}"}) {
snom_key("P${i}");
@@ -365,6 +427,12 @@ sub KBDInput
sub UpdatePhoneInfo
{
+ if (defined(${$Config{$sections[$g_host->get_active]}}{extern})) {
+ $cbextern->show();
+ } else {
+ $cbextern->hide();
+ }
+
my $req = HTTP::Request->new(GET => "http://".${$Config{$sections[$g_host->get_active]}}{host}."/");
my $response = $ua->request($req);
@@ -374,17 +442,30 @@ sub UpdatePhoneInfo
$g_identity->set_active(0);
}
my @lines=split("\n", $response->content());
+ my $num = 0;
+ my $activated = 0;
+
foreach (@lines) {
chomp;
#
#
#
- if (m/^\