--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/14 02:03:11 1.97 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/15 19:35:20 1.115 @@ -9,7 +9,7 @@ our ($FOCUS, $HOVER, $GRAB); # various widgets -our $TOPLEVEL; +our $ROOT; our $BUTTON_STATE; # class methods for events @@ -26,7 +26,7 @@ my ($x, $y) = ($ev->motion_x, $ev->motion_y); if (!$BUTTON_STATE) { - my $widget = $TOPLEVEL->find_widget ($x, $y); + my $widget = $ROOT->find_widget ($x, $y); $GRAB = $widget; $GRAB->update if $GRAB; @@ -34,18 +34,18 @@ $BUTTON_STATE |= 1 << ($ev->button - 1); - $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; + $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; } sub feed_sdl_button_up_event { my ($ev) = @_; my ($x, $y) = ($ev->motion_x, $ev->motion_y); - my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); + my $widget = $GRAB || $ROOT->find_widget ($x, $y); $BUTTON_STATE &= ~(1 << ($ev->button - 1)); - $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; + $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; if (!$BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; @@ -58,16 +58,29 @@ my ($ev) = @_; my ($x, $y) = ($ev->motion_x, $ev->motion_y); - my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); + my $widget = $GRAB || $ROOT->find_widget ($x, $y); if ($widget != $HOVER) { my $hover = $HOVER; $HOVER = $widget; - $hover->update if $hover; - $HOVER->update if $HOVER; + $hover->update if $hover && $hover->{can_hover}; + $HOVER->update if $HOVER && $HOVER->{can_hover}; } - $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; + $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; +} + +# convert position array to integers +sub harmonize { + my ($vals) = @_; + + my $rem = 0; + + for ($vals) { + my $i = int $_ + $rem; + $rem += $_ - $i; + $_ = $i; + } } ############################################################################# @@ -118,13 +131,13 @@ sub _size_allocate { my ($self, $x, $y, $w, $h) = @_; - $self->{x} = int $x; - $self->{y} = int $y; + $self->{x} = $x; + $self->{y} = $y; return unless $self->{w} != $w || $self->{h} != $h; - $self->{w} = int $w; - $self->{h} = int $h; + $self->{w} = $w; + $self->{h} = $h; 1 } @@ -135,11 +148,27 @@ $self->_size_allocate ($x, $y, $w, $h); } +# return top left coordinates +sub _topleft { + my ($self, $x, $y) = @_; + + $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); +} + # translate global coordinates to local coordinate system -sub translate { +sub coord2local { + my ($self, $x, $y) = @_; + + my ($X, $Y) = $self->_topleft; + ($x - $X, $y - $Y) +} + +# translate local coordinates to global coordinate system +sub coord2global { my ($self, $x, $y) = @_; - $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); + my ($X, $Y) = $self->_topleft; + ($x + $X, $y + $Y) } sub focus_in { @@ -222,14 +251,9 @@ } sub set_parent { - my ($self, $par) = @_; - - $self->{parent} = $par; - Scalar::Util::weaken $self->{parent}; -} + my ($self, $parent) = @_; -sub get_parent { - $_[0]->{parent} + Scalar::Util::weaken ($self->{parent} = $parent); } sub update { @@ -328,13 +352,15 @@ } sub add { - my ($self, $chld) = @_; + my ($self, $child) = @_; - $chld->set_parent ($self); + $child->set_parent ($self); + + use sort 'stable'; $self->{children} = [ sort { $a->{z} <=> $b->{z} } - @{$self->{children}}, $chld + @{$self->{children}}, $child ]; $self->{w} = $self->{h} = -1; @@ -441,10 +467,11 @@ sub render_chld { my ($self) = @_; - $self->{texture} = - CFClient::Texture->new_from_opengl ( - $self->{w}, $self->{h}, sub { $self->child->draw } - ); + $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + glClearColor 0, 0, 0, 1; + glClear GL_COLOR_BUFFER_BIT; + $self->child->draw; + }; } sub size_allocate { @@ -641,6 +668,10 @@ my $rep_y = $ch / $bg->{h}; glColor @{ $self->{bg} }; + + $bg->{s} = $rep_x; + $bg->{t} = $rep_y; + $bg->{wrap_mode} = 1; $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); glDisable GL_TEXTURE_2D; @@ -669,15 +700,23 @@ } sub add { - my ($self, $x, $y, $chld) = @_; + my ($self, $x, $y, $child) = @_; - $self->{children}[$y][$x] = $chld; - $chld->set_parent ($self); + $child->set_parent ($self); + $self->{children}[$y][$x] = $child; $self->{w} = $self->{h} = -1; $self->update; } +# TODO: move to container class maybe? send childs a signal on removal? +sub clear { + my ($self) = @_; + + delete $self->{children}; + $self->update; +} + sub get_wh { my ($self) = @_; @@ -730,6 +769,9 @@ $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; + CFClient::UI::harmonize $ws; + CFClient::UI::harmonize $hs; + my $y; for my $r (0 .. $#{$self->{children}}) { @@ -826,6 +868,8 @@ } } + CFClient::UI::harmonize \@h; + my $y = 0; for (0 .. $#$children) { my $child = $children->[$_]; @@ -880,6 +924,8 @@ } } + CFClient::UI::harmonize \@h; + my $y = 0; for (0 .. $#$children) { my $child = $children->[$_]; @@ -902,12 +948,12 @@ my ($class, %arg) = @_; my $self = $class->SUPER::new ( - fg => [1, 1, 1], - height => $::FONTSIZE, - text => "", - align => -1, - padding => 2, - layout => new CFClient::Layout, + fg => [1, 1, 1], + fontsize => $::FONTSIZE, + text => "", + align => -1, + padding => 2, + layout => new CFClient::Layout, %arg ); @@ -947,7 +993,7 @@ my ($self) = @_; $self->{layout}->set_width; - $self->{layout}->set_height ($self->{height}); + $self->{layout}->set_height ($self->{fontsize}); my ($w, $h) = $self->{layout}->size; ( @@ -976,14 +1022,14 @@ my $tex = $self->{texture} ||= do { $self->{layout}->set_width ($self->{w}); - $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); + $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); new_from_layout CFClient::Texture $self->{layout} }; 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; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor @{$self->{fg}}; @@ -992,8 +1038,7 @@ : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} : ($self->{w} - $tex->{w}) * 0.5; - glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; - $tex->draw_quad (0, 0); + $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); glDisable GL_TEXTURE_2D; glDisable GL_BLEND; @@ -1025,11 +1070,13 @@ sub _set_text { my ($self, $text) = @_; + my $old_text = $self->{text}; + $self->{last_activity} = $::NOW; $self->{text} = $text; $self->{layout}->set_width ($self->{w}); - $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); + $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); $text =~ s/./*/g if $self->{hidden}; @@ -1039,6 +1086,9 @@ utf8::encode $text; @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); + + $self->emit (changed => $self->{text}) # XXX: is this the right place to do this? + if $old_text ne $self->{text}; } sub size_request { @@ -1087,6 +1137,8 @@ $self->{cursor} = 0; } elsif ($sym == SDLK_END) { $self->{cursor} = length $text; + } elsif ($sym == SDLK_ESCAPE) { + $self->emit ('escape'); } elsif ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; } @@ -1158,6 +1210,28 @@ } } +package CFClient::UI::LineEntry; + +our @ISA = CFClient::UI::Entry::; + +use SDL; +use SDL::OpenGL; + +sub key_down { + my ($self, $ev) = @_; + + my $sym = $ev->key_sym; + + if ($sym == SDLK_RETURN) { + $self->emit (activate => $self->get_text); + $self->update; + + } else { + $self->SUPER::key_down ($ev); + } + +} + ############################################################################# package CFClient::UI::Button; @@ -1224,6 +1298,10 @@ our @ISA = CFClient::UI::DrawBG::; +my @tex = + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + qw(c1_checkbox_bg.png c1_checkbox_active.png); + use SDL; use SDL::OpenGL; @@ -1270,24 +1348,19 @@ glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; - + glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; - glBegin GL_LINE_LOOP; - glVertex 0 , 0; - glVertex 0 , $s; - glVertex $s, $s; - glVertex $s, 0; - glEnd; + glEnable GL_BLEND; + glEnable GL_TEXTURE_2D; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - if ($self->{state}) { - glBegin GL_LINES; - glVertex 0 , 0; - glVertex $s, $s; - glVertex $s, 0; - glVertex 0 , $s; - glEnd; - } + my $tex = $self->{state} ? $tex[1] : $tex[0]; + + $tex->draw_quad (0, 0, $s, $s); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; } ############################################################################# @@ -1300,6 +1373,10 @@ our @ISA = CFClient::UI::DrawBG::; +my @tex = + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + qw(s1_slider.png s1_slider_bg.png); + sub new { my $class = shift; @@ -1316,6 +1393,7 @@ req_h => 13, vertical => 0, can_hover => 1, + inner_pad => 5, @_ ); @@ -1346,7 +1424,11 @@ my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); - $x = $x * ($hi - $lo) / $w + $lo; + my $inner_pad_px = $self->_calc_inner_pad_px ($w); + my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right + + $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; @@ -1356,6 +1438,14 @@ } } +# 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 _draw { my ($self) = @_; @@ -1377,39 +1467,35 @@ my ($value, $lo, $hi, $page) = @{$self->{range}}; - $page = int $page * $w / ($hi - $lo); - $value = int +($value - $lo) * $w / ($hi - $lo); + $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; - glColor @$fg; - glBegin GL_LINES; - glVertex 0, 0; glVertex 0, $h; - glVertex $w - 1, 0; glVertex $w - 1, $h; - glVertex 0, $h * 0.5; glVertex $w, $h * 0.5; - glEnd; + my $knob_a = $inner_pad_px + ($value - $page * 0.5); + my $knob_b = $inner_pad_px + ($value + $page * 0.5); - my $knob_a = $value - $page * 0.5; - my $knob_b = $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; - glBegin GL_QUADS; - glColor @$fg; - glVertex $knob_a, 0; - glVertex $knob_a, $h; - glVertex $knob_b, $h; - glVertex $knob_b, 0; - - if ($knob_a < $knob_b - 2) { - glColor @$bg; - glVertex $knob_a + 1, 1; - glVertex $knob_a + 1, $h - 1; - glVertex $knob_b - 1, $h - 1; - glVertex $knob_b - 1, 1; - } - glEnd; + # draw background + $tex[1]->draw_quad (0, 0, $w, $h); + + # draw handle + $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); + + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; } ############################################################################# @@ -1424,59 +1510,158 @@ my $class = shift; my $self = $class->SUPER::new ( - par => [], + req_w => $::WIDTH / 6, + req_h => $::HEIGHT / 6, + fontsize => $::FONTSIZE, @_, + + layout => (new CFClient::Layout), + par => [], + height => 0, children => [ (new CFClient::UI::Empty expand => 1), (new CFClient::UI::Slider vertical => 1), ], ); + $self->{children}[1]->connect (changed => sub { + $self->update; + }); + $self } +sub set_fontsize { + my ($self, $fontsize) = @_; + + $self->{fontsize} = $fontsize; + $self->reflow; +} + +sub text_height { + my ($self, $text) = @_; + + my $layout = $self->{layout}; + + $layout->set_height ($self->{fontsize}); + $layout->set_width ($self->{w}); + $layout->set_text ($text); + + ($layout->size)[1] +} + +sub reflow { + my ($self) = @_; + + $self->{need_reflow}++; + $self->update; +} + +sub size_request { + my ($self) = @_; + + ($self->{req_w}, $self->{req_h}) +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->SUPER::size_allocate ($x, $y, $w, $h); + + $self->{layout}->set_height ($self->{fontsize}); + $self->{layout}->set_width ($self->{w}); + + $self->reflow; +} + sub add_paragraph { my ($self, $color, $text) = @_; - push @{$self->{par}}, [$color, $text]; - my $count = scalar @{$self->{par}}; - $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; + #TODO: intelligently "reformat" paragraph + + my $height = $self->text_height ($text); + + $self->{height} += $height; + + push @{$self->{par}}, [$height, $color, $text]; + + $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; $self->{children}[1]->update; } -sub _draw { +sub update { my ($self) = @_; - my $par = $self->{par}; + $self->SUPER::update; - my $bottom = (scalar @$par) - 1; + return unless $self->{h} > 0; - my $w = $self->{children}[0]{w}; - my $y = $self->{h}; + delete $self->{texture}; - 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; + $ROOT->on_refresh ($self, sub { + if (delete $self->{need_reflow}) { + my $height = 0; + + $height += $_->[0] = $self->text_height ($_->[2]) + for @{$self->{par}}; + + $self->{height} = $height; + + $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; + + delete $self->{texture}; + } + + $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + glClearColor 0, 0, 0, 1; + 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; + + my $top = int $self->{children}[1]{range}[0]; + + my $y0 = $top; + my $y1 = $top + $self->{h}; + + my $y = 0; + + my $layout = $self->{layout}; - # TODO: everything! - while ($y > 0 && $bottom >= 0) { - my $par = $par->[$bottom--]; - - my $layout = new CFClient::Layout; - - $layout->set_height ($::FONTSIZE); - $layout->set_width ($w); - $layout->set_text ($par->[1]); - my $tex = new_from_layout CFClient::Texture $layout; - $y -= $tex->{h}; + for my $par (@{$self->{par}}) { + my $h = $par->[0]; - glColor @{ $par->[0] }; - $tex->draw_quad (0, $y); + if ($y0 < $y + $h && $y < $y1) { + $layout->set_text ($par->[2]); + + glColor @{ $par->[1] }; + my ($W, $H) = $layout->size; + CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); + } + + $y += $h; + } + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + }; + }); +} + +sub _draw { + my ($self) = @_; + + if ($self->{texture}) { + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); + glDisable GL_TEXTURE_2D; } - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + $self->{children}[1]->draw; + } ############################################################################# @@ -1510,6 +1695,40 @@ sub key_up { } +sub button_down { + my ($self, $ev, $x, $y) = @_; + + $self->focus_in; + + if ($ev->button == 2) { + my ($ox, $oy) = ($ev->button_x, $ev->button_y); + my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); + + $self->{motion} = sub { + my ($ev, $x, $y) = @_; + + ($x, $y) = ($ev->motion_x, $ev->motion_y); + + $::CFG->{map_shift_x} = $bw + $x - $ox; + $::CFG->{map_shift_y} = $bh + $y - $oy; + + $self->update; + }; + } +} + +sub button_up { + my ($self, $ev, $x, $y) = @_; + + delete $self->{motion}; +} + +sub mouse_motion { + my ($self, $ev, $x, $y) = @_; + + $self->{motion}->($ev, $x, $y) if $self->{motion}; +} + sub size_request { ( 1 + 32 * int $::WIDTH / 32, @@ -1527,15 +1746,19 @@ sub draw { my ($self) = @_; - $self->{need_update}++;#d# if (delete $self->{need_update}) { glNewList $self->{list}, GL_COMPILE; - my $sw = int $::WIDTH / 32; - my $sh = int $::HEIGHT / 32; - if ($::MAP) { - my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); + my $sw = int $::WIDTH / 32; + my $sh = int $::HEIGHT / 32; + + my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; + my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; + + glTranslate $sx0 - 32, $sy0 - 32, 0; + + my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); if ($::CFG->{fow_enable}) { if ($::CFG->{fow_smooth}) { # smooth fog of war @@ -1563,6 +1786,7 @@ glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 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; @@ -1572,12 +1796,36 @@ glDisable GL_TEXTURE_2D; glDisable GL_BLEND; } + + # HACK BEGIN + { + glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove + my ($w, $h) = (250, 250); + + 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; + + CFClient::Texture->new ( + w => $w, + h => $h, + data => $::MAP->mapmap ($w, $h), + type => GL_UNSIGNED_INT_8_8_8_8_REV + )->draw_quad (100, 100); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + } + # HACK END } glEndList; } + glPushMatrix; glCallList $self->{list}; + glPopMatrix; if ($FOCUS != $self) { glColor 64/255, 64/255, 64/255; @@ -1619,6 +1867,10 @@ $::CONN->user_send ("command stay fire"); } elsif ($sym == SDLK_a) { $::CONN->user_send ("command apply"); + } elsif ($sym == SDLK_QUOTE) { + $self->emit ('activate_console'); + } elsif ($sym == SDLK_SLASH) { + $self->emit ('activate_console' => '/'); } elsif (exists $DIR{$sym}) { if ($mod & KMOD_SHIFT) { $self->{shft}++; @@ -1716,22 +1968,25 @@ # TODO: use animation if ($self->{state} = !$self->{state}) { - $CFClient::UI::TOPLEVEL->add ($self->{other}); - $self->{other}->move ( - ($::WIDTH - $self->{other}{w}) * 0.5, - ($::HEIGHT - $self->{other}{h}) * 0.5, - ); + $CFClient::UI::ROOT->add ($self->{other}); + $self->{other}->move ($self->coord2global (0, $self->{h})); + $self->emit ("open"); } else { - $CFClient::UI::TOPLEVEL->remove ($self->{other}); + $CFClient::UI::ROOT->remove ($self->{other}); + $self->emit ("close"); } + + $self->emit (changed => $self->{state}); } ############################################################################# -package CFClient::UI::Toplevel; +package CFClient::UI::Root; our @ISA = CFClient::UI::Container::; +use SDL::OpenGL; + sub size_request { ($::WIDTH, $::HEIGHT) } @@ -1745,7 +2000,7 @@ for @{$self->{children}}; } -sub translate { +sub _topleft { my ($self, $x, $y) = @_; ($x, $y) @@ -1766,9 +2021,29 @@ $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); } +sub on_refresh { + my ($self, $id, $cb) = @_; + + $self->{refresh_hook}{$id} = $cb; +} + sub draw { my ($self) = @_; + while (my $rcb = delete $self->{refresh_hook}) { + $_->() for values %$rcb; + } + + 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; } @@ -1776,7 +2051,7 @@ package CFClient::UI; -$TOPLEVEL = new CFClient::UI::Toplevel; +$ROOT = new CFClient::UI::Root; 1