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.204 by root, Sun May 14 22:24:16 2006 UTC

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

Diff Legend

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