ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC

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

Diff Legend

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