diff options
Diffstat (limited to 'perl-install/ugtk2.pm')
| -rw-r--r-- | perl-install/ugtk2.pm | 1527 |
1 files changed, 949 insertions, 578 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 1e23d61d0..09f877c9f 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -2,28 +2,32 @@ package ugtk2; use diagnostics; use strict; -use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $force_center $force_focus $force_position $grab $pop_it $border); #- leave it on one line, for automatic removal of the line at package creation +use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $wm_icon $grab $border); #- leave it on one line, for automatic removal of the line at package creation +use locale; @ISA = qw(Exporter); %EXPORT_TAGS = ( - wrappers => [ qw(gtkadd gtkappend gtkappend_page gtkappend_text gtkappenditems gtkcombo_setpopdown_strings gtkdestroy - gtkentry gtkexpand gtkflush gtkhide gtkinsert_text gtkmodify_font gtkmove gtkpack gtkpack2 gtkpack2_ - gtkpack2__ gtkpack_ gtkpack__ gtkpowerpack gtkprepend_text gtkput gtkradio gtkresize gtkroot - gtkset_active gtkset_border_width gtkset_editable gtkset_justify gtkset_layout gtkset_markup - gtkset_modal gtkset_mousecursor gtkset_mousecursor_normal gtkset_mousecursor_wait gtkset_name + wrappers => [ qw(gtkadd gtkadd_widget gtkappend gtkappend_page gtkappenditems gtkcombo_setpopdown_strings gtkdestroy + gtkentry gtkflush gtkhide gtkmodify_font gtkmove gtkpack gtkpack2 gtkpack2_ + gtkpack2__ gtkpack_ gtkpack__ gtkpowerpack gtkput gtkradio gtkresize gtkroot + gtkset_active gtkset_border_width gtkset_editable gtkset_justify gtkset_alignment gtkset_layout gtkset_line_wrap + gtkset_markup gtkset_modal gtkset_mousecursor gtkset_mousecursor_normal gtkset_mousecursor_wait gtkset_name gtkset_property gtkset_relief gtkset_selectable gtkset_sensitive gtkset_shadow_type gtkset_size_request gtkset_text gtkset_tip gtkset_visibility gtksetstyle gtkshow gtksignal_connect gtksize gtktext_append gtktext_insert ) ], - helpers => [ qw(add2notebook add_icon_path fill_tiled fill_tiled_coords get_text_coord gtkcolor gtkcreate_img - gtkcreate_pixbuf gtkfontinfo gtkset_background n_line_size set_back_pixbuf string_size) ], + helpers => [ qw(add2notebook add_icon_path escape_text_for_TextView_markup_format gtkcolor gtkcreate_img + gtkcreate_pixbuf gtkfontinfo gtkset_background gtktreeview_children set_back_pixmap + get_default_step_items set_default_step_items + string_size string_width) ], create => [ qw(create_adjustment create_box_with_title create_dialog create_factory_menu create_factory_popup_menu create_hbox create_hpaned create_menu create_notebook create_okcancel create_packtable - create_scrolled_window create_vbox create_vpaned destroy_window ) ], + create_scrolled_window create_vbox create_vpaned _create_dialog gtkcreate_frame) ], ask => [ qw(ask_browse_tree_info ask_browse_tree_info_given_widgets ask_dir ask_from_entry ask_okcancel ask_warn - ask_yesorno ) ], + ask_yesorno) ], + dialogs => [ qw(err_dialog info_dialog warn_dialog) ], ); $EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ]; @@ -32,19 +36,14 @@ $EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ]; use c; use log; use common; +use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version use Gtk2; -unless ($::no_ugtk_init) { - !check_for_xserver() and die "Cannot be run in console mode.\n"; - Gtk2->init(\@ARGV); - c::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', @::textdomains; - $::need_utf8_i18n = 1; -} - $border = 5; +sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" } # -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- # wrappers @@ -54,8 +53,8 @@ $border = 5; # variables, and second, to "see" directly in the code the user interface # you're building. -sub gtkdestroy { $_[0] and $_[0]->destroy } -sub gtkflush { Gtk2->update_ui } +sub gtkdestroy { mygtk2::may_destroy($_[0]) } +sub gtkflush() { mygtk2::flush() } sub gtkhide { $_[0]->hide; $_[0] } sub gtkmove { $_[0]->window->move($_[1], $_[2]); $_[0] } sub gtkpack { gtkpowerpack(1, 1, @_) } @@ -71,6 +70,7 @@ sub gtkset_border_width { $_[0]->set_border_width($_[1]); $_[0] } sub gtkset_editable { $_[0]->set_editable($_[1]); $_[0] } sub gtkset_selectable { $_[0]->set_selectable($_[1]); $_[0] } sub gtkset_justify { $_[0]->set_justify($_[1]); $_[0] } +sub gtkset_alignment { $_[0]->set_alignment($_[1], $_[2]); $_[0] } sub gtkset_layout { $_[0]->set_layout($_[1]); $_[0] } sub gtkset_modal { $_[0]->set_modal($_[1]); $_[0] } sub gtkset_mousecursor_normal { gtkset_mousecursor('left-ptr', @_) } @@ -84,52 +84,55 @@ sub gtkset_style { $_[0]->set_style($_[1]); $_[0] } sub gtkset_size_request { $_[0]->set_size_request($_[1], $_[2]); $_[0] } sub gtkshow { $_[0]->show; $_[0] } sub gtksize { $_[0]->size($_[1], $_[2]); $_[0] } -sub gtkexpand { $_[0]->expand; $_[0] } sub gtkset_markup { $_[0]->set_markup($_[1]); $_[0] } +sub gtkset_line_wrap { $_[0]->set_line_wrap($_[1]); $_[0] } sub gtkadd { my $w = shift; - foreach (@_) { - my $l = $_; - ref $l or $l = Gtk2::Label->new($l); + foreach my $l (@_) { + ref $l or $l = gtknew('WrappedLabel', text => $l); $w->add(gtkshow($l)); } - $w + $w; +} + +sub gtkadd_widget { + my $sg = shift; + map { + my $l = $_; + ref $l or $l = gtknew('WrappedLabel', text => $l); + $sg->add_widget($l); + $l; + } @_; } sub gtkappend { my $w = shift; - foreach (@_) { - my $l = $_; - ref $l or $l = Gtk2::Label->new($l); + foreach my $l (@_) { + ref $l or $l = gtknew('WrappedLabel', text => $l); $w->append(gtkshow($l)); } - $w + $w; } sub gtkappenditems { my $w = shift; $_->show foreach @_; $w->append_items(@_); - $w + $w; } # append page to a notebook sub gtkappend_page { - my $w = shift; - $w->append_page(@_); - $w -} - -sub gtkbuttonset { - gtkdestroy($_[0]->child); - gtkadd($_[0], gtkshow($_[1])) + my ($notebook, $page, $o_title) = @_; + $notebook->append_page($page, $o_title); + $notebook; } sub gtkentry { - my ($text) = @_; - my $e = Gtk2::Entry->new; - $text and $e->set_text($text); + my ($o_text) = @_; + my $e = gtknew('Entry'); + $o_text and $e->set_text($o_text); $e; } @@ -142,13 +145,16 @@ sub gtksetstyle { sub gtkradio { my $def = shift; my $radio; - map { gtkset_active($radio = Gtk2::RadioButton->new($radio ? $radio->get_group : undef, $_), $_ eq $def) } @_; + map { + my $w = gtkset_active($radio = Gtk2::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def); + $w->get_child->set_line_wrap(1); + $w; + } @_; } -sub gtkroot { - my $root if 0; - $root ||= Gtk2::Gdk::Window->foreign_new(Gtk2::Gdk->ROOT_WINDOW); -} +sub gtkroot() { mygtk2::root_window() } +sub gtkcolor { &mygtk2::rgb2color } +sub gtkset_background { &mygtk2::set_root_window_background } sub gtkset_text { my ($w, $s) = @_; @@ -162,28 +168,10 @@ sub gtkcombo_setpopdown_strings { $w; } -sub gtkinsert_text { - my ($w, $text, $position) = @_; - $w->insert_text($text, -1, $position); - $w; -} - -# compat with ugtk for gtk-1.2, don't use it -sub gtkappend_text { - my ($w, $s) = @_; - gtkinsert_text($w, $s, -1); -} - -# compat with ugtk for gtk-1.2, don't use it -sub gtkprepend_text { - my ($w, $s) = @_; - gtkinsert_text($w, $s, 0); -} - sub gtkset_mousecursor { my ($type, $w) = @_; - ($w || gtkroot())->set_cursor(my $c = Gtk2::Gdk::Cursor->new($type)); - $c->unref; + ($w || gtkroot())->set_cursor(Gtk2::Gdk::Cursor->new($type)); + $w; } sub gtksignal_connect { @@ -224,10 +212,10 @@ sub gtkpowerpack { #- attr value directly in the arg list (avoiding confusion between value 0 and Gtk::Label("0"). That can simplify some writings but #- this arg(s) MUST then be present... my (%attr, $attrs); - ref($_[0]) eq 'HASH' || ref($_[0]) eq 'ARRAY' and $attrs = shift; + member(ref($_[0]), qw(HASH ARRAY)) and $attrs = shift; foreach (@attributes_list) { if (($default_attrs->{$_} || '') eq 'arg') { - ref($_[0]) and die "error in packing definition\n"; + ref($_[0]) and internal_error "error in packing definition\n"; $attr{$_} = shift; ref($attrs) eq 'ARRAY' and shift @$attrs; } elsif (ref($attrs) eq 'HASH' && defined($attrs->{$_})) { @@ -241,8 +229,8 @@ sub gtkpowerpack { } } #- Get and pack the widget (create it if necessary to a label...) - my $widget = ref($_[0]) ? shift : Gtk2::Label->new(shift); - my $pack_call = 'pack_'.($attr{pack_end} ? 'end' : 'start'); + my $widget = ref($_[0]) ? shift : gtknew('WrappedLabel', text => shift); + my $pack_call = 'pack_' . ($attr{pack_end} ? 'end' : 'start'); $box->$pack_call($widget, $attr{expand}, $attr{fill}, $attr{padding}); $widget->show; } @@ -252,7 +240,7 @@ sub gtkpowerpack { sub gtktreeview_children { my ($model, $iter) = @_; my @l; - $model && $iter or return; + $model or return; for (my $p = $model->iter_children($iter); $p; $p = $model->iter_next($p)) { push @l, $p; } @@ -270,11 +258,12 @@ sub gtktreeview_children { sub create_pixbutton { my ($label, $pix, $reverse_order) = @_; my @label_and_pix = (0, $label, if_($pix, 0, $pix)); - gtkadd(Gtk2::Button->new, - gtkpack_(Gtk2::HBox->new(0, 3), + gtkadd(gtknew('Button'), + gtknew('HBox', spacing => 3, children => [ 1, "", $reverse_order ? reverse(@label_and_pix) : @label_and_pix, - 1, "")); + 1, "", + ])); } sub create_adjustment { @@ -283,23 +272,9 @@ sub create_adjustment { } sub create_scrolled_window { - my ($W, $policy, $viewport_shadow) = @_; - my $w = Gtk2::ScrolledWindow->new(undef, undef); - $policy ||= [ 'automatic', 'automatic' ]; - $w->set_policy(@{$policy}); - if (member(ref($W), qw(Gtk2::Layout Gtk2::Text Gtk2::TextView Gtk2::TreeView))) { - $w->add($W) - } else { - $w->add_with_viewport($W); - } - $viewport_shadow and gtkset_shadow_type($w->child, $viewport_shadow); - $W->can('set_focus_vadjustment') and $W->set_focus_vadjustment($w->get_vadjustment); - $W->show; - if (ref($W) eq 'Gtk2::TextView') { - gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'in'), $w) - } else { - $w - } + my ($W, $o_policy, $o_viewport_shadow) = @_; + gtknew('ScrolledWindow', ($o_policy ? (h_policy => $o_policy->[0], v_policy => $o_policy->[1]) : ()), + child => $W, if_($o_viewport_shadow, shadow_type => $o_viewport_shadow)); } sub n_line_size { @@ -309,145 +284,215 @@ sub n_line_size { round($nbline * ($fontinfo{ascent} + $fontinfo{descent} + $spacing) + 8); } +# Glib::Markup::escape_text() if no use for us because it'll do extra +# s/X/&foobar;/ (such as s/'/'/) that are suitable for +# Gtk2::Labels but are not for Gtk2::TextViews, resulting in +# displaying the raw enriched text instead... +# +sub escape_text_for_TextView_markup_format { + my ($str) = @_; + my %rules = ('&' => '&', + '<' => '<', + '>' => '>', + ); + eval { $str =~ s!([&<>])!$rules{$1}!g }; #^(&(amp|lt|gt);)!!) { + if (my $err = $@) { + internal_error("$err\n$str"); + } + $str; +} + +sub markup_to_TextView_format { + my ($s, $o_default_attrs) = @_; + require interactive; + my $l = interactive::markup_parse($s) or return $s; + + foreach (@$l) { + my ($_txt, $attrs) = @$_; + if ($attrs) { + $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Gtk2::Pango; Gtk2::Pango->PANGO_WEIGHT_BOLD }; + $attrs->{size} eq 'larger' and do { + $attrs->{scale} = Gtk2::Pango->scale_x_large; # equivalent to Label's size => 'larger' + delete $attrs->{size}; + }; + } + #- nb: $attrs may be empty, need special handling if $o_default_attrs is used + add2hash_($_->[1] ||= {}, $o_default_attrs) if $o_default_attrs; + } + $l; +} + sub create_box_with_title { - my $o = shift; + my ($o, @l) = @_; - my $nbline = sum(map { round(length($_) / 60 + 1/2) } map { split "\n" } @_); - my $box = Gtk2::VBox->new(0,0); + my $nbline = sum(map { round(length($_) / 60 + 1/2) } map { split "\n" } @l); + my $box = gtknew('VBox'); if ($nbline == 0) { $o->{box_size} = 0; return $box; } $o->{box_size} = n_line_size($nbline, 'text', $box); - #- hugly hack because GtkLabel doesn't wrap when using languages that don't contain spaces - if (@_ <= 2 && ($nbline > 4 || ($nbline > 1 && ref($::o) && member($::o->{locale}{lang}, qw(ja))))) { + if (@l <= 2 && $nbline > 4) { $o->{icon} && !$::isWizard and - eval { gtkpack__($box, gtkset_border_width(gtkpack_(Gtk2::HBox->new(0,0), 1, gtkcreate_img($o->{icon})),5)) }; + eval { gtkpack__($box, gtknew('HBox', border_width => 5, children_loose => [ gtkcreate_img($o->{icon}) ])) }; my $wanted = $o->{box_size}; $o->{box_size} = min(200, $o->{box_size}); my $has_scroll = $o->{box_size} < $wanted; - my $wtext = Gtk2::TextView->new; - $wtext->set_left_margin(3); + chomp(my $text = join("\n", @l)); + my $wtext = gtknew('TextView', text => markup_to_TextView_format($text)); + $wtext->set_justification('fill'); + $wtext->set_left_margin(12); + $wtext->set_right_margin(12); $wtext->can_focus($has_scroll); - chomp(my $text = join("\n", @_)); - my $scroll = create_scrolled_window(gtktext_insert($wtext, $text)); - $scroll->set_size_request(400, $o->{box_size}); - gtkpack($box, $scroll); + my $width = 400; + my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200); + $scroll->signal_connect(realize => sub { + my $layout = $wtext->create_pango_layout($text); + $layout->set_width(($width - 10) * Gtk2::Pango->scale); + $wtext->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); + $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); + $o->{rwindow}->queue_resize; + }); + gtkpack_($box, $o->{box_allow_grow} || 0, $scroll); } else { - my $a = !$::no_separator; - undef $::no_separator; - if ($o->{icon} && (!$::isWizard || $::isInstall)) { - gtkpack__($box, - gtkpack_(Gtk2::HBox->new(0,0), - 0, gtkset_size_request(Gtk2::VBox->new(0,0), 15, 0), - 0, eval { gtkcreate_img($o->{icon}) }, - 0, gtkset_size_request(Gtk2::VBox->new(0,0), 15, 0), - 1, gtkpack_($o->{box_title} = Gtk2::VBox->new(0,0), - 1, Gtk2::HBox->new(0,0), - (map { - my $w = ref($_) ? $_ : Gtk2::Label->new($_); - $::isWizard and $w->set_justify("left"); - (0, gtkset_name($w, "Title")); - } map { ref($_) ? $_ : warp_text($_) } @_), - 1, Gtk2::HBox->new(0,0), - ) - ), - if_($a, Gtk2::HSeparator->new) - ) - } else { + my $new_label = sub { + my ($txt) = @_; + ref($txt) ? $txt : gtknew('WrappedLabel', text_markup => $txt, + # workaround infamous 6 years old gnome bug #101968: + width => mygtk2::get_label_width()); + }; gtkpack__($box, - if_($::isWizard, gtkset_size_request(Gtk2::Label->new, 0, 10)), + if_($::isWizard, gtknew('Label', height => 10)), (map { - my $w = ref($_) ? $_ : Gtk2::Label->new($_); - gtkset_name($w, "Title"); - $::isWizard ? gtkpack__(Gtk2::HBox->new(0,0), gtkset_size_request(Gtk2::Label->new, 20, 0), $w) - : $w - } map { ref($_) ? $_ : warp_text($_) } @_), - if_($::isWizard, gtkset_size_request(Gtk2::Label->new, 0, 15)), - if_($a, Gtk2::HSeparator->new) - ) - } + my $w = $new_label->($_); + $::isWizard ? gtknew('HBox', children_tight => [ gtknew('Label', width => 20), $w ]) + : $w; + } @l), + if_($::isWizard, gtknew('Label', height => 15)), + ); } } -# drakfloppy / logdrake +sub _create_dialog { + my ($title, $o_options) = @_; + my $options = $o_options || {}; + + #- keep compatibility with "transient" now called "transient_for" + $options->{transient_for} = delete $options->{transient} if $options->{transient}; + + gtknew('Dialog', title => $title, + position_policy => 'center-on-parent', # center-on-parent does not work + modal => 1, + if_(!$::isInstall, icon_no_error => wm_icon()), + %$options, allow_unknown_options => 1, + ); +} + + +# drakfloppy / drakfont / harddrake2 / mcc sub create_dialog { - my ($label, $c) = @_; + my ($title, $label, $o_options) = @_; my $ret = 0; - my $dialog = Gtk2::Dialog->new; - $dialog->signal_connect(delete_event => sub { Gtk2->main_quit }); - $dialog->set_title(N("logdrake")); + $o_options ||= {}; + $o_options->{transient_for} = $::main_window if !$o_options->{transient_for} && $::main_window; + + my $dialog = gtkset_border_width(_create_dialog($title, $o_options), 10); $dialog->set_border_width(10); - $dialog->set_position('center-on-parent'); # center-on-parent doesn't work - $dialog->vbox->pack_start(Gtk2::Label->new($label), 1, 1, 0); + my $text = ref($label) ? $label : $o_options->{use_markup} ? gtknew('WrappedLabel', text_markup => $label) : gtknew('WrappedLabel', text => $label); + gtkpack($dialog->vbox, + gtknew('HBox', children => [ + if_($o_options->{stock}, + 0, Gtk2::Image->new_from_stock($o_options->{stock}, 'dialog'), + 0, gtknew('Label', text => " "), + ), + 1, $o_options->{scroll} ? create_scrolled_window($text, [ 'never', 'automatic' ]) : $text, + ]), + ); + + if ($o_options->{cancel}) { + $dialog->action_area->pack_start( + gtknew('Button', text => N("Cancel"), + clicked => sub { $ret = 0; $dialog->destroy; Gtk2->main_quit }, + can_default => 1), + 1, 1, 0); + } - my $button = Gtk2::Button->new(N("OK")); - $button->can_default(1); - $button->signal_connect(clicked => sub { $ret = 1; $dialog->destroy; Gtk2->main_quit }); + my $button = gtknew('Button', text => N("Ok"), can_default => 1, + clicked => sub { $ret = 1; $dialog->destroy; Gtk2->main_quit }); $dialog->action_area->pack_start($button, 1, 1, 0); $button->grab_default; - if ($c) { - my $button2 = Gtk2::Button->new(N("Cancel")); - $button2->signal_connect(clicked => sub { $ret = 0; $dialog->destroy; Gtk2->main_quit }); - $button2->can_default(1); - $dialog->action_area->pack_start($button2, 1, 1, 0); - } - + $dialog->set_has_separator(0); $dialog->show_all; - $dialog->set_modal(1); Gtk2->main; $ret; } -# drakfloppy / logdrake -sub destroy_window { - my ($_widget, $windowref, $w2) = @_; - $$windowref = undef; - $w2 = undef if defined $w2; - 0; +sub info_dialog { + my ($title, $label, $o_options) = @_; + $o_options ||= { }; + add2hash_($o_options, { stock => 'gtk-dialog-info' }); + create_dialog($title, $label, $o_options); +} + +sub warn_dialog { + my ($title, $label, $o_options) = @_; + $o_options ||= { }; + add2hash_($o_options, { stock => 'gtk-dialog-warning', cancel => 1 }); + create_dialog($title, $label, $o_options); +} + +sub err_dialog { + my ($title, $label, $o_options) = @_; + $o_options ||= { }; + add2hash_($o_options, { stock => 'gtk-dialog-error' }); + create_dialog($title, $label, $o_options); } -sub create_hbox { gtkset_layout(gtkset_border_width(Gtk2::HButtonBox->new, 3), $_[0] || 'spread') } -sub create_vbox { gtkset_layout(Gtk2::VButtonBox->new, $_[0] || 'spread') } +sub create_hbox { gtknew('HButtonBox', layout => $_[0]) } +sub create_vbox { gtknew('VButtonBox', layout => $_[0]) } sub create_factory_menu_ { my ($type, $name, $window, @menu_items) = @_; my $widget = Gtk2::ItemFactory->new($type, $name, my $accel_group = Gtk2::AccelGroup->new); - $widget->create_items([ @menu_items ]); + $widget->create_items($window, @menu_items); $window->add_accel_group($accel_group); ($widget->get_widget($name), $widget); } -sub create_factory_popup_menu { create_factory_menu_(Gtk2::Menu->get_type, '<main>', @_) } -sub create_factory_menu { create_factory_menu_(Gtk2::MenuBar->get_type, '<main>', @_) } +sub create_factory_popup_menu { create_factory_menu_("Gtk2::Menu", '<main>', @_) } +sub create_factory_menu { create_factory_menu_("Gtk2::MenuBar", '<main>', @_) } sub create_menu { my $title = shift; my $w = Gtk2::MenuItem->new($title); $w->set_submenu(gtkshow(gtkappend(Gtk2::Menu->new, @_))); - $w + $w; } sub create_notebook { - my $n = Gtk2::Notebook->new; - add2notebook($n, splice(@_, 0, 2)) while @_; - $n + my $book = gtknew('Notebook'); + while (@_) { + my ($page, $title) = splice(@_, 0, 2); + gtkappend_page($book, $page, $title); + } + $book; } sub create_packtable { my ($options, @l) = @_; my $w = Gtk2::Table->new(0, 0, $options->{homogeneous} || 0); + add2hash_($options, { xpadding => 5, ypadding => 0 }); each_index { - my ($i, $l) = ($_[0], $_); + my ($i, $l) = ($::i, $_); each_index { - my ($j) = @_; + my $j = $::i; if ($_) { - ref $_ or $_ = Gtk2::Label->new($_); + ref $_ or $_ = gtknew('WrappedLabel', text => $_); $j != $#$l && !$options->{mcc} ? $w->attach($_, $j, $j + 1, $i, $i + 1, - 'fill', 'fill', 5, 0) : + 'fill', 'fill', $options->{xpadding}, $options->{ypadding}) : $w->attach($_, $j, $j + 1, $i, $i + 1, ['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0); $_->show; @@ -456,31 +501,72 @@ sub create_packtable { } @l; $w->set_col_spacings($options->{col_spacings} || 0); $w->set_row_spacings($options->{row_spacings} || 0); - $w + gtkset_border_width($w, $::isInstall ? 3 : 10); } +my $wm_is_kde; sub create_okcancel { - my ($w, $ok, $cancel, $spread, @other) = @_; - my $wizard_buttons = $::isWizard && !$w->{pop_it}; - $cancel = $wizard_buttons ? N("<- Previous") : N("Cancel") if !defined $cancel && !defined $ok; - $ok = $wizard_buttons ? ($::Wizard_finished ? N("Finish") : N("Next ->")) : N("Ok") if !defined $ok; - my $b1 = gtksignal_connect($w->{ok} = Gtk2::Button->new($ok), clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit }); - my $b2 = $cancel && gtksignal_connect($w->{cancel} = Gtk2::Button->new($cancel), clicked => $w->{cancel_clicked} || sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit }); - gtksignal_connect($w->{wizcancel} = Gtk2::Button->new(N("Cancel")), clicked => sub { die 'wizcancel' }) if $wizard_buttons && !$::isInstall; - my @l = grep { $_ } $wizard_buttons ? (if_(!$::isInstall, $w->{wizcancel}), - if_(!$::Wizard_no_previous, $b2), $b1) : ($b1, $b2); - my @l2 = map { gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => $_->[1]) } grep { $_->[2] } @other; - my @r2 = map { gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => $_->[1]) } grep { !$_->[2] } @other; - - my $box = create_hbox($spread || "edge"); - - $box->pack_start($_, 0, 0, 1) foreach @l2; - $box->pack_end($_, 0, 0, 1) foreach @r2, @l; - foreach (@l2, @r2, @l) { - $_->show; - $_->can_default($wizard_buttons); + my ($w, $o_ok, $o_cancel, $_o_spread, @other) = @_; + # @other is a list of extra buttons (usually help (eg: XFdrake/drakx caller) or advanced (eg: interactive caller) button) + # extra buttons have the following structure [ label, handler, is_first, pack_right ] + local $::isWizard = $::isWizard && !$w->{pop_it}; + my $cancel; + if (defined $o_cancel || defined $o_ok) { + $cancel = $o_cancel; + } elsif (!$::Wizard_no_previous) { + $cancel = $::isWizard ? N("Previous") : N("Cancel"); + } + my $ok = defined $o_ok ? $o_ok : $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok"); + my $bok = $ok && ($w->{ok} = gtknew('Button', text => $ok, clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit })); + my $bprev; + if ($cancel) { + $bprev = $w->{cancel} = gtknew('Button', text => $cancel, clicked => $w->{cancel_clicked} || + sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit }); + } + $w->{wizcancel} = gtknew('Button', text => ($::Wizard_skip ? N("Skip") : N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel; + if (!defined $wm_is_kde) { + require any; + my $wm = any::running_window_manager(); + $wm_is_kde = !$::isInstall && (member($wm, qw(kwin compiz)) && fuzzy_pidofs(qr/\bkde-window-decorator\b/)) || 0; + } + my $f = sub { $w->{buttons}{$_[0][0]} = ref($_[0][0]) =~ /Gtk2::Button/ ? + $_[0][0] : + gtknew('Button', text => $_[0][0], clicked => $_[0][1]) }; + my @left = ((map { $f->($_) } grep { $_->[2] && !$_->[3] } @other), + map { $f->($_) } grep { !$_->[2] && !$_->[3] } @other); + my @right = ((map { $f->($_) } grep { $_->[2] && $_->[3] } @other), + map { $f->($_) } grep { !$_->[2] && $_->[3] } @other); + # we put space to group buttons in two packs (but if there's only one when not in wizard mode) + # but in the installer where all windows run in wizard mode because of design even when not in a wizard step + $bprev = gtknew('Label') if !$cancel && $::Wizard_no_previous && !@left && !@right; + if ($::isWizard || $w->{pop_it}) { + # wizard mode: order is cancel/left_extras/white/right_extras/prev/next + unshift @left, $w->{wizcancel} if $w->{wizcancel}; + push @right, $bprev, $bok; + } else { + # normal mode: cancel/ok button follow GNOME's HIG + unshift @left, ($wm_is_kde ? $bok : $bprev); + push @left, gtknew('Label') if $ok && $cancel; # space buttons but if there's only one button + push @right, ($wm_is_kde ? $bprev : $bok); } - $box; + + gtknew('VBox', spacing => 5, children_loose => [ + gtknew('HBox', height => 5), + gtknew('HSeparator'), + gtknew('HBox', children_loose => [ + map { + gtknew('HButtonBox', spacing => 5, layout => $_->[1], + children_loose => [ + map { + $_->can_default($::isWizard); + $_; + } grep { $_ } @{$_->[0]} + ]); + } ([ \@left, 'start' ], + [ \@right, 'end' ], + ) + ]), + ]); } sub _setup_paned { @@ -501,6 +587,11 @@ sub create_hpaned { _setup_paned(Gtk2::HPaned->new, @_); } +sub gtkcreate_frame { + my ($label) = @_; + gtknew('Frame', text => $label, border_width => 5); +} + # -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- # helpers @@ -509,69 +600,61 @@ sub create_hpaned { # several places of your programs. sub _find_imgfile { - my ($f, @extensions) = shift; - @extensions or @extensions = qw(.png .xpm); - if ($f !~ m|^/|) { + my ($name) = @_; + + if ($name =~ m|/| && -f $name) { + $name; + } else { foreach my $path (icon_paths()) { - -e "$path/$f$_" and $f = "$path/$f$_" foreach '', @extensions; + foreach ('', '.png', '.xpm') { + my $file = "$path/$name$_"; + -f $file and return $file; + } } } - return $f; } # use it if you want to display an icon/image in your app sub gtkcreate_img { - return Gtk2::Image->new_from_file(_find_imgfile(@_)); + my ($file, $o_size) = @_; + gtknew('Image', file => $file, if_($o_size, size => $o_size)); } # use it if you want to draw an image onto a drawingarea sub gtkcreate_pixbuf { - return Gtk2::Gdk::Pixbuf->new_from_file(_find_imgfile(@_)); -} - -sub gtktext_append { gtktext_insert(@_, { 'append' => 1 }) } - -# choose one of the two styles: -# - gtktext_insert($textview, "My text.."); -# - gtktext_insert($textview, [ [ 'first text', { 'foreground' => 'blue', 'background' => 'green', ... } ], -# [ 'second text' ], -# [ 'third', { 'font' => 'Serif 15', ... } ], -# ... ]); -sub gtktext_insert { - my ($textview, $t, $opts) = @_; - if (ref($t) eq 'ARRAY') { - my $buffer = $textview->get_buffer; - $opts->{append} or $buffer->set_text('', -1); - foreach my $token (@$t) { - my $c = $buffer->get_char_count; - $buffer->insert($buffer->get_end_iter, $token->[0], -1); - if ($token->[1]) { - my $tag = $buffer->create_tag(undef); - $tag->set(%{$token->[1]}); - $buffer->apply_tag($tag, $buffer->get_iter_at_offset($c), $buffer->get_end_iter); - } - } - } else { - $textview->get_buffer->set_text($t, -1); + my ($file, $o_size) = @_; + gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size)); +} + +sub gtktext_append { gtktext_insert(@_, append => 1) } + +sub may_set_icon { + my ($w, $name) = @_; + if (my $f = $name && _find_imgfile($name)) { + $w->set_icon(gtkcreate_pixbuf($f)); } - $textview->set_wrap_mode($opts->{wrap_mode} || 'word'); - $textview->set_editable($opts->{editable} || 0); - $textview->set_cursor_visible($opts->{visible} || 0); - $textview; +} + +sub gtktext_insert { &mygtk2::_text_insert } +sub icon_paths { &mygtk2::_icon_paths } +sub add_icon_path { &mygtk2::add_icon_path } + +sub set_main_window_size { + my ($o) = @_; + mygtk2::set_main_window_size($o->{rwindow}); } # extracts interesting font metrics for a given widget sub gtkfontinfo { my ($widget) = @_; my $context = $widget->get_pango_context; - my $metrics = $context->get_metrics($widget->style->get_font_desc, $context->get_language); + my $metrics = $context->get_metrics($context->get_font_description, $context->get_language); my %fontinfo; foreach (qw(ascent descent approximate_char_width approximate_digit_width)) { no strict; my $func = "get_$_"; - $fontinfo{$_} = Gtk2::Pango->PANGO_PIXELS($metrics->$func); + $fontinfo{$_} = Gtk2::Pango->pixels($metrics->$func); } - $metrics->unref; %fontinfo; } @@ -592,34 +675,25 @@ sub set_back_pixbuf { my $window = $widget->window; my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); - $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'none', 0, 0); + $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); $window->set_back_pixmap($pixmap, 0); } -sub fill_tiled_coords { - my ($widget, $pixbuf, $x_back, $y_back, $width, $height) = @_; - my ($x2, $y2) = (0, 0); - while (1) { - $x2 = 0; - while (1) { - $pixbuf->render_to_drawable($widget->window, $widget->style->fg_gc('normal'), - 0, 0, $x2, $y2, $x_back, $y_back, 'none', 0, 0); - $x2 += $x_back; - $x2 >= $width and last; - } - $y2 += $y_back; - $y2 >= $height and last; - } -} +sub set_back_pixmap { + my ($w) = @_; + return if !$w->realized; + my $window = $w->window; + my $pixmap = $w->{back_pixmap} ||= Gtk2::Gdk::Pixmap->new($window, 1, 2, $window->get_depth); -sub fill_tiled { - my ($widget, $pixbuf) = @_; - fill_tiled_coords($widget, $pixbuf, $pixbuf->get_width, $pixbuf->get_height, $widget->window->get_size); + my $style = $w->get_style; + $pixmap->draw_points($style->bg_gc('normal'), 0, 0); + $pixmap->draw_points($style->base_gc('normal'), 0, 1); + $window->set_back_pixmap($pixmap); } sub add2notebook { my ($n, $title, $book) = @_; - $n->append_page($book, gtkshow(Gtk2::Label->new($title))); + $n->append_page($book, gtkshow(gtknew('Label', text => $title))); $book->show; } @@ -627,107 +701,22 @@ sub string_size { my ($widget, $text) = @_; my $layout = $widget->create_pango_layout($text); my @size = $layout->get_pixel_size; - $layout->unref; @size; } -sub get_text_coord { - my ($text, $widget4style, $max_width, $max_height, $can_be_greater, $can_be_smaller, $centeredx, $centeredy, $wrap_char) = @_; - $wrap_char ||= ' '; - my $idx = 0; - my $real_width = 0; - my $real_height = 0; - my @lines; - my @widths; - my @heights; - my %fontinfo = gtkfontinfo($widget4style); - my $height_elem = $fontinfo{ascent} + $fontinfo{descent}; - $heights[0] = 0; - my $max_width2 = $max_width; - my $height = $heights[0] = $height_elem; - my $width = 0; - my $flag = 1; - my @t = split($wrap_char, $text); - my @t2; - if ($::isInstall && $::o->{lang} =~ /ja|zh/) { - @t = map { $_ . $wrap_char } @t; - $wrap_char = ''; - foreach (@t) { - my @c = split(''); - my $i = 0; - my $el = ''; - while (1) { - $i >= @c and last; - $el .= $c[$i]; - if (ord($c[$i]) >= 128) { $el .= $c[$i+1]; $i++; push @t2, $el; $el = '' } - $i++; - } - $el ne '' and push @t2, $el; - } - } else { - @t2 = @t; - } - foreach (@t2) { - my ($l, undef) = string_size($widget4style, $_ . (!$flag ? $wrap_char : '')); - if ($width + $l > $max_width2 && !$flag) { - $flag = 1; - $height += $height_elem + 1; - $heights[$idx+1] = $height; - $widths[$idx] = $centeredx && !$can_be_smaller ? (max($max_width2-$width, 0))/2 : 0; - $width = 0; - $idx++; - } - $lines[$idx] = $flag ? $_ : $lines[$idx] . $wrap_char . $_; - $width += $l; - $flag = 0; - $l <= $max_width2 or $max_width2 = $l; - $width <= $real_width or $real_width = $width; - } - $height += $height_elem; - $widths[$idx] = $centeredx && !$can_be_smaller ? (max($max_width2-$width, 0))/2 : 0; - - $height < $real_height or $real_height = $height; - $width = $max_width; - $height = $max_height; - $real_width < $max_width && $can_be_smaller and $width = $real_width; - $real_width > $max_width && $can_be_greater and $width = $real_width; - $real_height < $max_height && $can_be_smaller and $height = $real_height; - $real_height > $max_height && $can_be_greater and $height = $real_height; - if ($centeredy) { - my $dh = ($height-$real_height)/2 + ($height_elem)/2; - @heights = map { $_ + $dh } @heights; - } - ($width, $height, \@lines, \@widths, \@heights) +sub string_width { + my ($widget, $text) = @_; + my ($width, undef) = string_size($widget, $text); + $width; } -sub gtkcolor { - my ($r, $g, $b) = @_; - my $color = Gtk2::Gdk::Color->new($r, $g, $b); - gtkroot()->get_colormap->rgb_find_color($color); - $color; -} -sub gtkset_background { - my ($r, $g, $b) = @_; - my $root = gtkroot(); - my $gc = Gtk2::Gdk::GC->new($root); - my $color = gtkcolor($r, $g, $b); - $gc->set_rgb_fg_color($color); - $root->set_background($color); - $root->draw_rectangle($gc, 1, 0, 0, $root->get_size); - $gc->unref; +my ($def_step_title); +sub set_default_step_items { + $def_step_title = translate($_[0]); } -sub add_icon_path { push @icon_paths, @_ } -sub icon_paths { - (@icon_paths, (exists $ENV{SHARE_PATH} ? ($ENV{SHARE_PATH}, "$ENV{SHARE_PATH}/icons", "$ENV{SHARE_PATH}/libDrakX/pixmaps") : ()), - "/usr/lib/libDrakX/icons", "pixmaps", 'standalone/icons', '/usr/share/rpmdrake/icons'); -} -add_icon_path(@icon_paths, - exists $ENV{SHARE_PATH} ? "$ENV{SHARE_PATH}/libDrakX/pixmaps" : (), - '/usr/lib/libDrakX/icons', 'standalone/icons'); - - +sub get_default_step_items { ($def_step_title) } # -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- # toplevel window creation helper @@ -741,126 +730,49 @@ add_icon_path(@icon_paths, sub new { my ($type, $title, %opts) = @_; - Gtk2->set_locale; - my $o = bless { %opts }, $type; - $o->_create_window($title); while (my $e = shift @tempory::objects) { $e->destroy } - push @interactive::objects, $o if !$opts{no_interactive_objects}; - $o->{rwindow}->set_position('center-always') if $::isStandalone; - $o->{rwindow}->set_modal(1) if ($grab || $o->{grab} || $o->{modal}) && !$::isInstall; - $o->{rwindow}->set_transient_for($o->{transient}) if $o->{transient}; - - $o->{pop_it} ||= $pop_it || $::WizardTable && do { - my @l = $::WizardTable->get_children; - pop @l if !$::isInstall && $::isWizard; #- don't take into account the DrawingArea - any { $_->visible } @l; - }; - - if ($::isWizard && !$o->{pop_it}) { - $o->{isWizard} = 1; - $o->{window}->sink; $o->{rwindow}->sink; #- free memory - $o->{window} = Gtk2::VBox->new(0,0); - $o->{window}->set_border_width($::Wizard_splash ? 0 : 10); - $o->{rwindow} = $o->{window}; - if (!defined($::WizardWindow)) { - $::WizardWindow = Gtk2::Window->new('toplevel'); - $::WizardWindow->signal_connect(delete_event => sub { die 'wizcancel' }); - $::WizardTable = Gtk2::Table->new(2, 2, 0); - $::WizardWindow->add(gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'out'), $::WizardTable)); - - if ($::isInstall) { - $::WizardTable->set_size_request($::windowwidth * 0.90, $::windowheight * ($::logoheight ? 0.73 : 0.9)); - $::WizardWindow->set_uposition($::stepswidth + $::windowwidth * 0.04, $::logoheight + $::windowheight * ($::logoheight ? 0.12 : 0.05)); - $::WizardWindow->signal_connect(key_press_event => sub { - my (undef, $event) = @_; - my $d = ${{ Gtk2::Gdk::Event::Key->Sym_F2 => 'screenshot' }}{$event->keyval}; - - if ($d eq 'screenshot') { - common::take_screenshot(); - } elsif (chr($event->keyval) eq 'e' && member('mod1-mask', @{$event->state})) { #- alt-e - log::l("Switching to " . ($::expert ? "beginner" : "expert")); - $::expert = !$::expert; - } - 0; - }); - } else { - my $draw1 = Gtk2::DrawingArea->new; - $draw1->set_size_request(540, 100); - my $draw2 = Gtk2::DrawingArea->new; - $draw2->set_size_request(100, 300); - my $pixbuf_up = gtkcreate_pixbuf($::Wizard_pix_up || "wiz_default_up.png"); - my $pixbuf_left = gtkcreate_pixbuf($::Wizard_pix_left || "wiz_default_left.png"); - $draw1->modify_font(Gtk2::Pango::FontDescription->from_string(N("utopia 25"))); - $draw1->signal_connect(expose_event => sub { - my $height = $pixbuf_up->get_height; - for (my $i = 0; $i < 540/$height; $i++) { - $pixbuf_up->render_to_drawable($draw1->window, - $draw1->style->bg_gc('normal'), - 0, 0, 0, $height*$i, -1, -1, 'none', 0, 0); - my $layout = $draw1->create_pango_layout($::Wizard_title); - $draw1->window->draw_layout($draw1->style->white_gc, 40, 62, $layout); - $layout->unref; - } - }); - $draw2->signal_connect(expose_event => sub { - my $height = $pixbuf_left->get_height; - for (my $i = 0; $i < 300/$height; $i++) { - $pixbuf_left->render_to_drawable($draw2->window, - $draw2->style->bg_gc('normal'), - 0, 0, 0, $height*$i, -1, -1, 'none', 0, 0); - } - }); - - $::WizardWindow->set_position('center_always'); - $::WizardTable->attach($draw1, 0, 2, 0, 1, 'fill', 'fill', 0, 0); - $::WizardTable->set_size_request(540,420); - } - $::WizardWindow->show_all; - flush(); - } - $::WizardTable->attach($o->{window}, 0, 2, 1, 2, ['fill', 'expand'], ['fill', 'expand'], 0, 0); - } - if ($::isEmbedded && !$o->{pop_it}) { - $o->{isEmbedded} = 1; - $o->{window} = new Gtk2::HBox(0,0); - $o->{rwindow} = $o->{window}; - if (!$::Plug) { - $::Plug = gtkshow(Gtk2::Plug->new($::XID)); - flush(); - $::WizardTable = Gtk2::Table->new(2, 2, 0); - $::Plug->add($::WizardTable); - } - $::WizardTable->attach($o->{window}, 0, 2, 1, 2, ['fill', 'expand'], ['fill', 'expand'], 0, 0); - $::WizardTable->show; - } - $o->{rwindow}->signal_connect(destroy => sub { $o->{destroyed} = 1 }); + my $icon = find { _find_imgfile($_) } $::isInstall ? 'empty-banner' : $opts{icon}; + my $banner_title = $opts{banner_title}; + $o->{transient} ||= $::main_window if $::main_window && !$opts{do_not_track_main_window}; + my $window = gtknew( + 'MagicWindow', + title => $title || '', + pop_it => $o->{pop_it}, + $::isInstall ? (banner => gtknew('Install_Title', text => $title || get_default_step_items())) : (), + $::isStandalone && $banner_title && $icon ? (banner => Gtk2::Banner->new($icon, $banner_title)) : (), + width => $opts{width}, height => $opts{height}, default_width => $opts{default_width}, default_height => $opts{default_height}, + modal => (!$o->{pop_it} && !$::isInstall) && ($opts{modal} || $grab || $o->{grab}) || $o->{modal}, + no_Window_Manager => exists $opts{no_Window_Manager} ? $opts{no_Window_Manager} : !$::isStandalone, + if_(!$::isInstall, icon_no_error => wm_icon()), + if_($o->{transient}, transient_for => $o->{transient}), + ); + mygtk2::register_main_window($window->{real_window}) if !$opts{do_not_track_main_window}; + $window->set_border_width(10) if !$window->{pop_it} && !$::noborderWhenEmbedded; + + $o->{rwindow} = $o->{window} = $window; + $o->{real_window} = $window->{real_window}; + $o->{pop_it} = $window->{pop_it}; $o; } + sub main { - my ($o, $completed, $canceled) = @_; - gtkset_mousecursor_normal(); - my $timeout = Gtk2->timeout_add(1000, sub { gtkset_mousecursor_normal(); 1 }); - my $_b = MDK::Common::Func::before_leaving { Gtk2->timeout_remove($timeout) }; - $o->show; + my ($o, $o_completed, $o_canceled) = @_; - do { - Gtk2->main; - } while (!$o->{destroyed} && ($o->{retval} ? $completed && !$completed->() : $canceled && !$canceled->())); - $o->destroy; - $o->{retval} + $o->show; + mygtk2::main($o->{rwindow}, + sub { $o->{retval} ? !$o_completed || $o_completed->() : !$o_canceled || $o_canceled->() }); + $o->{retval}; } sub show($) { my ($o) = @_; - $o->{window}->show; $o->{rwindow}->show; } sub destroy($) { my ($o) = @_; - $o->{rwindow}->destroy if !$o->{destroyed}; - gtkset_mousecursor_wait(); + $o->{rwindow}->destroy; flush(); } sub DESTROY { goto &destroy } @@ -869,57 +781,24 @@ sub sync { show($o); flush(); } -sub flush { gtkflush() } +sub flush() { gtkflush() } +sub shrink_topwindow { + my ($o) = @_; + $o->{real_window}->signal_emit('size_allocate', Gtk2::Gdk::Rectangle->new(-1, -1, -1, -1)); +} sub exit { - gtkset_mousecursor_normal(); #- for restoring a normal in any case flush(); - c::_exit($_[1]) #- workaround + if ($::isStandalone) { + require standalone; + standalone::__exit($_[1]); #- workaround + } else { + c::_exit($_[1]); #- workaround + } } #- in case "exit" above was not called by the program END { &exit() } -sub _create_window($$) { - my ($o, $title) = @_; - my $w = Gtk2::Window->new('toplevel'); - my $inner = gtkadd(gtkset_shadow_type(Gtk2::Frame->new(undef), 'out'), - my $f = gtkset_border_width(gtkset_shadow_type(Gtk2::Frame->new(undef), 'none'), 3) - ); - gtkadd($w, $inner) if !$::noBorder; - $w->set_name("Title"); - $w->set_title($title); - - $w->signal_connect(expose_event => sub { eval { $interactive::objects[-1]{rwindow} == $w and $w->window->XSetInputFocus } }) if $force_focus || $o->{force_focus}; - $w->signal_connect(delete_event => sub { if ($::isWizard) { $w->destroy; die 'wizcancel' } else { Gtk2->main_quit } }); - $w->set_uposition(@{$force_position || $o->{force_position}}) if $force_position || $o->{force_position}; - - if ($::o->{mouse}{unsafe}) { - $w->add_events('pointer-motion-mask'); - my $signal; #- don't make this line part of next one, signal_disconnect won't be able to access $signal value - $signal = $w->signal_connect(motion_notify_event => sub { - delete $::o->{mouse}{unsafe}; - log::l("unsetting unsafe mouse"); - $w->signal_disconnect($signal); - }); - } - - my ($wi, $he); - $w->signal_connect(size_allocate => sub { - my (undef, $event) = @_; - my $w_size = $event->values; - return if $w_size->[2] == $wi && $w_size->[3] == $he; - (undef, undef, $wi, $he) = @{$w_size}; - - my ($X, $Y, $Wi, $He) = @{$force_center || $o->{force_center}}; - $w->set_uposition(max(0, $X + ($Wi - $wi) / 2), max(0, $Y + ($He - $he) / 2)); - - }) if ($force_center || $o->{force_center}) && !($force_position || $o->{force_position}); - - $o->{window} = $::noBorder ? $w : $f; - $o->{rwindow} = $w; -} - - # -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- # ask # @@ -934,7 +813,7 @@ sub ask_dir { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_dir(@_); sub _ask_from_entry($$@) { my ($o, @msgs) = @_; - my $entry = Gtk2::Entry->new; + my $entry = gtknew('Entry'); my $f = sub { $o->{retval} = $entry->get_text; Gtk2->main_quit }; $o->{ok_clicked} = $f; $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk2->main_quit }; @@ -951,7 +830,7 @@ sub _ask_warn($@) { my ($o, @msgs) = @_; gtkadd($o->{window}, gtkpack($o->create_box_with_title(@msgs), - gtksignal_connect(my $w = Gtk2::Button->new(N("Ok")), "clicked" => sub { Gtk2->main_quit }), + my $w = gtknew('Button', text => N("Ok"), clicked => sub { Gtk2->main_quit }), ), ); $w->grab_focus; @@ -969,29 +848,52 @@ sub _ask_okcancel($@) { $o->{ok}->grab_focus; } +sub create_file_selector { + my (%opts) = @_; + my $w = ugtk2->new(delete $opts{title}, modal => 1); + my ($message, $save, $want_a_dir) = (delete $opts{message}, delete $opts{save}, delete $opts{want_a_dir}); + my $action = $want_a_dir ? ($save ? 'create_folder' : 'select_folder') : ($save ? 'save' : 'open'); + add2hash(\%opts, { width => 480, height => 250 }); + gtkadd($w->{window}, + gtkpack_(create_box_with_title($w, $message), + 1, $w->{chooser} = gtknew('FileChooser', action => $action, %opts), + 0, create_okcancel($w), + )); + $w->{chooser}->signal_connect(file_activated => sub { $w->{ok}->clicked }); + $w; +} + +sub file_selected_check { + my ($save, $want_a_dir, $file) = @_; + + if (!$file) { + N("No file chosen"); + } elsif (-f $file && $want_a_dir) { + N("You have chosen a file, not a directory"); + } elsif (-d $file && !$want_a_dir) { + N("You have chosen a directory, not a file"); + } elsif (!-e $file && !$save) { + $want_a_dir ? N("No such directory") : N("No such file"); + } else { + ''; + } +} sub _ask_file { my ($o, $title, $path) = @_; - my ($modality, $position) = ($o->{rwindow}->get_modal, $o->{rwindow}->window_position); - my $f = $o->{rwindow} = Gtk2::FileSelection->new($title); - $f->set_modal($modality); - $f->set_position($position); - $path and $f->set_filename($path); - $f->ok_button->signal_connect(clicked => sub { $o->{retval} = $f->get_filename; Gtk2->main_quit }); - $f->cancel_button->signal_connect(clicked => sub { Gtk2->main_quit }); - $f->grab_focus; - $f; -} + my $w = create_file_selector(title => $title, want_a_dir => 0, directory => $path); + put_in_hash($o, $w); + + $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename }); +} sub _ask_dir { - my ($o) = @_; - my $f = _ask_file(@_); - $f->file_list->get_parent->hide; - $f->selection_entry->get_parent->hide; - $f->ok_button->signal_connect(clicked => sub { - my ($model, $iter) = $f->dir_list->get_selection->get_selected; - if ($model) { $o->{retval} .= $model->get($iter, 0); $iter->free } - }); + my ($o, $title, $path) = @_; + + my $w = create_file_selector(title => $title, want_a_dir => 1, directory => $path); + put_in_hash($o, $w); + + $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename }); } sub ask_browse_tree_info { @@ -999,57 +901,62 @@ sub ask_browse_tree_info { my $w = ugtk2->new($common->{title}); - my $tree_model = Gtk2::TreeStore->new(Gtk2::GType->STRING, Gtk2::GType->OBJECT, Gtk2::GType->STRING); + my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String"); my $tree = Gtk2::TreeView->new_with_model($tree_model); $tree->get_selection->set_mode('browse'); $tree->append_column(my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); $tree->append_column(my $pixcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererPixbuf->new, 'pixbuf' => 1)); $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 2)); $tree->set_headers_visible(0); - $textcolumn->set_minmax_width(200); + $tree->set_rules_hint(1); + $textcolumn->set_min_width(200); + $textcolumn->set_max_width(200); gtkadd($w->{window}, - gtkpack_(Gtk2::VBox->new(0,5), - 0, $common->{message}, - 1, gtkpack(Gtk2::HBox->new(0,0), - create_scrolled_window($tree), - gtkadd(Gtk2::Frame->new(N("Info")), - create_scrolled_window(my $info = Gtk2::TextView->new), - )), - 0, my $box1 = Gtk2::HBox->new(0,15), - 0, my $box2 = Gtk2::HBox->new(0,10), - )); - gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new('horizontal', 'icons')); + gtknew('VBox', spacing => 5, children => [ + 0, gtknew('Title2', label => $common->{message}, + # workaround infamous 6 years old gnome bug #101968: + width => mygtk2::get_label_width()), + 1, gtknew('VBox', children => [ + 1, gtknew('ScrolledWindow', child => $tree), + 0, gtknew('Frame', text => N("Info"), child => + gtknew('ScrolledWindow', child => my $info = gtknew('TextView', editable => 0, height => 100)), + ) ]), + 0, Gtk2::HSeparator->new, + 0, my $status = gtknew('Label'), + if_($common->{auto_deps}, + 0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps}) + ), + 0, Gtk2::HSeparator->new, + 0, my $box2 = gtknew('HBox', spacing => 10), + ])); + + gtkpack__($box2, gtknew(($::isInstall ? 'Install_Button' : 'Button'), text => N("Help"), + clicked => $common->{interactive_help})) if $common->{interactive_help}; + + #gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new('horizontal', 'icons')); + gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new); my @l = ([ $common->{ok}, 1 ], if_($common->{cancel}, [ $common->{cancel}, 0 ])); @l = reverse @l if !$::isInstall; my @buttons = map { my ($t, $val) = @$_; - $box2->pack_end(my $w = gtksignal_connect(Gtk2::Button->new($t), clicked => sub { - $w->{retval} = $val; - Gtk2->main_quit; - }), 0, 1, 20); + $box2->pack_end(my $w = gtknew('Button', text => $t, clicked => sub { + $w->{retval} = $val; + Gtk2->main_quit; + }), 0, 1, 20); + $w->show; $w; } @l; @buttons = reverse @buttons if !$::isInstall; - gtkpack__($box2, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { - ask_warn(N("Help"), $common->{interactive_help}->()) - })) if $common->{interactive_help}; - - if ($common->{auto_deps}) { - gtkpack__($box1, gtksignal_connect(gtkset_active(Gtk2::CheckButton->new($common->{auto_deps}), $common->{state}{auto_deps}), - clicked => sub { invbool \$common->{state}{auto_deps} })); - } - $box1->pack_end(my $status = Gtk2::Label->new, 0, 1, 20); + $status->show; - $w->{window}->set_size_request(map { $_ - 2 * $border - 4 } $::windowwidth, $::windowheight) if !$::isInstall; + $w->{window}->set_size_request(map { $_ - 2 * $border - 4 } $w->{windowwidth}, $w->{windowheight}) if !$::isInstall; $buttons[0]->grab_focus; - $w->{rwindow}->show_all; + $w->{rwindow}->show; - my @toolbar = (ftout => [ N("Expand Tree"), sub { $tree->expand_all } ], - ftin => [ N("Collapse Tree"), sub { $tree->collapse_all } ], - reload => [ N("Toggle between flat and group sorted"), sub { invbool(\$common->{state}{flat}); $common->{rebuild_tree}->() } ]); + my @toolbar; foreach my $ic (@{$common->{icons} || []}) { push @toolbar, ($ic->{icon} => [ $ic->{help}, sub { if ($ic->{code}) { @@ -1064,31 +971,36 @@ sub ask_browse_tree_info { $toolbar->append_item(undef, $toolbar{$_}[0], undef, gtkcreate_img("$_.png"), $toolbar{$_}[1]); } - my $widgets = { w => $w, tree => $tree, tree_model => $tree_model, textcolumn => $textcolumn, pixcolumn => $pixcolumn, - info => $info, status => $status }; - ask_browse_tree_info_given_widgets($common, $widgets); + $pixcolumn->{is_pix} = 1; + $common->{widgets} = { w => $w, tree => $tree, tree_model => $tree_model, + info => $info, status => $status }; + ask_browse_tree_info_given_widgets($common); } sub ask_browse_tree_info_given_widgets { - my ($common, $w) = @_; + my ($common) = @_; + my $w = $common->{widgets}; + my ($curr, $prev_label, $idle, $mouse_toggle_pending); my (%wtree, %ptree, %pix, %node_state, %state_stats); my $update_size = sub { - my $new_label = $common->{get_status}(); - $prev_label ne $new_label and $w->{status}->set($prev_label = $new_label); + if ($w->{status}) { + my $new_label = $common->{get_status}(); + $prev_label ne $new_label and $w->{status}->set($prev_label = $new_label); + } }; my $set_node_state_flat = sub { my ($iter, $state) = @_; $state eq 'XXX' and return; - $pix{$state} ||= gtkcreate_pixbuf($state); - $w->{tree_model}->set($iter, [ 1 => $pix{$state} ]); + $pix{$state} ||= gtkcreate_pixbuf($state); + $w->{tree_model}->set($iter, 1 => $pix{$state}); }; my $set_node_state_tree; $set_node_state_tree = sub { my ($iter, $state) = @_; my $iter_str = $w->{tree_model}->get_path_str($iter); $state eq 'XXX' and return; - $pix{$state} ||= gtkcreate_pixbuf($state); + $pix{$state} ||= gtkcreate_pixbuf($state); if ($node_state{$iter_str} ne $state) { my $parent; if (!$w->{tree_model}->iter_has_child($iter) && ($parent = $w->{tree_model}->iter_parent($iter))) { @@ -1097,9 +1009,8 @@ sub ask_browse_tree_info_given_widgets { my @list = grep { $stats->{$_} > 0 } keys %$stats; my $new_state = @list == 1 ? $list[0] : 'semiselected'; $node_state{$parent_str} ne $new_state and $set_node_state_tree->($parent, $new_state); - $parent->free; } - $w->{tree_model}->set($iter, [ 1 => $pix{$state} ]); + $w->{tree_model}->set($iter, 1 => $pix{$state}); $node_state{$iter_str} = $state; #- cache for efficiency } }; @@ -1137,21 +1048,19 @@ sub ask_browse_tree_info_given_widgets { #- if leaf is void, we may create the parent and one child (to have the [+] in front of the parent in the ctree) #- though we use '' as the label of the child; then rpmdrake will connect on tree_expand, and whenever #- the first child has '' as the label, it will remove the child and add all the "right" children - $options->{nochild} or $w->{tree_model}->append_set($parent, [ 0 => '' ])->free; + $options->{nochild} or $w->{tree_model}->append_set($parent, [ 0 => '' ]); } }; my $clear_all_caches = sub { foreach (values %ptree) { foreach my $n (@$_) { delete $node_state{$w->{tree_model}->get_path_str($n)}; - $n->free; } } foreach (values %wtree) { my $iter_str = $w->{tree_model}->get_path_str($_); delete $node_state{$iter_str}; delete $state_stats{$iter_str}; - $_->free; } %ptree = %wtree = (); }; @@ -1187,13 +1096,11 @@ sub ask_browse_tree_info_given_widgets { delete $wtree{$_->[1]}; delete $node_state{$w->{tree_model}->get_path_str($_->[0])}; delete $state_stats{$w->{tree_model}->get_path_str($_->[0])}; - $_->[0]->free; } } } foreach (@to_remove) { delete $node_state{$w->{tree_model}->get_path_str($_)}; - $_->free; } @{$ptree{$_}} = difference2($ptree{$_}, \@to_remove); } @@ -1202,7 +1109,6 @@ sub ask_browse_tree_info_given_widgets { delete $node_state{$iter_str}; delete $state_stats{$iter_str}; $w->{tree_model}->remove($wtree{$cat}); - $wtree{$cat}->free; delete $wtree{$cat}; } &$update_size; @@ -1214,14 +1120,12 @@ sub ask_browse_tree_info_given_widgets { }; $common->{display_info} = sub { gtktext_insert($w->{info}, $common->{get_info}($curr)); 0 }; - my $children = sub { map { my $v = $w->{tree_model}->get($_, 0); $_->free; $v } gtktreeview_children($w->{tree_model}, $_[0]) }; + my $children = sub { map { $w->{tree_model}->get($_, 0) } gtktreeview_children($w->{tree_model}, $_[0]) }; my $toggle = sub { if (ref($curr) && !$_[0]) { - $w->{tree}->toggle_expansion(my $path = $w->{tree_model}->get_path($curr)); - $path->free; + $w->{tree}->toggle_expansion($w->{tree_model}->get_path($curr)); } else { if (ref $curr) { - my @_a = $children->($curr); my @l = $common->{grep_allowed_to_toggle}($children->($curr)) or return; my @unsel = $common->{grep_unselected}(@l); my @p = @unsel ? @@ -1239,21 +1143,23 @@ sub ask_browse_tree_info_given_widgets { $w->{tree}->signal_connect(key_press_event => sub { my $c = chr($_[1]->keyval & 0xff); - if ($_[1]->keyval >= 0x100 ? $c eq "\r" || $c eq "\x8d" : $c eq ' ') { - Gtk2->update_ui; #- ultra dirty hackish so that gtk - Gtk2->timeout_add(1, sub { $toggle->(0), 0 }) #- will not loop forever + if ($_[1]->keyval >= 0x100 ? member($c, "\r", "\x8d") : $c eq ' ') { + $toggle->(0); } 0; }); + $w->{tree}->get_selection->signal_connect(changed => sub { my ($model, $iter) = $_[0]->get_selected; $model && $iter or return; - Gtk2->timeout_remove($idle) if $idle; + if ($idle) { + Glib::Source->remove($idle); + undef $idle; + } - $curr->free if ref $curr; if (!$model->iter_has_child($iter)) { $curr = $model->get($iter, 0); - $idle = Gtk2->timeout_add(100, $common->{display_info}); + $idle = Glib::Timeout->add(100, $common->{display_info}); } else { $curr = $iter; } @@ -1261,22 +1167,487 @@ sub ask_browse_tree_info_given_widgets { #- two changed events, the first being on a different row :/ (is it a bug in gtk2?) - that #- happens in rpmdrake when doing a "search" and directly trying to select a found package if ($mouse_toggle_pending eq $model->get($iter, 0)) { - Gtk2->update_ui; - Gtk2->timeout_add(1, sub { $toggle->(1), $mouse_toggle_pending = 0 }); + $toggle->(1); + $mouse_toggle_pending = 0; } 0; }); - $w->{tree}->signal_connect(button_press_event => sub { #- not too good, but CellRendererPixbuf doesn't have the needed signals :( - my ($returns, $path, $column) = $w->{tree}->get_path_at_pos($_[1]->x, $_[1]->y); - if ($returns) { - Gtk2->equals($column, $w->{pixcolumn}) and $mouse_toggle_pending = $w->{tree_model}->get($path, 0); - $path->free; + $w->{tree}->signal_connect(button_press_event => sub { #- not too good, but CellRendererPixbuf does not have the needed signals :( + my ($path, $column) = $w->{tree}->get_path_at_pos($_[1]->x, $_[1]->y); + if ($path && $column) { + $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0); } + 0; }); $common->{rebuild_tree}->(); &$update_size; + $common->{initial_selection} and $common->{toggle_nodes}($set_leaf_state, @{$common->{initial_selection}}); my $_b = before_leaving { $clear_all_caches->() }; + $common->{init_callback}->() if $common->{init_callback}; $w->{w}->main; } +sub gtk_set_treelist { + my ($treelist, $l) = @_; + + my $list = $treelist->get_model; + $list->clear; + $list->append_set([ 0 => $_ ]) foreach @$l; +} + + +sub gtk_TextView_get_log { + my ($log_w, $command, $filter_output, $when_command_is_over) = @_; + + my $pid = open(my $F, "$command |") or return; + common::nonblock($F); + + my $gtk_buffer = $log_w->get_buffer; + $log_w->signal_connect(destroy => sub { + kill 9, $pid if $pid; #- we do not continue in background + $pid = $gtk_buffer = ''; #- ensure $gtk_buffer is valid when its value is non-null + }); + + Glib::Timeout->add(100, sub { + if ($gtk_buffer) { + my $end = $gtk_buffer->get_end_iter; + while (defined (my $s = <$F>)) { + $gtk_buffer->insert($end, $filter_output->($s)); + } + $log_w->{to_bottom}->(); + } + if (waitpid($pid, c::WNOHANG()) > 0) { + #- we do not call $when_command_is_over if $gtk_buffer does not exist anymore + #- since it is not a normal case + $when_command_is_over->($gtk_buffer) if $when_command_is_over && $gtk_buffer; + $pid = ''; + 0; + } else { + to_bool($gtk_buffer); + } + }); + $pid; #- $pid becomes invalid after $when_command_is_over is called +} + +sub gtk_new_TextView_get_log { + my ($command, $filter_output, $when_command_is_over) = @_; + + my $log_w = gtknew('TextView', editable => 0); + my $log_scroll = gtknew('ScrolledWindow', child => $log_w, to_bottom => 1); + my $pid = gtk_TextView_get_log($log_w, $command, $filter_output, $when_command_is_over) or return; + $log_scroll, $pid; +} + +# misc helpers: + +package Gtk2::TreeStore; +sub append_set { + my ($model, $parent, @values) = @_; + # compatibility: + @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY'; + my $iter = $model->append($parent); + $model->set($iter, @values); + return $iter; +} + + +package Gtk2::ListStore; +# Append a new row, set the values, return the TreeIter +sub append_set { + my ($model, @values) = @_; + # compatibility: + @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY'; + my $iter = $model->append; + $model->set($iter, @values); + return $iter; +} + + +package Gtk2::TreeModel; +# gets the string representation of a TreeIter +sub get_path_str { + my ($self, $iter) = @_; + my $path = $self->get_path($iter); + $path or return; + $path->to_string; +} + +sub iter_each_children { + my ($model, $iter, $f) = @_; + for (my $child = $model->iter_children($iter); $child; $child = $model->iter_next($child)) { + $f->($child); + } +} + +package Gtk2::TreeView; +# likewise gtk-1.2 function +sub toggle_expansion { + my ($self, $path, $b_open_all) = @_; + if ($self->row_expanded($path)) { + $self->collapse_row($path); + } else { + $self->expand_row($path, $b_open_all || 0); + } +} + + +# With GTK+, for more GUIes coherency, GtkOptionMenu is recommended instead of a +# combo if the user is selecting from a fixed set of options. +# +# That is, non-editable combo boxes are not encouraged. GtkOptionMenu is much +# easier to use than GtkCombo as well. Use GtkCombo only when you need the +# editable text entry. +# +# GtkOptionMenu is a much better-implemented widget and also the right UI for +# noneditable sets of choices.) +# +# GtkCombo is deprecated in 2.4.x because it still uses deprecated +# GtkList. GtkOption menu is deprecated in order to have an unified widget. +# +# GtkComBox widget replaces GtkOption menu whereas GtkComBoxEntry replaces GtkCombo. +# +# +# This layer try to make OptionMenu and ComboBox look being api +# compatible with Combo since its API is quite nice. + +package Gtk2::OptionMenu; +use MDK::Common; + +# try to get combox <==> option menu mapping +sub set_popdown_strings { + my ($w, @strs) = @_; + my $menu = Gtk2::Menu->new; + # keep string list around for ->set_text compatibilty helper + $w->{strings} = \@strs; + #$w->set_menu((ugtk2::create_factory_menu($window, [ "File", (undef) x 3, '<Branch>' ], map { [ "File/" . $_, (undef) x 3, '<Item>' ] } @strs))[0]); + $menu->append(ugtk2::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs; + $w->set_menu($menu); + $w; +} + +sub new_with_strings { + my ($class, $strs, $o_val) = @_; + my $w = $class->new; + $w->set_popdown_strings(@$strs); + $w->set_text($o_val) if $o_val; + $w; +} + +sub entry { + my ($w) = @_; + return $w; +} + +sub get_text { + my ($w) = @_; + $w->get_history == -1 ? '' : $w->{strings}[$w->get_history]; +} + +sub set_text { + my ($w, $val) = @_; + each_index { + if ($_ eq $val) { + $w->set_history($::i); + return; + } + } @{$w->{strings}}; +} + + + + +package Gtk2::ComboBox; +use MDK::Common; + +# try to get combox <==> option menu mapping +sub set_popdown_strings { + my ($w, @strs) = @_; + $w->get_model->clear; + # keep string list around for ->set_text compatibilty helper + $w->{strings} = \@strs; + $w->append_text($_) foreach @strs; + $w; +} + +sub new_with_strings { + my ($class, $strs, $o_val) = @_; + my $w = $class->new_text; + $w->set_popdown_strings(@$strs); + $w->set_text($o_val) if $o_val; + $w; +} + +sub entry { + my ($w) = @_; + return $w; +} + +sub get_text { + my ($w) = @_; + $w->get_active == -1 ? '' : $w->{strings}[$w->get_active]; +} + +sub set_text { + my ($w, $val) = @_; + eval { + my $val_index = find_index { $_ eq $val } @{$w->{strings}}; + $w->set_active($val_index); + }; + # internal_error(qq(impossible to lookup "$val":\n\t) . chomp_($@)) if $@; +} + + +package Gtk2::Label; +sub set { + my ($label, $text) = @_; + mygtk2::gtkset($label, text => $text); +} + + +package Gtk2::WrappedLabel; +sub new { + my ($_type, $o_text, $o_align) = @_; + mygtk2::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]); +} + + +package Gtk2::Entry; +sub new_with_text { + my ($_class, $o_text) = @_; + mygtk2::gtknew('Entry', text => $o_text); +} + + +package Gtk2::Banner; + +use MDK::Common; +use mygtk2 qw(gtknew); +use ugtk2 qw(:helpers :wrappers); + +sub set_pixmap { + my ($darea) = @_; + return if !$darea->realized; + ugtk2::set_back_pixbuf($darea, $darea->{back_pixbuf}); + update_text($darea); +} + +sub update_text { + my ($darea) = @_; + $darea->{layout} = $darea->create_pango_layout($darea->{text}); + $darea->{txt_width} = first($darea->{layout}->get_pixel_size); + $darea->queue_draw; +} + + +sub new { + my ($_class, $icon, $text, $o_options) = @_; + + mygtk2::import_style_ressources(); + my $darea = gtknew('DrawingArea', widget_name => 'Banner'); + $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); + my $d_height = $darea->{back_pixbuf}->get_height; + $darea->set_size_request(-1, $d_height); + $darea->modify_font(Gtk2::Pango::FontDescription->from_string("13")); + eval { $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon) }; + $darea->{icon} ||= ugtk2::gtkcreate_pixbuf(ugtk2::wm_icon()); + my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk2::text_direction_rtl()) }; + my $blue_width = $blue_part->get_width; + $darea->{text} = $text; + require lang; + my $is_rtl = lang::text_direction_rtl(); + + $darea->signal_connect(realize => \&set_pixmap); + $darea->signal_connect("style-set" => \&set_pixmap); + $darea->signal_connect(expose_event => sub { + my $style = $darea->get_style; + my $height = $darea->{icon}->get_height; + my $width = $darea->{icon}->get_width; + # fix icon position when not using the default height: + (undef, undef, undef, $d_height) = $darea->window->get_geometry; + my $padding = int(($d_height - $height)/2); + my $d_width = $darea->allocation->width; + my $x_blue = $is_rtl ? $d_width - $blue_width : 0; + my $x_icon = $is_rtl ? $d_width - 12 - $width : 12; + # here: 10 is the amount of padding (white background) wish to add betwen text & blue background: + my $x_text = $is_rtl ? $d_width - $blue_width - 10 - $darea->{txt_width} : $blue_width + 10; + $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size); + $blue_part->render_to_drawable($darea->window, $style->bg_gc('normal'), + 0, 0, $x_blue, 0, -1, -1, 'none', 0, 0); + $darea->{icon}->render_to_drawable($darea->window, $style->bg_gc('normal'), + 0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0); + $darea->window->draw_layout($style->fg_gc('normal'), $x_text, + $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2, + $darea->{layout}); + 1; + }); + + return $darea; +} + + +package Gtk2::MDV::CellRendererPixWithLabel; + +use MDK::Common; +use Glib::Object::Subclass "Gtk2::CellRenderer", + properties => [ + Glib::ParamSpec->string("label", "Label", "A meaningfull label", "", [qw(readable writable)]), + Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk2::Gdk::Pixbuf', [qw(readable writable)]), + ]; + +my $x_padding = 2; +my $y_padding = 2; + +sub INIT_INSTANCE {} + +sub pixbuf_size { + my ($cell) = @_; + my $pixbuf = $cell->get('pixbuf'); + $pixbuf ? ($pixbuf->get_width, $pixbuf->get_height) : (0, 0); +} + +sub calc_size { + my ($cell, $layout) = @_; + my ($width, $height) = $layout->get_pixel_size; + my ($pwidth, $pheight) = pixbuf_size($cell); + + return 0, 0, + $width + $x_padding * 3 + $pwidth, + max($pheight, $height + $y_padding * 2); +} + +sub GET_SIZE { + my ($cell, $widget, $_cell_area) = @_; + + my $layout = get_layout($cell, $widget); + $layout->set_text($cell->get('label')); + + return calc_size($cell, $layout); +} + +sub get_layout { + my ($_cell, $widget) = @_; + return $widget->create_pango_layout(""); +} + +sub RENDER { # not that efficient... + my ($cell, $window, $widget, $_background_area, $cell_area, $_expose_area, $flags) = @_; + my $state; + if ($flags & 'selected') { + $state = $widget->has_focus + ? 'selected' + : 'active'; + } else { + $state = $widget->state eq 'insensitive' + ? 'insensitive' + : 'normal'; + } + + my $layout = get_layout($cell, $widget); + $layout->set_text($cell->get('label')); + + my $is_rtl = lang::text_direction_rtl(); + my $txt_width = first($layout->get_pixel_size); + + my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout); + my $pixbuf = $cell->get('pixbuf'); + my ($pwidth, $pheight) = pixbuf_size($cell); + my $txt_offset = $cell_area->x + $x_offset + $x_padding * 2 + $pwidth; + + if ($pixbuf) { + $pixbuf->render_to_drawable($window, $widget->style->fg_gc('normal'), + 0, 0, + $is_rtl ? $cell_area->width - $cell_area->x - $pwidth : $cell_area->x ,#+ $x_padding, + $cell_area->y, #+ $y_padding, + $pwidth, $pheight, 'none', 0, 0); + } + $widget->get_style->paint_layout($window, + $state, + 1, + $cell_area, + $widget, + "cellrenderertext", + $is_rtl ? $cell_area->width - $txt_width - $txt_offset : $txt_offset, + $cell_area->y + $y_offset + $y_padding, + $layout); + +} + +1; + + +package Gtk2::Notify::Queue; + +sub new { + my ($class, $statusicon) = @_; + + require Gtk2::Notify; + + my $self = bless { + queue => [], + statusicon => $statusicon, + display => 5000, + delay => 500, + }, $class; + $self; +} + +sub process_next { + my ($self) = @_; + shift @{$self->{queue}}; + #- wait for some time so that the new notification is noticeable + @{$self->{queue}} and Glib::Timeout->add($self->{delay}, sub { $self->show; 0 }); +} + +sub add { + my ($self, $info) = @_; + push @{$self->{queue}}, $info; + @{$self->{queue}} == 1 and $self->show; +} + +sub show { + my ($self) = @_; # perl_checker: $self = Gtk2::Notify->new + my $info = $self->{queue}[0]; + my $notification = Gtk2::Notify->new($info->{title}, $info->{message}, $self->{statusicon}); + $notification->set_icon_from_pixbuf($info->{pixbuf}) if $info->{pixbuf}; + $notification->set_urgency($info->{urgency}) if $info->{urgency}; + foreach my $a (@{$info->{actions} || []}) { + $notification->add_action( + $a->{action}, $a->{label}, + sub { + $info->{processed} = 1; + #- $a->{callback} has to call $selft->process_next when done + $a->{callback}->(); + }); + } + $notification->signal_connect(closed => sub { + $info->{processed} and return; + $info->{timeout}->() if $info->{timeout}; + $self->process_next; + }); + # this makes net_applet to segfault (mga#9102): + #eval { $notification->show }; +} + +1; + + +package Gtk2::GUI_Update_Guard; + +use MDK::Common::Func qw(before_leaving); +use ugtk2; + +sub new { + my ($_class) = @_; # prevent a perl_checker warning in callers + my $old_signal = $SIG{ALRM}; + $SIG{ALRM} = sub { + ugtk2::gtkflush(); + alarm(1); + }; + alarm(1); + return before_leaving { + alarm(0); + $SIG{ALRM} = $old_signal || 'DEFAULT'; # restore default action + }; +} + 1; |