--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/17 22:59:13 1.214
+++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/24 21:49:58 1.229
@@ -138,6 +138,14 @@
}
}
+sub full_refresh {
+ # make a copy, otherwise for complains about freed values.
+ my @widgets = values %WIDGET;
+
+ $_->update
+ for @widgets;
+}
+
# call when resolution changes etc.
sub rescale_widgets {
my ($sx, $sy) = @_;
@@ -200,12 +208,24 @@
sub show {
my ($self) = @_;
-
return if $self->{parent};
$CFClient::UI::ROOT->add ($self);
}
+sub show_centered {
+ my ($self) = @_;
+ return if $self->{parent};
+
+ $self->show;
+
+ $CFClient::UI::ROOT->on_post_alloc (
+ "centered $self" => sub {
+ $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
+ },
+ );
+}
+
sub hide {
my ($self) = @_;
@@ -421,6 +441,8 @@
# TODO: req_w _does_change after ->reconfigure
$self->check_size
unless exists $self->{req_w};
+
+ $self->show;
}
sub check_size {
@@ -693,13 +715,6 @@
glClear GL_COLOR_BUFFER_BIT;
$self->_render;
-# glColorMask 1, 1, 1, 0;
-# glEnable GL_BLEND;
-# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
-# glRasterPos 0, 0;
-# glCopyPixels 0, 0, $self->{w}, $self->{h};
-# glDisable GL_BLEND;
-# glColorMask 1, 1, 1, 1;
};
}
@@ -713,7 +728,7 @@
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- glColor 0, 0, 0, 1;
+ glColor 1, 1, 1, 1;
$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
@@ -730,7 +745,6 @@
my ($self) = @_;
@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
- $self->child->configure (0, 0, @$self{qw(child_w child_h)});
@$self{qw(child_w child_h)}
}
@@ -738,6 +752,9 @@
sub size_allocate {
my ($self, $w, $h) = @_;
+ my ($cw, $ch) = @$self{qw(child_w child_h)};
+# $w = $self->{w};
+ $self->child->configure (0, 0, $cw, $ch);
$self->update;
}
@@ -801,12 +818,12 @@
vertical => 1,
range => [0, 0, 1, 0.01], # HACK fix
connect_changed => sub {
- $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
+ $self->{vp}->set_offset (0, $_[1]);
},
;
$self = $class->SUPER::new (
- vp => (new CFClient::UI::ViewPort),
+ vp => (new CFClient::UI::ViewPort expand => 1),
slider => $slider,
@_,
);
@@ -818,6 +835,15 @@
$self
}
+sub size_allocate {
+ my ($self, $w, $h) = @_;
+
+ $self->SUPER::size_allocate ($w, $h);
+
+ my $child = $self->{vp}->child;
+ $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
+}
+
#TODO# update range on size_allocate depending on child
# update viewport offset on scroll
@@ -1475,6 +1501,7 @@
can_focus => 1,
valign => 0,
can_events => 1,
+ #text => ...
@_
)
}
@@ -2054,12 +2081,12 @@
active_fg => [0, 0, 0],
bg => [0, 0, 0, 0.2],
active_bg => [1, 1, 1, 0.5],
- range => [0, 0, 100, 10],
+ range => [0, 0, 100, 10, 0],
req_w => $::WIDTH / 80,
req_h => $::WIDTH / 80,
vertical => 0,
can_hover => 1,
- inner_pad => .05,
+ inner_pad => 0.02,
@_
);
@@ -2069,6 +2096,14 @@
$self
}
+sub set_range {
+ my ($self, $range) = @_;
+
+ $self->{range} = $range;
+
+ $self->update;
+}
+
sub set_value {
my ($self, $value) = @_;
@@ -2076,14 +2111,14 @@
$hi = $lo + 1 if $hi <= $lo;
- $value = $lo if $value < $lo;
- $value = $hi if $value > $hi;
+ $page = $hi - $lo if $page > $hi - $lo;
+
+ $value = $lo if $value < $lo;
+ $value = $hi - $page if $value > $hi - $page;
$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
if $unit;
- $page = $hi - $lo if $page > $hi - $lo;
-
@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
if ($value != $old_value) {
@@ -2105,6 +2140,9 @@
my ($self, $ev, $x, $y) = @_;
$self->SUPER::button_down ($ev, $x, $y);
+
+ $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
+
$self->mouse_motion ($ev, $x, $y);
}
@@ -2116,9 +2154,9 @@
my (undef, $lo, $hi, $page) = @{$self->{range}};
- $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
+ $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
- $self->set_value ($x * ($hi - $lo) + $lo);
+ $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
}
}
@@ -2129,21 +2167,18 @@
$self->set_value ($self->{range}[0]);
my ($value, $lo, $hi, $page) = @{$self->{range}};
+ my $range = ($hi - $page - $lo) || 1e-100;
- my $inner_w = 1 - 2 * $self->{inner_pad};
-
- $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
-
- $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
- $value = $self->{scale} * ($value - $lo);
+ my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
- $value = $self->{inner_pad} + ($value - $page * 0.5);
+ $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
+ $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
- $value = 0 if $value < 0;
- $page = 1 - $value if $value + $page > 1;
+ $value = ($value - $lo) / $range;
+ $value = $value * $self->{scale} + $self->{offset};
- $self->{knob_x} = $value;
- $self->{knob_w} = $page;
+ $self->{knob_x} = $value - $knob_w * 0.5;
+ $self->{knob_w} = $knob_w;
});
$self->SUPER::update;
@@ -2180,6 +2215,47 @@
#############################################################################
+package CFClient::UI::ValSlider;
+
+our @ISA = CFClient::UI::HBox::;
+
+sub new {
+ my ($class, %arg) = @_;
+
+ my $range = delete $arg{range};
+
+ my $self = $class->SUPER::new (
+ slider => (new CFClient::UI::Slider expand => 1, range => $range),
+ entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
+ to_value => sub { shift },
+ from_value => sub { shift },
+ %arg,
+ );
+
+ $self->{slider}->connect (changed => sub {
+ my ($self, $value) = @_;
+ $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
+ $self->{parent}->emit (changed => $value);
+ });
+
+# $self->{entry}->connect (changed => sub {
+# my ($self, $value) = @_;
+# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
+# $self->{parent}->emit (changed => $value);
+# });
+
+ $self->add ($self->{slider}, $self->{entry});
+
+ $self->{slider}->emit (changed => $self->{slider}{range}[0]);
+
+ $self
+}
+
+sub set_range { shift->{slider}->set_range (@_) }
+sub set_value { shift->{slider}->set_value (@_) }
+
+#############################################################################
+
package CFClient::UI::TextView;
our @ISA = CFClient::UI::HBox::;
@@ -2216,16 +2292,28 @@
$self->reflow;
}
-sub text_height {
- my ($self, $text) = @_;
+sub size_allocate {
+ my ($self, $w, $h) = @_;
+
+ $self->SUPER::size_allocate ($w, $h);
+
+ $self->{layout}->set_font ($self->{font}) if $self->{font};
+ $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
+ $self->{layout}->set_width ($self->{children}[0]{w});
+
+ $self->reflow;
+}
+
+sub text_size {
+ my ($self, $text, $indent) = @_;
my $layout = $self->{layout};
$layout->set_height ($self->{fontsize} * $::FONTSIZE);
- $layout->set_width ($self->{children}[0]{w});
+ $layout->set_width ($self->{children}[0]{w} - $indent);
$layout->set_markup ($text);
- ($layout->size)[1]
+ $layout->size
}
sub reflow {
@@ -2235,31 +2323,31 @@
$self->update;
}
-sub size_allocate {
- my ($self, $w, $h) = @_;
+sub set_offset {
+ my ($self, $offset) = @_;
- $self->SUPER::size_allocate ($w, $h);
+ # todo: base offset on lines or so, not on pixels
+ $self->{children}[1]->set_value ($offset);
+}
- $self->{layout}->set_font ($self->{font}) if $self->{font};
- $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
- $self->{layout}->set_width ($self->{children}[0]{w});
+sub clear {
+ my ($self) = @_;
- $self->reflow;
+ $self->{par} = [];
+ $self->{height} = 0;
+ $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
}
sub add_paragraph {
- my ($self, $color, $text) = @_;
-
- #TODO: intelligently "reformat" paragraph
-
- my $height = $self->text_height ($text);
+ my ($self, $color, $text, $indent) = @_;
- $self->{height} += $height;
-
- push @{$self->{par}}, [$height, $color, $text];
+ for my $line (split /\n/, $text) {
+ my ($w, $h) = $self->text_size ($line);
+ $self->{height} += $h;
+ push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
+ }
- $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
- $self->{children}[1]->update;
+ $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
}
sub update {
@@ -2272,30 +2360,42 @@
delete $self->{texture};
$ROOT->on_post_alloc ($self, sub {
+ my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
+
if (delete $self->{need_reflow}) {
my $height = 0;
- $height += $_->[0] = $self->text_height ($_->[2])
- for @{$self->{par}};
+ my $layout = $self->{layout};
+
+ $layout->set_height ($self->{fontsize} * $::FONTSIZE);
+
+ for (@{$self->{par}}) {
+ if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
+ $layout->set_width ($W - $_->[3]);
+ $layout->set_markup ($_->[4]);
+ my ($w, $h) = $layout->size;
+ $_->[0] = $w + $_->[3];
+ $_->[1] = $h;
+ }
+
+ $height += $_->[1];
+ }
$self->{height} = $height;
- $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
+ $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
delete $self->{texture};
}
- $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
- glClearColor 0, 0, 0, 0;
+ $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
+ glClearColor 0.5, 0.5, 0.5, 0;
glClear GL_COLOR_BUFFER_BIT;
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-
my $top = int $self->{children}[1]{range}[0];
my $y0 = $top;
- my $y1 = $top + $self->{h};
+ my $y1 = $top + $H;
my $y = 0;
@@ -2303,21 +2403,28 @@
$layout->set_font ($self->{font}) if $self->{font};
+ glEnable GL_BLEND;
+ #TODO# not correct in windows where rgba is forced off
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+
for my $par (@{$self->{par}}) {
- my $h = $par->[0];
+ my $h = $par->[1];
if ($y0 < $y + $h && $y < $y1) {
- $layout->set_foreground (@{ $par->[1] });
- $layout->set_markup ($par->[2]);
+ $layout->set_foreground (@{ $par->[2] });
+ $layout->set_width ($W - $par->[3]);
+ $layout->set_markup ($par->[4]);
- my ($W, $H) = $layout->size;
- CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
+ my ($w, $h, $data, $format, $internalformat) = $layout->render;
+
+ glRasterPos $par->[3], $y - $y0;
+ glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
}
$y += $h;
}
- glDisable GL_TEXTURE_2D;
+ glDisable GL_BLEND;
};
});
}
@@ -2328,7 +2435,7 @@
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
glColor 1, 1, 1, 1;
- $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+ $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
glDisable GL_TEXTURE_2D;
$self->{children}[1]->draw;
@@ -2498,23 +2605,56 @@
sub new {
my $class = shift;
- $class->SUPER::new (
+ my $self = $class->SUPER::new (
aspect => 1,
@_,
- )
+ );
+
+ if ($self->{anim} && $self->{animspeed}) {
+ Scalar::Util::weaken (my $widget = $self);
+
+ $self->{timer} = Event->timer (
+ at => $self->{animspeed} * int $::NOW / $self->{animspeed},
+ hard => 1,
+ interval => $self->{animspeed},
+ cb => sub {
+ ++$widget->{frame};
+ $widget->update;
+ },
+ );
+ }
+
+ $self
}
sub size_request {
(32, 8)
}
+sub update {
+ my ($self) = @_;
+
+ return unless $self->{visible};
+
+ $self->SUPER::update;
+}
+
sub _draw {
my ($self) = @_;
- return unless $::CONN;#d# manage and cache textures differently
- my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
+ return unless $::CONN;
+
+ my $face;
+
+ if ($self->{frame}) {
+ my $anim = $::CONN->{anim}[$self->{anim}];
+
+ $face = $anim->[ $self->{frame} % @$anim ]
+ if $anim && @$anim;
+ }
+
+ my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
- # TODO animation
if ($tex) {
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
@@ -2524,6 +2664,15 @@
}
}
+sub DESTROY {
+ my ($self) = @_;
+
+ $self->{timer}->cancel
+ if $self->{timer};
+
+ $self->SUPER::DESTROY;
+}
+
#############################################################################
package CFClient::UI::InventoryItem;
@@ -2536,7 +2685,7 @@
my $desc =
$item->{nrof} < 2
? $item->{name}
- : "$item->{nrof} $item->{name_pl}";
+ : "$item->{nrof} × $item->{name_pl}";
$item->{flags} & Crossfire::Protocol::F_OPEN
and $desc .= " (open)";
@@ -2566,15 +2715,15 @@
my $desc = _item_to_desc ($item);
my $self = $class->SUPER::new (
- can_hover => 1,
+ can_hover => 1,
can_events => 1,
- tooltip => ((CFClient::UI::Label::escape $desc)
- . "\nleftclick - pick up\nmiddle click - apply\nrightclick - menu"),
+ tooltip => ((CFClient::UI::Label::escape $desc)
+ . "\nleftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu"),
connect_button_down => sub {
my ($self, $ev, $x, $y) = @_;
# todo: maybe put examine on 1? but should just be a tooltip :(
- if ($ev->{button} == 1) {
+ if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
my $targ = $::CONN->{player}{tag};
if ($item->{container} == $::CONN->{player}{tag}) {
@@ -2582,18 +2731,25 @@
}
$::CONN->send ("move $targ $item->{tag} 0");
+ } elsif ($ev->{button} == 1) {
+ $::CONN->send ("examine $item->{tag}");
} elsif ($ev->{button} == 2) {
$::CONN->send ("apply $item->{tag}");
} elsif ($ev->{button} == 3) {
my @menu_items = (
["examine", sub { $::CONN->send ("examine $item->{tag}") }],
- ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
+ ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
["apply", sub { $::CONN->send ("apply $item->{tag}") }],
- ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
- [
- $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
- sub { $::CONN->send ("lock $item->{tag}") },
- ],
+ (
+ $item->{flags} & Crossfire::Protocol::F_LOCKED
+ ? (
+ ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
+ )
+ : (
+ ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
+ ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
+ )
+ ),
);
CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
@@ -2639,7 +2795,7 @@
my $class = shift;
my $self = $class->SUPER::new (
- scrolled => (new CFClient::UI::VBox),
+ scrolled => (new CFClient::UI::Table),
@_,
);
@@ -2660,11 +2816,17 @@
$self->{real_items} = \@items;
for my $item (@items) {
+ $item->{item} = $item;
$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
$item->update_item ();
}
- $self->{scrolled}->add (@items);
+ my $i = 0;
+ for (@items) {
+ $self->{scrolled}->add (0, $i, $_);
+ my $nrof = $_->{item}->{nrof} || 1;
+ $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
+ }
# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
}
@@ -2937,6 +3099,12 @@
sub add {
my ($self, @children) = @_;
+ for (my @widgets = @children; my $w = pop @widgets; ) {
+ push @widgets, $w->children;
+ $w->{root} = $self;
+ $w->{visible} = 1;
+ }
+
for my $child (@children) {
$child->{toplevel} = 1;
@@ -2948,6 +3116,18 @@
$self->SUPER::add (@children);
}
+sub remove {
+ my ($self, @children) = @_;
+
+ $self->SUPER::remove (@children);
+
+ while (@children) {
+ my $w = pop @children;
+ push @children, $w->children;
+ delete $w->{visible};
+ }
+}
+
sub on_refresh {
my ($self, $id, $cb) = @_;
@@ -3024,7 +3204,7 @@
glMatrixMode GL_PROJECTION;
glLoadIdentity;
- glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
+ glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
glMatrixMode GL_MODELVIEW;
glLoadIdentity;