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.167 by elmex, Mon Apr 24 08:44:23 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
… …
503 497
504 $self 498 $self
505} 499}
506 500
507sub add { 501sub add {
508 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
509 503
510 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
511 506
512 use sort 'stable'; 507 use sort 'stable';
513 508
514 $self->{children} = [ 509 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
517 ]; 512 ];
518 513
519 $child->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub children {
519 @{ $_[0]{children} }
520} 520}
521 521
522sub remove { 522sub remove {
523 my ($self, $child) = @_; 523 my ($self, $child) = @_;
524 524
… …
539 539
540 for (@$children) { 540 for (@$children) {
541 delete $_->{parent}; 541 delete $_->{parent};
542 $_->hide; 542 $_->hide;
543 } 543 }
544
545 $self->check_size;
546 $self->update;
544} 547}
545 548
546sub find_widget { 549sub find_widget {
547 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
548 551
… …
623} 626}
624 627
625sub update { 628sub update {
626 my ($self) = @_; 629 my ($self) = @_;
627 630
628 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 632 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 633}
642 634
643sub size_allocate { 635sub size_allocate {
644 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
645 637
646 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
647 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
648 $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 };
649} 662}
650 663
651sub _draw { 664sub _draw {
652 my ($self) = @_; 665 my ($self) = @_;
653 666
654 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
655 668
656 my $tex = $self->{texture} 669 my $tex = $self->{texture}
657 or return; 670 or return;
658 671
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
662 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;
663 675
664 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 677
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
668} 679}
669 680
670############################################################################# 681#############################################################################
671 682
672package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
673 684
674our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
675 686
676sub new { die }
677
678sub size_request { 687sub size_request {
679 my ($self) = @_; 688 my ($self) = @_;
680 689
681 @$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)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
683 692
684 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
685} 694}
686 695
687sub _draw { 696sub size_allocate {
688 my ($self) = @_; 697 my ($self, $w, $h) = @_;
689 698
690 $self->{children}[1]->draw; 699 $self->update;
691} 700}
692 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
693 781
694############################################################################# 782#############################################################################
695 783
696package CFClient::UI::Frame; 784package CFClient::UI::Frame;
697 785
… …
754 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
755 843
756 my $self = $class->SUPER::new ( 844 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
759 border => 0.8, 847 border => 0.6,
760 can_events => 1, 848 can_events => 1,
761 @_ 849 @_
762 ); 850 );
763 851
764 $self->{title} &&= new CFClient::UI::Label 852 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 853 align => 0,
766 valign => 1, 854 valign => 1,
767 text => $self->{title}, 855 text => $self->{title},
768 fontsize => 1; 856 fontsize => $self->{border};
769 857
770 $self 858 $self
771} 859}
772 860
773sub border { 861sub border {
… …
798} 886}
799 887
800sub button_down { 888sub button_down {
801 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
802 890
891 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 892 my $border = $self->border;
804 893
805 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
810 901
902 my $mx = $x < $border;
903 my $my = $y < $border;
904
811 $self->{motion} = sub { 905 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
813 907
814 ($x, $y) = ($ev->{x}, $ev->{y}); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
815 910
816 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 914 $self->check_size;
819 }; 915 };
820 916
821 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
826 920
827 $self->{motion} = sub { 921 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
… …
864 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
868 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 964 my $bg = $tex[0];
870 965
871 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
874 969
875 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
876 971
877 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
881 976
882 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
884 980
885 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
886 $self->child->draw; 983 $self->child->draw;
887} 984}
888 985
889############################################################################# 986#############################################################################
890 987
… …
912 $self->{children}[$y][$x] = $child; 1009 $self->{children}[$y][$x] = $child;
913 1010
914 $child->check_size; 1011 $child->check_size;
915} 1012}
916 1013
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
917# 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?
918sub clear { 1019sub clear {
919 my ($self) = @_; 1020 my ($self) = @_;
920 1021
921 my $children = delete $self->{children}; 1022 my @children = $self->children;
1023 delete $self->{children};
922 1024
923 for (grep $_, map @$_, grep $_, @$children) { 1025 for (@children) {
924 delete $_->{parent}; 1026 delete $_->{parent};
925 $_->hide; 1027 $_->hide;
926 } 1028 }
927 1029
928 $self->update; 1030 $self->update;
… …
1109} 1211}
1110 1212
1111sub size_allocate { 1213sub size_allocate {
1112 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1113 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1114 my $children = $self->{children}; 1218 my $children = $self->{children};
1115 1219
1116 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1117 1221
1118 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1157 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1158 1262
1159 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1161 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1162 fontsize => 1, 1269 fontsize => 1,
1163 text => "",
1164 align => -1, 1270 align => -1,
1165 valign => -1, 1271 valign => -1,
1166 padding => 2, 1272 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1273 can_events => 0,
1169 %arg 1274 %arg
1170 ); 1275 );
1171 1276
1172 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1280 $self->{template} = $layout;
1176 } 1281 }
1177 1282
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1179 $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 }
1180 1288
1181 $self 1289 $self
1182} 1290}
1183 1291
1184sub escape { 1292sub escape {
… …
1189 s/</&lt;/g; 1297 s/</&lt;/g;
1190 1298
1191 $_[1] 1299 $_[1]
1192} 1300}
1193 1301
1302sub update {
1303 my ($self) = @_;
1304
1305 delete $self->{texture};
1306 $self->SUPER::update;
1307}
1308
1194sub set_text { 1309sub set_text {
1195 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1196 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;
1197 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1198 1317
1199 delete $self->{texture}; 1318 $self->update;
1200 $self->check_size; 1319 $self->check_size;
1201 $self->update;
1202} 1320}
1203 1321
1204sub set_markup { 1322sub set_markup {
1205 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1206 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;
1207 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1208 1332
1209 delete $self->{texture}; 1333 $self->update;
1210 $self->check_size; 1334 $self->check_size;
1211 $self->update;
1212} 1335}
1213 1336
1214sub size_request { 1337sub size_request {
1215 my ($self) = @_; 1338 my ($self) = @_;
1216 1339
… …
1245sub set_fontsize { 1368sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1247 1370
1248 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1250 $self->check_size; 1375 $self->check_size;
1251 $self->update;
1252} 1376}
1253 1377
1254sub _draw { 1378sub _draw {
1255 my ($self) = @_; 1379 my ($self) = @_;
1256 1380
1257 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1260 $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
1261 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
1262 }; 1398 };
1263 1399
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1402
1403 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $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 }
1284 1409
1285 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1411}
1288 1412
1289############################################################################# 1413#############################################################################
1290 1414
1291package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1326 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1327 1451
1328 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1329} 1453}
1330 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
1331sub get_text { 1464sub get_text {
1332 $_[0]{text} 1465 $_[0]{text}
1333} 1466}
1334 1467
1335sub size_request { 1468sub size_request {
… …
1342 1475
1343sub size_allocate { 1476sub size_allocate {
1344 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1345 1478
1346 $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
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355} 1480}
1356 1481
1357sub key_down { 1482sub key_down {
1358 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1359 1484
… …
1469 1594
1470 if ($sym == 13) { 1595 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1596 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1597 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1598 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1600 $self->emit (activate => $txt);
1475 $self->update; 1601 $self->update;
1476 1602
1477 } elsif ($sym == CFClient::SDLK_UP) { 1603 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1604 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1605 $self->{history_saveback} = $self->get_text;
1480 } 1606 }
1607 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1608 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1609 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1610 $self->{history_pointer} = @{$self->{history} || []} - 1;
1611 }
1612 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1613 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1614
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1615 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1616 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1617 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1618
… …
1737} 1865}
1738 1866
1739sub set_max { 1867sub set_max {
1740 my ($self, $max) = @_; 1868 my ($self, $max) = @_;
1741 1869
1870 return if $self->{max_val} == $max;
1871
1742 $self->{max_val} = $max; 1872 $self->{max_val} = $max;
1873 $self->update;
1743} 1874}
1744 1875
1745sub set_value { 1876sub set_value {
1746 my ($self, $val, $max) = @_; 1877 my ($self, $val, $max) = @_;
1747 1878
1748 $self->set_max ($max) 1879 $self->set_max ($max)
1749 if defined $max; 1880 if defined $max;
1750 1881
1751 $max = $self->{max_val}; 1882 return if $self->{val} == $val;
1883
1752 $self->{val} = $val; 1884 $self->{val} = $val;
1753
1754 $self->update; 1885 $self->update;
1755} 1886}
1756 1887
1757sub _draw { 1888sub _draw {
1758 my ($self) = @_; 1889 my ($self) = @_;
… …
1821 1952
1822sub new { 1953sub new {
1823 my ($class, %arg) = @_; 1954 my ($class, %arg) = @_;
1824 1955
1825 my $self = $class->SUPER::new ( 1956 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 1957 tooltip => $arg{type},
1827 can_hover => 1, 1958 can_hover => 1,
1959 can_events => 1,
1828 %arg, 1960 %arg,
1829 ); 1961 );
1830 1962
1831 $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");
1832 $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);
… …
1840 1972
1841 $self->{value}->set_fontsize ($fsize); 1973 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 1974 $self->{max} ->set_fontsize ($fsize);
1843} 1975}
1844 1976
1977sub set_max {
1978 my ($self, $max) = @_;
1979
1980 $self->{gauge}->set_max ($max);
1981 $self->{max}->set_text ($max);
1982}
1983
1845sub set_value { 1984sub set_value {
1846 my ($self, $val, $max) = @_; 1985 my ($self, $val, $max) = @_;
1847 1986
1848 $self->set_max ($max) 1987 $self->set_max ($max)
1849 if defined $max; 1988 if defined $max;
1850 1989
1851 $self->{gauge}->set_value ($val, $max); 1990 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 1991 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 1992}
1861 1993
1862############################################################################# 1994#############################################################################
1863 1995
1864package CFClient::UI::Slider; 1996package CFClient::UI::Slider;
… …
1883 # TODO: calculations are off 2015 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2016 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2017 fg => [1, 1, 1],
1886 active_fg => [0, 0, 0], 2018 active_fg => [0, 0, 0],
1887 range => [0, 0, 100, 10], 2019 range => [0, 0, 100, 10],
1888 req_w => 20, 2020 req_w => $::WIDTH / 80,
1889 req_h => 20, 2021 req_h => $::WIDTH / 80,
1890 vertical => 0, 2022 vertical => 0,
1891 can_hover => 1, 2023 can_hover => 1,
1892 inner_pad => 5, 2024 inner_pad => 5,
1893 @_ 2025 @_
1894 ); 2026 );
… …
2018 (new CFClient::UI::Empty expand => 1), 2150 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2151 (new CFClient::UI::Slider vertical => 1),
2020 ], 2152 ],
2021 ); 2153 );
2022 2154
2023 $self->{children}[1]->connect (changed => sub { 2155 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2156
2027 $self 2157 $self
2028} 2158}
2029 2159
2030sub set_fontsize { 2160sub set_fontsize {
… …
2038 my ($self, $text) = @_; 2168 my ($self, $text) = @_;
2039 2169
2040 my $layout = $self->{layout}; 2170 my $layout = $self->{layout};
2041 2171
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w}); 2173 $layout->set_width ($self->{children}[0]{w});
2044 $layout->set_text ($text); 2174 $layout->set_text ($text);
2045 2175
2046 ($layout->size)[1] 2176 ($layout->size)[1]
2047} 2177}
2048 2178
… …
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2102 2232
2103 delete $self->{texture}; 2233 delete $self->{texture};
2104 } 2234 }
2105 2235
2106 $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 {
2107 glClearColor 0, 0, 0, 1; 2237 glClearColor 0, 0, 0, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2238 glClear GL_COLOR_BUFFER_BIT;
2109 2239
2110 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
… …
2144} 2274}
2145 2275
2146sub _draw { 2276sub _draw {
2147 my ($self) = @_; 2277 my ($self) = @_;
2148 2278
2149 if ($self->{texture}) { 2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2281 glEnable GL_TEXTURE_2D;
2151 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;
2152 $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});
2153 glDisable GL_TEXTURE_2D; 2285 glDisable GL_TEXTURE_2D;
2154 } 2286 glDisable GL_BLEND;
2155 2287
2156 $self->{children}[1]->draw; 2288 $self->{children}[1]->draw;
2157 2289
2158} 2290}
2159 2291
… …
2328 2460
2329sub size_request { 2461sub size_request {
2330 (32, 8) 2462 (32, 8)
2331} 2463}
2332 2464
2333sub draw { 2465sub _draw {
2334 my ($self) = @_; 2466 my ($self) = @_;
2335 2467
2468 return unless $::CONN;#d# manage and cache textures differently
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337 2470
2471 # TODO animation
2338 if ($tex) { 2472 if ($tex) {
2339 glEnable GL_BLEND; 2473 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D; 2475 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2347 } 2481 }
2348} 2482}
2349 2483
2350############################################################################# 2484#############################################################################
2351 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
2352package CFClient::UI::Root; 2732package CFClient::UI::Root;
2353 2733
2354our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2355 2735
2356use CFClient::OpenGL; 2736use CFClient::OpenGL;
2357 2737
2358sub check_size { 2738sub new {
2359 my ($self) = @_; 2739 my $class = shift;
2360 2740
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2741 $class->SUPER::new (
2362} 2742 @_,
2363 2743 )
2364sub size_request {
2365 ($::WIDTH, $::HEIGHT)
2366} 2744}
2367 2745
2368sub configure { 2746sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 2747 my ($self, $x, $y, $w, $h) = @_;
2370 2748
2371 $self->SUPER::configure ($x, $y, $w, $h); 2749 $self->{w} = $w;
2750 $self->{h} = $h;
2751}
2372 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
2373 for my $child (@{$self->{children}}) { 2785 for my $child ($self->children) {
2374 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)};
2375 2787
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H); 2790 $child->configure ($X, $Y, $W, $H);
2379 } 2791 }
2380}
2381 2792
2382sub _topleft { 2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2383 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2384 2799
2385 ($x, $y) 2800 ($x, $y)
2386} 2801}
2387 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2388sub update { 2809sub update {
2389 my ($self) = @_; 2810 my ($self) = @_;
2390 2811
2391 $self->check_size; 2812 $self->check_size;
2392 ::refresh (); 2813 $::WANT_REFRESH++;
2393} 2814}
2394 2815
2395sub add { 2816sub add {
2396 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2397 2818
2398 # integerize window positions 2819 # integerise window positions
2399 $child->{x} = int $child->{x}; 2820 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y}; 2821 $child->{y} = int $child->{y};
2401 2822
2402 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2403} 2824}
… …
2406 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2407 2828
2408 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2409} 2830}
2410 2831
2411sub draw { 2832sub draw {
2412 my ($self) = @_; 2833 my ($self) = @_;
2413 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
2414 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2415 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2416 } 2882 }
2417 2883
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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