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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC

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

Diff Legend

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