From 02ecb2eea2df4511085d3b7266e36cb49f298801 Mon Sep 17 00:00:00 2001 From: damien Date: Wed, 5 Sep 2001 23:04:49 +0000 Subject: typo --- perl-install/standalone/mousedrake | 118 +------------------------------------ 1 file changed, 2 insertions(+), 116 deletions(-) (limited to 'perl-install/standalone/mousedrake') diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index 54dbb2f09..9af8479c7 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -41,7 +41,7 @@ if (!$mouse || !$::auto) { require my_gtk; my $time_tag = Gtk->timeout_add(100, sub { defined $::Plug && defined $::Plug->child or return 1; - test_mouse2($mouse,$::Plug->child); + test_mouse($mouse,$::Plug->child); 0; }); } @@ -69,89 +69,16 @@ if (!$mouse || !$::auto) { ) || goto begin if $mouse->{type} eq 'serial'; } -#test_mouse($mouse) if $::isEmbedded; mouse::write_conf($mouse); -e "/var/lock/subsys/gpm" and system "service", "gpm", "restart"; $::isEmbedded ? kill(USR1, $::CCPID) : $in->exit(0); goto begin; - sub test_mouse { my ($mouse, $hbox) = @_; - my ($width, $height, $offset) = (210, round_up(min(350, $::windowheight - 150), 6), 25); - my ($bw, $bh) = ($width / 3, $height / 3); - - my $darea = new Gtk::DrawingArea; - $darea->set_events([ 'button_press_mask', 'button_release_mask' ]); #$darea must be unrealized. - my_gtk::gtkpack($hbox, my_gtk::gtkset_border_width(my_gtk::gtkpack(new Gtk::VBox(0,10), my_gtk::gtksize(my_gtk::gtkset_usize($darea, $width+1, $height+1), $width, $height)),10)); - my $draw_rect; $draw_rect = sub { - my ($black, $fill, $rect) = @_; - $draw_rect->(0, 1, $rect) if !$fill; #- blank it first - $darea->window->draw_rectangle($black ? $darea->style->fg_gc('normal') : $darea->style->bg_gc('normal'), $fill, @$rect); - $darea->draw($rect); - }; - my $paintWheel = sub { - my ($x, $y, $w, $h) = ($width / 2 - $bw / 6, $bh / 4, $bw / 3, $bh / 2); - $mouse->{nbuttons} = max($mouse->{nbuttons}, 5); #- it means, the mouse has more than 3 buttons... - $draw_rect->(1, 0, [ $x, $y, $w, $h ]); - - my $offset = 0 if 0; - $offset += $_[0] if $_[0]; - my $step = 10; - for (my $i = $offset % $step; $i < $h; $i += $step) { - $draw_rect->(1, 1, [ $x, $y + $i, $w, min(2, $h - $i) ]); - } - }; - my $paintButton = sub { - my ($nb, $pressed) = @_; - my $rect = [ $bw * $nb, 0, $bw, $bh ]; - $draw_rect->(1, $pressed, $rect); - $paintWheel->(0) if $nb == 1 && $mouse->{nbuttons} > 3; - }; - my $draw_text = sub { - my ($t, $y) = @_; - my $font = $darea->style->font; - my $w = $font->string_width($t); - $darea->window->draw_string($font, $darea->style->fg_gc('normal'), ($width - $w) / 2, $y, $t); - }; - my $default_time = 10; - my $time = $default_time; - my $expose1 = 0; - my $expose2 = 1; - $darea->signal_connect(button_press_event => sub { - my $b = $_[1]{button}; - $time = $default_time; - $b >= 4 ? - $paintWheel->($b == 4 ? -1 : 1) : - $paintButton->($b - 1, 1); - $expose2 = 0; - }); - $darea->signal_connect(button_release_event => sub { - my $b = $_[1]{button}; - $paintButton->($b - 1, 0) if $b < 4; - $expose2 = 1; - }); - $darea->signal_connect(expose_event => sub { $expose = 1 }); - $time_tag2 = Gtk->timeout_add(100, sub { - $expose && $expose2 or return 1; - $expose = 0; - $draw_rect->(1, 0, [ 0, 0, $width, $height]); - $draw_text->(_("Test the mouse here."), 2 * $bh - 20); - $draw_text->(_("To activate the mouse,"), 2 * $bh + 10) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; - $draw_text->(_("MOVE YOUR WHEEL!"), 2 * $bh + 30) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; - $paintButton->($_, 0) foreach 0..2; - $expose = 0; - 1; - }); -} - -sub test_mouse2 { - my ($mouse, $hbox) = @_; - my ($width, $height, $offset) = (210, round_up(min(350, $::windowheight - 150), 6), 25); -# my ($bw, $bh) = ($width / 3, $height / 3); my $darea = new Gtk::DrawingArea; $darea->set_events([ 'button_press_mask', 'button_release_mask' ]); #$darea must be unrealized. @@ -163,7 +90,7 @@ sub test_mouse2 { my ($m3_left, $m3_left_mask) = my_gtk::gtkcreate_xpm($darea, 'mouse_left.xpm'); my ($m3_right, $m3_right_mask) = my_gtk::gtkcreate_xpm($darea, 'mouse_right.xpm'); my ($m3_middle, $m3_middle_mask) = my_gtk::gtkcreate_xpm($darea, 'mouse_middle.xpm'); - $image = $m3_image; + my $image = $m3_image; $mouse->{nbuttons} > 3 and $image = $m3_imagep; my $drawarea; $drawarea = sub { $darea->window->draw_pixmap ($darea->style->bg_gc('normal'), $image, 0, 0, @@ -171,24 +98,6 @@ sub test_mouse2 { 210, 350) }; -# my $draw_rect; $draw_rect = sub { -# my ($black, $fill, $rect) = @_; -# $draw_rect->(0, 1, $rect) if !$fill; #- blank it first -# $darea->window->draw_rectangle($black ? $darea->style->fg_gc('normal') : $darea->style->bg_gc('normal'), $fill, @$rect); -# $darea->draw($rect); -# }; -# my $paintWheel = sub { -# my ($x, $y, $w, $h) = ($width / 2 - $bw / 6, $bh / 4, $bw / 3, $bh / 2); -# $mouse->{nbuttons} = max($mouse->{nbuttons}, 5); #- it means, the mouse has more than 3 buttons... -# $draw_rect->(1, 0, [ $x, $y, $w, $h ]); - -# my $offset = 0 if 0; -# $offset += $_[0] if $_[0]; -# my $step = 10; -# for (my $i = $offset % $step; $i < $h; $i += $step) { -# $draw_rect->(1, 1, [ $x, $y + $i, $w, min(2, $h - $i) ]); -# } -# }; my $paintButton = sub { my ($nb, $pressed) = @_; my $x = 60 + $nb*33; @@ -226,16 +135,6 @@ sub test_mouse2 { 13, 62) } }; -# my $draw_text = sub { -# my ($t, $y) = @_; -# my $font = $darea->style->font; -# my $w = $font->string_width($t); -# $darea->window->draw_string($font, $darea->style->fg_gc('normal'), ($width - $w) / 2, $y, $t); -# }; -# my $default_time = 10; -# my $time = $default_time; -# my $expose1 = 0; -# my $expose2 = 1; $darea->signal_connect(button_press_event => sub { my $b = $_[1]{button}; $time = $default_time; @@ -248,17 +147,4 @@ sub test_mouse2 { $drawarea->() }); $darea->signal_connect(expose_event => sub { $drawarea->() }); -# $time_tag2 = Gtk->timeout_add(100, sub { -# $expose or return 1; -# $expose && $expose2 or return 1; -# $expose = 0; -# $drawarea->(); -# $draw_rect->(1, 0, [ 0, 0, $width, $height]); -# $draw_text->(_("Test the mouse here."), 2 * $bh - 20); -# $draw_text->(_("To activate the mouse,"), 2 * $bh + 10) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; -# $draw_text->(_("MOVE YOUR WHEEL!"), 2 * $bh + 30) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; -# $paintButton->($_, 0) foreach 0..2; -# $expose = 0; -# 1; -# }); } -- cgit v1.2.1