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.203 by root, Sun May 14 21:13:11 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
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
31 } 43 }
32 44
33 return; 45 return;
34 } 46 }
35 } 47 }
… …
39 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
40} 52}
41 53
42# class methods for events 54# class methods for events
43sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
57 if $FOCUS;
45} 58}
46 59
47sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
62 if $FOCUS;
49} 63}
50 64
51sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
52 my ($ev) = @_; 66 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 67 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 75 check_tooltip;
62 } 76 }
63 77
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 79
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 80 if ($GRAB) {
81 ($x, $y) = $GRAB->coord2local ($x, $y);
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
67} 84}
68 85
69sub feed_sdl_button_up_event { 86sub feed_sdl_button_up_event {
70 my ($ev) = @_; 87 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 88 my ($x, $y) = ($ev->{x}, $ev->{y});
72 89
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 90 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 91
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 93
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 94 if ($GRAB) {
95 ($x, $y) = $GRAB->coord2local ($x, $y);
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
78 98
79 if (!$BUTTON_STATE) { 99 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 100 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 101 $grab->update if $grab;
82 $GRAB->update if $GRAB; 102 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 118 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 119
100 check_tooltip; 120 check_tooltip;
101 } 121 }
102 122
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
126 }
104} 127}
105 128
106# convert position array to integers 129# convert position array to integers
107sub harmonize { 130sub harmonize {
108 my ($vals) = @_; 131 my ($vals) = @_;
… …
114 $rem += $_ - $i; 137 $rem += $_ - $i;
115 $_ = $i; 138 $_ = $i;
116 } 139 }
117} 140}
118 141
142# call when resolution changes etc.
143sub rescale_widgets {
144 my ($sx, $sy) = @_;
145
146 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) {
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156 }
157
158 $widget->reconfigure;
159 }
160}
161
119############################################################################# 162#############################################################################
120 163
121package CFClient::UI::Base; 164package CFClient::UI::Base;
122 165
123use strict; 166use strict;
… …
126 169
127sub new { 170sub new {
128 my $class = shift; 171 my $class = shift;
129 172
130 my $self = bless { 173 my $self = bless {
131 x => 0, 174 x => 0,
132 y => 0, 175 y => 0,
133 z => 0, 176 z => 0,
134 can_events => 1, 177 can_events => 1,
135 @_ 178 @_
136 }, $class; 179 }, $class;
137 180
138 for (keys %$self) { 181 for (keys %$self) {
139 if (/^connect_(.*)$/) { 182 if (/^connect_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 183 $self->connect ($1 => delete $self->{$_});
141 } 184 }
142 } 185 }
143 186
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188
144 $self 189 $self
145} 190}
146 191
147sub destroy { 192sub destroy {
148 my ($self) = @_; 193 my ($self) = @_;
… …
160} 205}
161 206
162sub hide { 207sub hide {
163 my ($self) = @_; 208 my ($self) = @_;
164 209
165 return unless $self->{parent}; 210 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self;
166 212
167 $self->{parent}->remove ($self); 213 $self->{parent}->remove ($self)
214 if $self->{parent};
168} 215}
169 216
170sub move { 217sub move {
171 my ($self, $x, $y, $z) = @_; 218 my ($self, $x, $y, $z) = @_;
172 219
… …
211 $self->{y} = $y; 258 $self->{y} = $y;
212 $self->update; 259 $self->update;
213 } 260 }
214 261
215 if ($self->{w} != $w || $self->{h} != $h) { 262 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 263 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 264 }
222} 265}
223 266
224sub size_allocate { 267sub size_allocate {
225 # nothing to be done 268 # nothing to be done
226} 269}
227 270
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children {
279}
280
228sub set_max_size { 281sub set_max_size {
229 my ($self, $w, $h) = @_; 282 my ($self, $w, $h) = @_;
230 283
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 284 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 285 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} 286}
241 287
242# translate global coordinates to local coordinate system 288# translate global coordinates to local coordinate system
243sub coord2local { 289sub coord2local {
244 my ($self, $x, $y) = @_; 290 my ($self, $x, $y) = @_;
245 291
246 my ($X, $Y) = $self->_topleft; 292 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 293}
249 294
250# translate local coordinates to global coordinate system 295# translate local coordinates to global coordinate system
251sub coord2global { 296sub coord2global {
252 my ($self, $x, $y) = @_; 297 my ($self, $x, $y) = @_;
253 298
254 my ($X, $Y) = $self->_topleft; 299 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 300}
257 301
258sub focus_in { 302sub focus_in {
259 my ($self) = @_; 303 my ($self) = @_;
260 304
… …
358 402
359sub set_parent { 403sub set_parent {
360 my ($self, $parent) = @_; 404 my ($self, $parent) = @_;
361 405
362 Scalar::Util::weaken ($self->{parent} = $parent); 406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
363} 411}
364 412
365sub check_size { 413sub check_size {
366 my ($self) = @_; 414 my ($self, $forced) = @_;
367 415
368 $self->{parent} 416 $self->{force_alloc} = 1 if $forced;
369 or return 1; 417 $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} 418}
390 419
391sub update { 420sub update {
392 my ($self) = @_; 421 my ($self) = @_;
393 422
… …
402} 431}
403 432
404sub emit { 433sub emit {
405 my ($self, $signal, @args) = @_; 434 my ($self, $signal, @args) = @_;
406 435
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 437}
411 438
412sub DESTROY { 439sub DESTROY {
413 my ($self) = @_; 440 my ($self) = @_;
414 441
442 delete $WIDGET{$self+0};
415 #$self->deactivate; 443 #$self->deactivate;
416} 444}
417 445
418############################################################################# 446#############################################################################
419 447
… …
481sub new { 509sub new {
482 my ($class, %arg) = @_; 510 my ($class, %arg) = @_;
483 511
484 my $children = delete $arg{children} || []; 512 my $children = delete $arg{children} || [];
485 513
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 514 my $self = $class->SUPER::new (
515 children => [],
516 can_events => 0,
517 %arg,
518 );
487 $self->add ($_) for @$children; 519 $self->add ($_) for @$children;
488 520
489 $self 521 $self
490} 522}
491 523
492sub add { 524sub add {
493 my ($self, $child) = @_; 525 my ($self, @widgets) = @_;
494 526
495 $child->set_parent ($self); 527 $_->set_parent ($self)
528 for @widgets;
496 529
497 use sort 'stable'; 530 use sort 'stable';
498 531
499 $self->{children} = [ 532 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 533 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 534 @{$self->{children}}, @widgets
502 ]; 535 ];
503 536
504 $child->check_size; 537 $self->check_size (1);
538 $self->update;
539}
540
541sub children {
542 @{ $_[0]{children} }
505} 543}
506 544
507sub remove { 545sub remove {
508 my ($self, $child) = @_; 546 my ($self, $child) = @_;
509 547
510 delete $child->{parent}; 548 delete $child->{parent};
549 $child->hide;
511 550
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 552
514 $self->check_size; 553 $self->check_size;
515 $self->update; 554 $self->update;
516} 555}
517 556
518sub clear { 557sub clear {
519 my ($self) = @_; 558 my ($self) = @_;
520 559
521 delete $_->{parent} 560 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 561 $self->{children} = [];
562
563 for (@$children) {
564 delete $_->{parent};
565 $_->hide;
566 }
567
568 $self->check_size;
569 $self->update;
525} 570}
526 571
527sub find_widget { 572sub find_widget {
528 my ($self, $x, $y) = @_; 573 my ($self, $x, $y) = @_;
529 574
… …
604} 649}
605 650
606sub update { 651sub update {
607 my ($self) = @_; 652 my ($self) = @_;
608 653
609 # we want to do this delayed... 654 $ROOT->on_post_alloc ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 655 $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} 656}
623 657
624sub size_allocate { 658sub size_allocate {
625 my ($self, $w, $h) = @_; 659 my ($self, $w, $h) = @_;
626 660
627 $self->child->configure (0, 0, $w, $h); 661 $self->SUPER::size_allocate ($w, $h);
662 $self->update;
663}
628 664
665sub _render {
666 $_[0]{children}[0]->draw;
667}
668
669sub render_child {
670 my ($self) = @_;
671
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT;
675
629 $self->render_chld; 676 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 };
630} 685}
631 686
632sub _draw { 687sub _draw {
633 my ($self) = @_; 688 my ($self) = @_;
634 689
635 my ($w, $h) = ($self->w, $self->h); 690 my ($w, $h) = ($self->w, $self->h);
636 691
637 my $tex = $self->{texture} 692 my $tex = $self->{texture}
638 or return; 693 or return;
639 694
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 695 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1;
644 698
645 $tex->draw_quad (0, 0, $w, $h); 699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 700
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
649} 702}
650 703
651############################################################################# 704#############################################################################
652 705
653package CFClient::UI::ViewPort; 706package CFClient::UI::ViewPort;
654 707
655our @ISA = CFClient::UI::Window::; 708our @ISA = CFClient::UI::Window::;
656 709
657sub new { die }
658
659sub size_request { 710sub size_request {
660 my ($self) = @_; 711 my ($self) = @_;
661 712
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 713 @$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)}); 714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
664 715
665 @$self{qw(child_w child_h)} 716 @$self{qw(child_w child_h)}
666} 717}
667 718
668sub _draw { 719sub size_allocate {
669 my ($self) = @_; 720 my ($self, $w, $h) = @_;
670 721
671 $self->{children}[1]->draw; 722 $self->update;
672} 723}
673 724
725sub set_offset {
726 my ($self, $x, $y) = @_;
674 727
675############################################################################# 728 $self->{view_x} = int $x;
729 $self->{view_y} = int $y;
676 730
731 $self->update;
732}
733
734# hmm, this does not work for topleft of $self... but we should not ask for that
735sub coord2local {
736 my ($self, $x, $y) = @_;
737
738 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
739}
740
741sub coord2global {
742 my ($self, $x, $y) = @_;
743
744 $x = List::Util::min $self->{w}, $x - $self->{view_x};
745 $y = List::Util::min $self->{h}, $y - $self->{view_y};
746
747 $self->SUPER::coord2global ($x, $y)
748}
749
750sub find_widget {
751 my ($self, $x, $y) = @_;
752
753 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
754 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
755 ) {
756 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
757 } else {
758 $self->CFClient::UI::Base::find_widget ($x, $y)
759 }
760}
761
762sub _render {
763 my ($self) = @_;
764
765 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766
767 $self->SUPER::_render;
768}
769
770#############################################################################
771
677package CFClient::UI::Frame; 772package CFClient::UI::ScrolledWindow;
678 773
679our @ISA = CFClient::UI::Bin::; 774our @ISA = CFClient::UI::HBox::;
680
681use CFClient::OpenGL;
682 775
683sub new { 776sub new {
684 my $class = shift; 777 my $class = shift;
685 778
779 my $self;
780
781 my $slider = new CFClient::UI::Slider
782 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
786 },
787 ;
788
686 my $self = $class->SUPER::new ( 789 $self = $class->SUPER::new (
687 bg => [1, 1, 1, 1], 790 vp => (new CFClient::UI::ViewPort),
688 border_bg => [1, 1, 1, 1], 791 slider => $slider,
689 border => 0.8,
690 @_ 792 @_,
691 ); 793 );
692 794
795 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp});
797 $self->add ($self->{slider});
798
693 $self 799 $self
694} 800}
695 801
802#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll
804
805#############################################################################
806
807package CFClient::UI::Frame;
808
809our @ISA = CFClient::UI::Bin::;
810
811use CFClient::OpenGL;
812
813sub new {
814 my $class = shift;
815
816 $class->SUPER::new (
817 bg => undef,
818 @_,
819 )
820}
821
696sub _draw { 822sub _draw {
697 my ($self) = @_; 823 my ($self) = @_;
698 824
699 my ($w, $h) = ($self->{w}, $self->{h}); 825 if ($self->{bg}) {
826 my ($w, $h) = @$self{qw(w h)};
700 827
701 glEnable GL_BLEND; 828 glEnable GL_BLEND;
702 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 829 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
703 glEnable GL_TEXTURE_2D; 830 glColor @{ $self->{bg} };
704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705 831
706# glBegin GL_QUADS; 832 glBegin GL_QUADS;
707# glColor 0, 0, 0, 0;
708# glVertex 0 , 0; 833 glVertex 0 , 0;
709# glVertex 0 , $h; 834 glVertex 0 , $h;
710# glVertex $w, $h; 835 glVertex $w, $h;
711# glVertex $w, 0; 836 glVertex $w, 0;
712# glEnd; 837 glEnd;
713 838
714
715 $self->child->draw;
716 glDisable GL_BLEND; 839 glDisable GL_BLEND;
717 glDisable GL_TEXTURE_2D; 840 }
841
842 $self->SUPER::_draw;
718} 843}
719 844
720############################################################################# 845#############################################################################
721 846
722package CFClient::UI::FancyFrame; 847package CFClient::UI::FancyFrame;
… …
733 my $class = shift; 858 my $class = shift;
734 859
735 # TODO: user_x, user_y, overwrite moveto? 860 # TODO: user_x, user_y, overwrite moveto?
736 861
737 my $self = $class->SUPER::new ( 862 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 863 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 864 border_bg => [1, 1, 1, 1],
740 border => 0.8, 865 border => 0.6,
866 toplevel => 1,
741 can_events => 1, 867 can_events => 1,
742 @_ 868 @_
743 ); 869 );
744 870
745 $self->{title} &&= new CFClient::UI::Label 871 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 872 align => 0,
747 valign => 1, 873 valign => 1,
748 text => $self->{title}, 874 text => $self->{title},
749 fontsize => 1; 875 fontsize => $self->{border};
750 876
751 $self 877 $self
752} 878}
753 879
754sub border { 880sub border {
… …
779} 905}
780 906
781sub button_down { 907sub button_down {
782 my ($self, $ev, $x, $y) = @_; 908 my ($self, $ev, $x, $y) = @_;
783 909
910 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 911 my $border = $self->border;
785 912
786 if ($x < $self->{w} && $x >= $self->{w} - $border 913 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 914 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 915
916 if ($lr & $td) {
917 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 919 my ($bw, $bh) = ($self->{w}, $self->{h});
791 920
921 my $mx = $x < $border;
922 my $my = $y < $border;
923
792 $self->{motion} = sub { 924 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 925 my ($ev, $x, $y) = @_;
794 926
795 ($x, $y) = ($ev->{x}, $ev->{y}); 927 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy;
796 929
797 $self->{user_w} = $bw + $x - $ox; 930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
799 $self->check_size; 933 $self->check_size;
800 }; 934 };
801 935
802 } elsif ($x >= 0 && $x < $self->{w} 936 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 937 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 938 my ($bx, $by) = ($self->{x}, $self->{y});
807 939
808 $self->{motion} = sub { 940 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
… …
832 my ($self) = @_; 964 my ($self) = @_;
833 965
834 my ($w, $h ) = ($self->{w}, $self->{h}); 966 my ($w, $h ) = ($self->{w}, $self->{h});
835 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
836 968
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 969 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841 971
842 my $border = $self->border; 972 my $border = $self->border;
843 973
844 glColor @{ $self->{border_bg} }; 974 glColor @{ $self->{border_bg} };
845 $tex[1]->draw_quad (0, 0, $w, $border); 975 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
849 979
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850 my $bg = $tex[0]; 981 my $bg = $tex[0];
851 982
852 # TODO: repeat texture not scale 983 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 984 my $rep_x = $cw / $bg->{w};
854 my $rep_y = $ch / $bg->{h}; 985 my $rep_y = $ch / $bg->{h};
855 986
856 glColor @{ $self->{bg} }; 987 glColor @{ $self->{bg} };
857 988
858 $bg->{s} = $rep_x; 989 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y; 990 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1; 991 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 992 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 }
862 994
863 glDisable GL_TEXTURE_2D; 995 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND;
865 996
866 $self->{title}->draw if $self->{title}; 997 $self->{title}->draw if $self->{title};
998
867 $self->child->draw; 999 $self->child->draw;
868} 1000}
869 1001
870############################################################################# 1002#############################################################################
871 1003
… …
893 $self->{children}[$y][$x] = $child; 1025 $self->{children}[$y][$x] = $child;
894 1026
895 $child->check_size; 1027 $child->check_size;
896} 1028}
897 1029
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
898# TODO: move to container class maybe? send childs a signal on removal? 1034# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 1035sub clear {
900 my ($self) = @_; 1036 my ($self) = @_;
901 1037
1038 my @children = $self->children;
902 delete $self->{children}; 1039 delete $self->{children};
1040
1041 for (@children) {
1042 delete $_->{parent};
1043 $_->hide;
1044 }
1045
903 $self->update; 1046 $self->update;
904} 1047}
905 1048
906sub get_wh { 1049sub get_wh {
907 my ($self) = @_; 1050 my ($self) = @_;
… …
1084} 1227}
1085 1228
1086sub size_allocate { 1229sub size_allocate {
1087 my ($self, $w, $h) = @_; 1230 my ($self, $w, $h) = @_;
1088 1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1089 my $children = $self->{children}; 1234 my $children = $self->{children};
1090 1235
1091 my @h = map $_->{req_h}, @$children; 1236 my @h = map $_->{req_h}, @$children;
1092 1237
1093 my $req_h = List::Util::sum @h; 1238 my $req_h = List::Util::sum @h;
… …
1130 1275
1131sub new { 1276sub new {
1132 my ($class, %arg) = @_; 1277 my ($class, %arg) = @_;
1133 1278
1134 my $self = $class->SUPER::new ( 1279 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1280 fg => [1, 1, 1],
1136 #font => default_font 1281 #font => default_font
1282 #text => initial text
1283 #markup => initial narkup
1284 layout => (new CFClient::Layout),
1137 fontsize => 1, 1285 fontsize => 1,
1138 text => "",
1139 align => -1, 1286 align => -1,
1140 valign => -1, 1287 valign => -1,
1141 padding => 2, 1288 padding => 2,
1142 layout => new CFClient::Layout,
1143 can_events => 0, 1289 can_events => 0,
1144 %arg 1290 %arg
1145 ); 1291 );
1146 1292
1147 if (exists $self->{template}) { 1293 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1294 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1295 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1296 $self->{template} = $layout;
1151 } 1297 }
1152 1298
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1299 if (exists $self->{markup}) {
1154 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1300 $self->set_markup (delete $self->{markup});
1301 } else {
1302 $self->set_text (delete $self->{text});
1303 }
1155 1304
1156 $self 1305 $self
1157} 1306}
1158 1307
1159sub escape { 1308sub escape {
… …
1164 s/</&lt;/g; 1313 s/</&lt;/g;
1165 1314
1166 $_[1] 1315 $_[1]
1167} 1316}
1168 1317
1318sub update {
1319 my ($self) = @_;
1320
1321 delete $self->{texture};
1322 $self->SUPER::update;
1323}
1324
1169sub set_text { 1325sub set_text {
1170 my ($self, $text) = @_; 1326 my ($self, $text) = @_;
1171 1327
1328 return if $self->{text} eq "T$text";
1329 $self->{text} = "T$text";
1330
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1172 $self->{layout}->set_text ($text); 1332 $self->{layout}->set_text ($text);
1173 1333
1174 delete $self->{texture}; 1334 $self->update;
1175 $self->check_size; 1335 $self->check_size;
1176 $self->update;
1177} 1336}
1178 1337
1179sub set_markup { 1338sub set_markup {
1180 my ($self, $markup) = @_; 1339 my ($self, $markup) = @_;
1181 1340
1341 return if $self->{text} eq "M$markup";
1342 $self->{text} = "M$markup";
1343
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1182 $self->{layout}->set_markup ($markup); 1347 $self->{layout}->set_markup ($markup);
1183 1348
1184 delete $self->{texture}; 1349 $self->update;
1185 $self->check_size; 1350 $self->check_size;
1186 $self->update;
1187} 1351}
1188 1352
1189sub size_request { 1353sub size_request {
1190 my ($self) = @_; 1354 my ($self) = @_;
1191 1355
… …
1220sub set_fontsize { 1384sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1385 my ($self, $fontsize) = @_;
1222 1386
1223 $self->{fontsize} = $fontsize; 1387 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1388 delete $self->{texture};
1389
1390 $self->update;
1225 $self->check_size; 1391 $self->check_size;
1226 $self->update;
1227} 1392}
1228 1393
1229sub _draw { 1394sub _draw {
1230 my ($self) = @_; 1395 my ($self) = @_;
1231 1396
1232 my $tex = $self->{texture} ||= do { 1397 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1399 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $self->{layout}->set_width ($self->{w}); 1400 $self->{layout}->set_width ($self->{w});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1402
1236 new_from_layout CFClient::Texture $self->{layout} 1403 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5;
1408
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5;
1412
1413 $tex
1237 }; 1414 };
1238 1415
1239 glEnable GL_BLEND;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 glEnable GL_TEXTURE_2D; 1416 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1418
1419 if ($tex->{format} == GL_ALPHA) {
1244 glColor @{$self->{fg}}; 1420 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}); 1421 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1422 } else {
1423 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1424 }
1259 1425
1260 glDisable GL_TEXTURE_2D; 1426 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1427}
1263 1428
1264############################################################################# 1429#############################################################################
1265 1430
1266package CFClient::UI::EntryBase; 1431package CFClient::UI::EntryBase;
… …
1271 1436
1272sub new { 1437sub new {
1273 my $class = shift; 1438 my $class = shift;
1274 1439
1275 $class->SUPER::new ( 1440 $class->SUPER::new (
1276 fg => [1, 1, 1], 1441 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1442 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1443 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1444 active_fg => [0, 0, 0],
1280 can_hover => 1, 1445 can_hover => 1,
1281 can_focus => 1, 1446 can_focus => 1,
1282 valign => 0, 1447 valign => 0,
1283 can_events => 1, 1448 can_events => 1,
1284 @_ 1449 @_
1285 ) 1450 )
1286} 1451}
1287 1452
… …
1301 $self->{layout}->set_text ("$text "); 1466 $self->{layout}->set_text ("$text ");
1302 1467
1303 $self->emit (changed => $self->{text}); 1468 $self->emit (changed => $self->{text});
1304} 1469}
1305 1470
1471sub set_text {
1472 my ($self, $text) = @_;
1473
1474 $self->{cursor} = length $text;
1475 $self->_set_text ($text);
1476 $self->check_size;
1477 $self->update;
1478}
1479
1306sub get_text { 1480sub get_text {
1307 $_[0]{text} 1481 $_[0]{text}
1308} 1482}
1309 1483
1310sub size_request { 1484sub size_request {
… …
1317 1491
1318sub size_allocate { 1492sub size_allocate {
1319 my ($self, $w, $h) = @_; 1493 my ($self, $w, $h) = @_;
1320 1494
1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1495 $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} 1496}
1331 1497
1332sub key_down { 1498sub key_down {
1333 my ($self, $ev) = @_; 1499 my ($self, $ev) = @_;
1334 1500
… …
1336 my $sym = $ev->{sym}; 1502 my $sym = $ev->{sym};
1337 my $uni = $ev->{unicode}; 1503 my $uni = $ev->{unicode};
1338 1504
1339 my $text = $self->get_text; 1505 my $text = $self->get_text;
1340 1506
1341 if ($sym == 8) { 1507 if ($uni == 8) {
1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1508 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343 } elsif ($sym == 127) { 1509 } elsif ($uni == 127) {
1344 substr $text, $self->{cursor}, 1, ""; 1510 substr $text, $self->{cursor}, 1, "";
1345 } elsif ($sym == CFClient::SDLK_LEFT) { 1511 } elsif ($sym == CFClient::SDLK_LEFT) {
1346 --$self->{cursor} if $self->{cursor}; 1512 --$self->{cursor} if $self->{cursor};
1347 } elsif ($sym == CFClient::SDLK_RIGHT) { 1513 } elsif ($sym == CFClient::SDLK_RIGHT) {
1348 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1514 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1349 } elsif ($sym == CFClient::SDLK_HOME) { 1515 } elsif ($sym == CFClient::SDLK_HOME) {
1350 $self->{cursor} = 0; 1516 $self->{cursor} = 0;
1351 } elsif ($sym == CFClient::SDLK_END) { 1517 } elsif ($sym == CFClient::SDLK_END) {
1352 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1353 } elsif ($sym == 27) { 1519 } elsif ($uni == 27) {
1354 $self->emit ('escape'); 1520 $self->emit ('escape');
1355 } elsif ($uni) { 1521 } elsif ($uni) {
1356 substr $text, $self->{cursor}++, 0, chr $uni; 1522 substr $text, $self->{cursor}++, 0, chr $uni;
1357 } 1523 }
1358 1524
… …
1441 my ($self, $ev) = @_; 1607 my ($self, $ev) = @_;
1442 1608
1443 my $sym = $ev->{sym}; 1609 my $sym = $ev->{sym};
1444 1610
1445 if ($sym == 13) { 1611 if ($sym == 13) {
1612 unshift @{$self->{history}},
1613 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1616 $self->emit (activate => $txt);
1447 $self->update; 1617 $self->update;
1618
1619 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text;
1622 }
1623 if (@{$self->{history} || []} > 0) {
1624 $self->{history_pointer}++;
1625 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1626 $self->{history_pointer} = @{$self->{history} || []} - 1;
1627 }
1628 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1629 }
1630
1631 } elsif ($sym == CFClient::SDLK_DOWN) {
1632 $self->{history_pointer}--;
1633 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1634
1635 if ($self->{history_pointer} >= 0) {
1636 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1637 } else {
1638 $self->set_text ($self->{history_saveback});
1639 }
1448 1640
1449 } else { 1641 } else {
1450 $self->SUPER::key_down ($ev); 1642 $self->SUPER::key_down ($ev);
1451 } 1643 }
1452 1644
… …
1466 1658
1467sub new { 1659sub new {
1468 my $class = shift; 1660 my $class = shift;
1469 1661
1470 $class->SUPER::new ( 1662 $class->SUPER::new (
1471 padding => 4, 1663 padding => 4,
1472 fg => [1, 1, 1], 1664 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1665 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1666 active_fg => [0, 0, 1],
1475 can_hover => 1, 1667 can_hover => 1,
1476 align => 0, 1668 align => 0,
1477 valign => 0, 1669 valign => 0,
1478 can_events => 1, 1670 can_events => 1,
1479 @_ 1671 @_
1480 ) 1672 )
1481} 1673}
1482 1674
… …
1496 1688
1497 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1499 } 1691 }
1500 1692
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1693 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1695 glColor 0, 0, 0, 1;
1506 1696
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1698
1509 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1700
1512 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1513} 1702}
1514 1703
1515############################################################################# 1704#############################################################################
… …
1562 1751
1563 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1564 1753
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 1755
1567 glEnable GL_BLEND; 1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1568 glEnable GL_TEXTURE_2D; 1758 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); 1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 1761}
1578 1762
1579############################################################################# 1763#############################################################################
1580 1764
1581package CFClient::UI::Image; 1765package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 1808 glTranslate 0, -$self->{w}, 0;
1625 1809
1626 ($w, $h) = ($h, $w); 1810 ($w, $h) = ($h, $w);
1627 } 1811 }
1628 1812
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 1815
1634 $tex->draw_quad (0, 0, $w, $h); 1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 1817
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1638} 1819}
1639 1820
1640############################################################################# 1821#############################################################################
1641 1822
… …
1689} 1870}
1690 1871
1691sub set_max { 1872sub set_max {
1692 my ($self, $max) = @_; 1873 my ($self, $max) = @_;
1693 1874
1875 return if $self->{max_val} == $max;
1876
1694 $self->{max_val} = $max; 1877 $self->{max_val} = $max;
1878 $self->update;
1695} 1879}
1696 1880
1697sub set_value { 1881sub set_value {
1698 my ($self, $val, $max) = @_; 1882 my ($self, $val, $max) = @_;
1699 1883
1700 $self->set_max ($max) 1884 $self->set_max ($max)
1701 if defined $max; 1885 if defined $max;
1702 1886
1703 $max = $self->{max_val}; 1887 return if $self->{val} == $val;
1888
1704 $self->{val} = $val; 1889 $self->{val} = $val;
1705
1706 $self->update; 1890 $self->update;
1707} 1891}
1708 1892
1709sub _draw { 1893sub _draw {
1710 my ($self) = @_; 1894 my ($self) = @_;
… …
1773 1957
1774sub new { 1958sub new {
1775 my ($class, %arg) = @_; 1959 my ($class, %arg) = @_;
1776 1960
1777 my $self = $class->SUPER::new ( 1961 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 1962 tooltip => $arg{type},
1963 can_hover => 1,
1779 can_events => 1, 1964 can_events => 1,
1780 can_hover => 1,
1781 %arg, 1965 %arg,
1782 ); 1966 );
1783 1967
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1968 $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); 1969 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 1977
1794 $self->{value}->set_fontsize ($fsize); 1978 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 1979 $self->{max} ->set_fontsize ($fsize);
1796} 1980}
1797 1981
1982sub set_max {
1983 my ($self, $max) = @_;
1984
1985 $self->{gauge}->set_max ($max);
1986 $self->{max}->set_text ($max);
1987}
1988
1798sub set_value { 1989sub set_value {
1799 my ($self, $val, $max) = @_; 1990 my ($self, $val, $max) = @_;
1800 1991
1801 $self->set_max ($max) 1992 $self->set_max ($max)
1802 if defined $max; 1993 if defined $max;
1803 1994
1804 $self->{gauge}->set_value ($val, $max); 1995 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 1996 $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} 1997}
1814 1998
1815############################################################################# 1999#############################################################################
1816 2000
1817package CFClient::UI::Slider; 2001package CFClient::UI::Slider;
… …
1836 # TODO: calculations are off 2020 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2021 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2022 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 2023 active_fg => [0, 0, 0],
1840 range => [0, 0, 100, 10], 2024 range => [0, 0, 100, 10],
1841 req_w => 20, 2025 req_w => $::WIDTH / 80,
1842 req_h => 20, 2026 req_h => $::WIDTH / 80,
1843 vertical => 0, 2027 vertical => 0,
1844 can_hover => 1, 2028 can_hover => 1,
1845 inner_pad => 5, 2029 inner_pad => 5,
1846 @_ 2030 @_
1847 ); 2031 );
… …
1930 $page ||= 2; 2114 $page ||= 2;
1931 2115
1932 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934 2118
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2119 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2121
1940 # draw background 2122 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1942 2124
1943 # draw handle 2125 # draw handle
1944 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1945 2127
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2128 glDisable GL_TEXTURE_2D;
1948} 2129}
1949 2130
1950############################################################################# 2131#############################################################################
1951 2132
… …
1957 2138
1958sub new { 2139sub new {
1959 my $class = shift; 2140 my $class = shift;
1960 2141
1961 my $self = $class->SUPER::new ( 2142 my $self = $class->SUPER::new (
1962 fontsize => 1, 2143 fontsize => 1,
2144 can_events => 0,
1963 #font => default_font 2145 #font => default_font
1964 @_, 2146 @_,
1965 2147
1966 layout => (new CFClient::Layout), 2148 layout => (new CFClient::Layout 1),
1967 par => [], 2149 par => [],
1968 height => 0, 2150 height => 0,
1969 children => [ 2151 children => [
1970 (new CFClient::UI::Empty expand => 1), 2152 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2153 (new CFClient::UI::Slider vertical => 1),
1972 ], 2154 ],
1973 ); 2155 );
1974 2156
1975 $self->{children}[1]->connect (changed => sub { 2157 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2158
1979 $self 2159 $self
1980} 2160}
1981 2161
1982sub set_fontsize { 2162sub set_fontsize {
… …
1990 my ($self, $text) = @_; 2170 my ($self, $text) = @_;
1991 2171
1992 my $layout = $self->{layout}; 2172 my $layout = $self->{layout};
1993 2173
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w}); 2175 $layout->set_width ($self->{children}[0]{w});
1996 $layout->set_text ($text); 2176 $layout->set_markup ($text);
1997 2177
1998 ($layout->size)[1] 2178 ($layout->size)[1]
1999} 2179}
2000 2180
2001sub reflow { 2181sub reflow {
… …
2039 2219
2040 return unless $self->{h} > 0; 2220 return unless $self->{h} > 0;
2041 2221
2042 delete $self->{texture}; 2222 delete $self->{texture};
2043 2223
2044 $ROOT->on_refresh ($self, sub { 2224 $ROOT->on_post_alloc ($self, sub {
2045 if (delete $self->{need_reflow}) { 2225 if (delete $self->{need_reflow}) {
2046 my $height = 0; 2226 my $height = 0;
2047 2227
2048 $height += $_->[0] = $self->text_height ($_->[2]) 2228 $height += $_->[0] = $self->text_height ($_->[2])
2049 for @{$self->{par}}; 2229 for @{$self->{par}};
… …
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054 2234
2055 delete $self->{texture}; 2235 delete $self->{texture};
2056 } 2236 }
2057 2237
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059 glClearColor 0, 0, 0, 1; 2239 glClearColor 0, 0, 0, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2240 glClear GL_COLOR_BUFFER_BIT;
2061 2241
2062 glEnable GL_BLEND;
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066 2244
2067 my $top = int $self->{children}[1]{range}[0]; 2245 my $top = int $self->{children}[1]{range}[0];
2068 2246
… …
2077 2255
2078 for my $par (@{$self->{par}}) { 2256 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2257 my $h = $par->[0];
2080 2258
2081 if ($y0 < $y + $h && $y < $y1) { 2259 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] });
2082 $layout->set_text ($par->[2]); 2261 $layout->set_markup ($par->[2]);
2083 2262
2084 glColor @{ $par->[1] };
2085 my ($W, $H) = $layout->size; 2263 my ($W, $H) = $layout->size;
2086 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2087 } 2265 }
2088 2266
2089 $y += $h; 2267 $y += $h;
2090 } 2268 }
2091 2269
2092 glDisable GL_TEXTURE_2D; 2270 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND;
2094 }; 2271 };
2095 }); 2272 });
2096} 2273}
2097 2274
2098sub _draw { 2275sub _draw {
2099 my ($self) = @_; 2276 my ($self) = @_;
2100 2277
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2278 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2280 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2282 glDisable GL_TEXTURE_2D;
2106 }
2107 2283
2108 $self->{children}[1]->draw; 2284 $self->{children}[1]->draw;
2109 2285
2110} 2286}
2111 2287
… …
2159 2335
2160sub new { 2336sub new {
2161 my $class = shift; 2337 my $class = shift;
2162 2338
2163 my $self = $class->SUPER::new ( 2339 my $self = $class->SUPER::new (
2164 state => 0, 2340 state => 0,
2165 connect_activate => \&toggle_flopper, 2341 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2342 @_
2168 ); 2343 );
2169 2344
2170 if ($self->{state}) { 2345 if ($self->{state}) {
2171 $self->{state} = 0; 2346 $self->{state} = 0;
… …
2206 @_, 2381 @_,
2207 can_events => 0, 2382 can_events => 0,
2208 ) 2383 )
2209} 2384}
2210 2385
2211sub set_markup { 2386sub set_tooltip_from {
2212 my ($self, $text) = @_; 2387 my ($self, $widget) = @_;
2213 2388
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2389 $self->add (new CFClient::UI::Label
2215 $self->{label}->set_markup ($text); 2390 markup => $widget->{tooltip},
2216 $self->add ($self->{label}); 2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8,
2393 fg => [0, 0, 0, 1],
2394 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 );
2217} 2396}
2218 2397
2219sub size_request { 2398sub size_request {
2220 my ($self) = @_; 2399 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2400
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2401 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2402
2226 ($w + 4, $h + 4) 2403 ($w + 4, $h + 4)
2227} 2404}
… …
2233} 2410}
2234 2411
2235sub _draw { 2412sub _draw {
2236 my ($self) = @_; 2413 my ($self) = @_;
2237 2414
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375; 2415 glTranslate 0.375, 0.375;
2240 2416
2241 my ($w, $h) = @$self{qw(w h)}; 2417 my ($w, $h) = @$self{qw(w h)};
2242 2418
2243 glColor 1, 0.8, 0.4; 2419 glColor 1, 0.8, 0.4;
… …
2254 glVertex 0 , $h; 2430 glVertex 0 , $h;
2255 glVertex $w, $h; 2431 glVertex $w, $h;
2256 glVertex $w, 0; 2432 glVertex $w, 0;
2257 glEnd; 2433 glEnd;
2258 2434
2259 glPopMatrix; 2435 glTranslate 2 - 0.375, 2 - 0.375;
2260
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw; 2436 $self->SUPER::_draw;
2263} 2437}
2264 2438
2265############################################################################# 2439#############################################################################
2266 2440
… …
2281 2455
2282sub size_request { 2456sub size_request {
2283 (32, 8) 2457 (32, 8)
2284} 2458}
2285 2459
2286sub draw { 2460sub _draw {
2287 my ($self) = @_; 2461 my ($self) = @_;
2288 2462
2463 return unless $::CONN;#d# manage and cache textures differently
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290 2465
2466 # TODO animation
2291 if ($tex) { 2467 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2468 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2470 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D; 2472 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 } 2473 }
2474}
2475
2476#############################################################################
2477
2478package CFClient::UI::InventoryItem;
2479
2480our @ISA = CFClient::UI::HBox::;
2481
2482sub new {
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_;
2561
2562 $self->{scrolled}->clear;
2563 return unless $items;
2564
2565 my @items = sort {
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588}
2589
2590#############################################################################
2591
2592package CFClient::UI::Menu;
2593
2594our @ISA = CFClient::UI::FancyFrame::;
2595
2596use CFClient::OpenGL;
2597
2598sub new {
2599 my $class = shift;
2600
2601 my $self = $class->SUPER::new (
2602 items => [],
2603 z => 100,
2604 @_,
2605 );
2606
2607 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2608
2609 for my $item (@{ $self->{items} }) {
2610 my ($widget, $cb) = @$item;
2611
2612 # handle various types of items, only text for now
2613 if (!ref $widget) {
2614 $widget = new CFClient::UI::Label
2615 can_hover => 1,
2616 can_events => 1,
2617 text => $widget;
2618 }
2619
2620 $self->{item}{$widget} = $item;
2621
2622 $self->{vbox}->add ($widget);
2623 }
2624
2625 $self
2626}
2627
2628# popup given the event (must be a mouse button down event currently)
2629sub popup {
2630 my ($self, $ev) = @_;
2631
2632 $self->emit ("popdown");
2633
2634 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self;
2636 $self->{button} = $ev->{button};
2637
2638 $self->show;
2639 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640}
2641
2642sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_;
2644
2645 # TODO: should use vbox->find_widget or so
2646 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647 $self->{hover} = $self->{item}{$HOVER};
2648}
2649
2650sub button_up {
2651 my ($self, $ev, $x, $y) = @_;
2652
2653 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB;
2655 $self->hide;
2656
2657 $self->emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover};
2659 }
2660}
2661
2662#############################################################################
2663
2664package CFClient::UI::Statusbox;
2665
2666our @ISA = CFClient::UI::VBox::;
2667
2668sub reorder {
2669 my ($self) = @_;
2670 my $NOW = time;
2671
2672 while (my ($k, $v) = each %{ $self->{item} }) {
2673 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2674 }
2675
2676 my @widgets;
2677
2678 my @items = sort {
2679 $a->{pri} <=> $b->{pri}
2680 or $b->{id} <=> $a->{id}
2681 } values %{ $self->{item} };
2682
2683 my $count = 10 + 1;
2684 for my $item (@items) {
2685 last unless --$count;
2686
2687 push @widgets, $item->{label} ||= do {
2688 # TODO: doesn't handle markup well (read as: at all)
2689 my $short = $item->{count} > 1
2690 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text};
2692
2693 for ($short) {
2694 s/^\s+//;
2695 s/\012.*/…/s;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 }
2699
2700 new CFClient::UI::Label
2701 markup => $short,
2702 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize},
2706 color => $item->{color},
2707 can_events => 1,
2708 can_hover => 1
2709 };
2710 }
2711
2712 $self->clear;
2713 $self->SUPER::add (reverse @widgets);
2714}
2715
2716sub add {
2717 my ($self, $text, %arg) = @_;
2718
2719 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//;
2721
2722 my $timeout = time + ((delete $arg{timeout}) || 60);
2723
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725
2726 if (my $item = $self->{item}{$group}) {
2727 if ($item->{text} eq $text) {
2728 $item->{count}++;
2729 } else {
2730 $item->{count} = 1;
2731 $item->{text} = $item->{tooltip} = $text;
2732 }
2733 $item->{id} = ++$self->{id};
2734 $item->{timeout} = $timeout;
2735 delete $item->{label};
2736 } else {
2737 $self->{item}{$group} = {
2738 id => ++$self->{id},
2739 text => $text,
2740 timeout => $timeout,
2741 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0,
2745 count => 1,
2746 %arg,
2747 };
2748 }
2749
2750 $self->reorder;
2301} 2751}
2302 2752
2303############################################################################# 2753#############################################################################
2304 2754
2305package CFClient::UI::Root; 2755package CFClient::UI::Root;
2306 2756
2307our @ISA = CFClient::UI::Container::; 2757our @ISA = CFClient::UI::Container::;
2308 2758
2309use CFClient::OpenGL; 2759use CFClient::OpenGL;
2310 2760
2311sub check_size { 2761sub new {
2312 my ($self) = @_; 2762 my $class = shift;
2313 2763
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2764 $class->SUPER::new (
2315} 2765 @_,
2316 2766 )
2317sub size_request {
2318 ($::WIDTH, $::HEIGHT)
2319} 2767}
2320 2768
2321sub configure { 2769sub configure {
2322 my ($self, $x, $y, $w, $h) = @_; 2770 my ($self, $x, $y, $w, $h) = @_;
2323 2771
2324 $self->SUPER::configure ($x, $y, $w, $h); 2772 $self->{w} = $w;
2773 $self->{h} = $h;
2774}
2325 2775
2776sub check_size {
2777 my ($self) = @_;
2778
2779 $self->size_allocate ($self->{w}, $self->{h})
2780 if $self->{w};
2781}
2782
2783sub size_request {
2784 my ($self) = @_;
2785
2786 ($self->{w}, $self->{h})
2787}
2788
2789sub size_allocate {
2790 my ($self, $w, $h) = @_;
2791
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2326 for my $child (@{$self->{children}}) { 2798 for my $child ($self->children) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328 2800
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2801 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2331 $child->configure ($X, $Y, $W,$H); 2803 $child->configure ($X, $Y, $W, $H);
2332 } 2804 }
2333} 2805}
2334 2806
2335sub _topleft { 2807sub coord2local {
2336 my ($self, $x, $y) = @_; 2808 my ($self, $x, $y) = @_;
2337 2809
2338 ($x, $y) 2810 ($x, $y)
2339} 2811}
2340 2812
2813sub coord2global {
2814 my ($self, $x, $y) = @_;
2815
2816 ($x, $y)
2817}
2818
2341sub update { 2819sub update {
2342 my ($self) = @_; 2820 my ($self) = @_;
2343 2821
2344 $self->check_size; 2822 $self->check_size;
2345 ::refresh (); 2823 $::WANT_REFRESH++;
2346} 2824}
2347 2825
2348sub add { 2826sub add {
2349 my ($self, $child) = @_; 2827 my ($self, @children) = @_;
2350 2828
2829 for my $child (@children) {
2830 $child->{toplevel} = 1;
2831
2351 # integerize window positions 2832 # integerise window positions
2352 $child->{x} = int $child->{x}; 2833 $child->{x} = int $child->{x};
2353 $child->{y} = int $child->{y}; 2834 $child->{y} = int $child->{y};
2835 }
2354 2836
2355 $self->SUPER::add ($child); 2837 $self->SUPER::add (@children);
2356} 2838}
2357 2839
2358sub on_refresh { 2840sub on_refresh {
2359 my ($self, $id, $cb) = @_; 2841 my ($self, $id, $cb) = @_;
2360 2842
2361 $self->{refresh_hook}{$id} = $cb; 2843 $self->{refresh_hook}{$id} = $cb;
2362} 2844}
2363 2845
2846sub on_post_alloc {
2847 my ($self, $id, $cb) = @_;
2848
2849 $self->{post_alloc_hook}{$id} = $cb;
2850}
2851
2364sub draw { 2852sub draw {
2365 my ($self) = @_; 2853 my ($self) = @_;
2366 2854
2367 while (my $rcb = delete $self->{refresh_hook}) { 2855 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 2856 $_->()
2857 for values %{delete $self->{refresh_hook}};
2858 }
2859
2860 if ($self->{check_size}) {
2861 my @queue = ([], []);
2862
2863 for (;;) {
2864 if ($self->{check_size}) {
2865 # heuristic: check containers last
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2867 for values %{delete $self->{check_size}}
2868 }
2869
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2871
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2873 ? @$widget{qw(user_w user_h)}
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879
2880 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h;
2882
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2884
2885 $widget->{parent}->check_size
2886 if $widget->{parent};
2887 }
2888 }
2889 }
2890
2891 while ($self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) {
2893 my ($widget, $w, $h) = @$_;
2894
2895 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0;
2897
2898 $widget->{w} = $w;
2899 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h);
2901 $widget->emit (size_allocate => $w, $h);
2902 }
2903 }
2904
2905 while ($self->{post_alloc_hook}) {
2906 $_->()
2907 for values %{delete $self->{post_alloc_hook}};
2369 } 2908 }
2370 2909
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2910 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 2912 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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