summaryrefslogtreecommitdiffstats
path: root/lib/mouse.pm
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-11-07 16:56:16 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-11-24 21:30:34 +0100
commit24d07aa63eb77616a38ff178726d0f4a0908b7dc (patch)
tree4515b672c368248a956259800d6507c23d816e26 /lib/mouse.pm
parentc3e929c47cfbc38aae282eacbf757b14c7172590 (diff)
downloaddrakx-kbd-mouse-x11-24d07aa63eb77616a38ff178726d0f4a0908b7dc.tar
drakx-kbd-mouse-x11-24d07aa63eb77616a38ff178726d0f4a0908b7dc.tar.gz
drakx-kbd-mouse-x11-24d07aa63eb77616a38ff178726d0f4a0908b7dc.tar.bz2
drakx-kbd-mouse-x11-24d07aa63eb77616a38ff178726d0f4a0908b7dc.tar.xz
drakx-kbd-mouse-x11-24d07aa63eb77616a38ff178726d0f4a0908b7dc.zip
switch from gtk2 to gtk3
Diffstat (limited to 'lib/mouse.pm')
-rw-r--r--lib/mouse.pm20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/mouse.pm b/lib/mouse.pm
index a01924b..5112692 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -483,22 +483,22 @@ sub change_mouse_live {
sub test_mouse_install {
my ($mouse, $x_protocol_changed) = @_;
- require ugtk2;
- ugtk2->import(qw(:wrappers :create));
- my $w = ugtk2->new(N("Testing the mouse"), disallow_big_help => 1);
- my $darea = Gtk2::DrawingArea->new;
+ require ugtk3;
+ ugtk3->import(qw(:wrappers :create));
+ my $w = ugtk3->new(N("Testing the mouse"), disallow_big_help => 1);
+ my $darea = Gtk3::DrawingArea->new;
$darea->set_events([ 'button_press_mask', 'button_release_mask' ]); #$darea must be unrealized.
gtkadd($w->{window},
- gtkpack(my $vbox_grab = Gtk2::VBox->new(0, 0),
+ gtkpack(my $vbox_grab = Gtk3::VBox->new(0, 0),
$darea,
gtkset_sensitive(create_okcancel($w, undef, '', 'edge'), 1)
),
);
test_mouse($mouse, $darea, $x_protocol_changed);
$w->sync; # HACK
- Gtk2::Gdk->pointer_grab($vbox_grab->window, 1, 'pointer_motion_mask', $vbox_grab->window, undef, 0);
+ Gtk3::Gdk->pointer_grab($vbox_grab->window, 1, 'pointer_motion_mask', $vbox_grab->window, undef, 0);
my $r = $w->main;
- Gtk2::Gdk->pointer_ungrab(0);
+ Gtk3::Gdk->pointer_ungrab(0);
$r;
}
@@ -565,8 +565,8 @@ sub select {
sub test_mouse {
my ($mouse, $darea, $b_x_protocol_changed) = @_;
- require ugtk2;
- ugtk2->import(qw(:wrappers));
+ require ugtk3;
+ ugtk3->import(qw(:wrappers));
my $suffix = $mouse->{nbuttons} <= 2 ? '2b' : $mouse->{nbuttons} == 3 ? '3b' : '3b+';
my %offsets = (mouse_2b_right => [ 93, 0 ], mouse_3b_right => [ 117, 0 ],
mouse_2b_middle => [ 82, 80 ], mouse_3b_middle => [ 68, 0 ], 'mouse_3b+_middle' => [ 85, 67 ]);
@@ -577,7 +577,7 @@ sub test_mouse {
if_($mouse->{nbuttons} > 2, middle => 'mouse_' . $suffix . '_middle'),
up => 'arrow_up',
down => 'arrow_down');
- my %images = map { $_ => ugtk2::gtkcreate_pixbuf("$image_files{$_}.png") } keys %image_files;
+ my %images = map { $_ => ugtk3::gtkcreate_pixbuf("$image_files{$_}.png") } keys %image_files;
my $width = $images{mouse}->get_width;
my $height = round_up($images{mouse}->get_height, 6);