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.170 by root, Mon Apr 24 11:45:17 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 $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 {
… …
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
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
1334sub get_text { 1479sub get_text {
1335 $_[0]{text} 1480 $_[0]{text}
1336} 1481}
1337 1482
1338sub size_request { 1483sub size_request {
… …
1345 1490
1346sub size_allocate { 1491sub size_allocate {
1347 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1348 1493
1349 $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
1350}
1351
1352sub set_text {
1353 my ($self, $text) = @_;
1354
1355 $self->{cursor} = length $text;
1356 $self->_set_text ($text);
1357 $self->update;
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
… …
1550 1687
1551 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1552 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1553 } 1690 }
1554 1691
1555 glEnable GL_BLEND;
1556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1560 1695
1561 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562 1697
1563 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1564 glDisable GL_BLEND;
1565 1699
1566 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1567} 1701}
1568 1702
1569############################################################################# 1703#############################################################################
… …
1616 1750
1617 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;
1618 1752
1619 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620 1754
1621 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1622 glEnable GL_TEXTURE_2D; 1757 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); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1630 glDisable GL_BLEND;
1631} 1760}
1632 1761
1633############################################################################# 1762#############################################################################
1634 1763
1635package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1678 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1679 1808
1680 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1681 } 1810 }
1682 1811
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687 1814
1688 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1689 1816
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1692} 1818}
1693 1819
1694############################################################################# 1820#############################################################################
1695 1821
… …
1743} 1869}
1744 1870
1745sub set_max { 1871sub set_max {
1746 my ($self, $max) = @_; 1872 my ($self, $max) = @_;
1747 1873
1874 return if $self->{max_val} == $max;
1875
1748 $self->{max_val} = $max; 1876 $self->{max_val} = $max;
1877 $self->update;
1749} 1878}
1750 1879
1751sub set_value { 1880sub set_value {
1752 my ($self, $val, $max) = @_; 1881 my ($self, $val, $max) = @_;
1753 1882
1754 $self->set_max ($max) 1883 $self->set_max ($max)
1755 if defined $max; 1884 if defined $max;
1756 1885
1757 $max = $self->{max_val}; 1886 return if $self->{val} == $val;
1887
1758 $self->{val} = $val; 1888 $self->{val} = $val;
1759
1760 $self->update; 1889 $self->update;
1761} 1890}
1762 1891
1763sub _draw { 1892sub _draw {
1764 my ($self) = @_; 1893 my ($self) = @_;
… …
1827 1956
1828sub new { 1957sub new {
1829 my ($class, %arg) = @_; 1958 my ($class, %arg) = @_;
1830 1959
1831 my $self = $class->SUPER::new ( 1960 my $self = $class->SUPER::new (
1832 tooltip => $arg{type}, 1961 tooltip => $arg{type},
1833 can_hover => 1, 1962 can_hover => 1,
1963 can_events => 1,
1834 %arg, 1964 %arg,
1835 ); 1965 );
1836 1966
1837 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1967 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1838 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1968 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1846 1976
1847 $self->{value}->set_fontsize ($fsize); 1977 $self->{value}->set_fontsize ($fsize);
1848 $self->{max} ->set_fontsize ($fsize); 1978 $self->{max} ->set_fontsize ($fsize);
1849} 1979}
1850 1980
1981sub set_max {
1982 my ($self, $max) = @_;
1983
1984 $self->{gauge}->set_max ($max);
1985 $self->{max}->set_text ($max);
1986}
1987
1851sub set_value { 1988sub set_value {
1852 my ($self, $val, $max) = @_; 1989 my ($self, $val, $max) = @_;
1853 1990
1854 $self->set_max ($max) 1991 $self->set_max ($max)
1855 if defined $max; 1992 if defined $max;
1856 1993
1857 $self->{gauge}->set_value ($val, $max); 1994 $self->{gauge}->set_value ($val, $max);
1858 $self->{value}->set_text ($val); 1995 $self->{value}->set_text ($val);
1859}
1860
1861sub set_max {
1862 my ($self, $max) = @_;
1863
1864 $self->{gauge}->set_max ($max);
1865 $self->{max}->set_text ($max);
1866} 1996}
1867 1997
1868############################################################################# 1998#############################################################################
1869 1999
1870package CFClient::UI::Slider; 2000package CFClient::UI::Slider;
… …
1880 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
1881 2011
1882sub new { 2012sub new {
1883 my $class = shift; 2013 my $class = shift;
1884 2014
1885 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
1886 2016
1887 # TODO: 0-width page 2017 # TODO: 0-width page
1888 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
1889 # TODO: calculations are off 2019 # TODO: calculations are off
1890 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
1891 fg => [1, 1, 1], 2021 fg => [1, 1, 1],
1892 active_fg => [0, 0, 0], 2022 active_fg => [0, 0, 0],
1893 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
1894 req_w => 20, 2024 req_w => $::WIDTH / 80,
1895 req_h => 20, 2025 req_h => $::WIDTH / 80,
1896 vertical => 0, 2026 vertical => 0,
1897 can_hover => 1, 2027 can_hover => 1,
1898 inner_pad => 5, 2028 inner_pad => .05,
1899 @_ 2029 @_
1900 ); 2030 );
1901 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
1902 $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 }
1903} 2059}
1904 2060
1905sub size_request { 2061sub size_request {
1906 my ($self) = @_; 2062 my ($self) = @_;
1907 2063
… …
1920 2076
1921sub mouse_motion { 2077sub mouse_motion {
1922 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
1923 2079
1924 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
1925 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
1926 2098
1927 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
1928 2100
1929 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1930 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1931 2102
1932 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1933 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
1934 $x = $lo if $x < $lo;
1935 $x = $hi - $page if $x > $hi - $page;
1936 $self->{range}[0] = $x;
1937 2105
1938 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
1939 $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;
1940 } 2113 });
1941}
1942 2114
1943# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
1944# so that the handle doesn't leave the texture. This calculation isn't 100%
1945# correct propably, but it does the job for now
1946sub _calc_inner_pad_px {
1947 my ($self, $w) = @_;
1948 ($w / 100) * $self->{inner_pad} # % to pixels
1949} 2116}
1950 2117
1951sub _draw { 2118sub _draw {
1952 my ($self) = @_; 2119 my ($self) = @_;
1953 2120
1954 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
1955 2122
1956 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
1957 2124
1958 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
1959 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
1960 2127
1961 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
1962 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
1963
1964 ($w, $h) = ($h, $w);
1965 } 2130 }
1966 2131
1967 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1968 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1969 2134
1970 my ($value, $lo, $hi, $page) = @{$self->{range}};
1971
1972 $hi = $value + 1 if $lo == $hi;
1973
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976
1977 $page = int $page * $inner_w / ($hi - $lo);
1978 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1979
1980 $w -= $page;
1981 $page &= ~1;
1982 glTranslate $page * 0.5, 0, 0;
1983 $page ||= 2;
1984
1985 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1986 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1987
1988 glEnable GL_BLEND;
1989 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1990 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
1991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1992 2137
1993 # draw background 2138 # draw background
1994 $tex[1]->draw_quad (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1995 2140
1996 # draw handle 2141 # draw handle
1997 $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);
1998 2143
1999 glDisable GL_BLEND;
2000 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
2001} 2145}
2002 2146
2003############################################################################# 2147#############################################################################
2004 2148
… …
2015 fontsize => 1, 2159 fontsize => 1,
2016 can_events => 0, 2160 can_events => 0,
2017 #font => default_font 2161 #font => default_font
2018 @_, 2162 @_,
2019 2163
2020 layout => (new CFClient::Layout), 2164 layout => (new CFClient::Layout 1),
2021 par => [], 2165 par => [],
2022 height => 0, 2166 height => 0,
2023 children => [ 2167 children => [
2024 (new CFClient::UI::Empty expand => 1), 2168 (new CFClient::UI::Empty expand => 1),
2025 (new CFClient::UI::Slider vertical => 1), 2169 (new CFClient::UI::Slider vertical => 1),
2026 ], 2170 ],
2027 ); 2171 );
2028 2172
2029 $self->{children}[1]->connect (changed => sub { 2173 $self->{children}[1]->connect (changed => sub { $self->update });
2030 $self->update;
2031 });
2032 2174
2033 $self 2175 $self
2034} 2176}
2035 2177
2036sub set_fontsize { 2178sub set_fontsize {
… …
2044 my ($self, $text) = @_; 2186 my ($self, $text) = @_;
2045 2187
2046 my $layout = $self->{layout}; 2188 my $layout = $self->{layout};
2047 2189
2048 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2049 $layout->set_width ($self->{w}); 2191 $layout->set_width ($self->{children}[0]{w});
2050 $layout->set_text ($text); 2192 $layout->set_markup ($text);
2051 2193
2052 ($layout->size)[1] 2194 ($layout->size)[1]
2053} 2195}
2054 2196
2055sub reflow { 2197sub reflow {
… …
2093 2235
2094 return unless $self->{h} > 0; 2236 return unless $self->{h} > 0;
2095 2237
2096 delete $self->{texture}; 2238 delete $self->{texture};
2097 2239
2098 $ROOT->on_refresh ($self, sub { 2240 $ROOT->on_post_alloc ($self, sub {
2099 if (delete $self->{need_reflow}) { 2241 if (delete $self->{need_reflow}) {
2100 my $height = 0; 2242 my $height = 0;
2101 2243
2102 $height += $_->[0] = $self->text_height ($_->[2]) 2244 $height += $_->[0] = $self->text_height ($_->[2])
2103 for @{$self->{par}}; 2245 for @{$self->{par}};
… …
2107 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2108 2250
2109 delete $self->{texture}; 2251 delete $self->{texture};
2110 } 2252 }
2111 2253
2112 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2113 glClearColor 0, 0, 0, 1; 2255 glClearColor 0, 0, 0, 0;
2114 glClear GL_COLOR_BUFFER_BIT; 2256 glClear GL_COLOR_BUFFER_BIT;
2115 2257
2116 glEnable GL_BLEND;
2117 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2118 glEnable GL_TEXTURE_2D; 2258 glEnable GL_TEXTURE_2D;
2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120 2260
2121 my $top = int $self->{children}[1]{range}[0]; 2261 my $top = int $self->{children}[1]{range}[0];
2122 2262
… …
2131 2271
2132 for my $par (@{$self->{par}}) { 2272 for my $par (@{$self->{par}}) {
2133 my $h = $par->[0]; 2273 my $h = $par->[0];
2134 2274
2135 if ($y0 < $y + $h && $y < $y1) { 2275 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] });
2136 $layout->set_text ($par->[2]); 2277 $layout->set_markup ($par->[2]);
2137 2278
2138 glColor @{ $par->[1] };
2139 my ($W, $H) = $layout->size; 2279 my ($W, $H) = $layout->size;
2140 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);
2141 } 2281 }
2142 2282
2143 $y += $h; 2283 $y += $h;
2144 } 2284 }
2145 2285
2146 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2147 glDisable GL_BLEND;
2148 }; 2287 };
2149 }); 2288 });
2150} 2289}
2151 2290
2152sub _draw { 2291sub _draw {
2153 my ($self) = @_; 2292 my ($self) = @_;
2154 2293
2155 if ($self->{texture}) {
2156 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2296 glColor 1, 1, 1, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2159 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
2160 }
2161 2299
2162 $self->{children}[1]->draw; 2300 $self->{children}[1]->draw;
2163 2301
2164} 2302}
2165 2303
… …
2259 @_, 2397 @_,
2260 can_events => 0, 2398 can_events => 0,
2261 ) 2399 )
2262} 2400}
2263 2401
2264sub set_markup { 2402sub set_tooltip_from {
2265 my ($self, $text) = @_; 2403 my ($self, $widget) = @_;
2266 2404
2267 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2405 $self->add (new CFClient::UI::Label
2268 $self->{label}->set_markup ($text); 2406 markup => $widget->{tooltip},
2269 $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 );
2270} 2412}
2271 2413
2272sub size_request { 2414sub size_request {
2273 my ($self) = @_; 2415 my ($self) = @_;
2274
2275 $self->child->set_max_size ($::WIDTH * 0.3);
2276 2416
2277 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2278 2418
2279 ($w + 4, $h + 4) 2419 ($w + 4, $h + 4)
2280} 2420}
… …
2286} 2426}
2287 2427
2288sub _draw { 2428sub _draw {
2289 my ($self) = @_; 2429 my ($self) = @_;
2290 2430
2291 glPushMatrix;
2292 glTranslate 0.375, 0.375; 2431 glTranslate 0.375, 0.375;
2293 2432
2294 my ($w, $h) = @$self{qw(w h)}; 2433 my ($w, $h) = @$self{qw(w h)};
2295 2434
2296 glColor 1, 0.8, 0.4; 2435 glColor 1, 0.8, 0.4;
… …
2307 glVertex 0 , $h; 2446 glVertex 0 , $h;
2308 glVertex $w, $h; 2447 glVertex $w, $h;
2309 glVertex $w, 0; 2448 glVertex $w, 0;
2310 glEnd; 2449 glEnd;
2311 2450
2312 glPopMatrix; 2451 glTranslate 2 - 0.375, 2 - 0.375;
2313
2314 glTranslate 2, 2;
2315 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2316} 2453}
2317 2454
2318############################################################################# 2455#############################################################################
2319 2456
… …
2334 2471
2335sub size_request { 2472sub size_request {
2336 (32, 8) 2473 (32, 8)
2337} 2474}
2338 2475
2339sub draw { 2476sub _draw {
2340 my ($self) = @_; 2477 my ($self) = @_;
2341 2478
2479 return unless $::CONN;#d# manage and cache textures differently
2342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2343 2481
2482 # TODO animation
2344 if ($tex) { 2483 if ($tex) {
2345 glEnable GL_BLEND;
2346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347 glEnable GL_TEXTURE_2D; 2484 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2486 glColor 1, 1, 1, 1;
2350 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2351 glDisable GL_TEXTURE_2D; 2488 glDisable GL_TEXTURE_2D;
2352 glDisable GL_BLEND;
2353 } 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});
2618}
2619
2620#############################################################################
2621
2622package CFClient::UI::Menu;
2623
2624our @ISA = CFClient::UI::FancyFrame::;
2625
2626use CFClient::OpenGL;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 items => [],
2633 z => 100,
2634 @_,
2635 );
2636
2637 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2638
2639 for my $item (@{ $self->{items} }) {
2640 my ($widget, $cb) = @$item;
2641
2642 # handle various types of items, only text for now
2643 if (!ref $widget) {
2644 $widget = new CFClient::UI::Label
2645 can_hover => 1,
2646 can_events => 1,
2647 text => $widget;
2648 }
2649
2650 $self->{item}{$widget} = $item;
2651
2652 $self->{vbox}->add ($widget);
2653 }
2654
2655 $self
2656}
2657
2658# popup given the event (must be a mouse button down event currently)
2659sub popup {
2660 my ($self, $ev) = @_;
2661
2662 $self->emit ("popdown");
2663
2664 # maybe save $GRAB? must be careful about events...
2665 $GRAB = $self;
2666 $self->{button} = $ev->{button};
2667
2668 $self->show;
2669 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2670}
2671
2672sub mouse_motion {
2673 my ($self, $ev, $x, $y) = @_;
2674
2675 # TODO: should use vbox->find_widget or so
2676 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2677 $self->{hover} = $self->{item}{$HOVER};
2678}
2679
2680sub button_up {
2681 my ($self, $ev, $x, $y) = @_;
2682
2683 if ($ev->{button} == $self->{button}) {
2684 undef $GRAB;
2685 $self->hide;
2686
2687 $self->emit ("popdown");
2688 $self->{hover}[1]->() if $self->{hover};
2689 }
2690}
2691
2692#############################################################################
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;
2354} 2781}
2355 2782
2356############################################################################# 2783#############################################################################
2357 2784
2358package CFClient::UI::Root; 2785package CFClient::UI::Root;
2359 2786
2360our @ISA = CFClient::UI::Container::; 2787our @ISA = CFClient::UI::Container::;
2361 2788
2362use CFClient::OpenGL; 2789use CFClient::OpenGL;
2363 2790
2364sub check_size { 2791sub new {
2365 my ($self) = @_; 2792 my $class = shift;
2366 2793
2367 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2794 $class->SUPER::new (
2368} 2795 @_,
2369 2796 )
2370sub size_request {
2371 ($::WIDTH, $::HEIGHT)
2372} 2797}
2373 2798
2374sub configure { 2799sub configure {
2375 my ($self, $x, $y, $w, $h) = @_; 2800 my ($self, $x, $y, $w, $h) = @_;
2376 2801
2377 $self->SUPER::configure ($x, $y, $w, $h); 2802 $self->{w} = $w;
2803 $self->{h} = $h;
2804}
2378 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
2379 for my $child (@{$self->{children}}) { 2828 for my $child ($self->children) {
2380 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)};
2381 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
2382 $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;
2383 $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
2384 $child->configure ($X, $Y, $W,$H); 2840 $child->configure ($X, $Y, $W, $H);
2385 } 2841 }
2386} 2842}
2387 2843
2388sub _topleft { 2844sub coord2local {
2389 my ($self, $x, $y) = @_; 2845 my ($self, $x, $y) = @_;
2390 2846
2391 ($x, $y) 2847 ($x, $y)
2392} 2848}
2393 2849
2850sub coord2global {
2851 my ($self, $x, $y) = @_;
2852
2853 ($x, $y)
2854}
2855
2394sub update { 2856sub update {
2395 my ($self) = @_; 2857 my ($self) = @_;
2396 2858
2397 $self->check_size; 2859 $self->check_size;
2398 ::refresh (); 2860 $::WANT_REFRESH++;
2399} 2861}
2400 2862
2401sub add { 2863sub add {
2402 my ($self, $child) = @_; 2864 my ($self, @children) = @_;
2403 2865
2866 for my $child (@children) {
2867 $child->{toplevel} = 1;
2868
2404 # integerize window positions 2869 # integerise window positions
2405 $child->{x} = int $child->{x}; 2870 $child->{x} = int $child->{x};
2406 $child->{y} = int $child->{y}; 2871 $child->{y} = int $child->{y};
2872 }
2407 2873
2408 $self->SUPER::add ($child); 2874 $self->SUPER::add (@children);
2409} 2875}
2410 2876
2411sub on_refresh { 2877sub on_refresh {
2412 my ($self, $id, $cb) = @_; 2878 my ($self, $id, $cb) = @_;
2413 2879
2414 $self->{refresh_hook}{$id} = $cb; 2880 $self->{refresh_hook}{$id} = $cb;
2415} 2881}
2416 2882
2883sub on_post_alloc {
2884 my ($self, $id, $cb) = @_;
2885
2886 $self->{post_alloc_hook}{$id} = $cb;
2887}
2888
2417sub draw { 2889sub draw {
2418 my ($self) = @_; 2890 my ($self) = @_;
2419 2891
2420 while (my $rcb = delete $self->{refresh_hook}) { 2892 while ($self->{refresh_hook}) {
2421 $_->() 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}};
2422 } 2945 }
2423 2946
2424 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2425 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2426 glClear GL_COLOR_BUFFER_BIT; 2949 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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