--- deliantra/Deliantra-Client/DC/UI.pm 2006/08/13 14:38:35 1.342 +++ deliantra/Deliantra-Client/DC/UI.pm 2007/04/12 07:53:31 1.365 @@ -3,7 +3,6 @@ use utf8; use strict; -use Scalar::Util (); use List::Util (); use Event; @@ -237,7 +236,7 @@ @_ }, $class; - Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); + CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); for (keys %$self) { if (/^on_(.*)$/) { @@ -264,6 +263,7 @@ my ($self) = @_; $self->hide; + $self->emit ("destroy"); %$self = (); } @@ -506,6 +506,12 @@ } } +sub disconnect_all { + my ($self, $signal) = @_; + + delete $self->{signal_cb}{$signal}; +} + my %has_coords = ( button_down => 1, button_up => 1, @@ -516,8 +522,8 @@ sub emit { my ($self, $signal, @args) = @_; - # I do not really like this solution, but I dislike duplication - # and needlessly verbose code, too. + # I do not really like this solution, but I do not like duplication + # and needlessly verbose code, either. my @append = $has_coords{$signal} ? $args[0]->xy ($self) @@ -525,10 +531,15 @@ #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, @append), @{$self->{signal_cb}{$signal} || []}) # before - || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure - || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent + for my $cb ( + @{$self->{signal_cb}{$signal} || []}, # before + ($self->can ("invoke_$signal") || sub { 1 }), # closure + ) { + return $cb->($self, @args, @append) || next; + } + + # parent + $self->{parent} && $self->{parent}->emit ($signal, @args) } sub find_widget { @@ -546,7 +557,7 @@ sub set_parent { my ($self, $parent) = @_; - Scalar::Util::weaken ($self->{parent} = $parent); + CFPlus::weaken ($self->{parent} = $parent); $self->set_visible if $parent->{visible}; } @@ -635,15 +646,16 @@ warn "no draw defined for $self\n"; } +my $cntx;#d# sub DESTROY { my ($self) = @_; return if CFPlus::in_destruct; - delete $WIDGET{$self+0}; - eval { $self->destroy }; warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; + + delete $WIDGET{$self+0}; } ############################################################################# @@ -900,19 +912,17 @@ { package CFPlus::UI::Base; - ($draw_x, $draw_y, $draw_w, $draw_h) = + local ($draw_x, $draw_y, $draw_w, $draw_h) = (0, 0, $self->{w}, $self->{h}); - } - $self->_render; + $self->_render; + } }; } sub _draw { my ($self) = @_; - my ($w, $h) = @$self{qw(w h)}; - my $tex = $self->{texture} or return; @@ -920,7 +930,7 @@ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor 0, 0, 0, 1; - $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); + $tex->draw_quad_alpha_premultiplied (0, 0); glDisable GL_TEXTURE_2D; } @@ -1136,6 +1146,106 @@ use CFPlus::OpenGL; +sub new { + my ($class, %arg) = @_; + + if ((exists $arg{label}) && !ref $arg{label}) { + $arg{label} = new CFPlus::UI::Label + align => 1, + valign => 0, + text => $arg{label}, + fontsize => ($arg{border} || 0.8) * 0.75; + } + + my $self = $class->SUPER::new ( + # label => "", + fg => [0.6, 0.3, 0.1], + border => 0.8, + style => 'single', + %arg, + ); + + $self +} + +sub add { + my ($self, @widgets) = @_; + + $self->SUPER::add (@widgets); + $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; +} + +sub border { + int $_[0]{border} * $::FONTSIZE +} + +sub size_request { + my ($self) = @_; + + ($self->{label_w}, undef) = $self->{label}->size_request + if $self->{label}; + + my ($w, $h) = $self->SUPER::size_request; + + ( + $w + $self->border * 2, + $h + $self->border * 2, + ) +} + +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + my $border = $self->border; + + $w -= List::Util::max 0, $border * 2; + $h -= List::Util::max 0, $border * 2; + + if (my $label = $self->{label}) { + $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2; + $label->{h} = List::Util::min $h, $border; + $label->invoke_size_allocate ($label->{w}, $label->{h}); + } + + $self->child->configure ($border, $border, $w, $h); + + 1 +} + +sub _draw { + my ($self) = @_; + + my $child = $self->{children}[0]; + + my $border = $self->border; + my ($w, $h) = ($self->{w}, $self->{h}); + + $child->draw; + + glColor @{$self->{fg}}; + glBegin GL_LINE_STRIP; + glVertex $border * 1.5 , $border * 0.5 + 0.5; + glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; + glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; + glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; + glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5; + glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5; + glEnd; + + if ($self->{label}) { + glTranslate $border * 2, 0; + $self->{label}->_draw; + } +} + +############################################################################# + +package CFPlus::UI::Toplevel; + +our @ISA = CFPlus::UI::Bin::; + +use CFPlus::OpenGL; + my $bg = new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", mipmap => 1, wrap => 1; @@ -1620,6 +1730,7 @@ #text => initial text #markup => initial narkup #max_w => maximum pixel width + #style => 0, # render flags ellipsise => 3, # end layout => (new CFPlus::Layout), fontsize => 1, @@ -1780,7 +1891,7 @@ my $w = List::Util::min $self->{w} + 4, $size->[0]; my $h = List::Util::min $self->{h} + 2, $size->[1]; - $self->{layout}->render ($self->{ox}, $self->{oy}); + $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); } ############################################################################# @@ -1803,6 +1914,7 @@ can_focus => 1, valign => 0, can_events => 1, + ellipsise => 0, #text => ... #hidden => "*", @_ @@ -1866,12 +1978,25 @@ } elsif ($sym == CFPlus::SDLK_RIGHT) { ++$self->{cursor} if $self->{cursor} < length $self->{text}; } elsif ($sym == CFPlus::SDLK_HOME) { - $self->{cursor} = 0; + # what a hack + $self->{cursor} = + (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ + ? length $1 + : 0; } elsif ($sym == CFPlus::SDLK_END) { - $self->{cursor} = length $text; + # uh, again + $self->{cursor} = + (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ + ? $self->{cursor} + length $1 + : length $self->{text}; + } elsif ($uni == 21) { # ctrl-u + $text = ""; + $self->{cursor} = 0; } elsif ($uni == 27) { $self->emit ('escape'); - } elsif ($uni) { + } elsif ($uni == 0x0d) { + substr $text, $self->{cursor}++, 0, "\012"; + } elsif ($uni >= 0x20) { substr $text, $self->{cursor}++, 0, chr $uni; } else { return 0; @@ -1880,6 +2005,7 @@ $self->_set_text ($text); $self->realloc; + $self->update; 1 } @@ -1951,14 +2077,15 @@ @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) } - glColor @{$self->{fg}}; glBegin GL_LINES; - glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; - glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; + glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; + glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; glEnd; } } +############################################################################# + package CFPlus::UI::Entry; our @ISA = CFPlus::UI::EntryBase::; @@ -1970,7 +2097,7 @@ my $sym = $ev->{sym}; - if ($sym == 13) { + if ($ev->{uni} == 0x0d || $sym == 13) { unshift @{$self->{history}}, my $txt = $self->get_text; @@ -2010,6 +2137,45 @@ ############################################################################# +package CFPlus::UI::TextEdit; + +our @ISA = CFPlus::UI::EntryBase::; + +use CFPlus::OpenGL; + +sub move_cursor_ver { + my ($self, $dy) = @_; + + my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); + + $y += $dy; + + if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { + $self->{cursor} = $index; + delete $self->{cur_h}; + $self->update; + return; + } +} + +sub invoke_key_down { + my ($self, $ev) = @_; + + my $sym = $ev->{sym}; + + if ($sym == CFPlus::SDLK_UP) { + $self->move_cursor_ver (-1); + } elsif ($sym == CFPlus::SDLK_DOWN) { + $self->move_cursor_ver (+1); + } else { + return $self->SUPER::invoke_key_down ($ev) + } + + 1 +} + +############################################################################# + package CFPlus::UI::Button; our @ISA = CFPlus::UI::Label::; @@ -2161,7 +2327,7 @@ $self->{tex} ||= $texture_cache{$self->{path}} ||= new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; - Scalar::Util::weaken $texture_cache{$self->{path}}; + CFPlus::weaken $texture_cache{$self->{path}}; $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; @@ -2544,7 +2710,9 @@ my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; - $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); + my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; + + $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); ! ! $delta } @@ -2664,6 +2832,7 @@ layout => (new CFPlus::Layout), par => [], + max_par => 0, height => 0, children => [ (new CFPlus::UI::Empty expand => 1), @@ -2754,6 +2923,21 @@ $self->{children}[1]->set_value ($offset); } +sub current_paragraph { + my ($self) = @_; + + $self->{top_paragraph} - 1 +} + +sub scroll_to { + my ($self, $para) = @_; + + $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; + + $self->{scroll_to} = $para; + $self->update; +} + sub clear { my ($self) = @_; @@ -2783,6 +2967,10 @@ push @{$self->{par}}, $para; } + if (my $max = $self->{max_par}) { + shift @{$self->{par}} while @{$self->{par}} > $max; + } + $self->{need_reflow}++; $self->update; } @@ -2790,65 +2978,79 @@ sub scroll_to_bottom { my ($self) = @_; - $self->{scroll_to_bottom} = 1; + $self->{scroll_to} = $#{$self->{par}}; $self->update; } -sub update { +sub force_uptodate { my ($self) = @_; - $self->SUPER::update; + if (delete $self->{need_reflow}) { + my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; - return unless $self->{h} > 0; + my $height = 0; - delete $self->{texture}; + for my $para (@{$self->{par}}) { + if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { + my $layout = $self->get_layout ($para); + my ($w, $h) = $layout->size; + + $para->{w} = $w + $para->{indent}; + $para->{h} = $h; + $para->{wrapped} = $layout->has_wrapped; + } - $ROOT->on_post_alloc ($self => sub { - my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; + $para->{y} = $height; + $height += $para->{h}; + } - if (delete $self->{need_reflow}) { - my $height = 0; + $self->{height} = $height; + $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); - for my $para (@{$self->{par}}) { - if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { - my $layout = $self->get_layout ($para); - my ($w, $h) = $layout->size; + delete $self->{texture}; + } - $para->{w} = $w + $para->{indent}; - $para->{h} = $h; - $para->{wrapped} = $layout->has_wrapped; - } + if (my $paridx = delete $self->{scroll_to}) { + $self->{children}[1]->set_value ($self->{par}[$paridx]{y}); + } +} - $height += $para->{h}; - } +sub update { + my ($self) = @_; - $self->{height} = $height; + $self->SUPER::update; - $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); + return unless $self->{h} > 0; - delete $self->{texture}; - } + delete $self->{texture}; - if (delete $self->{scroll_to_bottom}) { - $self->{children}[1]->set_value (1e10); - } + $ROOT->on_post_alloc ($self => sub { + $self->force_uptodate; + + my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; + package CFPlus::UI::Base; + local ($draw_x, $draw_y, $draw_w, $draw_h) = + (0, 0, $self->{w}, $self->{h}); + + my $top = int $self->{children}[1]{range}[0]; + + my $paridx = 0; + my $top_paragraph; my $top = int $self->{children}[1]{range}[0]; my $y0 = $top; my $y1 = $top + $H; - my $y = 0; - for my $para (@{$self->{par}}) { my $h = $para->{h}; + my $y = $para->{y}; if ($y0 < $y + $h && $y < $y1) { - my $layout = $self->get_layout ($para); $layout->render ($para->{indent}, $y - $y0); @@ -2867,8 +3069,11 @@ } } - $y += $h; + $paridx++; + $top_paragraph ||= $paridx if $y >= $top; } + + $self->{top_paragraph} = $top_paragraph; }; }); } @@ -2999,7 +3204,7 @@ markup => $tooltip, max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, fontsize => 0.8, - fg => [0, 0, 0, 1], + style => 1, # FLAG_INVERSE ellipsise => 0, font => ($widget->{tooltip_font} || $::FONT_PROP), ); @@ -3087,7 +3292,7 @@ ); if ($self->{anim} && $self->{animspeed}) { - Scalar::Util::weaken (my $widget = $self); + CFPlus::weaken (my $widget = $self); $self->{timer} = Event->timer ( at => $self->{animspeed} * int $::NOW / $self->{animspeed}, @@ -3157,13 +3362,13 @@ our @ISA = CFPlus::UI::HBox::; -# TODO: should actualyl wrap buttons and other goodies. +# TODO: should actually wrap buttons and other goodies. ############################################################################# package CFPlus::UI::Menu; -our @ISA = CFPlus::UI::FancyFrame::; +our @ISA = CFPlus::UI::Toplevel::; use CFPlus::OpenGL; @@ -3351,7 +3556,7 @@ sub add { my ($self, $title, $widget, $tooltip) = @_; - Scalar::Util::weaken $self; + CFPlus::weaken $self; $self->{buttonbar}->add (new CFPlus::UI::Button markup => $title, @@ -3445,7 +3650,7 @@ @_, ); - Scalar::Util::weaken (my $this = $self); + CFPlus::weaken (my $this = $self); $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); @@ -3578,190 +3783,6 @@ ############################################################################# -package CFPlus::UI::Inventory; - -our @ISA = CFPlus::UI::Table::; - -sub new { - my $class = shift; - - my $self = $class->SUPER::new ( - col_expand => [0, 1, 0], - items => [], - @_, - ); - - $self->set_sort_order (undef); - - $self -} - -sub update_items { - my ($self) = @_; - - $self->clear; - - my @item = $self->{sort}->(@{ $self->{items} }); - - my @adds; - my $row = 0; - for my $item ($self->{sort}->(@{ $self->{items} })) { - CFPlus::Item::update_widgets $item; - - 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; -} - -############################################################################# - -package CFPlus::UI::SpellList; - -our @ISA = CFPlus::UI::Table::; - -sub new { - my $class = shift; - - my $self = $class->SUPER::new ( - binding => [], - commands => [], - @_, - ) -} - -my $TOOLTIP_ALL = "\n\nLeft click - ready spell\nMiddle click - invoke spell\nRight click - further options"; - -my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip => - "Name. The name of the spell.$TOOLTIP_ALL"); -my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip => - "Skill. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL"); -my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => - "Level. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL"); -my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => - "Spell points / Grace points. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL"); -my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => - "Damage. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); - -sub rebuild_spell_list { - my ($self) = @_; - - $CFPlus::UI::ROOT->on_refresh ($self => sub { - $self->clear; - - return unless $::CONN; - - $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME); - $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL); - $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL); - $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP); - $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG); - - my $row = 0; - - for (sort { $a cmp $b } keys %{ $self->{spell} }) { - my $spell = $self->{spell}{$_}; - - $row++; - - my $spell_cb = sub { - my ($widget, $ev) = @_; - - if ($ev->{button} == 1) { - $::CONN->user_send ("cast $spell->{name}"); - } elsif ($ev->{button} == 2) { - $::CONN->user_send ("invoke $spell->{name}"); - } elsif ($ev->{button} == 3) { - (new CFPlus::UI::Menu - items => [ - ["bind cast $spell->{name} to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], - ["bind invoke $spell->{name} to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], - ], - )->popup ($ev); - } else { - return 0; - } - - 1 - }; - - my $tooltip = "$spell->{message}$TOOLTIP_ALL"; - - #TODO: add path info to tooltip - #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path}); - - $self->add (0, $row, new CFPlus::UI::Face - face => $spell->{face}, - can_hover => 1, - can_events => 1, - tooltip => $tooltip, - on_button_down => $spell_cb, - ); - - $self->add (1, $row, new CFPlus::UI::Label - expand => 1, - text => $spell->{name}, - can_hover => 1, - can_events => 1, - tooltip => $tooltip, - on_button_down => $spell_cb, - ); - - $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); - $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL); - $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); - $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); - } - }); -} - -sub add_spell { - my ($self, $spell) = @_; - - $self->{spell}->{$spell->{name}} = $spell; - $self->rebuild_spell_list; -} - -sub remove_spell { - my ($self, $spell) = @_; - - delete $self->{spell}->{$spell->{name}}; - $self->rebuild_spell_list; -} - -sub clear_spells { - my ($self) = @_; - - $self->{spell} = {}; - $self->rebuild_spell_list; -} - -############################################################################# - package CFPlus::UI::Root; our @ISA = CFPlus::UI::Container::; @@ -3778,7 +3799,7 @@ @_, ); - Scalar::Util::weaken ($self->{root} = $self); + CFPlus::weaken ($self->{root} = $self); $self } @@ -3997,11 +4018,11 @@ { package CFPlus::UI::Base; - ($draw_x, $draw_y, $draw_w, $draw_h) = + local ($draw_x, $draw_y, $draw_w, $draw_h) = (0, 0, $self->{w}, $self->{h}); - } - $self->_draw; + $self->_draw; + } } #############################################################################