less strict handling of modifier states

diff --git a/snom.pl b/snom.pl
index 97b8e9937dca9ad06a5cf44b9d41b18e388b124a..168293818c60c0f86a5f2796129847a649e53fd5 100755 (executable)
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-#$Id: snom.pl,v 1.43 2006-05-23 19:14:09 michael Exp $
+#$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" "$@"
 
 
 PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@"
 


@@ -288,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;}
                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 +341,7 @@ sub KBDInput
                        }
                }
        } else {
                        }
                }
        } 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}");
                        for (my $i=1; $i<13; $i++) {
                                if ($keyval == $Gtk2::Gdk::Keysyms{"F${i}"}) {
                                        snom_key("P${i}");