ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.198 by root, Fri May 12 02:08:52 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_text ($widget->{tooltip}); 29 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
31 } 41 }
32 42
33 return; 43 return;
34 } 44 }
35 } 45 }
… …
39 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
40} 50}
41 51
42# class methods for events 52# class methods for events
43sub feed_sdl_key_down_event { 53sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
55 if $FOCUS;
45} 56}
46 57
47sub feed_sdl_key_up_event { 58sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
60 if $FOCUS;
49} 61}
50 62
51sub feed_sdl_button_down_event { 63sub feed_sdl_button_down_event {
52 my ($ev) = @_; 64 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 73 check_tooltip;
62 } 74 }
63 75
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 77
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 78 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y);
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
67} 82}
68 83
69sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
70 my ($ev) = @_; 85 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
72 87
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 89
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 91
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 92 if ($GRAB) {
93 ($x, $y) = $GRAB->coord2local ($x, $y);
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
78 96
79 if (!$BUTTON_STATE) { 97 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 98 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 99 $grab->update if $grab;
82 $GRAB->update if $GRAB; 100 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 116 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 117
100 check_tooltip; 118 check_tooltip;
101 } 119 }
102 120
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
104} 125}
105 126
106# convert position array to integers 127# convert position array to integers
107sub harmonize { 128sub harmonize {
108 my ($vals) = @_; 129 my ($vals) = @_;
… …
126 147
127sub new { 148sub new {
128 my $class = shift; 149 my $class = shift;
129 150
130 my $self = bless { 151 my $self = bless {
131 x => 0, 152 x => 0,
132 y => 0, 153 y => 0,
133 z => 0, 154 z => 0,
134 can_events => 1, 155 can_events => 1,
135 @_ 156 @_
136 }, $class; 157 }, $class;
137 158
138 for (keys %$self) { 159 for (keys %$self) {
… …
160} 181}
161 182
162sub hide { 183sub hide {
163 my ($self) = @_; 184 my ($self) = @_;
164 185
165 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
166 188
167 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
168} 191}
169 192
170sub move { 193sub move {
171 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
172 195
… …
211 $self->{y} = $y; 234 $self->{y} = $y;
212 $self->update; 235 $self->update;
213 } 236 }
214 237
215 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 240 }
222} 241}
223 242
224sub size_allocate { 243sub size_allocate {
225 # nothing to be done 244 # nothing to be done
226} 245}
227 246
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
228sub set_max_size { 261sub set_max_size {
229 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
230 263
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
233}
234
235# return top left coordinates
236sub _topleft {
237 my ($self, $x, $y) = @_;
238
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 266}
241 267
242# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
243sub coord2local { 269sub coord2local {
244 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
245 271
246 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 273}
249 274
250# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
251sub coord2global { 276sub coord2global {
252 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
253 278
254 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 280}
257 281
258sub focus_in { 282sub focus_in {
259 my ($self) = @_; 283 my ($self) = @_;
260 284
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
322 glEnd; 346 glEnd;
323 glDisable GL_BLEND; 347 glDisable GL_BLEND;
324 } 348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
325} 363}
326 364
327sub _draw { 365sub _draw {
328 my ($self) = @_; 366 my ($self) = @_;
329 367
… …
344 382
345sub set_parent { 383sub set_parent {
346 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
347 385
348 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388
389 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size
391 unless exists $self->{req_w};
349} 392}
350 393
351sub check_size { 394sub check_size {
352 my ($self) = @_; 395 my ($self, $forced) = @_;
353 396
354 $self->{parent} 397 $self->{force_alloc} = 1 if $forced;
355 or return 1; 398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
356
357 my ($w, $h) = $self->{user_w} && $self->{user_h}
358 ? @$self{qw(user_w user_h)}
359 : $self->size_request;
360
361 if ($w != $self->{req_w} || $h != $self->{req_h}) {
362 $self->{req_w} = $w;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else {
373 0
374 }
375} 399}
376 400
377sub update { 401sub update {
378 my ($self) = @_; 402 my ($self) = @_;
379 403
… …
388} 412}
389 413
390sub emit { 414sub emit {
391 my ($self, $signal, @args) = @_; 415 my ($self, $signal, @args) = @_;
392 416
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 418}
397 419
398sub DESTROY { 420sub DESTROY {
399 my ($self) = @_; 421 my ($self) = @_;
400 422
… …
467sub new { 489sub new {
468 my ($class, %arg) = @_; 490 my ($class, %arg) = @_;
469 491
470 my $children = delete $arg{children} || []; 492 my $children = delete $arg{children} || [];
471 493
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 494 my $self = $class->SUPER::new (
495 children => [],
496 can_events => 0,
497 %arg,
498 );
473 $self->add ($_) for @$children; 499 $self->add ($_) for @$children;
474 500
475 $self 501 $self
476} 502}
477 503
478sub add { 504sub add {
479 my ($self, $child) = @_; 505 my ($self, @widgets) = @_;
480 506
481 $child->set_parent ($self); 507 $_->set_parent ($self)
508 for @widgets;
482 509
483 use sort 'stable'; 510 use sort 'stable';
484 511
485 $self->{children} = [ 512 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 513 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 514 @{$self->{children}}, @widgets
488 ]; 515 ];
489 516
490 $child->check_size; 517 $self->check_size (1);
518 $self->update;
519}
520
521sub children {
522 @{ $_[0]{children} }
491} 523}
492 524
493sub remove { 525sub remove {
494 my ($self, $child) = @_; 526 my ($self, $child) = @_;
495 527
496 delete $child->{parent}; 528 delete $child->{parent};
529 $child->hide;
497 530
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532
533 $self->check_size;
534 $self->update;
535}
536
537sub clear {
538 my ($self) = @_;
539
540 my $children = delete $self->{children};
541 $self->{children} = [];
542
543 for (@$children) {
544 delete $_->{parent};
545 $_->hide;
546 }
499 547
500 $self->check_size; 548 $self->check_size;
501 $self->update; 549 $self->update;
502} 550}
503 551
… …
581} 629}
582 630
583sub update { 631sub update {
584 my ($self) = @_; 632 my ($self) = @_;
585 633
586 # we want to do this delayed... 634 $ROOT->on_post_alloc ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 635 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 636}
600 637
601sub size_allocate { 638sub size_allocate {
602 my ($self, $w, $h) = @_; 639 my ($self, $w, $h) = @_;
603 640
604 $self->child->configure (0, 0, $w, $h); 641 $self->SUPER::size_allocate ($w, $h);
642 $self->update;
643}
605 644
645sub _render {
646 $_[0]{children}[0]->draw;
647}
648
649sub render_child {
650 my ($self) = @_;
651
652 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
653 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT;
655
606 $self->render_chld; 656 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 };
607} 665}
608 666
609sub _draw { 667sub _draw {
610 my ($self) = @_; 668 my ($self) = @_;
611 669
612 my ($w, $h) = ($self->w, $self->h); 670 my ($w, $h) = ($self->w, $self->h);
613 671
614 my $tex = $self->{texture} 672 my $tex = $self->{texture}
615 or return; 673 or return;
616 674
617 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 675 glEnable GL_TEXTURE_2D;
620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1;
621 678
622 $tex->draw_quad (0, 0, $w, $h); 679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623 680
624 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 681 glDisable GL_TEXTURE_2D;
626} 682}
627 683
628############################################################################# 684#############################################################################
629 685
630package CFClient::UI::ViewPort; 686package CFClient::UI::ViewPort;
631 687
632our @ISA = CFClient::UI::Window::; 688our @ISA = CFClient::UI::Window::;
633 689
634sub new { die }
635
636sub size_request { 690sub size_request {
637 my ($self) = @_; 691 my ($self) = @_;
638 692
639 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
641 695
642 @$self{qw(child_w child_h)} 696 @$self{qw(child_w child_h)}
643} 697}
644 698
645sub _draw { 699sub size_allocate {
646 my ($self) = @_; 700 my ($self, $w, $h) = @_;
647 701
648 $self->{children}[1]->draw; 702 $self->update;
649} 703}
650 704
705sub set_offset {
706 my ($self, $x, $y) = @_;
651 707
652############################################################################# 708 $self->{view_x} = int $x;
709 $self->{view_y} = int $y;
653 710
711 $self->update;
712}
713
714# hmm, this does not work for topleft of $self... but we should not ask for that
715sub coord2local {
716 my ($self, $x, $y) = @_;
717
718 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
719}
720
721sub coord2global {
722 my ($self, $x, $y) = @_;
723
724 $x = List::Util::min $self->{w}, $x - $self->{view_x};
725 $y = List::Util::min $self->{h}, $y - $self->{view_y};
726
727 $self->SUPER::coord2global ($x, $y)
728}
729
730sub find_widget {
731 my ($self, $x, $y) = @_;
732
733 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
734 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
735 ) {
736 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
737 } else {
738 $self->CFClient::UI::Base::find_widget ($x, $y)
739 }
740}
741
742sub _render {
743 my ($self) = @_;
744
745 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
746
747 $self->SUPER::_render;
748}
749
750#############################################################################
751
654package CFClient::UI::Frame; 752package CFClient::UI::ScrolledWindow;
655 753
656our @ISA = CFClient::UI::Bin::; 754our @ISA = CFClient::UI::HBox::;
657
658use CFClient::OpenGL;
659 755
660sub new { 756sub new {
661 my $class = shift; 757 my $class = shift;
662 758
759 my $self;
760
761 my $slider = new CFClient::UI::Slider
762 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
766 },
767 ;
768
663 my $self = $class->SUPER::new ( 769 $self = $class->SUPER::new (
664 bg => [1, 1, 1, 1], 770 vp => (new CFClient::UI::ViewPort),
665 border_bg => [1, 1, 1, 1], 771 slider => $slider,
666 border => 0.8,
667 @_ 772 @_,
668 ); 773 );
669 774
775 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{vp});
777 $self->add ($self->{slider});
778
670 $self 779 $self
671} 780}
672 781
673sub _draw { 782#TODO# update range on size_allocate depeneing on child
674 my ($self) = @_; 783# update viewport offset on scroll
675 784
676 my ($w, $h) = ($self->{w}, $self->{h}); 785#############################################################################
677 786
678 glEnable GL_BLEND; 787package CFClient::UI::Frame;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680 glEnable GL_TEXTURE_2D;
681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682 788
683# glBegin GL_QUADS; 789our @ISA = CFClient::UI::Bin::;
684# glColor 0, 0, 0, 0;
685# glVertex 0 , 0;
686# glVertex 0 , $h;
687# glVertex $w, $h;
688# glVertex $w, 0;
689# glEnd;
690 790
691 791use CFClient::OpenGL;
692 $self->child->draw;
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D;
695}
696 792
697############################################################################# 793#############################################################################
698 794
699package CFClient::UI::FancyFrame; 795package CFClient::UI::FancyFrame;
700 796
… …
710 my $class = shift; 806 my $class = shift;
711 807
712 # TODO: user_x, user_y, overwrite moveto? 808 # TODO: user_x, user_y, overwrite moveto?
713 809
714 my $self = $class->SUPER::new ( 810 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 811 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 812 border_bg => [1, 1, 1, 1],
717 border => 0.8, 813 border => 0.6,
718 can_events => 1, 814 can_events => 1,
719 @_ 815 @_
720 ); 816 );
721 817
722 $self->{title} &&= new CFClient::UI::Label 818 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 819 align => 0,
724 valign => 1, 820 valign => 1,
725 text => $self->{title}, 821 text => $self->{title},
726 fontsize => 1; 822 fontsize => $self->{border};
727 823
728 $self 824 $self
729} 825}
730 826
731sub border { 827sub border {
… …
756} 852}
757 853
758sub button_down { 854sub button_down {
759 my ($self, $ev, $x, $y) = @_; 855 my ($self, $ev, $x, $y) = @_;
760 856
857 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 858 my $border = $self->border;
762 859
763 if ($x < $self->{w} && $x >= $self->{w} - $border 860 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 861 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 862
863 if ($lr & $td) {
864 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 865 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 866 my ($bw, $bh) = ($self->{w}, $self->{h});
768 867
868 my $mx = $x < $border;
869 my $my = $y < $border;
870
769 $self->{motion} = sub { 871 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 872 my ($ev, $x, $y) = @_;
771 873
772 ($x, $y) = ($ev->{x}, $ev->{y}); 874 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy;
773 876
774 $self->{user_w} = $bw + $x - $ox; 877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 880 $self->check_size;
777 }; 881 };
778 882
779 } elsif ($x >= 0 && $x < $self->{w} 883 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 884 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 885 my ($bx, $by) = ($self->{x}, $self->{y});
784 886
785 $self->{motion} = sub { 887 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 888 my ($ev, $x, $y) = @_;
… …
809 my ($self) = @_; 911 my ($self) = @_;
810 912
811 my ($w, $h ) = ($self->{w}, $self->{h}); 913 my ($w, $h ) = ($self->{w}, $self->{h});
812 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813 915
814 glEnable GL_BLEND;
815 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816 glEnable GL_TEXTURE_2D; 916 glEnable GL_TEXTURE_2D;
817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818 918
819 my $border = $self->border; 919 my $border = $self->border;
820 920
821 glColor @{ $self->{border_bg} }; 921 glColor @{ $self->{border_bg} };
822 $tex[1]->draw_quad (0, 0, $w, $border); 922 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
826 926
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 928 my $bg = $tex[0];
828 929
829 # TODO: repeat texture not scale 930 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 931 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 932 my $rep_y = $ch / $bg->{h};
832 933
833 glColor @{ $self->{bg} }; 934 glColor @{ $self->{bg} };
834 935
835 $bg->{s} = $rep_x; 936 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 937 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 938 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 939 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 }
839 941
840 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND;
842 943
843 $self->{title}->draw if $self->{title}; 944 $self->{title}->draw if $self->{title};
945
844 $self->child->draw; 946 $self->child->draw;
845} 947}
846 948
847############################################################################# 949#############################################################################
848 950
… …
870 $self->{children}[$y][$x] = $child; 972 $self->{children}[$y][$x] = $child;
871 973
872 $child->check_size; 974 $child->check_size;
873} 975}
874 976
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979}
980
875# TODO: move to container class maybe? send childs a signal on removal? 981# TODO: move to container class maybe? send childs a signal on removal?
876sub clear { 982sub clear {
877 my ($self) = @_; 983 my ($self) = @_;
878 984
985 my @children = $self->children;
879 delete $self->{children}; 986 delete $self->{children};
987
988 for (@children) {
989 delete $_->{parent};
990 $_->hide;
991 }
992
880 $self->update; 993 $self->update;
881} 994}
882 995
883sub get_wh { 996sub get_wh {
884 my ($self) = @_; 997 my ($self) = @_;
… …
1061} 1174}
1062 1175
1063sub size_allocate { 1176sub size_allocate {
1064 my ($self, $w, $h) = @_; 1177 my ($self, $w, $h) = @_;
1065 1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
1066 my $children = $self->{children}; 1181 my $children = $self->{children};
1067 1182
1068 my @h = map $_->{req_h}, @$children; 1183 my @h = map $_->{req_h}, @$children;
1069 1184
1070 my $req_h = List::Util::sum @h; 1185 my $req_h = List::Util::sum @h;
… …
1107 1222
1108sub new { 1223sub new {
1109 my ($class, %arg) = @_; 1224 my ($class, %arg) = @_;
1110 1225
1111 my $self = $class->SUPER::new ( 1226 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1227 fg => [1, 1, 1],
1113 #font => default_font 1228 #font => default_font
1229 #text => initial text
1230 #markup => initial narkup
1231 layout => (new CFClient::Layout),
1114 fontsize => 1, 1232 fontsize => 1,
1115 text => "",
1116 align => -1, 1233 align => -1,
1117 valign => -1, 1234 valign => -1,
1118 padding => 2, 1235 padding => 2,
1119 layout => new CFClient::Layout,
1120 can_events => 0, 1236 can_events => 0,
1121 %arg 1237 %arg
1122 ); 1238 );
1123 1239
1124 if (exists $self->{template}) { 1240 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1241 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1242 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1243 $self->{template} = $layout;
1128 } 1244 }
1129 1245
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1246 if (exists $self->{markup}) {
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1247 $self->set_markup (delete $self->{markup});
1248 } else {
1249 $self->set_text (delete $self->{text});
1250 }
1132 1251
1133 $self 1252 $self
1134} 1253}
1135 1254
1136sub escape_text { 1255sub escape {
1137 local $_ = $_[1]; 1256 local $_ = $_[1];
1138 1257
1139 s/&/&amp;/g; 1258 s/&/&amp;/g;
1140 s/>/&gt;/g; 1259 s/>/&gt;/g;
1141 s/</&lt;/g; 1260 s/</&lt;/g;
1142 1261
1143 $_[1] 1262 $_[1]
1144} 1263}
1145 1264
1265sub update {
1266 my ($self) = @_;
1267
1268 delete $self->{texture};
1269 $self->SUPER::update;
1270}
1271
1146sub set_text { 1272sub set_text {
1147 my ($self, $text) = @_; 1273 my ($self, $text) = @_;
1148 1274
1275 return if $self->{text} eq "T$text";
1276 $self->{text} = "T$text";
1277
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1149 $self->{layout}->set_text ($text); 1279 $self->{layout}->set_text ($text);
1150 1280
1151 delete $self->{texture}; 1281 $self->update;
1152 $self->check_size; 1282 $self->check_size;
1153 $self->update;
1154} 1283}
1155 1284
1156sub set_markup { 1285sub set_markup {
1157 my ($self, $markup) = @_; 1286 my ($self, $markup) = @_;
1158 1287
1288 return if $self->{text} eq "M$markup";
1289 $self->{text} = "M$markup";
1290
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292
1293 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1159 $self->{layout}->set_markup ($markup); 1294 $self->{layout}->set_markup ($markup);
1160 1295
1161 delete $self->{texture}; 1296 $self->update;
1162 $self->check_size; 1297 $self->check_size;
1163 $self->update;
1164} 1298}
1165 1299
1166sub size_request { 1300sub size_request {
1167 my ($self) = @_; 1301 my ($self) = @_;
1168 1302
… …
1197sub set_fontsize { 1331sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1332 my ($self, $fontsize) = @_;
1199 1333
1200 $self->{fontsize} = $fontsize; 1334 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1335 delete $self->{texture};
1336
1337 $self->update;
1202 $self->check_size; 1338 $self->check_size;
1203 $self->update;
1204} 1339}
1205 1340
1206sub _draw { 1341sub _draw {
1207 my ($self) = @_; 1342 my ($self) = @_;
1208 1343
1209 my $tex = $self->{texture} ||= do { 1344 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1346 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $self->{layout}->set_width ($self->{w}); 1347 $self->{layout}->set_width ($self->{w});
1212 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1349
1213 new_from_layout CFClient::Texture $self->{layout} 1350 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5;
1355
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5;
1359
1360 $tex
1214 }; 1361 };
1215 1362
1216 glEnable GL_BLEND;
1217 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218 glEnable GL_TEXTURE_2D; 1363 glEnable GL_TEXTURE_2D;
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220 1365
1366 if ($tex->{format} == GL_ALPHA) {
1221 glColor @{$self->{fg}}; 1367 glColor @{$self->{fg}};
1222
1223 $self->{ox} = int (
1224 $self->{align} < 0 ? $self->{padding}
1225 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226 : ($self->{w} - $tex->{w}) * 0.5
1227 );
1228
1229 $self->{oy} = int (
1230 $self->{valign} < 0 ? $self->{padding}
1231 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232 : ($self->{h} - $tex->{h}) * 0.5
1233 );
1234
1235 $tex->draw_quad ($self->{ox}, $self->{oy}); 1368 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1369 } else {
1370 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1371 }
1236 1372
1237 glDisable GL_TEXTURE_2D; 1373 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1374}
1240 1375
1241############################################################################# 1376#############################################################################
1242 1377
1243package CFClient::UI::EntryBase; 1378package CFClient::UI::EntryBase;
… …
1248 1383
1249sub new { 1384sub new {
1250 my $class = shift; 1385 my $class = shift;
1251 1386
1252 $class->SUPER::new ( 1387 $class->SUPER::new (
1253 fg => [1, 1, 1], 1388 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1389 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1390 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1391 active_fg => [0, 0, 0],
1257 can_hover => 1, 1392 can_hover => 1,
1258 can_focus => 1, 1393 can_focus => 1,
1259 valign => 0, 1394 valign => 0,
1260 can_events => 1, 1395 can_events => 1,
1261 @_ 1396 @_
1262 ) 1397 )
1263} 1398}
1264 1399
… …
1278 $self->{layout}->set_text ("$text "); 1413 $self->{layout}->set_text ("$text ");
1279 1414
1280 $self->emit (changed => $self->{text}); 1415 $self->emit (changed => $self->{text});
1281} 1416}
1282 1417
1418sub set_text {
1419 my ($self, $text) = @_;
1420
1421 $self->{cursor} = length $text;
1422 $self->_set_text ($text);
1423 $self->check_size;
1424 $self->update;
1425}
1426
1283sub get_text { 1427sub get_text {
1284 $_[0]{text} 1428 $_[0]{text}
1285} 1429}
1286 1430
1287sub size_request { 1431sub size_request {
… …
1294 1438
1295sub size_allocate { 1439sub size_allocate {
1296 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1297 1441
1298 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1299}
1300
1301sub set_text {
1302 my ($self, $text) = @_;
1303
1304 $self->{cursor} = length $text;
1305 $self->_set_text ($text);
1306 $self->update;
1307} 1443}
1308 1444
1309sub key_down { 1445sub key_down {
1310 my ($self, $ev) = @_; 1446 my ($self, $ev) = @_;
1311 1447
… …
1418 my ($self, $ev) = @_; 1554 my ($self, $ev) = @_;
1419 1555
1420 my $sym = $ev->{sym}; 1556 my $sym = $ev->{sym};
1421 1557
1422 if ($sym == 13) { 1558 if ($sym == 13) {
1559 unshift @{$self->{history}},
1560 my $txt = $self->get_text;
1561 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1563 $self->emit (activate => $txt);
1424 $self->update; 1564 $self->update;
1565
1566 } elsif ($sym == CFClient::SDLK_UP) {
1567 if ($self->{history_pointer} < 0) {
1568 $self->{history_saveback} = $self->get_text;
1569 }
1570 if (@{$self->{history} || []} > 0) {
1571 $self->{history_pointer}++;
1572 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1573 $self->{history_pointer} = @{$self->{history} || []} - 1;
1574 }
1575 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1576 }
1577
1578 } elsif ($sym == CFClient::SDLK_DOWN) {
1579 $self->{history_pointer}--;
1580 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1581
1582 if ($self->{history_pointer} >= 0) {
1583 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1584 } else {
1585 $self->set_text ($self->{history_saveback});
1586 }
1425 1587
1426 } else { 1588 } else {
1427 $self->SUPER::key_down ($ev); 1589 $self->SUPER::key_down ($ev);
1428 } 1590 }
1429 1591
… …
1443 1605
1444sub new { 1606sub new {
1445 my $class = shift; 1607 my $class = shift;
1446 1608
1447 $class->SUPER::new ( 1609 $class->SUPER::new (
1448 padding => 4, 1610 padding => 4,
1449 fg => [1, 1, 1], 1611 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1612 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1613 active_fg => [0, 0, 1],
1452 can_hover => 1, 1614 can_hover => 1,
1453 align => 0, 1615 align => 0,
1454 valign => 0, 1616 valign => 0,
1455 can_events => 1, 1617 can_events => 1,
1456 @_ 1618 @_
1457 ) 1619 )
1458} 1620}
1459 1621
… …
1473 1635
1474 if ($GRAB == $self) { 1636 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg}; 1637 $self->{fg} = $self->{active_fg};
1476 } 1638 }
1477 1639
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1642 glColor 0, 0, 0, 1;
1483 1643
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1644 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1645
1486 glDisable GL_TEXTURE_2D; 1646 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1647
1489 $self->SUPER::_draw; 1648 $self->SUPER::_draw;
1490} 1649}
1491 1650
1492############################################################################# 1651#############################################################################
… …
1539 1698
1540 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1699 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1541 1700
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 1702
1544 glEnable GL_BLEND; 1703 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704
1545 glEnable GL_TEXTURE_2D; 1705 glEnable GL_TEXTURE_2D;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548 my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550 $tex->draw_quad (0, 0, $s, $s); 1706 $tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552 glDisable GL_TEXTURE_2D; 1707 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 1708}
1555 1709
1556############################################################################# 1710#############################################################################
1557 1711
1558package CFClient::UI::Image; 1712package CFClient::UI::Image;
… …
1601 glTranslate 0, -$self->{w}, 0; 1755 glTranslate 0, -$self->{w}, 0;
1602 1756
1603 ($w, $h) = ($h, $w); 1757 ($w, $h) = ($h, $w);
1604 } 1758 }
1605 1759
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 1760 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 1762
1611 $tex->draw_quad (0, 0, $w, $h); 1763 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 1764
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 1765 glDisable GL_TEXTURE_2D;
1615} 1766}
1616 1767
1617############################################################################# 1768#############################################################################
1618 1769
… …
1666} 1817}
1667 1818
1668sub set_max { 1819sub set_max {
1669 my ($self, $max) = @_; 1820 my ($self, $max) = @_;
1670 1821
1822 return if $self->{max_val} == $max;
1823
1671 $self->{max_val} = $max; 1824 $self->{max_val} = $max;
1825 $self->update;
1672} 1826}
1673 1827
1674sub set_value { 1828sub set_value {
1675 my ($self, $val, $max) = @_; 1829 my ($self, $val, $max) = @_;
1676 1830
1677 $self->set_max ($max) 1831 $self->set_max ($max)
1678 if defined $max; 1832 if defined $max;
1679 1833
1680 $max = $self->{max_val}; 1834 return if $self->{val} == $val;
1835
1681 $self->{val} = $val; 1836 $self->{val} = $val;
1682
1683 $self->update; 1837 $self->update;
1684} 1838}
1685 1839
1686sub _draw { 1840sub _draw {
1687 my ($self) = @_; 1841 my ($self) = @_;
… …
1750 1904
1751sub new { 1905sub new {
1752 my ($class, %arg) = @_; 1906 my ($class, %arg) = @_;
1753 1907
1754 my $self = $class->SUPER::new ( 1908 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1909 tooltip => $arg{type},
1910 can_hover => 1,
1756 can_events => 1, 1911 can_events => 1,
1757 can_hover => 1,
1758 %arg, 1912 %arg,
1759 ); 1913 );
1760 1914
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1915 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1762 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1916 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1770 1924
1771 $self->{value}->set_fontsize ($fsize); 1925 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 1926 $self->{max} ->set_fontsize ($fsize);
1773} 1927}
1774 1928
1929sub set_max {
1930 my ($self, $max) = @_;
1931
1932 $self->{gauge}->set_max ($max);
1933 $self->{max}->set_text ($max);
1934}
1935
1775sub set_value { 1936sub set_value {
1776 my ($self, $val, $max) = @_; 1937 my ($self, $val, $max) = @_;
1777 1938
1778 $self->set_max ($max) 1939 $self->set_max ($max)
1779 if defined $max; 1940 if defined $max;
1780 1941
1781 $self->{gauge}->set_value ($val, $max); 1942 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 1943 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 1944}
1791 1945
1792############################################################################# 1946#############################################################################
1793 1947
1794package CFClient::UI::Slider; 1948package CFClient::UI::Slider;
… …
1813 # TODO: calculations are off 1967 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 1968 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 1969 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 1970 active_fg => [0, 0, 0],
1817 range => [0, 0, 100, 10], 1971 range => [0, 0, 100, 10],
1818 req_w => 20, 1972 req_w => $::WIDTH / 80,
1819 req_h => 20, 1973 req_h => $::WIDTH / 80,
1820 vertical => 0, 1974 vertical => 0,
1821 can_hover => 1, 1975 can_hover => 1,
1822 inner_pad => 5, 1976 inner_pad => 5,
1823 @_ 1977 @_
1824 ); 1978 );
… …
1907 $page ||= 2; 2061 $page ||= 2;
1908 2062
1909 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1910 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1911 2065
1912 glEnable GL_BLEND;
1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1914 glEnable GL_TEXTURE_2D; 2066 glEnable GL_TEXTURE_2D;
1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916 2068
1917 # draw background 2069 # draw background
1918 $tex[1]->draw_quad (0, 0, $w, $h); 2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1919 2071
1920 # draw handle 2072 # draw handle
1921 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2073 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1922 2074
1923 glDisable GL_BLEND;
1924 glDisable GL_TEXTURE_2D; 2075 glDisable GL_TEXTURE_2D;
1925} 2076}
1926 2077
1927############################################################################# 2078#############################################################################
1928 2079
… …
1934 2085
1935sub new { 2086sub new {
1936 my $class = shift; 2087 my $class = shift;
1937 2088
1938 my $self = $class->SUPER::new ( 2089 my $self = $class->SUPER::new (
1939 fontsize => 1, 2090 fontsize => 1,
2091 can_events => 0,
1940 #font => default_font 2092 #font => default_font
1941 @_, 2093 @_,
1942 2094
1943 layout => (new CFClient::Layout), 2095 layout => (new CFClient::Layout 1),
1944 par => [], 2096 par => [],
1945 height => 0, 2097 height => 0,
1946 children => [ 2098 children => [
1947 (new CFClient::UI::Empty expand => 1), 2099 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2100 (new CFClient::UI::Slider vertical => 1),
1949 ], 2101 ],
1950 ); 2102 );
1951 2103
1952 $self->{children}[1]->connect (changed => sub { 2104 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2105
1956 $self 2106 $self
1957} 2107}
1958 2108
1959sub set_fontsize { 2109sub set_fontsize {
… …
1967 my ($self, $text) = @_; 2117 my ($self, $text) = @_;
1968 2118
1969 my $layout = $self->{layout}; 2119 my $layout = $self->{layout};
1970 2120
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w}); 2122 $layout->set_width ($self->{children}[0]{w});
1973 $layout->set_text ($text); 2123 $layout->set_markup ($text);
1974 2124
1975 ($layout->size)[1] 2125 ($layout->size)[1]
1976} 2126}
1977 2127
1978sub reflow { 2128sub reflow {
… …
2016 2166
2017 return unless $self->{h} > 0; 2167 return unless $self->{h} > 0;
2018 2168
2019 delete $self->{texture}; 2169 delete $self->{texture};
2020 2170
2021 $ROOT->on_refresh ($self, sub { 2171 $ROOT->on_post_alloc ($self, sub {
2022 if (delete $self->{need_reflow}) { 2172 if (delete $self->{need_reflow}) {
2023 my $height = 0; 2173 my $height = 0;
2024 2174
2025 $height += $_->[0] = $self->text_height ($_->[2]) 2175 $height += $_->[0] = $self->text_height ($_->[2])
2026 for @{$self->{par}}; 2176 for @{$self->{par}};
… …
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2031 2181
2032 delete $self->{texture}; 2182 delete $self->{texture};
2033 } 2183 }
2034 2184
2035 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2185 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2036 glClearColor 0, 0, 0, 1; 2186 glClearColor 0, 0, 0, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2187 glClear GL_COLOR_BUFFER_BIT;
2038 2188
2039 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D; 2189 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2191
2044 my $top = int $self->{children}[1]{range}[0]; 2192 my $top = int $self->{children}[1]{range}[0];
2045 2193
… …
2054 2202
2055 for my $par (@{$self->{par}}) { 2203 for my $par (@{$self->{par}}) {
2056 my $h = $par->[0]; 2204 my $h = $par->[0];
2057 2205
2058 if ($y0 < $y + $h && $y < $y1) { 2206 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] });
2059 $layout->set_text ($par->[2]); 2208 $layout->set_markup ($par->[2]);
2060 2209
2061 glColor @{ $par->[1] };
2062 my ($W, $H) = $layout->size; 2210 my ($W, $H) = $layout->size;
2063 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2211 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2064 } 2212 }
2065 2213
2066 $y += $h; 2214 $y += $h;
2067 } 2215 }
2068 2216
2069 glDisable GL_TEXTURE_2D; 2217 glDisable GL_TEXTURE_2D;
2070 glDisable GL_BLEND;
2071 }; 2218 };
2072 }); 2219 });
2073} 2220}
2074 2221
2075sub _draw { 2222sub _draw {
2076 my ($self) = @_; 2223 my ($self) = @_;
2077 2224
2078 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2225 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2081 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2227 glColor 1, 1, 1, 1;
2228 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2082 glDisable GL_TEXTURE_2D; 2229 glDisable GL_TEXTURE_2D;
2083 }
2084 2230
2085 $self->{children}[1]->draw; 2231 $self->{children}[1]->draw;
2086 2232
2087} 2233}
2088 2234
… …
2136 2282
2137sub new { 2283sub new {
2138 my $class = shift; 2284 my $class = shift;
2139 2285
2140 my $self = $class->SUPER::new ( 2286 my $self = $class->SUPER::new (
2141 state => 0, 2287 state => 0,
2142 connect_activate => \&toggle_flopper, 2288 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2289 @_
2145 ); 2290 );
2146 2291
2147 if ($self->{state}) { 2292 if ($self->{state}) {
2148 $self->{state} = 0; 2293 $self->{state} = 0;
… …
2183 @_, 2328 @_,
2184 can_events => 0, 2329 can_events => 0,
2185 ) 2330 )
2186} 2331}
2187 2332
2188sub set_text { 2333sub set_tooltip_from {
2189 my ($self, $text) = @_; 2334 my ($self, $widget) = @_;
2190 2335
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2336 $self->add (new CFClient::UI::Label
2192 $self->{label}->set_text ($text); 2337 markup => $widget->{tooltip},
2193 $self->add ($self->{label}); 2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8,
2340 fg => [0, 0, 0, 1],
2341 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 );
2194} 2343}
2195 2344
2196sub size_request { 2345sub size_request {
2197 my ($self) = @_; 2346 my ($self) = @_;
2198 2347
2199 $self->child->set_max_size ($::WIDTH * 0.3);
2200
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2348 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2349
2203 ($w + 4, $h + 4) 2350 ($w + 4, $h + 4)
2204} 2351}
2205 2352
2353sub size_allocate {
2354 my ($self, $w, $h) = @_;
2355
2356 $self->SUPER::size_allocate ($w - 4, $h - 4);
2357}
2358
2206sub _draw { 2359sub _draw {
2207 my ($self) = @_; 2360 my ($self) = @_;
2208 2361
2209 glPushMatrix;
2210 glTranslate 0.375, 0.375; 2362 glTranslate 0.375, 0.375;
2211 2363
2212 my ($w, $h) = @$self{qw(w h)}; 2364 my ($w, $h) = @$self{qw(w h)};
2213 2365
2214 glColor 1, 0.8, 0.4; 2366 glColor 1, 0.8, 0.4;
… …
2225 glVertex 0 , $h; 2377 glVertex 0 , $h;
2226 glVertex $w, $h; 2378 glVertex $w, $h;
2227 glVertex $w, 0; 2379 glVertex $w, 0;
2228 glEnd; 2380 glEnd;
2229 2381
2230 glPopMatrix; 2382 glTranslate 2 - 0.375, 2 - 0.375;
2231
2232 glTranslate 2, 2;
2233 $self->SUPER::_draw; 2383 $self->SUPER::_draw;
2234} 2384}
2235 2385
2236############################################################################# 2386#############################################################################
2237 2387
2388package CFClient::UI::Face;
2389
2390our @ISA = CFClient::UI::Base::;
2391
2392use CFClient::OpenGL;
2393
2394sub new {
2395 my $class = shift;
2396
2397 $class->SUPER::new (
2398 aspect => 1,
2399 @_,
2400 )
2401}
2402
2403sub size_request {
2404 (32, 8)
2405}
2406
2407sub _draw {
2408 my ($self) = @_;
2409
2410 return unless $::CONN;#d# manage and cache textures differently
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2412
2413 # TODO animation
2414 if ($tex) {
2415 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D;
2420 }
2421}
2422
2423#############################################################################
2424
2425package CFClient::UI::InventoryItem;
2426
2427our @ISA = CFClient::UI::HBox::;
2428
2429sub new {
2430 my $class = shift;
2431
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new (
2442 can_hover => 1,
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488
2489#############################################################################
2490
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_,
2501 );
2502
2503 $self
2504}
2505
2506sub set_items {
2507 my ($self, $items) = @_;
2508
2509 $self->{scrolled}->clear;
2510 return unless $items;
2511
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2513
2514 $self->{real_items} = \@items;
2515
2516 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2522 }
2523
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525}
2526
2527sub size_request {
2528 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h});
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Menu;
2535
2536our @ISA = CFClient::UI::FancyFrame::;
2537
2538use CFClient::OpenGL;
2539
2540sub new {
2541 my $class = shift;
2542
2543 my $self = $class->SUPER::new (
2544 items => [],
2545 z => 100,
2546 @_,
2547 );
2548
2549 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2550
2551 for my $item (@{ $self->{items} }) {
2552 my ($widget, $cb) = @$item;
2553
2554 # handle various types of items, only text for now
2555 if (!ref $widget) {
2556 $widget = new CFClient::UI::Label
2557 can_hover => 1,
2558 can_events => 1,
2559 text => $widget;
2560 }
2561
2562 $self->{item}{$widget} = $item;
2563
2564 $self->{vbox}->add ($widget);
2565 }
2566
2567 $self
2568}
2569
2570# popup given the event (must be a mouse button down event currently)
2571sub popup {
2572 my ($self, $ev) = @_;
2573
2574 $self->emit ("popdown");
2575
2576 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self;
2578 $self->{button} = $ev->{button};
2579
2580 $self->show;
2581 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2582}
2583
2584sub mouse_motion {
2585 my ($self, $ev, $x, $y) = @_;
2586
2587 # TODO: should use vbox->find_widget or so
2588 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2589 $self->{hover} = $self->{item}{$HOVER};
2590}
2591
2592sub button_up {
2593 my ($self, $ev, $x, $y) = @_;
2594
2595 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB;
2597 $self->hide;
2598
2599 $self->emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover};
2601 }
2602}
2603
2604#############################################################################
2605
2606package CFClient::UI::Statusbox;
2607
2608our @ISA = CFClient::UI::VBox::;
2609
2610sub reorder {
2611 my ($self) = @_;
2612 my $NOW = time;
2613
2614 while (my ($k, $v) = each %{ $self->{item} }) {
2615 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2616 }
2617
2618 my @widgets;
2619
2620 my @items = sort {
2621 $a->{pri} <=> $b->{pri}
2622 or $b->{id} <=> $a->{id}
2623 } values %{ $self->{item} };
2624
2625 my $count = 10 + 1;
2626 for my $item (@items) {
2627 last unless --$count;
2628
2629 push @widgets, $item->{label} ||= do {
2630 # TODO: doesn't handle markup well (read as: at all)
2631 my $short = $item->{count} > 1
2632 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text};
2634
2635 for ($short) {
2636 s/^\s+//;
2637 s/\012.*/…/s;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 }
2641
2642 new CFClient::UI::Label
2643 markup => $short,
2644 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize},
2648 color => $item->{color},
2649 can_events => 1,
2650 can_hover => 1
2651 };
2652 }
2653
2654 $self->clear;
2655 $self->SUPER::add (reverse @widgets);
2656}
2657
2658sub add {
2659 my ($self, $text, %arg) = @_;
2660
2661 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//;
2663
2664 my $timeout = time + ((delete $arg{timeout}) || 60);
2665
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667
2668 if (my $item = $self->{item}{$group}) {
2669 if ($item->{text} eq $text) {
2670 $item->{count}++;
2671 } else {
2672 $item->{count} = 1;
2673 $item->{text} = $item->{tooltip} = $text;
2674 }
2675 $item->{id} = ++$self->{id};
2676 $item->{timeout} = $timeout;
2677 delete $item->{label};
2678 } else {
2679 $self->{item}{$group} = {
2680 id => ++$self->{id},
2681 text => $text,
2682 timeout => $timeout,
2683 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0,
2687 count => 1,
2688 %arg,
2689 };
2690 }
2691
2692 $self->reorder;
2693}
2694
2695#############################################################################
2696
2238package CFClient::UI::Root; 2697package CFClient::UI::Root;
2239 2698
2240our @ISA = CFClient::UI::Container::; 2699our @ISA = CFClient::UI::Container::;
2241 2700
2242use CFClient::OpenGL; 2701use CFClient::OpenGL;
2243 2702
2244sub check_size { 2703sub new {
2245 my ($self) = @_; 2704 my $class = shift;
2246 2705
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2706 $class->SUPER::new (
2248} 2707 @_,
2249 2708 )
2250sub size_request {
2251 ($::WIDTH, $::HEIGHT)
2252} 2709}
2253 2710
2254sub configure { 2711sub configure {
2255 my ($self, $x, $y, $w, $h) = @_; 2712 my ($self, $x, $y, $w, $h) = @_;
2256 2713
2257 $self->SUPER::configure ($x, $y, $w, $h); 2714 $self->{w} = $w;
2715 $self->{h} = $h;
2716}
2258 2717
2718sub check_size {
2719 my ($self) = @_;
2720
2721 $self->size_allocate ($self->{w}, $self->{h})
2722 if $self->{w};
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727
2728 ($self->{w}, $self->{h})
2729}
2730
2731sub size_allocate {
2732 my ($self, $w, $h) = @_;
2733
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749
2259 for my $child (@{$self->{children}}) { 2750 for my $child ($self->children) {
2260 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2751 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2261 2752
2262 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2753 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2263 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2754 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2264 $child->configure ($X, $Y, $W,$H); 2755 $child->configure ($X, $Y, $W, $H);
2265 } 2756 }
2266}
2267 2757
2268sub _topleft { 2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760}
2761
2762sub coord2local {
2269 my ($self, $x, $y) = @_; 2763 my ($self, $x, $y) = @_;
2270 2764
2271 ($x, $y) 2765 ($x, $y)
2272} 2766}
2273 2767
2768sub coord2global {
2769 my ($self, $x, $y) = @_;
2770
2771 ($x, $y)
2772}
2773
2274sub update { 2774sub update {
2275 my ($self) = @_; 2775 my ($self) = @_;
2276 2776
2277 $self->check_size; 2777 $self->check_size;
2278 ::refresh (); 2778 $::WANT_REFRESH++;
2279} 2779}
2280 2780
2281sub add { 2781sub add {
2282 my ($self, $child) = @_; 2782 my ($self, $child) = @_;
2283 2783
2284 # integerize window positions 2784 # integerise window positions
2285 $child->{x} = int $child->{x}; 2785 $child->{x} = int $child->{x};
2286 $child->{y} = int $child->{y}; 2786 $child->{y} = int $child->{y};
2287 2787
2288 $self->SUPER::add ($child); 2788 $self->SUPER::add ($child);
2289} 2789}
… …
2292 my ($self, $id, $cb) = @_; 2792 my ($self, $id, $cb) = @_;
2293 2793
2294 $self->{refresh_hook}{$id} = $cb; 2794 $self->{refresh_hook}{$id} = $cb;
2295} 2795}
2296 2796
2797sub on_post_alloc {
2798 my ($self, $id, $cb) = @_;
2799
2800 $self->{post_alloc_hook}{$id} = $cb;
2801}
2802
2297sub draw { 2803sub draw {
2298 my ($self) = @_; 2804 my ($self) = @_;
2299 2805
2300 while (my $rcb = delete $self->{refresh_hook}) { 2806 while ($self->{refresh_hook}) {
2301 $_->() for values %$rcb; 2807 $_->()
2808 for values %{delete $self->{refresh_hook}};
2809 }
2810
2811 if ($self->{check_size}) {
2812 my @queue = ([], []);
2813
2814 for (;;) {
2815 if ($self->{check_size}) {
2816 # heuristic: check containers last
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2818 for values %{delete $self->{check_size}}
2819 }
2820
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2822
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2824 ? @$widget{qw(user_w user_h)}
2825 : $widget->size_request;
2826
2827 if (delete $widget->{force_alloc}
2828 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2830
2831 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h;
2833
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2835
2836 $widget->{parent}->check_size
2837 if $widget->{parent};
2838 }
2839 }
2840 }
2841
2842 while ($self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) {
2844 my ($widget, $w, $h) = @$_;
2845
2846 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0;
2848
2849 $widget->{w} = $w;
2850 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h);
2852 $widget->emit (size_allocate => $w, $h);
2853 }
2854 }
2855
2856 while ($self->{post_alloc_hook}) {
2857 $_->()
2858 for values %{delete $self->{post_alloc_hook}};
2302 } 2859 }
2303 2860
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2861 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 2863 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines