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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.207 by elmex, Mon May 15 18:23:33 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
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $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;
135 } 158 }
136} 159}
137 160
138############################################################################# 161#############################################################################
139 162
… …
158 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
160 } 183 }
161 } 184 }
162 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
163 $self 188 $self
164} 189}
165 190
166sub destroy { 191sub destroy {
167 my ($self) = @_; 192 my ($self) = @_;
… …
232 $self->{y} = $y; 257 $self->{y} = $y;
233 $self->update; 258 $self->update;
234 } 259 }
235 260
236 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 263 }
243} 264}
244 265
245sub size_allocate { 266sub size_allocate {
246 # nothing to be done 267 # nothing to be done
247} 268}
248 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
249sub children { 277sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 278}
261 279
262sub set_max_size { 280sub set_max_size {
263 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
264 282
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277} 285}
278 286
279# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
280sub coord2local { 288sub coord2local {
281 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
282 290
283 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 292}
286 293
287# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
288sub coord2global { 295sub coord2global {
289 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
290 297
291 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 299}
294 300
295sub focus_in { 301sub focus_in {
296 my ($self) = @_; 302 my ($self) = @_;
297 303
… …
369 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
372 glEnd; 378 glEnd;
373 glPopMatrix; 379 glPopMatrix;
374 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;
375 } 381 }
376} 382}
377 383
378sub _draw { 384sub _draw {
379 my ($self) = @_; 385 my ($self) = @_;
… …
395 401
396sub set_parent { 402sub set_parent {
397 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
398 404
399 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};
400} 410}
401 411
402sub check_size { 412sub check_size {
403 my ($self) = @_; 413 my ($self, $forced) = @_;
404 414
405 $self->{parent} 415 $self->{force_alloc} = 1 if $forced;
406 or return 1; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 417}
427 418
428sub update { 419sub update {
429 my ($self) = @_; 420 my ($self) = @_;
430 421
… …
445} 436}
446 437
447sub DESTROY { 438sub DESTROY {
448 my ($self) = @_; 439 my ($self) = @_;
449 440
441 delete $WIDGET{$self+0};
450 #$self->deactivate; 442 #$self->deactivate;
451} 443}
452 444
453############################################################################# 445#############################################################################
454 446
… …
527 519
528 $self 520 $self
529} 521}
530 522
531sub add { 523sub add {
532 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
533 525
534 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
535 528
536 use sort 'stable'; 529 use sort 'stable';
537 530
538 $self->{children} = [ 531 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
541 ]; 534 ];
542 535
543 $child->check_size; 536 $self->check_size (1);
537 $self->update;
544} 538}
545 539
546sub children { 540sub children {
547 @{ $_[0]{children} } 541 @{ $_[0]{children} }
548} 542}
… …
567 561
568 for (@$children) { 562 for (@$children) {
569 delete $_->{parent}; 563 delete $_->{parent};
570 $_->hide; 564 $_->hide;
571 } 565 }
566
567 $self->check_size;
568 $self->update;
572} 569}
573 570
574sub find_widget { 571sub find_widget {
575 my ($self, $x, $y) = @_; 572 my ($self, $x, $y) = @_;
576 573
… …
651} 648}
652 649
653sub update { 650sub update {
654 my ($self) = @_; 651 my ($self) = @_;
655 652
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 654 $self->SUPER::update;
658} 655}
659 656
660sub size_allocate { 657sub size_allocate {
661 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
662 659
663 $self->SUPER::size_allocate ($w, $h); 660 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 661 $self->update;
662}
663
664sub _render {
665 $_[0]{children}[0]->draw;
665} 666}
666 667
667sub render_child { 668sub render_child {
668 my ($self) = @_; 669 my ($self) = @_;
669 670
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 672 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 673 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 674
675 $self->_render;
674# glColorMask 1, 1, 1, 0; 676# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 677# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 679# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 680# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
687 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
688 690
689 my $tex = $self->{texture} 691 my $tex = $self->{texture}
690 or return; 692 or return;
691 693
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
695 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; 696 glColor 0, 0, 0, 1;
697 697
698 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 699
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
702} 701}
703 702
704############################################################################# 703#############################################################################
705 704
706package CFClient::UI::ViewPort; 705package CFClient::UI::ViewPort;
707 706
708our @ISA = CFClient::UI::Window::; 707our @ISA = CFClient::UI::Window::;
709 708
710sub new { die }
711
712sub size_request { 709sub size_request {
713 my ($self) = @_; 710 my ($self) = @_;
714 711
715 @$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)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 714
718 @$self{qw(child_w child_h)} 715 @$self{qw(child_w child_h)}
719} 716}
720 717
721sub _draw { 718sub size_allocate {
722 my ($self) = @_; 719 my ($self, $w, $h) = @_;
723 720
724 $self->{children}[1]->draw; 721 $self->update;
725} 722}
726 723
724sub set_offset {
725 my ($self, $x, $y) = @_;
727 726
728############################################################################# 727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
729 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
730package CFClient::UI::Frame; 771package CFClient::UI::ScrolledWindow;
731 772
732our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 774
736sub new { 775sub new {
737 my $class = shift; 776 my $class = shift;
738 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
739 my $self = $class->SUPER::new ( 788 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 789 vp => (new CFClient::UI::ViewPort),
741 border_bg => [1, 1, 1, 1], 790 slider => $slider,
742 border => 0.8,
743 @_ 791 @_,
744 ); 792 );
745 793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
746 $self 798 $self
747} 799}
748 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
749sub _draw { 821sub _draw {
750 my ($self) = @_; 822 my ($self) = @_;
751 823
752 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
753 826
754 glEnable GL_BLEND; 827 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 830
759# glBegin GL_QUADS; 831 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 832 glVertex 0 , 0;
762# glVertex 0 , $h; 833 glVertex 0 , $h;
763# glVertex $w, $h; 834 glVertex $w, $h;
764# glVertex $w, 0; 835 glVertex $w, 0;
765# glEnd; 836 glEnd;
766 837
767
768 $self->child->draw;
769 glDisable GL_BLEND; 838 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
771} 842}
772 843
773############################################################################# 844#############################################################################
774 845
775package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
789 860
790 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
793 border => 0.6, 864 border => 0.6,
865 toplevel => 1,
794 can_events => 1, 866 can_events => 1,
795 @_ 867 @_
796 ); 868 );
797 869
798 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
… …
891 my ($self) = @_; 963 my ($self) = @_;
892 964
893 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 967
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 970
901 my $border = $self->border; 971 my $border = $self->border;
902 972
903 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 978
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 980 my $bg = $tex[0];
911 981
912 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
… …
916 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
917 987
918 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
922 993
923 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 995
927 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
928 997
929 $self->child->draw; 998 $self->child->draw;
930} 999}
… …
1157} 1226}
1158 1227
1159sub size_allocate { 1228sub size_allocate {
1160 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1161 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1162 my $children = $self->{children}; 1233 my $children = $self->{children};
1163 1234
1164 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1165 1236
1166 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1205 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1206 1277
1207 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1209 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1210 fontsize => 1, 1284 fontsize => 1,
1211 text => "",
1212 align => -1, 1285 align => -1,
1213 valign => -1, 1286 valign => -1,
1214 padding => 2, 1287 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1288 can_events => 0,
1217 %arg 1289 %arg
1218 ); 1290 );
1219 1291
1220 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1295 $self->{template} = $layout;
1224 } 1296 }
1225 1297
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1227 $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 }
1228 1303
1229 $self 1304 $self
1230} 1305}
1231 1306
1232sub escape { 1307sub escape {
… …
1244 1319
1245 delete $self->{texture}; 1320 delete $self->{texture};
1246 $self->SUPER::update; 1321 $self->SUPER::update;
1247} 1322}
1248 1323
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1324sub set_text {
1256 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1257 1326
1258 return if $self->{text} eq "T$text"; 1327 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1328 $self->{text} = "T$text";
1260 1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1262 1332
1263 delete $self->{texture};
1264 $self->update; 1333 $self->update;
1265 $self->check_size; 1334 $self->check_size;
1266} 1335}
1267 1336
1268sub set_markup { 1337sub set_markup {
1269 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1270 1339
1271 return if $self->{text} eq "M$markup"; 1340 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1341 $self->{text} = "M$markup";
1273 1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1275 1347
1276 delete $self->{texture};
1277 $self->update; 1348 $self->update;
1278 $self->check_size; 1349 $self->check_size;
1279} 1350}
1280 1351
1281sub size_request { 1352sub size_request {
… …
1312sub set_fontsize { 1383sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1314 1385
1315 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1387 delete $self->{texture};
1388
1389 $self->update;
1317 $self->check_size; 1390 $self->check_size;
1318 $self->update;
1319} 1391}
1320 1392
1321sub _draw { 1393sub _draw {
1322 my ($self) = @_; 1394 my ($self) = @_;
1323 1395
1324 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1327 $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
1328 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
1329 }; 1413 };
1330 1414
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1417
1418 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $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 }
1351 1424
1352 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1426}
1355 1427
1356############################################################################# 1428#############################################################################
1357 1429
1358package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1393 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1394 1466
1395 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1396} 1468}
1397 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
1398sub get_text { 1479sub get_text {
1399 $_[0]{text} 1480 $_[0]{text}
1400} 1481}
1401 1482
1402sub size_request { 1483sub size_request {
… …
1409 1490
1410sub size_allocate { 1491sub size_allocate {
1411 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1412 1493
1413 $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
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1495}
1423 1496
1424sub key_down { 1497sub key_down {
1425 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1426 1499
… …
1428 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1430 1503
1431 my $text = $self->get_text; 1504 my $text = $self->get_text;
1432 1505
1433 if ($sym == 8) { 1506 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1519 $self->emit ('escape');
1447 } elsif ($uni) { 1520 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1522 }
1450 1523
… …
1614 1687
1615 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1617 } 1690 }
1618 1691
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1624 1695
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1697
1627 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1699
1630 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1631} 1701}
1632 1702
1633############################################################################# 1703#############################################################################
… …
1680 1750
1681 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;
1682 1752
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1754
1685 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1686 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1760}
1696 1761
1697############################################################################# 1762#############################################################################
1698 1763
1699package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1743 1808
1744 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1745 } 1810 }
1746 1811
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1814
1752 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1816
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1756} 1818}
1757 1819
1758############################################################################# 1820#############################################################################
1759 1821
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
1949 2011
1950sub new { 2012sub new {
1951 my $class = shift; 2013 my $class = shift;
1952 2014
1953 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
1954 2016
1955 # TODO: 0-width page 2017 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2019 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2021 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2022 active_fg => [0, 0, 0],
1961 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
1962 req_w => 20, 2024 req_w => $::WIDTH / 80,
1963 req_h => 20, 2025 req_h => $::WIDTH / 80,
1964 vertical => 0, 2026 vertical => 0,
1965 can_hover => 1, 2027 can_hover => 1,
1966 inner_pad => 5, 2028 inner_pad => .05,
1967 @_ 2029 @_
1968 ); 2030 );
1969 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
1970 $self 2035 $self
2036}
2037
2038sub set_value {
2039 my ($self, $value) = @_;
2040
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042
2043 $hi = $lo + 1 if $hi <= $lo;
2044
2045 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi;
2047
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054
2055 if ($value != $old_value) {
2056 $self->emit (changed => $value);
2057 $self->update;
2058 }
1971} 2059}
1972 2060
1973sub size_request { 2061sub size_request {
1974 my ($self) = @_; 2062 my ($self) = @_;
1975 2063
… …
1988 2076
1989sub mouse_motion { 2077sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
1991 2079
1992 if ($GRAB == $self) { 2080 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082
2083 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2086
2087 $self->set_value ($x * ($hi - $lo) + $lo);
2088 }
2089}
2090
2091sub update {
2092 my ($self) = @_;
2093
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095 $self->set_value ($self->{range}[0]);
2096
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
1994 2098
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
1996 2100
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1999 2102
2000 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2105
2006 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2007 $self->update; 2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value;
2112 $self->{knob_w} = $page;
2008 } 2113 });
2009}
2010 2114
2011# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2116}
2018 2117
2019sub _draw { 2118sub _draw {
2020 my ($self) = @_; 2119 my ($self) = @_;
2021 2120
2022 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
2023 2122
2024 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
2025 2124
2026 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
2028 2127
2029 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2130 }
2034 2131
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2134
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2137
2061 # draw background 2138 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2140
2064 # draw handle 2141 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2142 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 2143
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
2069} 2145}
2070 2146
2071############################################################################# 2147#############################################################################
2072 2148
… …
2083 fontsize => 1, 2159 fontsize => 1,
2084 can_events => 0, 2160 can_events => 0,
2085 #font => default_font 2161 #font => default_font
2086 @_, 2162 @_,
2087 2163
2088 layout => (new CFClient::Layout), 2164 layout => (new CFClient::Layout 1),
2089 par => [], 2165 par => [],
2090 height => 0, 2166 height => 0,
2091 children => [ 2167 children => [
2092 (new CFClient::UI::Empty expand => 1), 2168 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2169 (new CFClient::UI::Slider vertical => 1),
… …
2111 2187
2112 my $layout = $self->{layout}; 2188 my $layout = $self->{layout};
2113 2189
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w}); 2191 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text); 2192 $layout->set_markup ($text);
2117 2193
2118 ($layout->size)[1] 2194 ($layout->size)[1]
2119} 2195}
2120 2196
2121sub reflow { 2197sub reflow {
… …
2159 2235
2160 return unless $self->{h} > 0; 2236 return unless $self->{h} > 0;
2161 2237
2162 delete $self->{texture}; 2238 delete $self->{texture};
2163 2239
2164 $ROOT->on_refresh ($self, sub { 2240 $ROOT->on_post_alloc ($self, sub {
2165 if (delete $self->{need_reflow}) { 2241 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2242 my $height = 0;
2167 2243
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2244 $height += $_->[0] = $self->text_height ($_->[2])
2169 for @{$self->{par}}; 2245 for @{$self->{par}};
… …
2177 2253
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2179 glClearColor 0, 0, 0, 0; 2255 glClearColor 0, 0, 0, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2256 glClear GL_COLOR_BUFFER_BIT;
2181 2257
2182 glEnable GL_BLEND;
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D; 2258 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186 2260
2187 my $top = int $self->{children}[1]{range}[0]; 2261 my $top = int $self->{children}[1]{range}[0];
2188 2262
… …
2197 2271
2198 for my $par (@{$self->{par}}) { 2272 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2273 my $h = $par->[0];
2200 2274
2201 if ($y0 < $y + $h && $y < $y1) { 2275 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] });
2202 $layout->set_text ($par->[2]); 2277 $layout->set_markup ($par->[2]);
2203 2278
2204 glColor @{ $par->[1] };
2205 my ($W, $H) = $layout->size; 2279 my ($W, $H) = $layout->size;
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2207 } 2281 }
2208 2282
2209 $y += $h; 2283 $y += $h;
2210 } 2284 }
2211 2285
2212 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND;
2214 }; 2287 };
2215 }); 2288 });
2216} 2289}
2217 2290
2218sub _draw { 2291sub _draw {
2219 my ($self) = @_; 2292 my ($self) = @_;
2220 2293
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2296 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2299
2230 $self->{children}[1]->draw; 2300 $self->{children}[1]->draw;
2231 2301
2232} 2302}
2233 2303
… …
2327 @_, 2397 @_,
2328 can_events => 0, 2398 can_events => 0,
2329 ) 2399 )
2330} 2400}
2331 2401
2332sub set_markup { 2402sub set_tooltip_from {
2333 my ($self, $text) = @_; 2403 my ($self, $widget) = @_;
2334 2404
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2405 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2406 markup => $widget->{tooltip},
2337 $self->add ($self->{label}); 2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8,
2409 fg => [0, 0, 0, 1],
2410 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 );
2338} 2412}
2339 2413
2340sub size_request { 2414sub size_request {
2341 my ($self) = @_; 2415 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2416
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2418
2347 ($w + 4, $h + 4) 2419 ($w + 4, $h + 4)
2348} 2420}
… …
2354} 2426}
2355 2427
2356sub _draw { 2428sub _draw {
2357 my ($self) = @_; 2429 my ($self) = @_;
2358 2430
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2431 glTranslate 0.375, 0.375;
2361 2432
2362 my ($w, $h) = @$self{qw(w h)}; 2433 my ($w, $h) = @$self{qw(w h)};
2363 2434
2364 glColor 1, 0.8, 0.4; 2435 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2446 glVertex 0 , $h;
2376 glVertex $w, $h; 2447 glVertex $w, $h;
2377 glVertex $w, 0; 2448 glVertex $w, 0;
2378 glEnd; 2449 glEnd;
2379 2450
2380 glPopMatrix; 2451 glTranslate 2 - 0.375, 2 - 0.375;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2384} 2453}
2385 2454
2386############################################################################# 2455#############################################################################
2387 2456
… …
2405} 2474}
2406 2475
2407sub _draw { 2476sub _draw {
2408 my ($self) = @_; 2477 my ($self) = @_;
2409 2478
2479 return unless $::CONN;#d# manage and cache textures differently
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411 2481
2412 # TODO animation 2482 # TODO animation
2413 if ($tex) { 2483 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2484 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2486 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2488 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2489 }
2490}
2491
2492#############################################################################
2493
2494package CFClient::UI::InventoryItem;
2495
2496our @ISA = CFClient::UI::HBox::;
2497
2498sub new {
2499 my $class = shift;
2500
2501 my %args = @_;
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2
2506 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}";
2508
2509 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)";
2513 $item->{flags} & Crossfire::Protocol::F_UNPAID
2514 and $desc .= " (unpaid)";
2515 $item->{flags} & Crossfire::Protocol::F_MAGIC
2516 and $desc .= " (magic)";
2517 $item->{flags} & Crossfire::Protocol::F_CURSED
2518 and $desc .= " (cursed)";
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *";
2523
2524 my $self = $class->SUPER::new (
2525 can_hover => 1,
2526 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_;
2531
2532 # todo: maybe put examine on 1? but should just be a tooltip :(
2533 if ($ev->{button} == 1) {
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2535 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) {
2538 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ],
2547 );
2548
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 }
2551
2552 1
2553 },
2554 %args
2555 );
2556
2557 $self->add (new CFClient::UI::Face
2558 can_events => 0,
2559 face => $item->{face},
2560 anim => $item->{anim},
2561 animspeed => $item->{animspeed},
2562 );
2563
2564 $self->add (new CFClient::UI::Label
2565 can_events => 0,
2566 text => $desc,
2567 );
2568
2569 $self
2570}
2571
2572#############################################################################
2573
2574package CFClient::UI::Inventory;
2575
2576our @ISA = CFClient::UI::ScrolledWindow::;
2577
2578sub new {
2579 my $class = shift;
2580
2581 my $self = $class->SUPER::new (
2582 scrolled => (new CFClient::UI::VBox),
2583 @_,
2584 );
2585
2586 $self
2587}
2588
2589sub set_items {
2590 my ($self, $items) = @_;
2591
2592 $self->{scrolled}->clear;
2593 return unless $items;
2594
2595 my @items = sort {
2596 ($a->{type} <=> $b->{type})
2597 or ($a->{name} cmp $b->{name})
2598 } @$items;
2599
2600 $self->{real_items} = \@items;
2601
2602 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2608 }
2609
2610 $self->{scrolled}->add (@items);
2611
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613}
2614
2615sub size_request {
2616 my ($self) = @_;
2617 ($self->{req_w}, $self->{req_h});
2423} 2618}
2424 2619
2425############################################################################# 2620#############################################################################
2426 2621
2427package CFClient::UI::Menu; 2622package CFClient::UI::Menu;
… …
2475} 2670}
2476 2671
2477sub mouse_motion { 2672sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2673 my ($self, $ev, $x, $y) = @_;
2479 2674
2480 # TODO: should use vbox->fdind_widget or so 2675 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2676 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2677 $self->{hover} = $self->{item}{$HOVER};
2483} 2678}
2484 2679
2485sub button_up { 2680sub button_up {
… …
2494 } 2689 }
2495} 2690}
2496 2691
2497############################################################################# 2692#############################################################################
2498 2693
2694package CFClient::UI::Statusbox;
2695
2696our @ISA = CFClient::UI::VBox::;
2697
2698sub reorder {
2699 my ($self) = @_;
2700 my $NOW = time;
2701
2702 while (my ($k, $v) = each %{ $self->{item} }) {
2703 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2704 }
2705
2706 my @widgets;
2707
2708 my @items = sort {
2709 $a->{pri} <=> $b->{pri}
2710 or $b->{id} <=> $a->{id}
2711 } values %{ $self->{item} };
2712
2713 my $count = 10 + 1;
2714 for my $item (@items) {
2715 last unless --$count;
2716
2717 push @widgets, $item->{label} ||= do {
2718 # TODO: doesn't handle markup well (read as: at all)
2719 my $short = $item->{count} > 1
2720 ? "<b>$item->{count} ×</b> $item->{text}"
2721 : $item->{text};
2722
2723 for ($short) {
2724 s/^\s+//;
2725 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 }
2729
2730 new CFClient::UI::Label
2731 markup => $short,
2732 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize},
2736 fg => $item->{fg},
2737 can_events => 1,
2738 can_hover => 1
2739 };
2740 }
2741
2742 $self->clear;
2743 $self->SUPER::add (reverse @widgets);
2744}
2745
2746sub add {
2747 my ($self, $text, %arg) = @_;
2748
2749 $text =~ s/^\s+//;
2750 $text =~ s/\s+$//;
2751
2752 my $timeout = time + ((delete $arg{timeout}) || 60);
2753
2754 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755
2756 if (my $item = $self->{item}{$group}) {
2757 if ($item->{text} eq $text) {
2758 $item->{count}++;
2759 } else {
2760 $item->{count} = 1;
2761 $item->{text} = $item->{tooltip} = $text;
2762 }
2763 $item->{id} = ++$self->{id};
2764 $item->{timeout} = $timeout;
2765 delete $item->{label};
2766 } else {
2767 $self->{item}{$group} = {
2768 id => ++$self->{id},
2769 text => $text,
2770 timeout => $timeout,
2771 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0,
2775 count => 1,
2776 %arg,
2777 };
2778 }
2779
2780 $self->reorder;
2781}
2782
2783#############################################################################
2784
2499package CFClient::UI::Root; 2785package CFClient::UI::Root;
2500 2786
2501our @ISA = CFClient::UI::Container::; 2787our @ISA = CFClient::UI::Container::;
2502 2788
2503use CFClient::OpenGL; 2789use CFClient::OpenGL;
2504 2790
2505sub check_size { 2791sub new {
2506 my ($self) = @_; 2792 my $class = shift;
2507 2793
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2794 $class->SUPER::new (
2509} 2795 @_,
2510 2796 )
2511sub size_request {
2512 ($::WIDTH, $::HEIGHT)
2513} 2797}
2514 2798
2515sub configure { 2799sub configure {
2516 my ($self, $x, $y, $w, $h) = @_; 2800 my ($self, $x, $y, $w, $h) = @_;
2517 2801
2518 $self->SUPER::configure ($x, $y, $w, $h); 2802 $self->{w} = $w;
2803 $self->{h} = $h;
2804}
2519 2805
2806sub check_size {
2807 my ($self) = @_;
2808
2809 $self->size_allocate ($self->{w}, $self->{h})
2810 if $self->{w};
2811}
2812
2813sub size_request {
2814 my ($self) = @_;
2815
2816 ($self->{w}, $self->{h})
2817}
2818
2819sub size_allocate {
2820 my ($self, $w, $h) = @_;
2821
2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827
2520 for my $child (@{$self->{children}}) { 2828 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 2830
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832 if exists $child->{req_x};
2833
2834 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2835 if exists $child->{req_y};
2836
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2837 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2838 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2839
2525 $child->configure ($X, $Y, $W,$H); 2840 $child->configure ($X, $Y, $W, $H);
2526 } 2841 }
2527} 2842}
2528 2843
2529sub _topleft { 2844sub coord2local {
2530 my ($self, $x, $y) = @_; 2845 my ($self, $x, $y) = @_;
2531 2846
2532 ($x, $y) 2847 ($x, $y)
2533} 2848}
2534 2849
2850sub coord2global {
2851 my ($self, $x, $y) = @_;
2852
2853 ($x, $y)
2854}
2855
2535sub update { 2856sub update {
2536 my ($self) = @_; 2857 my ($self) = @_;
2537 2858
2538 $self->check_size; 2859 $self->check_size;
2539 ::refresh (); 2860 $::WANT_REFRESH++;
2540} 2861}
2541 2862
2542sub add { 2863sub add {
2543 my ($self, $child) = @_; 2864 my ($self, @children) = @_;
2544 2865
2866 for my $child (@children) {
2867 $child->{toplevel} = 1;
2868
2545 # integerize window positions 2869 # integerise window positions
2546 $child->{x} = int $child->{x}; 2870 $child->{x} = int $child->{x};
2547 $child->{y} = int $child->{y}; 2871 $child->{y} = int $child->{y};
2872 }
2548 2873
2549 $self->SUPER::add ($child); 2874 $self->SUPER::add (@children);
2550} 2875}
2551 2876
2552sub on_refresh { 2877sub on_refresh {
2553 my ($self, $id, $cb) = @_; 2878 my ($self, $id, $cb) = @_;
2554 2879
2555 $self->{refresh_hook}{$id} = $cb; 2880 $self->{refresh_hook}{$id} = $cb;
2556} 2881}
2557 2882
2883sub on_post_alloc {
2884 my ($self, $id, $cb) = @_;
2885
2886 $self->{post_alloc_hook}{$id} = $cb;
2887}
2888
2558sub draw { 2889sub draw {
2559 my ($self) = @_; 2890 my ($self) = @_;
2560 2891
2561 while (my $rcb = delete $self->{refresh_hook}) { 2892 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 2893 $_->()
2894 for values %{delete $self->{refresh_hook}};
2895 }
2896
2897 if ($self->{check_size}) {
2898 my @queue = ([], []);
2899
2900 for (;;) {
2901 if ($self->{check_size}) {
2902 # heuristic: check containers last
2903 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2904 for values %{delete $self->{check_size}}
2905 }
2906
2907 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2908
2909 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2910 ? @$widget{qw(user_w user_h)}
2911 : $widget->size_request;
2912
2913 if (delete $widget->{force_alloc}
2914 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2915 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2916
2917 $widget->{req_w} = $w;
2918 $widget->{req_h} = $h;
2919
2920 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2921
2922 $widget->{parent}->check_size
2923 if $widget->{parent};
2924 }
2925 }
2926 }
2927
2928 while ($self->{size_alloc}) {
2929 for (values %{delete $self->{size_alloc}}) {
2930 my ($widget, $w, $h) = @$_;
2931
2932 $w = 0 if $w < 0;
2933 $h = 0 if $h < 0;
2934
2935 $widget->{w} = $w;
2936 $widget->{h} = $h;
2937 $widget->size_allocate ($w, $h);
2938 $widget->emit (size_allocate => $w, $h);
2939 }
2940 }
2941
2942 while ($self->{post_alloc_hook}) {
2943 $_->()
2944 for values %{delete $self->{post_alloc_hook}};
2563 } 2945 }
2564 2946
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 2949 glClear GL_COLOR_BUFFER_BIT;
… …
2575 $self->_draw; 2957 $self->_draw;
2576} 2958}
2577 2959
2578############################################################################# 2960#############################################################################
2579 2961
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 2962package CFClient::UI;
2688 2963
2689$ROOT = new CFClient::UI::Root; 2964$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 2965$TOOLTIP = new CFClient::UI::Tooltip;
2691 2966

Diff Legend

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