unify table-generation

diff --git a/snom.pl b/snom.pl
index 67356844c575d96a21a18b6593aeb606f5773945..67cb29283bb9401e8e8a6a62d22835509a0f041a 100755 (executable)
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: snom.pl,v 1.11 2006-05-21 21:20:19 michael Exp $
+#$Id: snom.pl,v 1.12 2006-05-21 21:58:09 michael Exp $
 
 PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@"
 
@@ -13,22 +13,51 @@ use strict;
 use LWP::UserAgent;
 my $ua = LWP::UserAgent->new;
 #$ua->credentials("${ARGV[0]}:80","snom","root","geheim");
+my %g_key = ();
 
 set_locale Gtk2;
 
-sub snom_key(@) {
-       (my $key) = @_;
+sub snom_key {
+       my $key = shift;
        $key='%23' if ($key eq '#');
        my $req = HTTP::Request->new(GET => "http://${ARGV[0]}/command.htm?key=${key}");
        $ua->request($req);
 }
 
-sub snom_number(@) {
-       (my $number) = @_;
+sub snom_number {
+       my $number = shift;
        my $req = HTTP::Request->new(GET => "http://${ARGV[0]}/command.htm?number=${number}");
        $ua->request($req);
 }
 
+sub gen_table {
+       my $rows = shift;
+       my $cols = shift;
+       my $homogeneous = shift;
+       my $row_spacing = shift;
+       my $col_spacing = shift;
+       my $keys = shift;
+
+       my $table = Gtk2::Table->new($rows, $cols, $homogeneous);
+       $table->set_row_spacings($row_spacing);
+       $table->set_col_spacings($col_spacing);
+
+       my $n = 0;
+       foreach my $key (@$keys) {
+               if ($key ne '_') {
+                       $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();
+               }
+               $n++;
+       }
+
+       $table->show();
+
+       $table;
+}
+
 if (!defined($ARGV[0])) {
        print STDERR "Usage: ${0} snom.phone.address\n";
        exit 1
@@ -42,99 +71,23 @@ my $kphandler = $window->signal_connect(key_press_event => \&KBDInput);
 $window->set_border_width(15);
 $window->set_resizable(FALSE);
 
-my $keypad = Gtk2::Table->new(4, 3, 1);
-$keypad->set_row_spacings(2);
-$keypad->set_col_spacings(2);
-my %key = ();
-my $n = 0;
-foreach my $i (1, 2, 3, 4, 5, 6, 7, 8, 9, '*', 0, '#') {
-       $key{$i} = Gtk2::Button->new("  ${i}  ");
-       $key{$i}->signal_connect(clicked => \&KeyPressed, $i);
-       $keypad->attach_defaults($key{$i}, (($n)%3), (($n)%3)+1, int(($n)/3), int((($n)/3)+1));
-       $key{$i}->show();
-       $n++;
-}
-$keypad->show();
-
-my $fkeys = Gtk2::Table->new(6, 2, 1);
-$fkeys->set_row_spacings(2);
-$fkeys->set_col_spacings(2);
-$n = 0;
-foreach my $i qw(_Redial S_ettings Director_y Hel_p Men_u snom _ _ _Conference _Transfer H_old _DND) {
-       if ($i ne '_') {
-               $key{$i} = Gtk2::Button->new("${i}");
-               $key{$i}->signal_connect(clicked => \&KeyPressed, $i);
-               $fkeys->attach_defaults($key{$i}, (($n)%2), (($n)%2)+1, int(($n)/2), int((($n)/2)+1));
-               $key{$i}->show();
-       }
-       $n++;
-}
-$fkeys->show();
-
-my $pkeys = Gtk2::Table->new(6, 2, 1);
-$pkeys->set_row_spacings(2);
-$pkeys->set_col_spacings(2);
-$n = 0;
-foreach my $i qw(P7 P1 P8 P2 P9 P3 P10 P4 P11 P5 P12 P6) {
-       $key{$i} = Gtk2::Button->new("${i}");
-       $key{$i}->signal_connect(clicked => \&KeyPressed, $i);
-       $pkeys->attach_defaults($key{$i}, (($n+1)%2), (($n+1)%2)+1, int($n/2), int($n/2)+1);
-       $key{$i}->show();
-       $n++;
-}
-$pkeys->show();
-
-my $softkeys = Gtk2::Table->new(1, 4);
-$softkeys->set_col_spacings(6);
-$n = 0;
-foreach my $i qw(F1 F2 F3 F4) {
-       $key{$i} = Gtk2::Button->new("${i}");
-       $key{$i}->signal_connect(clicked => \&KeyPressed, $i);
-       $softkeys->attach_defaults($key{$i}, $n, $n+1, 0, 1);
-       $key{$i}->show();
-       $n++;
-}
-$softkeys->show();
-
-my $navi = Gtk2::Table->new(3, 5);
-$n = 0;
-foreach my $i qw(_ _ ^ _  _ X < _ > OK _ _ V _ _) {
-       if ( $i ne '_' ) {
-               $key{$i} = Gtk2::Button->new("${i}");
-               $key{$i}->signal_connect(clicked => \&KeyPressed, $i);
-               $navi->attach_defaults($key{$i}, (($n)%5), (($n)%5)+1, int(($n)/5), int((($n)/5)+1));
-               $key{$i}->show();
-       }
-       $n++;
-}
-$navi->show();
-
-my $output = Gtk2::Table->new(2, 3);
-$output->set_row_spacings(2);
-$output->set_col_spacings(2);
-$n = 0;
-foreach my $i qw(- + _ _Mute _Speaker _Headset) {
-       if ( $i ne '_' ) {
-               $key{$i} = Gtk2::Button->new("${i}");
-               $key{$i}->signal_connect(clicked => \&KeyPressed, $i);
-               $output->attach_defaults($key{$i}, (($n)%3), (($n)%3)+1, int(($n)/3), int((($n)/3)+1));
-               $key{$i}->show();
-       }
-       $n++;
-}
-$output->show();
-
-my $special= Gtk2::Table->new(1, 2);
-$special->set_col_spacings(2);
-$n = 0;
-foreach my $i qw(Record Retrieve) {
-       $key{$i} = Gtk2::Button->new("${i}");
-       $key{$i}->signal_connect(clicked => \&KeyPressed, $i);
-       $special->attach_defaults($key{$i}, $n, $n+1, 0, 1);
-       $key{$i}->show();
-       $n++;
-}
-$special->show();
+my $keypad = gen_table(4, 3, TRUE, 2, 2, [1, 2, 3, 4, 5, 6, 7, 8, 9, '*', 0, '#']);
+
+my $fkeys = gen_table(6, 2, TRUE, 2, 2, 
+       ['_Redial', 'S_ettings', 'Director_y', 'Hel_p', 'Men_u', 'snom', '_', '_',
+       '_Conference', '_Transfer', 'H_old', '_DND']);
+
+my $pkeys = gen_table(6, 2, TRUE, 2, 2, ['P1', 'P7', 'P2', 'P8', 'P3', 'P9', 'P4',
+       'P10', 'P5', 'P11', 'P6', 'P12']);
+
+my $softkeys = gen_table(1, 4, FALSE, 0, 6, ['F1', 'F2', 'F3', 'F4']);
+
+my $navi = gen_table(3, 5, FALSE, 0, 0,
+       ['_', '_', '^', '_', '_', 'X', '<', '_', '>', 'OK', '_', '_', 'V', '_', '_']);
+
+my $output = gen_table(2, 3, FALSE, 2, 2, ['-', '+', '_', '_Mute', '_Speaker', '_Headset']);
+
+my $special = gen_table(1, 2, FALSE, 0, 2, ['Record', 'Retrieve']);
 
 my $display = Gtk2::Entry->new();
 $display->signal_connect(activate => \&DialNumber);
@@ -186,7 +139,7 @@ $mainbox->show();
 $window->add($mainbox);
 $window->show();
 
-$key{OK}->grab_focus();
+$g_key{OK}->grab_focus();
 
 # Gtk2 event loop
 Gtk2->main;
@@ -258,7 +211,7 @@ sub DisplayMouseOver
                        $kph_blocked=TRUE;
                }
        } else {
-               $key{OK}->grab_focus();
+               $g_key{OK}->grab_focus();
                if ($kph_blocked) {
                        $window->signal_handler_unblock($kphandler);
                        $kph_blocked=FALSE;