X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/snom-frontend/blobdiff_plain/76d5a918f8cd6d9b7880503e12e712613bf90645..b4c10db9bc70e920a92cff57002c06cfa4d2daa2:/snom.pl

diff --git a/snom.pl b/snom.pl
index 97b8e99..93b1eee 100755
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,4 @@
 #!/bin/sh
-#$Id: snom.pl,v 1.43 2006-05-23 19:14:09 michael Exp $
 
 PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@"
 
@@ -12,6 +11,8 @@ 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;
@@ -69,6 +70,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);
 }
@@ -148,8 +150,16 @@ $display->signal_connect(enter_notify_event => \&DisplayMouseOver, TRUE);
 $display->signal_connect(leave_notify_event => \&DisplayMouseOver, FALSE);
 $display->show();
 
+my $cbextern = Gtk2::CheckButton->new("extern");
+$cbextern->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();
@@ -190,7 +200,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();
@@ -249,8 +309,12 @@ sub KeyPressed
 sub DialNumber
 {
 	my ($entry) = @_;
-
-	snom_number($entry->get_text());
+	my ($num) = $entry->get_text();
+	if ($cbextern->get_active){
+	 snom_number("09".$num)
+	} else {
+	 snom_number($num);
+	}	
 	return TRUE;
 }
 
@@ -288,7 +352,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;}
@@ -341,7 +405,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,18 +438,24 @@ sub UpdatePhoneInfo
 	}
 	my @lines=split("\n", $response->content());
 	my $num = 0;
+	my $activated = 0;
+
 	foreach (@lines) {
 		chomp;
 		#<option value="1" selected>51@stargate.gernoth.loc</option>
 		#<option value="2">89@asterix.ear-projekt.de</option>
 		#<option value="3">41@grumpy.gernoth.loc</option>
-		if (m/^\<option value=\"(.+)\"( selected)?\>([^<\@]*)\@([^<]*)\<\/option\>$/) {
+		if (m/^\<option value=\"(.+)\"( selected)?\>([^<\@]*)\@([^<]*)\<\/option\>\s*$/) {
 			my $line = $3;
 			$g_identity->append_text("${3}");
-			$g_identity->set_active(${1}-1) if(defined($2));
+			if (defined($2)) {
+				$g_identity->set_active(${1}-1);
+				$activated=1;
+			}
 			$num++;
 		}
 	}
+	$g_identity->set_active(0) if (!$activated);
 	if ($num > 1) {
 		$g_identity->show;
 	} else {