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.164 by root, Mon Apr 24 06:57:39 2006 UTC vs.
Revision 1.194 by root, Thu May 11 23:41:47 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
… …
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_markup ($widget->{tooltip}); 29 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 30
30 $TOOLTIP->show; 31 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
31 } 40 }
32 41
33 return; 42 return;
34 } 43 }
35 } 44 }
… …
224 $self->{y} = $y; 233 $self->{y} = $y;
225 $self->update; 234 $self->update;
226 } 235 }
227 236
228 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 239 }
235} 240}
236 241
237sub size_allocate { 242sub size_allocate {
238 # nothing to be done 243 # nothing to be done
239} 244}
240 245
246sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259}
260
241sub set_max_size { 261sub set_max_size {
242 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
243 263
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 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}->_topleft ($x + $self->{x}, $y + $self->{y});
253} 266}
254 267
255# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
256sub coord2local { 269sub coord2local {
257 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
258 271
259 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 273}
262 274
263# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
264sub coord2global { 276sub coord2global {
265 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
266 278
267 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 280}
270 281
271sub focus_in { 282sub focus_in {
272 my ($self) = @_; 283 my ($self) = @_;
273 284
… …
371 382
372sub set_parent { 383sub set_parent {
373 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
374 385
375 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
376} 390}
377 391
378sub check_size { 392sub check_size {
379 my ($self) = @_; 393 my ($self) = @_;
380 394
381 $self->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 396}
403 397
404sub update { 398sub update {
405 my ($self) = @_; 399 my ($self) = @_;
406 400
… …
492sub new { 486sub new {
493 my ($class, %arg) = @_; 487 my ($class, %arg) = @_;
494 488
495 my $children = delete $arg{children} || []; 489 my $children = delete $arg{children} || [];
496 490
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 491 my $self = $class->SUPER::new (
492 children => [],
493 can_events => 0,
494 %arg,
495 );
498 $self->add ($_) for @$children; 496 $self->add ($_) for @$children;
499 497
500 $self 498 $self
501} 499}
502 500
503sub add { 501sub add {
504 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
505 503
506 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
507 506
508 use sort 'stable'; 507 use sort 'stable';
509 508
510 $self->{children} = [ 509 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
513 ]; 512 ];
514 513
515 $child->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub children {
519 @{ $_[0]{children} }
516} 520}
517 521
518sub remove { 522sub remove {
519 my ($self, $child) = @_; 523 my ($self, $child) = @_;
520 524
… …
535 539
536 for (@$children) { 540 for (@$children) {
537 delete $_->{parent}; 541 delete $_->{parent};
538 $_->hide; 542 $_->hide;
539 } 543 }
544
545 $self->check_size;
546 $self->update;
540} 547}
541 548
542sub find_widget { 549sub find_widget {
543 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
544 551
… …
619} 626}
620 627
621sub update { 628sub update {
622 my ($self) = @_; 629 my ($self) = @_;
623 630
624 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 632 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 633}
638 634
639sub size_allocate { 635sub size_allocate {
640 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
641 637
642 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
643 641
642sub _render {
643 $_[0]{children}[0]->draw;
644}
645
646sub render_child {
647 my ($self) = @_;
648
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT;
652
644 $self->render_chld; 653 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 };
645} 662}
646 663
647sub _draw { 664sub _draw {
648 my ($self) = @_; 665 my ($self) = @_;
649 666
650 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
651 668
652 my $tex = $self->{texture} 669 my $tex = $self->{texture}
653 or return; 670 or return;
654 671
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1;
659 675
660 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 677
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
664} 679}
665 680
666############################################################################# 681#############################################################################
667 682
668package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
669 684
670our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
671 686
672sub new { die }
673
674sub size_request { 687sub size_request {
675 my ($self) = @_; 688 my ($self) = @_;
676 689
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
679 692
680 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
681} 694}
682 695
683sub _draw { 696sub size_allocate {
684 my ($self) = @_; 697 my ($self, $w, $h) = @_;
685 698
686 $self->{children}[1]->draw; 699 $self->update;
687} 700}
688 701
702sub set_offset {
703 my ($self, $x, $y) = @_;
704
705 $self->{view_x} = int $x;
706 $self->{view_y} = int $y;
707
708 $self->update;
709}
710
711# hmm, this does not work for topleft of $self... but we should not ask for that
712sub coord2local {
713 my ($self, $x, $y) = @_;
714
715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
725}
726
727sub find_widget {
728 my ($self, $x, $y) = @_;
729
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y)
736 }
737}
738
739sub _render {
740 my ($self) = @_;
741
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743
744 $self->SUPER::_render;
745}
746
747#############################################################################
748
749package CFClient::UI::ScrolledWindow;
750
751our @ISA = CFClient::UI::HBox::;
752
753sub new {
754 my $class = shift;
755
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort),
768 slider => $slider,
769 @_,
770 );
771
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
689 781
690############################################################################# 782#############################################################################
691 783
692package CFClient::UI::Frame; 784package CFClient::UI::Frame;
693 785
… …
750 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
751 843
752 my $self = $class->SUPER::new ( 844 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
755 border => 0.8, 847 border => 0.6,
756 can_events => 0, 848 can_events => 1,
757 @_ 849 @_
758 ); 850 );
759 851
760 $self->{title} &&= new CFClient::UI::Label 852 $self->{title} &&= new CFClient::UI::Label
761 align => 0, 853 align => 0,
762 valign => 1, 854 valign => 1,
763 text => $self->{title}, 855 text => $self->{title},
764 fontsize => 1; 856 fontsize => $self->{border};
765 857
766 $self 858 $self
767} 859}
768 860
769sub border { 861sub border {
… …
794} 886}
795 887
796sub button_down { 888sub button_down {
797 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
798 890
891 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 892 my $border = $self->border;
800 893
801 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
806 901
902 my $mx = $x < $border;
903 my $my = $y < $border;
904
807 $self->{motion} = sub { 905 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
809 907
810 ($x, $y) = ($ev->{x}, $ev->{y}); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
811 910
812 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
814 $self->check_size; 914 $self->check_size;
815 }; 915 };
816 916
817 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
822 920
823 $self->{motion} = sub { 921 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
… …
860 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
864 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
865 my $bg = $tex[0]; 964 my $bg = $tex[0];
866 965
867 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
869 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
870 969
871 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
872 971
873 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
877 976
878 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
880 980
881 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
882 $self->child->draw; 983 $self->child->draw;
883} 984}
884 985
885############################################################################# 986#############################################################################
886 987
… …
908 $self->{children}[$y][$x] = $child; 1009 $self->{children}[$y][$x] = $child;
909 1010
910 $child->check_size; 1011 $child->check_size;
911} 1012}
912 1013
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
913# TODO: move to container class maybe? send childs a signal on removal? 1018# TODO: move to container class maybe? send childs a signal on removal?
914sub clear { 1019sub clear {
915 my ($self) = @_; 1020 my ($self) = @_;
916 1021
917 my $children = delete $self->{children}; 1022 my @children = $self->children;
1023 delete $self->{children};
918 1024
919 for (grep $_, map @$_, grep $_, @$children) { 1025 for (@children) {
920 delete $_->{parent}; 1026 delete $_->{parent};
921 $_->hide; 1027 $_->hide;
922 } 1028 }
923 1029
924 $self->update; 1030 $self->update;
… …
1105} 1211}
1106 1212
1107sub size_allocate { 1213sub size_allocate {
1108 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1109 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1110 my $children = $self->{children}; 1218 my $children = $self->{children};
1111 1219
1112 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1113 1221
1114 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1153 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1154 1262
1155 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1157 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1158 fontsize => 1, 1269 fontsize => 1,
1159 text => "",
1160 align => -1, 1270 align => -1,
1161 valign => -1, 1271 valign => -1,
1162 padding => 2, 1272 padding => 2,
1163 layout => new CFClient::Layout,
1164 can_events => 0, 1273 can_events => 0,
1165 %arg 1274 %arg
1166 ); 1275 );
1167 1276
1168 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout; 1280 $self->{template} = $layout;
1172 } 1281 }
1173 1282
1174 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1176 1288
1177 $self 1289 $self
1178} 1290}
1179 1291
1180sub escape { 1292sub escape {
… …
1185 s/</&lt;/g; 1297 s/</&lt;/g;
1186 1298
1187 $_[1] 1299 $_[1]
1188} 1300}
1189 1301
1302sub update {
1303 my ($self) = @_;
1304
1305 delete $self->{texture};
1306 $self->SUPER::update;
1307}
1308
1190sub set_text { 1309sub set_text {
1191 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1192 1311
1312 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text";
1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1193 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1194 1317
1195 delete $self->{texture}; 1318 $self->update;
1196 $self->check_size; 1319 $self->check_size;
1197 $self->update;
1198} 1320}
1199 1321
1200sub set_markup { 1322sub set_markup {
1201 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1202 1324
1325 return if $self->{text} eq "M$markup";
1326 $self->{text} = "M$markup";
1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1203 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1204 1332
1205 delete $self->{texture}; 1333 $self->update;
1206 $self->check_size; 1334 $self->check_size;
1207 $self->update;
1208} 1335}
1209 1336
1210sub size_request { 1337sub size_request {
1211 my ($self) = @_; 1338 my ($self) = @_;
1212 1339
… …
1241sub set_fontsize { 1368sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1243 1370
1244 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1246 $self->check_size; 1375 $self->check_size;
1247 $self->update;
1248} 1376}
1249 1377
1250sub _draw { 1378sub _draw {
1251 my ($self) = @_; 1379 my ($self) = @_;
1252 1380
1253 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1257 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1258 }; 1398 };
1259 1399
1260 glEnable GL_BLEND;
1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1262 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1402
1403 if ($tex->{format} == GL_ALPHA) {
1265 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1266
1267 $self->{ox} = int (
1268 $self->{align} < 0 ? $self->{padding}
1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1272
1273 $self->{oy} = int (
1274 $self->{valign} < 0 ? $self->{padding}
1275 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276 : ($self->{h} - $tex->{h}) * 0.5
1277 );
1278
1279 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1280 1409
1281 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1411}
1284 1412
1285############################################################################# 1413#############################################################################
1286 1414
1287package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1322 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1323 1451
1324 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1325} 1453}
1326 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1327sub get_text { 1464sub get_text {
1328 $_[0]{text} 1465 $_[0]{text}
1329} 1466}
1330 1467
1331sub size_request { 1468sub size_request {
… …
1338 1475
1339sub size_allocate { 1476sub size_allocate {
1340 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1341 1478
1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1343}
1344
1345sub set_text {
1346 my ($self, $text) = @_;
1347
1348 $self->{cursor} = length $text;
1349 $self->_set_text ($text);
1350 $self->update;
1351} 1480}
1352 1481
1353sub key_down { 1482sub key_down {
1354 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1355 1484
… …
1462 my ($self, $ev) = @_; 1591 my ($self, $ev) = @_;
1463 1592
1464 my $sym = $ev->{sym}; 1593 my $sym = $ev->{sym};
1465 1594
1466 if ($sym == 13) { 1595 if ($sym == 13) {
1596 unshift @{$self->{history}},
1597 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1600 $self->emit (activate => $txt);
1468 $self->update; 1601 $self->update;
1602
1603 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text;
1606 }
1607 if (@{$self->{history} || []} > 0) {
1608 $self->{history_pointer}++;
1609 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1610 $self->{history_pointer} = @{$self->{history} || []} - 1;
1611 }
1612 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1613 }
1614
1615 } elsif ($sym == CFClient::SDLK_DOWN) {
1616 $self->{history_pointer}--;
1617 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1618
1619 if ($self->{history_pointer} >= 0) {
1620 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1621 } else {
1622 $self->set_text ($self->{history_saveback});
1623 }
1469 1624
1470 } else { 1625 } else {
1471 $self->SUPER::key_down ($ev); 1626 $self->SUPER::key_down ($ev);
1472 } 1627 }
1473 1628
… …
1710} 1865}
1711 1866
1712sub set_max { 1867sub set_max {
1713 my ($self, $max) = @_; 1868 my ($self, $max) = @_;
1714 1869
1870 return if $self->{max_val} == $max;
1871
1715 $self->{max_val} = $max; 1872 $self->{max_val} = $max;
1873 $self->update;
1716} 1874}
1717 1875
1718sub set_value { 1876sub set_value {
1719 my ($self, $val, $max) = @_; 1877 my ($self, $val, $max) = @_;
1720 1878
1721 $self->set_max ($max) 1879 $self->set_max ($max)
1722 if defined $max; 1880 if defined $max;
1723 1881
1724 $max = $self->{max_val}; 1882 return if $self->{val} == $val;
1883
1725 $self->{val} = $val; 1884 $self->{val} = $val;
1726
1727 $self->update; 1885 $self->update;
1728} 1886}
1729 1887
1730sub _draw { 1888sub _draw {
1731 my ($self) = @_; 1889 my ($self) = @_;
… …
1794 1952
1795sub new { 1953sub new {
1796 my ($class, %arg) = @_; 1954 my ($class, %arg) = @_;
1797 1955
1798 my $self = $class->SUPER::new ( 1956 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 1957 tooltip => $arg{type},
1800 can_hover => 1, 1958 can_hover => 1,
1959 can_events => 1,
1801 %arg, 1960 %arg,
1802 ); 1961 );
1803 1962
1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1963 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1964 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1813 1972
1814 $self->{value}->set_fontsize ($fsize); 1973 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize); 1974 $self->{max} ->set_fontsize ($fsize);
1816} 1975}
1817 1976
1977sub set_max {
1978 my ($self, $max) = @_;
1979
1980 $self->{gauge}->set_max ($max);
1981 $self->{max}->set_text ($max);
1982}
1983
1818sub set_value { 1984sub set_value {
1819 my ($self, $val, $max) = @_; 1985 my ($self, $val, $max) = @_;
1820 1986
1821 $self->set_max ($max) 1987 $self->set_max ($max)
1822 if defined $max; 1988 if defined $max;
1823 1989
1824 $self->{gauge}->set_value ($val, $max); 1990 $self->{gauge}->set_value ($val, $max);
1825 $self->{value}->set_text ($val); 1991 $self->{value}->set_text ($val);
1826}
1827
1828sub set_max {
1829 my ($self, $max) = @_;
1830
1831 $self->{gauge}->set_max ($max);
1832 $self->{max}->set_text ($max);
1833} 1992}
1834 1993
1835############################################################################# 1994#############################################################################
1836 1995
1837package CFClient::UI::Slider; 1996package CFClient::UI::Slider;
… …
1856 # TODO: calculations are off 2015 # TODO: calculations are off
1857 my $self = $class->SUPER::new ( 2016 my $self = $class->SUPER::new (
1858 fg => [1, 1, 1], 2017 fg => [1, 1, 1],
1859 active_fg => [0, 0, 0], 2018 active_fg => [0, 0, 0],
1860 range => [0, 0, 100, 10], 2019 range => [0, 0, 100, 10],
1861 req_w => 20, 2020 req_w => $::WIDTH / 80,
1862 req_h => 20, 2021 req_h => $::WIDTH / 80,
1863 vertical => 0, 2022 vertical => 0,
1864 can_hover => 1, 2023 can_hover => 1,
1865 inner_pad => 5, 2024 inner_pad => 5,
1866 @_ 2025 @_
1867 ); 2026 );
… …
1991 (new CFClient::UI::Empty expand => 1), 2150 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2151 (new CFClient::UI::Slider vertical => 1),
1993 ], 2152 ],
1994 ); 2153 );
1995 2154
1996 $self->{children}[1]->connect (changed => sub { 2155 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2156
2000 $self 2157 $self
2001} 2158}
2002 2159
2003sub set_fontsize { 2160sub set_fontsize {
… …
2011 my ($self, $text) = @_; 2168 my ($self, $text) = @_;
2012 2169
2013 my $layout = $self->{layout}; 2170 my $layout = $self->{layout};
2014 2171
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w}); 2173 $layout->set_width ($self->{children}[0]{w});
2017 $layout->set_text ($text); 2174 $layout->set_text ($text);
2018 2175
2019 ($layout->size)[1] 2176 ($layout->size)[1]
2020} 2177}
2021 2178
… …
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2075 2232
2076 delete $self->{texture}; 2233 delete $self->{texture};
2077 } 2234 }
2078 2235
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2080 glClearColor 0, 0, 0, 1; 2237 glClearColor 0, 0, 0, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2238 glClear GL_COLOR_BUFFER_BIT;
2082 2239
2083 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
… …
2117} 2274}
2118 2275
2119sub _draw { 2276sub _draw {
2120 my ($self) = @_; 2277 my ($self) = @_;
2121 2278
2122 if ($self->{texture}) { 2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2123 glEnable GL_TEXTURE_2D; 2281 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1;
2125 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2284 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126 glDisable GL_TEXTURE_2D; 2285 glDisable GL_TEXTURE_2D;
2127 } 2286 glDisable GL_BLEND;
2128 2287
2129 $self->{children}[1]->draw; 2288 $self->{children}[1]->draw;
2130 2289
2131} 2290}
2132 2291
… …
2301 2460
2302sub size_request { 2461sub size_request {
2303 (32, 8) 2462 (32, 8)
2304} 2463}
2305 2464
2306sub draw { 2465sub _draw {
2307 my ($self) = @_; 2466 my ($self) = @_;
2308 2467
2468 return unless $::CONN;#d# manage and cache textures differently
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2310 2470
2471 # TODO animation
2311 if ($tex) { 2472 if ($tex) {
2312 glEnable GL_BLEND; 2473 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D; 2475 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2320 } 2481 }
2321} 2482}
2322 2483
2323############################################################################# 2484#############################################################################
2324 2485
2486package CFClient::UI::InventoryItem;
2487
2488our @ISA = CFClient::UI::HBox::;
2489
2490sub new {
2491 my $class = shift;
2492
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new (
2503 can_hover => 1,
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_,
2562 );
2563
2564 $self
2565}
2566
2567sub set_items {
2568 my ($self, $items) = @_;
2569
2570 $self->{scrolled}->clear;
2571 return unless $items;
2572
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2574
2575 $self->{real_items} = \@items;
2576
2577 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2583 }
2584
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591}
2592
2593#############################################################################
2594
2595package CFClient::UI::Menu;
2596
2597our @ISA = CFClient::UI::FancyFrame::;
2598
2599use CFClient::OpenGL;
2600
2601sub new {
2602 my $class = shift;
2603
2604 my $self = $class->SUPER::new (
2605 items => [],
2606 z => 100,
2607 @_,
2608 );
2609
2610 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2611
2612 for my $item (@{ $self->{items} }) {
2613 my ($widget, $cb) = @$item;
2614
2615 # handle various types of items, only text for now
2616 if (!ref $widget) {
2617 $widget = new CFClient::UI::Label
2618 can_hover => 1,
2619 can_events => 1,
2620 text => $widget;
2621 }
2622
2623 $self->{item}{$widget} = $item;
2624
2625 $self->{vbox}->add ($widget);
2626 }
2627
2628 $self
2629}
2630
2631# popup given the event (must be a mouse button down event currently)
2632sub popup {
2633 my ($self, $ev) = @_;
2634
2635 $self->emit ("popdown");
2636
2637 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self;
2639 $self->{button} = $ev->{button};
2640
2641 $self->show;
2642 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2643}
2644
2645sub mouse_motion {
2646 my ($self, $ev, $x, $y) = @_;
2647
2648 # TODO: should use vbox->find_widget or so
2649 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2650 $self->{hover} = $self->{item}{$HOVER};
2651}
2652
2653sub button_up {
2654 my ($self, $ev, $x, $y) = @_;
2655
2656 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB;
2658 $self->hide;
2659
2660 $self->emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover};
2662 }
2663}
2664
2665#############################################################################
2666
2667package CFClient::UI::Statusbox;
2668
2669our @ISA = CFClient::UI::VBox::;
2670
2671sub reorder {
2672 my ($self) = @_;
2673 my $NOW = time;
2674
2675 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 }
2678
2679 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2681 my $count = 10 + 1;
2682 for my $item (@items) {
2683 last unless --$count;
2684
2685 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text};
2688 for ($short) {
2689 s/^\s+//;
2690 s/\012.*//s;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 }
2694
2695 new CFClient::UI::Label
2696 markup => $short,
2697 tooltip => delete $item->{tooltip},
2698 fontsize => delete $item->{fontsize},
2699 color => delete $item->{color},
2700 can_events => 1,
2701 can_hover => 1,
2702 };
2703 }
2704
2705 $self->clear;
2706 $self->SUPER::add (@widgets);
2707}
2708
2709sub add {
2710 my ($self, $text, %arg) = @_;
2711
2712 my $item = {
2713 time => time,
2714 text => $text,
2715 timeout => 60,
2716 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8],
2719 %arg,
2720 };
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726
2727 $self->reorder;
2728}
2729
2730#############################################################################
2731
2325package CFClient::UI::Root; 2732package CFClient::UI::Root;
2326 2733
2327our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2328 2735
2329use CFClient::OpenGL; 2736use CFClient::OpenGL;
2330 2737
2331sub check_size { 2738sub new {
2332 my ($self) = @_; 2739 my $class = shift;
2333 2740
2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2741 $class->SUPER::new (
2335} 2742 @_,
2336 2743 )
2337sub size_request {
2338 ($::WIDTH, $::HEIGHT)
2339} 2744}
2340 2745
2341sub configure { 2746sub configure {
2342 my ($self, $x, $y, $w, $h) = @_; 2747 my ($self, $x, $y, $w, $h) = @_;
2343 2748
2344 $self->SUPER::configure ($x, $y, $w, $h); 2749 $self->{w} = $w;
2750 $self->{h} = $h;
2751}
2345 2752
2753sub check_size {
2754 my ($self) = @_;
2755
2756 $self->size_allocate ($self->{w}, $self->{h})
2757 if $self->{w};
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762
2763 ($self->{w}, $self->{h})
2764}
2765
2766sub size_allocate {
2767 my ($self, $w, $h) = @_;
2768
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784
2346 for my $child (@{$self->{children}}) { 2785 for my $child ($self->children) {
2347 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2348 2787
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2350 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2351 $child->configure ($X, $Y, $W,$H); 2790 $child->configure ($X, $Y, $W, $H);
2352 } 2791 }
2353}
2354 2792
2355sub _topleft { 2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2356 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2357 2799
2358 ($x, $y) 2800 ($x, $y)
2359} 2801}
2360 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2361sub update { 2809sub update {
2362 my ($self) = @_; 2810 my ($self) = @_;
2363 2811
2364 $self->check_size; 2812 $self->check_size;
2365 ::refresh (); 2813 $::WANT_REFRESH++;
2366} 2814}
2367 2815
2368sub add { 2816sub add {
2369 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2370 2818
2371 # integerize window positions 2819 # integerise window positions
2372 $child->{x} = int $child->{x}; 2820 $child->{x} = int $child->{x};
2373 $child->{y} = int $child->{y}; 2821 $child->{y} = int $child->{y};
2374 2822
2375 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2376} 2824}
… …
2379 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2380 2828
2381 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2382} 2830}
2383 2831
2384sub draw { 2832sub draw {
2385 my ($self) = @_; 2833 my ($self) = @_;
2386 2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878
2387 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2388 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2389 } 2882 }
2390 2883
2391 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2392 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2393 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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