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.164 by root, Mon Apr 24 06:57:39 2006 UTC vs.
Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
31 } 43 }
32 44
33 return; 45 return;
34 } 46 }
35 } 47 }
… …
122 134
123 for (@$vals) { 135 for (@$vals) {
124 my $i = int $_ + $rem; 136 my $i = int $_ + $rem;
125 $rem += $_ - $i; 137 $rem += $_ - $i;
126 $_ = $i; 138 $_ = $i;
139 }
140}
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;
127 } 159 }
128} 160}
129 161
130############################################################################# 162#############################################################################
131 163
… …
150 if (/^connect_(.*)$/) { 182 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 183 $self->connect ($1 => delete $self->{$_});
152 } 184 }
153 } 185 }
154 186
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188
155 $self 189 $self
156} 190}
157 191
158sub destroy { 192sub destroy {
159 my ($self) = @_; 193 my ($self) = @_;
… …
224 $self->{y} = $y; 258 $self->{y} = $y;
225 $self->update; 259 $self->update;
226 } 260 }
227 261
228 if ($self->{w} != $w || $self->{h} != $h) { 262 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 263 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 264 }
235} 265}
236 266
237sub size_allocate { 267sub size_allocate {
238 # nothing to be done 268 # nothing to be done
239} 269}
240 270
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children {
279}
280
241sub set_max_size { 281sub set_max_size {
242 my ($self, $w, $h) = @_; 282 my ($self, $w, $h) = @_;
243 283
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 284 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 285 delete $self->{max_h}; $self->{max_h} = $h if $h;
246}
247
248# return top left coordinates
249sub _topleft {
250 my ($self, $x, $y) = @_;
251
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253} 286}
254 287
255# translate global coordinates to local coordinate system 288# translate global coordinates to local coordinate system
256sub coord2local { 289sub coord2local {
257 my ($self, $x, $y) = @_; 290 my ($self, $x, $y) = @_;
258 291
259 my ($X, $Y) = $self->_topleft; 292 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 293}
262 294
263# translate local coordinates to global coordinate system 295# translate local coordinates to global coordinate system
264sub coord2global { 296sub coord2global {
265 my ($self, $x, $y) = @_; 297 my ($self, $x, $y) = @_;
266 298
267 my ($X, $Y) = $self->_topleft; 299 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 300}
270 301
271sub focus_in { 302sub focus_in {
272 my ($self) = @_; 303 my ($self) = @_;
273 304
… …
371 402
372sub set_parent { 403sub set_parent {
373 my ($self, $parent) = @_; 404 my ($self, $parent) = @_;
374 405
375 Scalar::Util::weaken ($self->{parent} = $parent); 406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
376} 411}
377 412
378sub check_size { 413sub check_size {
379 my ($self) = @_; 414 my ($self, $forced) = @_;
380 415
381 $self->{parent} 416 $self->{force_alloc} = 1 if $forced;
382 or return 1; 417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 418}
403 419
404sub update { 420sub update {
405 my ($self) = @_; 421 my ($self) = @_;
406 422
… …
421} 437}
422 438
423sub DESTROY { 439sub DESTROY {
424 my ($self) = @_; 440 my ($self) = @_;
425 441
442 delete $WIDGET{$self+0};
426 #$self->deactivate; 443 #$self->deactivate;
427} 444}
428 445
429############################################################################# 446#############################################################################
430 447
… …
492sub new { 509sub new {
493 my ($class, %arg) = @_; 510 my ($class, %arg) = @_;
494 511
495 my $children = delete $arg{children} || []; 512 my $children = delete $arg{children} || [];
496 513
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 514 my $self = $class->SUPER::new (
515 children => [],
516 can_events => 0,
517 %arg,
518 );
498 $self->add ($_) for @$children; 519 $self->add ($_) for @$children;
499 520
500 $self 521 $self
501} 522}
502 523
503sub add { 524sub add {
504 my ($self, $child) = @_; 525 my ($self, @widgets) = @_;
505 526
506 $child->set_parent ($self); 527 $_->set_parent ($self)
528 for @widgets;
507 529
508 use sort 'stable'; 530 use sort 'stable';
509 531
510 $self->{children} = [ 532 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 533 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 534 @{$self->{children}}, @widgets
513 ]; 535 ];
514 536
515 $child->check_size; 537 $self->check_size (1);
538 $self->update;
539}
540
541sub children {
542 @{ $_[0]{children} }
516} 543}
517 544
518sub remove { 545sub remove {
519 my ($self, $child) = @_; 546 my ($self, $child) = @_;
520 547
… …
535 562
536 for (@$children) { 563 for (@$children) {
537 delete $_->{parent}; 564 delete $_->{parent};
538 $_->hide; 565 $_->hide;
539 } 566 }
567
568 $self->check_size;
569 $self->update;
540} 570}
541 571
542sub find_widget { 572sub find_widget {
543 my ($self, $x, $y) = @_; 573 my ($self, $x, $y) = @_;
544 574
… …
619} 649}
620 650
621sub update { 651sub update {
622 my ($self) = @_; 652 my ($self) = @_;
623 653
624 # we want to do this delayed... 654 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 655 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 656}
638 657
639sub size_allocate { 658sub size_allocate {
640 my ($self, $w, $h) = @_; 659 my ($self, $w, $h) = @_;
641 660
642 $self->child->configure (0, 0, $w, $h); 661 $self->SUPER::size_allocate ($w, $h);
662 $self->update;
663}
643 664
665sub _render {
666 $_[0]{children}[0]->draw;
667}
668
669sub render_child {
670 my ($self) = @_;
671
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT;
675
644 $self->render_chld; 676 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 };
645} 685}
646 686
647sub _draw { 687sub _draw {
648 my ($self) = @_; 688 my ($self) = @_;
649 689
650 my ($w, $h) = ($self->w, $self->h); 690 my ($w, $h) = ($self->w, $self->h);
651 691
652 my $tex = $self->{texture} 692 my $tex = $self->{texture}
653 or return; 693 or return;
654 694
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 695 glEnable GL_TEXTURE_2D;
658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1;
659 698
660 $tex->draw_quad (0, 0, $w, $h); 699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 700
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
664} 702}
665 703
666############################################################################# 704#############################################################################
667 705
668package CFClient::UI::ViewPort; 706package CFClient::UI::ViewPort;
669 707
670our @ISA = CFClient::UI::Window::; 708our @ISA = CFClient::UI::Window::;
671 709
672sub new { die }
673
674sub size_request { 710sub size_request {
675 my ($self) = @_; 711 my ($self) = @_;
676 712
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
679 715
680 @$self{qw(child_w child_h)} 716 @$self{qw(child_w child_h)}
681} 717}
682 718
683sub _draw { 719sub size_allocate {
684 my ($self) = @_; 720 my ($self, $w, $h) = @_;
685 721
686 $self->{children}[1]->draw; 722 $self->update;
687} 723}
688 724
725sub set_offset {
726 my ($self, $x, $y) = @_;
689 727
690############################################################################# 728 $self->{view_x} = int $x;
729 $self->{view_y} = int $y;
691 730
731 $self->update;
732}
733
734# hmm, this does not work for topleft of $self... but we should not ask for that
735sub coord2local {
736 my ($self, $x, $y) = @_;
737
738 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
739}
740
741sub coord2global {
742 my ($self, $x, $y) = @_;
743
744 $x = List::Util::min $self->{w}, $x - $self->{view_x};
745 $y = List::Util::min $self->{h}, $y - $self->{view_y};
746
747 $self->SUPER::coord2global ($x, $y)
748}
749
750sub find_widget {
751 my ($self, $x, $y) = @_;
752
753 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
754 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
755 ) {
756 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
757 } else {
758 $self->CFClient::UI::Base::find_widget ($x, $y)
759 }
760}
761
762sub _render {
763 my ($self) = @_;
764
765 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766
767 $self->SUPER::_render;
768}
769
770#############################################################################
771
692package CFClient::UI::Frame; 772package CFClient::UI::ScrolledWindow;
693 773
694our @ISA = CFClient::UI::Bin::; 774our @ISA = CFClient::UI::HBox::;
695
696use CFClient::OpenGL;
697 775
698sub new { 776sub new {
699 my $class = shift; 777 my $class = shift;
700 778
779 my $self;
780
781 my $slider = new CFClient::UI::Slider
782 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
786 },
787 ;
788
701 my $self = $class->SUPER::new ( 789 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 790 vp => (new CFClient::UI::ViewPort),
703 border_bg => [1, 1, 1, 1], 791 slider => $slider,
704 border => 0.8,
705 @_ 792 @_,
706 ); 793 );
707 794
795 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp});
797 $self->add ($self->{slider});
798
708 $self 799 $self
709} 800}
710 801
802#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll
804
805#############################################################################
806
807package CFClient::UI::Frame;
808
809our @ISA = CFClient::UI::Bin::;
810
811use CFClient::OpenGL;
812
813sub new {
814 my $class = shift;
815
816 $class->SUPER::new (
817 bg => undef,
818 @_,
819 )
820}
821
711sub _draw { 822sub _draw {
712 my ($self) = @_; 823 my ($self) = @_;
713 824
714 my ($w, $h) = ($self->{w}, $self->{h}); 825 if ($self->{bg}) {
826 my ($w, $h) = @$self{qw(w h)};
715 827
716 glEnable GL_BLEND; 828 glEnable GL_BLEND;
717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 829 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
718 glEnable GL_TEXTURE_2D; 830 glColor @{ $self->{bg} };
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720 831
721# glBegin GL_QUADS; 832 glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0; 833 glVertex 0 , 0;
724# glVertex 0 , $h; 834 glVertex 0 , $h;
725# glVertex $w, $h; 835 glVertex $w, $h;
726# glVertex $w, 0; 836 glVertex $w, 0;
727# glEnd; 837 glEnd;
728 838
729
730 $self->child->draw;
731 glDisable GL_BLEND; 839 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D; 840 }
841
842 $self->SUPER::_draw;
733} 843}
734 844
735############################################################################# 845#############################################################################
736 846
737package CFClient::UI::FancyFrame; 847package CFClient::UI::FancyFrame;
… …
750 # TODO: user_x, user_y, overwrite moveto? 860 # TODO: user_x, user_y, overwrite moveto?
751 861
752 my $self = $class->SUPER::new ( 862 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 863 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 864 border_bg => [1, 1, 1, 1],
755 border => 0.8, 865 border => 0.6,
866 toplevel => 1,
756 can_events => 0, 867 can_events => 1,
757 @_ 868 @_
758 ); 869 );
759 870
760 $self->{title} &&= new CFClient::UI::Label 871 $self->{title} &&= new CFClient::UI::Label
761 align => 0, 872 align => 0,
762 valign => 1, 873 valign => 1,
763 text => $self->{title}, 874 text => $self->{title},
764 fontsize => 1; 875 fontsize => $self->{border};
765 876
766 $self 877 $self
767} 878}
768 879
769sub border { 880sub border {
… …
794} 905}
795 906
796sub button_down { 907sub button_down {
797 my ($self, $ev, $x, $y) = @_; 908 my ($self, $ev, $x, $y) = @_;
798 909
910 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 911 my $border = $self->border;
800 912
801 if ($x < $self->{w} && $x >= $self->{w} - $border 913 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 914 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 915
916 if ($lr & $td) {
917 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 919 my ($bw, $bh) = ($self->{w}, $self->{h});
806 920
921 my $mx = $x < $border;
922 my $my = $y < $border;
923
807 $self->{motion} = sub { 924 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 925 my ($ev, $x, $y) = @_;
809 926
810 ($x, $y) = ($ev->{x}, $ev->{y}); 927 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy;
811 929
812 $self->{user_w} = $bw + $x - $ox; 930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
814 $self->check_size; 933 $self->check_size;
815 }; 934 };
816 935
817 } elsif ($x >= 0 && $x < $self->{w} 936 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 937 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 938 my ($bx, $by) = ($self->{x}, $self->{y});
822 939
823 $self->{motion} = sub { 940 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
… …
847 my ($self) = @_; 964 my ($self) = @_;
848 965
849 my ($w, $h ) = ($self->{w}, $self->{h}); 966 my ($w, $h ) = ($self->{w}, $self->{h});
850 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
851 968
852 glEnable GL_BLEND;
853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
854 glEnable GL_TEXTURE_2D; 969 glEnable GL_TEXTURE_2D;
855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
856 971
857 my $border = $self->border; 972 my $border = $self->border;
858 973
859 glColor @{ $self->{border_bg} }; 974 glColor @{ $self->{border_bg} };
860 $tex[1]->draw_quad (0, 0, $w, $border); 975 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
864 979
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
865 my $bg = $tex[0]; 981 my $bg = $tex[0];
866 982
867 # TODO: repeat texture not scale 983 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 984 my $rep_x = $cw / $bg->{w};
869 my $rep_y = $ch / $bg->{h}; 985 my $rep_y = $ch / $bg->{h};
870 986
871 glColor @{ $self->{bg} }; 987 glColor @{ $self->{bg} };
872 988
873 $bg->{s} = $rep_x; 989 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y; 990 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1; 991 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 992 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 }
877 994
878 glDisable GL_TEXTURE_2D; 995 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND;
880 996
881 $self->{title}->draw if $self->{title}; 997 $self->{title}->draw if $self->{title};
998
882 $self->child->draw; 999 $self->child->draw;
883} 1000}
884 1001
885############################################################################# 1002#############################################################################
886 1003
… …
908 $self->{children}[$y][$x] = $child; 1025 $self->{children}[$y][$x] = $child;
909 1026
910 $child->check_size; 1027 $child->check_size;
911} 1028}
912 1029
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
913# TODO: move to container class maybe? send childs a signal on removal? 1034# TODO: move to container class maybe? send childs a signal on removal?
914sub clear { 1035sub clear {
915 my ($self) = @_; 1036 my ($self) = @_;
916 1037
917 my $children = delete $self->{children}; 1038 my @children = $self->children;
1039 delete $self->{children};
918 1040
919 for (grep $_, map @$_, grep $_, @$children) { 1041 for (@children) {
920 delete $_->{parent}; 1042 delete $_->{parent};
921 $_->hide; 1043 $_->hide;
922 } 1044 }
923 1045
924 $self->update; 1046 $self->update;
… …
1105} 1227}
1106 1228
1107sub size_allocate { 1229sub size_allocate {
1108 my ($self, $w, $h) = @_; 1230 my ($self, $w, $h) = @_;
1109 1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1110 my $children = $self->{children}; 1234 my $children = $self->{children};
1111 1235
1112 my @h = map $_->{req_h}, @$children; 1236 my @h = map $_->{req_h}, @$children;
1113 1237
1114 my $req_h = List::Util::sum @h; 1238 my $req_h = List::Util::sum @h;
… …
1153 my ($class, %arg) = @_; 1277 my ($class, %arg) = @_;
1154 1278
1155 my $self = $class->SUPER::new ( 1279 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1280 fg => [1, 1, 1],
1157 #font => default_font 1281 #font => default_font
1282 #text => initial text
1283 #markup => initial narkup
1284 layout => (new CFClient::Layout),
1158 fontsize => 1, 1285 fontsize => 1,
1159 text => "",
1160 align => -1, 1286 align => -1,
1161 valign => -1, 1287 valign => -1,
1162 padding => 2, 1288 padding => 2,
1163 layout => new CFClient::Layout,
1164 can_events => 0, 1289 can_events => 0,
1165 %arg 1290 %arg
1166 ); 1291 );
1167 1292
1168 if (exists $self->{template}) { 1293 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout; 1294 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template}); 1295 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout; 1296 $self->{template} = $layout;
1172 } 1297 }
1173 1298
1174 $self->set_text (delete $self->{text}) if exists $self->{text}; 1299 if (exists $self->{markup}) {
1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1300 $self->set_markup (delete $self->{markup});
1301 } else {
1302 $self->set_text (delete $self->{text});
1303 }
1176 1304
1177 $self 1305 $self
1178} 1306}
1179 1307
1180sub escape { 1308sub escape {
… …
1185 s/</&lt;/g; 1313 s/</&lt;/g;
1186 1314
1187 $_[1] 1315 $_[1]
1188} 1316}
1189 1317
1318sub update {
1319 my ($self) = @_;
1320
1321 delete $self->{texture};
1322 $self->SUPER::update;
1323}
1324
1190sub set_text { 1325sub set_text {
1191 my ($self, $text) = @_; 1326 my ($self, $text) = @_;
1192 1327
1328 return if $self->{text} eq "T$text";
1329 $self->{text} = "T$text";
1330
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1193 $self->{layout}->set_text ($text); 1332 $self->{layout}->set_text ($text);
1194 1333
1195 delete $self->{texture}; 1334 $self->update;
1196 $self->check_size; 1335 $self->check_size;
1197 $self->update;
1198} 1336}
1199 1337
1200sub set_markup { 1338sub set_markup {
1201 my ($self, $markup) = @_; 1339 my ($self, $markup) = @_;
1202 1340
1341 return if $self->{text} eq "M$markup";
1342 $self->{text} = "M$markup";
1343
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1203 $self->{layout}->set_markup ($markup); 1347 $self->{layout}->set_markup ($markup);
1204 1348
1205 delete $self->{texture}; 1349 $self->update;
1206 $self->check_size; 1350 $self->check_size;
1207 $self->update;
1208} 1351}
1209 1352
1210sub size_request { 1353sub size_request {
1211 my ($self) = @_; 1354 my ($self) = @_;
1212 1355
… …
1241sub set_fontsize { 1384sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1385 my ($self, $fontsize) = @_;
1243 1386
1244 $self->{fontsize} = $fontsize; 1387 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1388 delete $self->{texture};
1389
1390 $self->update;
1246 $self->check_size; 1391 $self->check_size;
1247 $self->update;
1248} 1392}
1249 1393
1250sub _draw { 1394sub _draw {
1251 my ($self) = @_; 1395 my ($self) = @_;
1252 1396
1253 my $tex = $self->{texture} ||= do { 1397 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1399 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $self->{layout}->set_width ($self->{w}); 1400 $self->{layout}->set_width ($self->{w});
1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1402
1257 new_from_layout CFClient::Texture $self->{layout} 1403 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5;
1408
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5;
1412
1413 $tex
1258 }; 1414 };
1259 1415
1260 glEnable GL_BLEND;
1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1262 glEnable GL_TEXTURE_2D; 1416 glEnable GL_TEXTURE_2D;
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1418
1419 if ($tex->{format} == GL_ALPHA) {
1265 glColor @{$self->{fg}}; 1420 glColor @{$self->{fg}};
1266
1267 $self->{ox} = int (
1268 $self->{align} < 0 ? $self->{padding}
1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1272
1273 $self->{oy} = int (
1274 $self->{valign} < 0 ? $self->{padding}
1275 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276 : ($self->{h} - $tex->{h}) * 0.5
1277 );
1278
1279 $tex->draw_quad ($self->{ox}, $self->{oy}); 1421 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1422 } else {
1423 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1424 }
1280 1425
1281 glDisable GL_TEXTURE_2D; 1426 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1427}
1284 1428
1285############################################################################# 1429#############################################################################
1286 1430
1287package CFClient::UI::EntryBase; 1431package CFClient::UI::EntryBase;
… …
1322 $self->{layout}->set_text ("$text "); 1466 $self->{layout}->set_text ("$text ");
1323 1467
1324 $self->emit (changed => $self->{text}); 1468 $self->emit (changed => $self->{text});
1325} 1469}
1326 1470
1471sub set_text {
1472 my ($self, $text) = @_;
1473
1474 $self->{cursor} = length $text;
1475 $self->_set_text ($text);
1476 $self->check_size;
1477 $self->update;
1478}
1479
1327sub get_text { 1480sub get_text {
1328 $_[0]{text} 1481 $_[0]{text}
1329} 1482}
1330 1483
1331sub size_request { 1484sub size_request {
… …
1338 1491
1339sub size_allocate { 1492sub size_allocate {
1340 my ($self, $w, $h) = @_; 1493 my ($self, $w, $h) = @_;
1341 1494
1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1343}
1344
1345sub set_text {
1346 my ($self, $text) = @_;
1347
1348 $self->{cursor} = length $text;
1349 $self->_set_text ($text);
1350 $self->update;
1351} 1496}
1352 1497
1353sub key_down { 1498sub key_down {
1354 my ($self, $ev) = @_; 1499 my ($self, $ev) = @_;
1355 1500
… …
1357 my $sym = $ev->{sym}; 1502 my $sym = $ev->{sym};
1358 my $uni = $ev->{unicode}; 1503 my $uni = $ev->{unicode};
1359 1504
1360 my $text = $self->get_text; 1505 my $text = $self->get_text;
1361 1506
1362 if ($sym == 8) { 1507 if ($uni == 8) {
1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1508 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1364 } elsif ($sym == 127) { 1509 } elsif ($uni == 127) {
1365 substr $text, $self->{cursor}, 1, ""; 1510 substr $text, $self->{cursor}, 1, "";
1366 } elsif ($sym == CFClient::SDLK_LEFT) { 1511 } elsif ($sym == CFClient::SDLK_LEFT) {
1367 --$self->{cursor} if $self->{cursor}; 1512 --$self->{cursor} if $self->{cursor};
1368 } elsif ($sym == CFClient::SDLK_RIGHT) { 1513 } elsif ($sym == CFClient::SDLK_RIGHT) {
1369 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1514 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1370 } elsif ($sym == CFClient::SDLK_HOME) { 1515 } elsif ($sym == CFClient::SDLK_HOME) {
1371 $self->{cursor} = 0; 1516 $self->{cursor} = 0;
1372 } elsif ($sym == CFClient::SDLK_END) { 1517 } elsif ($sym == CFClient::SDLK_END) {
1373 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1374 } elsif ($sym == 27) { 1519 } elsif ($uni == 27) {
1375 $self->emit ('escape'); 1520 $self->emit ('escape');
1376 } elsif ($uni) { 1521 } elsif ($uni) {
1377 substr $text, $self->{cursor}++, 0, chr $uni; 1522 substr $text, $self->{cursor}++, 0, chr $uni;
1378 } 1523 }
1379 1524
… …
1462 my ($self, $ev) = @_; 1607 my ($self, $ev) = @_;
1463 1608
1464 my $sym = $ev->{sym}; 1609 my $sym = $ev->{sym};
1465 1610
1466 if ($sym == 13) { 1611 if ($sym == 13) {
1612 unshift @{$self->{history}},
1613 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1616 $self->emit (activate => $txt);
1468 $self->update; 1617 $self->update;
1618
1619 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text;
1622 }
1623 if (@{$self->{history} || []} > 0) {
1624 $self->{history_pointer}++;
1625 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1626 $self->{history_pointer} = @{$self->{history} || []} - 1;
1627 }
1628 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1629 }
1630
1631 } elsif ($sym == CFClient::SDLK_DOWN) {
1632 $self->{history_pointer}--;
1633 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1634
1635 if ($self->{history_pointer} >= 0) {
1636 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1637 } else {
1638 $self->set_text ($self->{history_saveback});
1639 }
1469 1640
1470 } else { 1641 } else {
1471 $self->SUPER::key_down ($ev); 1642 $self->SUPER::key_down ($ev);
1472 } 1643 }
1473 1644
… …
1517 1688
1518 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1519 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1520 } 1691 }
1521 1692
1522 glEnable GL_BLEND;
1523 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524 glEnable GL_TEXTURE_2D; 1693 glEnable GL_TEXTURE_2D;
1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526 glColor 0, 0, 0, 1; 1695 glColor 0, 0, 0, 1;
1527 1696
1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529 1698
1530 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1531 glDisable GL_BLEND;
1532 1700
1533 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1534} 1702}
1535 1703
1536############################################################################# 1704#############################################################################
… …
1583 1751
1584 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1585 1753
1586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587 1755
1588 glEnable GL_BLEND; 1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1589 glEnable GL_TEXTURE_2D; 1758 glEnable GL_TEXTURE_2D;
1590 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1591
1592 my $tex = $self->{state} ? $tex[1] : $tex[0];
1593
1594 $tex->draw_quad (0, 0, $s, $s); 1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598} 1761}
1599 1762
1600############################################################################# 1763#############################################################################
1601 1764
1602package CFClient::UI::Image; 1765package CFClient::UI::Image;
… …
1645 glTranslate 0, -$self->{w}, 0; 1808 glTranslate 0, -$self->{w}, 0;
1646 1809
1647 ($w, $h) = ($h, $w); 1810 ($w, $h) = ($h, $w);
1648 } 1811 }
1649 1812
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 1815
1655 $tex->draw_quad (0, 0, $w, $h); 1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1656 1817
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1659} 1819}
1660 1820
1661############################################################################# 1821#############################################################################
1662 1822
… …
1710} 1870}
1711 1871
1712sub set_max { 1872sub set_max {
1713 my ($self, $max) = @_; 1873 my ($self, $max) = @_;
1714 1874
1875 return if $self->{max_val} == $max;
1876
1715 $self->{max_val} = $max; 1877 $self->{max_val} = $max;
1878 $self->update;
1716} 1879}
1717 1880
1718sub set_value { 1881sub set_value {
1719 my ($self, $val, $max) = @_; 1882 my ($self, $val, $max) = @_;
1720 1883
1721 $self->set_max ($max) 1884 $self->set_max ($max)
1722 if defined $max; 1885 if defined $max;
1723 1886
1724 $max = $self->{max_val}; 1887 return if $self->{val} == $val;
1888
1725 $self->{val} = $val; 1889 $self->{val} = $val;
1726
1727 $self->update; 1890 $self->update;
1728} 1891}
1729 1892
1730sub _draw { 1893sub _draw {
1731 my ($self) = @_; 1894 my ($self) = @_;
… …
1794 1957
1795sub new { 1958sub new {
1796 my ($class, %arg) = @_; 1959 my ($class, %arg) = @_;
1797 1960
1798 my $self = $class->SUPER::new ( 1961 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 1962 tooltip => $arg{type},
1800 can_hover => 1, 1963 can_hover => 1,
1964 can_events => 1,
1801 %arg, 1965 %arg,
1802 ); 1966 );
1803 1967
1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1968 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1969 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1813 1977
1814 $self->{value}->set_fontsize ($fsize); 1978 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize); 1979 $self->{max} ->set_fontsize ($fsize);
1816} 1980}
1817 1981
1982sub set_max {
1983 my ($self, $max) = @_;
1984
1985 $self->{gauge}->set_max ($max);
1986 $self->{max}->set_text ($max);
1987}
1988
1818sub set_value { 1989sub set_value {
1819 my ($self, $val, $max) = @_; 1990 my ($self, $val, $max) = @_;
1820 1991
1821 $self->set_max ($max) 1992 $self->set_max ($max)
1822 if defined $max; 1993 if defined $max;
1823 1994
1824 $self->{gauge}->set_value ($val, $max); 1995 $self->{gauge}->set_value ($val, $max);
1825 $self->{value}->set_text ($val); 1996 $self->{value}->set_text ($val);
1826}
1827
1828sub set_max {
1829 my ($self, $max) = @_;
1830
1831 $self->{gauge}->set_max ($max);
1832 $self->{max}->set_text ($max);
1833} 1997}
1834 1998
1835############################################################################# 1999#############################################################################
1836 2000
1837package CFClient::UI::Slider; 2001package CFClient::UI::Slider;
… …
1856 # TODO: calculations are off 2020 # TODO: calculations are off
1857 my $self = $class->SUPER::new ( 2021 my $self = $class->SUPER::new (
1858 fg => [1, 1, 1], 2022 fg => [1, 1, 1],
1859 active_fg => [0, 0, 0], 2023 active_fg => [0, 0, 0],
1860 range => [0, 0, 100, 10], 2024 range => [0, 0, 100, 10],
1861 req_w => 20, 2025 req_w => $::WIDTH / 80,
1862 req_h => 20, 2026 req_h => $::WIDTH / 80,
1863 vertical => 0, 2027 vertical => 0,
1864 can_hover => 1, 2028 can_hover => 1,
1865 inner_pad => 5, 2029 inner_pad => 5,
1866 @_ 2030 @_
1867 ); 2031 );
… …
1950 $page ||= 2; 2114 $page ||= 2;
1951 2115
1952 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1953 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1954 2118
1955 glEnable GL_BLEND;
1956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1957 glEnable GL_TEXTURE_2D; 2119 glEnable GL_TEXTURE_2D;
1958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1959 2121
1960 # draw background 2122 # draw background
1961 $tex[1]->draw_quad (0, 0, $w, $h); 2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1962 2124
1963 # draw handle 2125 # draw handle
1964 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1965 2127
1966 glDisable GL_BLEND;
1967 glDisable GL_TEXTURE_2D; 2128 glDisable GL_TEXTURE_2D;
1968} 2129}
1969 2130
1970############################################################################# 2131#############################################################################
1971 2132
… …
1982 fontsize => 1, 2143 fontsize => 1,
1983 can_events => 0, 2144 can_events => 0,
1984 #font => default_font 2145 #font => default_font
1985 @_, 2146 @_,
1986 2147
1987 layout => (new CFClient::Layout), 2148 layout => (new CFClient::Layout 1),
1988 par => [], 2149 par => [],
1989 height => 0, 2150 height => 0,
1990 children => [ 2151 children => [
1991 (new CFClient::UI::Empty expand => 1), 2152 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2153 (new CFClient::UI::Slider vertical => 1),
1993 ], 2154 ],
1994 ); 2155 );
1995 2156
1996 $self->{children}[1]->connect (changed => sub { 2157 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2158
2000 $self 2159 $self
2001} 2160}
2002 2161
2003sub set_fontsize { 2162sub set_fontsize {
… …
2011 my ($self, $text) = @_; 2170 my ($self, $text) = @_;
2012 2171
2013 my $layout = $self->{layout}; 2172 my $layout = $self->{layout};
2014 2173
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w}); 2175 $layout->set_width ($self->{children}[0]{w});
2017 $layout->set_text ($text); 2176 $layout->set_markup ($text);
2018 2177
2019 ($layout->size)[1] 2178 ($layout->size)[1]
2020} 2179}
2021 2180
2022sub reflow { 2181sub reflow {
… …
2060 2219
2061 return unless $self->{h} > 0; 2220 return unless $self->{h} > 0;
2062 2221
2063 delete $self->{texture}; 2222 delete $self->{texture};
2064 2223
2065 $ROOT->on_refresh ($self, sub { 2224 $ROOT->on_post_alloc ($self, sub {
2066 if (delete $self->{need_reflow}) { 2225 if (delete $self->{need_reflow}) {
2067 my $height = 0; 2226 my $height = 0;
2068 2227
2069 $height += $_->[0] = $self->text_height ($_->[2]) 2228 $height += $_->[0] = $self->text_height ($_->[2])
2070 for @{$self->{par}}; 2229 for @{$self->{par}};
… …
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2075 2234
2076 delete $self->{texture}; 2235 delete $self->{texture};
2077 } 2236 }
2078 2237
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2080 glClearColor 0, 0, 0, 1; 2239 glClearColor 0, 0, 0, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2240 glClear GL_COLOR_BUFFER_BIT;
2082 2241
2083 glEnable GL_BLEND;
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
2086 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2087 2244
2088 my $top = int $self->{children}[1]{range}[0]; 2245 my $top = int $self->{children}[1]{range}[0];
2089 2246
… …
2098 2255
2099 for my $par (@{$self->{par}}) { 2256 for my $par (@{$self->{par}}) {
2100 my $h = $par->[0]; 2257 my $h = $par->[0];
2101 2258
2102 if ($y0 < $y + $h && $y < $y1) { 2259 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] });
2103 $layout->set_text ($par->[2]); 2261 $layout->set_markup ($par->[2]);
2104 2262
2105 glColor @{ $par->[1] };
2106 my ($W, $H) = $layout->size; 2263 my ($W, $H) = $layout->size;
2107 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2108 } 2265 }
2109 2266
2110 $y += $h; 2267 $y += $h;
2111 } 2268 }
2112 2269
2113 glDisable GL_TEXTURE_2D; 2270 glDisable GL_TEXTURE_2D;
2114 glDisable GL_BLEND;
2115 }; 2271 };
2116 }); 2272 });
2117} 2273}
2118 2274
2119sub _draw { 2275sub _draw {
2120 my ($self) = @_; 2276 my ($self) = @_;
2121 2277
2122 if ($self->{texture}) {
2123 glEnable GL_TEXTURE_2D; 2278 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2125 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2280 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126 glDisable GL_TEXTURE_2D; 2282 glDisable GL_TEXTURE_2D;
2127 }
2128 2283
2129 $self->{children}[1]->draw; 2284 $self->{children}[1]->draw;
2130 2285
2131} 2286}
2132 2287
… …
2226 @_, 2381 @_,
2227 can_events => 0, 2382 can_events => 0,
2228 ) 2383 )
2229} 2384}
2230 2385
2231sub set_markup { 2386sub set_tooltip_from {
2232 my ($self, $text) = @_; 2387 my ($self, $widget) = @_;
2233 2388
2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2389 $self->add (new CFClient::UI::Label
2235 $self->{label}->set_markup ($text); 2390 markup => $widget->{tooltip},
2236 $self->add ($self->{label}); 2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8,
2393 fg => [0, 0, 0, 1],
2394 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 );
2237} 2396}
2238 2397
2239sub size_request { 2398sub size_request {
2240 my ($self) = @_; 2399 my ($self) = @_;
2241
2242 $self->child->set_max_size ($::WIDTH * 0.3);
2243 2400
2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2401 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2245 2402
2246 ($w + 4, $h + 4) 2403 ($w + 4, $h + 4)
2247} 2404}
… …
2253} 2410}
2254 2411
2255sub _draw { 2412sub _draw {
2256 my ($self) = @_; 2413 my ($self) = @_;
2257 2414
2258 glPushMatrix;
2259 glTranslate 0.375, 0.375; 2415 glTranslate 0.375, 0.375;
2260 2416
2261 my ($w, $h) = @$self{qw(w h)}; 2417 my ($w, $h) = @$self{qw(w h)};
2262 2418
2263 glColor 1, 0.8, 0.4; 2419 glColor 1, 0.8, 0.4;
… …
2274 glVertex 0 , $h; 2430 glVertex 0 , $h;
2275 glVertex $w, $h; 2431 glVertex $w, $h;
2276 glVertex $w, 0; 2432 glVertex $w, 0;
2277 glEnd; 2433 glEnd;
2278 2434
2279 glPopMatrix; 2435 glTranslate 2 - 0.375, 2 - 0.375;
2280
2281 glTranslate 2, 2;
2282 $self->SUPER::_draw; 2436 $self->SUPER::_draw;
2283} 2437}
2284 2438
2285############################################################################# 2439#############################################################################
2286 2440
… …
2301 2455
2302sub size_request { 2456sub size_request {
2303 (32, 8) 2457 (32, 8)
2304} 2458}
2305 2459
2306sub draw { 2460sub _draw {
2307 my ($self) = @_; 2461 my ($self) = @_;
2308 2462
2463 return unless $::CONN;#d# manage and cache textures differently
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2310 2465
2466 # TODO animation
2311 if ($tex) { 2467 if ($tex) {
2312 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D; 2468 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2316 glColor 1, 1, 1, 1; 2470 glColor 1, 1, 1, 1;
2317 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2318 glDisable GL_TEXTURE_2D; 2472 glDisable GL_TEXTURE_2D;
2319 glDisable GL_BLEND;
2320 } 2473 }
2474}
2475
2476#############################################################################
2477
2478package CFClient::UI::InventoryItem;
2479
2480our @ISA = CFClient::UI::HBox::;
2481
2482sub new {
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_;
2561
2562 $self->{scrolled}->clear;
2563 return unless $items;
2564
2565 my @items = sort {
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588}
2589
2590#############################################################################
2591
2592package CFClient::UI::Menu;
2593
2594our @ISA = CFClient::UI::FancyFrame::;
2595
2596use CFClient::OpenGL;
2597
2598sub new {
2599 my $class = shift;
2600
2601 my $self = $class->SUPER::new (
2602 items => [],
2603 z => 100,
2604 @_,
2605 );
2606
2607 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2608
2609 for my $item (@{ $self->{items} }) {
2610 my ($widget, $cb) = @$item;
2611
2612 # handle various types of items, only text for now
2613 if (!ref $widget) {
2614 $widget = new CFClient::UI::Label
2615 can_hover => 1,
2616 can_events => 1,
2617 text => $widget;
2618 }
2619
2620 $self->{item}{$widget} = $item;
2621
2622 $self->{vbox}->add ($widget);
2623 }
2624
2625 $self
2626}
2627
2628# popup given the event (must be a mouse button down event currently)
2629sub popup {
2630 my ($self, $ev) = @_;
2631
2632 $self->emit ("popdown");
2633
2634 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self;
2636 $self->{button} = $ev->{button};
2637
2638 $self->show;
2639 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640}
2641
2642sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_;
2644
2645 # TODO: should use vbox->find_widget or so
2646 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647 $self->{hover} = $self->{item}{$HOVER};
2648}
2649
2650sub button_up {
2651 my ($self, $ev, $x, $y) = @_;
2652
2653 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB;
2655 $self->hide;
2656
2657 $self->emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover};
2659 }
2660}
2661
2662#############################################################################
2663
2664package CFClient::UI::Statusbox;
2665
2666our @ISA = CFClient::UI::VBox::;
2667
2668sub reorder {
2669 my ($self) = @_;
2670 my $NOW = time;
2671
2672 while (my ($k, $v) = each %{ $self->{item} }) {
2673 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2674 }
2675
2676 my @widgets;
2677
2678 my @items = sort {
2679 $a->{pri} <=> $b->{pri}
2680 or $b->{id} <=> $a->{id}
2681 } values %{ $self->{item} };
2682
2683 my $count = 10 + 1;
2684 for my $item (@items) {
2685 last unless --$count;
2686
2687 push @widgets, $item->{label} ||= do {
2688 # TODO: doesn't handle markup well (read as: at all)
2689 my $short = $item->{count} > 1
2690 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text};
2692
2693 for ($short) {
2694 s/^\s+//;
2695 s/\012.*/…/s;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 }
2699
2700 new CFClient::UI::Label
2701 markup => $short,
2702 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize},
2706 color => $item->{color},
2707 can_events => 1,
2708 can_hover => 1
2709 };
2710 }
2711
2712 $self->clear;
2713 $self->SUPER::add (reverse @widgets);
2714}
2715
2716sub add {
2717 my ($self, $text, %arg) = @_;
2718
2719 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//;
2721
2722 my $timeout = time + ((delete $arg{timeout}) || 60);
2723
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725
2726 if (my $item = $self->{item}{$group}) {
2727 if ($item->{text} eq $text) {
2728 $item->{count}++;
2729 } else {
2730 $item->{count} = 1;
2731 $item->{text} = $item->{tooltip} = $text;
2732 }
2733 $item->{id} = ++$self->{id};
2734 $item->{timeout} = $timeout;
2735 delete $item->{label};
2736 } else {
2737 $self->{item}{$group} = {
2738 id => ++$self->{id},
2739 text => $text,
2740 timeout => $timeout,
2741 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0,
2745 count => 1,
2746 %arg,
2747 };
2748 }
2749
2750 $self->reorder;
2321} 2751}
2322 2752
2323############################################################################# 2753#############################################################################
2324 2754
2325package CFClient::UI::Root; 2755package CFClient::UI::Root;
2326 2756
2327our @ISA = CFClient::UI::Container::; 2757our @ISA = CFClient::UI::Container::;
2328 2758
2329use CFClient::OpenGL; 2759use CFClient::OpenGL;
2330 2760
2331sub check_size { 2761sub new {
2332 my ($self) = @_; 2762 my $class = shift;
2333 2763
2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2764 $class->SUPER::new (
2335} 2765 @_,
2336 2766 )
2337sub size_request {
2338 ($::WIDTH, $::HEIGHT)
2339} 2767}
2340 2768
2341sub configure { 2769sub configure {
2342 my ($self, $x, $y, $w, $h) = @_; 2770 my ($self, $x, $y, $w, $h) = @_;
2343 2771
2344 $self->SUPER::configure ($x, $y, $w, $h); 2772 $self->{w} = $w;
2773 $self->{h} = $h;
2774}
2345 2775
2776sub check_size {
2777 my ($self) = @_;
2778
2779 $self->size_allocate ($self->{w}, $self->{h})
2780 if $self->{w};
2781}
2782
2783sub size_request {
2784 my ($self) = @_;
2785
2786 ($self->{w}, $self->{h})
2787}
2788
2789sub size_allocate {
2790 my ($self, $w, $h) = @_;
2791
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2346 for my $child (@{$self->{children}}) { 2798 for my $child ($self->children) {
2347 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2348 2800
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2801 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2350 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2351 $child->configure ($X, $Y, $W,$H); 2803 $child->configure ($X, $Y, $W, $H);
2352 } 2804 }
2353} 2805}
2354 2806
2355sub _topleft { 2807sub coord2local {
2356 my ($self, $x, $y) = @_; 2808 my ($self, $x, $y) = @_;
2357 2809
2358 ($x, $y) 2810 ($x, $y)
2359} 2811}
2360 2812
2813sub coord2global {
2814 my ($self, $x, $y) = @_;
2815
2816 ($x, $y)
2817}
2818
2361sub update { 2819sub update {
2362 my ($self) = @_; 2820 my ($self) = @_;
2363 2821
2364 $self->check_size; 2822 $self->check_size;
2365 ::refresh (); 2823 $::WANT_REFRESH++;
2366} 2824}
2367 2825
2368sub add { 2826sub add {
2369 my ($self, $child) = @_; 2827 my ($self, @children) = @_;
2370 2828
2829 for my $child (@children) {
2830 $child->{toplevel} = 1;
2831
2371 # integerize window positions 2832 # integerise window positions
2372 $child->{x} = int $child->{x}; 2833 $child->{x} = int $child->{x};
2373 $child->{y} = int $child->{y}; 2834 $child->{y} = int $child->{y};
2835 }
2374 2836
2375 $self->SUPER::add ($child); 2837 $self->SUPER::add (@children);
2376} 2838}
2377 2839
2378sub on_refresh { 2840sub on_refresh {
2379 my ($self, $id, $cb) = @_; 2841 my ($self, $id, $cb) = @_;
2380 2842
2381 $self->{refresh_hook}{$id} = $cb; 2843 $self->{refresh_hook}{$id} = $cb;
2382} 2844}
2383 2845
2846sub on_post_alloc {
2847 my ($self, $id, $cb) = @_;
2848
2849 $self->{post_alloc_hook}{$id} = $cb;
2850}
2851
2384sub draw { 2852sub draw {
2385 my ($self) = @_; 2853 my ($self) = @_;
2386 2854
2387 while (my $rcb = delete $self->{refresh_hook}) { 2855 while ($self->{refresh_hook}) {
2388 $_->() for values %$rcb; 2856 $_->()
2857 for values %{delete $self->{refresh_hook}};
2858 }
2859
2860 if ($self->{check_size}) {
2861 my @queue = ([], []);
2862
2863 for (;;) {
2864 if ($self->{check_size}) {
2865 # heuristic: check containers last
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2867 for values %{delete $self->{check_size}}
2868 }
2869
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2871
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2873 ? @$widget{qw(user_w user_h)}
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879
2880 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h;
2882
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2884
2885 $widget->{parent}->check_size
2886 if $widget->{parent};
2887 }
2888 }
2889 }
2890
2891 while ($self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) {
2893 my ($widget, $w, $h) = @$_;
2894
2895 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0;
2897
2898 $widget->{w} = $w;
2899 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h);
2901 $widget->emit (size_allocate => $w, $h);
2902 }
2903 }
2904
2905 while ($self->{post_alloc_hook}) {
2906 $_->()
2907 for values %{delete $self->{post_alloc_hook}};
2389 } 2908 }
2390 2909
2391 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2910 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2392 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2393 glClear GL_COLOR_BUFFER_BIT; 2912 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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