--- deliantra/Deliantra-Client/DC/UI.pm 2006/11/18 23:31:23 1.354
+++ deliantra/Deliantra-Client/DC/UI.pm 2007/07/15 22:13:43 1.372
@@ -3,7 +3,6 @@
use utf8;
use strict;
-use Scalar::Util ();
use List::Util ();
use Event;
@@ -25,9 +24,11 @@
for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
if (length $widget->{tooltip}) {
if ($TOOLTIP->{owner} != $widget) {
+ $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
$TOOLTIP->hide;
$TOOLTIP->{owner} = $widget;
+ $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
return if $ENV{CFPLUS_DEBUG} & 8;
@@ -45,6 +46,7 @@
}
$TOOLTIP->hide;
+ $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
delete $TOOLTIP->{owner};
});
@@ -237,7 +239,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,9 +266,14 @@
my ($self) = @_;
$self->hide;
+ $self->emit ("destroy");
%$self = ();
}
+sub TO_JSON {
+ { __widget_ref__ => $_[0]{s_id} }
+}
+
sub show {
my ($self) = @_;
@@ -315,8 +322,8 @@
return if $self->{visible} == $visible;
- $visible ? $self->hide
- : $self->show;
+ $visible ? $self->show
+ : $self->hide;
}
sub toggle_visibility {
@@ -506,6 +513,12 @@
}
}
+sub disconnect_all {
+ my ($self, $signal) = @_;
+
+ delete $self->{signal_cb}{$signal};
+}
+
my %has_coords = (
button_down => 1,
button_up => 1,
@@ -525,23 +538,15 @@
#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
- if ($self->{tooltip} =~ /Apply.*audio/) {
- warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
- warn "3 $self->{parent}\n";#d#
- }
-
- #d##TODO# stop propagating at first true, do not use sum
- my $res =
- (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
- ;
- if ($self->{tooltip} =~ /Apply.*audio/) {
- warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
- warn "5 $self->{parent}\n";#d#
+ for my $cb (
+ @{$self->{signal_cb}{$signal} || []}, # before
+ ($self->can ("invoke_$signal") || sub { 1 }), # closure
+ ) {
+ return $cb->($self, @args, @append) || next;
}
- $res
+ # parent
+ $self->{parent} && $self->{parent}->emit ($signal, @args)
}
sub find_widget {
@@ -559,7 +564,7 @@
sub set_parent {
my ($self, $parent) = @_;
- Scalar::Util::weaken ($self->{parent} = $parent);
+ CFPlus::weaken ($self->{parent} = $parent);
$self->set_visible if $parent->{visible};
}
@@ -648,15 +653,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};
}
#############################################################################
@@ -1029,7 +1035,7 @@
package CFPlus::UI::ScrolledWindow;
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = CFPlus::UI::Table::;
sub new {
my ($class, %arg) = @_;
@@ -1038,22 +1044,45 @@
my $self;
- my $slider = new CFPlus::UI::Slider
+ my $hslider = new CFPlus::UI::Slider
+ vertical => 0,
+ range => [0, 0, 1, 0.01], # HACK fix
+ on_changed => sub {
+ $self->{hpos} = $_[1];
+ $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
+ },
+ ;
+
+ my $vslider = new CFPlus::UI::Slider
vertical => 1,
range => [0, 0, 1, 0.01], # HACK fix
on_changed => sub {
- $self->{vp}->set_offset (0, $_[1]);
+ $self->{vpos} = $_[1];
+ $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
},
;
$self = $class->SUPER::new (
- vp => (new CFPlus::UI::ViewPort expand => 1),
+ scroll_x => 0,
+ scroll_y => 1,
can_events => 1,
- slider => $slider,
+ hslider => $hslider,
+ vslider => $vslider,
+ col_expand => [1, 0],
+ row_expand => [1, 0],
%arg,
);
- $self->SUPER::add ($self->{vp}, $self->{slider});
+ $self->{vp} = new CFPlus::UI::ViewPort
+ expand => 1,
+ scroll_x => $self->{scroll_x},
+ scroll_y => $self->{scroll_y},
+ ;
+
+ $self->SUPER::add (0, 0, $self->{vp});
+ $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
+ $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
+
$self->add ($child) if $child;
$self
@@ -1072,7 +1101,7 @@
return 0 unless $ev->{dy}; # only vertical movements
- $self->{slider}->emit (mouse_wheel => $ev);
+ $self->{vslider}->emit (mouse_wheel => $ev);
1
}
@@ -1080,14 +1109,21 @@
sub update_slider {
my ($self) = @_;
- $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
+ my $child = ($self->{vp} or return)->child;
+
+ my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
+ $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
+ #$self->{hslider}->set_visibility ($w1 != $w2);
+
+ my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
+ $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
+ #$self->{vslider}->set_visibility ($h1 != $h2);
}
sub update {
my ($self) = @_;
$self->SUPER::update;
-
$self->update_slider;
}
@@ -1095,7 +1131,6 @@
my ($self, $w, $h) = @_;
$self->update_slider;
-
$self->SUPER::invoke_size_allocate ($w, $h)
}
@@ -1477,6 +1512,7 @@
$class->SUPER::new (
col_expand => [],
+ row_expand => [],
@_,
)
}
@@ -1561,16 +1597,21 @@
my $req_w = (sum @$ws) || 1;
my $req_h = (sum @$hs) || 1;
- # TODO: nicer code && do row_expand
+ # TODO: nicer code
my @col_expand = @{$self->{col_expand}};
@col_expand = (1) x @$ws unless @col_expand;
my $col_expand = (sum @col_expand) || 1;
- # linearly scale sizes
$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
- $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
CFPlus::UI::harmonize $ws;
+
+ my @row_expand = @{$self->{row_expand}};
+ @row_expand = (1) x @$ws unless @row_expand;
+ my $row_expand = (sum @row_expand) || 1;
+
+ $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
+
CFPlus::UI::harmonize $hs;
my $y;
@@ -1915,6 +1956,7 @@
can_focus => 1,
valign => 0,
can_events => 1,
+ ellipsise => 0,
#text => ...
#hidden => "*",
@_
@@ -1969,6 +2011,8 @@
my $text = $self->get_text;
+ $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
+
if ($uni == 8) {
substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
} elsif ($uni == 127) {
@@ -1978,15 +2022,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;
- } elsif ($uni == 21) { # ctrl-u
+ # 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;
@@ -1995,6 +2049,7 @@
$self->_set_text ($text);
$self->realloc;
+ $self->update;
1
}
@@ -2073,6 +2128,8 @@
}
}
+#############################################################################
+
package CFPlus::UI::Entry;
our @ISA = CFPlus::UI::EntryBase::;
@@ -2084,7 +2141,7 @@
my $sym = $ev->{sym};
- if ($sym == 13) {
+ if ($ev->{uni} == 0x0d || $sym == 13) {
unshift @{$self->{history}},
my $txt = $self->get_text;
@@ -2124,6 +2181,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::;
@@ -2275,7 +2371,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};
@@ -2658,7 +2754,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
}
@@ -2778,6 +2876,7 @@
layout => (new CFPlus::Layout),
par => [],
+ max_par => 0,
height => 0,
children => [
(new CFPlus::UI::Empty expand => 1),
@@ -2912,6 +3011,10 @@
push @{$self->{par}}, $para;
}
+ if (my $max = $self->{max_par}) {
+ shift @{$self->{par}} while @{$self->{par}} > $max;
+ }
+
$self->{need_reflow}++;
$self->update;
}
@@ -3233,13 +3336,14 @@
);
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},
hard => 1,
interval => $self->{animspeed},
cb => sub {
+ delete $self->{wait_face};
++$widget->{frame};
$widget->update;
},
@@ -3276,8 +3380,11 @@
$face = $anim->[ $self->{frame} % @$anim ]
if $anim && @$anim;
}
+
+ my $faceid = $::CONN->{faceid}[$face || $self->{face}]
+ or return;
- my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
+ my $tex = $::CONN->{texture}[$faceid];
if ($tex) {
glEnable GL_TEXTURE_2D;
@@ -3285,6 +3392,10 @@
glColor 0, 0, 0, 1;
$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
glDisable GL_TEXTURE_2D;
+ } else {
+ $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
+ $self->update;
+ });
}
}
@@ -3497,7 +3608,7 @@
sub add {
my ($self, $title, $widget, $tooltip) = @_;
- Scalar::Util::weaken $self;
+ CFPlus::weaken $self;
$self->{buttonbar}->add (new CFPlus::UI::Button
markup => $title,
@@ -3591,7 +3702,7 @@
@_,
);
- Scalar::Util::weaken (my $this = $self);
+ CFPlus::weaken (my $this = $self);
$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
@@ -3724,190 +3835,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 = (CFPlus::asxml $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::;
@@ -3924,7 +3851,7 @@
@_,
);
- Scalar::Util::weaken ($self->{root} = $self);
+ CFPlus::weaken ($self->{root} = $self);
$self
}