--- deliantra/Deliantra-Client/DC/UI.pm 2006/07/05 01:53:24 1.322
+++ deliantra/Deliantra-Client/DC/UI.pm 2006/12/08 15:07:08 1.359
@@ -1,4 +1,4 @@
-package CFClient::UI;
+package CFPlus::UI;
use utf8;
use strict;
@@ -7,8 +7,9 @@
use List::Util ();
use Event;
-use CFClient;
-use CFClient::Texture;
+use CFPlus;
+use CFPlus::Pod;
+use CFPlus::Texture;
our ($FOCUS, $HOVER, $GRAB); # various widgets
@@ -81,11 +82,26 @@
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) {
+ $BUTTON_STATE |= 1 << ($ev->{button} - 1);
+
+ unless ($GRAB) {
my $widget = $ROOT->find_widget ($x, $y);
$GRAB = $widget;
@@ -94,28 +110,34 @@
$TOOLTIP_WATCHER->cb->();
}
- $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 +148,9 @@
my $widget = $GRAB || $ROOT->find_widget ($x, $y);
- if ($widget != $HOVER) {
- my $hover = $HOVER; $HOVER = $widget;
+ check_hover $widget;
- $hover->update if $hover && $hover->{can_hover};
- $HOVER->update if $HOVER && $HOVER->{can_hover};
-
- $TOOLTIP_WATCHER->start;
- }
-
- $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
+ $HOVER->emit (mouse_motion => $ev)
if $HOVER;
}
@@ -195,11 +210,19 @@
#############################################################################
-package CFClient::UI::Base;
+package CFPlus::UI::Event;
+
+sub xy {
+ $_[1]->coord2local ($_[0]{x}, $_[0]{y})
+}
+
+#############################################################################
+
+package CFPlus::UI::Base;
use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -214,7 +237,7 @@
@_
}, $class;
- Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
+ Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
for (keys %$self) {
if (/^on_(.*)$/) {
@@ -222,11 +245,11 @@
}
}
- if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
- $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
- $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
- $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
- $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
+ if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
+ $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
+ $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
+ $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
+ $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
@@ -249,7 +272,7 @@
return if $self->{parent};
- $CFClient::UI::ROOT->add ($self);
+ $CFPlus::UI::ROOT->add ($self);
}
sub set_visible {
@@ -280,7 +303,7 @@
undef $GRAB if $GRAB == $self;
undef $HOVER if $HOVER == $self;
- $CFClient::UI::TOOLTIP_WATCHER->cb->()
+ $CFPlus::UI::TOOLTIP_WATCHER->cb->()
if $TOOLTIP->{owner} == $self;
$self->emit ("focus_out");
@@ -347,8 +370,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, CFPlus::ceil $h * $self->{aspect};
+ $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
# use alignment to adjust x, y
@@ -399,9 +422,9 @@
$self->{tooltip} = $tooltip;
- if ($CFClient::UI::TOOLTIP->{owner} == $self) {
- delete $CFClient::UI::TOOLTIP->{owner};
- $CFClient::UI::TOOLTIP_WATCHER->cb->();
+ if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
+ delete $CFPlus::UI::TOOLTIP->{owner};
+ $CFPlus::UI::TOOLTIP_WATCHER->cb->();
}
}
@@ -409,6 +432,8 @@
sub coord2local {
my ($self, $x, $y) = @_;
+ Carp::confess unless $self->{parent};#d#
+
$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
}
@@ -416,6 +441,8 @@
sub coord2global {
my ($self, $x, $y) = @_;
+ Carp::confess unless $self->{parent};#d#
+
$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
}
@@ -454,32 +481,54 @@
$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 CFPlus::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 do not like duplication
+ # and needlessly verbose code, either.
+ 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 {
@@ -573,7 +622,7 @@
glVertex 0 , $self->{h} - 1;
glEnd;
glPopMatrix;
- #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
+ #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
}
$self->_draw;
@@ -589,6 +638,8 @@
sub DESTROY {
my ($self) = @_;
+ return if CFPlus::in_destruct;
+
delete $WIDGET{$self+0};
eval { $self->destroy };
@@ -597,12 +648,12 @@
#############################################################################
-package CFClient::UI::DrawBG;
+package CFPlus::UI::DrawBG;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -643,9 +694,9 @@
#############################################################################
-package CFClient::UI::Empty;
+package CFPlus::UI::Empty;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
sub new {
my ($class, %arg) = @_;
@@ -662,9 +713,9 @@
#############################################################################
-package CFClient::UI::Container;
+package CFPlus::UI::Container;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
sub new {
my ($class, %arg) = @_;
@@ -683,6 +734,14 @@
$self
}
+sub realloc {
+ my ($self) = @_;
+
+ $self->{force_realloc} = 1;
+ $self->{force_size_alloc} = 1;
+ $self->SUPER::realloc;
+}
+
sub add {
my ($self, @widgets) = @_;
@@ -752,14 +811,14 @@
#############################################################################
-package CFClient::UI::Bin;
+package CFPlus::UI::Bin;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
sub new {
my ($class, %arg) = @_;
- my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
+ my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
$class->SUPER::new (children => [$child], %arg)
}
@@ -776,7 +835,7 @@
$self->SUPER::remove ($widget);
- $self->{children} = [new CFClient::UI::Empty]
+ $self->{children} = [new CFPlus::UI::Empty]
unless @{$self->{children}};
}
@@ -798,11 +857,11 @@
# back-buffered drawing area
-package CFClient::UI::Window;
+package CFPlus::UI::Window;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my ($class, %arg) = @_;
@@ -834,26 +893,24 @@
sub render_child {
my ($self) = @_;
- $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+ $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
{
- package CFClient::UI::Base;
+ 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;
@@ -861,16 +918,16 @@
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;
}
#############################################################################
-package CFClient::UI::ViewPort;
+package CFPlus::UI::ViewPort;
-our @ISA = CFClient::UI::Window::;
+our @ISA = CFPlus::UI::Window::;
sub new {
my $class = shift;
@@ -940,26 +997,26 @@
) {
$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
} else {
- $self->CFClient::UI::Base::find_widget ($x, $y)
+ $self->CFPlus::UI::Base::find_widget ($x, $y)
}
}
sub _render {
my ($self) = @_;
- local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
- local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
+ local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
+ local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
- CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+ CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
$self->SUPER::_render;
}
#############################################################################
-package CFClient::UI::ScrolledWindow;
+package CFPlus::UI::ScrolledWindow;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
sub new {
my ($class, %arg) = @_;
@@ -968,7 +1025,7 @@
my $self;
- my $slider = new CFClient::UI::Slider
+ my $slider = new CFPlus::UI::Slider
vertical => 1,
range => [0, 0, 1, 0.01], # HACK fix
on_changed => sub {
@@ -977,8 +1034,9 @@
;
$self = $class->SUPER::new (
- vp => (new CFClient::UI::ViewPort expand => 1),
- slider => $slider,
+ vp => (new CFPlus::UI::ViewPort expand => 1),
+ can_events => 1,
+ slider => $slider,
%arg,
);
@@ -996,6 +1054,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) = @_;
@@ -1020,11 +1088,11 @@
#############################################################################
-package CFClient::UI::Frame;
+package CFPlus::UI::Frame;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -1060,18 +1128,118 @@
#############################################################################
-package CFClient::UI::FancyFrame;
+package CFPlus::UI::FancyFrame;
+
+our @ISA = CFPlus::UI::Bin::;
+
+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 = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
my $bg =
- new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
+ new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
mipmap => 1, wrap => 1;
my @border =
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ 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);
sub new {
@@ -1082,12 +1250,12 @@
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,
);
- $self->{title_widget} = new CFClient::UI::Label
+ $self->{title_widget} = new CFPlus::UI::Label
align => 0,
valign => 1,
text => $self->{title},
@@ -1096,11 +1264,11 @@
if ($self->{has_close_button}) {
$self->{close_button} =
- new CFClient::UI::ImageButton
+ new CFPlus::UI::ImageButton
path => 'x1_close.png',
on_activate => sub { $self->emit ("delete") };
- $self->CFClient::UI::Container::add ($self->{close_button});
+ $self->CFPlus::UI::Container::add ($self->{close_button});
}
$self
@@ -1110,8 +1278,8 @@
my ($self, @widgets) = @_;
$self->SUPER::add (@widgets);
- $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
- $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
+ $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
+ $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
}
sub border {
@@ -1229,6 +1397,14 @@
! ! $self->{motion}
}
+sub invoke_visibility_change {
+ my ($self, $visible) = @_;
+
+ delete $self->{motion} unless $visible;
+
+ 0
+}
+
sub _draw {
my ($self) = @_;
@@ -1275,13 +1451,13 @@
#############################################################################
-package CFClient::UI::Table;
+package CFPlus::UI::Table;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
use List::Util qw(max sum);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -1297,11 +1473,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;
}
@@ -1376,8 +1557,8 @@
$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
- CFClient::UI::harmonize $ws;
- CFClient::UI::harmonize $hs;
+ CFPlus::UI::harmonize $ws;
+ CFPlus::UI::harmonize $hs;
my $y;
@@ -1430,9 +1611,9 @@
#############################################################################
-package CFClient::UI::Box;
+package CFPlus::UI::Box;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
sub size_request {
my ($self) = @_;
@@ -1475,7 +1656,7 @@
}
}
- CFClient::UI::harmonize \@req;
+ CFPlus::UI::harmonize \@req;
my $pos = 0;
for (0 .. $#children) {
@@ -1490,9 +1671,9 @@
#############################################################################
-package CFClient::UI::HBox;
+package CFPlus::UI::HBox;
-our @ISA = CFClient::UI::Box::;
+our @ISA = CFPlus::UI::Box::;
sub new {
my $class = shift;
@@ -1505,9 +1686,9 @@
#############################################################################
-package CFClient::UI::VBox;
+package CFPlus::UI::VBox;
-our @ISA = CFClient::UI::Box::;
+our @ISA = CFPlus::UI::Box::;
sub new {
my $class = shift;
@@ -1520,11 +1701,11 @@
#############################################################################
-package CFClient::UI::Label;
+package CFPlus::UI::Label;
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my ($class, %arg) = @_;
@@ -1537,8 +1718,9 @@
#text => initial text
#markup => initial narkup
#max_w => maximum pixel width
+ #style => 0, # render flags
ellipsise => 3, # end
- layout => (new CFClient::Layout 2),
+ layout => (new CFPlus::Layout),
fontsize => 1,
align => -1,
valign => -1,
@@ -1549,7 +1731,7 @@
);
if (exists $self->{template}) {
- my $layout = new CFClient::Layout 2;
+ my $layout = new CFPlus::Layout;
$layout->set_text (delete $self->{template});
$self->{template} = $layout;
}
@@ -1563,16 +1745,6 @@
$self
}
-sub escape($) {
- local $_ = $_[0];
-
- s/&/&/g;
- s/>/>/g;
- s/{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;
@@ -1690,7 +1863,7 @@
$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
- $self->{size_req}
+ [$self->{layout}->size]
};
unless (exists $self->{ox}) {
@@ -1706,16 +1879,16 @@
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});
}
#############################################################################
-package CFClient::UI::EntryBase;
+package CFPlus::UI::EntryBase;
-our @ISA = CFClient::UI::Label::;
+our @ISA = CFPlus::UI::Label::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -1729,6 +1902,7 @@
can_focus => 1,
valign => 0,
can_events => 1,
+ ellipsise => 0,
#text => ...
#hidden => "*",
@_
@@ -1787,14 +1961,17 @@
substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
} elsif ($uni == 127) {
substr $text, $self->{cursor}, 1, "";
- } elsif ($sym == CFClient::SDLK_LEFT) {
+ } elsif ($sym == CFPlus::SDLK_LEFT) {
--$self->{cursor} if $self->{cursor};
- } elsif ($sym == CFClient::SDLK_RIGHT) {
+ } elsif ($sym == CFPlus::SDLK_RIGHT) {
++$self->{cursor} if $self->{cursor} < length $self->{text};
- } elsif ($sym == CFClient::SDLK_HOME) {
+ } elsif ($sym == CFPlus::SDLK_HOME) {
$self->{cursor} = 0;
- } elsif ($sym == CFClient::SDLK_END) {
+ } elsif ($sym == CFPlus::SDLK_END) {
$self->{cursor} = length $text;
+ } elsif ($uni == 21) { # ctrl-u
+ $text = "";
+ $self->{cursor} = 0;
} elsif ($uni == 27) {
$self->emit ('escape');
} elsif ($uni) {
@@ -1806,6 +1983,7 @@
$self->_set_text ($text);
$self->realloc;
+ $self->update;
1
}
@@ -1827,8 +2005,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;
@@ -1877,19 +2055,20 @@
@$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 CFClient::UI::Entry;
+#############################################################################
-our @ISA = CFClient::UI::EntryBase::;
+package CFPlus::UI::Entry;
-use CFClient::OpenGL;
+our @ISA = CFPlus::UI::EntryBase::;
+
+use CFPlus::OpenGL;
sub invoke_key_down {
my ($self, $ev) = @_;
@@ -1905,7 +2084,7 @@
$self->emit (activate => $txt);
$self->update;
- } elsif ($sym == CFClient::SDLK_UP) {
+ } elsif ($sym == CFPlus::SDLK_UP) {
if ($self->{history_pointer} < 0) {
$self->{history_saveback} = $self->get_text;
}
@@ -1917,7 +2096,7 @@
$self->set_text ($self->{history}->[$self->{history_pointer}]);
}
- } elsif ($sym == CFClient::SDLK_DOWN) {
+ } elsif ($sym == CFPlus::SDLK_DOWN) {
$self->{history_pointer}--;
$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
@@ -1927,6 +2106,45 @@
$self->set_text ($self->{history_saveback});
}
+ } elsif ($ev->{unicode} >= 0x20) {
+ return $self->SUPER::invoke_key_down ($ev)
+ }
+
+ 1
+}
+
+#############################################################################
+
+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)
}
@@ -1936,14 +2154,14 @@
#############################################################################
-package CFClient::UI::Button;
+package CFPlus::UI::Button;
-our @ISA = CFClient::UI::Label::;
+our @ISA = CFPlus::UI::Label::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
my @tex =
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw(b1_button_active.png);
sub new {
@@ -1990,51 +2208,15 @@
#############################################################################
-package CFClient::UI::ImageButton;
-
-our @ISA = CFClient::UI::Image::;
-
-use CFClient::OpenGL;
+package CFPlus::UI::CheckBox;
-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::;
+our @ISA = CFPlus::UI::DrawBG::;
my @tex =
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw(c1_checkbox_bg.png c1_checkbox_active.png);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -2101,11 +2283,11 @@
#############################################################################
-package CFClient::UI::Image;
+package CFPlus::UI::Image;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
our %texture_cache;
@@ -2117,11 +2299,11 @@
@_,
);
- $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}} ||=
- new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
+ $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}};
@@ -2130,6 +2312,21 @@
$self
}
+sub STORABLE_freeze {
+ my ($self, $cloning) = @_;
+
+ $self->{path}
+ or die "cannot serialise CFPlus::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) = @_;
@@ -2153,36 +2350,72 @@
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::VGauge;
+package CFPlus::UI::ImageButton;
+
+our @ISA = CFPlus::UI::Image::;
+
+use CFPlus::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 CFPlus::UI::VGauge;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
use List::Util qw(min max);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
my %tex = (
food => [
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
],
grace => [
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
],
hp => [
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
],
mana => [
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
],
);
@@ -2295,9 +2528,9 @@
#############################################################################
-package CFClient::UI::Gauge;
+package CFPlus::UI::Gauge;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
sub new {
my ($class, %arg) = @_;
@@ -2309,9 +2542,9 @@
%arg,
);
- $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
- $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
- $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
+ $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
+ $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
+ $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
$self
}
@@ -2342,16 +2575,16 @@
#############################################################################
-package CFClient::UI::Slider;
+package CFPlus::UI::Slider;
use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
my @tex =
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
qw(s1_slider.png s1_slider_bg.png);
sub new {
@@ -2450,6 +2683,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) = @_;
@@ -2506,9 +2749,9 @@
#############################################################################
-package CFClient::UI::ValSlider;
+package CFPlus::UI::ValSlider;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
sub new {
my ($class, %arg) = @_;
@@ -2516,8 +2759,8 @@
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}),
+ slider => (new CFPlus::UI::Slider expand => 1, range => $range),
+ entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
to_value => sub { shift },
from_value => sub { shift },
%arg,
@@ -2547,28 +2790,28 @@
#############################################################################
-package CFClient::UI::TextScroller;
+package CFPlus::UI::TextScroller;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
fontsize => 1,
- can_events => 0,
+ can_events => 1,
indent => 0,
#font => default_font
@_,
- layout => (new CFClient::Layout 2),
+ layout => (new CFPlus::Layout),
par => [],
height => 0,
children => [
- (new CFClient::UI::Empty expand => 1),
- (new CFClient::UI::Slider vertical => 1),
+ (new CFPlus::UI::Empty expand => 1),
+ (new CFPlus::UI::Slider vertical => 1),
],
);
@@ -2610,6 +2853,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) = @_;
@@ -2645,6 +2898,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) = @_;
@@ -2657,21 +2925,22 @@
}
sub add_paragraph {
- my ($self, $color, $para, $indent) = @_;
+ my $self = shift;
- my ($text, @w) = ref $para ? @$para : $para;
-
- $para = {
- w => 1e10,
- wrapped => 1,
- fg => $color,
- indent => $indent,
- markup => $text,
- widget => \@w,
- };
+ for my $para (@_) {
+ $para = {
+ fg => [1, 1, 1, 1],
+ indent => 0,
+ markup => "",
+ widget => [],
+ ref $para ? %$para : (markup => $para),
+ w => 1e10,
+ wrapped => 1,
+ };
- $self->add (@w) if @w;
- push @{$self->{par}}, $para;
+ $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
+ push @{$self->{par}}, $para;
+ }
$self->{need_reflow}++;
$self->update;
@@ -2680,65 +2949,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 CFClient::Texture $W, $H, sub {
+ $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);
@@ -2757,8 +3040,11 @@
}
}
- $y += $h;
+ $paridx++;
+ $top_paragraph ||= $paridx if $y >= $top;
}
+
+ $self->{top_paragraph} = $top_paragraph;
};
});
}
@@ -2786,11 +3072,11 @@
#############################################################################
-package CFClient::UI::Animator;
+package CFPlus::UI::Animator;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
sub moveto {
my ($self, $x, $y) = @_;
@@ -2828,9 +3114,9 @@
#############################################################################
-package CFClient::UI::Flopper;
+package CFPlus::UI::Flopper;
-our @ISA = CFClient::UI::Button::;
+our @ISA = CFPlus::UI::Button::;
sub new {
my $class = shift;
@@ -2852,11 +3138,11 @@
#############################################################################
-package CFClient::UI::Tooltip;
+package CFPlus::UI::Tooltip;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -2870,6 +3156,9 @@
sub set_tooltip_from {
my ($self, $widget) = @_;
+ $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
+ if $widget->{tooltip} =~ /^#(.*)$/;
+
my $tooltip = $widget->{tooltip};
if ($ENV{CFPLUS_DEBUG} & 2) {
@@ -2882,11 +3171,11 @@
$tooltip =~ s/^\n+//;
$tooltip =~ s/\n+$//;
- $self->add (new CFClient::UI::Label
+ $self->add (new CFPlus::UI::Label
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),
);
@@ -2915,12 +3204,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;
+ }
});
}
@@ -2954,11 +3247,11 @@
#############################################################################
-package CFClient::UI::Face;
+package CFPlus::UI::Face;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::DrawBG::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -3003,6 +3296,8 @@
return unless $::CONN;
+ $self->SUPER::_draw;
+
my $face;
if ($self->{frame}) {
@@ -3034,19 +3329,19 @@
#############################################################################
-package CFClient::UI::Buttonbar;
+package CFPlus::UI::Buttonbar;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
-# TODO: should actualyl wrap buttons and other goodies.
+# TODO: should actually wrap buttons and other goodies.
#############################################################################
-package CFClient::UI::Menu;
+package CFPlus::UI::Menu;
-our @ISA = CFClient::UI::FancyFrame::;
+our @ISA = CFPlus::UI::Toplevel::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -3057,7 +3352,7 @@
@_,
);
- $self->add ($self->{vbox} = new CFClient::UI::VBox);
+ $self->add ($self->{vbox} = new CFPlus::UI::VBox);
for my $item (@{ $self->{items} }) {
my ($widget, $cb, $tooltip) = @$item;
@@ -3067,18 +3362,18 @@
if ($widget =~ /\t/) {
my ($left, $right) = split /\t/, $widget, 2;
- $widget = new CFClient::UI::HBox
+ $widget = new CFPlus::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),
+ (new CFPlus::UI::Label markup => $left, expand => 1),
+ (new CFPlus::UI::Label markup => $right, align => +1),
],
;
} else {
- $widget = new CFClient::UI::Label
+ $widget = new CFPlus::UI::Label
can_hover => 1,
can_events => 1,
markup => $widget,
@@ -3136,9 +3431,9 @@
#############################################################################
-package CFClient::UI::Multiplexer;
+package CFPlus::UI::Multiplexer;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
sub new {
my $class = shift;
@@ -3209,16 +3504,16 @@
#############################################################################
-package CFClient::UI::Notebook;
+package CFPlus::UI::Notebook;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
- buttonbar => (new CFClient::UI::Buttonbar),
- multiplexer => (new CFClient::UI::Multiplexer expand => 1),
+ buttonbar => (new CFPlus::UI::Buttonbar),
+ multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
# filter => # will be put between multiplexer and $self
@_,
);
@@ -3234,7 +3529,7 @@
Scalar::Util::weaken $self;
- $self->{buttonbar}->add (new CFClient::UI::Button
+ $self->{buttonbar}->add (new CFPlus::UI::Button
markup => $title,
tooltip => $tooltip,
on_activate => sub { $self->set_current_page ($widget) },
@@ -3258,11 +3553,11 @@
#############################################################################
-package CFClient::UI::Combobox;
+package CFPlus::UI::Selector;
use utf8;
-our @ISA = CFClient::UI::Button::;
+our @ISA = CFPlus::UI::Button::;
sub new {
my $class = shift;
@@ -3289,7 +3584,7 @@
push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
}
- CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
+ CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
}
sub _set_value {
@@ -3314,9 +3609,9 @@
#############################################################################
-package CFClient::UI::Statusbox;
+package CFPlus::UI::Statusbox;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
sub new {
my $class = shift;
@@ -3338,8 +3633,8 @@
my $NOW = Time::HiRes::time;
# freeze display when hovering over any label
- return if $CFClient::UI::TOOLTIP->{owner}
- && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
+ return if $CFPlus::UI::TOOLTIP->{owner}
+ && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
values %{ $self->{item} };
while (my ($k, $v) = each %{ $self->{item} }) {
@@ -3370,7 +3665,7 @@
s/\s+/ /g;
}
- new CFClient::UI::Label
+ new CFPlus::UI::Label
markup => $short,
tooltip => $item->{tooltip},
tooltip_font => $::FONT_PROP,
@@ -3459,51 +3754,71 @@
#############################################################################
-package CFClient::UI::Inventory;
+package CFPlus::UI::Inventory;
-our @ISA = CFClient::UI::Table::;
+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 set_items {
- my ($self, $items) = @_;
+sub update_items {
+ my ($self) = @_;
$self->clear;
- return unless $items;
-
- my @items = sort {
- ($a->{type} <=> $b->{type})
- or ($a->{name} cmp $b->{name})
- } values %$items;
- $self->{real_items} = \@items;
+ my @item = $self->{sort}->(@{ $self->{items} });
+ my @adds;
my $row = 0;
- for my $item (@items) {
- CFClient::Item::update_widgets $item;
+ for my $item ($self->{sort}->(@{ $self->{items} })) {
+ CFPlus::Item::update_widgets $item;
- $self->add (0, $row, $item->{face_widget});
- $self->add (1, $row, $item->{desc_widget});
- $self->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;
}
#############################################################################
-package CFClient::UI::SpellList;
+package CFPlus::UI::SpellList;
-our @ISA = CFClient::UI::Table::;
+our @ISA = CFPlus::UI::Table::;
sub new {
my $class = shift;
@@ -3531,16 +3846,16 @@
sub rebuild_spell_list {
my ($self) = @_;
- $CFClient::UI::ROOT->on_refresh ($self => sub {
+ $CFPlus::UI::ROOT->on_refresh ($self => sub {
$self->clear;
return unless $::CONN;
- $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
- $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
- $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
- $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
- $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
+ $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;
@@ -3557,10 +3872,11 @@
} elsif ($ev->{button} == 2) {
$::CONN->user_send ("invoke $spell->{name}");
} elsif ($ev->{button} == 3) {
- (new CFClient::UI::Menu
+ my $shortname = CFPlus::shorten $spell->{name}, 14;
+ (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}"]) }],
+ ["bind cast $shortname to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
+ ["bind invoke $shortname to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
],
)->popup ($ev);
} else {
@@ -3570,12 +3886,12 @@
1
};
- my $tooltip = "$spell->{message}$TOOLTIP_ALL";
+ my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
#TODO: add path info to tooltip
- #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
+ #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
- $self->add (0, $row, new CFClient::UI::Face
+ $self->add (0, $row, new CFPlus::UI::Face
face => $spell->{face},
can_hover => 1,
can_events => 1,
@@ -3583,7 +3899,7 @@
on_button_down => $spell_cb,
);
- $self->add (1, $row, new CFClient::UI::Label
+ $self->add (1, $row, new CFPlus::UI::Label
expand => 1,
text => $spell->{name},
can_hover => 1,
@@ -3592,10 +3908,10 @@
on_button_down => $spell_cb,
);
- $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
- $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
- $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
- $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
+ $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);
}
});
}
@@ -3623,13 +3939,13 @@
#############################################################################
-package CFClient::UI::Root;
+package CFPlus::UI::Root;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
use List::Util qw(min max);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -3815,6 +4131,15 @@
$w = 0 if $w < 0;
$h = 0 if $h < 0;
+ $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 = int $w + 0.5;
$h = int $h + 0.5;
@@ -3847,21 +4172,21 @@
glLoadIdentity;
{
- package CFClient::UI::Base;
+ 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;
+ }
}
#############################################################################
-package CFClient::UI;
+package CFPlus::UI;
-$ROOT = new CFClient::UI::Root;
-$TOOLTIP = new CFClient::UI::Tooltip z => 900;
+$ROOT = new CFPlus::UI::Root;
+$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
1