--- deliantra/Deliantra-Client/DC/UI.pm 2006/10/01 12:08:58 1.351
+++ deliantra/Deliantra-Client/DC/UI.pm 2007/07/21 22:54:52 1.404
@@ -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};
});
@@ -113,8 +115,12 @@
if ($GRAB) {
if ($ev->{button} == 4 || $ev->{button} == 5) {
# mousewheel
- $ev->{dx} = 0;
- $ev->{dy} = $ev->{button} * 2 - 9;
+ my $delta = $ev->{button} * 2 - 9;
+ my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
+
+ $ev->{dx} = $shift ? $delta : 0;
+ $ev->{dy} = $shift ? 0 : $delta;
+
$GRAB->emit (mouse_wheel => $ev);
} else {
$GRAB->emit (button_down => $ev)
@@ -237,7 +243,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 +270,14 @@
my ($self) = @_;
$self->hide;
+ $self->emit ("destroy");
%$self = ();
}
+sub TO_JSON {
+ { __widget_ref__ => $_[0]{s_id} }
+}
+
sub show {
my ($self) = @_;
@@ -315,8 +326,8 @@
return if $self->{visible} == $visible;
- $visible ? $self->hide
- : $self->show;
+ $visible ? $self->show
+ : $self->hide;
}
sub toggle_visibility {
@@ -506,6 +517,12 @@
}
}
+sub disconnect_all {
+ my ($self, $signal) = @_;
+
+ delete $self->{signal_cb}{$signal};
+}
+
my %has_coords = (
button_down => 1,
button_up => 1,
@@ -516,8 +533,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,28 +542,24 @@
#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
-}
-
-sub find_widget {
- my ($self, $x, $y) = @_;
-
- return () unless $self->{can_events};
-
- return $self
- if $x >= $self->{x} && $x < $self->{x} + $self->{w}
- && $y >= $self->{y} && $y < $self->{y} + $self->{h};
+ 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 {
+# in .xs
+
sub set_parent {
my ($self, $parent) = @_;
- Scalar::Util::weaken ($self->{parent} = $parent);
+ CFPlus::weaken ($self->{parent} = $parent);
$self->set_visible if $parent->{visible};
}
@@ -582,52 +595,8 @@
# functions seems pointless.
our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
-sub draw {
- my ($self) = @_;
-
- return unless $self->{h} && $self->{w};
-
- # update screen rectangle
- local $draw_x = $draw_x + $self->{x};
- local $draw_y = $draw_y + $self->{y};
-
- # skip widgets that are entirely outside the drawing area
- return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
- || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
-
- glPushMatrix;
- glTranslate $self->{x}, $self->{y}, 0;
-
- if ($self == $HOVER && $self->{can_hover}) {
- glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
- glEnable GL_BLEND;
- glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex $self->{w}, 0;
- glVertex $self->{w}, $self->{h};
- glVertex 0 , $self->{h};
- glEnd;
- glDisable GL_BLEND;
- }
-
- if ($ENV{CFPLUS_DEBUG} & 1) {
- glPushMatrix;
- glColor 1, 1, 0, 1;
- glTranslate 0.375, 0.375;
- glBegin GL_LINE_LOOP;
- glVertex 0 , 0;
- glVertex $self->{w} - 1, 0;
- glVertex $self->{w} - 1, $self->{h} - 1;
- glVertex 0 , $self->{h} - 1;
- glEnd;
- glPopMatrix;
- #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
- }
-
- $self->_draw;
- glPopMatrix;
-}
+#sub draw {
+#CFPlus.xs
sub _draw {
my ($self) = @_;
@@ -640,10 +609,10 @@
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};
}
#############################################################################
@@ -729,7 +698,7 @@
);
$self->add (@$children)
- if $children;
+ if $children && @$children;
$self
}
@@ -748,6 +717,7 @@
$_->set_parent ($self)
for @widgets;
+ # TODO: only do this in widgets that need it, e.g. root, fixed
use sort 'stable';
$self->{children} = [
@@ -756,6 +726,8 @@
];
$self->realloc;
+
+ map $_+0, @widgets
}
sub children {
@@ -776,7 +748,7 @@
sub clear {
my ($self) = @_;
- my $children = delete $self->{children};
+ my $children = $self->{children};
$self->{children} = [];
for (@$children) {
@@ -902,9 +874,9 @@
local ($draw_x, $draw_y, $draw_w, $draw_h) =
(0, 0, $self->{w}, $self->{h});
- }
- $self->_render;
+ $self->_render;
+ }
};
}
@@ -927,6 +899,8 @@
package CFPlus::UI::ViewPort;
+use List::Util qw(min max);
+
our @ISA = CFPlus::UI::Window::;
sub new {
@@ -944,8 +918,8 @@
my ($w, $h) = @{$self->child}{qw(req_w req_h)};
- $w = 10 if $self->{scroll_x};
- $h = 10 if $self->{scroll_y};
+ $w = 1 if $self->{scroll_x};
+ $h = 1 if $self->{scroll_y};
($w, $h)
}
@@ -967,10 +941,16 @@
sub set_offset {
my ($self, $x, $y) = @_;
- $self->{view_x} = int $x;
- $self->{view_y} = int $y;
+ my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
+ my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
- $self->update;
+ if ($x != $self->{view_x} or $y != $self->{view_y}) {
+ $self->{view_x} = $x;
+ $self->{view_y} = $y;
+
+ $self->emit (changed => $x, $y);
+ $self->update;
+ }
}
# hmm, this does not work for topleft of $self... but we should not ask for that
@@ -995,7 +975,7 @@
if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
) {
- $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
+ $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
} else {
$self->CFPlus::UI::Base::find_widget ($x, $y)
}
@@ -1016,7 +996,7 @@
package CFPlus::UI::ScrolledWindow;
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = CFPlus::UI::Table::;
sub new {
my ($class, %arg) = @_;
@@ -1025,64 +1005,166 @@
my $self;
- my $slider = new CFPlus::UI::Slider
+ my $hslider = new CFPlus::UI::Slider
+ col => 0,
+ row => 1,
+ 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
+ col => 1,
+ row => 0,
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
+ col => 0,
+ row => 0,
+ expand => 1,
+ scroll_x => $self->{scroll_x},
+ scroll_y => $self->{scroll_y},
+ on_changed => sub {
+ my ($vp, $x, $y) = @_;
+
+ $vp->{parent}{hslider}->set_value ($x);
+ $vp->{parent}{vslider}->set_value ($y);
+
+ 0
+ },
+ on_size_allocate => sub {
+ my ($vp, $w, $h) = @_;
+ $vp->{parent}->update_slider;
+ 0
+ },
+ ;
+
+ $self->SUPER::add ($self->{vp});
+
$self->add ($child) if $child;
$self
}
-#TODO# update range on size_allocate depending on child
-
sub add {
my ($self, $widget) = @_;
$self->{vp}->add ($self->{child} = $widget);
}
-sub invoke_mouse_wheel {
+sub update_slider {
+ my ($self) = @_;
+
+ my $child = ($self->{vp} or return)->child;
+
+ if ($self->{scroll_x}) {
+ my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
+ $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
+
+ my $visible = $w1 > $w2;
+ if ($visible != $self->{hslider_visible}) {
+ $self->{hslider_visible} = $visible;
+ $visible ? $self->SUPER::add ($self->{hslider})
+ : $self->SUPER::remove ($self->{hslider});
+ }
+ }
+
+ if ($self->{scroll_y}) {
+ my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
+ $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
+
+ my $visible = $h1 > $h2;
+ if ($visible != $self->{vslider_visible}) {
+ $self->{vslider_visible} = $visible;
+ $visible ? $self->SUPER::add ($self->{vslider})
+ : $self->SUPER::remove ($self->{vslider});
+ }
+ }
+}
+
+sub start_dragging {
my ($self, $ev) = @_;
- return 0 unless $ev->{dy}; # only vertical movements
+ $self->grab_focus;
+
+ my $ox = $self->{vp}{view_x};
+ my $oy = $self->{vp}{view_y};
+
+ $self->{motion} = sub {
+ my ($ev, $x, $y) = @_;
- $self->{slider}->emit (mouse_wheel => $ev);
+ $ox -= $ev->{xrel};
+ $oy -= $ev->{yrel};
+
+ $self->{vp}->set_offset ($ox, $oy);
+ };
+}
+
+sub invoke_mouse_wheel {
+ my ($self, $ev) = @_;
+
+ $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
+ $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1
}
-sub update_slider {
- my ($self) = @_;
+sub invoke_button_down {
+ my ($self, $ev, $x, $y) = @_;
- $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
+ if ($ev->{button} == 2) {
+ $self->start_dragging ($ev);
+ return 1;
+ }
+
+ 0
}
-sub update {
- my ($self) = @_;
+sub invoke_button_up {
+ my ($self, $ev, $x, $y) = @_;
- $self->SUPER::update;
+ if (delete $self->{motion}) {
+ return 1;
+ }
- $self->update_slider;
+ 0
+}
+
+sub invoke_mouse_motion {
+ my ($self, $ev, $x, $y) = @_;
+
+ if ($self->{motion}) {
+ $self->{motion}->($ev, $x, $y);
+ return 1;
+ }
+
+ 0
}
sub invoke_size_allocate {
my ($self, $w, $h) = @_;
$self->update_slider;
-
$self->SUPER::invoke_size_allocate ($w, $h)
}
@@ -1242,6 +1324,10 @@
map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
+my @icon =
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ qw(x1_move.png x1_resize.png);
+
sub new {
my ($class, %arg) = @_;
@@ -1419,10 +1505,24 @@
my $border = $self->border;
glColor @{ $self->{border_bg} };
- $border[0]->draw_quad_alpha (0, 0, $w, $border);
- $border[1]->draw_quad_alpha (0, $border, $border, $ch);
- $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
- $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
+ $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
+ $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
+ $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
+ $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
+
+ # move
+ my $w2 = ($w - $border) * .5;
+ my $h2 = ($h - $border) * .5;
+ $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
+ $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
+ $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
+
+ # resize
+ $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
+ $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
+ unless $self->{has_close_button};
+ $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
+ $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
glColor @{ $self->{bg} };
@@ -1453,7 +1553,7 @@
package CFPlus::UI::Table;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = CFPlus::UI::Container::;
use List::Util qw(max sum);
@@ -1464,47 +1564,37 @@
$class->SUPER::new (
col_expand => [],
+ row_expand => [],
@_,
)
}
-sub children {
- grep $_, map @$_, grep $_, @{ $_[0]{children} }
-}
-
sub add {
- my ($self) = shift;
+ my ($self, @widgets) = @_;
- while (@_) {
- my ($x, $y, $child) = splice @_, 0, 3, ();
- $child->set_parent ($self);
- $self->{children}[$y][$x] = $child;
+ for my $child (@widgets) {
+ $child->{rowspan} ||= 1;
+ $child->{colspan} ||= 1;
}
- $self->{force_realloc} = 1;
- $self->{force_size_alloc} = 1;
- $self->realloc;
+ $self->SUPER::add (@widgets);
}
-sub remove {
- my ($self, $child) = @_;
+sub add_at {
+ my $self = shift;
- # TODO: not yet implemented
-}
+ my @widgets;
-# TODO: move to container class maybe? send children a signal on removal?
-sub clear {
- my ($self) = @_;
+ while (@_) {
+ my ($col, $row, $child) = splice @_, 0, 3, ();
- my @children = $self->children;
- delete $self->{children};
-
- for (@children) {
- delete $_->{parent};
- $_->hide;
+ $child->{row} = $row;
+ $child->{col} = $col;
+
+ push @widgets, $child;
}
- $self->realloc;
+ $self->add (@widgets);
}
sub get_wh {
@@ -1512,17 +1602,27 @@
my (@w, @h);
- for my $y (0 .. $#{$self->{children}}) {
- my $row = $self->{children}[$y]
- or next;
-
- for my $x (0 .. $#$row) {
- my $widget = $row->[$x]
- or next;
- my ($w, $h) = @$widget{qw(req_w req_h)};
+ my @children = $self->children;
+
+ # first pass, columns
+ for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
+ my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
+
+ my $sw = sum @w[$c .. $c + $cs - 1];
+
+ if ($w > $sw) {
+ $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
+ }
+ }
+
+ # second pass, rows
+ for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
+ my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
+
+ my $sh = sum @h[$r .. $r + $rs - 1];
- $w[$x] = max $w[$x], $w;
- $h[$y] = max $h[$y], $h;
+ if ($h > $sh) {
+ $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
}
}
@@ -1548,65 +1648,118 @@
my $req_w = (sum @$ws) || 1;
my $req_h = (sum @$hs) || 1;
- # TODO: nicer code && do row_expand
+ # now linearly scale the rows/columns to the allocated size
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;
- CFPlus::UI::harmonize $hs;
- my $y;
+ my @row_expand = @{$self->{row_expand}};
+ @row_expand = (1) x @$ws unless @row_expand;
+ my $row_expand = (sum @row_expand) || 1;
- for my $r (0 .. $#{$self->{children}}) {
- my $row = $self->{children}[$r]
- or next;
+ $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
- my $x = 0;
- my $row_h = $hs->[$r];
-
- for my $c (0 .. $#$row) {
- my $col_w = $ws->[$c];
+ CFPlus::UI::harmonize $hs;
- if (my $widget = $row->[$c]) {
- $widget->configure ($x, $y, $col_w, $row_h);
- }
+ my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
+ my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
- $x += $col_w;
- }
+ for my $widget ($self->children) {
+ my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
- $y += $row_h;
+ $widget->configure (
+ $x[$c], $y[$r],
+ $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
+ );
}
1
}
-sub find_widget {
- my ($self, $x, $y) = @_;
+#############################################################################
- $x -= $self->{x};
- $y -= $self->{y};
+package CFPlus::UI::Fixed;
- my $res;
+use List::Util qw(min max);
- for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
- $res = $_->find_widget ($x, $y)
- and return $res;
- }
+our @ISA = CFPlus::UI::Container::;
- $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
+sub add_fixed {
+ my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
+
+ $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
+ $self->SUPER::add ($child);
}
-sub _draw {
+sub _scale($$$) {
+ my ($mode, $val, $max) = @_;
+
+ $mode eq "abs" ? $val
+ : $mode eq "rel" ? $val * $max
+ : 0
+}
+
+sub size_request {
my ($self) = @_;
- for (grep $_, @{$self->{children}}) {
- $_->draw for grep $_, @$_;
+ my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
+
+ # determine overall size by querying abs widgets
+ for my $child ($self->visible_children) {
+ my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+ if ($pos eq "abs") {
+ $w = _scale $size, $w, $child->{req_w};
+ $h = _scale $size, $h, $child->{req_h};
+
+ $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
+ $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+ }
}
+
+ my $W = $x2 - $x1;
+ my $H = $y2 - $y1;
+
+ # now layout remaining widgets
+ for my $child ($self->visible_children) {
+ my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+ if ($pos ne "abs") {
+ $x = _scale $pos, $x, $W;
+ $y = _scale $pos, $x, $H;
+ $w = _scale $size, $w, $child->{req_w};
+ $h = _scale $size, $h, $child->{req_h};
+
+ $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
+ $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+ }
+ }
+
+ my $W = $x2 - $x1;
+ my $H = $y2 - $y1;
+
+ ($W, $H)
+}
+
+sub invoke_size_allocate {
+ my ($self, $W, $H) = @_;
+
+ for my $child ($self->visible_children) {
+ my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+ $x = _scale $pos, $x, $W;
+ $y = _scale $pos, $x, $H;
+ $w = _scale $size, $w, $W;
+ $h = _scale $size, $h, $H;
+
+ $child->configure ($x, $y, $w, $h);
+ }
+
+ 1
}
#############################################################################
@@ -1902,6 +2055,7 @@
can_focus => 1,
valign => 0,
can_events => 1,
+ ellipsise => 0,
#text => ...
#hidden => "*",
@_
@@ -1956,6 +2110,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) {
@@ -1965,15 +2121,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;
@@ -1982,6 +2148,7 @@
$self->_set_text ($text);
$self->realloc;
+ $self->update;
1
}
@@ -2060,6 +2227,8 @@
}
}
+#############################################################################
+
package CFPlus::UI::Entry;
our @ISA = CFPlus::UI::EntryBase::;
@@ -2071,7 +2240,7 @@
my $sym = $ev->{sym};
- if ($sym == 13) {
+ if ($ev->{uni} == 0x0d || $sym == 13) {
unshift @{$self->{history}},
my $txt = $self->get_text;
@@ -2111,6 +2280,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::;
@@ -2119,7 +2327,7 @@
my @tex =
map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
- qw(b1_button_active.png);
+ qw(b1_button_inactive.png b1_button_active.png);
sub new {
my $class = shift;
@@ -2127,8 +2335,8 @@
$class->SUPER::new (
padding_x => 4,
padding_y => 4,
- fg => [1, 1, 1],
- active_fg => [0, 0, 1],
+ fg => [1.0, 1.0, 1.0],
+ active_fg => [0.8, 0.8, 0.8],
can_hover => 1,
align => 0,
valign => 0,
@@ -2156,7 +2364,8 @@
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
glColor 0, 0, 0, 1;
- $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
+ my $tex = $tex[$GRAB == $self];
+ $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
glDisable GL_TEXTURE_2D;
@@ -2262,7 +2471,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};
@@ -2645,7 +2854,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
}
@@ -2765,6 +2976,7 @@
layout => (new CFPlus::Layout),
par => [],
+ max_par => 0,
height => 0,
children => [
(new CFPlus::UI::Empty expand => 1),
@@ -2899,6 +3111,10 @@
push @{$self->{par}}, $para;
}
+ if (my $max = $self->{max_par}) {
+ shift @{$self->{par}} while @{$self->{par}} > $max;
+ }
+
$self->{need_reflow}++;
$self->update;
}
@@ -2961,12 +3177,9 @@
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});
- }
+ 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];
@@ -3217,30 +3430,86 @@
my $class = shift;
my $self = $class->SUPER::new (
+ size_w => 32,
+ size_h => 8,
aspect => 1,
can_events => 0,
@_,
);
if ($self->{anim} && $self->{animspeed}) {
- Scalar::Util::weaken (my $widget = $self);
+ CFPlus::weaken (my $widget = $self);
+ $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
+ $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
$self->{timer} = Event->timer (
- at => $self->{animspeed} * int $::NOW / $self->{animspeed},
- hard => 1,
- interval => $self->{animspeed},
+ parked => 1,
cb => sub {
+ return unless $::CONN && $widget;
+
++$widget->{frame};
+ $widget->update_face;
$widget->update;
+
+ $widget->update_timer;
},
);
+
+ $self->update_face;
+ $self->update_timer;
}
$self
}
+sub update_timer {
+ my ($self) = @_;
+
+ return unless $self->{timer};
+
+ if ($self->{visible}) {
+ $self->{timer}->at (
+ $self->{anim_start}
+ + $self->{animspeed}
+ * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
+ );
+ $self->{timer}->start;
+ } else {
+ $self->{timer}->stop;
+ }
+}
+
+sub update_face {
+ my ($self) = @_;
+
+ return unless $::CONN;
+
+ if (my $anim = $::CONN->{anim}[$self->{anim}]) {
+ if ($anim && @$anim) {
+ delete $self->{wait_face};
+ $self->{face} = $anim->[ $self->{frame} % @$anim ];
+ $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
+ }
+ }
+}
+
sub size_request {
- (32, 8)
+ my ($self) = @_;
+
+ if ($::CONN) {
+ if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
+ if (my $tex = $::CONN->{texture}[$faceid]) {
+ $self->{tex} = $tex;
+ return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
+ } else {
+ $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
+ $self->realloc;
+ });
+ }
+ }
+ }
+
+ ($self->{size_w} || 8, $self->{size_h} || 8)
}
sub update {
@@ -3251,25 +3520,20 @@
$self->SUPER::update;
}
-sub _draw {
+sub invoke_visibility_change {
my ($self) = @_;
- return unless $::CONN;
-
- $self->SUPER::_draw;
+ $self->update_timer;
- my $face;
+ 0
+}
- if ($self->{frame}) {
- my $anim = $::CONN->{anim}[$self->{anim}];
+sub _draw {
+ my ($self) = @_;
- $face = $anim->[ $self->{frame} % @$anim ]
- if $anim && @$anim;
- }
-
- my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
+ $self->SUPER::_draw;
- if ($tex) {
+ if (my $tex = $self->{tex}) {
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
glColor 0, 0, 0, 1;
@@ -3281,7 +3545,7 @@
sub destroy {
my ($self) = @_;
- $self->{timer}->cancel
+ (delete $self->{timer})->cancel
if $self->{timer};
$self->SUPER::destroy;
@@ -3293,7 +3557,7 @@
our @ISA = CFPlus::UI::HBox::;
-# TODO: should actualyl wrap buttons and other goodies.
+# TODO: should actually wrap buttons and other goodies.
#############################################################################
@@ -3487,7 +3751,7 @@
sub add {
my ($self, $title, $widget, $tooltip) = @_;
- Scalar::Util::weaken $self;
+ CFPlus::weaken $self;
$self->{buttonbar}->add (new CFPlus::UI::Button
markup => $title,
@@ -3581,7 +3845,7 @@
@_,
);
- Scalar::Util::weaken (my $this = $self);
+ CFPlus::weaken (my $this = $self);
$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
@@ -3714,190 +3978,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::;
@@ -3914,7 +3994,7 @@
@_,
);
- Scalar::Util::weaken ($self->{root} = $self);
+ CFPlus::weaken ($self->{root} = $self);
$self
}
@@ -4019,7 +4099,7 @@
for values %{delete $self->{refresh_hook}};
}
- if ($self->{realloc}) {
+ while ($self->{realloc}) {
my %queue;
my @queue;
my $widget;
@@ -4076,40 +4156,37 @@
delete $self->{realloc}{$widget+0};
}
- }
-
- while (my $size_alloc = delete $self->{size_alloc}) {
- my @queue = sort { $b->{visible} <=> $a->{visible} }
- values %$size_alloc;
- while () {
- my $widget = pop @queue || last;
+ while (my $size_alloc = delete $self->{size_alloc}) {
+ my @queue = sort { $a->{visible} <=> $b->{visible} }
+ values %$size_alloc;
- my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
+ while () {
+ my $widget = pop @queue || last;
- $w = 0 if $w < 0;
- $h = 0 if $h < 0;
+ my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
- $w = max $widget->{min_w}, $w;
- $h = max $widget->{min_h}, $h;
+ $w = max $widget->{min_w}, $w;
+ $h = max $widget->{min_h}, $h;
# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
- $w = min $widget->{max_w}, $w if exists $widget->{max_w};
- $h = min $widget->{max_h}, $h if exists $widget->{max_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;
+ $w = int $w + 0.5;
+ $h = int $h + 0.5;
- if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
- $widget->{old_w} = $widget->{w};
- $widget->{old_h} = $widget->{h};
+ if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
+ $widget->{old_w} = $widget->{w};
+ $widget->{old_h} = $widget->{h};
- $widget->{w} = $w;
- $widget->{h} = $h;
+ $widget->{w} = $w;
+ $widget->{h} = $h;
- $widget->emit (size_allocate => $w, $h);
+ $widget->emit (size_allocate => $w, $h);
+ }
}
}
}
@@ -4119,7 +4196,6 @@
for values %{delete $self->{post_alloc_hook}};
}
-
glViewport 0, 0, $::WIDTH, $::HEIGHT;
glClearColor +($::CFG->{fow_intensity}) x 3, 1;
glClear GL_COLOR_BUFFER_BIT;
@@ -4135,9 +4211,9 @@
local ($draw_x, $draw_y, $draw_w, $draw_h) =
(0, 0, $self->{w}, $self->{h});
- }
- $self->_draw;
+ $self->_draw;
+ }
}
#############################################################################