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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.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_text ($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
320 glVertex $x + $self->{w}, $y + $self->{h}; 364 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 365 glVertex $x , $y + $self->{h};
322 glEnd; 366 glEnd;
323 glDisable GL_BLEND; 367 glDisable GL_BLEND;
324 } 368 }
369
370 if ($ENV{PCLIENT_DEBUG}) {
371 glPushMatrix;
372 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0;
376 glVertex $self->{w}, 0;
377 glVertex $self->{w}, $self->{h};
378 glVertex 0 , $self->{h};
379 glEnd;
380 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 }
325} 383}
326 384
327sub _draw { 385sub _draw {
328 my ($self) = @_; 386 my ($self) = @_;
329 387
344 402
345sub set_parent { 403sub set_parent {
346 my ($self, $parent) = @_; 404 my ($self, $parent) = @_;
347 405
348 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};
349} 411}
350 412
351sub check_size { 413sub check_size {
352 my ($self) = @_; 414 my ($self, $forced) = @_;
353 415
354 $self->{parent} 416 $self->{force_alloc} = 1 if $forced;
355 or return 1; 417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
356
357 my ($w, $h) = $self->{user_w} && $self->{user_h}
358 ? @$self{qw(user_w user_h)}
359 : $self->size_request;
360
361 if ($w != $self->{req_w} || $h != $self->{req_h}) {
362 $self->{req_w} = $w;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else {
373 0
374 }
375} 418}
376 419
377sub update { 420sub update {
378 my ($self) = @_; 421 my ($self) = @_;
379 422
388} 431}
389 432
390sub emit { 433sub emit {
391 my ($self, $signal, @args) = @_; 434 my ($self, $signal, @args) = @_;
392 435
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 437}
397 438
398sub DESTROY { 439sub DESTROY {
399 my ($self) = @_; 440 my ($self) = @_;
400 441
442 delete $WIDGET{$self+0};
401 #$self->deactivate; 443 #$self->deactivate;
402} 444}
403 445
404############################################################################# 446#############################################################################
405 447
467sub new { 509sub new {
468 my ($class, %arg) = @_; 510 my ($class, %arg) = @_;
469 511
470 my $children = delete $arg{children} || []; 512 my $children = delete $arg{children} || [];
471 513
472 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 );
473 $self->add ($_) for @$children; 519 $self->add ($_) for @$children;
474 520
475 $self 521 $self
476} 522}
477 523
478sub add { 524sub add {
479 my ($self, $child) = @_; 525 my ($self, @widgets) = @_;
480 526
481 $child->set_parent ($self); 527 $_->set_parent ($self)
528 for @widgets;
482 529
483 use sort 'stable'; 530 use sort 'stable';
484 531
485 $self->{children} = [ 532 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 533 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 534 @{$self->{children}}, @widgets
488 ]; 535 ];
489 536
490 $child->check_size; 537 $self->check_size (1);
538 $self->update;
539}
540
541sub children {
542 @{ $_[0]{children} }
491} 543}
492 544
493sub remove { 545sub remove {
494 my ($self, $child) = @_; 546 my ($self, $child) = @_;
495 547
496 delete $child->{parent}; 548 delete $child->{parent};
549 $child->hide;
497 550
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552
553 $self->check_size;
554 $self->update;
555}
556
557sub clear {
558 my ($self) = @_;
559
560 my $children = delete $self->{children};
561 $self->{children} = [];
562
563 for (@$children) {
564 delete $_->{parent};
565 $_->hide;
566 }
499 567
500 $self->check_size; 568 $self->check_size;
501 $self->update; 569 $self->update;
502} 570}
503 571
581} 649}
582 650
583sub update { 651sub update {
584 my ($self) = @_; 652 my ($self) = @_;
585 653
586 # we want to do this delayed... 654 $ROOT->on_post_alloc ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 655 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 656}
600 657
601sub size_allocate { 658sub size_allocate {
602 my ($self, $w, $h) = @_; 659 my ($self, $w, $h) = @_;
603 660
604 $self->child->configure (0, 0, $w, $h); 661 $self->SUPER::size_allocate ($w, $h);
662 $self->update;
663}
605 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
606 $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 };
607} 685}
608 686
609sub _draw { 687sub _draw {
610 my ($self) = @_; 688 my ($self) = @_;
611 689
612 my ($w, $h) = ($self->w, $self->h); 690 my ($w, $h) = ($self->w, $self->h);
613 691
614 my $tex = $self->{texture} 692 my $tex = $self->{texture}
615 or return; 693 or return;
616 694
617 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 695 glEnable GL_TEXTURE_2D;
620 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;
621 698
622 $tex->draw_quad (0, 0, $w, $h); 699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623 700
624 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
626} 702}
627 703
628############################################################################# 704#############################################################################
629 705
630package CFClient::UI::ViewPort; 706package CFClient::UI::ViewPort;
631 707
632our @ISA = CFClient::UI::Window::; 708our @ISA = CFClient::UI::Window::;
633 709
634sub new { die }
635
636sub size_request { 710sub size_request {
637 my ($self) = @_; 711 my ($self) = @_;
638 712
639 @$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)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
641 715
642 @$self{qw(child_w child_h)} 716 @$self{qw(child_w child_h)}
643} 717}
644 718
645sub _draw { 719sub size_allocate {
646 my ($self) = @_; 720 my ($self, $w, $h) = @_;
647 721
648 $self->{children}[1]->draw; 722 $self->update;
649} 723}
650 724
725sub set_offset {
726 my ($self, $x, $y) = @_;
651 727
652############################################################################# 728 $self->{view_x} = int $x;
729 $self->{view_y} = int $y;
653 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
654package CFClient::UI::Frame; 772package CFClient::UI::ScrolledWindow;
655 773
656our @ISA = CFClient::UI::Bin::; 774our @ISA = CFClient::UI::HBox::;
657
658use CFClient::OpenGL;
659 775
660sub new { 776sub new {
661 my $class = shift; 777 my $class = shift;
662 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
663 my $self = $class->SUPER::new ( 789 $self = $class->SUPER::new (
664 bg => [1, 1, 1, 1], 790 vp => (new CFClient::UI::ViewPort),
665 border_bg => [1, 1, 1, 1], 791 slider => $slider,
666 border => 0.8,
667 @_ 792 @_,
668 ); 793 );
669 794
795 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp});
797 $self->add ($self->{slider});
798
670 $self 799 $self
671} 800}
672 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
673sub _draw { 822sub _draw {
674 my ($self) = @_; 823 my ($self) = @_;
675 824
676 my ($w, $h) = ($self->{w}, $self->{h}); 825 if ($self->{bg}) {
826 my ($w, $h) = @$self{qw(w h)};
677 827
678 glEnable GL_BLEND; 828 glEnable GL_BLEND;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 829 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680 glEnable GL_TEXTURE_2D; 830 glColor @{ $self->{bg} };
681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682 831
683# glBegin GL_QUADS; 832 glBegin GL_QUADS;
684# glColor 0, 0, 0, 0;
685# glVertex 0 , 0; 833 glVertex 0 , 0;
686# glVertex 0 , $h; 834 glVertex 0 , $h;
687# glVertex $w, $h; 835 glVertex $w, $h;
688# glVertex $w, 0; 836 glVertex $w, 0;
689# glEnd; 837 glEnd;
690 838
691
692 $self->child->draw;
693 glDisable GL_BLEND; 839 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 840 }
841
842 $self->SUPER::_draw;
695} 843}
696 844
697############################################################################# 845#############################################################################
698 846
699package CFClient::UI::FancyFrame; 847package CFClient::UI::FancyFrame;
710 my $class = shift; 858 my $class = shift;
711 859
712 # TODO: user_x, user_y, overwrite moveto? 860 # TODO: user_x, user_y, overwrite moveto?
713 861
714 my $self = $class->SUPER::new ( 862 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 863 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 864 border_bg => [1, 1, 1, 1],
717 border => 0.8, 865 border => 0.6,
866 toplevel => 1,
718 can_events => 1, 867 can_events => 1,
719 @_ 868 @_
720 ); 869 );
721 870
722 $self->{title} &&= new CFClient::UI::Label 871 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 872 align => 0,
724 valign => 1, 873 valign => 1,
725 text => $self->{title}, 874 text => $self->{title},
726 fontsize => 1; 875 fontsize => $self->{border};
727 876
728 $self 877 $self
729} 878}
730 879
731sub border { 880sub border {
756} 905}
757 906
758sub button_down { 907sub button_down {
759 my ($self, $ev, $x, $y) = @_; 908 my ($self, $ev, $x, $y) = @_;
760 909
910 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 911 my $border = $self->border;
762 912
763 if ($x < $self->{w} && $x >= $self->{w} - $border 913 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 914 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 915
916 if ($lr & $td) {
917 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 919 my ($bw, $bh) = ($self->{w}, $self->{h});
768 920
921 my $mx = $x < $border;
922 my $my = $y < $border;
923
769 $self->{motion} = sub { 924 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 925 my ($ev, $x, $y) = @_;
771 926
772 ($x, $y) = ($ev->{x}, $ev->{y}); 927 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy;
773 929
774 $self->{user_w} = $bw + $x - $ox; 930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 933 $self->check_size;
777 }; 934 };
778 935
779 } elsif ($x >= 0 && $x < $self->{w} 936 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 937 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 938 my ($bx, $by) = ($self->{x}, $self->{y});
784 939
785 $self->{motion} = sub { 940 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
809 my ($self) = @_; 964 my ($self) = @_;
810 965
811 my ($w, $h ) = ($self->{w}, $self->{h}); 966 my ($w, $h ) = ($self->{w}, $self->{h});
812 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813 968
814 glEnable GL_BLEND;
815 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816 glEnable GL_TEXTURE_2D; 969 glEnable GL_TEXTURE_2D;
817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818 971
819 my $border = $self->border; 972 my $border = $self->border;
820 973
821 glColor @{ $self->{border_bg} }; 974 glColor @{ $self->{border_bg} };
822 $tex[1]->draw_quad (0, 0, $w, $border); 975 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
826 979
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 981 my $bg = $tex[0];
828 982
829 # TODO: repeat texture not scale 983 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 984 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 985 my $rep_y = $ch / $bg->{h};
832 986
833 glColor @{ $self->{bg} }; 987 glColor @{ $self->{bg} };
834 988
835 $bg->{s} = $rep_x; 989 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 990 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 991 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 992 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 }
839 994
840 glDisable GL_TEXTURE_2D; 995 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND;
842 996
843 $self->{title}->draw if $self->{title}; 997 $self->{title}->draw if $self->{title};
998
844 $self->child->draw; 999 $self->child->draw;
845} 1000}
846 1001
847############################################################################# 1002#############################################################################
848 1003
870 $self->{children}[$y][$x] = $child; 1025 $self->{children}[$y][$x] = $child;
871 1026
872 $child->check_size; 1027 $child->check_size;
873} 1028}
874 1029
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
875# 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?
876sub clear { 1035sub clear {
877 my ($self) = @_; 1036 my ($self) = @_;
878 1037
1038 my @children = $self->children;
879 delete $self->{children}; 1039 delete $self->{children};
1040
1041 for (@children) {
1042 delete $_->{parent};
1043 $_->hide;
1044 }
1045
880 $self->update; 1046 $self->update;
881} 1047}
882 1048
883sub get_wh { 1049sub get_wh {
884 my ($self) = @_; 1050 my ($self) = @_;
1061} 1227}
1062 1228
1063sub size_allocate { 1229sub size_allocate {
1064 my ($self, $w, $h) = @_; 1230 my ($self, $w, $h) = @_;
1065 1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1066 my $children = $self->{children}; 1234 my $children = $self->{children};
1067 1235
1068 my @h = map $_->{req_h}, @$children; 1236 my @h = map $_->{req_h}, @$children;
1069 1237
1070 my $req_h = List::Util::sum @h; 1238 my $req_h = List::Util::sum @h;
1107 1275
1108sub new { 1276sub new {
1109 my ($class, %arg) = @_; 1277 my ($class, %arg) = @_;
1110 1278
1111 my $self = $class->SUPER::new ( 1279 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1280 fg => [1, 1, 1],
1113 #font => default_font 1281 #font => default_font
1282 #text => initial text
1283 #markup => initial narkup
1284 layout => (new CFClient::Layout),
1114 fontsize => 1, 1285 fontsize => 1,
1115 text => "",
1116 align => -1, 1286 align => -1,
1117 valign => -1, 1287 valign => -1,
1118 padding => 2, 1288 padding => 2,
1119 layout => new CFClient::Layout,
1120 can_events => 0, 1289 can_events => 0,
1121 %arg 1290 %arg
1122 ); 1291 );
1123 1292
1124 if (exists $self->{template}) { 1293 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1294 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1295 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1296 $self->{template} = $layout;
1128 } 1297 }
1129 1298
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1299 if (exists $self->{markup}) {
1131 $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 }
1132 1304
1133 $self 1305 $self
1134} 1306}
1135 1307
1136sub escape_text { 1308sub escape {
1137 local $_ = $_[1]; 1309 local $_ = $_[1];
1138 1310
1139 s/&/&amp;/g; 1311 s/&/&amp;/g;
1140 s/>/&gt;/g; 1312 s/>/&gt;/g;
1141 s/</&lt;/g; 1313 s/</&lt;/g;
1142 1314
1143 $_[1] 1315 $_[1]
1144} 1316}
1145 1317
1318sub update {
1319 my ($self) = @_;
1320
1321 delete $self->{texture};
1322 $self->SUPER::update;
1323}
1324
1146sub set_text { 1325sub set_text {
1147 my ($self, $text) = @_; 1326 my ($self, $text) = @_;
1148 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;
1149 $self->{layout}->set_text ($text); 1332 $self->{layout}->set_text ($text);
1150 1333
1151 delete $self->{texture}; 1334 $self->update;
1152 $self->check_size; 1335 $self->check_size;
1153 $self->update;
1154} 1336}
1155 1337
1156sub set_markup { 1338sub set_markup {
1157 my ($self, $markup) = @_; 1339 my ($self, $markup) = @_;
1158 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;
1159 $self->{layout}->set_markup ($markup); 1347 $self->{layout}->set_markup ($markup);
1160 1348
1161 delete $self->{texture}; 1349 $self->update;
1162 $self->check_size; 1350 $self->check_size;
1163 $self->update;
1164} 1351}
1165 1352
1166sub size_request { 1353sub size_request {
1167 my ($self) = @_; 1354 my ($self) = @_;
1168 1355
1197sub set_fontsize { 1384sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1385 my ($self, $fontsize) = @_;
1199 1386
1200 $self->{fontsize} = $fontsize; 1387 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1388 delete $self->{texture};
1389
1390 $self->update;
1202 $self->check_size; 1391 $self->check_size;
1203 $self->update;
1204} 1392}
1205 1393
1206sub _draw { 1394sub _draw {
1207 my ($self) = @_; 1395 my ($self) = @_;
1208 1396
1209 my $tex = $self->{texture} ||= do { 1397 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1399 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $self->{layout}->set_width ($self->{w}); 1400 $self->{layout}->set_width ($self->{w});
1212 $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
1213 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
1214 }; 1414 };
1215 1415
1216 glEnable GL_BLEND;
1217 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218 glEnable GL_TEXTURE_2D; 1416 glEnable GL_TEXTURE_2D;
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220 1418
1419 if ($tex->{format} == GL_ALPHA) {
1221 glColor @{$self->{fg}}; 1420 glColor @{$self->{fg}};
1222
1223 $self->{ox} = int (
1224 $self->{align} < 0 ? $self->{padding}
1225 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226 : ($self->{w} - $tex->{w}) * 0.5
1227 );
1228
1229 $self->{oy} = int (
1230 $self->{valign} < 0 ? $self->{padding}
1231 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232 : ($self->{h} - $tex->{h}) * 0.5
1233 );
1234
1235 $tex->draw_quad ($self->{ox}, $self->{oy}); 1421 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1422 } else {
1423 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1424 }
1236 1425
1237 glDisable GL_TEXTURE_2D; 1426 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1427}
1240 1428
1241############################################################################# 1429#############################################################################
1242 1430
1243package CFClient::UI::EntryBase; 1431package CFClient::UI::EntryBase;
1248 1436
1249sub new { 1437sub new {
1250 my $class = shift; 1438 my $class = shift;
1251 1439
1252 $class->SUPER::new ( 1440 $class->SUPER::new (
1253 fg => [1, 1, 1], 1441 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1442 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1443 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1444 active_fg => [0, 0, 0],
1257 can_hover => 1, 1445 can_hover => 1,
1258 can_focus => 1, 1446 can_focus => 1,
1259 valign => 0, 1447 valign => 0,
1260 can_events => 1, 1448 can_events => 1,
1261 @_ 1449 @_
1262 ) 1450 )
1263} 1451}
1264 1452
1278 $self->{layout}->set_text ("$text "); 1466 $self->{layout}->set_text ("$text ");
1279 1467
1280 $self->emit (changed => $self->{text}); 1468 $self->emit (changed => $self->{text});
1281} 1469}
1282 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
1283sub get_text { 1480sub get_text {
1284 $_[0]{text} 1481 $_[0]{text}
1285} 1482}
1286 1483
1287sub size_request { 1484sub size_request {
1294 1491
1295sub size_allocate { 1492sub size_allocate {
1296 my ($self, $w, $h) = @_; 1493 my ($self, $w, $h) = @_;
1297 1494
1298 $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
1299}
1300
1301sub set_text {
1302 my ($self, $text) = @_;
1303
1304 $self->{cursor} = length $text;
1305 $self->_set_text ($text);
1306 $self->update;
1307} 1496}
1308 1497
1309sub key_down { 1498sub key_down {
1310 my ($self, $ev) = @_; 1499 my ($self, $ev) = @_;
1311 1500
1313 my $sym = $ev->{sym}; 1502 my $sym = $ev->{sym};
1314 my $uni = $ev->{unicode}; 1503 my $uni = $ev->{unicode};
1315 1504
1316 my $text = $self->get_text; 1505 my $text = $self->get_text;
1317 1506
1318 if ($sym == 8) { 1507 if ($uni == 8) {
1319 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1508 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320 } elsif ($sym == 127) { 1509 } elsif ($uni == 127) {
1321 substr $text, $self->{cursor}, 1, ""; 1510 substr $text, $self->{cursor}, 1, "";
1322 } elsif ($sym == CFClient::SDLK_LEFT) { 1511 } elsif ($sym == CFClient::SDLK_LEFT) {
1323 --$self->{cursor} if $self->{cursor}; 1512 --$self->{cursor} if $self->{cursor};
1324 } elsif ($sym == CFClient::SDLK_RIGHT) { 1513 } elsif ($sym == CFClient::SDLK_RIGHT) {
1325 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1514 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1326 } elsif ($sym == CFClient::SDLK_HOME) { 1515 } elsif ($sym == CFClient::SDLK_HOME) {
1327 $self->{cursor} = 0; 1516 $self->{cursor} = 0;
1328 } elsif ($sym == CFClient::SDLK_END) { 1517 } elsif ($sym == CFClient::SDLK_END) {
1329 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1330 } elsif ($sym == 27) { 1519 } elsif ($uni == 27) {
1331 $self->emit ('escape'); 1520 $self->emit ('escape');
1332 } elsif ($uni) { 1521 } elsif ($uni) {
1333 substr $text, $self->{cursor}++, 0, chr $uni; 1522 substr $text, $self->{cursor}++, 0, chr $uni;
1334 } 1523 }
1335 1524
1418 my ($self, $ev) = @_; 1607 my ($self, $ev) = @_;
1419 1608
1420 my $sym = $ev->{sym}; 1609 my $sym = $ev->{sym};
1421 1610
1422 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} = '';
1423 $self->emit (activate => $self->get_text); 1616 $self->emit (activate => $txt);
1424 $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 }
1425 1640
1426 } else { 1641 } else {
1427 $self->SUPER::key_down ($ev); 1642 $self->SUPER::key_down ($ev);
1428 } 1643 }
1429 1644
1443 1658
1444sub new { 1659sub new {
1445 my $class = shift; 1660 my $class = shift;
1446 1661
1447 $class->SUPER::new ( 1662 $class->SUPER::new (
1448 padding => 4, 1663 padding => 4,
1449 fg => [1, 1, 1], 1664 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1665 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1666 active_fg => [0, 0, 1],
1452 can_hover => 1, 1667 can_hover => 1,
1453 align => 0, 1668 align => 0,
1454 valign => 0, 1669 valign => 0,
1455 can_events => 1, 1670 can_events => 1,
1456 @_ 1671 @_
1457 ) 1672 )
1458} 1673}
1459 1674
1473 1688
1474 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1476 } 1691 }
1477 1692
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1693 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1695 glColor 0, 0, 0, 1;
1483 1696
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1698
1486 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1700
1489 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1490} 1702}
1491 1703
1492############################################################################# 1704#############################################################################
1539 1751
1540 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;
1541 1753
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 1755
1544 glEnable GL_BLEND; 1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1545 glEnable GL_TEXTURE_2D; 1758 glEnable GL_TEXTURE_2D;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548 my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550 $tex->draw_quad (0, 0, $s, $s); 1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 1761}
1555 1762
1556############################################################################# 1763#############################################################################
1557 1764
1558package CFClient::UI::Image; 1765package CFClient::UI::Image;
1601 glTranslate 0, -$self->{w}, 0; 1808 glTranslate 0, -$self->{w}, 0;
1602 1809
1603 ($w, $h) = ($h, $w); 1810 ($w, $h) = ($h, $w);
1604 } 1811 }
1605 1812
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 1815
1611 $tex->draw_quad (0, 0, $w, $h); 1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 1817
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1615} 1819}
1616 1820
1617############################################################################# 1821#############################################################################
1618 1822
1666} 1870}
1667 1871
1668sub set_max { 1872sub set_max {
1669 my ($self, $max) = @_; 1873 my ($self, $max) = @_;
1670 1874
1875 return if $self->{max_val} == $max;
1876
1671 $self->{max_val} = $max; 1877 $self->{max_val} = $max;
1878 $self->update;
1672} 1879}
1673 1880
1674sub set_value { 1881sub set_value {
1675 my ($self, $val, $max) = @_; 1882 my ($self, $val, $max) = @_;
1676 1883
1677 $self->set_max ($max) 1884 $self->set_max ($max)
1678 if defined $max; 1885 if defined $max;
1679 1886
1680 $max = $self->{max_val}; 1887 return if $self->{val} == $val;
1888
1681 $self->{val} = $val; 1889 $self->{val} = $val;
1682
1683 $self->update; 1890 $self->update;
1684} 1891}
1685 1892
1686sub _draw { 1893sub _draw {
1687 my ($self) = @_; 1894 my ($self) = @_;
1750 1957
1751sub new { 1958sub new {
1752 my ($class, %arg) = @_; 1959 my ($class, %arg) = @_;
1753 1960
1754 my $self = $class->SUPER::new ( 1961 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1962 tooltip => $arg{type},
1963 can_hover => 1,
1756 can_events => 1, 1964 can_events => 1,
1757 can_hover => 1,
1758 %arg, 1965 %arg,
1759 ); 1966 );
1760 1967
1761 $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");
1762 $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);
1770 1977
1771 $self->{value}->set_fontsize ($fsize); 1978 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 1979 $self->{max} ->set_fontsize ($fsize);
1773} 1980}
1774 1981
1982sub set_max {
1983 my ($self, $max) = @_;
1984
1985 $self->{gauge}->set_max ($max);
1986 $self->{max}->set_text ($max);
1987}
1988
1775sub set_value { 1989sub set_value {
1776 my ($self, $val, $max) = @_; 1990 my ($self, $val, $max) = @_;
1777 1991
1778 $self->set_max ($max) 1992 $self->set_max ($max)
1779 if defined $max; 1993 if defined $max;
1780 1994
1781 $self->{gauge}->set_value ($val, $max); 1995 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 1996 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 1997}
1791 1998
1792############################################################################# 1999#############################################################################
1793 2000
1794package CFClient::UI::Slider; 2001package CFClient::UI::Slider;
1813 # TODO: calculations are off 2020 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2021 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2022 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 2023 active_fg => [0, 0, 0],
1817 range => [0, 0, 100, 10], 2024 range => [0, 0, 100, 10],
1818 req_w => 20, 2025 req_w => $::WIDTH / 80,
1819 req_h => 20, 2026 req_h => $::WIDTH / 80,
1820 vertical => 0, 2027 vertical => 0,
1821 can_hover => 1, 2028 can_hover => 1,
1822 inner_pad => 5, 2029 inner_pad => 5,
1823 @_ 2030 @_
1824 ); 2031 );
1907 $page ||= 2; 2114 $page ||= 2;
1908 2115
1909 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1910 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1911 2118
1912 glEnable GL_BLEND;
1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1914 glEnable GL_TEXTURE_2D; 2119 glEnable GL_TEXTURE_2D;
1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916 2121
1917 # draw background 2122 # draw background
1918 $tex[1]->draw_quad (0, 0, $w, $h); 2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1919 2124
1920 # draw handle 2125 # draw handle
1921 $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);
1922 2127
1923 glDisable GL_BLEND;
1924 glDisable GL_TEXTURE_2D; 2128 glDisable GL_TEXTURE_2D;
1925} 2129}
1926 2130
1927############################################################################# 2131#############################################################################
1928 2132
1934 2138
1935sub new { 2139sub new {
1936 my $class = shift; 2140 my $class = shift;
1937 2141
1938 my $self = $class->SUPER::new ( 2142 my $self = $class->SUPER::new (
1939 fontsize => 1, 2143 fontsize => 1,
2144 can_events => 0,
1940 #font => default_font 2145 #font => default_font
1941 @_, 2146 @_,
1942 2147
1943 layout => (new CFClient::Layout), 2148 layout => (new CFClient::Layout 1),
1944 par => [], 2149 par => [],
1945 height => 0, 2150 height => 0,
1946 children => [ 2151 children => [
1947 (new CFClient::UI::Empty expand => 1), 2152 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2153 (new CFClient::UI::Slider vertical => 1),
1949 ], 2154 ],
1950 ); 2155 );
1951 2156
1952 $self->{children}[1]->connect (changed => sub { 2157 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2158
1956 $self 2159 $self
1957} 2160}
1958 2161
1959sub set_fontsize { 2162sub set_fontsize {
1967 my ($self, $text) = @_; 2170 my ($self, $text) = @_;
1968 2171
1969 my $layout = $self->{layout}; 2172 my $layout = $self->{layout};
1970 2173
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w}); 2175 $layout->set_width ($self->{children}[0]{w});
1973 $layout->set_text ($text); 2176 $layout->set_markup ($text);
1974 2177
1975 ($layout->size)[1] 2178 ($layout->size)[1]
1976} 2179}
1977 2180
1978sub reflow { 2181sub reflow {
2016 2219
2017 return unless $self->{h} > 0; 2220 return unless $self->{h} > 0;
2018 2221
2019 delete $self->{texture}; 2222 delete $self->{texture};
2020 2223
2021 $ROOT->on_refresh ($self, sub { 2224 $ROOT->on_post_alloc ($self, sub {
2022 if (delete $self->{need_reflow}) { 2225 if (delete $self->{need_reflow}) {
2023 my $height = 0; 2226 my $height = 0;
2024 2227
2025 $height += $_->[0] = $self->text_height ($_->[2]) 2228 $height += $_->[0] = $self->text_height ($_->[2])
2026 for @{$self->{par}}; 2229 for @{$self->{par}};
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2031 2234
2032 delete $self->{texture}; 2235 delete $self->{texture};
2033 } 2236 }
2034 2237
2035 $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 {
2036 glClearColor 0, 0, 0, 1; 2239 glClearColor 0, 0, 0, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2240 glClear GL_COLOR_BUFFER_BIT;
2038 2241
2039 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2244
2044 my $top = int $self->{children}[1]{range}[0]; 2245 my $top = int $self->{children}[1]{range}[0];
2045 2246
2054 2255
2055 for my $par (@{$self->{par}}) { 2256 for my $par (@{$self->{par}}) {
2056 my $h = $par->[0]; 2257 my $h = $par->[0];
2057 2258
2058 if ($y0 < $y + $h && $y < $y1) { 2259 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] });
2059 $layout->set_text ($par->[2]); 2261 $layout->set_markup ($par->[2]);
2060 2262
2061 glColor @{ $par->[1] };
2062 my ($W, $H) = $layout->size; 2263 my ($W, $H) = $layout->size;
2063 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);
2064 } 2265 }
2065 2266
2066 $y += $h; 2267 $y += $h;
2067 } 2268 }
2068 2269
2069 glDisable GL_TEXTURE_2D; 2270 glDisable GL_TEXTURE_2D;
2070 glDisable GL_BLEND;
2071 }; 2271 };
2072 }); 2272 });
2073} 2273}
2074 2274
2075sub _draw { 2275sub _draw {
2076 my ($self) = @_; 2276 my ($self) = @_;
2077 2277
2078 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2278 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2081 $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});
2082 glDisable GL_TEXTURE_2D; 2282 glDisable GL_TEXTURE_2D;
2083 }
2084 2283
2085 $self->{children}[1]->draw; 2284 $self->{children}[1]->draw;
2086 2285
2087} 2286}
2088 2287
2136 2335
2137sub new { 2336sub new {
2138 my $class = shift; 2337 my $class = shift;
2139 2338
2140 my $self = $class->SUPER::new ( 2339 my $self = $class->SUPER::new (
2141 state => 0, 2340 state => 0,
2142 connect_activate => \&toggle_flopper, 2341 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2342 @_
2145 ); 2343 );
2146 2344
2147 if ($self->{state}) { 2345 if ($self->{state}) {
2148 $self->{state} = 0; 2346 $self->{state} = 0;
2183 @_, 2381 @_,
2184 can_events => 0, 2382 can_events => 0,
2185 ) 2383 )
2186} 2384}
2187 2385
2188sub set_text { 2386sub set_tooltip_from {
2189 my ($self, $text) = @_; 2387 my ($self, $widget) = @_;
2190 2388
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2389 $self->add (new CFClient::UI::Label
2192 $self->{label}->set_text ($text); 2390 markup => $widget->{tooltip},
2193 $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 );
2194} 2396}
2195 2397
2196sub size_request { 2398sub size_request {
2197 my ($self) = @_; 2399 my ($self) = @_;
2198 2400
2199 $self->child->set_max_size ($::WIDTH * 0.3);
2200
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2401 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2402
2203 ($w + 4, $h + 4) 2403 ($w + 4, $h + 4)
2204} 2404}
2205 2405
2406sub size_allocate {
2407 my ($self, $w, $h) = @_;
2408
2409 $self->SUPER::size_allocate ($w - 4, $h - 4);
2410}
2411
2206sub _draw { 2412sub _draw {
2207 my ($self) = @_; 2413 my ($self) = @_;
2208 2414
2209 glPushMatrix;
2210 glTranslate 0.375, 0.375; 2415 glTranslate 0.375, 0.375;
2211 2416
2212 my ($w, $h) = @$self{qw(w h)}; 2417 my ($w, $h) = @$self{qw(w h)};
2213 2418
2214 glColor 1, 0.8, 0.4; 2419 glColor 1, 0.8, 0.4;
2225 glVertex 0 , $h; 2430 glVertex 0 , $h;
2226 glVertex $w, $h; 2431 glVertex $w, $h;
2227 glVertex $w, 0; 2432 glVertex $w, 0;
2228 glEnd; 2433 glEnd;
2229 2434
2230 glPopMatrix; 2435 glTranslate 2 - 0.375, 2 - 0.375;
2231
2232 glTranslate 2, 2;
2233 $self->SUPER::_draw; 2436 $self->SUPER::_draw;
2234} 2437}
2235 2438
2236############################################################################# 2439#############################################################################
2237 2440
2441package CFClient::UI::Face;
2442
2443our @ISA = CFClient::UI::Base::;
2444
2445use CFClient::OpenGL;
2446
2447sub new {
2448 my $class = shift;
2449
2450 $class->SUPER::new (
2451 aspect => 1,
2452 @_,
2453 )
2454}
2455
2456sub size_request {
2457 (32, 8)
2458}
2459
2460sub _draw {
2461 my ($self) = @_;
2462
2463 return unless $::CONN;#d# manage and cache textures differently
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2465
2466 # TODO animation
2467 if ($tex) {
2468 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D;
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;
2751}
2752
2753#############################################################################
2754
2238package CFClient::UI::Root; 2755package CFClient::UI::Root;
2239 2756
2240our @ISA = CFClient::UI::Container::; 2757our @ISA = CFClient::UI::Container::;
2241 2758
2242use CFClient::OpenGL; 2759use CFClient::OpenGL;
2243 2760
2244sub check_size { 2761sub new {
2245 my ($self) = @_; 2762 my $class = shift;
2246 2763
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2764 $class->SUPER::new (
2248} 2765 @_,
2249 2766 )
2250sub size_request {
2251 ($::WIDTH, $::HEIGHT)
2252} 2767}
2253 2768
2254sub configure { 2769sub configure {
2255 my ($self, $x, $y, $w, $h) = @_; 2770 my ($self, $x, $y, $w, $h) = @_;
2256 2771
2257 $self->SUPER::configure ($x, $y, $w, $h); 2772 $self->{w} = $w;
2773 $self->{h} = $h;
2774}
2258 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
2259 for my $child (@{$self->{children}}) { 2798 for my $child ($self->children) {
2260 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)};
2261 2800
2262 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2801 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2263 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2264 $child->configure ($X, $Y, $W,$H); 2803 $child->configure ($X, $Y, $W, $H);
2265 } 2804 }
2266} 2805}
2267 2806
2268sub _topleft { 2807sub coord2local {
2269 my ($self, $x, $y) = @_; 2808 my ($self, $x, $y) = @_;
2270 2809
2271 ($x, $y) 2810 ($x, $y)
2272} 2811}
2273 2812
2813sub coord2global {
2814 my ($self, $x, $y) = @_;
2815
2816 ($x, $y)
2817}
2818
2274sub update { 2819sub update {
2275 my ($self) = @_; 2820 my ($self) = @_;
2276 2821
2277 $self->check_size; 2822 $self->check_size;
2278 ::refresh (); 2823 $::WANT_REFRESH++;
2279} 2824}
2280 2825
2281sub add { 2826sub add {
2282 my ($self, $child) = @_; 2827 my ($self, @children) = @_;
2283 2828
2829 for my $child (@children) {
2830 $child->{toplevel} = 1;
2831
2284 # integerize window positions 2832 # integerise window positions
2285 $child->{x} = int $child->{x}; 2833 $child->{x} = int $child->{x};
2286 $child->{y} = int $child->{y}; 2834 $child->{y} = int $child->{y};
2835 }
2287 2836
2288 $self->SUPER::add ($child); 2837 $self->SUPER::add (@children);
2289} 2838}
2290 2839
2291sub on_refresh { 2840sub on_refresh {
2292 my ($self, $id, $cb) = @_; 2841 my ($self, $id, $cb) = @_;
2293 2842
2294 $self->{refresh_hook}{$id} = $cb; 2843 $self->{refresh_hook}{$id} = $cb;
2295} 2844}
2296 2845
2846sub on_post_alloc {
2847 my ($self, $id, $cb) = @_;
2848
2849 $self->{post_alloc_hook}{$id} = $cb;
2850}
2851
2297sub draw { 2852sub draw {
2298 my ($self) = @_; 2853 my ($self) = @_;
2299 2854
2300 while (my $rcb = delete $self->{refresh_hook}) { 2855 while ($self->{refresh_hook}) {
2301 $_->() 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}};
2302 } 2908 }
2303 2909
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2910 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 2912 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines