--- deliantra/Deliantra-Client/DC/UI.pm 2007/07/20 16:32:11 1.384
+++ deliantra/Deliantra-Client/DC/UI.pm 2008/07/18 22:32:54 1.464
@@ -1,14 +1,13 @@
-package CFPlus::UI;
+package DC::UI;
use utf8;
use strict;
use List::Util ();
-use Event;
-use CFPlus;
-use CFPlus::Pod;
-use CFPlus::Texture;
+use DC;
+use DC::Pod;
+use DC::Texture;
our ($FOCUS, $HOVER, $GRAB); # various widgets
@@ -19,7 +18,9 @@
our %WIDGET; # all widgets, weak-referenced
-our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
+our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
+ $_[0]->stop;
+
if (!$GRAB) {
for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
if (length $widget->{tooltip}) {
@@ -32,10 +33,6 @@
return if $ENV{CFPLUS_DEBUG} & 8;
- my $tip = $widget->{tooltip};
-
- $tip = $tip->($widget) if CODE:: eq ref $tip;
-
$TOOLTIP->set_tooltip_from ($widget);
$TOOLTIP->show;
}
@@ -48,7 +45,7 @@
$TOOLTIP->hide;
$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
delete $TOOLTIP->{owner};
-});
+};
sub get_layout {
my $layout;
@@ -93,7 +90,7 @@
$hover->update if $hover && $hover->{can_hover};
$HOVER->update if $HOVER && $HOVER->{can_hover};
- $TOOLTIP_WATCHER->start;
+ $TOOLTIP_WATCHER->again;
}
}
@@ -109,14 +106,18 @@
$GRAB = $widget;
$GRAB->update if $GRAB;
- $TOOLTIP_WATCHER->cb->();
+ $TOOLTIP_WATCHER->invoke;
}
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} & DC::KMOD_SHIFT;
+
+ $ev->{dx} = $shift ? $delta : 0;
+ $ev->{dy} = $shift ? 0 : $delta;
+
$GRAB->emit (mouse_wheel => $ev);
} else {
$GRAB->emit (button_down => $ev)
@@ -140,7 +141,7 @@
$GRAB->update if $GRAB;
check_hover $widget;
- $TOOLTIP_WATCHER->cb->();
+ $TOOLTIP_WATCHER->invoke;
}
}
@@ -212,7 +213,7 @@
#############################################################################
-package CFPlus::UI::Event;
+package DC::UI::Event;
sub xy {
$_[1]->coord2local ($_[0]{x}, $_[0]{y})
@@ -220,11 +221,11 @@
#############################################################################
-package CFPlus::UI::Base;
+package DC::UI::Base;
use strict;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -239,7 +240,7 @@
@_
}, $class;
- CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
+ DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
for (keys %$self) {
if (/^on_(.*)$/) {
@@ -247,11 +248,11 @@
}
}
- 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};
+ if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
+ $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
+ $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
+ $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
+ $self->{force_h} = $layout->{h} * $DC::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};
@@ -271,7 +272,7 @@
}
sub TO_JSON {
- { __widget_ref__ => $_[0]{s_id} }
+ { "\fw" => $_[0]{s_id} }
}
sub show {
@@ -279,7 +280,7 @@
return if $self->{parent};
- $CFPlus::UI::ROOT->add ($self);
+ $DC::UI::ROOT->add ($self);
}
sub set_visible {
@@ -310,7 +311,7 @@
undef $GRAB if $GRAB == $self;
undef $HOVER if $HOVER == $self;
- $CFPlus::UI::TOOLTIP_WATCHER->cb->()
+ $DC::UI::TOOLTIP_WATCHER->invoke
if $TOOLTIP->{owner} == $self;
$self->emit ("focus_out");
@@ -339,8 +340,11 @@
$self->set_invisible;
- $self->{parent}->remove ($self)
- if $self->{parent};
+ # extra $parent copy for 5.8.8+ bug workaround
+ # (otherwise $_[0] in remove gets freed
+ if (my $parent = $self->{parent}) {
+ $parent->remove ($self);
+ }
}
sub move_abs {
@@ -362,6 +366,24 @@
$self->realloc;
}
+# traverse the widget chain up to find the maximum "physical" size constraints
+sub get_max_wh {
+ my ($self) = @_;
+
+ my ($w, $h) = @$self{qw(max_w max_h)};
+
+ if ($w <= 0 || $h <= 0) {
+ my ($mw, $mh) = $self->{parent}
+ ? $self->{parent}->get_max_wh
+ : ($::WIDTH, $::HEIGHT);
+
+ $w = $mw if $w <= 0;
+ $h = $mh if $h <= 0;
+ }
+
+ ($w, $h)
+}
+
sub size_request {
require Carp;
Carp::confess "size_request is abstract";
@@ -377,8 +399,8 @@
if ($self->{aspect}) {
my ($ow, $oh) = ($w, $h);
- $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
- $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
+ $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
+ $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
# use alignment to adjust x, y
@@ -429,9 +451,9 @@
$self->{tooltip} = $tooltip;
- if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
- delete $CFPlus::UI::TOOLTIP->{owner};
- $CFPlus::UI::TOOLTIP_WATCHER->cb->();
+ if ($DC::UI::TOOLTIP->{owner} == $self) {
+ delete $DC::UI::TOOLTIP->{owner};
+ $DC::UI::TOOLTIP_WATCHER->invoke;
}
}
@@ -439,7 +461,7 @@
sub coord2local {
my ($self, $x, $y) = @_;
- Carp::confess unless $self->{parent};#d#
+ return (undef, undef) unless $self->{parent};
$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
}
@@ -448,7 +470,7 @@
sub coord2global {
my ($self, $x, $y) = @_;
- Carp::confess unless $self->{parent};#d#
+ return (undef, undef) unless $self->{parent};
$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
}
@@ -507,7 +529,7 @@
push @{ $self->{signal_cb}{$signal} }, $cb;
- defined wantarray and CFPlus::guard {
+ defined wantarray and DC::guard {
@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
@{ $self->{signal_cb}{$signal} };
}
@@ -549,22 +571,13 @@
$self->{parent} && $self->{parent}->emit ($signal, @args)
}
-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};
-
- ()
-}
+#sub find_widget {
+# in .xs
sub set_parent {
my ($self, $parent) = @_;
- CFPlus::weaken ($self->{parent} = $parent);
+ DC::weaken ($self->{parent} = $parent);
$self->set_visible if $parent->{visible};
}
@@ -600,52 +613,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) = @_;
@@ -653,12 +622,12 @@
warn "no draw defined for $self\n";
}
-my $cntx;#d#
sub DESTROY {
my ($self) = @_;
- return if CFPlus::in_destruct;
+ return if DC::in_destruct;
+ local $@;
eval { $self->destroy };
warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
@@ -667,18 +636,16 @@
#############################################################################
-package CFPlus::UI::DrawBG;
+package DC::UI::DrawBG;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
use strict;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
- # range [value, low, high, page]
-
$class->SUPER::new (
#bg => [0, 0, 0, 0.2],
#active_bg => [1, 1, 1, 0.5],
@@ -699,23 +666,16 @@
glEnable GL_BLEND;
glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glColor_premultiply @$color;
-
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex 0 , $h;
- glVertex $w, $h;
- glVertex $w, 0;
- glEnd;
-
+ glRect 0, 0, $w, $h;
glDisable GL_BLEND;
}
}
#############################################################################
-package CFPlus::UI::Empty;
+package DC::UI::Empty;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
sub new {
my ($class, %arg) = @_;
@@ -732,9 +692,9 @@
#############################################################################
-package CFPlus::UI::Container;
+package DC::UI::Container;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
sub new {
my ($class, %arg) = @_;
@@ -748,7 +708,7 @@
);
$self->add (@$children)
- if $children;
+ if $children && @$children;
$self
}
@@ -767,6 +727,7 @@
$_->set_parent ($self)
for @widgets;
+ # TODO: only do this in widgets that need it, e.g. root, fixed
use sort 'stable';
$self->{children} = [
@@ -775,6 +736,10 @@
];
$self->realloc;
+
+ $self->emit (c_add => \@widgets);
+
+ map $_+0, @widgets
}
sub children {
@@ -782,12 +747,15 @@
}
sub remove {
- my ($self, $child) = @_;
+ my ($self, @widgets) = @_;
- delete $child->{parent};
- $child->hide;
+ $self->emit (c_remove => \@widgets);
- $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
+ for my $child (@widgets) {
+ delete $child->{parent};
+ $child->hide;
+ $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
+ }
$self->realloc;
}
@@ -795,7 +763,7 @@
sub clear {
my ($self) = @_;
- my $children = delete $self->{children};
+ my $children = $self->{children};
$self->{children} = [];
for (@$children) {
@@ -825,19 +793,19 @@
sub _draw {
my ($self) = @_;
- $_->draw for @{$self->{children}};
+ $_->draw for $self->visible_children;
}
#############################################################################
-package CFPlus::UI::Bin;
+package DC::UI::Bin;
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
sub new {
my ($class, %arg) = @_;
- my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
+ my $child = (delete $arg{child}) || new DC::UI::Empty::;
$class->SUPER::new (children => [$child], %arg)
}
@@ -845,7 +813,7 @@
sub add {
my ($self, $child) = @_;
- $self->SUPER::remove ($_) for @{ $self->{children} };
+ $self->clear;
$self->SUPER::add ($child);
}
@@ -854,7 +822,7 @@
$self->SUPER::remove ($widget);
- $self->{children} = [new CFPlus::UI::Empty]
+ $self->{children} = [new DC::UI::Empty]
unless @{$self->{children}};
}
@@ -873,14 +841,13 @@
}
#############################################################################
-
# back-buffered drawing area
-package CFPlus::UI::Window;
+package DC::UI::Window;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my ($class, %arg) = @_;
@@ -912,12 +879,12 @@
sub render_child {
my ($self) = @_;
- $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
+ $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
{
- package CFPlus::UI::Base;
+ package DC::UI::Base;
local ($draw_x, $draw_y, $draw_w, $draw_h) =
(0, 0, $self->{w}, $self->{h});
@@ -944,11 +911,11 @@
#############################################################################
-package CFPlus::UI::ViewPort;
+package DC::UI::ViewPort;
use List::Util qw(min max);
-our @ISA = CFPlus::UI::Window::;
+our @ISA = DC::UI::Window::;
sub new {
my $class = shift;
@@ -965,8 +932,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)
}
@@ -1000,6 +967,24 @@
}
}
+sub set_center {
+ my ($self, $x, $y) = @_;
+
+ $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
+}
+
+sub make_visible {
+ my ($self, $x, $y, $border) = @_;
+
+ if ( $x < $self->{view_x} + $self->{w} * $border
+ || $x > $self->{view_x} + $self->{w} * (1 - $border)
+ || $y < $self->{view_y} + $self->{h} * $border
+ || $y > $self->{view_y} + $self->{h} * (1 - $border)
+ ) {
+ $self->set_center ($x, $y);
+ }
+}
+
# hmm, this does not work for topleft of $self... but we should not ask for that
sub coord2local {
my ($self, $x, $y) = @_;
@@ -1022,28 +1007,28 @@
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)
+ $self->DC::UI::Base::find_widget ($x, $y)
}
}
sub _render {
my ($self) = @_;
- 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};
+ local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
+ local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
- CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+ DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
$self->SUPER::_render;
}
#############################################################################
-package CFPlus::UI::ScrolledWindow;
+package DC::UI::ScrolledWindow;
-our @ISA = CFPlus::UI::Table::;
+our @ISA = DC::UI::Table::;
sub new {
my ($class, %arg) = @_;
@@ -1052,7 +1037,9 @@
my $self;
- my $hslider = new CFPlus::UI::Slider
+ my $hslider = new DC::UI::Slider
+ c_col => 0,
+ c_row => 1,
vertical => 0,
range => [0, 0, 1, 0.01], # HACK fix
on_changed => sub {
@@ -1061,7 +1048,9 @@
},
;
- my $vslider = new CFPlus::UI::Slider
+ my $vslider = new DC::UI::Slider
+ c_col => 1,
+ c_row => 0,
vertical => 1,
range => [0, 0, 1, 0.01], # HACK fix
on_changed => sub {
@@ -1081,7 +1070,9 @@
%arg,
);
- $self->{vp} = new CFPlus::UI::ViewPort
+ $self->{vp} = new DC::UI::ViewPort
+ c_col => 0,
+ c_row => 0,
expand => 1,
scroll_x => $self->{scroll_x},
scroll_y => $self->{scroll_y},
@@ -1093,2436 +1084,83 @@
0
},
+ on_size_allocate => sub {
+ my ($vp, $w, $h) = @_;
+ $vp->{parent}->update_slider;
+ 0
+ },
;
- $self->SUPER::add_at (0, 0, $self->{vp});
+ $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 set_offset { shift->{vp}->set_offset (@_) }
+sub set_center { shift->{vp}->set_center (@_) }
+sub make_visible { shift->{vp}->make_visible (@_) }
+
sub update_slider {
my ($self) = @_;
my $child = ($self->{vp} or return)->child;
- my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
- $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
+ 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}) {
- $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
- : $self->{hslider}->hide;
- }
-
- my ($h1, $h2) = ($child->{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}) {
- $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
-#!/opt/bin/perl
-
-my $startup_done = sub { };
-our $PANGO = "1.5.0";
-
-# do splash-screen thingy on win32
-BEGIN {
- if (%PAR::LibCache && $^O eq "MSWin32") {
- while (my ($filename, $zip) = each %PAR::LibCache) {
- $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
+ my $visible = $w1 > $w2;
+ if ($visible != $self->{hslider_visible}) {
+ $self->{hslider_visible} = $visible;
+ $visible ? $self->SUPER::add ($self->{hslider})
+ : $self->SUPER::remove ($self->{hslider});
}
-
- require Win32::GUI::SplashScreen;
-
- Win32::GUI::SplashScreen::Show (
- -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
- );
-
- $startup_done = sub {
- Win32::GUI::SplashScreen::Done (1);
- };
}
-}
-use strict;
-use utf8;
-
-use Carp 'verbose';
-
-# do things only needed for single-binary version (par)
-BEGIN {
- if (%PAR::LibCache) {
- @INC = grep ref, @INC; # weed out all paths except pars loader refs
-
- my $tmp = $ENV{PAR_TEMP};
-
- while (my ($filename, $zip) = each %PAR::LibCache) {
- for ($zip->memberNames) {
- next unless /^root\/(.*)/;
- $zip->extractMember ($_, "$tmp/$1")
- unless -e "$tmp/$1";
- }
- }
+ 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]);
- if ($^O eq "MSWin32") {
- # relocatable
- } else {
- # unix, need to patch pango rc file
- open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
- or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
- local $/;
- my $rc = <$fh>;
- $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
-
- mkdir "$tmp/pango-modules";
- open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
- or die "$tmp/pango-modules/pango.modules: $!";
- print $fh $rc;
-
- $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
- open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
- or die "$ENV{PANGO_RC_FILE}: $!";
- print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
+ my $visible = $h1 > $h2;
+ if ($visible != $self->{vslider_visible}) {
+ $self->{vslider_visible} = $visible;
+ $visible ? $self->SUPER::add ($self->{vslider})
+ : $self->SUPER::remove ($self->{vslider});
}
-
- unshift @INC, $tmp;
}
}
-# need to do it again because that pile of garbage called PAR nukes it before main
-unshift @INC, $ENV{PAR_TEMP}
- if %PAR::LibCache;
-
-use Time::HiRes 'time';
-use Event;
-
-use Crossfire;
-use Crossfire::Protocol::Constants;
-
-use Compress::LZF;
-
-use CFPlus;
-use CFPlus::OpenGL ();
-use CFPlus::Protocol;
-use CFPlus::DB;
-use CFPlus::UI;
-use CFPlus::UI::Inventory;
-use CFPlus::UI::SpellList;
-use CFPlus::Pod;
-use CFPlus::MapWidget;
-use CFPlus::Macro;
-
-$SIG{QUIT} = sub { Carp::cluck "QUIT" };
-$SIG{PIPE} = 'IGNORE';
-
-$Event::Eval = 1;
-$Event::DIED = sub {
- CFPlus::fatal Carp::longmess $_[1]
-};
-
-my $MAX_FPS = 60;
-my $MIN_FPS = 5; # unused as of yet
-
-our $META_SERVER = "http://metaserver.schmorp.de/current.json";
-
-our $LAST_REFRESH;
-our $NOW;
-
-our $CFG;
-our $CONN;
-our $PROFILE; # current profile
-our $FAST; # fast, low-quality mode, possibly useful for software-rendering
-
-our $WANT_REFRESH;
-our $CAN_REFRESH;
-
-our @SDL_MODES;
-our $WIDTH;
-our $HEIGHT;
-our $FULLSCREEN;
-our $FONTSIZE;
-
-our $FONT_PROP;
-our $FONT_FIXED;
-
-our $MAP;
-our $MAPMAP;
-our $MAPWIDGET;
-our $BUTTONBAR;
-our $LOGVIEW;
-our $CONSOLE;
-our $METASERVER;
-our $LOGIN_BUTTON;
-our $QUIT_DIALOG;
-our $HOST_ENTRY;
-our $FULLSCREEN_ENABLE;
-our $PICKUP_ENABLE;
-our $SERVER_INFO;
-
-our $SETUP_DIALOG;
-our $SETUP_NOTEBOOK;
-our $SETUP_SERVER;
-our $SETUP_KEYBOARD;
-
-our $PL_NOTEBOOK;
-our $PL_WINDOW;
-
-our $INVENTORY_PAGE;
-our $STATS_PAGE;
-our $SKILL_PAGE;
-our $SPELL_PAGE;
-our $SPELL_LIST;
-
-our $HELP_WINDOW;
-our $MESSAGE_WINDOW;
-our $FLOORBOX;
-our $GAUGES;
-our $STATWIDS;
-
-our $SDL_ACTIVE;
-our %SDL_CB;
-
-our $SDL_MIXER;
-our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
-our @MUSIC_WANT;
-our $MUSIC_START;
-our $MUSIC_PLAYING;
-our $MUSIC_PLAYER;
-our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
-our @SOUNDS; # event => file mapping
-our %AUDIO_CHUNKS; # audio files
-
-our $ALT_ENTER_MESSAGE;
-our $STATUSBOX;
-our $DEBUG_STATUS;
-
-our $INV;
-our $INVR;
-our $INV_RIGHT_HB;
-
-our $PICKUP_CFG;
-
-our $IN_BUILD_MODE;
-our $BUILD_BUTTON;
-
-sub status {
- $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
-}
-
-sub debug {
- $DEBUG_STATUS->set_text ($_[0]);
-}
-
-sub message {
- my ($para) = @_;
-
- my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
-
- $para->{markup} = "$time $para->{markup}";
-
- $LOGVIEW->add_paragraph ($para);
- $LOGVIEW->scroll_to_bottom;
-}
-
-sub destroy_query_dialog {
- (delete $_[0]{query_dialog})->destroy
- if $_[0]{query_dialog};
-}
-
-# FIXME: a very ugly hack to wait for stat update look below! #d#
-our $QUERY_TIMER; #d#
-
-# server query dialog
-sub server_query {
- my ($conn, $flags, $prompt) = @_;
-
- # FIXME: a very ugly hack to wait for stat update #d#
- if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
- unless ($QUERY_TIMER) {
- $QUERY_TIMER =
- Event->timer (
- after => 1,
- cb => sub {
- server_query ($conn, $flags, $prompt, 1);
- $QUERY_TIMER = undef
- }
- );
- return;
- }
- }
-
- $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
- x => "center",
- y => "center",
- title => "Server Query",
- child => my $vbox = new CFPlus::UI::VBox,
- ;
-
- my @dialog = my $label = new CFPlus::UI::Label
- max_w => $::WIDTH * 0.8,
- ellipsise => 0,
- text => $prompt;
-
- if ($flags & CS_QUERY_YESNO) {
- push @dialog, my $hbox = new CFPlus::UI::HBox;
-
- $hbox->add (new CFPlus::UI::Button
- text => "No",
- on_activate => sub {
- $conn->send ("reply n");
- $dialog->destroy;
- 0
- }
- );
- $hbox->add (new CFPlus::UI::Button
- text => "Yes",
- on_activate => sub {
- $conn->send ("reply y");
- destroy_query_dialog $conn;
- 0
- },
- );
-
- $dialog->grab_focus;
-
- } elsif ($flags & CS_QUERY_SINGLECHAR) {
- if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
- $dialog->{tooltip} = "#charcreation_focus";
-
- unshift @dialog, new CFPlus::UI::Label
- max_w => $::WIDTH * 0.8,
- ellipsise => 0,
- markup => "\nOr use your keyboard and the text entry below:\n";
-
- unshift @dialog, my $table = new CFPlus::UI::Table;
-
- $table->add_at (0, 0, new CFPlus::UI::Button
- text => "Next Race",
- on_activate => sub {
- $conn->send ("reply n");
- destroy_query_dialog $conn;
- 0
- },
- );
- $table->add_at (2, 0, new CFPlus::UI::Button
- text => "Accept",
- on_activate => sub {
- $conn->send ("reply d");
- destroy_query_dialog $conn;
- 0
- },
- );
-
- if ($conn->{chargen_race_description}) {
- unshift @dialog, new CFPlus::UI::Label
- max_w => $::WIDTH * 0.8,
- ellipsise => 0,
- markup => "$conn->{chargen_race_description}",
- ;
- }
-
- unshift @dialog, new CFPlus::UI::Face
- face => $conn->{player}{face},
- bg => [.2, .2, .2, 1],
- min_w => 64,
- min_h => 64,
- ;
-
- if ($conn->{chargen_race_title}) {
- unshift @dialog, new CFPlus::UI::Label
- allign => 1,
- ellipsise => 0,
- markup => "Race: $conn->{chargen_race_title}",
- ;
- }
-
- unshift @dialog, new CFPlus::UI::Label
- max_w => $::WIDTH * 0.4,
- ellipsise => 0,
- markup => (CFPlus::Pod::section_label ui => "chargen_race"),
- ;
-
- } elsif ($prompt =~ /roll new stats/) {
- if (my $stat = delete $conn->{stat_change_with}) {
- $conn->send ("reply $stat");
- destroy_query_dialog $conn;
- return;
- }
-
- unshift @dialog, new CFPlus::UI::Label
- max_w => $::WIDTH * 0.4,
- ellipsise => 0,
- markup => "\nOr use your keyboard and the text entry below:\n";
-
- unshift @dialog, my $table = new CFPlus::UI::Table;
-
- # left: re-roll
- $table->add_at (0, 0, new CFPlus::UI::Button
- text => "Roll Again",
- on_activate => sub {
- $conn->send ("reply y");
- destroy_query_dialog $conn;
- 0
- },
- );
-
- # center: swap stats
- my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
- expand => 1,
- value => $_,
- options => [
- [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
- [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
- [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
- [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
- [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
- [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
- [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
- ],
- ), 1 .. 2;
-
- $table->add_at (2, 0, new CFPlus::UI::Button
- text => "Swap Stats",
- on_activate => sub {
- $conn->{stat_change_with} = $sw2->{value};
- $conn->send ("reply $sw1->{value}");
- destroy_query_dialog $conn;
- 0
- },
- );
- $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
-
- # right: accept
- $table->add_at (4, 0, new CFPlus::UI::Button
- text => "Accept",
- on_activate => sub {
- $conn->send ("reply n");
- $STATS_PAGE->hide;
- destroy_query_dialog $conn;
- 0
- },
- );
-
- unshift @dialog, my $hbox = new CFPlus::UI::HBox;
- for (
- [Str => CS_STAT_STR],
- [Dex => CS_STAT_DEX],
- [Con => CS_STAT_CON],
- [Int => CS_STAT_INT],
- [Wis => CS_STAT_WIS],
- [Pow => CS_STAT_POW],
- [Cha => CS_STAT_CHA],
- ) {
- my ($name, $id) = @$_;
- $hbox->add (new CFPlus::UI::Label
- markup => "$conn->{stat}{$id} $name",
- align => 0,
- expand => 1,
- can_events => 1,
- can_hover => 1,
- tooltip => "#stat_$name",
- );
- }
-
- unshift @dialog, new CFPlus::UI::Label
- max_w => $::WIDTH * 0.4,
- ellipsise => 0,
- markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
- ;
- }
-
- push @dialog, my $entry = new CFPlus::UI::Entry
- on_changed => sub {
- $conn->send ("reply $_[1]");
- destroy_query_dialog $conn;
- 0
- },
- ;
-
- $entry->grab_focus;
-
- } else {
- $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
-
- push @dialog, my $entry = new CFPlus::UI::Entry
- $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
- on_activate => sub {
- $conn->send ("reply $_[1]");
- destroy_query_dialog $conn;
- 0
- },
- ;
-
- $entry->grab_focus;
- }
-
- $vbox->add (@dialog);
- $dialog->show;
-}
-
-sub start_game {
- status "logging in...";
-
- $LOGIN_BUTTON->set_text ("Logout");
- $SETUP_DIALOG->hide;
-
- my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+sub start_dragging {
+ my ($self, $ev) = @_;
- my ($host, $port) = split /:/, $PROFILE->{host};
+ $self->grab_focus;
- $MAP = new CFPlus::Map;
+ my $ox = $self->{vp}{view_x};
+ my $oy = $self->{vp}{view_y};
- $CONN = eval {
- new CFPlus::Protocol
- host => $host,
- port => $port || 13327,
- user => $PROFILE->{user},
- pass => $PROFILE->{password},
- mapw => $mapsize,
- maph => $mapsize,
-
- client => "cfplus $CFPlus::VERSION $] $^O",
-
- map_widget => $MAPWIDGET,
- logview => $LOGVIEW,
- statusbox => $STATUSBOX,
- map => $MAP,
- mapmap => $MAPMAP,
- query => \&server_query,
-
- setup_req => {
- smoothing => $CFG->{map_smoothing}*1,
- },
-
- sound_play => sub {
- my ($x, $y, $soundnum, $type) = @_;
-
- $SDL_MIXER
- or return;
-
- my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
- or return;
-
- $chunk->play;
- },
- };
-
- if ($CONN) {
- CFPlus::lowdelay fileno $CONN->{fh};
-
- status "login successful";
- } else {
- status "unable to connect";
- stop_game();
- }
-}
-
-sub stop_game {
- $LOGIN_BUTTON->set_text ("Login");
- $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
- $SETUP_DIALOG->show;
- $PL_WINDOW->hide;
- $SPELL_LIST->clear_spells;
- $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
-
- &audio_music_set ([]);
-
- return unless $CONN;
-
- status "connection closed";
-
- destroy_query_dialog $CONN;
- $CONN->destroy;
- $CONN = 0; # false, does not autovivify
-
- undef $MAP;
-}
-
-sub graphics_setup {
- my $vbox = new CFPlus::UI::VBox;
-
- $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
-
- my $row = 0;
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
- $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
- can_events => 1,
- tooltip => "" . (CFPlus::OpenGL::gl_extensions) . "");
-
- my $vidmode_tooltip =
- "Video Mode. The video mode to use for fullscreen (and the window size for windowed operation). "
- . "The format is width x height \@ depth-per-channel + alpha-channel.";
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
- $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
-
- $hbox->add (my $mode_slider = new CFPlus::UI::Slider
- force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
- tooltip => $vidmode_tooltip);
- $hbox->add (my $mode_label = new CFPlus::UI::Label
- align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
- can_events => 1, tooltip => $vidmode_tooltip);
-
- $mode_slider->connect (changed => sub {
- my ($self, $value) = @_;
-
- $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
- $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
- });
- $mode_slider->emit (changed => $mode_slider->{range}[0]);
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
- $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
- state => $CFG->{fullscreen},
- tooltip => "Bring the client into fullscreen mode.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
- state => $CFG->{fast},
- tooltip => "Lower the visual quality considerably to speed up rendering.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
- range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
- tooltip => "The base font size used by most GUI elements that do not have their own setting.",
- on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
- );
-
- $table->add_at (1, $row++, new CFPlus::UI::Button
- expand => 1, align => 0, text => "Apply",
- tooltip => "Apply the video settings above.",
- on_activate => sub {
- video_shutdown ();
- video_init ();
- 0
- }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
- range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
- tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
- state => $CFG->{map_smoothing},
- tooltip => "Map Smoothing tries to make tile borders less square. "
- . "This increases load on the graphics subsystem and works only with 2.x servers. "
- . "Changes take effect at next connection only.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
- state => $CFG->{fow_enable},
- tooltip => "Fog-of-War marks areas that cannot be seen by the player. Changes are instant.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
- range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
- tooltip => "Fog of War Lightness. The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
- range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
- tooltip => "The font size used by the message/server log window only. Changes are instant.",
- on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
- range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
- tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
- on_changed => sub {
- $CFG->{gauge_fontsize} = $_[1];
- &set_gauge_window_fontsize;
- 0
- }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
- range => [$CFG->{gauge_size}, 0.2, 0.8],
- tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
- on_changed => sub {
- $CFG->{gauge_size} = $_[1];
- $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
- 0
- }
- );
-
- $vbox
-}
-
-sub audio_setup {
- my $vbox = new CFPlus::UI::VBox;
-
- $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
-
- my $row = 0;
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
- state => $CFG->{audio_enable},
- tooltip => "Master Audio Enable. If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
- on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
- );
-# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
-# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
-# $CFG->{effects_volume} = $_[1];
-# });
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
- $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
- $hbox->add (new CFPlus::UI::CheckBox
- expand => 1, state => $CFG->{bgm_enable},
- tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
- on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
- );
- $hbox->add (new CFPlus::UI::Slider
- expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
- tooltip => "The volume of the background music. Changes are instant.",
- on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
- );
-
- $table->add_at (1, $row++, new CFPlus::UI::Button
- expand => 1, align => 0, text => "Apply",
- tooltip => "Apply the audio settings",
- on_activate => sub {
- audio_shutdown ();
- audio_init ();
- 0
- }
- );
-
- $vbox
-}
-
-sub set_gauge_window_fontsize {
- for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
- $_->set_fontsize ($::CFG->{gauge_fontsize});
- }
-}
-
-sub make_gauge_window {
- my $gh = int $HEIGHT * $CFG->{gauge_size};
-
- my $win = new CFPlus::UI::Frame (
- force_x => 0,
- force_y => "max",
- force_w => $WIDTH,
- force_h => $gh,
- );
-
- $win->add (my $hbox = new CFPlus::UI::HBox
- children => [
- (new CFPlus::UI::HBox expand => 1),
- (new CFPlus::UI::VBox children => [
- (new CFPlus::UI::Empty expand => 1),
- (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
- ]),
- (my $vbox = new CFPlus::UI::VBox),
- ],
- );
+ $self->{motion} = sub {
+ my ($ev, $x, $y) = @_;
- $vbox->add (new CFPlus::UI::HBox
- expand => 1,
- children => [
- (new CFPlus::UI::Empty expand => 1),
- (my $hb = new CFPlus::UI::HBox),
- ],
- );
+ $ox -= $ev->{xrel};
+ $oy -= $ev->{yrel};
- $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
- $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
- $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
- $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
-
- $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
- $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
-
- $GAUGES = {
- exp => $exp, win => $win, range => $rng,
- food => $fg, mana => $mg, hp => $hg, grace => $gg
+ $self->{vp}->set_offset ($ox, $oy);
};
-
- &set_gauge_window_fontsize;
-
- $win
-}
-
-sub debug_setup {
- my $table = new CFPlus::UI::Table;
-
- $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
- $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
- $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
- $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
- $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
- $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
- $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
- $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
- $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
-
- $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
-
- $table
-}
-
-sub stats_window {
- my $r = new CFPlus::UI::ScrolledWindow (
- expand => 1,
- scroll_y => 1
- );
- $r->add (my $vb = new CFPlus::UI::VBox);
-
- $vb->add (new CFPlus::UI::FancyFrame
- label => "Player",
- child => (my $pi = new CFPlus::UI::VBox),
- );
-
- $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
- can_hover => 1, can_events => 1,
- tooltip => "Your name and title. You can change your title by using the title command, if supported by the server.");
- $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
- can_hover => 1, can_events => 1,
- tooltip => "The map you are currently on (if supported by the server).");
-
- $pi->add (my $hb0 = new CFPlus::UI::HBox);
- $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
- can_hover => 1, can_events => 1,
- tooltip => "The weight of the player including all inventory items.");
- $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
- can_hover => 1, can_events => 1,
- tooltip => "The weight limit: you cannot carry more than this.");
-
- $vb->add (new CFPlus::UI::FancyFrame
- label => "Primary/Secondary Statistics",
- child => (my $hb = new CFPlus::UI::HBox expand => 1),
- );
- $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
-
- my $color2 = [1, 1, 0];
-
- for (
- [0, 0, st_str => "Str", 30],
- [0, 1, st_dex => "Dex", 30],
- [0, 2, st_con => "Con", 30],
- [0, 3, st_int => "Int", 30],
- [0, 4, st_wis => "Wis", 30],
- [0, 5, st_pow => "Pow", 30],
- [0, 6, st_cha => "Cha", 30],
-
- [2, 0, st_wc => "Wc", -120],
- [2, 1, st_ac => "Ac", -120],
- [2, 2, st_dam => "Dam", 120],
- [2, 3, st_arm => "Arm", 120],
- [2, 4, st_spd => "Spd", 10.54],
- [2, 5, st_wspd => "WSp", 10.54],
- ) {
- my ($col, $row, $id, $label, $template) = @$_;
-
- $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
- font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
- align => +1, template => $template, tooltip => "#stat_$label");
- $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
- font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
- align => -1, text => $label, tooltip => "#stat_$label");
- }
-
- $vb->add (new CFPlus::UI::FancyFrame
- label => "Resistancies",
- child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
- );
-
- my $row = 0;
- my $col = 0;
-
- my %resist_names = (
- slow => ["Slow",
- "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
- holyw => ["Holy Word",
- "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
- conf => ["Confusion",
- "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
- fire => ["Fire",
- "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
- depl => ["Depletion",
- "Depletion (some monsters and other effects can cause stats depletion)"],
- magic => ["Magic",
- "Magic (resistance to magic spells like magic missile or similar)"],
- drain => ["Draining",
- "Draining (some monsters (e.g. vampires) and other effects can steal experience)"],
- acid => ["Acid",
- "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
- pois => ["Poison",
- "Poison (resistance to getting poisoned)"],
- para => ["Paralysation",
- "Paralysation (this resistance affects the chance you get paralysed)"],
- deat => ["Death",
- "Death (resistance against death spells)"],
- phys => ["Physical",
- "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
- blind => ["Blind",
- "Blind (blind resistance affects the chance of a successful blinding attack)"],
- fear => ["Fear",
- "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
- tund => ["Turn undead",
- "Turn undead (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
- elec => ["Electricity",
- "Electricity (resistance against electricity, spells like large lightning, small lightning, ...)"],
- cold => ["Cold",
- "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
- ghit => ["Ghost hit",
- "Ghost hit (special attack used by ghosts and ghost-like beings)"],
- );
- for (qw/slow holyw conf fire depl magic
- drain acid pois para deat phys
- blind fear tund elec cold ghit/)
- {
- $tbl2->add ($col, $row,
- $STATWIDS->{"res_$_"} =
- new CFPlus::UI::Label
- font => $FONT_FIXED,
- template => "-100%",
- align => +1,
- valign => 0,
- can_events => 1,
- can_hover => 1,
- tooltip => $resist_names{$_}->[1],
- );
- $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
- font => $FONT_FIXED,
- can_hover => 1,
- can_events => 1,
- path => "ui/resist/resist_$_.png",
- tooltip => $resist_names{$_}->[1],
- );
- $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
- text => $resist_names{$_}->[0],
- font => $FONT_FIXED,
- can_hover => 1,
- can_events => 1,
- tooltip => $resist_names{$_}->[1],
- );
-
- $row++;
- if ($row % 6 == 0) {
- $col += 3;
- $row = 0;
- }
- }
-
- #update_stats_window ({});
-
- $r
-}
-
-sub skill_window {
- my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
- $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
- $sw
-}
-
-sub formsep($) {
- scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
-}
-
-my $METASERVER_ATIME;
-
-sub update_metaserver {
- my ($metaserver_dialog) = @_;
-
- $METASERVER = $metaserver_dialog
- if defined $metaserver_dialog;
-
- return if $METASERVER_ATIME > time;
- $METASERVER_ATIME = time + 60;
-
- my $table = $METASERVER->{table};
- $table->clear;
- $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
-
- my $ok = 0;
-
- CFPlus::background {
- my $ua = CFPlus::lwp_useragent;
-
- CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
- } sub {
- my ($msg) = @_;
- if ($msg) {
- $table->clear;
-
- my @tip = (
- "The current number of users logged in on the server.",
- "The hostname of the server.",
- "The time this server has been running without being restarted.",
- "The server software version - a '+' indicates a Crossfire+ server.",
- "Short information about this server provided by its admins.",
- );
- my @col = qw(#Users Host Uptime Version Description);
- $table->add_at ($_, 0, new CFPlus::UI::Label
- can_hover => 1, can_events => 1,
- align => 0, fg => [1, 1, 0],
- text => $col[$_], tooltip => $tip[$_])
- for 0 .. $#col;
-
- my @align = qw(1 0 1 1 -1);
-
- my $y = 0;
- for my $m (@{ $msg->{servers} }) {
- my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
- @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
-
- for ($desc) {
- s/
/\n/gi;
- s/
/\n· /gi;
- s/<.*?>//sgi;
- s/&/&/g;
- s/<//g;
- }
-
- $uptime = sprintf "%dd %02d:%02d:%02d",
- (int $uptime / 86400),
- (int $uptime / 3600) % 24,
- (int $uptime / 60) % 60,
- $uptime % 60;
-
- $m = [$users, $host, $uptime, $version, $desc];
-
- $y++;
-
- $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
- (new CFPlus::UI::Button
- text => "Use",
- tooltip => "Put this server into the Host:Port field",
- on_activate => sub {
- $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
- $METASERVER->hide;
- 0
- },
- ),
- (new CFPlus::UI::Empty expand => 1),
- ]);
-
- $table->add_at ($_, $y, new CFPlus::UI::Label
- max_w => $::WIDTH * 0.4,
- ellipsise => 0,
- align => $align[$_],
- text => $m->[$_],
- tooltip => $tip[$_],
- fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
- can_hover => 1,
- can_events => 1,
- fontsize => 0.8)
- for 0 .. $#$m;
- }
- } else {
- $ok or $label->set_text ("error while contacting metaserver");
- }
- };
-
-}
-
-sub metaserver_dialog {
- my $vbox = new CFPlus::UI::VBox;
- my $table = new CFPlus::UI::Table;
- $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
-
- my $dialog = new CFPlus::UI::Toplevel
- title => "Server List",
- name => 'metaserver_dialog',
- x => 'center',
- y => 'center',
- z => 3,
- force_w => $::WIDTH * 0.9,
- force_h => $::HEIGHT * 0.7,
- child => $vbox,
- has_close_button => 1,
- table => $table,
- on_visibility_change => sub {
- update_metaserver ($_[0]) if $_[1];
- 0
- },
- ;
-
- $dialog
-}
-
-sub server_setup {
- my $vbox = new CFPlus::UI::VBox;
-
- $vbox->add (new CFPlus::UI::FancyFrame
- label => "Connection Settings",
- child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
- );
- $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
-
- {
- $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
-
- $vbox->add (
- $HOST_ENTRY = new CFPlus::UI::Entry
- expand => 1,
- text => $CFG->{profile}{default}{host},
- tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{profile}{default}{host} = $value;
- 0
- }
- );
-
- $vbox->add (new CFPlus::UI::Button
- expand => 1,
- text => "Server List",
- other => $METASERVER,
- tooltip => "Show a list of available crossfire servers",
- on_activate => sub { $METASERVER->toggle_visibility; 0 },
- on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
- );
- }
-
- $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
- $table->add_at (1, 4, new CFPlus::UI::Entry
- text => $CFG->{profile}{default}{user},
- tooltip => "The name of your character on the server",
- on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
- );
-
- $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
- $table->add_at (1, 5, new CFPlus::UI::Entry
- text => $CFG->{profile}{default}{password},
- hidden => 1,
- tooltip => "The password for your character",
- on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
- );
-
- $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
- $table->add_at (1, 7, new CFPlus::UI::Slider
- force_w => 100,
- range => [$CFG->{mapsize}, 10, 100, 0, 1],
- tooltip => "This is the size of the portion of the map update the server sends you. "
- . "If you set this to a high value you will be able to see further, "
- . "but you also increase bandwidth requirements and latency. "
- . "This option is only used once at log-in.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
- );
-
- $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
- $table->add_at (1, 8, new CFPlus::UI::CheckBox
- state => $CFG->{face_prefetch},
- tooltip => "Background Image Prefetch\n\n"
- . "If enabled, the client automatically pre-fetches images from the server. "
- . "This might increase or create lag, but increases the chances "
- . "of faces being ready for display when you encounter them. "
- . "It also uses up server bandwidth on every connect, "
- . "so only set it if you really need to prefetch images. "
- . "This option can be set and unset any time.",
- on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
- );
-
- $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
- $table->add_at (1, 9, new CFPlus::UI::Entry
- text => $CFG->{output_rate},
- tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
- . "when sending images, to ensure interactiveness. When 0 or unset, the server "
- . "default will be used, which is usually around 100kb/s.",
- on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
- );
-
- $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
- $table->add_at (1, 10, new CFPlus::UI::Entry
- text => $CFG->{output_count},
- tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
- on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
- );
-
- $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
- $table->add_at (1, 11, new CFPlus::UI::Entry
- text => $CFG->{output_sync},
- tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
- on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
- );
-
- $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
- expand => 1,
- align => 0,
- text => "Login",
- on_activate => sub {
- $CONN ? stop_game
- : start_game;
- 0
- },
- );
-
- $vbox->add (new CFPlus::UI::FancyFrame
- label => "Server Info",
- child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
- );
-
- $vbox
-}
-
-sub client_setup {
- my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
-
- my $row = 0;
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
- $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
- text => $CFG->{say_command},
- tooltip => "This is the command that will be used if you write a line in the message window entry or press \" in the map window. "
- . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
- . "But you could also set it to tell playername to only chat with that user.",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{say_command} = $value;
- 0
- }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
- state => $CFG->{show_tips},
- tooltip => "Show the Tip of the day window at startup?",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{show_tips} = $value;
- 0
- }
- );
-
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
- $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
- text => $CFG->{logview_max_par},
- tooltip => "This is maximum number of messages remembered in the Messages window. If the server "
- . "sends more messages than this number, older messages get removed to save memory and "
- . "computing time. A value of 0 disables this feature, but that is not recommended.",
- on_changed => sub {
- my ($self, $value) = @_;
- $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
- 0
- },
- );
-
- $table
-}
-
-sub message_window {
- my $window = new CFPlus::UI::Toplevel
- name => "message_window",
- title => "Messages",
- border_bg => [1, 1, 1, 1],
- x => "max",
- y => 0,
- force_w => $::WIDTH * 0.4,
- force_h => $::HEIGHT * 0.5,
- child => (my $vbox = new CFPlus::UI::VBox),
- has_close_button => 1;
-
- $vbox->add ($LOGVIEW);
-
- $vbox->add (my $input = new CFPlus::UI::Entry
- tooltip => "Chat Box. If you enter a text and press return/enter here, the current communication command "
- . "from the client setup will be prepended (e.g. shout, chat...). "
- . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
- . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
- on_focus_in => sub {
- my ($input, $prev_focus) = @_;
-
- delete $input->{refocus_map};
-
- if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
- $input->{refocus_map} = 1;
- }
- delete $input->{auto_activated};
-
- 0
- },
- on_activate => sub {
- my ($input, $text) = @_;
- $input->set_text ('');
-
- if ($text =~ /^\/(.*)/) {
- $::CONN->user_send ($1);
- } else {
- my $say_cmd = $::CFG->{say_command} || 'say';
- $::CONN->user_send ("$say_cmd $text");
- }
- if ($input->{refocus_map}) {
- delete $input->{refocus_map};
- $MAPWIDGET->focus_in
- }
-
- 0
- },
- on_escape => sub {
- $MAPWIDGET->grab_focus;
-
- 0
- },
- );
-
- $CONSOLE = {
- window => $window,
- input => $input,
- };
-
- $window
-}
-
-sub autopickup_setup {
- my $r = new CFPlus::UI::ScrolledWindow (
- expand => 1,
- scroll_y => 1
- );
- $r->add (my $table = new CFPlus::UI::Table
- row_expand => [0],
- col_expand => [0, 1, 0, 1],
- );
-
- for (
- ["General", 0, 0,
- ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
- ["Inhibit autopickup" => PICKUP_INHIBIT],
- ["Stop before pickup" => PICKUP_STOP],
- ["Debug autopickup" => PICKUP_DEBUG],
- ],
- ["Weapons", 0, 6,
- ["All weapons" => PICKUP_ALLWEAPON],
- ["Missile weapons" => PICKUP_MISSILEWEAPON],
- ["Bows" => PICKUP_BOW],
- ["Arrows" => PICKUP_ARROW],
- ],
- ["Armour", 0, 12,
- ["Helmets" => PICKUP_HELMET],
- ["Shields" => PICKUP_SHIELD],
- ["Body Armour" => PICKUP_ARMOUR],
- ["Boots" => PICKUP_BOOTS],
- ["Gloves" => PICKUP_GLOVES],
- ["Cloaks" => PICKUP_CLOAK],
- ],
-
- ["Readables", 2, 0,
- ["Spellbooks" => PICKUP_SPELLBOOK],
- ["Skillscrolls" => PICKUP_SKILLSCROLL],
- ["Normal Books/Scrolls" => PICKUP_READABLES],
- ],
- ["Misc", 2, 5,
- ["Food" => PICKUP_FOOD],
- ["Drinks" => PICKUP_DRINK],
- ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
- ["Keys" => PICKUP_KEY],
- ["Magical Items" => PICKUP_MAGICAL],
- ["Potions" => PICKUP_POTION],
- ["Magic Devices" => PICKUP_MAGIC_DEVICE],
- ["Ignore cursed" => PICKUP_NOT_CURSED],
- ["Jewelery" => PICKUP_JEWELS],
- ["Flesh" => PICKUP_FLESH],
- ],
- ["Weight/Value ratio", 2, 17]
- )
- {
- my ($title, $x, $y, @bits) = @$_;
- $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
-
- for (@bits) {
- ++$y;
-
- my $mask = $_->[1];
- $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
- $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
- state => $::CFG->{pickup} & $mask,
- on_changed => sub {
- my ($box, $value) = @_;
-
- if ($value) {
- $::CFG->{pickup} |= $mask;
- } else {
- $::CFG->{pickup} &= ~$mask;
- }
-
- $::CONN->send_command ("pickup $::CFG->{pickup}")
- if defined $::CONN;
-
- 0
- });
-
- ${$_->[2]} = $checkbox if $_->[2];
- }
- }
-
- $table->add_at (2, 18, new CFPlus::UI::ValSlider
- range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
- template => ">= 99",
- to_value => sub { ">= " . 5 * $_[0] },
- on_changed => sub {
- my ($slider, $value) = @_;
-
- $::CFG->{pickup} &= ~0xF;
- $::CFG->{pickup} |= int $value
- if $value;
- 1;
- });
-
- $table->add_at (3, 18, new CFPlus::UI::Button
- text => "set",
- on_activate => sub {
- $::CONN->send_command ("pickup $::CFG->{pickup}")
- if defined $::CONN;
- 0
- });
-
- $r
-}
-
-my %SORT_ORDER = (
- type => undef,
- mtime => sub {
- my $NOW = time;
- sort {
- my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
- my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
-
- ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
- or $btime <=> $atime
- or $a->{type} <=> $b->{type}
- } @_
- },
- weight => sub { sort {
- $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
- or $a->{type} <=> $b->{type}
- } @_ },
-);
-
-sub inventory_widget {
- my $hb = new CFPlus::UI::HBox homogeneous => 1;
-
- $hb->add (my $vb1 = new CFPlus::UI::VBox);
- $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
-
- $vb1->add (my $hb1 = new CFPlus::UI::HBox);
-
- use sort 'stable';
-
- $hb1->add (new CFPlus::UI::Selector
- value => $::CFG->{inv_sort},
- options => [
- [type => "Type/Name"],
- [mtime => "Recent/Normal/Locked"],
- [weight => "Weight/Type"],
- ],
- on_changed => sub {
- $::CFG->{inv_sort} = $_[1];
- $INV->set_sort_order ($SORT_ORDER{$_[1]});
- },
- );
- $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
- #TODO# update to weigh/maxweight
- $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
-
- $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
- $sw1->add ($INV = new CFPlus::UI::Inventory);
- $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
-
- $hb->add (my $vb2 = new CFPlus::UI::VBox);
-
- $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
-
- $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
- $sw2->add ($INVR = new CFPlus::UI::Inventory);
-
- # XXX: Call after $INVR = ... because set_opencont sets the items
- CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
-
- $hb
-}
-
-sub toggle_player_page {
- my ($widget) = @_;
-
- if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
- $PL_WINDOW->hide;
- } else {
- $PL_NOTEBOOK->set_current_page ($widget);
- $PL_WINDOW->show;
- }
-}
-
-sub player_window {
- my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
- x => "center",
- y => "center",
- force_w => $WIDTH * 9/10,
- force_h => $HEIGHT * 9/10,
- title => "Player",
- name => "playerbook",
- has_close_button => 1
- ;
-
- my $ntb =
- $PL_NOTEBOOK =
- new CFPlus::UI::Notebook expand => 1;
-
- $ntb->add (
- "Statistics (F2)" => $STATS_PAGE = stats_window,
- "Shows statistics, where all your Stats and Resistances are shown."
- );
- $ntb->add (
- "Skills (F3)" => $SKILL_PAGE = skill_window,
- "Shows all your Skills."
- );
-
- my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
- $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
- $ntb->add (
- "Spellbook (F4)" => $spellsw,
- "Displays all spells you have and lets you edit keyboard shortcuts for them."
- );
- $ntb->add (
- "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
- "Toggles the inventory window, where you can manage your loot (or treasures :). "
- . "You can also hit the Tab-key to show/hide the Inventory."
- );
- $ntb->add (Pickup => autopickup_setup,
- "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
-
- $ntb->set_current_page ($INVENTORY_PAGE);
-
- $plwin->add ($ntb);
- $plwin
-}
-
-sub keyboard_setup {
- CFPlus::Macro::keyboard_setup
-}
-
-sub help_window {
- my $win = new CFPlus::UI::Toplevel
- x => 'center',
- y => 'center',
- z => 4,
- name => 'doc_browser',
- force_w => int $WIDTH * 7/8,
- force_h => int $HEIGHT * 7/8,
- title => "Help Browser",
- has_close_button => 1;
-
- $win->add (my $vbox = new CFPlus::UI::VBox);
-
- $vbox->add (new CFPlus::UI::FancyFrame
- label => "Navigation",
- child => (my $buttons = new CFPlus::UI::HBox),
- );
- $vbox->add (my $viewer = new CFPlus::UI::TextScroller
- expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
-
- my @history;
- my @future;
- my $curnode;
-
- my $load_node; $load_node = sub {
- my ($node, $para) = @_;
-
- $buttons->clear;
-
- $buttons->add (new CFPlus::UI::Button
- text => "⇤",
- tooltip => "back to the starting page",
- on_activate => sub {
- unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
- unshift @future, @history;
- @history = ();
- $load_node->(@{shift @future});
- },
- );
-
- if (@history) {
- $buttons->add (new CFPlus::UI::Button
- text => "⋘",
- tooltip => "back to " . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "",
- on_activate => sub {
- unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
- $load_node->(@{pop @history});
- },
- );
- }
-
- if (@future) {
- $buttons->add (new CFPlus::UI::Button
- text => "⋙",
- tooltip => "forward to " . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "",
- on_activate => sub {
- push @history, [$curnode, $viewer->current_paragraph];
- $load_node->(@{shift @future});
- },
- );
- }
-
- $buttons->add (new CFPlus::UI::Label text => " ");
-
- my @path = CFPlus::Pod::full_path_of $node;
- pop @path; # drop current node
-
- for my $node (@path) {
- $buttons->add (new CFPlus::UI::Button
- text => $node->{kw}[0],
- tooltip => "go to " . (CFPlus::asxml CFPlus::Pod::full_path $node) . "",
- on_activate => sub {
- push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
- $load_node->($node);
- },
- );
- $buttons->add (new CFPlus::UI::Label text => "/");
- }
-
- $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
-
- $curnode = $node;
-
- $viewer->clear;
- $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
- $viewer->scroll_to ($para);
- };
-
- $load_node->(CFPlus::Pod::find pod => "mainpage");
-
- $CFPlus::Pod::goto_document = sub {
- my (@path) = @_;
-
- push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
-
- $load_node->((CFPlus::Pod::find @path)[0]);
- $win->show;
- };
-
- $win
-}
-
-sub open_string_query {
- my ($title, $cb, $txt, $tooltip) = @_;
- my $dialog = new CFPlus::UI::Toplevel
- x => "center",
- y => "center",
- z => 50,
- force_w => $WIDTH * 4/5,
- title => $title;
-
- $dialog->add (
- my $e = new CFPlus::UI::Entry
- on_activate => sub { $cb->(@_); $dialog->hide; 0 },
- on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
- tooltip => $tooltip
- );
-
- $e->grab_focus;
- $e->set_text ($txt) if $txt;
- $dialog->show;
-}
-
-sub open_quit_dialog {
- unless ($QUIT_DIALOG) {
- $QUIT_DIALOG = new CFPlus::UI::Toplevel
- x => "center",
- y => "center",
- z => 50,
- title => "Really Quit?",
- on_key_down => sub {
- my ($dialog, $ev) = @_;
- $ev->{sym} == 27 and $dialog->hide;
- }
- ;
-
- $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
-
- $vb->add (new CFPlus::UI::Label
- text => "You should find a savebed and apply it first!",
- max_w => $WIDTH * 0.25,
- ellipsize => 0,
- );
- $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
- $hb->add (new CFPlus::UI::Button
- text => "Ok",
- expand => 1,
- on_activate => sub { $QUIT_DIALOG->hide; 0 },
- );
- $hb->add (new CFPlus::UI::Button
- text => "Quit anyway",
- expand => 1,
- on_activate => sub { exit },
- );
- }
-
- $QUIT_DIALOG->show;
- $QUIT_DIALOG->grab_focus;
-}
-
-sub show_tip_of_the_day {
- # find all tips
- my @tod = CFPlus::Pod::find tip_of_the_day => "*";
-
- CFPlus::DB::get state => "tip_of_the_day", sub {
- my ($todindex) = @_;
- $todindex = 0 if $todindex >= @tod;
- CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
-
- # create dialog
- my $dialog;
-
- my $close = sub {
- $dialog->destroy;
- };
-
- $dialog = new CFPlus::UI::Toplevel
- x => "center",
- y => "center",
- z => 3,
- name => 'tip_of_the_day',
- force_w => int $WIDTH * 4/9,
- force_h => int $WIDTH * 2/9,
- title => "Tip of the day #" . (1 + $todindex),
- child => my $vbox = new CFPlus::UI::VBox,
- has_close_button => 1,
- on_delete => $close,
- ;
-
- $vbox->add (my $viewer = new CFPlus::UI::TextScroller
- expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
- $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
-
- $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
-
- $table->add_at (0, 0, new CFPlus::UI::Button
- text => "Close",
- tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the Server Setup.",
- on_activate => $close,
- );
-
- $table->add_at (2, 0, new CFPlus::UI::Button
- text => "Next",
- tooltip => "Show the next Tip of the day.",
- on_activate => sub {
- $close->();
- &show_tip_of_the_day;
- },
- );
-
- $dialog->show;
- };
-}
-
-sub sdl_init {
- CFPlus::SDL_Init
- and die "SDL::Init failed!\n";
-}
-
-sub video_init {
- $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
-
- my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
-
- ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
- $FULLSCREEN = $CFG->{fullscreen};
- $FAST = $CFG->{fast};
-
- CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
- or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
-
- $SDL_ACTIVE = 1;
- $LAST_REFRESH = time - 0.01;
-
- CFPlus::OpenGL::init;
-
- $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
-
- $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
-
- #############################################################################
-
- if ($DEBUG_STATUS) {
- CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
- } else {
- # create the widgets
-
- $DEBUG_STATUS = new CFPlus::UI::Label
- padding => 0,
- z => 100,
- force_x => "max",
- force_y => 0;
- $DEBUG_STATUS->show;
-
- $STATUSBOX = new CFPlus::UI::Statusbox;
- $STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
-
- (new CFPlus::UI::Frame
- bg => [0, 0, 0, 0.4],
- force_x => 0,
- force_y => "max",
- child => $STATUSBOX,
- )->show;
-
- CFPlus::UI::Toplevel->new (
- title => "Map",
- name => "mapmap",
- x => 0,
- y => $FONTSIZE + 8,
- border_bg => [1, 1, 1, 192/255],
- bg => [1, 1, 1, 0],
- child => ($MAPMAP = new CFPlus::MapWidget::MapMap
- tooltip => "Map. On servers that support this feature, this will display an overview of the surrounding areas.",
- ),
- )->show;
-
- $MAPWIDGET = new CFPlus::MapWidget;
- $MAPWIDGET->connect (activate_console => sub {
- my ($mapwidget, $preset) = @_;
-
- if ($CONSOLE) {
- $CONSOLE->{input}->{auto_activated} = 1;
- $CONSOLE->{input}->grab_focus;
-
- if ($preset && $CONSOLE->{input}->get_text eq '') {
- $CONSOLE->{input}->set_text ($preset);
- }
- }
- });
- $MAPWIDGET->show;
- $MAPWIDGET->grab_focus;
-
- $LOGVIEW = new CFPlus::UI::TextScroller
- expand => 1,
- font => $FONT_FIXED,
- fontsize => $::CFG->{log_fontsize},
- indent => -4,
- can_hover => 1,
- can_events => 1,
- max_par => $CFG->{logview_max_par},
- tooltip => "Server Log. This text viewer contains all recent messages sent by the server.",
- ;
-
- $SETUP_DIALOG = new CFPlus::UI::Toplevel
- title => "Setup",
- name => "setup_dialog",
- x => 'center',
- y => 'center',
- z => 2,
- force_w => $::WIDTH * 0.6,
- force_h => $::HEIGHT * 0.6,
- has_close_button => 1,
- ;
-
- $METASERVER = metaserver_dialog;
-
- $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
- filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
-
- $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
- "Configure the server to play on, your username, password and other server-related options.");
- $SETUP_NOTEBOOK->add (Client => client_setup,
- "Configure various client-specific settings.");
- $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
- "Configure the video mode, performance, fonts and other graphical aspects of the game.");
- $SETUP_NOTEBOOK->add (Audio => audio_setup,
- "Configure the use of audio, sound effects and background music.");
- $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
- "Lets you define, edit and delete key bindings."
- . "There is a shortcut for making bindings: Control-Insert opens the binding editor "
- . "with nothing set and the recording started. After doing the actions you "
- . "want to record press Insert and you will be asked to press a key-combo. "
- . "After pressing the combo the binding will be saved automatically and the "
- . "binding editor closes");
- $SETUP_NOTEBOOK->add (Debug => debug_setup,
- "Some debuggin' options. Do not ask.");
-
- $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
-
- $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
- tooltip => "Toggles a dialog where you can configure all aspects of this client.");
-
- $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
- tooltip => "Toggles the server message log, where the client collects all messages from the server.");
-
- make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
-
- $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
- tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
-
- $BUTTONBAR->add (new CFPlus::UI::Button
- text => "Save Config",
- tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
- on_activate => sub {
- $::CFG->{layout} = CFPlus::UI::get_layout;
- CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
- status "Configuration Saved";
- 0
- },
- );
-
- $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
- tooltip => "View Documentation");
-
-
- $BUTTONBAR->add (new CFPlus::UI::Button
- text => "Quit",
- tooltip => "Terminates the program",
- on_activate => sub {
- if ($CONN) {
- open_quit_dialog;
- } else {
- exit;
- }
- 0
- },
- );
-
- $BUTTONBAR->show;
- $SETUP_DIALOG->show;
- }
-
- $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
-}
-
-sub setup_build_button {
- my ($enabled) = @_;
- if ($enabled) {
- $BUILD_BUTTON->hide if $BUILD_BUTTON;
- $BUILD_BUTTON ||= new CFPlus::UI::Button
- text => "Build",
- tooltip => "Opens the ingame builder",
- on_activate => sub {
- if ($CONN) {
- $CONN->send_ext_req (builder_player_items => sub {
- open_ingame_editor ($_[0]) if exists $_[0]->{items};
- });
- }
- 0
- };
- $BUTTONBAR->add ($BUILD_BUTTON);
- } else {
- $BUILD_BUTTON->hide if $BUILD_BUTTON;
- }
-}
-
-sub open_ingame_editor {
- my ($msg) = @_;
-
- my $win = new CFPlus::UI::Toplevel
- x => 0,
- y => 'center',
- z => 4,
- name => 'builder_window',
- force_w => int $WIDTH * 1/4,
- force_h => int $HEIGHT * 3/4,
- title => "In game builder",
- has_close_button => 1;
-
- my $r = new CFPlus::UI::ScrolledWindow (
- expand => 1,
- scroll_y => 1
- );
- $r->add (my $vb = new CFPlus::UI::VBox);
- $win->add ($r);
-
-
- $vb->add (
- new CFPlus::UI::Button
- text => "Disable build mode",
- on_activate => sub { $::IN_BUILD_MODE = undef }
- );
- $vb->add (
- new CFPlus::UI::Button
- text => "ERASE",
- on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
- );
-
- for my $itemarchname (
- sort {
- $msg->{items}->{$a}->{build_arch_name}
- cmp $msg->{items}->{$b}->{build_arch_name}
- } keys %{$msg->{items}}
- ) {
- my $info = $msg->{items}->{$itemarchname};
- $vb->add (
- new CFPlus::UI::Button text => $info->{build_arch_name},
- on_activate => sub {
- $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
-
- if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
- build_mode_query_arch_info ();
- }
- }
- );
- }
-
- $win->show;
-}
-
-sub build_mode_query_arch_info {
- my ($iteminfo) = $::IN_BUILD_MODE;
- my $itemarchname = $iteminfo->{item};
- my $info = $iteminfo->{info};
-
- my $dialog = new CFPlus::UI::Toplevel
- x => "center",
- y => "center",
- z => 50,
- force_w => int $WIDTH * 1/2,
- title => "Enter information for placement of '$itemarchname'",
- has_close_button => 1;
-
- $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
-
- $vb->add (my $table = new CFPlus::UI::Table expand => 1);
- my $row = 0;
- if ($info->{has_name}) {
- $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
- $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
- }
- if ($info->{has_text}) {
- $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
- $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
- }
- if ($info->{has_connection}) {
- $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
- $table->add_at (1, $row++,
- new CFPlus::UI::Entry
- expand => 1,
- on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
- tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
- );
- }
-
- $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
- $hb->add (new CFPlus::UI::Button
- text => "Close",
- expand => 1,
- on_activate => sub { $dialog->hide; 0 },
- );
- $dialog->show;
-}
-
-sub video_shutdown {
- CFPlus::OpenGL::shutdown;
-
- undef $SDL_ACTIVE;
-}
-
-sub audio_channel_finished {
- my ($channel) = @_;
-
- #warn "channel $channel finished\n";#d#
-}
-
-sub audio_music_set {
- my ($songs) = @_;
-
- my @want =
- grep $_,
- map $CONN->{music_meta}{$_},
- @$songs;
-
- if (@want) {
- @MUSIC_WANT = @want;
- &audio_music_changed ();
- }
-}
-
-sub audio_music_start {
- my $path = $MUSIC_PLAYING->{path}
- or return;
-
- CFPlus::DB::prefetch_file $path, 1024_000, sub {
- # music might have changed...
- $path eq $MUSIC_PLAYING->{path}
- or return &audio_music_start ();
-
- $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
-
- my $NOW = time;
-
- if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
- my $pos = $MUSIC_PLAYING->{stop_pos};
- $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
- $MUSIC_START = time - $pos;
- } else {
- $MUSIC_PLAYER->play (0);
- $MUSIC_START = time;
- }
-
- delete $MUSIC_PLAYING->{stop_time};
- delete $MUSIC_PLAYING->{stop_pos};
- }
-}
-
-sub audio_music_changed {
- return unless $CFG->{bgm_enable};
-
- # default MUSIC_WANT == MUSIC_DEFAULT
- @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
-
- # if the currently playing song is acceptable, let it continue
- return if $MUSIC_PLAYING
- && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
-
- my $NOW = time;
-
- if ($MUSIC_PLAYING) {
- $MUSIC_PLAYING->{stop_time} = $NOW;
- $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
- CFPlus::MixMusic::fade_out 1000;
- } else {
- # sort by stop time, oldest first
- @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
-
- # if the most recently-played piece played very recently,
- # resume it, else choose the oldest piece for rotation.
- $MUSIC_PLAYING =
- $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
- ? $MUSIC_WANT[-1]
- : $MUSIC_WANT[0];
-
- audio_music_start;
- }
-}
-
-sub audio_music_finished {
- $MUSIC_PLAYING = undef;
- undef $MUSIC_PLAYER;
-
- audio_music_changed;
-}
-
-sub audio_init {
- if ($CFG->{audio_enable}) {
- if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
- $SDL_MIXER = !CFPlus::Mix_OpenAudio;
-
- unless ($SDL_MIXER) {
- status "Unable to open sound device: there will be no sound";
- return;
- }
-
- CFPlus::Mix_AllocateChannels 8;
- CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
-
- audio_music_finished;
-
- local $_;
- while (<$fh>) {
- next if /^\s*#/;
- next if /^\s*$/;
-
- my ($file, $volume, $event) = split /\s+/, $_, 3;
-
- push @SOUNDS, "$volume,$file";
-
- $AUDIO_CHUNKS{"$volume,$file"} ||= do {
- my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
- $chunk->volume ($volume * 128 / 100);
- $chunk
- };
- }
- } else {
- status "unable to open sound config: $!";
- }
- }
-}
-
-sub audio_shutdown {
- CFPlus::Mix_CloseAudio if $SDL_MIXER;
- undef $SDL_MIXER;
- @SOUNDS = ();
- %AUDIO_CHUNKS = ();
-}
-
-my %animate_object;
-my $animate_timer;
-
-my $fps = 9;
-
-my %demo;#d#
-
-sub force_refresh {
- $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
- debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
-
- $CFPlus::UI::ROOT->draw;
-
- $WANT_REFRESH = 0;
- $CAN_REFRESH = 0;
- $LAST_REFRESH = $NOW;
-
- CFPlus::SDL_GL_SwapBuffers;
-}
-
-my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
- $NOW = time;
-
- ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
- for CFPlus::poll_events;
-
- if (%animate_object) {
- $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
- ++$WANT_REFRESH;
- }
-
- if ($WANT_REFRESH) {
- force_refresh;
- } else {
- $CAN_REFRESH = 1;
- }
-});
-
-sub animation_start {
- my ($widget) = @_;
- $animate_object{$widget} = $widget;
-}
-
-sub animation_stop {
- my ($widget) = @_;
- delete $animate_object{$widget};
-}
-
-# check once/second for faces that need to be prefetched
-# this should, of course, only run on demand, but
-# SDL forces worse things on us....
-
-Event->timer (after => 1, interval => 0.25, cb => sub {
- $CONN->face_prefetch
- if $CONN;
-});
-
-%SDL_CB = (
- CFPlus::SDL_QUIT => sub {
- exit;
- },
- CFPlus::SDL_VIDEORESIZE => sub {
- },
- CFPlus::SDL_VIDEOEXPOSE => sub {
- CFPlus::UI::full_refresh;
- },
- CFPlus::SDL_ACTIVEEVENT => sub {
-# not useful, as APPACTIVE include sonly iconified state, not unmapped
-# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
-# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
-# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
-# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
-# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
- },
- CFPlus::SDL_KEYDOWN => sub {
- if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
- # alt-enter
- $FULLSCREEN_ENABLE->toggle;
- video_shutdown;
- video_init;
- } else {
- CFPlus::UI::feed_sdl_key_down_event ($_[0]);
- }
- },
- CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
- CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
- CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
- CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
- CFPlus::SDL_USEREVENT => sub {
- if ($_[0]{code} == 1) {
- audio_channel_finished $_[0]{data1};
- } elsif ($_[0]{code} == 0) {
- audio_music_finished;
- }
- },
-);
-
-#############################################################################
-
-$SIG{INT} = $SIG{TERM} = sub { exit };
-
-{
- CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
- CFPlus::DB::Server::run;
-
- CFPlus::UI::set_layout ($::CFG->{layout});
-
- my %DEF_CFG = (
- sdl_mode => 0,
- width => 640,
- height => 480,
- fullscreen => 0,
- fast => 0,
- map_scale => 1,
- fow_enable => 1,
- fow_intensity => 0,
- map_smoothing => 1,
- gui_fontsize => 1,
- log_fontsize => 0.7,
- gauge_fontsize => 1,
- gauge_size => 0.35,
- stat_fontsize => 0.7,
- mapsize => 100,
- say_command => 'chat',
- audio_enable => 1,
- bgm_enable => 1,
- bgm_volume => 0.25,
- face_prefetch => 0,
- output_sync => 1,
- output_count => 1,
- output_rate => "",
- pickup => 0,
- inv_sort => "mtime",
- default => "profile", # default profile
- show_tips => 1,
- logview_max_par => 1000,
- );
-
- while (my ($k, $v) = each %DEF_CFG) {
- $CFG->{$k} = $v unless exists $CFG->{$k};
- }
-
- $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
- $PROFILE = $CFG->{profile}{default};
-
- # convert old bindings (only default profile matters)
- if (my $bindings = delete $PROFILE->{bindings}) {
- while (my ($mod, $syms) = each %$bindings) {
- while (my ($sym, $cmds) = each %$syms) {
- push @{ $PROFILE->{macro} }, {
- accelkey => [$mod*1, $sym*1],
- action => $cmds,
- };
- }
- }
- }
-
- sdl_init;
-
- @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
- @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
- @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
-
- @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
-
- $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
-
- {
- my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
- DejaVuSans.ttf
- DejaVuSansMono.ttf
- DejaVuSans-Bold.ttf
- DejaVuSansMono-Bold.ttf
- DejaVuSans-Oblique.ttf
- DejaVuSansMono-Oblique.ttf
- DejaVuSans-BoldOblique.ttf
- DejaVuSansMono-BoldOblique.ttf
- );
-
- CFPlus::add_font $_ for @fonts;
-
- CFPlus::pango_init;
-
- $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
- $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
-
- $FONT_PROP->make_default;
- }
-
-# compare mono (ft) vs. rgba (cairo)
-# ft - 1.8s, cairo 3s, even in alpha-only mode
-# for my $rgba (0..1) {
-# my $t1 = Time::HiRes::time;
-# for (1..1000) {
-# my $layout = CFPlus::Layout->new ($rgba);
-# $layout->set_text ("hallo" x 100);
-# $layout->render;
-# }
-# my $t2 = Time::HiRes::time;
-# warn $t2-$t1;
-# }
-
- $startup_done->();
-
- video_init;
- audio_init;
-}
-
-show_tip_of_the_day if $CFG->{show_tips};
-
-Event::loop;
-#CFPlus::SDL_Quit;
-#CFPlus::_exit 0;
-
-END {
- CFPlus::SDL_Quit;
- CFPlus::DB::Server::stop;
-}
-
-=head1 NAME
-
-cfplus - A Crossfire+ and Crossfire game client
-
-=head1 SYNOPSIS
-
-Just run it - no commandline arguments are supported.
-
-=head1 USAGE
-
-cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
-fullscreen and interactively.
-
-=head1 DEBUGGING
-
-
-CFPLUS_DEBUG - environment variable
-
- 1 draw borders around widgets
- 2 add low-level widget info to tooltips
- 4 show fps
- 8 suppress tooltips
-
-=head1 AUTHOR
-
-Marc Lehmann , Robin Redeker
-
-
-
- : $self->{vslider}->hide;
- }
-}
-
-sub update {
- my ($self) = @_;
-
- $self->SUPER::update;
- $self->update_slider;
}
sub invoke_mouse_wheel {
my ($self, $ev) = @_;
- return 0 unless $ev->{dy}; # only vertical movements for now
-
- $self->{vslider}->emit (mouse_wheel => $ev);
+ $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
+ $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1
}
@@ -3531,18 +1169,7 @@
my ($self, $ev, $x, $y) = @_;
if ($ev->{button} == 2) {
- $self->grab_focus;
-
- my $ox = $self->{vp}{view_x} + $ev->{x};
- my $oy = $self->{vp}{view_y} + $ev->{y};
-
- $self->{motion} = sub {
- my ($ev, $x, $y) = @_;
-
- $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
- $self->update;
- };
-
+ $self->start_dragging ($ev);
return 1;
}
@@ -3579,11 +1206,11 @@
#############################################################################
-package CFPlus::UI::Frame;
+package DC::UI::Frame;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -3603,14 +1230,7 @@
glEnable GL_BLEND;
glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glColor_premultiply @{ $self->{bg} };
-
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex 0 , $h;
- glVertex $w, $h;
- glVertex $w, 0;
- glEnd;
-
+ glRect 0, 0, $w, $h;
glDisable GL_BLEND;
}
@@ -3619,19 +1239,19 @@
#############################################################################
-package CFPlus::UI::FancyFrame;
+package DC::UI::FancyFrame;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my ($class, %arg) = @_;
if ((exists $arg{label}) && !ref $arg{label}) {
- $arg{label} = new CFPlus::UI::Label
+ $arg{label} = new DC::UI::Label
align => 1,
- valign => 0,
+ valign => 0.5,
text => $arg{label},
fontsize => ($arg{border} || 0.8) * 0.75;
}
@@ -3651,7 +1271,7 @@
my ($self, @widgets) = @_;
$self->SUPER::add (@widgets);
- $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
+ $self->DC::UI::Container::add ($self->{label}) if $self->{label};
}
sub border {
@@ -3719,22 +1339,22 @@
#############################################################################
-package CFPlus::UI::Toplevel;
+package DC::UI::Toplevel;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
my $bg =
- new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
+ new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
mipmap => 1, wrap => 1;
my @border =
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_file DC::Texture DC::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 }
+ map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
qw(x1_move.png x1_resize.png);
sub new {
@@ -3750,8 +1370,8 @@
%arg,
);
- $self->{title_widget} = new CFPlus::UI::Label
- align => 0,
+ $self->{title_widget} = new DC::UI::Label
+ align => 0.5,
valign => 1,
text => $self->{title},
fontsize => $self->{border},
@@ -3759,11 +1379,11 @@
if ($self->{has_close_button}) {
$self->{close_button} =
- new CFPlus::UI::ImageButton
+ new DC::UI::ImageButton
path => 'x1_close.png',
on_activate => sub { $self->emit ("delete") };
- $self->CFPlus::UI::Container::add ($self->{close_button});
+ $self->DC::UI::Container::add ($self->{close_button});
}
$self
@@ -3773,14 +1393,23 @@
my ($self, @widgets) = @_;
$self->SUPER::add (@widgets);
- $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
- $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
+ $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
+ $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
}
sub border {
int $_[0]{border} * $::FONTSIZE
}
+sub get_max_wh {
+ my ($self) = @_;
+
+ return ($self->{w}, $self->{h})
+ if $self->{visible} && $self->{w};
+
+ $self->SUPER::get_max_wh
+}
+
sub size_request {
my ($self) = @_;
@@ -3960,93 +1589,78 @@
#############################################################################
-package CFPlus::UI::Table;
+package DC::UI::Table;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Container::;
use List::Util qw(max sum);
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
$class->SUPER::new (
- children => [],
col_expand => [],
row_expand => [],
@_,
)
}
-sub children {
- grep $_, map @$_, grep $_, @{ $_[0]{children} }
-}
-
-# TODO: store row/col info in child widget and use standard add/del
sub add {
- my $self = shift;
+ my ($self, @widgets) = @_;
- Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
- $self->add_at (@_);
+ for my $child (@widgets) {
+ $child->{c_rowspan} ||= 1;
+ $child->{c_colspan} ||= 1;
+ }
+
+ $self->SUPER::add (@widgets);
}
sub add_at {
my $self = shift;
+ my @widgets;
+
while (@_) {
my ($col, $row, $child) = splice @_, 0, 3, ();
- $child->set_parent ($self);
- $self->{children}[$row][$col] = $child;
- }
-
- $self->{force_realloc} = 1;
- $self->{force_size_alloc} = 1;
- $self->realloc;
-}
-
-sub remove {
- my ($self, $child) = @_;
+ $child->{c_row} = $row;
+ $child->{c_col} = $col;
- for (@{ $self->{children} }) {
- for (@{ $_ || [] }) {
- $_ = undef if $_ == $child;
- }
+ push @widgets, $child;
}
+
+ $self->add (@widgets);
}
-# TODO: move to container class maybe? send children a signal on removal?
-sub clear {
+sub get_wh {
my ($self) = @_;
+ my (@w, @h);
+
my @children = $self->children;
- delete $self->{children};
-
- for (@children) {
- delete $_->{parent};
- $_->hide;
- }
- $self->realloc;
-}
+ # first pass, columns
+ for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
+ my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
-sub get_wh {
- my ($self) = @_;
+ my $sw = sum @w[$c .. $c + $cs - 1];
- my (@w, @h);
+ if ($w > $sw) {
+ $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
+ }
+ }
- 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)};
+ # second pass, rows
+ for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
+ my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
- $w[$x] = max $w[$x], $w;
- $h[$y] = max $h[$y], $h;
+ my $sh = sum @h[$r .. $r + $rs - 1];
+
+ if ($h > $sh) {
+ $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
}
}
@@ -4072,14 +1686,14 @@
my $req_w = (sum @$ws) || 1;
my $req_h = (sum @$hs) || 1;
- # TODO: nicer code
+ # 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;
$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
- CFPlus::UI::harmonize $ws;
+ DC::UI::harmonize $ws;
my @row_expand = @{$self->{row_expand}};
@row_expand = (1) x @$ws unless @row_expand;
@@ -4087,78 +1701,35 @@
$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
- CFPlus::UI::harmonize $hs;
-
- my $y;
+ DC::UI::harmonize $hs;
- for my $r (0 .. $#{$self->{children}}) {
- my $row = $self->{children}[$r]
- or next;
-
- my $x = 0;
- my $row_h = $hs->[$r];
-
- for my $c (0 .. $#$row) {
- my $col_w = $ws->[$c];
-
- 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(c_row c_col req_w req_h c_rowspan c_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};
-
- my $res;
-
- for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
- $res = $_->find_widget ($x, $y)
- and return $res;
- }
-
- $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
-}
-
-sub _draw {
- my ($self) = @_;
-
- for (grep $_, @{$self->{children}}) {
- $_->draw for grep $_, @$_;
- }
-}
-
#############################################################################
-package CFPlus::UI::Fixed;
+package DC::UI::Fixed;
use List::Util qw(min max);
-our @ISA = CFPlus::UI::Container::;
-
-sub add {
- my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
-
- $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
- $self->SUPER::add ($child);
-}
+our @ISA = DC::UI::Container::;
sub _scale($$$) {
- my ($mode, $val, $max) = @_;
+ my ($rel, $val, $max) = @_;
- $mode eq "abs" ? $val
- : $mode eq "rel" ? $val * $max
- : 0
+ $rel ? $val * $max : $val
}
sub size_request {
@@ -4168,14 +1739,12 @@
# determine overall size by querying abs widgets
for my $child ($self->visible_children) {
- my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+ unless ($child->{c_rel}) {
+ my $x = $child->{c_x};
+ my $y = $child->{c_y};
- 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;
+ $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
+ $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
}
}
@@ -4184,16 +1753,12 @@
# 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};
+ if ($child->{c_rel}) {
+ my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
+ my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
- $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
- $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+ $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
+ $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
}
}
@@ -4207,14 +1772,13 @@
my ($self, $W, $H) = @_;
for my $child ($self->visible_children) {
- my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+ my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
+ my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
- $x = _scale $pos, $x, $W;
- $y = _scale $pos, $x, $H;
- $w = _scale $size, $w, $child->{req_w};
- $h = _scale $size, $h, $child->{req_h};
+ $x += $child->{c_halign} * $child->{req_w};
+ $y += $child->{c_valign} * $child->{req_h};
- $child->configure ($x, $y, $w, $h);
+ $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
}
1
@@ -4222,21 +1786,23 @@
#############################################################################
-package CFPlus::UI::Box;
+package DC::UI::Box;
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
sub size_request {
my ($self) = @_;
+ my @children = $self->visible_children;
+
$self->{vertical}
? (
- (List::Util::max map $_->{req_w}, @{$self->{children}}),
- (List::Util::sum map $_->{req_h}, @{$self->{children}}),
+ (List::Util::max map $_->{req_w}, @children),
+ (List::Util::sum map $_->{req_h}, @children),
)
: (
- (List::Util::sum map $_->{req_w}, @{$self->{children}}),
- (List::Util::max map $_->{req_h}, @{$self->{children}}),
+ (List::Util::sum map $_->{req_w}, @children),
+ (List::Util::max map $_->{req_h}, @children),
)
}
@@ -4267,7 +1833,7 @@
}
}
- CFPlus::UI::harmonize \@req;
+ DC::UI::harmonize \@req;
my $pos = 0;
for (0 .. $#children) {
@@ -4282,9 +1848,9 @@
#############################################################################
-package CFPlus::UI::HBox;
+package DC::UI::HBox;
-our @ISA = CFPlus::UI::Box::;
+our @ISA = DC::UI::Box::;
sub new {
my $class = shift;
@@ -4297,9 +1863,9 @@
#############################################################################
-package CFPlus::UI::VBox;
+package DC::UI::VBox;
-our @ISA = CFPlus::UI::Box::;
+our @ISA = DC::UI::Box::;
sub new {
my $class = shift;
@@ -4312,11 +1878,11 @@
#############################################################################
-package CFPlus::UI::Label;
+package DC::UI::Label;
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my ($class, %arg) = @_;
@@ -4331,18 +1897,18 @@
#max_w => maximum pixel width
#style => 0, # render flags
ellipsise => 3, # end
- layout => (new CFPlus::Layout),
+ layout => (new DC::Layout),
fontsize => 1,
- align => -1,
- valign => -1,
- padding_x => 2,
+ align => 0.5,
+ valign => 0.5,
+ padding_x => 4,
padding_y => 2,
can_events => 0,
%arg
);
if (exists $self->{template}) {
- my $layout = new CFPlus::Layout;
+ my $layout = new DC::Layout;
$layout->set_text (delete $self->{template});
$self->{template} = $layout;
}
@@ -4370,6 +1936,12 @@
$self->SUPER::realloc;
}
+sub clear {
+ my ($self) = @_;
+
+ $self->set_text ("");
+}
+
sub set_text {
my ($self, $text) = @_;
@@ -4402,8 +1974,10 @@
my ($self) = @_;
$self->{size_req} ||= do {
+ my ($max_w, $max_h) = $self->get_max_wh;
+
$self->{layout}->set_font ($self->{font}) if $self->{font};
- $self->{layout}->set_width ($self->{max_w} || -1);
+ $self->{layout}->set_width ($max_w);
$self->{layout}->set_ellipsise ($self->{ellipsise});
$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
@@ -4412,7 +1986,7 @@
if (exists $self->{template}) {
$self->{template}->set_font ($self->{font}) if $self->{font};
- $self->{template}->set_width ($self->{max_w} || -1);
+ $self->{template}->set_width ($max_w);
$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
my ($w2, $h2) = $self->{template}->size;
@@ -4478,28 +2052,39 @@
};
unless (exists $self->{ox}) {
- $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
- : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
- : ($self->{w} - $size->[0]) * 0.5);
-
- $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
- : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
- : ($self->{h} - $size->[1]) * 0.5);
+ $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
+ $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
+
+ $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
};
- my $w = List::Util::min $self->{w} + 4, $size->[0];
- my $h = List::Util::min $self->{h} + 2, $size->[1];
+# unless ($self->{list}) {
+# $self->{list} = DC::OpenGL::glGenList;
+# DC::OpenGL::glNewList $self->{list};
+# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
+# DC::OpenGL::glEndList;
+# }
+#
+# DC::OpenGL::glCallList $self->{list};
- $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
+ $self->{layout}->draw;
}
+#sub destroy {
+# my ($self) = @_;
+#
+# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
+#
+# $self->SUPER::destroy;
+#}
+
#############################################################################
-package CFPlus::UI::EntryBase;
+package DC::UI::EntryBase;
-our @ISA = CFPlus::UI::Label::;
+our @ISA = DC::UI::Label::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -4507,13 +2092,18 @@
$class->SUPER::new (
fg => [1, 1, 1],
bg => [0, 0, 0, 0.2],
- active_bg => [1, 1, 1, 0.5],
- active_fg => [0, 0, 0],
+ outline => [0.6, 0.3, 0.1],
+ active_bg => [0, 0, 1, .2],
+ active_fg => [1, 1, 1],
+ active_outline => [1, 1, 0],
can_hover => 1,
can_focus => 1,
- valign => 0,
+ align => 0,
+ valign => 0.5,
can_events => 1,
ellipsise => 0,
+ padding_x => 4,
+ padding_y => 2,
#text => ...
#hidden => "*",
@_
@@ -4574,17 +2164,17 @@
substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
} elsif ($uni == 127) {
substr $text, $self->{cursor}, 1, "";
- } elsif ($sym == CFPlus::SDLK_LEFT) {
+ } elsif ($sym == DC::SDLK_LEFT) {
--$self->{cursor} if $self->{cursor};
- } elsif ($sym == CFPlus::SDLK_RIGHT) {
+ } elsif ($sym == DC::SDLK_RIGHT) {
++$self->{cursor} if $self->{cursor} < length $self->{text};
- } elsif ($sym == CFPlus::SDLK_HOME) {
+ } elsif ($sym == DC::SDLK_HOME) {
# what a hack
$self->{cursor} =
(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
? length $1
: 0;
- } elsif ($sym == CFPlus::SDLK_END) {
+ } elsif ($sym == DC::SDLK_END) {
# uh, again
$self->{cursor} =
(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
@@ -4658,12 +2248,7 @@
glEnable GL_BLEND;
glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex 0 , $self->{h};
- glVertex $self->{w}, $self->{h};
- glVertex $self->{w}, 0;
- glEnd;
+ glRect 0, 0, $self->{w}, $self->{h};
glDisable GL_BLEND;
$self->SUPER::_draw;
@@ -4675,23 +2260,48 @@
my $text = substr $self->{text}, 0, $self->{cursor};
utf8::encode $text;
- @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
+ @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
}
+ glColor_premultiply @{$self->{active_fg}};
glBegin GL_LINES;
- 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};
+ glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
+ glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
+ glEnd;
+
+ glLineWidth 3;
+ glColor @{$self->{active_outline}};
+ glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
+ glLineWidth 1;
+
+ } else {
+ glColor @{$self->{outline}};
+ glBegin GL_LINE_STRIP;
+ glVertex .5, $self->{h} * .5;
+ glVertex .5, $self->{h} - 2.5;
+ glVertex $self->{w} - .5, $self->{h} - 2.5;
+ glVertex $self->{w} - .5, $self->{h} * .5;
glEnd;
}
}
#############################################################################
-package CFPlus::UI::Entry;
+package DC::UI::Entry;
+
+our @ISA = DC::UI::EntryBase::;
+
+use DC::OpenGL;
+
+sub new {
+ my $class = shift;
-our @ISA = CFPlus::UI::EntryBase::;
+ $class->SUPER::new (
+ history_pointer => -1,
+ @_
+ )
+}
-use CFPlus::OpenGL;
sub invoke_key_down {
my ($self, $ev) = @_;
@@ -4707,7 +2317,7 @@
$self->emit (activate => $txt);
$self->update;
- } elsif ($sym == CFPlus::SDLK_UP) {
+ } elsif ($sym == DC::SDLK_UP) {
if ($self->{history_pointer} < 0) {
$self->{history_saveback} = $self->get_text;
}
@@ -4719,14 +2329,17 @@
$self->set_text ($self->{history}->[$self->{history_pointer}]);
}
- } elsif ($sym == CFPlus::SDLK_DOWN) {
+ } elsif ($sym == DC::SDLK_DOWN) {
$self->{history_pointer}--;
$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
if ($self->{history_pointer} >= 0) {
$self->set_text ($self->{history}->[$self->{history_pointer}]);
} else {
- $self->set_text ($self->{history_saveback});
+ if (defined $self->{history_saveback}) {
+ $self->set_text ($self->{history_saveback});
+ $self->{history_saveback} = undef;
+ }
}
} else {
@@ -4738,20 +2351,30 @@
#############################################################################
-package CFPlus::UI::TextEdit;
+package DC::UI::TextEdit;
+
+our @ISA = DC::UI::EntryBase::;
+
+use DC::OpenGL;
+
+sub new {
+ my $class = shift;
-our @ISA = CFPlus::UI::EntryBase::;
+ $class->SUPER::new (
+ padding_y => 4,
-use CFPlus::OpenGL;
+ @_
+ )
+}
sub move_cursor_ver {
my ($self, $dy) = @_;
- my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
+ my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
- $y += $dy;
+ $line += $dy;
- if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
+ if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
$self->{cursor} = $index;
delete $self->{cur_h};
$self->update;
@@ -4764,9 +2387,9 @@
my $sym = $ev->{sym};
- if ($sym == CFPlus::SDLK_UP) {
+ if ($sym == DC::SDLK_UP) {
$self->move_cursor_ver (-1);
- } elsif ($sym == CFPlus::SDLK_DOWN) {
+ } elsif ($sym == DC::SDLK_DOWN) {
$self->move_cursor_ver (+1);
} else {
return $self->SUPER::invoke_key_down ($ev)
@@ -4777,27 +2400,76 @@
#############################################################################
-package CFPlus::UI::Button;
+package DC::UI::ButtonBin;
-our @ISA = CFPlus::UI::Label::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
my @tex =
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
qw(b1_button_inactive.png b1_button_active.png);
sub new {
my $class = shift;
$class->SUPER::new (
- padding_x => 4,
+ can_hover => 1,
+ align => 0.5,
+ valign => 0.5,
+ 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
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+ glColor 0, 0, 0, 1;
+
+ my $tex = $tex[$GRAB == $self];
+ $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
+
+ glDisable GL_TEXTURE_2D;
+
+ $self->SUPER::_draw;
+}
+
+#############################################################################
+
+package DC::UI::Button;
+
+our @ISA = DC::UI::Label::;
+
+use DC::OpenGL;
+
+my @tex =
+ map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+ qw(b1_button_inactive.png b1_button_active.png);
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ padding_x => 8,
padding_y => 4,
fg => [1.0, 1.0, 1.0],
active_fg => [0.8, 0.8, 0.8],
can_hover => 1,
- align => 0,
- valign => 0,
+ align => 0.5,
+ valign => 0.5,
can_events => 1,
@_
)
@@ -4832,15 +2504,15 @@
#############################################################################
-package CFPlus::UI::CheckBox;
+package DC::UI::CheckBox;
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
my @tex =
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
qw(c1_checkbox_bg.png c1_checkbox_active.png);
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -4890,7 +2562,7 @@
$self->SUPER::_draw;
- glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
+ glTranslate $self->{padding_x}, $self->{padding_y}, 0;
my ($w, $h) = @$self{qw(w h)};
@@ -4907,11 +2579,11 @@
#############################################################################
-package CFPlus::UI::Image;
+package DC::UI::Image;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
our %texture_cache;
@@ -4920,6 +2592,7 @@
my $self = $class->SUPER::new (
can_events => 0,
+ scale => 1,
@_,
);
@@ -4927,9 +2600,9 @@
or Carp::croak "'path' or 'tex' attributes required";
$self->{tex} ||= $texture_cache{$self->{path}} ||=
- new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
+ new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
- CFPlus::weaken $texture_cache{$self->{path}};
+ DC::weaken $texture_cache{$self->{path}};
$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
@@ -4940,7 +2613,7 @@
my ($self, $cloning) = @_;
$self->{path}
- or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
+ or die "cannot serialise DC::UI::Image on non-loadable images\n";
$self->{path}
}
@@ -4954,7 +2627,7 @@
sub size_request {
my ($self) = @_;
- ($self->{tex}{w}, $self->{tex}{h})
+ (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
}
sub _draw {
@@ -4974,18 +2647,18 @@
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- $tex->draw_quad (0, 0, $w, $h);
+ $tex->draw_quad_alpha (0, 0, $w, $h);
glDisable GL_TEXTURE_2D;
}
#############################################################################
-package CFPlus::UI::ImageButton;
+package DC::UI::ImageButton;
-our @ISA = CFPlus::UI::Image::;
+our @ISA = DC::UI::Image::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
my %textures;
@@ -4998,13 +2671,19 @@
fg => [1, 1, 1],
active_fg => [0, 0, 1],
can_hover => 1,
- align => 0,
- valign => 0,
+ align => 0.5,
+ valign => 0.5,
can_events => 1,
@_
);
}
+sub invoke_button_down {
+ my ($self, $ev, $x, $y) = @_;
+
+ 1
+}
+
sub invoke_button_up {
my ($self, $ev, $x, $y) = @_;
@@ -5017,29 +2696,29 @@
#############################################################################
-package CFPlus::UI::VGauge;
+package DC::UI::VGauge;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
use List::Util qw(min max);
-use CFPlus::OpenGL;
+use DC::OpenGL;
my %tex = (
food => [
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
],
grace => [
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_file DC::Texture DC::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 CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
],
mana => [
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
],
);
@@ -5152,9 +2831,147 @@
#############################################################################
-package CFPlus::UI::Gauge;
+package DC::UI::Progress;
+
+our @ISA = DC::UI::Label::;
+
+use DC::OpenGL;
+
+sub new {
+ my ($class, %arg) = @_;
+
+ my $self = $class->SUPER::new (
+ fg => [1, 1, 1],
+ bg => [0, 0, 1, 0.2],
+ bar => [0.7, 0.5, 0.1, 0.8],
+ outline => [0.4, 0.3, 0],
+ fontsize => 0.9,
+ valign => 0.5,
+ align => 0.5,
+ can_events => 1,
+ ellipsise => 1,
+ label => "%d%%",
+ %arg,
+ );
+
+ $self->set_value ($arg{value} || -1);
+
+ $self
+}
+
+sub set_label {
+ my ($self, $label) = @_;
+
+ return if $self->{label} eq $label;
+ $self->{label} = $label;
+
+ $self->DC::UI::Progress::set_value (0 + delete $self->{value});
+}
+
+sub set_value {
+ my ($self, $value) = @_;
+
+ if ($self->{value} ne $value) {
+ $self->{value} = $value;
+
+ if ($value < 0) {
+ $self->set_text ("-");
+ } else {
+ $self->set_text (sprintf $self->{label}, $value * 100);
+ }
+
+ $self->update;
+ }
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ glEnable GL_BLEND;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+
+ if ($self->{value} >= 0) {
+ my $s = int 2 + ($self->{w} - 4) * $self->{value};
+
+ glColor_premultiply @{$self->{bar}};
+ glRect 2, 2, $s, $self->{h} - 2;
+ glColor_premultiply @{$self->{bg}};
+ glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
+ }
+
+ glColor_premultiply @{$self->{outline}};
+ glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
+
+ glDisable GL_BLEND;
+
+ {
+ local $self->{bg}; # do not draw background
+ $self->SUPER::_draw;
+ }
+}
+
+#############################################################################
+
+package DC::UI::ExperienceProgress;
+
+our @ISA = DC::UI::Progress::;
+
+sub new {
+ my ($class, %arg) = @_;
+
+ my $self = $class->SUPER::new (
+ tooltip => sub {
+ my ($self) = @_;
+
+ sprintf "level %d\n%s points\n%s next level\n%s to go",
+ $self->{lvl},
+ ::formsep ($self->{exp}),
+ ::formsep ($self->{nxt}),
+ ::formsep ($self->{nxt} - $self->{exp}),
+ },
+ %arg
+ );
+
+ $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
+ if $::CONN;
+
+ $self
+}
+
+sub DESTROY {
+ my ($self) = @_;
+
+ delete $::CONN->{on_exp_update}{$self+0}
+ if $::CONN;
+
+ $self->SUPER::DESTROY;
+}
+
+sub set_value {
+ my ($self, $lvl, $exp) = @_;
+
+ $self->{lvl} = $lvl;
+ $self->{exp} = $exp;
+
+ my $v = -1;
+
+ if ($::CONN && (my $table = $::CONN->{exp_table})) {
+ my $l0 = $table->[$lvl - 1];
+ my $l1 = $table->[$lvl];
+
+ $self->{nxt} = $l1;
+
+ $v = ($exp - $l0) / ($l1 - $l0);
+ }
+
+ $self->SUPER::set_value ($v);
+}
+
+#############################################################################
+
+package DC::UI::Gauge;
-our @ISA = CFPlus::UI::VBox::;
+our @ISA = DC::UI::VBox::;
sub new {
my ($class, %arg) = @_;
@@ -5166,9 +2983,9 @@
%arg,
);
- $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->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
+ $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
+ $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
$self
}
@@ -5199,16 +3016,16 @@
#############################################################################
-package CFPlus::UI::Slider;
+package DC::UI::Slider;
use strict;
-use CFPlus::OpenGL;
+use DC::OpenGL;
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
my @tex =
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
+ map { new_from_file DC::Texture DC::find_rcfile $_ }
qw(s1_slider.png s1_slider_bg.png);
sub new {
@@ -5255,12 +3072,10 @@
my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
- $hi = $lo + 1 if $hi <= $lo;
+ $hi = $lo if $hi < $lo;
- $page = $hi - $lo if $page > $hi - $lo;
-
- $value = $lo if $value < $lo;
$value = $hi - $page if $value > $hi - $page;
+ $value = $lo if $value < $lo;
$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
if $unit;
@@ -5286,7 +3101,9 @@
$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
- $self->invoke_mouse_motion ($ev, $x, $y)
+ $self->invoke_mouse_motion ($ev, $x, $y);
+
+ 1
}
sub invoke_mouse_motion {
@@ -5312,11 +3129,11 @@
my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
- my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
+ my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
- ! ! $delta
+ 1
}
sub update {
@@ -5332,10 +3149,10 @@
unless ($self->{knob_w}) {
$self->set_value ($self->{range}[0]);
- my ($value, $lo, $hi, $page) = @{$self->{range}};
- my $range = ($hi - $page - $lo) || 1e-100;
+ my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
+ my $range = ($hi - $page - $lo) || 1e-10;
- my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
+ my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
@@ -5375,9 +3192,9 @@
#############################################################################
-package CFPlus::UI::ValSlider;
+package DC::UI::ValSlider;
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::HBox::;
sub new {
my ($class, %arg) = @_;
@@ -5385,8 +3202,8 @@
my $range = delete $arg{range};
my $self = $class->SUPER::new (
- slider => (new CFPlus::UI::Slider expand => 1, range => $range),
- entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
+ slider => (new DC::UI::Slider expand => 1, range => $range),
+ entry => (new DC::UI::Label text => "", template => delete $arg{template}),
to_value => sub { shift },
from_value => sub { shift },
%arg,
@@ -5416,11 +3233,11 @@
#############################################################################
-package CFPlus::UI::TextScroller;
+package DC::UI::TextScroller;
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::HBox::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -5432,13 +3249,13 @@
#font => default_font
@_,
- layout => (new CFPlus::Layout),
+ layout => (new DC::Layout),
par => [],
max_par => 0,
height => 0,
children => [
- (new CFPlus::UI::Empty expand => 1),
- (new CFPlus::UI::Slider vertical => 1),
+ (new DC::UI::Empty expand => 1),
+ (new DC::UI::Slider vertical => 1),
],
);
@@ -5457,7 +3274,7 @@
sub size_request {
my ($self) = @_;
- my ($empty, $slider) = @{ $self->{children} };
+ my ($empty, $slider) = $self->visible_children;
local $self->{children} = [$empty, $slider];
$self->SUPER::size_request
@@ -5504,7 +3321,7 @@
$layout->set_shapes (
map
- +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
+ +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
@{$para->{widget}}
);
@@ -5631,11 +3448,11 @@
my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
- $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
+ $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
- package CFPlus::UI::Base;
+ package DC::UI::Base;
local ($draw_x, $draw_y, $draw_w, $draw_h) =
(0, 0, $self->{w}, $self->{h});
@@ -5656,6 +3473,7 @@
my $layout = $self->get_layout ($para);
$layout->render ($para->{indent}, $y - $y0);
+ $layout->draw;
if (my @w = @{ $para->{widget} }) {
my @s = $layout->get_shapes;
@@ -5703,11 +3521,11 @@
#############################################################################
-package CFPlus::UI::Animator;
+package DC::UI::Animator;
-use CFPlus::OpenGL;
+use DC::OpenGL;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
sub moveto {
my ($self, $x, $y) = @_;
@@ -5745,9 +3563,9 @@
#############################################################################
-package CFPlus::UI::Flopper;
+package DC::UI::Flopper;
-our @ISA = CFPlus::UI::Button::;
+our @ISA = DC::UI::Button::;
sub new {
my $class = shift;
@@ -5769,11 +3587,11 @@
#############################################################################
-package CFPlus::UI::Tooltip;
+package DC::UI::Tooltip;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -5787,24 +3605,26 @@
sub set_tooltip_from {
my ($self, $widget) = @_;
- $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
- if $widget->{tooltip} =~ /^#(.*)$/;
-
- my $tooltip = $widget->{tooltip};
+ my $tip = $widget->{tooltip};
+ $tip = $tip->($widget) if "CODE" eq ref $tip;
+
+ $tip = DC::Pod::section_label tooltip => $1
+ if $tip =~ /^#(.*)$/;
if ($ENV{CFPLUS_DEBUG} & 2) {
- $tooltip .= "\n\n" . (ref $widget) . "\n"
- . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
- . "req $widget->{req_w} $widget->{req_h}\n"
- . "visible $widget->{visible}";
+ $tip .= "\n\n" . (ref $widget) . "\n"
+ . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
+ . "req $widget->{req_w} $widget->{req_h}\n"
+ . "visible $widget->{visible}";
}
- $tooltip =~ s/^\n+//;
- $tooltip =~ s/\n+$//;
+ $tip =~ s/^\n+//;
+ $tip =~ s/\n+$//;
- $self->add (new CFPlus::UI::Label
- markup => $tooltip,
+ $self->add (new DC::UI::Label
+ markup => $tip,
max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
+ align => 0,
fontsize => 0.8,
style => 1, # FLAG_INVERSE
ellipsise => 0,
@@ -5851,38 +3671,26 @@
sub _draw {
my ($self) = @_;
- glTranslate 0.375, 0.375;
-
my ($w, $h) = @$self{qw(w h)};
glColor 1, 0.8, 0.4;
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex 0 , $h;
- glVertex $w, $h;
- glVertex $w, 0;
- glEnd;
+ glRect 0, 0, $w, $h;
glColor 0, 0, 0;
- glBegin GL_LINE_LOOP;
- glVertex 0 , 0;
- glVertex 0 , $h;
- glVertex $w, $h;
- glVertex $w, 0;
- glEnd;
+ glRect_lineloop .5, .5, $w + .5, $h + .5;
- glTranslate 2 - 0.375, 2 - 0.375;
+ glTranslate 2, 2;
$self->SUPER::_draw;
}
#############################################################################
-package CFPlus::UI::Face;
+package DC::UI::Face;
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -5896,22 +3704,22 @@
);
if ($self->{anim} && $self->{animspeed}) {
- CFPlus::weaken (my $widget = $self);
+ DC::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 (
- parked => 1,
- cb => sub {
- return unless $::CONN && $widget;
-
- ++$widget->{frame};
- $widget->update_face;
- $widget->update;
+ $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
+ $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
+ return unless $::CONN;
- $widget->update_timer;
- },
- );
+ my $w = $widget
+ or return;
+
+ ++$w->{frame};
+ $w->update_face;
+
+ # somehow, $widget can go away
+ $w->update;
+ $w->update_timer;
+ };
$self->update_face;
$self->update_timer;
@@ -5926,11 +3734,6 @@
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;
@@ -5940,12 +3743,18 @@
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 ];
+ if ($::CONN) {
+ if (my $anim = $::CONN->{anim}[$self->{anim}]) {
+ if ($anim && @$anim) {
+ $self->{face} = $anim->[ $self->{frame} % @$anim ];
+ delete $self->{face_change_cb};
+
+ if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
+ unless ($tex->{name} || $tex->{loading}) {
+ $tex->upload (sub { $self->reconfigure });
+ }
+ }
+ }
}
}
}
@@ -5954,14 +3763,16 @@
my ($self) = @_;
if ($::CONN) {
- if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
- if (my $tex = $::CONN->{texture}[$faceid]) {
- return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
- } else {
- $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
- $self->realloc;
- });
+ if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
+ if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
+ if ($tex->{name}) {
+ return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
+ } elsif (!$tex->{loading}) {
+ $tex->upload (sub { $self->reconfigure });
+ }
}
+
+ $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
}
}
@@ -5987,16 +3798,9 @@
sub _draw {
my ($self) = @_;
- return unless $::CONN;
-
$self->SUPER::_draw;
- my $faceid = $::CONN->{faceid}[$self->{face}]
- or return;
-
- my $tex = $::CONN->{texture}[$faceid];
-
- 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;
@@ -6016,19 +3820,19 @@
#############################################################################
-package CFPlus::UI::Buttonbar;
+package DC::UI::Buttonbar;
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::HBox::;
# TODO: should actually wrap buttons and other goodies.
#############################################################################
-package CFPlus::UI::Menu;
+package DC::UI::Menu;
-our @ISA = CFPlus::UI::Toplevel::;
+our @ISA = DC::UI::Toplevel::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -6039,7 +3843,7 @@
@_,
);
- $self->add ($self->{vbox} = new CFPlus::UI::VBox);
+ $self->add ($self->{vbox} = new DC::UI::VBox);
for my $item (@{ $self->{items} }) {
my ($widget, $cb, $tooltip) = @$item;
@@ -6049,20 +3853,21 @@
if ($widget =~ /\t/) {
my ($left, $right) = split /\t/, $widget, 2;
- $widget = new CFPlus::UI::HBox
+ $widget = new DC::UI::HBox
can_hover => 1,
can_events => 1,
tooltip => $tooltip,
children => [
- (new CFPlus::UI::Label markup => $left, expand => 1),
- (new CFPlus::UI::Label markup => $right, align => +1),
+ (new DC::UI::Label markup => $left , align => 0, expand => 1),
+ (new DC::UI::Label markup => $right, align => 1),
],
;
-
+
} else {
- $widget = new CFPlus::UI::Label
+ $widget = new DC::UI::Label
can_hover => 1,
can_events => 1,
+ align => 0,
markup => $widget,
tooltip => $tooltip;
}
@@ -6118,9 +3923,9 @@
#############################################################################
-package CFPlus::UI::Multiplexer;
+package DC::UI::Multiplexer;
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
sub new {
my $class = shift;
@@ -6191,38 +3996,99 @@
#############################################################################
-package CFPlus::UI::Notebook;
+package DC::UI::Notebook;
-our @ISA = CFPlus::UI::VBox::;
+use DC::OpenGL;
+
+our @ISA = DC::UI::VBox::;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
- buttonbar => (new CFPlus::UI::Buttonbar),
- multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
+ buttonbar => (new DC::UI::Buttonbar),
+ multiplexer => (new DC::UI::Multiplexer expand => 1),
+ active_outline => [.7, .7, 0.2],
# filter => # will be put between multiplexer and $self
@_,
);
-
+
$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
+ {
+ Scalar::Util::weaken (my $wself = $self);
+
+ $self->{multiplexer}->connect (c_add => sub {
+ my ($mplex, $widgets) = @_;
+
+ for my $child (@$widgets) {
+ Scalar::Util::weaken $child;
+ $child->{c_tab_} ||= do {
+ my $tab =
+ (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
+ ? $child->{c_tab}
+ : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
+
+ $tab->connect (activate => sub {
+ $wself->set_current_page ($child);
+ });
+
+ $tab
+ };
+
+ $self->{buttonbar}->add ($child->{c_tab_});
+ }
+ });
+
+ $self->{multiplexer}->connect (c_remove => sub {
+ my ($mplex, $widgets) = @_;
+
+ for my $child (@$widgets) {
+ $wself->{buttonbar}->remove ($child->{c_tab_});
+ }
+ });
+ }
+
$self
}
sub add {
- my ($self, $title, $widget, $tooltip) = @_;
+ my ($self, @widgets) = @_;
+
+ $self->{multiplexer}->add (@widgets)
+}
- CFPlus::weaken $self;
+sub remove {
+ my ($self, @widgets) = @_;
- $self->{buttonbar}->add (new CFPlus::UI::Button
- markup => $title,
- tooltip => $tooltip,
- on_activate => sub { $self->set_current_page ($widget) },
- );
+ $self->{multiplexer}->remove (@widgets)
+}
+
+sub pages {
+ my ($self) = @_;
+ $self->{multiplexer}->children
+}
+
+sub page_index {
+ my ($self, $widget) = @_;
+
+ my $i = 0;
+ for ($self->pages) {
+ if ($_ eq $widget) { return $i };
+ $i++;
+ }
- $self->{multiplexer}->add ($widget);
+ undef
+}
+
+sub add_tab {
+ my ($self, $title, $widget, $tooltip) = @_;
+
+ $title = [$title, $tooltip] unless ref $title;
+ $widget->{c_tab} = $title;
+
+ $self->add ($widget);
}
sub get_current_page {
@@ -6238,13 +4104,33 @@
$self->emit (page_changed => $self->{multiplexer}{current});
}
+sub _draw {
+ my ($self) = @_;
+
+ $self->SUPER::_draw ();
+
+ if (my $cur = $self->{multiplexer}{current}) {
+ if ($cur = $cur->{c_tab_}) {
+ glTranslate $self->{buttonbar}{x} + $cur->{x},
+ $self->{buttonbar}{y} + $cur->{y};
+ glLineWidth 3;
+ #glEnable GL_BLEND;
+ #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+ glColor @{$self->{active_outline}};
+ glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
+ glLineWidth 1;
+ #glDisable GL_BLEND;
+ }
+ }
+}
+
#############################################################################
-package CFPlus::UI::Selector;
+package DC::UI::Selector;
use utf8;
-our @ISA = CFPlus::UI::Button::;
+our @ISA = DC::UI::Button::;
sub new {
my $class = shift;
@@ -6271,18 +4157,19 @@
push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
}
- CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
+ DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
}
sub _set_value {
my ($self, $value) = @_;
- my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
+ my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
+ $item ||= $self->{options}[0]
or return;
$self->{value} = $item->[0];
$self->set_markup ("$item->[1] ⇓");
- $self->set_tooltip ($item->[2]);
+# $self->set_tooltip ($item->[2]);
}
sub set_value {
@@ -6294,11 +4181,18 @@
$self->emit (changed => $value);
}
+sub set_options {
+ my ($self, $options) = @_;
+
+ $self->{options} = $options;
+ $self->_set_value ($self->{value});
+}
+
#############################################################################
-package CFPlus::UI::Statusbox;
+package DC::UI::Statusbox;
-our @ISA = CFPlus::UI::VBox::;
+our @ISA = DC::UI::VBox::;
sub new {
my $class = shift;
@@ -6308,9 +4202,9 @@
@_,
);
- CFPlus::weaken (my $this = $self);
+ DC::weaken (my $this = $self);
- $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
+ $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
$self
}
@@ -6320,14 +4214,16 @@
my $NOW = Time::HiRes::time;
# freeze display when hovering over any label
- return if $CFPlus::UI::TOOLTIP->{owner}
- && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
+ return if $DC::UI::TOOLTIP->{owner}
+ && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
values %{ $self->{item} };
while (my ($k, $v) = each %{ $self->{item} }) {
delete $self->{item}{$k} if $v->{timeout} < $NOW;
}
+ $self->{timer}->set (1, 1);
+
my @widgets;
my @items = sort {
@@ -6335,8 +4231,6 @@
or $b->{id} <=> $a->{id}
} values %{ $self->{item} };
- $self->{timer}->interval (1);
-
my $count = 10 + 1;
for my $item (@items) {
last unless --$count;
@@ -6352,13 +4246,14 @@
s/\s+/ /g;
}
- new CFPlus::UI::Label
+ new DC::UI::Label
markup => $short,
tooltip => $item->{tooltip},
tooltip_font => $::FONT_PROP,
tooltip_width => 0.67,
fontsize => $item->{fontsize} || $self->{fontsize},
max_w => $::WIDTH * 0.44,
+ align => 0,
fg => [@{ $item->{fg} }],
can_events => 1,
can_hover => 1
@@ -6369,7 +4264,7 @@
$label->update;
$label->set_max_size (undef, $label->{req_h} * $diff)
if $diff < 1;
- $self->{timer}->interval (1/30);
+ $self->{timer}->set (1/30, 1/30);
} else {
$label->{fg}[3] = $item->{fg}[3] || 1;
}
@@ -6441,13 +4336,13 @@
#############################################################################
-package CFPlus::UI::Root;
+package DC::UI::Root;
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
use List::Util qw(min max);
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -6457,7 +4352,7 @@
@_,
);
- CFPlus::weaken ($self->{root} = $self);
+ DC::weaken ($self->{root} = $self);
$self
}
@@ -6515,7 +4410,7 @@
sub update {
my ($self) = @_;
- $::WANT_REFRESH++;
+ $::WANT_REFRESH = 1;
}
sub add {
@@ -6562,7 +4457,7 @@
for values %{delete $self->{refresh_hook}};
}
- if ($self->{realloc}) {
+ while ($self->{realloc}) {
my %queue;
my @queue;
my $widget;
@@ -6592,8 +4487,11 @@
my ($w, $h) = $widget->size_request;
- $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
- $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+ $w += $widget->{padding_x} * 2;
+ $h += $widget->{padding_y} * 2;
+
+ $w = max $widget->{min_w}, $w;
+ $h = max $widget->{min_h}, $h;
$w = min $widget->{max_w}, $w if exists $widget->{max_w};
$h = min $widget->{max_h}, $h if exists $widget->{max_h};
@@ -6619,40 +4517,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 $size_alloc = delete $self->{size_alloc}) {
+ my @queue = sort { $a->{visible} <=> $b->{visible} }
+ values %$size_alloc;
- while () {
- my $widget = pop @queue || last;
-
- 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);
+ }
}
}
}
@@ -6673,7 +4568,7 @@
glLoadIdentity;
{
- package CFPlus::UI::Base;
+ package DC::UI::Base;
local ($draw_x, $draw_y, $draw_w, $draw_h) =
(0, 0, $self->{w}, $self->{h});
@@ -6684,10 +4579,10 @@
#############################################################################
-package CFPlus::UI;
+package DC::UI;
-$ROOT = new CFPlus::UI::Root;
-$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
+$ROOT = new DC::UI::Root;
+$TOOLTIP = new DC::UI::Tooltip z => 900;
1