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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.205 by root, Mon May 15 00:15:08 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
241sub children { 277sub children {
242} 278}
243 279
244sub set_max_size { 280sub set_max_size {
245 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
246 282
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
249}
250
251# return top left coordinates
252sub _topleft {
253 my ($self, $x, $y) = @_;
254
255 $self->{parent}
256 or Carp::confess "no parent widget in _topleft\n";#d#
257
258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
259} 285}
260 286
261# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
262sub coord2local { 288sub coord2local {
263 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
264 290
265 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 292}
268 293
269# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
270sub coord2global { 295sub coord2global {
271 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
272 297
273 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 299}
276 300
277sub focus_in { 301sub focus_in {
278 my ($self) = @_; 302 my ($self) = @_;
279 303
… …
351 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
354 glEnd; 378 glEnd;
355 glPopMatrix; 379 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 } 381 }
358} 382}
359 383
360sub _draw { 384sub _draw {
361 my ($self) = @_; 385 my ($self) = @_;
… …
377 401
378sub set_parent { 402sub set_parent {
379 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
380 404
381 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};
382} 410}
383 411
384sub check_size { 412sub check_size {
385 my ($self) = @_; 413 my ($self, $forced) = @_;
386 414
387 $self->{parent} 415 $self->{force_alloc} = 1 if $forced;
388 or return 1; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408} 417}
409 418
410sub update { 419sub update {
411 my ($self) = @_; 420 my ($self) = @_;
412 421
… …
427} 436}
428 437
429sub DESTROY { 438sub DESTROY {
430 my ($self) = @_; 439 my ($self) = @_;
431 440
441 delete $WIDGET{$self+0};
432 #$self->deactivate; 442 #$self->deactivate;
433} 443}
434 444
435############################################################################# 445#############################################################################
436 446
… …
509 519
510 $self 520 $self
511} 521}
512 522
513sub add { 523sub add {
514 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
515 525
516 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
517 528
518 use sort 'stable'; 529 use sort 'stable';
519 530
520 $self->{children} = [ 531 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
523 ]; 534 ];
524 535
525 $child->check_size; 536 $self->check_size (1);
537 $self->update;
526} 538}
527 539
528sub children { 540sub children {
529 @{ $_[0]{children} } 541 @{ $_[0]{children} }
530} 542}
… …
549 561
550 for (@$children) { 562 for (@$children) {
551 delete $_->{parent}; 563 delete $_->{parent};
552 $_->hide; 564 $_->hide;
553 } 565 }
566
567 $self->check_size;
568 $self->update;
554} 569}
555 570
556sub find_widget { 571sub find_widget {
557 my ($self, $x, $y) = @_; 572 my ($self, $x, $y) = @_;
558 573
… …
633} 648}
634 649
635sub update { 650sub update {
636 my ($self) = @_; 651 my ($self) = @_;
637 652
638 # we want to do this delayed... 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 654 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 655}
652 656
653sub size_allocate { 657sub size_allocate {
654 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
655 659
656 $self->child->configure (0, 0, $w, $h); 660 $self->SUPER::size_allocate ($w, $h);
661 $self->update;
662}
657 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
658 $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 };
659} 684}
660 685
661sub _draw { 686sub _draw {
662 my ($self) = @_; 687 my ($self) = @_;
663 688
664 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
665 690
666 my $tex = $self->{texture} 691 my $tex = $self->{texture}
667 or return; 692 or return;
668 693
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
672 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;
673 697
674 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 699
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
678} 701}
679 702
680############################################################################# 703#############################################################################
681 704
682package CFClient::UI::ViewPort; 705package CFClient::UI::ViewPort;
683 706
684our @ISA = CFClient::UI::Window::; 707our @ISA = CFClient::UI::Window::;
685 708
686sub new { die }
687
688sub size_request { 709sub size_request {
689 my ($self) = @_; 710 my ($self) = @_;
690 711
691 @$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)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
693 714
694 @$self{qw(child_w child_h)} 715 @$self{qw(child_w child_h)}
695} 716}
696 717
697sub _draw { 718sub size_allocate {
698 my ($self) = @_; 719 my ($self, $w, $h) = @_;
699 720
700 $self->{children}[1]->draw; 721 $self->update;
701} 722}
702 723
724sub set_offset {
725 my ($self, $x, $y) = @_;
703 726
704############################################################################# 727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
705 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
706package CFClient::UI::Frame; 771package CFClient::UI::ScrolledWindow;
707 772
708our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
709
710use CFClient::OpenGL;
711 774
712sub new { 775sub new {
713 my $class = shift; 776 my $class = shift;
714 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
715 my $self = $class->SUPER::new ( 788 $self = $class->SUPER::new (
716 bg => [1, 1, 1, 1], 789 vp => (new CFClient::UI::ViewPort),
717 border_bg => [1, 1, 1, 1], 790 slider => $slider,
718 border => 0.8,
719 @_ 791 @_,
720 ); 792 );
721 793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
722 $self 798 $self
723} 799}
724 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
725sub _draw { 821sub _draw {
726 my ($self) = @_; 822 my ($self) = @_;
727 823
728 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
729 826
730 glEnable GL_BLEND; 827 glEnable GL_BLEND;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 830
735# glBegin GL_QUADS; 831 glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0; 832 glVertex 0 , 0;
738# glVertex 0 , $h; 833 glVertex 0 , $h;
739# glVertex $w, $h; 834 glVertex $w, $h;
740# glVertex $w, 0; 835 glVertex $w, 0;
741# glEnd; 836 glEnd;
742 837
743
744 $self->child->draw;
745 glDisable GL_BLEND; 838 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
747} 842}
748 843
749############################################################################# 844#############################################################################
750 845
751package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
764 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
765 860
766 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
769 border => 0.8, 864 border => 0.6,
865 toplevel => 1,
770 can_events => 1, 866 can_events => 1,
771 @_ 867 @_
772 ); 868 );
773 869
774 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 871 align => 0,
776 valign => 1, 872 valign => 1,
777 text => $self->{title}, 873 text => $self->{title},
778 fontsize => 1; 874 fontsize => $self->{border};
779 875
780 $self 876 $self
781} 877}
782 878
783sub border { 879sub border {
… …
808} 904}
809 905
810sub button_down { 906sub button_down {
811 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
812 908
909 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 910 my $border = $self->border;
814 911
815 if ($x < $self->{w} && $x >= $self->{w} - $border 912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
820 919
920 my $mx = $x < $border;
921 my $my = $y < $border;
922
821 $self->{motion} = sub { 923 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
823 925
824 ($x, $y) = ($ev->{x}, $ev->{y}); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
825 928
826 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
828 $self->check_size; 932 $self->check_size;
829 }; 933 };
830 934
831 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
836 938
837 $self->{motion} = sub { 939 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
… …
861 my ($self) = @_; 963 my ($self) = @_;
862 964
863 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 967
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 970
871 my $border = $self->border; 971 my $border = $self->border;
872 972
873 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
878 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
879 my $bg = $tex[0]; 980 my $bg = $tex[0];
880 981
881 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
883 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
884 985
885 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
886 987
887 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
891 993
892 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 995
895 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
997
896 $self->child->draw; 998 $self->child->draw;
897} 999}
898 1000
899############################################################################# 1001#############################################################################
900 1002
… …
1124} 1226}
1125 1227
1126sub size_allocate { 1228sub size_allocate {
1127 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1128 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1129 my $children = $self->{children}; 1233 my $children = $self->{children};
1130 1234
1131 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1132 1236
1133 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1172 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1173 1277
1174 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1176 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1177 fontsize => 1, 1284 fontsize => 1,
1178 text => "",
1179 align => -1, 1285 align => -1,
1180 valign => -1, 1286 valign => -1,
1181 padding => 2, 1287 padding => 2,
1182 layout => new CFClient::Layout,
1183 can_events => 0, 1288 can_events => 0,
1184 %arg 1289 %arg
1185 ); 1290 );
1186 1291
1187 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1295 $self->{template} = $layout;
1191 } 1296 }
1192 1297
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1194 $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 }
1195 1303
1196 $self 1304 $self
1197} 1305}
1198 1306
1199sub escape { 1307sub escape {
… …
1204 s/</&lt;/g; 1312 s/</&lt;/g;
1205 1313
1206 $_[1] 1314 $_[1]
1207} 1315}
1208 1316
1317sub update {
1318 my ($self) = @_;
1319
1320 delete $self->{texture};
1321 $self->SUPER::update;
1322}
1323
1209sub set_text { 1324sub set_text {
1210 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1211 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;
1212 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1213 1332
1214 delete $self->{texture}; 1333 $self->update;
1215 $self->check_size; 1334 $self->check_size;
1216 $self->update;
1217} 1335}
1218 1336
1219sub set_markup { 1337sub set_markup {
1220 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1221 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;
1222 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1223 1347
1224 delete $self->{texture}; 1348 $self->update;
1225 $self->check_size; 1349 $self->check_size;
1226 $self->update;
1227} 1350}
1228 1351
1229sub size_request { 1352sub size_request {
1230 my ($self) = @_; 1353 my ($self) = @_;
1231 1354
… …
1260sub set_fontsize { 1383sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1262 1385
1263 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1387 delete $self->{texture};
1388
1389 $self->update;
1265 $self->check_size; 1390 $self->check_size;
1266 $self->update;
1267} 1391}
1268 1392
1269sub _draw { 1393sub _draw {
1270 my ($self) = @_; 1394 my ($self) = @_;
1271 1395
1272 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1275 $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
1276 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
1277 }; 1413 };
1278 1414
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1417
1418 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $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 }
1299 1424
1300 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1426}
1303 1427
1304############################################################################# 1428#############################################################################
1305 1429
1306package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1341 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1342 1466
1343 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1344} 1468}
1345 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
1346sub get_text { 1479sub get_text {
1347 $_[0]{text} 1480 $_[0]{text}
1348} 1481}
1349 1482
1350sub size_request { 1483sub size_request {
… …
1357 1490
1358sub size_allocate { 1491sub size_allocate {
1359 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1360 1493
1361 $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
1362}
1363
1364sub set_text {
1365 my ($self, $text) = @_;
1366
1367 $self->{cursor} = length $text;
1368 $self->_set_text ($text);
1369 $self->update;
1370} 1495}
1371 1496
1372sub key_down { 1497sub key_down {
1373 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1374 1499
… …
1376 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1378 1503
1379 my $text = $self->get_text; 1504 my $text = $self->get_text;
1380 1505
1381 if ($sym == 8) { 1506 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1519 $self->emit ('escape');
1395 } elsif ($uni) { 1520 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1522 }
1398 1523
… …
1562 1687
1563 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1565 } 1690 }
1566 1691
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1572 1695
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1697
1575 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1699
1578 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1579} 1701}
1580 1702
1581############################################################################# 1703#############################################################################
… …
1628 1750
1629 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;
1630 1752
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1754
1633 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1634 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1760}
1644 1761
1645############################################################################# 1762#############################################################################
1646 1763
1647package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1691 1808
1692 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1693 } 1810 }
1694 1811
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1814
1700 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1816
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1704} 1818}
1705 1819
1706############################################################################# 1820#############################################################################
1707 1821
… …
1755} 1869}
1756 1870
1757sub set_max { 1871sub set_max {
1758 my ($self, $max) = @_; 1872 my ($self, $max) = @_;
1759 1873
1874 return if $self->{max_val} == $max;
1875
1760 $self->{max_val} = $max; 1876 $self->{max_val} = $max;
1877 $self->update;
1761} 1878}
1762 1879
1763sub set_value { 1880sub set_value {
1764 my ($self, $val, $max) = @_; 1881 my ($self, $val, $max) = @_;
1765 1882
1766 $self->set_max ($max) 1883 $self->set_max ($max)
1767 if defined $max; 1884 if defined $max;
1768 1885
1769 $max = $self->{max_val}; 1886 return if $self->{val} == $val;
1887
1770 $self->{val} = $val; 1888 $self->{val} = $val;
1771
1772 $self->update; 1889 $self->update;
1773} 1890}
1774 1891
1775sub _draw { 1892sub _draw {
1776 my ($self) = @_; 1893 my ($self) = @_;
… …
1859 1976
1860 $self->{value}->set_fontsize ($fsize); 1977 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 1978 $self->{max} ->set_fontsize ($fsize);
1862} 1979}
1863 1980
1981sub set_max {
1982 my ($self, $max) = @_;
1983
1984 $self->{gauge}->set_max ($max);
1985 $self->{max}->set_text ($max);
1986}
1987
1864sub set_value { 1988sub set_value {
1865 my ($self, $val, $max) = @_; 1989 my ($self, $val, $max) = @_;
1866 1990
1867 $self->set_max ($max) 1991 $self->set_max ($max)
1868 if defined $max; 1992 if defined $max;
1869 1993
1870 $self->{gauge}->set_value ($val, $max); 1994 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 1995 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 1996}
1880 1997
1881############################################################################# 1998#############################################################################
1882 1999
1883package CFClient::UI::Slider; 2000package CFClient::UI::Slider;
… …
1902 # TODO: calculations are off 2019 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2021 fg => [1, 1, 1],
1905 active_fg => [0, 0, 0], 2022 active_fg => [0, 0, 0],
1906 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
1907 req_w => 20, 2024 req_w => $::WIDTH / 80,
1908 req_h => 20, 2025 req_h => $::WIDTH / 80,
1909 vertical => 0, 2026 vertical => 0,
1910 can_hover => 1, 2027 can_hover => 1,
1911 inner_pad => 5, 2028 inner_pad => 5,
1912 @_ 2029 @_
1913 ); 2030 );
… …
1996 $page ||= 2; 2113 $page ||= 2;
1997 2114
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2115 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2116 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000 2117
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2118 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2120
2006 # draw background 2121 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2122 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2008 2123
2009 # draw handle 2124 # draw handle
2010 $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);
2011 2126
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2127 glDisable GL_TEXTURE_2D;
2014} 2128}
2015 2129
2016############################################################################# 2130#############################################################################
2017 2131
… …
2028 fontsize => 1, 2142 fontsize => 1,
2029 can_events => 0, 2143 can_events => 0,
2030 #font => default_font 2144 #font => default_font
2031 @_, 2145 @_,
2032 2146
2033 layout => (new CFClient::Layout), 2147 layout => (new CFClient::Layout 1),
2034 par => [], 2148 par => [],
2035 height => 0, 2149 height => 0,
2036 children => [ 2150 children => [
2037 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
2039 ], 2153 ],
2040 ); 2154 );
2041 2155
2042 $self->{children}[1]->connect (changed => sub { 2156 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2157
2046 $self 2158 $self
2047} 2159}
2048 2160
2049sub set_fontsize { 2161sub set_fontsize {
… …
2057 my ($self, $text) = @_; 2169 my ($self, $text) = @_;
2058 2170
2059 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
2060 2172
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w}); 2174 $layout->set_width ($self->{children}[0]{w});
2063 $layout->set_text ($text); 2175 $layout->set_markup ($text);
2064 2176
2065 ($layout->size)[1] 2177 ($layout->size)[1]
2066} 2178}
2067 2179
2068sub reflow { 2180sub reflow {
… …
2106 2218
2107 return unless $self->{h} > 0; 2219 return unless $self->{h} > 0;
2108 2220
2109 delete $self->{texture}; 2221 delete $self->{texture};
2110 2222
2111 $ROOT->on_refresh ($self, sub { 2223 $ROOT->on_post_alloc ($self, sub {
2112 if (delete $self->{need_reflow}) { 2224 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2225 my $height = 0;
2114 2226
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2227 $height += $_->[0] = $self->text_height ($_->[2])
2116 for @{$self->{par}}; 2228 for @{$self->{par}};
… …
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2121 2233
2122 delete $self->{texture}; 2234 delete $self->{texture};
2123 } 2235 }
2124 2236
2125 $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 {
2126 glClearColor 0, 0, 0, 1; 2238 glClearColor 0, 0, 0, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
2128 2240
2129 glEnable GL_BLEND;
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D; 2241 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133 2243
2134 my $top = int $self->{children}[1]{range}[0]; 2244 my $top = int $self->{children}[1]{range}[0];
2135 2245
… …
2144 2254
2145 for my $par (@{$self->{par}}) { 2255 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2256 my $h = $par->[0];
2147 2257
2148 if ($y0 < $y + $h && $y < $y1) { 2258 if ($y0 < $y + $h && $y < $y1) {
2259 $layout->set_foreground (@{ $par->[1] });
2149 $layout->set_text ($par->[2]); 2260 $layout->set_markup ($par->[2]);
2150 2261
2151 glColor @{ $par->[1] };
2152 my ($W, $H) = $layout->size; 2262 my ($W, $H) = $layout->size;
2153 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);
2154 } 2264 }
2155 2265
2156 $y += $h; 2266 $y += $h;
2157 } 2267 }
2158 2268
2159 glDisable GL_TEXTURE_2D; 2269 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND;
2161 }; 2270 };
2162 }); 2271 });
2163} 2272}
2164 2273
2165sub _draw { 2274sub _draw {
2166 my ($self) = @_; 2275 my ($self) = @_;
2167 2276
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2279 glColor 1, 1, 1, 1;
2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2280 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
2174 }
2175 2282
2176 $self->{children}[1]->draw; 2283 $self->{children}[1]->draw;
2177 2284
2178} 2285}
2179 2286
… …
2273 @_, 2380 @_,
2274 can_events => 0, 2381 can_events => 0,
2275 ) 2382 )
2276} 2383}
2277 2384
2278sub set_markup { 2385sub set_tooltip_from {
2279 my ($self, $text) = @_; 2386 my ($self, $widget) = @_;
2280 2387
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2388 $self->add (new CFClient::UI::Label
2282 $self->{label}->set_markup ($text); 2389 markup => $widget->{tooltip},
2283 $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 );
2284} 2395}
2285 2396
2286sub size_request { 2397sub size_request {
2287 my ($self) = @_; 2398 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2399
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2400 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2401
2293 ($w + 4, $h + 4) 2402 ($w + 4, $h + 4)
2294} 2403}
… …
2300} 2409}
2301 2410
2302sub _draw { 2411sub _draw {
2303 my ($self) = @_; 2412 my ($self) = @_;
2304 2413
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2414 glTranslate 0.375, 0.375;
2307 2415
2308 my ($w, $h) = @$self{qw(w h)}; 2416 my ($w, $h) = @$self{qw(w h)};
2309 2417
2310 glColor 1, 0.8, 0.4; 2418 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2429 glVertex 0 , $h;
2322 glVertex $w, $h; 2430 glVertex $w, $h;
2323 glVertex $w, 0; 2431 glVertex $w, 0;
2324 glEnd; 2432 glEnd;
2325 2433
2326 glPopMatrix; 2434 glTranslate 2 - 0.375, 2 - 0.375;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2435 $self->SUPER::_draw;
2330} 2436}
2331 2437
2332############################################################################# 2438#############################################################################
2333 2439
… …
2348 2454
2349sub size_request { 2455sub size_request {
2350 (32, 8) 2456 (32, 8)
2351} 2457}
2352 2458
2353sub draw { 2459sub _draw {
2354 my ($self) = @_; 2460 my ($self) = @_;
2355 2461
2462 return unless $::CONN;#d# manage and cache textures differently
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2463 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357 2464
2465 # TODO animation
2358 if ($tex) { 2466 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2467 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2469 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2470 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2471 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 } 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/\s+/ /g;
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 fg => $item->{fg},
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 fg => [0.8, 0.8, 0.8, 0.8],
2743 pri => 0,
2744 count => 1,
2745 %arg,
2746 };
2747 }
2748
2749 $self->reorder;
2368} 2750}
2369 2751
2370############################################################################# 2752#############################################################################
2371 2753
2372package CFClient::UI::Root; 2754package CFClient::UI::Root;
2373 2755
2374our @ISA = CFClient::UI::Container::; 2756our @ISA = CFClient::UI::Container::;
2375 2757
2376use CFClient::OpenGL; 2758use CFClient::OpenGL;
2377 2759
2378sub check_size { 2760sub new {
2379 my ($self) = @_; 2761 my $class = shift;
2380 2762
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2763 $class->SUPER::new (
2382} 2764 @_,
2383 2765 )
2384sub size_request {
2385 ($::WIDTH, $::HEIGHT)
2386} 2766}
2387 2767
2388sub configure { 2768sub configure {
2389 my ($self, $x, $y, $w, $h) = @_; 2769 my ($self, $x, $y, $w, $h) = @_;
2390 2770
2391 $self->SUPER::configure ($x, $y, $w, $h); 2771 $self->{w} = $w;
2772 $self->{h} = $h;
2773}
2392 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
2393 for my $child (@{$self->{children}}) { 2797 for my $child ($self->children) {
2394 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)};
2395 2799
2800 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2801 if exists $child->{req_x};
2802
2803 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2804 if exists $child->{req_y};
2805
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2806 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2807 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2808
2398 $child->configure ($X, $Y, $W,$H); 2809 $child->configure ($X, $Y, $W, $H);
2399 } 2810 }
2400} 2811}
2401 2812
2402sub _topleft { 2813sub coord2local {
2403 my ($self, $x, $y) = @_; 2814 my ($self, $x, $y) = @_;
2404 2815
2405 ($x, $y) 2816 ($x, $y)
2406} 2817}
2407 2818
2819sub coord2global {
2820 my ($self, $x, $y) = @_;
2821
2822 ($x, $y)
2823}
2824
2408sub update { 2825sub update {
2409 my ($self) = @_; 2826 my ($self) = @_;
2410 2827
2411 $self->check_size; 2828 $self->check_size;
2412 ::refresh (); 2829 $::WANT_REFRESH++;
2413} 2830}
2414 2831
2415sub add { 2832sub add {
2416 my ($self, $child) = @_; 2833 my ($self, @children) = @_;
2417 2834
2835 for my $child (@children) {
2836 $child->{toplevel} = 1;
2837
2418 # integerize window positions 2838 # integerise window positions
2419 $child->{x} = int $child->{x}; 2839 $child->{x} = int $child->{x};
2420 $child->{y} = int $child->{y}; 2840 $child->{y} = int $child->{y};
2841 }
2421 2842
2422 $self->SUPER::add ($child); 2843 $self->SUPER::add (@children);
2423} 2844}
2424 2845
2425sub on_refresh { 2846sub on_refresh {
2426 my ($self, $id, $cb) = @_; 2847 my ($self, $id, $cb) = @_;
2427 2848
2428 $self->{refresh_hook}{$id} = $cb; 2849 $self->{refresh_hook}{$id} = $cb;
2429} 2850}
2430 2851
2852sub on_post_alloc {
2853 my ($self, $id, $cb) = @_;
2854
2855 $self->{post_alloc_hook}{$id} = $cb;
2856}
2857
2431sub draw { 2858sub draw {
2432 my ($self) = @_; 2859 my ($self) = @_;
2433 2860
2434 while (my $rcb = delete $self->{refresh_hook}) { 2861 while ($self->{refresh_hook}) {
2435 $_->() for values %$rcb; 2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2864 }
2865
2866 if ($self->{check_size}) {
2867 my @queue = ([], []);
2868
2869 for (;;) {
2870 if ($self->{check_size}) {
2871 # heuristic: check containers last
2872 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2873 for values %{delete $self->{check_size}}
2874 }
2875
2876 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2877
2878 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2879 ? @$widget{qw(user_w user_h)}
2880 : $widget->size_request;
2881
2882 if (delete $widget->{force_alloc}
2883 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2884 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2885
2886 $widget->{req_w} = $w;
2887 $widget->{req_h} = $h;
2888
2889 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2890
2891 $widget->{parent}->check_size
2892 if $widget->{parent};
2893 }
2894 }
2895 }
2896
2897 while ($self->{size_alloc}) {
2898 for (values %{delete $self->{size_alloc}}) {
2899 my ($widget, $w, $h) = @$_;
2900
2901 $w = 0 if $w < 0;
2902 $h = 0 if $h < 0;
2903
2904 $widget->{w} = $w;
2905 $widget->{h} = $h;
2906 $widget->size_allocate ($w, $h);
2907 $widget->emit (size_allocate => $w, $h);
2908 }
2909 }
2910
2911 while ($self->{post_alloc_hook}) {
2912 $_->()
2913 for values %{delete $self->{post_alloc_hook}};
2436 } 2914 }
2437 2915
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2916 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2917 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 2918 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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