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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.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}
253 or Carp::confess "no parent widget in _topleft\n";#d#
254
255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
256} 266}
257 267
258# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
259sub coord2local { 269sub coord2local {
260 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
261 271
262 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 273}
265 274
266# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
267sub coord2global { 276sub coord2global {
268 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
269 278
270 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 280}
273 281
274sub focus_in { 282sub focus_in {
275 my ($self) = @_; 283 my ($self) = @_;
276 284
… …
374 382
375sub set_parent { 383sub set_parent {
376 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
377 385
378 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
379} 390}
380 391
381sub check_size { 392sub check_size {
382 my ($self) = @_; 393 my ($self) = @_;
383 394
384 $self->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
385 or return 1;
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} 396}
406 397
407sub update { 398sub update {
408 my ($self) = @_; 399 my ($self) = @_;
409 400
… …
506 497
507 $self 498 $self
508} 499}
509 500
510sub add { 501sub add {
511 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
512 503
513 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
514 506
515 use sort 'stable'; 507 use sort 'stable';
516 508
517 $self->{children} = [ 509 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
520 ]; 512 ];
521 513
522 $child->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub children {
519 @{ $_[0]{children} }
523} 520}
524 521
525sub remove { 522sub remove {
526 my ($self, $child) = @_; 523 my ($self, $child) = @_;
527 524
… …
542 539
543 for (@$children) { 540 for (@$children) {
544 delete $_->{parent}; 541 delete $_->{parent};
545 $_->hide; 542 $_->hide;
546 } 543 }
544
545 $self->check_size;
546 $self->update;
547} 547}
548 548
549sub find_widget { 549sub find_widget {
550 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
551 551
… …
626} 626}
627 627
628sub update { 628sub update {
629 my ($self) = @_; 629 my ($self) = @_;
630 630
631 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 632 $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} 633}
645 634
646sub size_allocate { 635sub size_allocate {
647 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
648 637
649 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
650 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
651 $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 };
652} 662}
653 663
654sub _draw { 664sub _draw {
655 my ($self) = @_; 665 my ($self) = @_;
656 666
657 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
658 668
659 my $tex = $self->{texture} 669 my $tex = $self->{texture}
660 or return; 670 or return;
661 671
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
665 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;
666 675
667 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668 677
669 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
671} 679}
672 680
673############################################################################# 681#############################################################################
674 682
675package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
676 684
677our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
678 686
679sub new { die }
680
681sub size_request { 687sub size_request {
682 my ($self) = @_; 688 my ($self) = @_;
683 689
684 @$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)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
686 692
687 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
688} 694}
689 695
690sub _draw { 696sub size_allocate {
691 my ($self) = @_; 697 my ($self, $w, $h) = @_;
692 698
693 $self->{children}[1]->draw; 699 $self->update;
694} 700}
695 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
696 781
697############################################################################# 782#############################################################################
698 783
699package CFClient::UI::Frame; 784package CFClient::UI::Frame;
700 785
… …
757 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
758 843
759 my $self = $class->SUPER::new ( 844 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
762 border => 0.8, 847 border => 0.6,
763 can_events => 1, 848 can_events => 1,
764 @_ 849 @_
765 ); 850 );
766 851
767 $self->{title} &&= new CFClient::UI::Label 852 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 853 align => 0,
769 valign => 1, 854 valign => 1,
770 text => $self->{title}, 855 text => $self->{title},
771 fontsize => 1; 856 fontsize => $self->{border};
772 857
773 $self 858 $self
774} 859}
775 860
776sub border { 861sub border {
… …
801} 886}
802 887
803sub button_down { 888sub button_down {
804 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
805 890
891 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 892 my $border = $self->border;
807 893
808 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
813 901
902 my $mx = $x < $border;
903 my $my = $y < $border;
904
814 $self->{motion} = sub { 905 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
816 907
817 ($x, $y) = ($ev->{x}, $ev->{y}); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
818 910
819 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 914 $self->check_size;
822 }; 915 };
823 916
824 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
829 920
830 $self->{motion} = sub { 921 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
… …
867 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
871 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 964 my $bg = $tex[0];
873 965
874 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
877 969
878 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
879 971
880 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
884 976
885 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
887 980
888 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
889 $self->child->draw; 983 $self->child->draw;
890} 984}
891 985
892############################################################################# 986#############################################################################
893 987
… …
915 $self->{children}[$y][$x] = $child; 1009 $self->{children}[$y][$x] = $child;
916 1010
917 $child->check_size; 1011 $child->check_size;
918} 1012}
919 1013
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
920# 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?
921sub clear { 1019sub clear {
922 my ($self) = @_; 1020 my ($self) = @_;
923 1021
924 my $children = delete $self->{children}; 1022 my @children = $self->children;
1023 delete $self->{children};
925 1024
926 for (grep $_, map @$_, grep $_, @$children) { 1025 for (@children) {
927 delete $_->{parent}; 1026 delete $_->{parent};
928 $_->hide; 1027 $_->hide;
929 } 1028 }
930 1029
931 $self->update; 1030 $self->update;
… …
1112} 1211}
1113 1212
1114sub size_allocate { 1213sub size_allocate {
1115 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1116 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1117 my $children = $self->{children}; 1218 my $children = $self->{children};
1118 1219
1119 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1120 1221
1121 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1160 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1161 1262
1162 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1163 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1164 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1165 fontsize => 1, 1269 fontsize => 1,
1166 text => "",
1167 align => -1, 1270 align => -1,
1168 valign => -1, 1271 valign => -1,
1169 padding => 2, 1272 padding => 2,
1170 layout => new CFClient::Layout,
1171 can_events => 0, 1273 can_events => 0,
1172 %arg 1274 %arg
1173 ); 1275 );
1174 1276
1175 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1176 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1177 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1178 $self->{template} = $layout; 1280 $self->{template} = $layout;
1179 } 1281 }
1180 1282
1181 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1182 $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 }
1183 1288
1184 $self 1289 $self
1185} 1290}
1186 1291
1187sub escape { 1292sub escape {
… …
1192 s/</&lt;/g; 1297 s/</&lt;/g;
1193 1298
1194 $_[1] 1299 $_[1]
1195} 1300}
1196 1301
1302sub update {
1303 my ($self) = @_;
1304
1305 delete $self->{texture};
1306 $self->SUPER::update;
1307}
1308
1197sub set_text { 1309sub set_text {
1198 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1199 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;
1200 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1201 1317
1202 delete $self->{texture}; 1318 $self->update;
1203 $self->check_size; 1319 $self->check_size;
1204 $self->update;
1205} 1320}
1206 1321
1207sub set_markup { 1322sub set_markup {
1208 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1209 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;
1210 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1211 1332
1212 delete $self->{texture}; 1333 $self->update;
1213 $self->check_size; 1334 $self->check_size;
1214 $self->update;
1215} 1335}
1216 1336
1217sub size_request { 1337sub size_request {
1218 my ($self) = @_; 1338 my ($self) = @_;
1219 1339
… …
1248sub set_fontsize { 1368sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1250 1370
1251 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1253 $self->check_size; 1375 $self->check_size;
1254 $self->update;
1255} 1376}
1256 1377
1257sub _draw { 1378sub _draw {
1258 my ($self) = @_; 1379 my ($self) = @_;
1259 1380
1260 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1263 $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
1264 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
1265 }; 1398 };
1266 1399
1267 glEnable GL_BLEND;
1268 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271 1402
1403 if ($tex->{format} == GL_ALPHA) {
1272 glColor @{$self->{fg}}; 1404 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}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1287 1409
1288 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1289 glDisable GL_BLEND;
1290} 1411}
1291 1412
1292############################################################################# 1413#############################################################################
1293 1414
1294package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1329 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1330 1451
1331 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1332} 1453}
1333 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
1334sub get_text { 1464sub get_text {
1335 $_[0]{text} 1465 $_[0]{text}
1336} 1466}
1337 1467
1338sub size_request { 1468sub size_request {
… …
1345 1475
1346sub size_allocate { 1476sub size_allocate {
1347 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1348 1478
1349 $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
1350}
1351
1352sub set_text {
1353 my ($self, $text) = @_;
1354
1355 $self->{cursor} = length $text;
1356 $self->_set_text ($text);
1357 $self->update;
1358} 1480}
1359 1481
1360sub key_down { 1482sub key_down {
1361 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1362 1484
… …
1743} 1865}
1744 1866
1745sub set_max { 1867sub set_max {
1746 my ($self, $max) = @_; 1868 my ($self, $max) = @_;
1747 1869
1870 return if $self->{max_val} == $max;
1871
1748 $self->{max_val} = $max; 1872 $self->{max_val} = $max;
1873 $self->update;
1749} 1874}
1750 1875
1751sub set_value { 1876sub set_value {
1752 my ($self, $val, $max) = @_; 1877 my ($self, $val, $max) = @_;
1753 1878
1754 $self->set_max ($max) 1879 $self->set_max ($max)
1755 if defined $max; 1880 if defined $max;
1756 1881
1757 $max = $self->{max_val}; 1882 return if $self->{val} == $val;
1883
1758 $self->{val} = $val; 1884 $self->{val} = $val;
1759
1760 $self->update; 1885 $self->update;
1761} 1886}
1762 1887
1763sub _draw { 1888sub _draw {
1764 my ($self) = @_; 1889 my ($self) = @_;
… …
1847 1972
1848 $self->{value}->set_fontsize ($fsize); 1973 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 1974 $self->{max} ->set_fontsize ($fsize);
1850} 1975}
1851 1976
1977sub set_max {
1978 my ($self, $max) = @_;
1979
1980 $self->{gauge}->set_max ($max);
1981 $self->{max}->set_text ($max);
1982}
1983
1852sub set_value { 1984sub set_value {
1853 my ($self, $val, $max) = @_; 1985 my ($self, $val, $max) = @_;
1854 1986
1855 $self->set_max ($max) 1987 $self->set_max ($max)
1856 if defined $max; 1988 if defined $max;
1857 1989
1858 $self->{gauge}->set_value ($val, $max); 1990 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 1991 $self->{value}->set_text ($val);
1860}
1861
1862sub set_max {
1863 my ($self, $max) = @_;
1864
1865 $self->{gauge}->set_max ($max);
1866 $self->{max}->set_text ($max);
1867} 1992}
1868 1993
1869############################################################################# 1994#############################################################################
1870 1995
1871package CFClient::UI::Slider; 1996package CFClient::UI::Slider;
… …
1890 # TODO: calculations are off 2015 # TODO: calculations are off
1891 my $self = $class->SUPER::new ( 2016 my $self = $class->SUPER::new (
1892 fg => [1, 1, 1], 2017 fg => [1, 1, 1],
1893 active_fg => [0, 0, 0], 2018 active_fg => [0, 0, 0],
1894 range => [0, 0, 100, 10], 2019 range => [0, 0, 100, 10],
1895 req_w => 20, 2020 req_w => $::WIDTH / 80,
1896 req_h => 20, 2021 req_h => $::WIDTH / 80,
1897 vertical => 0, 2022 vertical => 0,
1898 can_hover => 1, 2023 can_hover => 1,
1899 inner_pad => 5, 2024 inner_pad => 5,
1900 @_ 2025 @_
1901 ); 2026 );
… …
2025 (new CFClient::UI::Empty expand => 1), 2150 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2151 (new CFClient::UI::Slider vertical => 1),
2027 ], 2152 ],
2028 ); 2153 );
2029 2154
2030 $self->{children}[1]->connect (changed => sub { 2155 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2156
2034 $self 2157 $self
2035} 2158}
2036 2159
2037sub set_fontsize { 2160sub set_fontsize {
… …
2045 my ($self, $text) = @_; 2168 my ($self, $text) = @_;
2046 2169
2047 my $layout = $self->{layout}; 2170 my $layout = $self->{layout};
2048 2171
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w}); 2173 $layout->set_width ($self->{children}[0]{w});
2051 $layout->set_text ($text); 2174 $layout->set_text ($text);
2052 2175
2053 ($layout->size)[1] 2176 ($layout->size)[1]
2054} 2177}
2055 2178
… …
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2109 2232
2110 delete $self->{texture}; 2233 delete $self->{texture};
2111 } 2234 }
2112 2235
2113 $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 {
2114 glClearColor 0, 0, 0, 1; 2237 glClearColor 0, 0, 0, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2238 glClear GL_COLOR_BUFFER_BIT;
2116 2239
2117 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
… …
2151} 2274}
2152 2275
2153sub _draw { 2276sub _draw {
2154 my ($self) = @_; 2277 my ($self) = @_;
2155 2278
2156 if ($self->{texture}) { 2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2157 glEnable GL_TEXTURE_2D; 2281 glEnable GL_TEXTURE_2D;
2158 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;
2159 $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});
2160 glDisable GL_TEXTURE_2D; 2285 glDisable GL_TEXTURE_2D;
2161 } 2286 glDisable GL_BLEND;
2162 2287
2163 $self->{children}[1]->draw; 2288 $self->{children}[1]->draw;
2164 2289
2165} 2290}
2166 2291
… …
2335 2460
2336sub size_request { 2461sub size_request {
2337 (32, 8) 2462 (32, 8)
2338} 2463}
2339 2464
2340sub draw { 2465sub _draw {
2341 my ($self) = @_; 2466 my ($self) = @_;
2342 2467
2468 return unless $::CONN;#d# manage and cache textures differently
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2344 2470
2471 # TODO animation
2345 if ($tex) { 2472 if ($tex) {
2346 glEnable GL_BLEND; 2473 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D; 2475 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2354 } 2481 }
2355} 2482}
2356 2483
2357############################################################################# 2484#############################################################################
2358 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
2359package CFClient::UI::Root; 2732package CFClient::UI::Root;
2360 2733
2361our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2362 2735
2363use CFClient::OpenGL; 2736use CFClient::OpenGL;
2364 2737
2365sub check_size { 2738sub new {
2366 my ($self) = @_; 2739 my $class = shift;
2367 2740
2368 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2741 $class->SUPER::new (
2369} 2742 @_,
2370 2743 )
2371sub size_request {
2372 ($::WIDTH, $::HEIGHT)
2373} 2744}
2374 2745
2375sub configure { 2746sub configure {
2376 my ($self, $x, $y, $w, $h) = @_; 2747 my ($self, $x, $y, $w, $h) = @_;
2377 2748
2378 $self->SUPER::configure ($x, $y, $w, $h); 2749 $self->{w} = $w;
2750 $self->{h} = $h;
2751}
2379 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
2380 for my $child (@{$self->{children}}) { 2785 for my $child ($self->children) {
2381 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)};
2382 2787
2383 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2384 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2385 $child->configure ($X, $Y, $W,$H); 2790 $child->configure ($X, $Y, $W, $H);
2386 } 2791 }
2387}
2388 2792
2389sub _topleft { 2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2390 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2391 2799
2392 ($x, $y) 2800 ($x, $y)
2393} 2801}
2394 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2395sub update { 2809sub update {
2396 my ($self) = @_; 2810 my ($self) = @_;
2397 2811
2398 $self->check_size; 2812 $self->check_size;
2399 ::refresh (); 2813 $::WANT_REFRESH++;
2400} 2814}
2401 2815
2402sub add { 2816sub add {
2403 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2404 2818
2405 # integerize window positions 2819 # integerise window positions
2406 $child->{x} = int $child->{x}; 2820 $child->{x} = int $child->{x};
2407 $child->{y} = int $child->{y}; 2821 $child->{y} = int $child->{y};
2408 2822
2409 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2410} 2824}
… …
2413 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2414 2828
2415 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2416} 2830}
2417 2831
2418sub draw { 2832sub draw {
2419 my ($self) = @_; 2833 my ($self) = @_;
2420 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
2421 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2422 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2423 } 2882 }
2424 2883
2425 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2426 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2427 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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