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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.201 by root, Sat May 13 23:17:49 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_markup ($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
… …
358 382
359sub set_parent { 383sub set_parent {
360 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
361 385
362 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
363} 391}
364 392
365sub check_size { 393sub check_size {
366 my ($self) = @_; 394 my ($self, $forced) = @_;
367 395
368 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
369 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
370
371 my ($w, $h) = $self->{user_w} && $self->{user_h}
372 ? @$self{qw(user_w user_h)}
373 : $self->size_request;
374
375 if ($w != $self->{req_w} || $h != $self->{req_h}) {
376 $self->{req_w} = $w;
377 $self->{req_h} = $h;
378
379 $self->{parent}->check_size
380 or $self->size_allocate (
381 (List::Util::max $self->{w}, $w),
382 (List::Util::max $self->{h}, $h),
383 );
384
385 1
386 } else {
387 0
388 }
389} 398}
390 399
391sub update { 400sub update {
392 my ($self) = @_; 401 my ($self) = @_;
393 402
… …
402} 411}
403 412
404sub emit { 413sub emit {
405 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
406 415
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 417}
411 418
412sub DESTROY { 419sub DESTROY {
413 my ($self) = @_; 420 my ($self) = @_;
414 421
… …
481sub new { 488sub new {
482 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
483 490
484 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
485 492
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 493 my $self = $class->SUPER::new (
494 children => [],
495 can_events => 0,
496 %arg,
497 );
487 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
488 499
489 $self 500 $self
490} 501}
491 502
492sub add { 503sub add {
493 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
494 505
495 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
496 508
497 use sort 'stable'; 509 use sort 'stable';
498 510
499 $self->{children} = [ 511 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
502 ]; 514 ];
503 515
504 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
505} 522}
506 523
507sub remove { 524sub remove {
508 my ($self, $child) = @_; 525 my ($self, $child) = @_;
509 526
510 delete $child->{parent}; 527 delete $child->{parent};
528 $child->hide;
511 529
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 531
514 $self->check_size; 532 $self->check_size;
515 $self->update; 533 $self->update;
516} 534}
517 535
518sub clear { 536sub clear {
519 my ($self) = @_; 537 my ($self) = @_;
520 538
521 delete $_->{parent} 539 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 540 $self->{children} = [];
541
542 for (@$children) {
543 delete $_->{parent};
544 $_->hide;
545 }
546
547 $self->check_size;
548 $self->update;
525} 549}
526 550
527sub find_widget { 551sub find_widget {
528 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
529 553
… …
604} 628}
605 629
606sub update { 630sub update {
607 my ($self) = @_; 631 my ($self) = @_;
608 632
609 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 634 $self->SUPER::update;
612}
613
614sub render_chld {
615 my ($self) = @_;
616
617 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618 glClearColor 0, 0, 0, 1;
619 glClear GL_COLOR_BUFFER_BIT;
620 $self->child->draw;
621 };
622} 635}
623 636
624sub size_allocate { 637sub size_allocate {
625 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
626 639
627 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
628 643
644sub _render {
645 $_[0]{children}[0]->draw;
646}
647
648sub render_child {
649 my ($self) = @_;
650
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT;
654
629 $self->render_chld; 655 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 };
630} 664}
631 665
632sub _draw { 666sub _draw {
633 my ($self) = @_; 667 my ($self) = @_;
634 668
635 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
636 670
637 my $tex = $self->{texture} 671 my $tex = $self->{texture}
638 or return; 672 or return;
639 673
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1;
644 677
645 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 679
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
649} 681}
650 682
651############################################################################# 683#############################################################################
652 684
653package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
654 686
655our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
656 688
657sub new { die }
658
659sub size_request { 689sub size_request {
660 my ($self) = @_; 690 my ($self) = @_;
661 691
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
664 694
665 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
666} 696}
667 697
668sub _draw { 698sub size_allocate {
669 my ($self) = @_; 699 my ($self, $w, $h) = @_;
670 700
671 $self->{children}[1]->draw; 701 $self->update;
672} 702}
673 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
674 706
675############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
676 709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
677package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
678 752
679our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
680
681use CFClient::OpenGL;
682 754
683sub new { 755sub new {
684 my $class = shift; 756 my $class = shift;
685 757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
686 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
687 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
688 border_bg => [1, 1, 1, 1], 770 slider => $slider,
689 border => 0.8,
690 @_ 771 @_,
691 ); 772 );
692 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
693 $self 778 $self
694} 779}
695 780
781#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll
783
784#############################################################################
785
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use CFClient::OpenGL;
791
792sub new {
793 my $class = shift;
794
795 $class->SUPER::new (
796 bg => undef,
797 @_,
798 )
799}
800
696sub _draw { 801sub _draw {
697 my ($self) = @_; 802 my ($self) = @_;
698 803
699 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
700 806
701 glEnable GL_BLEND; 807 glEnable GL_BLEND;
702 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
703 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705 810
706# glBegin GL_QUADS; 811 glBegin GL_QUADS;
707# glColor 0, 0, 0, 0;
708# glVertex 0 , 0; 812 glVertex 0 , 0;
709# glVertex 0 , $h; 813 glVertex 0 , $h;
710# glVertex $w, $h; 814 glVertex $w, $h;
711# glVertex $w, 0; 815 glVertex $w, 0;
712# glEnd; 816 glEnd;
713 817
714
715 $self->child->draw;
716 glDisable GL_BLEND; 818 glDisable GL_BLEND;
717 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
718} 822}
719 823
720############################################################################# 824#############################################################################
721 825
722package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
733 my $class = shift; 837 my $class = shift;
734 838
735 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
736 840
737 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
740 border => 0.8, 844 border => 0.6,
741 can_events => 1, 845 can_events => 1,
742 @_ 846 @_
743 ); 847 );
744 848
745 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 850 align => 0,
747 valign => 1, 851 valign => 1,
748 text => $self->{title}, 852 text => $self->{title},
749 fontsize => 1; 853 fontsize => $self->{border};
750 854
751 $self 855 $self
752} 856}
753 857
754sub border { 858sub border {
… …
779} 883}
780 884
781sub button_down { 885sub button_down {
782 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
783 887
888 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 889 my $border = $self->border;
785 890
786 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
791 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
792 $self->{motion} = sub { 902 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
794 904
795 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
796 907
797 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
799 $self->check_size; 911 $self->check_size;
800 }; 912 };
801 913
802 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
807 917
808 $self->{motion} = sub { 918 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
832 my ($self) = @_; 942 my ($self) = @_;
833 943
834 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
835 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
836 946
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841 949
842 my $border = $self->border; 950 my $border = $self->border;
843 951
844 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
845 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
849 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850 my $bg = $tex[0]; 959 my $bg = $tex[0];
851 960
852 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
854 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
855 964
856 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
857 966
858 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
862 972
863 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND;
865 974
866 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
867 $self->child->draw; 977 $self->child->draw;
868} 978}
869 979
870############################################################################# 980#############################################################################
871 981
… …
893 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
894 1004
895 $child->check_size; 1005 $child->check_size;
896} 1006}
897 1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
898# TODO: move to container class maybe? send childs a signal on removal? 1012# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 1013sub clear {
900 my ($self) = @_; 1014 my ($self) = @_;
901 1015
1016 my @children = $self->children;
902 delete $self->{children}; 1017 delete $self->{children};
1018
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023
903 $self->update; 1024 $self->update;
904} 1025}
905 1026
906sub get_wh { 1027sub get_wh {
907 my ($self) = @_; 1028 my ($self) = @_;
… …
1084} 1205}
1085 1206
1086sub size_allocate { 1207sub size_allocate {
1087 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1088 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1089 my $children = $self->{children}; 1212 my $children = $self->{children};
1090 1213
1091 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1092 1215
1093 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1130 1253
1131sub new { 1254sub new {
1132 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1133 1256
1134 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1136 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1137 fontsize => 1, 1263 fontsize => 1,
1138 text => "",
1139 align => -1, 1264 align => -1,
1140 valign => -1, 1265 valign => -1,
1141 padding => 2, 1266 padding => 2,
1142 layout => new CFClient::Layout,
1143 can_events => 0, 1267 can_events => 0,
1144 %arg 1268 %arg
1145 ); 1269 );
1146 1270
1147 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1274 $self->{template} = $layout;
1151 } 1275 }
1152 1276
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1154 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1278 $self->set_markup (delete $self->{markup});
1279 } else {
1280 $self->set_text (delete $self->{text});
1281 }
1155 1282
1156 $self 1283 $self
1157} 1284}
1158 1285
1159sub escape { 1286sub escape {
… …
1164 s/</&lt;/g; 1291 s/</&lt;/g;
1165 1292
1166 $_[1] 1293 $_[1]
1167} 1294}
1168 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1169sub set_text { 1303sub set_text {
1170 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1171 1305
1306 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text";
1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1172 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1173 1311
1174 delete $self->{texture}; 1312 $self->update;
1175 $self->check_size; 1313 $self->check_size;
1176 $self->update;
1177} 1314}
1178 1315
1179sub set_markup { 1316sub set_markup {
1180 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1181 1318
1319 return if $self->{text} eq "M$markup";
1320 $self->{text} = "M$markup";
1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1182 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1183 1326
1184 delete $self->{texture}; 1327 $self->update;
1185 $self->check_size; 1328 $self->check_size;
1186 $self->update;
1187} 1329}
1188 1330
1189sub size_request { 1331sub size_request {
1190 my ($self) = @_; 1332 my ($self) = @_;
1191 1333
… …
1220sub set_fontsize { 1362sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1222 1364
1223 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1225 $self->check_size; 1369 $self->check_size;
1226 $self->update;
1227} 1370}
1228 1371
1229sub _draw { 1372sub _draw {
1230 my ($self) = @_; 1373 my ($self) = @_;
1231 1374
1232 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1380
1236 new_from_layout CFClient::Texture $self->{layout} 1381 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1237 }; 1392 };
1238 1393
1239 glEnable GL_BLEND;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1396
1397 if ($tex->{format} == GL_ALPHA) {
1244 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1245
1246 $self->{ox} = int (
1247 $self->{align} < 0 ? $self->{padding}
1248 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1249 : ($self->{w} - $tex->{w}) * 0.5
1250 );
1251
1252 $self->{oy} = int (
1253 $self->{valign} < 0 ? $self->{padding}
1254 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1255 : ($self->{h} - $tex->{h}) * 0.5
1256 );
1257
1258 $tex->draw_quad ($self->{ox}, $self->{oy}); 1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1259 1403
1260 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1405}
1263 1406
1264############################################################################# 1407#############################################################################
1265 1408
1266package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1271 1414
1272sub new { 1415sub new {
1273 my $class = shift; 1416 my $class = shift;
1274 1417
1275 $class->SUPER::new ( 1418 $class->SUPER::new (
1276 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1280 can_hover => 1, 1423 can_hover => 1,
1281 can_focus => 1, 1424 can_focus => 1,
1282 valign => 0, 1425 valign => 0,
1283 can_events => 1, 1426 can_events => 1,
1284 @_ 1427 @_
1285 ) 1428 )
1286} 1429}
1287 1430
… …
1301 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1302 1445
1303 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1304} 1447}
1305 1448
1449sub set_text {
1450 my ($self, $text) = @_;
1451
1452 $self->{cursor} = length $text;
1453 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456}
1457
1306sub get_text { 1458sub get_text {
1307 $_[0]{text} 1459 $_[0]{text}
1308} 1460}
1309 1461
1310sub size_request { 1462sub size_request {
… …
1317 1469
1318sub size_allocate { 1470sub size_allocate {
1319 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1320 1472
1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1322}
1323
1324sub set_text {
1325 my ($self, $text) = @_;
1326
1327 $self->{cursor} = length $text;
1328 $self->_set_text ($text);
1329 $self->update;
1330} 1474}
1331 1475
1332sub key_down { 1476sub key_down {
1333 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1334 1478
… …
1336 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1337 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1338 1482
1339 my $text = $self->get_text; 1483 my $text = $self->get_text;
1340 1484
1341 if ($sym == 8) { 1485 if ($uni == 8) {
1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1344 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1345 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1346 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1347 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1348 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1349 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1350 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1351 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1352 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1353 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1354 $self->emit ('escape'); 1498 $self->emit ('escape');
1355 } elsif ($uni) { 1499 } elsif ($uni) {
1356 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1357 } 1501 }
1358 1502
… …
1441 my ($self, $ev) = @_; 1585 my ($self, $ev) = @_;
1442 1586
1443 my $sym = $ev->{sym}; 1587 my $sym = $ev->{sym};
1444 1588
1445 if ($sym == 13) { 1589 if ($sym == 13) {
1590 unshift @{$self->{history}},
1591 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1594 $self->emit (activate => $txt);
1447 $self->update; 1595 $self->update;
1596
1597 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text;
1600 }
1601 if (@{$self->{history} || []} > 0) {
1602 $self->{history_pointer}++;
1603 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1604 $self->{history_pointer} = @{$self->{history} || []} - 1;
1605 }
1606 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1607 }
1608
1609 } elsif ($sym == CFClient::SDLK_DOWN) {
1610 $self->{history_pointer}--;
1611 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1612
1613 if ($self->{history_pointer} >= 0) {
1614 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1615 } else {
1616 $self->set_text ($self->{history_saveback});
1617 }
1448 1618
1449 } else { 1619 } else {
1450 $self->SUPER::key_down ($ev); 1620 $self->SUPER::key_down ($ev);
1451 } 1621 }
1452 1622
… …
1466 1636
1467sub new { 1637sub new {
1468 my $class = shift; 1638 my $class = shift;
1469 1639
1470 $class->SUPER::new ( 1640 $class->SUPER::new (
1471 padding => 4, 1641 padding => 4,
1472 fg => [1, 1, 1], 1642 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1643 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1644 active_fg => [0, 0, 1],
1475 can_hover => 1, 1645 can_hover => 1,
1476 align => 0, 1646 align => 0,
1477 valign => 0, 1647 valign => 0,
1478 can_events => 1, 1648 can_events => 1,
1479 @_ 1649 @_
1480 ) 1650 )
1481} 1651}
1482 1652
… …
1496 1666
1497 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1499 } 1669 }
1500 1670
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1506 1674
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1676
1509 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1678
1512 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1513} 1680}
1514 1681
1515############################################################################# 1682#############################################################################
… …
1562 1729
1563 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1564 1731
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 1733
1567 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1568 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570
1571 my $tex = $self->{state} ? $tex[1] : $tex[0];
1572
1573 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 1739}
1578 1740
1579############################################################################# 1741#############################################################################
1580 1742
1581package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1625 1787
1626 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1627 } 1789 }
1628 1790
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 1793
1634 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 1795
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1638} 1797}
1639 1798
1640############################################################################# 1799#############################################################################
1641 1800
… …
1689} 1848}
1690 1849
1691sub set_max { 1850sub set_max {
1692 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1693 1852
1853 return if $self->{max_val} == $max;
1854
1694 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1695} 1857}
1696 1858
1697sub set_value { 1859sub set_value {
1698 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1699 1861
1700 $self->set_max ($max) 1862 $self->set_max ($max)
1701 if defined $max; 1863 if defined $max;
1702 1864
1703 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1704 $self->{val} = $val; 1867 $self->{val} = $val;
1705
1706 $self->update; 1868 $self->update;
1707} 1869}
1708 1870
1709sub _draw { 1871sub _draw {
1710 my ($self) = @_; 1872 my ($self) = @_;
… …
1773 1935
1774sub new { 1936sub new {
1775 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1776 1938
1777 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 1940 tooltip => $arg{type},
1941 can_hover => 1,
1779 can_events => 1, 1942 can_events => 1,
1780 can_hover => 1,
1781 %arg, 1943 %arg,
1782 ); 1944 );
1783 1945
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1946 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1947 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 1955
1794 $self->{value}->set_fontsize ($fsize); 1956 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 1957 $self->{max} ->set_fontsize ($fsize);
1796} 1958}
1797 1959
1960sub set_max {
1961 my ($self, $max) = @_;
1962
1963 $self->{gauge}->set_max ($max);
1964 $self->{max}->set_text ($max);
1965}
1966
1798sub set_value { 1967sub set_value {
1799 my ($self, $val, $max) = @_; 1968 my ($self, $val, $max) = @_;
1800 1969
1801 $self->set_max ($max) 1970 $self->set_max ($max)
1802 if defined $max; 1971 if defined $max;
1803 1972
1804 $self->{gauge}->set_value ($val, $max); 1973 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 1974 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813} 1975}
1814 1976
1815############################################################################# 1977#############################################################################
1816 1978
1817package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
… …
1836 # TODO: calculations are off 1998 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1840 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1841 req_w => 20, 2003 req_w => $::WIDTH / 80,
1842 req_h => 20, 2004 req_h => $::WIDTH / 80,
1843 vertical => 0, 2005 vertical => 0,
1844 can_hover => 1, 2006 can_hover => 1,
1845 inner_pad => 5, 2007 inner_pad => 5,
1846 @_ 2008 @_
1847 ); 2009 );
… …
1930 $page ||= 2; 2092 $page ||= 2;
1931 2093
1932 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934 2096
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2099
1940 # draw background 2100 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1942 2102
1943 # draw handle 2103 # draw handle
1944 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1945 2105
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
1948} 2107}
1949 2108
1950############################################################################# 2109#############################################################################
1951 2110
… …
1957 2116
1958sub new { 2117sub new {
1959 my $class = shift; 2118 my $class = shift;
1960 2119
1961 my $self = $class->SUPER::new ( 2120 my $self = $class->SUPER::new (
1962 fontsize => 1, 2121 fontsize => 1,
2122 can_events => 0,
1963 #font => default_font 2123 #font => default_font
1964 @_, 2124 @_,
1965 2125
1966 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
1967 par => [], 2127 par => [],
1968 height => 0, 2128 height => 0,
1969 children => [ 2129 children => [
1970 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
1972 ], 2132 ],
1973 ); 2133 );
1974 2134
1975 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2136
1979 $self 2137 $self
1980} 2138}
1981 2139
1982sub set_fontsize { 2140sub set_fontsize {
… …
1990 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1991 2149
1992 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
1993 2151
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
1996 $layout->set_text ($text); 2154 $layout->set_markup ($text);
1997 2155
1998 ($layout->size)[1] 2156 ($layout->size)[1]
1999} 2157}
2000 2158
2001sub reflow { 2159sub reflow {
… …
2039 2197
2040 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2041 2199
2042 delete $self->{texture}; 2200 delete $self->{texture};
2043 2201
2044 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2045 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2046 my $height = 0; 2204 my $height = 0;
2047 2205
2048 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2049 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054 2212
2055 delete $self->{texture}; 2213 delete $self->{texture};
2056 } 2214 }
2057 2215
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2061 2219
2062 glEnable GL_BLEND;
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066 2222
2067 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2068 2224
… …
2077 2233
2078 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2235 my $h = $par->[0];
2080 2236
2081 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2082 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2083 2240
2084 glColor @{ $par->[1] };
2085 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2086 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2087 } 2243 }
2088 2244
2089 $y += $h; 2245 $y += $h;
2090 } 2246 }
2091 2247
2092 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND;
2094 }; 2249 };
2095 }); 2250 });
2096} 2251}
2097 2252
2098sub _draw { 2253sub _draw {
2099 my ($self) = @_; 2254 my ($self) = @_;
2100 2255
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2258 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2106 }
2107 2261
2108 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2109 2263
2110} 2264}
2111 2265
… …
2159 2313
2160sub new { 2314sub new {
2161 my $class = shift; 2315 my $class = shift;
2162 2316
2163 my $self = $class->SUPER::new ( 2317 my $self = $class->SUPER::new (
2164 state => 0, 2318 state => 0,
2165 connect_activate => \&toggle_flopper, 2319 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2320 @_
2168 ); 2321 );
2169 2322
2170 if ($self->{state}) { 2323 if ($self->{state}) {
2171 $self->{state} = 0; 2324 $self->{state} = 0;
… …
2206 @_, 2359 @_,
2207 can_events => 0, 2360 can_events => 0,
2208 ) 2361 )
2209} 2362}
2210 2363
2211sub set_markup { 2364sub set_tooltip_from {
2212 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2213 2366
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2215 $self->{label}->set_markup ($text); 2368 markup => $widget->{tooltip},
2216 $self->add ($self->{label}); 2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8,
2371 fg => [0, 0, 0, 1],
2372 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 );
2217} 2374}
2218 2375
2219sub size_request { 2376sub size_request {
2220 my ($self) = @_; 2377 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2378
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2380
2226 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2227} 2382}
… …
2233} 2388}
2234 2389
2235sub _draw { 2390sub _draw {
2236 my ($self) = @_; 2391 my ($self) = @_;
2237 2392
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2240 2394
2241 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2242 2396
2243 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2254 glVertex 0 , $h; 2408 glVertex 0 , $h;
2255 glVertex $w, $h; 2409 glVertex $w, $h;
2256 glVertex $w, 0; 2410 glVertex $w, 0;
2257 glEnd; 2411 glEnd;
2258 2412
2259 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2260
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2263} 2415}
2264 2416
2265############################################################################# 2417#############################################################################
2266 2418
… …
2281 2433
2282sub size_request { 2434sub size_request {
2283 (32, 8) 2435 (32, 8)
2284} 2436}
2285 2437
2286sub draw { 2438sub _draw {
2287 my ($self) = @_; 2439 my ($self) = @_;
2288 2440
2441 return unless $::CONN;#d# manage and cache textures differently
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290 2443
2444 # TODO animation
2291 if ($tex) { 2445 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2446 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2448 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 } 2451 }
2452}
2453
2454#############################################################################
2455
2456package CFClient::UI::InventoryItem;
2457
2458our @ISA = CFClient::UI::HBox::;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort {
2544 ($a->{type} <=> $b->{type})
2545 or ($a->{name} cmp $b->{name})
2546 } @$items;
2547
2548 $self->{real_items} = \@items;
2549
2550 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2556 }
2557
2558 $self->{scrolled}->add (@items);
2559
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566}
2567
2568#############################################################################
2569
2570package CFClient::UI::Menu;
2571
2572our @ISA = CFClient::UI::FancyFrame::;
2573
2574use CFClient::OpenGL;
2575
2576sub new {
2577 my $class = shift;
2578
2579 my $self = $class->SUPER::new (
2580 items => [],
2581 z => 100,
2582 @_,
2583 );
2584
2585 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2586
2587 for my $item (@{ $self->{items} }) {
2588 my ($widget, $cb) = @$item;
2589
2590 # handle various types of items, only text for now
2591 if (!ref $widget) {
2592 $widget = new CFClient::UI::Label
2593 can_hover => 1,
2594 can_events => 1,
2595 text => $widget;
2596 }
2597
2598 $self->{item}{$widget} = $item;
2599
2600 $self->{vbox}->add ($widget);
2601 }
2602
2603 $self
2604}
2605
2606# popup given the event (must be a mouse button down event currently)
2607sub popup {
2608 my ($self, $ev) = @_;
2609
2610 $self->emit ("popdown");
2611
2612 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self;
2614 $self->{button} = $ev->{button};
2615
2616 $self->show;
2617 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2618}
2619
2620sub mouse_motion {
2621 my ($self, $ev, $x, $y) = @_;
2622
2623 # TODO: should use vbox->find_widget or so
2624 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2625 $self->{hover} = $self->{item}{$HOVER};
2626}
2627
2628sub button_up {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB;
2633 $self->hide;
2634
2635 $self->emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover};
2637 }
2638}
2639
2640#############################################################################
2641
2642package CFClient::UI::Statusbox;
2643
2644our @ISA = CFClient::UI::VBox::;
2645
2646sub reorder {
2647 my ($self) = @_;
2648 my $NOW = time;
2649
2650 while (my ($k, $v) = each %{ $self->{item} }) {
2651 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2652 }
2653
2654 my @widgets;
2655
2656 my @items = sort {
2657 $a->{pri} <=> $b->{pri}
2658 or $b->{id} <=> $a->{id}
2659 } values %{ $self->{item} };
2660
2661 my $count = 10 + 1;
2662 for my $item (@items) {
2663 last unless --$count;
2664
2665 push @widgets, $item->{label} ||= do {
2666 # TODO: doesn't handle markup well (read as: at all)
2667 my $short = $item->{count} > 1
2668 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text};
2670
2671 for ($short) {
2672 s/^\s+//;
2673 s/\012.*/…/s;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 }
2677
2678 new CFClient::UI::Label
2679 markup => $short,
2680 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize},
2684 color => $item->{color},
2685 can_events => 1,
2686 can_hover => 1
2687 };
2688 }
2689
2690 $self->clear;
2691 $self->SUPER::add (reverse @widgets);
2692}
2693
2694sub add {
2695 my ($self, $text, %arg) = @_;
2696
2697 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//;
2699
2700 my $timeout = time + ((delete $arg{timeout}) || 60);
2701
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703
2704 if (my $item = $self->{item}{$group}) {
2705 if ($item->{text} eq $text) {
2706 $item->{count}++;
2707 } else {
2708 $item->{count} = 1;
2709 $item->{text} = $item->{tooltip} = $text;
2710 }
2711 $item->{id} = ++$self->{id};
2712 $item->{timeout} = $timeout;
2713 delete $item->{label};
2714 } else {
2715 $self->{item}{$group} = {
2716 id => ++$self->{id},
2717 text => $text,
2718 timeout => $timeout,
2719 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0,
2723 count => 1,
2724 %arg,
2725 };
2726 }
2727
2728 $self->reorder;
2301} 2729}
2302 2730
2303############################################################################# 2731#############################################################################
2304 2732
2305package CFClient::UI::Root; 2733package CFClient::UI::Root;
2306 2734
2307our @ISA = CFClient::UI::Container::; 2735our @ISA = CFClient::UI::Container::;
2308 2736
2309use CFClient::OpenGL; 2737use CFClient::OpenGL;
2310 2738
2311sub check_size { 2739sub new {
2312 my ($self) = @_; 2740 my $class = shift;
2313 2741
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2742 $class->SUPER::new (
2315} 2743 @_,
2316 2744 )
2317sub size_request {
2318 ($::WIDTH, $::HEIGHT)
2319} 2745}
2320 2746
2321sub configure { 2747sub configure {
2322 my ($self, $x, $y, $w, $h) = @_; 2748 my ($self, $x, $y, $w, $h) = @_;
2323 2749
2324 $self->SUPER::configure ($x, $y, $w, $h); 2750 $self->{w} = $w;
2751 $self->{h} = $h;
2752}
2325 2753
2754sub check_size {
2755 my ($self) = @_;
2756
2757 $self->size_allocate ($self->{w}, $self->{h})
2758 if $self->{w};
2759}
2760
2761sub size_request {
2762 my ($self) = @_;
2763
2764 ($self->{w}, $self->{h})
2765}
2766
2767sub size_allocate {
2768 my ($self, $w, $h) = @_;
2769
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785
2326 for my $child (@{$self->{children}}) { 2786 for my $child ($self->children) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2787 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328 2788
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2789 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2331 $child->configure ($X, $Y, $W,$H); 2791 $child->configure ($X, $Y, $W, $H);
2332 } 2792 }
2333}
2334 2793
2335sub _topleft { 2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796}
2797
2798sub coord2local {
2336 my ($self, $x, $y) = @_; 2799 my ($self, $x, $y) = @_;
2337 2800
2338 ($x, $y) 2801 ($x, $y)
2339} 2802}
2340 2803
2804sub coord2global {
2805 my ($self, $x, $y) = @_;
2806
2807 ($x, $y)
2808}
2809
2341sub update { 2810sub update {
2342 my ($self) = @_; 2811 my ($self) = @_;
2343 2812
2344 $self->check_size; 2813 $self->check_size;
2345 ::refresh (); 2814 $::WANT_REFRESH++;
2346} 2815}
2347 2816
2348sub add { 2817sub add {
2349 my ($self, $child) = @_; 2818 my ($self, $child) = @_;
2350 2819
2351 # integerize window positions 2820 # integerise window positions
2352 $child->{x} = int $child->{x}; 2821 $child->{x} = int $child->{x};
2353 $child->{y} = int $child->{y}; 2822 $child->{y} = int $child->{y};
2354 2823
2355 $self->SUPER::add ($child); 2824 $self->SUPER::add ($child);
2356} 2825}
… …
2359 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2360 2829
2361 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2362} 2831}
2363 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2364sub draw { 2839sub draw {
2365 my ($self) = @_; 2840 my ($self) = @_;
2366 2841
2367 while (my $rcb = delete $self->{refresh_hook}) { 2842 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 2843 $_->()
2844 for values %{delete $self->{refresh_hook}};
2845 }
2846
2847 if ($self->{check_size}) {
2848 my @queue = ([], []);
2849
2850 for (;;) {
2851 if ($self->{check_size}) {
2852 # heuristic: check containers last
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2854 for values %{delete $self->{check_size}}
2855 }
2856
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2858
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2860 ? @$widget{qw(user_w user_h)}
2861 : $widget->size_request;
2862
2863 if (delete $widget->{force_alloc}
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2866
2867 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h;
2869
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2871
2872 $widget->{parent}->check_size
2873 if $widget->{parent};
2874 }
2875 }
2876 }
2877
2878 while ($self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) {
2880 my ($widget, $w, $h) = @$_;
2881
2882 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0;
2884
2885 $widget->{w} = $w;
2886 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h);
2888 $widget->emit (size_allocate => $w, $h);
2889 }
2890 }
2891
2892 while ($self->{post_alloc_hook}) {
2893 $_->()
2894 for values %{delete $self->{post_alloc_hook}};
2369 } 2895 }
2370 2896
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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