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

Diff Legend

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