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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC

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

Diff Legend

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