put arrow instanciation where it belongs

diff --git a/snom.pl b/snom.pl
index 8812102bf552d284717b5456edecf91e1820d268..9dcd53613373dc52575f568103fb255a0c297317 100755 (executable)
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-#$Id: snom.pl,v 1.41 2006-05-22 13:03:12 michael Exp $
+#$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" "$@"
 
 
 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 = ();
 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;
 my $g_host = Gtk2::ComboBox->new_text();
 my $g_identity = Gtk2::ComboBox->new_text();
 my $ua = LWP::UserAgent->new;


@@ -73,16 +74,6 @@ sub snom_number {
        $ua->request($req);
 }
 
        $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;
 sub gen_table {
        my $rows = shift;
        my $cols = shift;


@@ -100,7 +91,7 @@ sub gen_table {
                if ($key ne '_') {
                        if($key=~m/^ARROWS(.*)$/) {
                                $g_key{$key} = Gtk2::Button->new;
                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}");
                        }
                        } else {
                                $g_key{$key} = Gtk2::Button->new("${key}");
                        }


@@ -135,6 +126,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']);
 
 
 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', '_', '_']);
 
 my $navi = gen_table(3, 5, FALSE, 0, 0,
        ['_', '_', 'ARROWSup', '_', '_', 'X', 'ARROWSleft', '_', 'ARROWSright', 'OK', '_', '_', 'ARROWSdown', '_', '_']);