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.195 by root, Thu May 11 23:54:31 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_markup ($widget->{tooltip}); 29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 30
30 $TOOLTIP->show; 31 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
31 } 40 }
32 41
33 return; 42 return;
34 } 43 }
35 } 44 }
… …
39 delete $TOOLTIP->{owner}; 48 delete $TOOLTIP->{owner};
40} 49}
41 50
42# class methods for events 51# class methods for events
43sub feed_sdl_key_down_event { 52sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
54 if $FOCUS;
45} 55}
46 56
47sub feed_sdl_key_up_event { 57sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
59 if $FOCUS;
49} 60}
50 61
51sub feed_sdl_button_down_event { 62sub feed_sdl_button_down_event {
52 my ($ev) = @_; 63 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 64 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 72 check_tooltip;
62 } 73 }
63 74
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 75 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 76
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 77 if ($GRAB) {
78 ($x, $y) = $GRAB->coord2local ($x, $y);
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
67} 81}
68 82
69sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
70 my ($ev) = @_; 84 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
72 86
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 88
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 90
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 91 if ($GRAB) {
92 ($x, $y) = $GRAB->coord2local ($x, $y);
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
78 95
79 if (!$BUTTON_STATE) { 96 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 97 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 98 $grab->update if $grab;
82 $GRAB->update if $GRAB; 99 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 115 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 116
100 check_tooltip; 117 check_tooltip;
101 } 118 }
102 119
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
123 }
104} 124}
105 125
106# convert position array to integers 126# convert position array to integers
107sub harmonize { 127sub harmonize {
108 my ($vals) = @_; 128 my ($vals) = @_;
… …
126 146
127sub new { 147sub new {
128 my $class = shift; 148 my $class = shift;
129 149
130 my $self = bless { 150 my $self = bless {
131 x => 0, 151 x => 0,
132 y => 0, 152 y => 0,
133 z => 0, 153 z => 0,
134 can_events => 1, 154 can_events => 1,
135 @_ 155 @_
136 }, $class; 156 }, $class;
137 157
138 for (keys %$self) { 158 for (keys %$self) {
… …
160} 180}
161 181
162sub hide { 182sub hide {
163 my ($self) = @_; 183 my ($self) = @_;
164 184
165 return unless $self->{parent}; 185 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self;
166 187
167 $self->{parent}->remove ($self); 188 $self->{parent}->remove ($self)
189 if $self->{parent};
168} 190}
169 191
170sub move { 192sub move {
171 my ($self, $x, $y, $z) = @_; 193 my ($self, $x, $y, $z) = @_;
172 194
… …
211 $self->{y} = $y; 233 $self->{y} = $y;
212 $self->update; 234 $self->update;
213 } 235 }
214 236
215 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 239 }
222} 240}
223 241
224sub size_allocate { 242sub size_allocate {
225 # nothing to be done 243 # nothing to be done
226} 244}
227 245
246sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259}
260
228sub set_max_size { 261sub set_max_size {
229 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
230 263
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
233}
234
235# return top left coordinates
236sub _topleft {
237 my ($self, $x, $y) = @_;
238
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 266}
241 267
242# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
243sub coord2local { 269sub coord2local {
244 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
245 271
246 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 273}
249 274
250# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
251sub coord2global { 276sub coord2global {
252 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
253 278
254 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 280}
257 281
258sub focus_in { 282sub focus_in {
259 my ($self) = @_; 283 my ($self) = @_;
260 284
… …
358 382
359sub set_parent { 383sub set_parent {
360 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
361 385
362 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
363} 390}
364 391
365sub check_size { 392sub check_size {
366 my ($self) = @_; 393 my ($self) = @_;
367 394
368 $self->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
369 or return 1;
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} 396}
390 397
391sub update { 398sub update {
392 my ($self) = @_; 399 my ($self) = @_;
393 400
… …
402} 409}
403 410
404sub emit { 411sub emit {
405 my ($self, $signal, @args) = @_; 412 my ($self, $signal, @args) = @_;
406 413
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 415}
411 416
412sub DESTROY { 417sub DESTROY {
413 my ($self) = @_; 418 my ($self) = @_;
414 419
… …
481sub new { 486sub new {
482 my ($class, %arg) = @_; 487 my ($class, %arg) = @_;
483 488
484 my $children = delete $arg{children} || []; 489 my $children = delete $arg{children} || [];
485 490
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 491 my $self = $class->SUPER::new (
492 children => [],
493 can_events => 0,
494 %arg,
495 );
487 $self->add ($_) for @$children; 496 $self->add ($_) for @$children;
488 497
489 $self 498 $self
490} 499}
491 500
492sub add { 501sub add {
493 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
494 503
495 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
496 506
497 use sort 'stable'; 507 use sort 'stable';
498 508
499 $self->{children} = [ 509 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
502 ]; 512 ];
503 513
504 $child->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub children {
519 @{ $_[0]{children} }
505} 520}
506 521
507sub remove { 522sub remove {
508 my ($self, $child) = @_; 523 my ($self, $child) = @_;
509 524
510 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
511 527
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 529
514 $self->check_size; 530 $self->check_size;
515 $self->update; 531 $self->update;
516} 532}
517 533
518sub clear { 534sub clear {
519 my ($self) = @_; 535 my ($self) = @_;
520 536
521 delete $_->{parent} 537 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
544
545 $self->check_size;
546 $self->update;
525} 547}
526 548
527sub find_widget { 549sub find_widget {
528 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
529 551
… …
604} 626}
605 627
606sub update { 628sub update {
607 my ($self) = @_; 629 my ($self) = @_;
608 630
609 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 632 $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} 633}
623 634
624sub size_allocate { 635sub size_allocate {
625 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
626 637
627 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
628 641
642sub _render {
643 $_[0]{children}[0]->draw;
644}
645
646sub render_child {
647 my ($self) = @_;
648
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT;
652
629 $self->render_chld; 653 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 };
630} 662}
631 663
632sub _draw { 664sub _draw {
633 my ($self) = @_; 665 my ($self) = @_;
634 666
635 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
636 668
637 my $tex = $self->{texture} 669 my $tex = $self->{texture}
638 or return; 670 or return;
639 671
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1;
644 675
645 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 677
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
649} 679}
650 680
651############################################################################# 681#############################################################################
652 682
653package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
654 684
655our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
656 686
657sub new { die }
658
659sub size_request { 687sub size_request {
660 my ($self) = @_; 688 my ($self) = @_;
661 689
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 690 @$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)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
664 692
665 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
666} 694}
667 695
668sub _draw { 696sub size_allocate {
669 my ($self) = @_; 697 my ($self, $w, $h) = @_;
670 698
671 $self->{children}[1]->draw; 699 $self->update;
672} 700}
673 701
702sub set_offset {
703 my ($self, $x, $y) = @_;
704
705 $self->{view_x} = int $x;
706 $self->{view_y} = int $y;
707
708 $self->update;
709}
710
711# hmm, this does not work for topleft of $self... but we should not ask for that
712sub coord2local {
713 my ($self, $x, $y) = @_;
714
715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
725}
726
727sub find_widget {
728 my ($self, $x, $y) = @_;
729
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y)
736 }
737}
738
739sub _render {
740 my ($self) = @_;
741
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743
744 $self->SUPER::_render;
745}
746
747#############################################################################
748
749package CFClient::UI::ScrolledWindow;
750
751our @ISA = CFClient::UI::HBox::;
752
753sub new {
754 my $class = shift;
755
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort),
768 slider => $slider,
769 @_,
770 );
771
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
674 781
675############################################################################# 782#############################################################################
676 783
677package CFClient::UI::Frame; 784package CFClient::UI::Frame;
678 785
… …
733 my $class = shift; 840 my $class = shift;
734 841
735 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
736 843
737 my $self = $class->SUPER::new ( 844 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
740 border => 0.8, 847 border => 0.6,
741 can_events => 1, 848 can_events => 1,
742 @_ 849 @_
743 ); 850 );
744 851
745 $self->{title} &&= new CFClient::UI::Label 852 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 853 align => 0,
747 valign => 1, 854 valign => 1,
748 text => $self->{title}, 855 text => $self->{title},
749 fontsize => 1; 856 fontsize => $self->{border};
750 857
751 $self 858 $self
752} 859}
753 860
754sub border { 861sub border {
… …
779} 886}
780 887
781sub button_down { 888sub button_down {
782 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
783 890
891 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 892 my $border = $self->border;
785 893
786 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
791 901
902 my $mx = $x < $border;
903 my $my = $y < $border;
904
792 $self->{motion} = sub { 905 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
794 907
795 ($x, $y) = ($ev->{x}, $ev->{y}); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
796 910
797 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
799 $self->check_size; 914 $self->check_size;
800 }; 915 };
801 916
802 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
807 920
808 $self->{motion} = sub { 921 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
… …
845 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
849 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850 my $bg = $tex[0]; 964 my $bg = $tex[0];
851 965
852 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
854 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
855 969
856 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
857 971
858 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
862 976
863 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
865 980
866 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
867 $self->child->draw; 983 $self->child->draw;
868} 984}
869 985
870############################################################################# 986#############################################################################
871 987
… …
893 $self->{children}[$y][$x] = $child; 1009 $self->{children}[$y][$x] = $child;
894 1010
895 $child->check_size; 1011 $child->check_size;
896} 1012}
897 1013
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
898# TODO: move to container class maybe? send childs a signal on removal? 1018# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 1019sub clear {
900 my ($self) = @_; 1020 my ($self) = @_;
901 1021
1022 my @children = $self->children;
902 delete $self->{children}; 1023 delete $self->{children};
1024
1025 for (@children) {
1026 delete $_->{parent};
1027 $_->hide;
1028 }
1029
903 $self->update; 1030 $self->update;
904} 1031}
905 1032
906sub get_wh { 1033sub get_wh {
907 my ($self) = @_; 1034 my ($self) = @_;
… …
1084} 1211}
1085 1212
1086sub size_allocate { 1213sub size_allocate {
1087 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1088 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1089 my $children = $self->{children}; 1218 my $children = $self->{children};
1090 1219
1091 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1092 1221
1093 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1130 1259
1131sub new { 1260sub new {
1132 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1133 1262
1134 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1136 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1137 fontsize => 1, 1269 fontsize => 1,
1138 text => "",
1139 align => -1, 1270 align => -1,
1140 valign => -1, 1271 valign => -1,
1141 padding => 2, 1272 padding => 2,
1142 layout => new CFClient::Layout,
1143 can_events => 0, 1273 can_events => 0,
1144 %arg 1274 %arg
1145 ); 1275 );
1146 1276
1147 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1280 $self->{template} = $layout;
1151 } 1281 }
1152 1282
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1154 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1155 1288
1156 $self 1289 $self
1157} 1290}
1158 1291
1159sub escape { 1292sub escape {
… …
1164 s/</&lt;/g; 1297 s/</&lt;/g;
1165 1298
1166 $_[1] 1299 $_[1]
1167} 1300}
1168 1301
1302sub update {
1303 my ($self) = @_;
1304
1305 delete $self->{texture};
1306 $self->SUPER::update;
1307}
1308
1169sub set_text { 1309sub set_text {
1170 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1171 1311
1312 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text";
1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1172 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1173 1317
1174 delete $self->{texture}; 1318 $self->update;
1175 $self->check_size; 1319 $self->check_size;
1176 $self->update;
1177} 1320}
1178 1321
1179sub set_markup { 1322sub set_markup {
1180 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1181 1324
1325 return if $self->{text} eq "M$markup";
1326 $self->{text} = "M$markup";
1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1182 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1183 1332
1184 delete $self->{texture}; 1333 $self->update;
1185 $self->check_size; 1334 $self->check_size;
1186 $self->update;
1187} 1335}
1188 1336
1189sub size_request { 1337sub size_request {
1190 my ($self) = @_; 1338 my ($self) = @_;
1191 1339
… …
1220sub set_fontsize { 1368sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1222 1370
1223 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1225 $self->check_size; 1375 $self->check_size;
1226 $self->update;
1227} 1376}
1228 1377
1229sub _draw { 1378sub _draw {
1230 my ($self) = @_; 1379 my ($self) = @_;
1231 1380
1232 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1236 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1237 }; 1398 };
1238 1399
1239 glEnable GL_BLEND;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1402
1403 if ($tex->{format} == GL_ALPHA) {
1244 glColor @{$self->{fg}}; 1404 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}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1259 1409
1260 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1411}
1263 1412
1264############################################################################# 1413#############################################################################
1265 1414
1266package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1271 1420
1272sub new { 1421sub new {
1273 my $class = shift; 1422 my $class = shift;
1274 1423
1275 $class->SUPER::new ( 1424 $class->SUPER::new (
1276 fg => [1, 1, 1], 1425 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1426 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1427 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1428 active_fg => [0, 0, 0],
1280 can_hover => 1, 1429 can_hover => 1,
1281 can_focus => 1, 1430 can_focus => 1,
1282 valign => 0, 1431 valign => 0,
1283 can_events => 1, 1432 can_events => 1,
1284 @_ 1433 @_
1285 ) 1434 )
1286} 1435}
1287 1436
… …
1301 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1302 1451
1303 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1304} 1453}
1305 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1306sub get_text { 1464sub get_text {
1307 $_[0]{text} 1465 $_[0]{text}
1308} 1466}
1309 1467
1310sub size_request { 1468sub size_request {
… …
1317 1475
1318sub size_allocate { 1476sub size_allocate {
1319 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1320 1478
1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1479 $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} 1480}
1331 1481
1332sub key_down { 1482sub key_down {
1333 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1334 1484
… …
1441 my ($self, $ev) = @_; 1591 my ($self, $ev) = @_;
1442 1592
1443 my $sym = $ev->{sym}; 1593 my $sym = $ev->{sym};
1444 1594
1445 if ($sym == 13) { 1595 if ($sym == 13) {
1596 unshift @{$self->{history}},
1597 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1600 $self->emit (activate => $txt);
1447 $self->update; 1601 $self->update;
1602
1603 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text;
1606 }
1607 if (@{$self->{history} || []} > 0) {
1608 $self->{history_pointer}++;
1609 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1610 $self->{history_pointer} = @{$self->{history} || []} - 1;
1611 }
1612 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1613 }
1614
1615 } elsif ($sym == CFClient::SDLK_DOWN) {
1616 $self->{history_pointer}--;
1617 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1618
1619 if ($self->{history_pointer} >= 0) {
1620 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1621 } else {
1622 $self->set_text ($self->{history_saveback});
1623 }
1448 1624
1449 } else { 1625 } else {
1450 $self->SUPER::key_down ($ev); 1626 $self->SUPER::key_down ($ev);
1451 } 1627 }
1452 1628
… …
1466 1642
1467sub new { 1643sub new {
1468 my $class = shift; 1644 my $class = shift;
1469 1645
1470 $class->SUPER::new ( 1646 $class->SUPER::new (
1471 padding => 4, 1647 padding => 4,
1472 fg => [1, 1, 1], 1648 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1649 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1650 active_fg => [0, 0, 1],
1475 can_hover => 1, 1651 can_hover => 1,
1476 align => 0, 1652 align => 0,
1477 valign => 0, 1653 valign => 0,
1478 can_events => 1, 1654 can_events => 1,
1479 @_ 1655 @_
1480 ) 1656 )
1481} 1657}
1482 1658
… …
1496 1672
1497 if ($GRAB == $self) { 1673 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg}; 1674 $self->{fg} = $self->{active_fg};
1499 } 1675 }
1500 1676
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1677 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1679 glColor 0, 0, 0, 1;
1506 1680
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1681 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1682
1509 glDisable GL_TEXTURE_2D; 1683 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1684
1512 $self->SUPER::_draw; 1685 $self->SUPER::_draw;
1513} 1686}
1514 1687
1515############################################################################# 1688#############################################################################
… …
1562 1735
1563 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1564 1737
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 1739
1567 glEnable GL_BLEND;
1568 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570 1741
1571 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1572 1743
1573 $tex->draw_quad (0, 0, $s, $s); 1744 $tex->draw_quad_alpha (0, 0, $s, $s);
1574 1745
1575 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 1747}
1578 1748
1579############################################################################# 1749#############################################################################
1580 1750
1581package CFClient::UI::Image; 1751package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 1794 glTranslate 0, -$self->{w}, 0;
1625 1795
1626 ($w, $h) = ($h, $w); 1796 ($w, $h) = ($h, $w);
1627 } 1797 }
1628 1798
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 1799 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 1801
1634 $tex->draw_quad (0, 0, $w, $h); 1802 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 1803
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1638} 1805}
1639 1806
1640############################################################################# 1807#############################################################################
1641 1808
… …
1689} 1856}
1690 1857
1691sub set_max { 1858sub set_max {
1692 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1693 1860
1861 return if $self->{max_val} == $max;
1862
1694 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1695} 1865}
1696 1866
1697sub set_value { 1867sub set_value {
1698 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1699 1869
1700 $self->set_max ($max) 1870 $self->set_max ($max)
1701 if defined $max; 1871 if defined $max;
1702 1872
1703 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1704 $self->{val} = $val; 1875 $self->{val} = $val;
1705
1706 $self->update; 1876 $self->update;
1707} 1877}
1708 1878
1709sub _draw { 1879sub _draw {
1710 my ($self) = @_; 1880 my ($self) = @_;
… …
1773 1943
1774sub new { 1944sub new {
1775 my ($class, %arg) = @_; 1945 my ($class, %arg) = @_;
1776 1946
1777 my $self = $class->SUPER::new ( 1947 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 1948 tooltip => $arg{type},
1949 can_hover => 1,
1779 can_events => 1, 1950 can_events => 1,
1780 can_hover => 1,
1781 %arg, 1951 %arg,
1782 ); 1952 );
1783 1953
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1954 $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); 1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 1963
1794 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1796} 1966}
1797 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1798sub set_value { 1975sub set_value {
1799 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1800 1977
1801 $self->set_max ($max) 1978 $self->set_max ($max)
1802 if defined $max; 1979 if defined $max;
1803 1980
1804 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 1982 $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} 1983}
1814 1984
1815############################################################################# 1985#############################################################################
1816 1986
1817package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1836 # TODO: calculations are off 2006 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1840 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1841 req_w => 20, 2011 req_w => $::WIDTH / 80,
1842 req_h => 20, 2012 req_h => $::WIDTH / 80,
1843 vertical => 0, 2013 vertical => 0,
1844 can_hover => 1, 2014 can_hover => 1,
1845 inner_pad => 5, 2015 inner_pad => 5,
1846 @_ 2016 @_
1847 ); 2017 );
… …
1930 $page ||= 2; 2100 $page ||= 2;
1931 2101
1932 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934 2104
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2105 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2107
1940 # draw background 2108 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1942 2110
1943 # draw handle 2111 # draw handle
1944 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1945 2113
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2114 glDisable GL_TEXTURE_2D;
1948} 2115}
1949 2116
1950############################################################################# 2117#############################################################################
1951 2118
… …
1957 2124
1958sub new { 2125sub new {
1959 my $class = shift; 2126 my $class = shift;
1960 2127
1961 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
1962 fontsize => 1, 2129 fontsize => 1,
2130 can_events => 0,
1963 #font => default_font 2131 #font => default_font
1964 @_, 2132 @_,
1965 2133
1966 layout => (new CFClient::Layout), 2134 layout => (new CFClient::Layout 1),
1967 par => [], 2135 par => [],
1968 height => 0, 2136 height => 0,
1969 children => [ 2137 children => [
1970 (new CFClient::UI::Empty expand => 1), 2138 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2139 (new CFClient::UI::Slider vertical => 1),
1972 ], 2140 ],
1973 ); 2141 );
1974 2142
1975 $self->{children}[1]->connect (changed => sub { 2143 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2144
1979 $self 2145 $self
1980} 2146}
1981 2147
1982sub set_fontsize { 2148sub set_fontsize {
… …
1990 my ($self, $text) = @_; 2156 my ($self, $text) = @_;
1991 2157
1992 my $layout = $self->{layout}; 2158 my $layout = $self->{layout};
1993 2159
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w}); 2161 $layout->set_width ($self->{children}[0]{w});
1996 $layout->set_text ($text); 2162 $layout->set_markup ($text);
1997 2163
1998 ($layout->size)[1] 2164 ($layout->size)[1]
1999} 2165}
2000 2166
2001sub reflow { 2167sub reflow {
… …
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054 2220
2055 delete $self->{texture}; 2221 delete $self->{texture};
2056 } 2222 }
2057 2223
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059 glClearColor 0, 0, 0, 1; 2225 glClearColor 0, 0, 0, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2226 glClear GL_COLOR_BUFFER_BIT;
2061 2227
2062 glEnable GL_BLEND;
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D; 2228 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066 2230
2067 my $top = int $self->{children}[1]{range}[0]; 2231 my $top = int $self->{children}[1]{range}[0];
2068 2232
… …
2077 2241
2078 for my $par (@{$self->{par}}) { 2242 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2243 my $h = $par->[0];
2080 2244
2081 if ($y0 < $y + $h && $y < $y1) { 2245 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] });
2082 $layout->set_text ($par->[2]); 2247 $layout->set_markup ($par->[2]);
2083 2248
2084 glColor @{ $par->[1] };
2085 my ($W, $H) = $layout->size; 2249 my ($W, $H) = $layout->size;
2086 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2087 } 2251 }
2088 2252
2089 $y += $h; 2253 $y += $h;
2090 } 2254 }
2091 2255
2092 glDisable GL_TEXTURE_2D; 2256 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND;
2094 }; 2257 };
2095 }); 2258 });
2096} 2259}
2097 2260
2098sub _draw { 2261sub _draw {
2099 my ($self) = @_; 2262 my ($self) = @_;
2100 2263
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2266 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2268 glDisable GL_TEXTURE_2D;
2106 }
2107 2269
2108 $self->{children}[1]->draw; 2270 $self->{children}[1]->draw;
2109 2271
2110} 2272}
2111 2273
… …
2159 2321
2160sub new { 2322sub new {
2161 my $class = shift; 2323 my $class = shift;
2162 2324
2163 my $self = $class->SUPER::new ( 2325 my $self = $class->SUPER::new (
2164 state => 0, 2326 state => 0,
2165 connect_activate => \&toggle_flopper, 2327 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2328 @_
2168 ); 2329 );
2169 2330
2170 if ($self->{state}) { 2331 if ($self->{state}) {
2171 $self->{state} = 0; 2332 $self->{state} = 0;
… …
2207 can_events => 0, 2368 can_events => 0,
2208 ) 2369 )
2209} 2370}
2210 2371
2211sub set_markup { 2372sub set_markup {
2212 my ($self, $text) = @_; 2373 my ($self, $text, $font) = @_;
2213 2374
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2375 $self->{label} = new CFClient::UI::Label
2376 fontsize => 0.8,
2377 fg => [0, 0, 0],
2378 font => ($font || $::FONT_PROP);
2379
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2215 $self->{label}->set_markup ($text); 2381 $self->{label}->set_markup ($text);
2216 $self->add ($self->{label}); 2382 $self->add ($self->{label});
2217} 2383}
2218 2384
2219sub size_request { 2385sub size_request {
2220 my ($self) = @_; 2386 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2387
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2388 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2389
2226 ($w + 4, $h + 4) 2390 ($w + 4, $h + 4)
2227} 2391}
… …
2281 2445
2282sub size_request { 2446sub size_request {
2283 (32, 8) 2447 (32, 8)
2284} 2448}
2285 2449
2286sub draw { 2450sub _draw {
2287 my ($self) = @_; 2451 my ($self) = @_;
2288 2452
2453 return unless $::CONN;#d# manage and cache textures differently
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290 2455
2456 # TODO animation
2291 if ($tex) { 2457 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2458 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2460 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D; 2462 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND; 2463 }
2464}
2465
2466#############################################################################
2467
2468package CFClient::UI::InventoryItem;
2469
2470our @ISA = CFClient::UI::HBox::;
2471
2472sub new {
2473 my $class = shift;
2474
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new (
2485 can_hover => 1,
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_,
2544 );
2545
2546 $self
2547}
2548
2549sub set_items {
2550 my ($self, $items) = @_;
2551
2552 $self->{scrolled}->clear;
2553 return unless $items;
2554
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2556
2557 $self->{real_items} = \@items;
2558
2559 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2565 }
2566
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::Menu;
2578
2579our @ISA = CFClient::UI::FancyFrame::;
2580
2581use CFClient::OpenGL;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 items => [],
2588 z => 100,
2589 @_,
2590 );
2591
2592 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2593
2594 for my $item (@{ $self->{items} }) {
2595 my ($widget, $cb) = @$item;
2596
2597 # handle various types of items, only text for now
2598 if (!ref $widget) {
2599 $widget = new CFClient::UI::Label
2600 can_hover => 1,
2601 can_events => 1,
2602 text => $widget;
2603 }
2604
2605 $self->{item}{$widget} = $item;
2606
2607 $self->{vbox}->add ($widget);
2608 }
2609
2610 $self
2611}
2612
2613# popup given the event (must be a mouse button down event currently)
2614sub popup {
2615 my ($self, $ev) = @_;
2616
2617 $self->emit ("popdown");
2618
2619 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self;
2621 $self->{button} = $ev->{button};
2622
2623 $self->show;
2624 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2625}
2626
2627sub mouse_motion {
2628 my ($self, $ev, $x, $y) = @_;
2629
2630 # TODO: should use vbox->find_widget or so
2631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2632 $self->{hover} = $self->{item}{$HOVER};
2633}
2634
2635sub button_up {
2636 my ($self, $ev, $x, $y) = @_;
2637
2638 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB;
2640 $self->hide;
2641
2642 $self->emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover};
2644 }
2645}
2646
2647#############################################################################
2648
2649package CFClient::UI::Statusbox;
2650
2651our @ISA = CFClient::UI::VBox::;
2652
2653sub reorder {
2654 my ($self) = @_;
2655 my $NOW = time;
2656
2657 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 }
2660
2661 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2663 my $count = 10 + 1;
2664 for my $item (@items) {
2665 last unless --$count;
2666
2667 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text};
2670 for ($short) {
2671 s/^\s+//;
2672 s/\012.*//s;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 }
2676
2677 new CFClient::UI::Label
2678 markup => $short,
2679 tooltip => delete $item->{tooltip},
2680 fontsize => delete $item->{fontsize},
2681 color => delete $item->{color},
2682 can_events => 1,
2683 can_hover => 1,
2684 };
2685 }
2686
2687 $self->clear;
2688 $self->SUPER::add (@widgets);
2689}
2690
2691sub add {
2692 my ($self, $text, %arg) = @_;
2693
2694 my $item = {
2695 time => time,
2696 text => $text,
2697 timeout => 60,
2698 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8],
2701 %arg,
2300 } 2702 };
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708
2709 $self->reorder;
2301} 2710}
2302 2711
2303############################################################################# 2712#############################################################################
2304 2713
2305package CFClient::UI::Root; 2714package CFClient::UI::Root;
2306 2715
2307our @ISA = CFClient::UI::Container::; 2716our @ISA = CFClient::UI::Container::;
2308 2717
2309use CFClient::OpenGL; 2718use CFClient::OpenGL;
2310 2719
2311sub check_size { 2720sub new {
2312 my ($self) = @_; 2721 my $class = shift;
2313 2722
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2723 $class->SUPER::new (
2315} 2724 @_,
2316 2725 )
2317sub size_request {
2318 ($::WIDTH, $::HEIGHT)
2319} 2726}
2320 2727
2321sub configure { 2728sub configure {
2322 my ($self, $x, $y, $w, $h) = @_; 2729 my ($self, $x, $y, $w, $h) = @_;
2323 2730
2324 $self->SUPER::configure ($x, $y, $w, $h); 2731 $self->{w} = $w;
2732 $self->{h} = $h;
2733}
2325 2734
2735sub check_size {
2736 my ($self) = @_;
2737
2738 $self->size_allocate ($self->{w}, $self->{h})
2739 if $self->{w};
2740}
2741
2742sub size_request {
2743 my ($self) = @_;
2744
2745 ($self->{w}, $self->{h})
2746}
2747
2748sub size_allocate {
2749 my ($self, $w, $h) = @_;
2750
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2326 for my $child (@{$self->{children}}) { 2767 for my $child ($self->children) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328 2769
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2770 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2331 $child->configure ($X, $Y, $W,$H); 2772 $child->configure ($X, $Y, $W, $H);
2332 } 2773 }
2333}
2334 2774
2335sub _topleft { 2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777}
2778
2779sub coord2local {
2336 my ($self, $x, $y) = @_; 2780 my ($self, $x, $y) = @_;
2337 2781
2338 ($x, $y) 2782 ($x, $y)
2339} 2783}
2340 2784
2785sub coord2global {
2786 my ($self, $x, $y) = @_;
2787
2788 ($x, $y)
2789}
2790
2341sub update { 2791sub update {
2342 my ($self) = @_; 2792 my ($self) = @_;
2343 2793
2344 $self->check_size; 2794 $self->check_size;
2345 ::refresh (); 2795 $::WANT_REFRESH++;
2346} 2796}
2347 2797
2348sub add { 2798sub add {
2349 my ($self, $child) = @_; 2799 my ($self, $child) = @_;
2350 2800
2351 # integerize window positions 2801 # integerise window positions
2352 $child->{x} = int $child->{x}; 2802 $child->{x} = int $child->{x};
2353 $child->{y} = int $child->{y}; 2803 $child->{y} = int $child->{y};
2354 2804
2355 $self->SUPER::add ($child); 2805 $self->SUPER::add ($child);
2356} 2806}
… …
2359 my ($self, $id, $cb) = @_; 2809 my ($self, $id, $cb) = @_;
2360 2810
2361 $self->{refresh_hook}{$id} = $cb; 2811 $self->{refresh_hook}{$id} = $cb;
2362} 2812}
2363 2813
2364sub draw { 2814sub draw {
2365 my ($self) = @_; 2815 my ($self) = @_;
2366 2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860
2367 while (my $rcb = delete $self->{refresh_hook}) { 2861 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2369 } 2864 }
2370 2865
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2866 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 2868 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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