X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/snom-frontend/blobdiff_plain/73968c99ffcdda340c8557341f587085031cbf39..5e67f822bc7021baa1e7e39ccb634d31e31fc9a3:/snom.pl diff --git a/snom.pl b/snom.pl index 220c9d9..1682938 100755 --- a/snom.pl +++ b/snom.pl @@ -1,7 +1,5 @@ #!/bin/sh -#$Id: snom.pl,v 1.28 2006-05-22 11:22:30 michael Exp $ - -# http://developer.gnome.org/doc/API/2.2/gtk/gtk-migrating-GtkComboBox.html +#$Id: snom.pl,v 1.44 2006-05-24 14:31:16 michael Exp $ PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@" @@ -16,7 +14,9 @@ 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; open(INIFILE,"<$ENV{HOME}/.snomrc") || die("can't open config: $ENV{HOME}/.snomrc: $!"); @@ -55,7 +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); set_locale Gtk2; @@ -87,7 +88,12 @@ sub gen_table { my $n = 0; foreach my $key (@$keys) { if ($key ne '_') { - $g_key{$key} = Gtk2::Button->new("${key}"); + if($key=~m/^ARROWS(.*)$/) { + $g_key{$key} = Gtk2::Button->new; + $g_key{$key}->add($g_arrows{"${1}"}); + } else { + $g_key{$key} = Gtk2::Button->new("${key}"); + } $g_key{$key}->signal_connect(clicked => \&KeyPressed, $key); $table->attach_defaults($g_key{$key}, (($n)%$cols), (($n)%$cols)+1, int(($n)/$cols), int((($n)/$cols)+1)); $g_key{$key}->show(); @@ -119,8 +125,17 @@ 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, - ['_', '_', '^', '_', '_', 'X', '<', '_', '>', 'OK', '_', '_', 'V', '_', '_']); + ['_', '_', 'ARROWSup', '_', '_', 'X', 'ARROWSleft', '_', 'ARROWSright', 'OK', '_', '_', 'ARROWSdown', '_', '_']); my $output = gen_table(2, 3, FALSE, 2, 2, ['-', '+', '_', '_Mute', '_Speaker', '_Headset']); @@ -145,6 +160,7 @@ $outbox->pack_end($output, 0, 0, 0); $outbox->show(); my $specialbox = Gtk2::VBox->new(0, 0); +$specialbox->pack_start($g_identity, 0, 0, 0); $specialbox->pack_end($special, 0, 0, 0); $specialbox->show(); @@ -217,10 +233,10 @@ sub KeyPressed snom_key("CANCEL") if ( $text eq "X" ); snom_key("ENTER") if ( $text eq "OK" ); - snom_key("UP") if ( $text eq "^" ); - snom_key("DOWN") if ( $text eq "V" ); - snom_key("LEFT") if ( $text eq "<" ); - snom_key("RIGHT") if ( $text eq ">" ); + snom_key("UP") if ( $text eq "ARROWSup" ); + snom_key("DOWN") if ( $text eq "ARROWSdown" ); + snom_key("LEFT") if ( $text eq "ARROWSleft" ); + snom_key("RIGHT") if ( $text eq "ARROWSright" ); snom_key("F_REC") if ( $text eq "Record" ); snom_key("F_RETRIEVE") if ( $text eq "Retrieve" ); @@ -272,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;} @@ -325,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}"); @@ -348,7 +364,39 @@ sub KBDInput sub UpdatePhoneInfo { - print "TODO: Update PhoneInfo from <".${$Config{$sections[$g_host->get_active]}}{host}."> here!\n"; + my $req = HTTP::Request->new(GET => "http://".${$Config{$sections[$g_host->get_active]}}{host}."/"); + my $response = $ua->request($req); + + $g_identity->set_active(0); + while($g_identity->get_active() == 0) { + $g_identity->remove_text(0); + $g_identity->set_active(0); + } + my @lines=split("\n", $response->content()); + my $num = 0; + foreach (@lines) { + chomp; + # + # + # + if (m/^\