--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/28 05:17:21 1.179 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/19 03:49:48 1.215 @@ -1,5 +1,6 @@ package CFClient::UI; +use utf8; use strict; use Scalar::Util (); @@ -13,6 +14,8 @@ our $TOOLTIP; our $BUTTON_STATE; +our %WIDGET; # all widgets, weak-referenced + sub check_tooltip { if (!$GRAB) { for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { @@ -25,17 +28,17 @@ $tip = $tip->($widget) if CODE:: eq ref $tip; - $TOOLTIP->set_markup ($widget->{tooltip}); - + $TOOLTIP->set_tooltip_from ($widget); $TOOLTIP->show; my ($x, $y) = $widget->coord2global ($widget->{w}, 0); - if ($x + $TOOLTIP->{w} > $::WIDTH) { - ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); - } + ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) + if $x + $TOOLTIP->{w} > $::WIDTH; $TOOLTIP->move ($x, $y); + $TOOLTIP->check_size; + $TOOLTIP->update; } return; @@ -135,6 +138,29 @@ } } +# call when resolution changes etc. +sub rescale_widgets { + my ($sx, $sy) = @_; + + # make a copy, otherwise for complains about freed values. + my @widgets = values %WIDGET; + + for my $widget (@widgets) { + if ($widget->{toplevel}) { + $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; + $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; + $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; + $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; + $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; + $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; + $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; + $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; + } + + $widget->reconfigure; + } +} + ############################################################################# package CFClient::UI::Base; @@ -160,6 +186,8 @@ } } + Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); + $self } @@ -234,11 +262,7 @@ } if ($self->{w} != $w || $self->{h} != $h) { - $self->{w} = $w; - $self->{h} = $h; - - $self->size_allocate ($w, $h); - $self->update; + $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; } } @@ -246,17 +270,14 @@ # nothing to be done } -sub children { -} - -# call when resoltuion changes etc. sub reconfigure { my ($self) = @_; - $_->reconfigure - for $self->children; + $self->check_size (1); + $self->update; +} - $_->check_size; +sub children { } sub set_max_size { @@ -266,30 +287,29 @@ delete $self->{max_h}; $self->{max_h} = $h if $h; } -# return top left coordinates -sub _topleft { - my ($self, $x, $y) = @_; +sub set_tooltip { + my ($self, $tooltip) = @_; - $self->{parent} - or Carp::confess "no parent widget in _topleft\n";#d# + $self->{tooltip} = $tooltip; - $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); + if ($CFClient::UI::TOOLTIP->{owner} == $self) { + delete $CFClient::UI::TOOLTIP->{owner}; + CFClient::UI::check_tooltip; + } } # translate global coordinates to local coordinate system sub coord2local { my ($self, $x, $y) = @_; - my ($X, $Y) = $self->_topleft; - ($x - $X, $y - $Y) + $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) } # translate local coordinates to global coordinate system sub coord2global { my ($self, $x, $y) = @_; - my ($X, $Y) = $self->_topleft; - ($x + $X, $y + $Y) + $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) } sub focus_in { @@ -371,7 +391,7 @@ glVertex 0 , $self->{h}; glEnd; glPopMatrix; - CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; + #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; } } @@ -397,32 +417,17 @@ my ($self, $parent) = @_; Scalar::Util::weaken ($self->{parent} = $parent); + + # TODO: req_w _does_change after ->reconfigure + $self->check_size + unless exists $self->{req_w}; } sub check_size { - my ($self) = @_; + my ($self, $forced) = @_; - $self->{parent} - or return 1; - - my ($w, $h) = $self->{user_w} && $self->{user_h} - ? @$self{qw(user_w user_h)} - : $self->size_request; - - if ($w != $self->{req_w} || $h != $self->{req_h}) { - $self->{req_w} = $w; - $self->{req_h} = $h; - - $self->{parent}->check_size - or $self->size_allocate ( - (List::Util::max $self->{w}, $w), - (List::Util::max $self->{h}, $h), - ); - - 1 - } else { - 0 - } + $self->{force_alloc} = 1 if $forced; + $CFClient::UI::ROOT->{check_size}{$self} = $self; } sub update { @@ -447,6 +452,7 @@ sub DESTROY { my ($self) = @_; + delete $WIDGET{$self+0}; #$self->deactivate; } @@ -465,8 +471,8 @@ # range [value, low, high, page] $class->SUPER::new ( - bg => [0, 0, 0, 0.2], - active_bg => [1, 1, 1, 0.5], + #bg => [0, 0, 0, 0.2], + #active_bg => [1, 1, 1, 0.5], @_ ) } @@ -474,20 +480,26 @@ sub _draw { my ($self) = @_; - my ($w, $h) = @$self{qw(w h)}; + my $color = $FOCUS == $self && $self->{active_bg} + ? $self->{active_bg} + : $self->{bg}; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; + if ($color && (@$color < 4 || $color->[3])) { + my ($w, $h) = @$self{qw(w h)}; - glBegin GL_QUADS; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; + glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glColor @$color; - glDisable GL_BLEND; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $h; + glVertex $w, $h; + glVertex $w, 0; + glEnd; + + glDisable GL_BLEND; + } } ############################################################################# @@ -529,18 +541,20 @@ } sub add { - my ($self, $child) = @_; + my ($self, @widgets) = @_; - $child->set_parent ($self); + $_->set_parent ($self) + for @widgets; use sort 'stable'; $self->{children} = [ sort { $a->{z} <=> $b->{z} } - @{$self->{children}}, $child + @{$self->{children}}, @widgets ]; - $child->check_size; + $self->check_size (1); + $self->update; } sub children { @@ -569,6 +583,9 @@ delete $_->{parent}; $_->hide; } + + $self->check_size; + $self->update; } sub find_widget { @@ -653,7 +670,7 @@ sub update { my ($self) = @_; - $ROOT->on_refresh ($self => sub { $self->render_child }); + $ROOT->on_post_alloc ($self => sub { $self->render_child }); $self->SUPER::update; } @@ -664,20 +681,18 @@ $self->update; } +sub _render { + $_[0]{children}[0]->draw; +} + sub render_child { my ($self) = @_; $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { - glClearColor 0, 0, 0, 0; + glClearColor 0.5, 0.5, 0.5, 1; glClear GL_COLOR_BUFFER_BIT; - $self->child->draw; -# glColorMask 1, 1, 1, 0; -# glEnable GL_BLEND; -# glBlendFunc GL_SRC_ALPHA, GL_ZERO; -# glRasterPos 0, 0; -# glCopyPixels 0, 0, $self->{w}, $self->{h}; -# glDisable GL_BLEND; -# glColorMask 1, 1, 1, 1; + + $self->_render; }; } @@ -689,15 +704,12 @@ my $tex = $self->{texture} or return; - glEnable GL_BLEND; - glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - glColor 0, 0, 0, 1; + glColor 1, 1, 1, 1; - $tex->draw_quad (0, 0, $w, $h); + $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; } @@ -707,23 +719,100 @@ our @ISA = CFClient::UI::Window::; -sub new { die } - sub size_request { my ($self) = @_; @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; - $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); + $self->child->configure (0, 0, @$self{qw(child_w child_h)}); @$self{qw(child_w child_h)} } -sub _draw { +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->update; +} + +sub set_offset { + my ($self, $x, $y) = @_; + + $self->{view_x} = int $x; + $self->{view_y} = int $y; + + $self->update; +} + +# hmm, this does not work for topleft of $self... but we should not ask for that +sub coord2local { + my ($self, $x, $y) = @_; + + $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) +} + +sub coord2global { + my ($self, $x, $y) = @_; + + $x = List::Util::min $self->{w}, $x - $self->{view_x}; + $y = List::Util::min $self->{h}, $y - $self->{view_y}; + + $self->SUPER::coord2global ($x, $y) +} + +sub find_widget { + my ($self, $x, $y) = @_; + + 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}) + } else { + $self->CFClient::UI::Base::find_widget ($x, $y) + } +} + +sub _render { my ($self) = @_; - $self->{children}[1]->draw; + CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; + + $self->SUPER::_render; +} + +############################################################################# + +package CFClient::UI::ScrolledWindow; + +our @ISA = CFClient::UI::HBox::; + +sub new { + my $class = shift; + + my $self; + + my $slider = new CFClient::UI::Slider + vertical => 1, + range => [0, 0, 1, 0.01], # HACK fix + connect_changed => sub { + $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); + }, + ; + + $self = $class->SUPER::new ( + vp => (new CFClient::UI::ViewPort), + slider => $slider, + @_, + ); + + $self->{vp}->add ($self->{scrolled}); + $self->add ($self->{vp}); + $self->add ($self->{slider}); + + $self } +#TODO# update range on size_allocate depending on child +# update viewport offset on scroll ############################################################################# @@ -736,38 +825,33 @@ sub new { my $class = shift; - my $self = $class->SUPER::new ( - bg => [1, 1, 1, 1], - border_bg => [1, 1, 1, 1], - border => 0.8, - @_ - ); - - $self + $class->SUPER::new ( + bg => undef, + @_, + ) } sub _draw { my ($self) = @_; - my ($w, $h) = ($self->{w}, $self->{h}); + if ($self->{bg}) { + my ($w, $h) = @$self{qw(w h)}; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glColor @{ $self->{bg} }; -# glBegin GL_QUADS; -# glColor 0, 0, 0, 0; -# glVertex 0 , 0; -# glVertex 0 , $h; -# glVertex $w, $h; -# glVertex $w, 0; -# glEnd; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $h; + glVertex $w, $h; + glVertex $w, 0; + glEnd; + glDisable GL_BLEND; + } - $self->child->draw; - glDisable GL_BLEND; - glDisable GL_TEXTURE_2D; + $self->SUPER::_draw; } ############################################################################# @@ -791,6 +875,7 @@ bg => [1, 1, 1, 1], border_bg => [1, 1, 1, 1], border => 0.6, + toplevel => 1, can_events => 1, @_ ); @@ -825,7 +910,7 @@ $h -= List::Util::max 0, $self->border * 2; $w -= List::Util::max 0, $self->border * 2; - $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) + $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) if $self->{title}; $self->child->configure ($self->border, $self->border, $w, $h); @@ -893,18 +978,16 @@ my ($w, $h ) = ($self->{w}, $self->{h}); my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; my $border = $self->border; glColor @{ $self->{border_bg} }; - $tex[1]->draw_quad (0, 0, $w, $border); - $tex[3]->draw_quad (0, $border, $border, $ch); - $tex[2]->draw_quad ($w - $border, $border, $border, $ch); - $tex[4]->draw_quad (0, $h - $border, $w, $border); + $tex[1]->draw_quad_alpha (0, 0, $w, $border); + $tex[3]->draw_quad_alpha (0, $border, $border, $ch); + $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); + $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); if (@{$self->{bg}} < 4 || $self->{bg}[3]) { my $bg = $tex[0]; @@ -918,12 +1001,11 @@ $bg->{s} = $rep_x; $bg->{t} = $rep_y; $bg->{wrap_mode} = 1; - $bg->draw_quad ($border, $border, $cw, $ch); - - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + $bg->draw_quad_alpha ($border, $border, $cw, $ch); } + glDisable GL_TEXTURE_2D; + $self->{title}->draw if $self->{title}; $self->child->draw; @@ -1159,6 +1241,8 @@ sub size_allocate { my ($self, $w, $h) = @_; + Carp::confess "negative size" if $w < 0 || $h < 0;#d# + my $children = $self->{children}; my @h = map $_->{req_h}, @$children; @@ -1197,7 +1281,7 @@ package CFClient::UI::Label; -our @ISA = CFClient::UI::Base::; +our @ISA = CFClient::UI::DrawBG::; use CFClient::OpenGL; @@ -1206,13 +1290,18 @@ my $self = $class->SUPER::new ( fg => [1, 1, 1], + #bg => none + #active_bg => none #font => default_font + #text => initial text + #markup => initial narkup + #max_w => maximum pixel width + ellipsise => 3, # end + layout => (new CFClient::Layout), fontsize => 1, - text => "", align => -1, valign => -1, padding => 2, - layout => new CFClient::Layout, can_events => 0, %arg ); @@ -1223,20 +1312,23 @@ $self->{template} = $layout; } - $self->set_text (delete $self->{text}) if exists $self->{text}; - $self->set_markup (delete $self->{markup}) if exists $self->{markup}; + if (exists $self->{markup}) { + $self->set_markup (delete $self->{markup}); + } else { + $self->set_text (delete $self->{text}); + } $self } -sub escape { - local $_ = $_[1]; +sub escape($) { + local $_ = $_[0]; s/&/&/g; s/>/>/g; s/SUPER::update; } -sub reconfigure { - my ($self) = @_; - - delete $self->{texture}; -} - sub set_text { my ($self, $text) = @_; return if $self->{text} eq "T$text"; $self->{text} = "T$text"; + $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; $self->{layout}->set_text ($text); - delete $self->{texture}; $self->update; $self->check_size; } @@ -1271,9 +1357,11 @@ return if $self->{text} eq "M$markup"; $self->{text} = "M$markup"; + my $rgba = $markup =~ /span.*(?:foreground|background)/; + + $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; $self->{layout}->set_markup ($markup); - delete $self->{texture}; $self->update; $self->check_size; } @@ -1283,6 +1371,8 @@ $self->{layout}->set_font ($self->{font}) if $self->{font}; $self->{layout}->set_width ($self->{max_w} || -1); + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); my ($w, $h) = $self->{layout}->size; @@ -1314,43 +1404,48 @@ $self->{fontsize} = $fontsize; delete $self->{texture}; - $self->check_size; + $self->update; + $self->check_size; } sub _draw { my ($self) = @_; + $self->SUPER::_draw; # draw background, if applicable + my $tex = $self->{texture} ||= do { + $self->{layout}->set_foreground (@{$self->{fg}}); $self->{layout}->set_font ($self->{font}) if $self->{font}; $self->{layout}->set_width ($self->{w}); - $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); - new_from_layout CFClient::Texture $self->{layout} - }; + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + my $tex = new_from_layout CFClient::Texture $self->{layout}; - glColor @{$self->{fg}}; + $self->{ox} = int ($self->{align} < 0 ? $self->{padding} + : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} + : ($self->{w} - $tex->{w}) * 0.5); - $self->{ox} = int ( - $self->{align} < 0 ? $self->{padding} - : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} - : ($self->{w} - $tex->{w}) * 0.5 - ); + $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} + : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} + : ($self->{h} - $tex->{h}) * 0.5); - $self->{oy} = int ( - $self->{valign} < 0 ? $self->{padding} - : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} - : ($self->{h} - $tex->{h}) * 0.5 - ); + $tex + }; + + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - $tex->draw_quad ($self->{ox}, $self->{oy}); + if ($tex->{format} == GL_ALPHA) { + glColor @{$self->{fg}}; + $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); + } else { + $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); + } glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; } ############################################################################# @@ -1395,6 +1490,15 @@ $self->emit (changed => $self->{text}); } +sub set_text { + my ($self, $text) = @_; + + $self->{cursor} = length $text; + $self->_set_text ($text); + $self->update; + $self->check_size; +} + sub get_text { $_[0]{text} } @@ -1413,14 +1517,6 @@ $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text } -sub set_text { - my ($self, $text) = @_; - - $self->{cursor} = length $text; - $self->_set_text ($text); - $self->update; -} - sub key_down { my ($self, $ev) = @_; @@ -1430,9 +1526,9 @@ my $text = $self->get_text; - if ($sym == 8) { + if ($uni == 8) { substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; - } elsif ($sym == 127) { + } elsif ($uni == 127) { substr $text, $self->{cursor}, 1, ""; } elsif ($sym == CFClient::SDLK_LEFT) { --$self->{cursor} if $self->{cursor}; @@ -1442,7 +1538,7 @@ $self->{cursor} = 0; } elsif ($sym == CFClient::SDLK_END) { $self->{cursor} = length $text; - } elsif ($sym == 27) { + } elsif ($uni == 27) { $self->emit ('escape'); } elsif ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; @@ -1450,6 +1546,7 @@ $self->_set_text ($text); $self->update; + $self->check_size; } sub focus_in { @@ -1588,7 +1685,6 @@ $class->SUPER::new ( padding => 4, fg => [1, 1, 1], - bg => [1, 1, 1, 0.2], active_fg => [0, 0, 1], can_hover => 1, align => 0, @@ -1616,16 +1712,13 @@ $self->{fg} = $self->{active_fg}; } - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor 0, 0, 0, 1; - $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); + $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; $self->SUPER::_draw; } @@ -1649,6 +1742,8 @@ padding => 2, fg => [1, 1, 1], active_fg => [1, 1, 0], + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], state => 0, can_hover => 1, @_ @@ -1682,16 +1777,11 @@ glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; - glEnable GL_BLEND; - glEnable GL_TEXTURE_2D; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - my $tex = $self->{state} ? $tex[1] : $tex[0]; - $tex->draw_quad (0, 0, $s, $s); - + glEnable GL_TEXTURE_2D; + $tex->draw_quad_alpha (0, 0, $s, $s); glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; } ############################################################################# @@ -1744,14 +1834,11 @@ ($w, $h) = ($h, $w); } - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 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_BLEND; glDisable GL_TEXTURE_2D; } @@ -1950,7 +2037,7 @@ sub new { my $class = shift; - # range [value, low, high, page] + # range [value, low, high, page, unit] # TODO: 0-width page # TODO: req_w/h are wrong with vertical @@ -1958,18 +2045,46 @@ my $self = $class->SUPER::new ( fg => [1, 1, 1], active_fg => [0, 0, 0], + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], range => [0, 0, 100, 10], - req_w => 20, - req_h => 20, + req_w => $::WIDTH / 80, + req_h => $::WIDTH / 80, vertical => 0, can_hover => 1, - inner_pad => 5, + inner_pad => .05, @_ ); + $self->set_value ($self->{range}[0]); + $self->update; + $self } +sub set_value { + my ($self, $value) = @_; + + my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; + + $hi = $lo + 1 if $hi <= $lo; + + $value = $lo if $value < $lo; + $value = $hi if $value > $hi; + + $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit + if $unit; + + $page = $hi - $lo if $page > $hi - $lo; + + @{$self->{range}} = ($value, $lo, $hi, $page, $unit); + + if ($value != $old_value) { + $self->emit (changed => $value); + $self->update; + } +} + sub size_request { my ($self) = @_; @@ -1990,30 +2105,41 @@ my ($self, $ev, $x, $y) = @_; if ($GRAB == $self) { - my ($value, $lo, $hi, $page) = @{$self->{range}}; - my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); - my $inner_pad_px = $self->_calc_inner_pad_px ($w); - my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right + my (undef, $lo, $hi, $page) = @{$self->{range}}; - $x -= $inner_pad_px; # substract the padding - $x = $x * ($hi - $lo) / $inner_w + $lo; - $x = $lo if $x < $lo; - $x = $hi - $page if $x > $hi - $page; - $self->{range}[0] = $x; + $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; - $self->emit (changed => $x); - $self->update; + $self->set_value ($x * ($hi - $lo) + $lo); } } -# the inner_* stuff is for generating a padding for the slider handle, -# so that the handle doesn't leave the texture. This calculation isn't 100% -# correct propably, but it does the job for now -sub _calc_inner_pad_px { - my ($self, $w) = @_; - ($w / 100) * $self->{inner_pad} # % to pixels +sub update { + my ($self) = @_; + + $CFClient::UI::ROOT->on_post_alloc ($self => sub { + $self->set_value ($self->{range}[0]); + + my ($value, $lo, $hi, $page) = @{$self->{range}}; + + my $inner_w = 1 - 2 * $self->{inner_pad}; + + $self->{scale} = ($inner_w / ($hi - $lo)) || 1; + + $page = $self->{scale} * $page || 10 / ($self->{w} || 1); + $value = $self->{scale} * ($value - $lo); + + $value = $self->{inner_pad} + ($value - $page * 0.5); + + $value = 0 if $value < 0; + $page = 1 - $value if $value + $page > 1; + + $self->{knob_x} = $value; + $self->{knob_w} = $page; + }); + + $self->SUPER::update; } sub _draw { @@ -2021,50 +2147,27 @@ $self->SUPER::_draw (); - my ($w, $h) = @$self{qw(w h)}; + glScale $self->{w}, $self->{h}; if ($self->{vertical}) { # draw a vertical slider like a rotated horizontal slider + glTranslate 1, 0, 0; glRotate 90, 0, 0, 1; - glTranslate 0, -$self->{w}, 0; - - ($w, $h) = ($h, $w); } my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; - my ($value, $lo, $hi, $page) = @{$self->{range}}; - - $hi = $value + 1 if $lo == $hi; - - my $inner_pad_px = $self->_calc_inner_pad_px ($w); - my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right - - $page = int $page * $inner_w / ($hi - $lo); - $value = int +($value - $lo) * $inner_w / ($hi - $lo); - - $w -= $page; - $page &= ~1; - glTranslate $page * 0.5, 0, 0; - $page ||= 2; - - my $knob_a = $inner_pad_px + ($value - $page * 0.5); - my $knob_b = $inner_pad_px + ($value + $page * 0.5); - - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; # draw background - $tex[1]->draw_quad (0, 0, $w, $h); + $tex[1]->draw_quad_alpha (0, 0, 1, 1); # draw handle - $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); + $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; } @@ -2085,7 +2188,7 @@ #font => default_font @_, - layout => (new CFClient::Layout), + layout => (new CFClient::Layout 1), par => [], height => 0, children => [ @@ -2113,7 +2216,7 @@ $layout->set_height ($self->{fontsize} * $::FONTSIZE); $layout->set_width ($self->{children}[0]{w}); - $layout->set_text ($text); + $layout->set_markup ($text); ($layout->size)[1] } @@ -2161,7 +2264,7 @@ delete $self->{texture}; - $ROOT->on_refresh ($self, sub { + $ROOT->on_post_alloc ($self, sub { if (delete $self->{need_reflow}) { my $height = 0; @@ -2176,11 +2279,9 @@ } $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { - glClearColor 0, 0, 0, 0; + glClearColor 0.5, 0.5, 0.5, 0; glClear GL_COLOR_BUFFER_BIT; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; @@ -2199,18 +2300,17 @@ my $h = $par->[0]; if ($y0 < $y + $h && $y < $y1) { - $layout->set_text ($par->[2]); + $layout->set_foreground (@{ $par->[1] }); + $layout->set_markup ($par->[2]); - glColor @{ $par->[1] }; my ($W, $H) = $layout->size; - CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); + CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); } $y += $h; } glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; }; }); } @@ -2218,14 +2318,11 @@ sub _draw { my ($self) = @_; - glEnable GL_BLEND; - glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor 1, 1, 1, 1; - $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); + $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; $self->{children}[1]->draw; @@ -2329,19 +2426,22 @@ ) } -sub set_markup { - my ($self, $text) = @_; +sub set_tooltip_from { + my ($self, $widget) = @_; - $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; - $self->{label}->set_markup ($text); - $self->add ($self->{label}); + $self->add (new CFClient::UI::Label + markup => $widget->{tooltip}, + max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, + fontsize => 0.8, + fg => [0, 0, 0, 1], + ellipsise => 0, + font => ($widget->{tooltip_font} || $::FONT_PROP), + ); } sub size_request { my ($self) = @_; - $self->child->set_max_size ($::WIDTH * 0.3); - my ($w, $h) = @{$self->child}{qw(req_w req_h)}; ($w + 4, $h + 4) @@ -2356,7 +2456,6 @@ sub _draw { my ($self) = @_; - glPushMatrix; glTranslate 0.375, 0.375; my ($w, $h) = @$self{qw(w h)}; @@ -2377,9 +2476,7 @@ glVertex $w, 0; glEnd; - glPopMatrix; - - glTranslate 2, 2; + glTranslate 2 - 0.375, 2 - 0.375; $self->SUPER::_draw; } @@ -2407,23 +2504,171 @@ sub _draw { my ($self) = @_; + return unless $::CONN;#d# manage and cache textures differently my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; # TODO animation if ($tex) { - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor 1, 1, 1, 1; - $tex->draw_quad (0, 0, $self->{w}, $self->{h}); + $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; } } ############################################################################# +package CFClient::UI::InventoryItem; + +our @ISA = CFClient::UI::HBox::; + +sub _item_to_desc { + my ($item) = @_; + + my $desc = + $item->{nrof} < 2 + ? $item->{name} + : "$item->{nrof} $item->{name_pl}"; + + $item->{flags} & Crossfire::Protocol::F_OPEN + and $desc .= " (open)"; + $item->{flags} & Crossfire::Protocol::F_APPLIED + and $desc .= " (applied)"; + $item->{flags} & Crossfire::Protocol::F_UNPAID + and $desc .= " (unpaid)"; + $item->{flags} & Crossfire::Protocol::F_MAGIC + and $desc .= " (magic)"; + $item->{flags} & Crossfire::Protocol::F_CURSED + and $desc .= " (cursed)"; + $item->{flags} & Crossfire::Protocol::F_DAMNED + and $desc .= " (damned)"; + $item->{flags} & Crossfire::Protocol::F_LOCKED + and $desc .= " *"; + + $desc +} + +sub new { + my $class = shift; + + my %args = @_; + + my $item = delete $args{item}; + + my $desc = _item_to_desc ($item); + + my $self = $class->SUPER::new ( + can_hover => 1, + can_events => 1, + tooltip => ((CFClient::UI::Label::escape $desc) + . "\nleftclick - pick up\nmiddle click - apply\nrightclick - menu"), + connect_button_down => sub { + my ($self, $ev, $x, $y) = @_; + + # todo: maybe put examine on 1? but should just be a tooltip :( + if ($ev->{button} == 1) { + my $targ = $::CONN->{player}{tag}; + + if ($item->{container} == $::CONN->{player}{tag}) { + $targ = $main::OPENCONT; + } + + $::CONN->send ("move $targ $item->{tag} 0"); + } elsif ($ev->{button} == 2) { + $::CONN->send ("apply $item->{tag}"); + } elsif ($ev->{button} == 3) { + my @menu_items = ( + ["examine", sub { $::CONN->send ("examine $item->{tag}") }], + ["mark", sub { $::CONN->send ("mark $item->{tag}") }], + ["apply", sub { $::CONN->send ("apply $item->{tag}") }], + ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], + [ + $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", + sub { $::CONN->send ("lock $item->{tag}") }, + ], + ); + + CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); + } + + 1 + }, + %args + ); + + + $self->add (new CFClient::UI::Face + can_events => 0, + face => $item->{face}, + anim => $item->{anim}, + animspeed => $item->{animspeed}, + ); + + $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0); + + $self->{item} = $item; + + $self->update_item; + + $self +} + +sub update_item { + my ($self) = @_; + + my $desc = _item_to_desc ($self->{item}); + + $self->{name_lbl}->set_text ($desc); +} + +############################################################################# + +package CFClient::UI::Inventory; + +our @ISA = CFClient::UI::ScrolledWindow::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + scrolled => (new CFClient::UI::VBox), + @_, + ); + + $self +} + +sub set_items { + my ($self, $items) = @_; + + $self->{scrolled}->clear; + return unless $items; + + my @items = sort { + ($a->{type} <=> $b->{type}) + or ($a->{name} cmp $b->{name}) + } @$items; + + $self->{real_items} = \@items; + + for my $item (@items) { + $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; + $item->update_item (); + } + + $self->{scrolled}->add (@items); + +# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; +} + +sub size_request { + my ($self) = @_; + ($self->{req_w}, $self->{req_h}); +} + +############################################################################# + package CFClient::UI::Menu; our @ISA = CFClient::UI::FancyFrame::; @@ -2477,7 +2722,7 @@ sub mouse_motion { my ($self, $ev, $x, $y) = @_; - # TODO: should use vbox->fdind_widget or so + # TODO: should use vbox->find_widget or so $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); $self->{hover} = $self->{item}{$HOVER}; } @@ -2496,88 +2741,115 @@ ############################################################################# -package CFClient::UI::Root; - -our @ISA = CFClient::UI::Container::; +package CFClient::UI::Statusbox; -use CFClient::OpenGL; - -sub check_size { - my ($self) = @_; +our @ISA = CFClient::UI::VBox::; - $self->configure (0, 0, $::WIDTH, $::HEIGHT); -} +sub new { + my $class = shift; -sub size_request { - ($::WIDTH, $::HEIGHT) + $class->SUPER::new ( + fontsize => 0.8, + @_, + ) } -sub configure { - my ($self, $x, $y, $w, $h) = @_; +sub reorder { + my ($self) = @_; + my $NOW = time; - $self->SUPER::configure ($x, $y, $w, $h); + while (my ($k, $v) = each %{ $self->{item} }) { + delete $self->{item}{$k} if $v->{timeout} < $NOW; + } - for my $child (@{$self->{children}}) { - my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; + my @widgets; - $X = List::Util::max 0, List::Util::min $w - $W, $X; - $Y = List::Util::max 0, List::Util::min $h - $H, $Y; - $child->configure ($X, $Y, $W,$H); - } -} + my @items = sort { + $a->{pri} <=> $b->{pri} + or $b->{id} <=> $a->{id} + } values %{ $self->{item} }; -sub _topleft { - my ($self, $x, $y) = @_; + my $count = 10 + 1; + for my $item (@items) { + last unless --$count; - ($x, $y) -} + push @widgets, $item->{label} ||= do { + # TODO: doesn't handle markup well (read as: at all) + my $short = $item->{count} > 1 + ? "$item->{count} × $item->{text}" + : $item->{text}; + + for ($short) { + s/^\s+//; + s/\s+/ /g; + } -sub update { - my ($self) = @_; + new CFClient::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, + fg => $item->{fg}, + can_events => 1, + can_hover => 1 + }; + } - $self->check_size; - ::refresh (); + $self->clear; + $self->SUPER::add (reverse @widgets); } sub add { - my ($self, $child) = @_; + my ($self, $text, %arg) = @_; - # integerize window positions - $child->{x} = int $child->{x}; - $child->{y} = int $child->{y}; + $text =~ s/^\s+//; + $text =~ s/\s+$//; - $self->SUPER::add ($child); -} + my $timeout = time + ((delete $arg{timeout}) || 60); -sub on_refresh { - my ($self, $id, $cb) = @_; + my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; - $self->{refresh_hook}{$id} = $cb; + if (my $item = $self->{item}{$group}) { + if ($item->{text} eq $text) { + $item->{count}++; + } else { + $item->{count} = 1; + $item->{text} = $item->{tooltip} = $text; + } + $item->{id} = ++$self->{id}; + $item->{timeout} = $timeout; + delete $item->{label}; + } else { + $self->{item}{$group} = { + id => ++$self->{id}, + text => $text, + timeout => $timeout, + tooltip => $text, + fg => [0.8, 0.8, 0.8, 0.8], + pri => 0, + count => 1, + %arg, + }; + } + + $self->reorder; } -sub draw { +sub reconfigure { my ($self) = @_; - while (my $rcb = delete $self->{refresh_hook}) { - $_->() for values %$rcb; - } + delete $_->{label} + for values %{ $self->{item} || {} }; - glViewport 0, 0, $::WIDTH, $::HEIGHT; - glClearColor +($::CFG->{fow_intensity}) x 3, 1; - glClear GL_COLOR_BUFFER_BIT; - - glMatrixMode GL_PROJECTION; - glLoadIdentity; - glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; - glMatrixMode GL_MODELVIEW; - glLoadIdentity; - - $self->_draw; + $self->reorder; + $self->SUPER::reconfigure; } ############################################################################# -package CFClient::UI::Inventory; +package CFClient::UI::Root; our @ISA = CFClient::UI::Container::; @@ -2586,108 +2858,178 @@ sub new { my $class = shift; - my $self = $class->SUPER::new (@_); + $class->SUPER::new ( + @_, + ) +} - $self +sub configure { + my ($self, $x, $y, $w, $h) = @_; + + $self->{w} = $w; + $self->{h} = $h; +} + +sub check_size { + my ($self) = @_; + + $self->size_allocate ($self->{w}, $self->{h}) + if $self->{w}; +} + +sub size_request { + my ($self) = @_; + + ($self->{w}, $self->{h}) } sub size_allocate { my ($self, $w, $h) = @_; - $self->{w} = $w; - $self->{h} = $h; + my $old_w = $self->{old_w}; $self->{old_w} = $w; + my $old_h = $self->{old_h}; $self->{old_h} = $h; - $self->check_size; + CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h + if $old_w && $old_h && ($old_w != $w || $old_h != $h); + + for my $child ($self->children) { + my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; + + $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 + if exists $child->{req_x}; + + $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 + if exists $child->{req_y}; + + $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; + $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; + + $child->configure ($X, $Y, $W, $H); + } } -sub set_items { - my ($self, $items) = @_; - my @items = values %{$items}; - @items = sort { $a->{type} <=> $b->{type} } @items; +sub coord2local { + my ($self, $x, $y) = @_; - $self->{real_items} = \@items; + ($x, $y) +} - for my $item (@items) { - my $desc = $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} $item->{name_pl}"; - - $self->add (my $hb = new CFClient::UI::HBox); - - $hb->add (my $f = new CFClient::UI::Face - can_events => 0, - face => $item->{face}, - anim => $item->{anim}, - animspeed => $item->{animspeed}, - expand => 1 - ); - $hb->add (new CFClient::UI::Label text => $desc, expand => 1); - } - - $self->{max_pos} = (scalar @items) - 1; - - my $range = $self->{range}; - my $page = $self->{h} / 32; # waht information souce to use for face size? - # it should be configurable i guess... - $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; - $range->update; +sub coord2global { + my ($self, $x, $y) = @_; + + ($x, $y) } -sub size_request { +sub update { my ($self) = @_; - (100, 200) + + $self->check_size; + $::WANT_REFRESH++; } -sub set_range { - my ($self, $range) = @_; +sub add { + my ($self, @children) = @_; - $self->{range} = $range; - $range->connect (changed => sub { $self->update }); + for my $child (@children) { + $child->{toplevel} = 1; - my $page = $self->{h} / 32; # waht information souce to use for face size? - # it should be configurable i guess... + # integerise window positions + $child->{x} = int $child->{x}; + $child->{y} = int $child->{y}; + } - $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; - $range->update; + $self->SUPER::add (@children); +} - $self->update; +sub on_refresh { + my ($self, $id, $cb) = @_; + + $self->{refresh_hook}{$id} = $cb; } -sub _draw { +sub on_post_alloc { + my ($self, $id, $cb) = @_; + + $self->{post_alloc_hook}{$id} = $cb; +} + +sub draw { my ($self) = @_; - my ($w, $h) = ($self->{w}, $self->{h}); + while ($self->{refresh_hook}) { + $_->() + for values %{delete $self->{refresh_hook}}; + } - $self->{pos} = int $self->{range}{range}[0]; + if ($self->{check_size}) { + my @queue = ([], []); + + for (;;) { + if ($self->{check_size}) { + # heuristic: check containers last + push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ + for values %{delete $self->{check_size}} + } - my $y = 0; - my $cnt = 0; - my $hrem = $self->{h}; # horiz. remaining space + my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; - for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) { - my $chld = $self->{children}->[$i]; + my ($w, $h) = $widget->{user_w} && $widget->{user_h} + ? @$widget{qw(user_w user_h)} + : $widget->size_request; + + if (delete $widget->{force_alloc} + or $w != $widget->{req_w} or $h != $widget->{req_h}) { + Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# + + $widget->{req_w} = $w; + $widget->{req_h} = $h; - if ($hrem >= $chld->{h}) { - $chld->configure (0, $y, $chld->{w}, $chld->{h}); + $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; - $chld->show; - $chld->draw; + $widget->{parent}->check_size + if $widget->{parent}; + } + } + } - $hrem -= $chld->{h}; - $y += $chld->{h}; - } else { - last + while ($self->{size_alloc}) { + for (values %{delete $self->{size_alloc}}) { + my ($widget, $w, $h) = @$_; + + $w = 0 if $w < 0; + $h = 0 if $h < 0; + + $widget->{w} = $w; + $widget->{h} = $h; + $widget->size_allocate ($w, $h); + $widget->emit (size_allocate => $w, $h); } } -} + while ($self->{post_alloc_hook}) { + $_->() + for values %{delete $self->{post_alloc_hook}}; + } + + glViewport 0, 0, $::WIDTH, $::HEIGHT; + glClearColor +($::CFG->{fow_intensity}) x 3, 1; + glClear GL_COLOR_BUFFER_BIT; + + glMatrixMode GL_PROJECTION; + glLoadIdentity; + glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; + glMatrixMode GL_MODELVIEW; + glLoadIdentity; + + $self->_draw; +} ############################################################################# package CFClient::UI; $ROOT = new CFClient::UI::Root; -$TOOLTIP = new CFClient::UI::Tooltip; +$TOOLTIP = new CFClient::UI::Tooltip z => 900; 1