--- deliantra/Deliantra-Client/DC/UI.pm 2006/07/02 13:57:58 1.316 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/07/23 16:46:06 1.336 @@ -81,11 +81,24 @@ if $FOCUS; } +sub check_hover { + my ($widget) = @_; + + if ($widget != $HOVER) { + my $hover = $HOVER; $HOVER = $widget; + + $hover->update if $hover && $hover->{can_hover}; + $HOVER->update if $HOVER && $HOVER->{can_hover}; + + $TOOLTIP_WATCHER->start; + } +} + sub feed_sdl_button_down_event { my ($ev) = @_; my ($x, $y) = ($ev->{x}, $ev->{y}); - if (!$BUTTON_STATE) { + unless ($BUTTON_STATE) { my $widget = $ROOT->find_widget ($x, $y); $GRAB = $widget; @@ -96,26 +109,34 @@ $BUTTON_STATE |= 1 << ($ev->{button} - 1); - $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) - if $GRAB; + if ($GRAB) { + if ($ev->{button} == 4 || $ev->{button} == 5) { + # mousewheel + $ev->{dx} = 0; + $ev->{dy} = $ev->{button} * 2 - 9; + $GRAB->emit (mouse_wheel => $ev); + } else { + $GRAB->emit (button_down => $ev) + } + } } sub feed_sdl_button_up_event { my ($ev) = @_; - my ($x, $y) = ($ev->{x}, $ev->{y}); - my $widget = $GRAB || $ROOT->find_widget ($x, $y); + my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y}); $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); - $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) - if $GRAB; + $GRAB->emit (button_up => $ev) + if $GRAB && $ev->{button} != 4 && $ev->{button} != 5; - if (!$BUTTON_STATE) { + unless ($BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; $grab->update if $grab; $GRAB->update if $GRAB; + check_hover $widget; $TOOLTIP_WATCHER->cb->(); } } @@ -126,16 +147,9 @@ my $widget = $GRAB || $ROOT->find_widget ($x, $y); - if ($widget != $HOVER) { - my $hover = $HOVER; $HOVER = $widget; - - $hover->update if $hover && $hover->{can_hover}; - $HOVER->update if $HOVER && $HOVER->{can_hover}; - - $TOOLTIP_WATCHER->start; - } + check_hover $widget; - $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) + $HOVER->emit (mouse_motion => $ev) if $HOVER; } @@ -195,6 +209,14 @@ ############################################################################# +package CFClient::UI::Event; + +sub xy { + $_[1]->coord2local ($_[0]{x}, $_[0]{y}) +} + +############################################################################# + package CFClient::UI::Base; use strict; @@ -347,8 +369,8 @@ if ($self->{aspect}) { my ($ow, $oh) = ($w, $h); - $w = List::Util::min $w, int $h * $self->{aspect}; - $h = List::Util::min $h, int $w / $self->{aspect}; + $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; + $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; # use alignment to adjust x, y @@ -409,6 +431,8 @@ sub coord2local { my ($self, $x, $y) = @_; + Carp::confess unless $self->{parent};#d# + $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) } @@ -416,6 +440,8 @@ sub coord2global { my ($self, $x, $y) = @_; + Carp::confess unless $self->{parent};#d# + $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) } @@ -425,10 +451,9 @@ return if $FOCUS == $self; return unless $self->{can_focus}; - my $focus = $FOCUS; $FOCUS = $self; + $FOCUS = $self; - $focus->update if $focus; - $FOCUS->update; + $self->update; 0 } @@ -438,9 +463,9 @@ return unless $FOCUS == $self; - my $focus = $FOCUS; undef $FOCUS; + undef $FOCUS; - $focus->update if $focus; #? + $self->update; $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus unless $FOCUS; @@ -451,35 +476,58 @@ sub grab_focus { my ($self) = @_; + $FOCUS->emit ("focus_out") if $FOCUS; $self->emit ("focus_in"); } -sub invoke_mouse_motion { 1 } -sub invoke_button_up { 1 } -sub invoke_key_down { 1 } -sub invoke_key_up { 1 } +sub invoke_mouse_motion { 0 } +sub invoke_button_up { 0 } +sub invoke_key_down { 0 } +sub invoke_key_up { 0 } +sub invoke_mouse_wheel { 0 } sub invoke_button_down { my ($self, $ev, $x, $y) = @_; $self->grab_focus; - 1 + 0 } sub connect { my ($self, $signal, $cb) = @_; push @{ $self->{signal_cb}{$signal} }, $cb; + + defined wantarray and CFClient::guard { + @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, + @{ $self->{signal_cb}{$signal} }; + } } +my %has_coords = ( + button_down => 1, + button_up => 1, + mouse_motion => 1, + mouse_wheel => 1, +); + sub emit { my ($self, $signal, @args) = @_; + # I do not really like this solution, but I dislike duplication + # and needlessly verbose code, too. + my @append + = $has_coords{$signal} + ? $args[0]->xy ($self) + : (); + + #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# + #d##TODO# stop propagating at first true, do not use sum - (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before - || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure - || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent + (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before + || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure + || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent } sub find_widget { @@ -589,6 +637,8 @@ sub DESTROY { my ($self) = @_; + return if CFClient::in_destruct; + delete $WIDGET{$self+0}; eval { $self->destroy }; @@ -683,6 +733,14 @@ $self } +sub realloc { + my ($self) = @_; + + $self->{force_realloc} = 1; + $self->{force_size_alloc} = 1; + $self->SUPER::realloc; +} + sub add { my ($self, @widgets) = @_; @@ -977,8 +1035,9 @@ ; $self = $class->SUPER::new ( - vp => (new CFClient::UI::ViewPort expand => 1), - slider => $slider, + vp => (new CFClient::UI::ViewPort expand => 1), + can_events => 1, + slider => $slider, %arg, ); @@ -996,6 +1055,16 @@ $self->{vp}->add ($self->{child} = $widget); } +sub invoke_mouse_wheel { + my ($self, $ev) = @_; + + return 0 unless $ev->{dy}; # only vertical movements + + $self->{slider}->emit (mouse_wheel => $ev); + + 1 +} + sub update_slider { my ($self) = @_; @@ -1082,8 +1151,8 @@ border_bg => [1, 1, 1, 1], border => 0.6, can_events => 1, - min_w => 16, - min_h => 16, + min_w => 64, + min_h => 32, %arg, ); @@ -1098,7 +1167,7 @@ $self->{close_button} = new CFClient::UI::ImageButton path => 'x1_close.png', - on_activate => sub { $self->hide }; + on_activate => sub { $self->emit ("delete") }; $self->CFClient::UI::Container::add ($self->{close_button}); } @@ -1157,6 +1226,14 @@ 1 } +sub invoke_delete { + my ($self) = @_; + + $self->hide; + + 1 +} + sub invoke_button_down { my ($self, $ev, $x, $y) = @_; @@ -1289,11 +1366,16 @@ } sub add { - my ($self, $x, $y, $child) = @_; + my ($self) = shift; - $child->set_parent ($self); - $self->{children}[$y][$x] = $child; + while (@_) { + my ($x, $y, $child) = splice @_, 0, 3, (); + $child->set_parent ($self); + $self->{children}[$y][$x] = $child; + } + $self->{force_realloc} = 1; + $self->{force_size_alloc} = 1; $self->realloc; } @@ -1555,16 +1637,6 @@ $self } -sub escape($) { - local $_ = $_[0]; - - s/&/&/g; - s/>/>/g; - s/{text} eq "T$text"; $self->{text} = "T$text"; - $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; $self->{layout}->set_text ($text); delete $self->{size_req}; @@ -1601,7 +1672,6 @@ my $rgba = $markup =~ /span.*(?:foreground|background)/; - $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; $self->{layout}->set_markup ($markup); delete $self->{size_req}; @@ -1623,6 +1693,7 @@ if (exists $self->{template}) { $self->{template}->set_font ($self->{font}) if $self->{font}; + $self->{template}->set_width ($self->{max_w} || -1); $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); my ($w2, $h2) = $self->{template}->size; @@ -1666,6 +1737,7 @@ my ($self) = @_; delete $self->{size_req}; + delete $self->{texture}; $self->SUPER::reconfigure; } @@ -1675,7 +1747,7 @@ $self->SUPER::_draw; # draw background, if applicable - my $tex = $self->{texture} ||= do { + my $size = $self->{texture} ||= do { $self->{layout}->set_foreground (@{$self->{fg}}); $self->{layout}->set_font ($self->{font}) if $self->{font}; $self->{layout}->set_width ($self->{w}); @@ -1683,34 +1755,23 @@ $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - new_from_layout CFClient::Texture $self->{layout} + [$self->{layout}->size] }; unless (exists $self->{ox}) { $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} - : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} - : ($self->{w} - $tex->{w}) * 0.5); + : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} + : ($self->{w} - $size->[0]) * 0.5); $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} - : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} - : ($self->{h} - $tex->{h}) * 0.5); + : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} + : ($self->{h} - $size->[1]) * 0.5); }; - glEnable GL_TEXTURE_2D; - - my $w = List::Util::min $self->{w} + 4, $tex->{w}; - my $h = List::Util::min $self->{h} + 2, $tex->{h}; + my $w = List::Util::min $self->{w} + 4, $size->[0]; + my $h = List::Util::min $self->{h} + 2, $size->[1]; - if ($tex->{format} == GL_ALPHA) { - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glColor @{$self->{fg}}; - $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h); - } else { - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h); - } - - glDisable GL_TEXTURE_2D; + $self->{layout}->render ($self->{ox}, $self->{oy}); } ############################################################################# @@ -1831,8 +1892,8 @@ # byte-index to char-index my $text = $self->{text}; - utf8::encode $text; - $self->{cursor} = length substr $text, 0, $idx; + utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text; + $self->{cursor} = length $text; $self->_set_text ($self->{text}); $self->update; @@ -1994,42 +2055,6 @@ ############################################################################# -package CFClient::UI::ImageButton; - -our @ISA = CFClient::UI::Image::; - -use CFClient::OpenGL; - -my %textures; - -sub new { - my $class = shift; - - my $self = $class->SUPER::new ( - padding_x => 4, - padding_y => 4, - fg => [1, 1, 1], - active_fg => [0, 0, 1], - can_hover => 1, - align => 0, - valign => 0, - can_events => 1, - @_ - ); -} - -sub invoke_button_up { - my ($self, $ev, $x, $y) = @_; - - $self->emit ("activate") - if $x >= 0 && $x < $self->{w} - && $y >= 0 && $y < $self->{h}; - - 1 -} - -############################################################################# - package CFClient::UI::CheckBox; our @ISA = CFClient::UI::DrawBG::; @@ -2062,13 +2087,20 @@ (6) x 2 } +sub toggle { + my ($self) = @_; + + $self->{state} = !$self->{state}; + $self->emit (changed => $self->{state}); + $self->update; +} + sub invoke_button_down { my ($self, $ev, $x, $y) = @_; if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { - $self->{state} = !$self->{state}; - $self->emit (changed => $self->{state}); + $self->toggle; } else { return 0 } @@ -2114,10 +2146,10 @@ @_, ); - $self->{path} - or Carp::croak "required attribute 'path' not set"; + $self->{path} || $self->{tex} + or Carp::croak "'path' or 'tex' attributes required"; - $self->{tex} = $texture_cache{$self->{path}} ||= + $self->{tex} ||= $texture_cache{$self->{path}} ||= new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; Scalar::Util::weaken $texture_cache{$self->{path}}; @@ -2127,6 +2159,21 @@ $self } +sub STORABLE_freeze { + my ($self, $cloning) = @_; + + $self->{path} + or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; + + $self->{path} +} + +sub STORABLE_attach { + my ($self, $cloning, $path) = @_; + + $self->new (path => $path) +} + sub size_request { my ($self) = @_; @@ -2150,13 +2197,49 @@ glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - $tex->draw_quad_alpha (0, 0, $w, $h); + $tex->draw_quad (0, 0, $w, $h); glDisable GL_TEXTURE_2D; } ############################################################################# +package CFClient::UI::ImageButton; + +our @ISA = CFClient::UI::Image::; + +use CFClient::OpenGL; + +my %textures; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + padding_x => 4, + padding_y => 4, + fg => [1, 1, 1], + active_fg => [0, 0, 1], + can_hover => 1, + align => 0, + valign => 0, + can_events => 1, + @_ + ); +} + +sub invoke_button_up { + my ($self, $ev, $x, $y) = @_; + + $self->emit ("activate") + if $x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $self->{h}; + + 1 +} + +############################################################################# + package CFClient::UI::VGauge; our @ISA = CFClient::UI::Base::; @@ -2249,6 +2332,9 @@ my $h1 = $self->{h} * (1 - $ycut1); my $h2 = $self->{h} * (1 - $ycut2); + my $h3 = $self->{h}; + + $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3); glEnable GL_BLEND; glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, @@ -2277,8 +2363,8 @@ glBindTexture GL_TEXTURE_2D, $t3->{name}; glBegin GL_QUADS; glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; - glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; - glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; + glTexCoord 0 , $t3->{t}; glVertex 0 , $h3; + glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3; glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; glEnd; } @@ -2444,6 +2530,16 @@ 1 } +sub invoke_mouse_wheel { + my ($self, $ev) = @_; + + my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; + + $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); + + ! ! $delta +} + sub update { my ($self) = @_; @@ -2552,12 +2648,12 @@ my $self = $class->SUPER::new ( fontsize => 1, - can_events => 0, + can_events => 1, indent => 0, #font => default_font @_, - layout => (new CFClient::Layout 1), + layout => (new CFClient::Layout), par => [], height => 0, children => [ @@ -2604,6 +2700,16 @@ $self->SUPER::invoke_size_allocate ($w, $h) } +sub invoke_mouse_wheel { + my ($self, $ev) = @_; + + return 0 unless $ev->{dy}; # only vertical movements + + $self->{children}[1]->emit (mouse_wheel => $ev); + + 1 +} + sub get_layout { my ($self, $para) = @_; @@ -2728,10 +2834,6 @@ my $y = 0; - glEnable GL_BLEND; - #TODO# not correct in windows where rgba is forced off - glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; - for my $para (@{$self->{par}}) { my $h = $para->{h}; @@ -2739,15 +2841,11 @@ my $layout = $self->get_layout ($para); - my ($w, $h, $data, $format, $internalformat) = $layout->render; - - glRasterPos $para->{indent}, $y - $y0; - glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; + $layout->render ($para->{indent}, $y - $y0); if (my @w = @{ $para->{widget} }) { my @s = $layout->get_shapes; - glDisable GL_BLEND; for (@w) { my ($dx, $dy) = splice @s, 0, 2, (); @@ -2756,15 +2854,11 @@ $_->draw; } - glEnable GL_BLEND; - glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; } } $y += $h; } - - glDisable GL_BLEND; }; }); } @@ -2921,12 +3015,16 @@ my $widget = $self->{owner} or return; - my ($x, $y) = $widget->coord2global ($widget->{w}, 0); + if ($widget->{visible}) { + my ($x, $y) = $widget->coord2global ($widget->{w}, 0); - ($x, $y) = $widget->coord2global (-$self->{w}, 0) - if $x + $self->{w} > $self->{root}{w}; + ($x, $y) = $widget->coord2global (-$self->{w}, 0) + if $x + $self->{w} > $self->{root}{w}; - $self->move_abs ($x, $y); + $self->move_abs ($x, $y); + } else { + $self->hide; + } }); } @@ -3070,11 +3168,26 @@ # handle various types of items, only text for now if (!ref $widget) { - $widget = new CFClient::UI::Label - can_hover => 1, - can_events => 1, - markup => $widget, - tooltip => $tooltip + if ($widget =~ /\t/) { + my ($left, $right) = split /\t/, $widget, 2; + + $widget = new CFClient::UI::HBox + can_hover => 1, + can_events => 1, + tooltip => $tooltip, + children => [ + (new CFClient::UI::Label markup => $left, expand => 1), + (new CFClient::UI::Label markup => $right, align => +1), + ], + ; + + } else { + $widget = new CFClient::UI::Label + can_hover => 1, + can_events => 1, + markup => $widget, + tooltip => $tooltip; + } } $self->{item}{$widget} = $item; @@ -3153,6 +3266,12 @@ if @{ $self->{children} }; } +sub get_current_page { + my ($self) = @_; + + $self->{current} +} + sub set_current_page { my ($self, $page_or_widget) = @_; @@ -3228,6 +3347,12 @@ $self->{multiplexer}->add ($widget); } +sub get_current_page { + my ($self) = @_; + + $self->{multiplexer}->get_current_page +} + sub set_current_page { my ($self, $page) = @_; @@ -3440,42 +3565,62 @@ package CFClient::UI::Inventory; -our @ISA = CFClient::UI::ScrolledWindow::; +our @ISA = CFClient::UI::Table::; sub new { my $class = shift; my $self = $class->SUPER::new ( - child => (new CFClient::UI::Table col_expand => [0, 1, 0]), + col_expand => [0, 1, 0], + items => [], @_, ); + $self->set_sort_order (undef); + $self } -sub set_items { - my ($self, $items) = @_; - - $self->{child}->clear; - return unless $items; +sub update_items { + my ($self) = @_; - my @items = sort { - ($a->{type} <=> $b->{type}) - or ($a->{name} cmp $b->{name}) - } values %$items; + $self->clear; - $self->{real_items} = \@items; + my @item = $self->{sort}->(@{ $self->{items} }); + my @adds; my $row = 0; - for my $item (@items) { + for my $item ($self->{sort}->(@{ $self->{items} })) { CFClient::Item::update_widgets $item; - $self->{child}->add (0, $row, $item->{face_widget}); - $self->{child}->add (1, $row, $item->{desc_widget}); - $self->{child}->add (2, $row, $item->{weight_widget}); + push @adds, 0, $row, $item->{face_widget}; + push @adds, 1, $row, $item->{desc_widget}; + push @adds, 2, $row, $item->{weight_widget}; $row++; } + + $self->add (@adds); +} + +sub set_sort_order { + my ($self, $order) = @_; + + $self->{sort} = $order ||= sub { + sort { + $a->{type} <=> $b->{type} + or $a->{name} cmp $b->{name} + } @_ + }; + + $self->update_items; +} + +sub set_items { + my ($self, $items) = @_; + + $self->{items} = [$items ? values %$items : ()]; + $self->update_items; } ############################################################################# @@ -3794,6 +3939,12 @@ $w = 0 if $w < 0; $h = 0 if $h < 0; + $w = max $widget->{min_w}, $w; + $h = max $widget->{min_h}, $h; + + $w = min $widget->{max_w}, $w if exists $widget->{max_w}; + $h = min $widget->{max_h}, $h if exists $widget->{max_h}; + $w = int $w + 0.5; $h = int $h + 0.5;