X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/snom-frontend/blobdiff_plain/6ee33adce14e5f5c060a84d755ac770e2771c55a..1b60460160078c2ba512f958fdd74ca7f2c18fdf:/snom.pl
diff --git a/snom.pl b/snom.pl
index 8812102..645a68e 100755
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,5 @@
#!/bin/sh
-#$Id: snom.pl,v 1.41 2006-05-22 13:03:12 michael Exp $
+#$Id: snom.pl,v 1.45 2007-06-23 11:29:58 michael Exp $
PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@"
@@ -14,6 +14,7 @@ use Gtk2::Gdk::Keysyms;
use LWP::UserAgent;
my %g_key = ();
+my %g_arrows;
my $g_host = Gtk2::ComboBox->new_text();
my $g_identity = Gtk2::ComboBox->new_text();
my $ua = LWP::UserAgent->new;
@@ -54,9 +55,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;
@@ -73,16 +73,6 @@ sub snom_number {
$ua->request($req);
}
-my %arrows;
-$arrows{up} = Gtk2::Arrow->new('up', 'none');
-$arrows{up}->show();
-$arrows{down} = Gtk2::Arrow->new('down', 'none');
-$arrows{down}->show();
-$arrows{left} = Gtk2::Arrow->new('left', 'none');
-$arrows{left}->show();
-$arrows{right} = Gtk2::Arrow->new('right', 'none');
-$arrows{right}->show();
-
sub gen_table {
my $rows = shift;
my $cols = shift;
@@ -100,7 +90,7 @@ sub gen_table {
if ($key ne '_') {
if($key=~m/^ARROWS(.*)$/) {
$g_key{$key} = Gtk2::Button->new;
- $g_key{$key}->add($arrows{"${1}"});
+ $g_key{$key}->add($g_arrows{"${1}"});
} else {
$g_key{$key} = Gtk2::Button->new("${key}");
}
@@ -135,6 +125,15 @@ my $pkeys = gen_table(6, 2, TRUE, 2, 2, ['P1', 'P7', 'P2', 'P8', 'P3', 'P9', 'P4
my $softkeys = gen_table(1, 4, FALSE, 0, 6, ['F1', 'F2', 'F3', 'F4']);
+$g_arrows{up} = Gtk2::Arrow->new('up', 'none');
+$g_arrows{up}->show();
+$g_arrows{down} = Gtk2::Arrow->new('down', 'none');
+$g_arrows{down}->show();
+$g_arrows{left} = Gtk2::Arrow->new('left', 'none');
+$g_arrows{left}->show();
+$g_arrows{right} = Gtk2::Arrow->new('right', 'none');
+$g_arrows{right}->show();
+
my $navi = gen_table(3, 5, FALSE, 0, 0,
['_', '_', 'ARROWSup', '_', '_', 'X', 'ARROWSleft', '_', 'ARROWSright', 'OK', '_', '_', 'ARROWSdown', '_', '_']);
@@ -289,7 +288,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 +341,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}");
@@ -374,17 +373,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/^\