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.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.195 by root, Thu May 11 23:54:31 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
… …
23 24
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}, $widget->{tooltip_font});
29 30
30 $TOOLTIP->show; 31 $TOOLTIP->show;
31 32
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 34
… …
232 $self->{y} = $y; 233 $self->{y} = $y;
233 $self->update; 234 $self->update;
234 } 235 }
235 236
236 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 239 }
243} 240}
244 241
245sub size_allocate { 242sub size_allocate {
246 # nothing to be done 243 # nothing to be done
247} 244}
248 245
249sub children { 246sub children {
250} 247}
251 248
252# call when resoltuion changes etc. 249# call when resolution changes etc.
253sub reconfigure { 250sub reconfigure {
254 my ($self) = @_; 251 my ($self) = @_;
255 252
256 $_->reconfigure 253 $_->reconfigure
257 for $self->children; 254 for $self->children;
258 255
259 $_->check_size; 256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
260} 259}
261 260
262sub set_max_size { 261sub set_max_size {
263 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
264 263
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277} 266}
278 267
279# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
280sub coord2local { 269sub coord2local {
281 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
282 271
283 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 273}
286 274
287# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
288sub coord2global { 276sub coord2global {
289 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
290 278
291 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 280}
294 281
295sub focus_in { 282sub focus_in {
296 my ($self) = @_; 283 my ($self) = @_;
297 284
… …
395 382
396sub set_parent { 383sub set_parent {
397 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
398 385
399 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
400} 390}
401 391
402sub check_size { 392sub check_size {
403 my ($self) = @_; 393 my ($self) = @_;
404 394
405 $self->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 396}
427 397
428sub update { 398sub update {
429 my ($self) = @_; 399 my ($self) = @_;
430 400
… …
527 497
528 $self 498 $self
529} 499}
530 500
531sub add { 501sub add {
532 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
533 503
534 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
535 506
536 use sort 'stable'; 507 use sort 'stable';
537 508
538 $self->{children} = [ 509 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
541 ]; 512 ];
542 513
543 $child->check_size; 514 $self->check_size;
515 $self->update;
544} 516}
545 517
546sub children { 518sub children {
547 @{ $_[0]{children} } 519 @{ $_[0]{children} }
548} 520}
… …
567 539
568 for (@$children) { 540 for (@$children) {
569 delete $_->{parent}; 541 delete $_->{parent};
570 $_->hide; 542 $_->hide;
571 } 543 }
544
545 $self->check_size;
546 $self->update;
572} 547}
573 548
574sub find_widget { 549sub find_widget {
575 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
576 551
… …
662 637
663 $self->SUPER::size_allocate ($w, $h); 638 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 639 $self->update;
665} 640}
666 641
642sub _render {
643 $_[0]{children}[0]->draw;
644}
645
667sub render_child { 646sub render_child {
668 my ($self) = @_; 647 my ($self) = @_;
669 648
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 650 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 651 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 652
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;
674 }; 661 };
675} 662}
676 663
677sub _draw { 664sub _draw {
678 my ($self) = @_; 665 my ($self) = @_;
… …
680 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
681 668
682 my $tex = $self->{texture} 669 my $tex = $self->{texture}
683 or return; 670 or return;
684 671
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1; 674 glColor 0, 0, 0, 1;
690 675
691 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
692 677
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
695} 679}
696 680
697############################################################################# 681#############################################################################
698 682
699package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
700 684
701our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
702 686
703sub new { die }
704
705sub size_request { 687sub size_request {
706 my ($self) = @_; 688 my ($self) = @_;
707 689
708 @$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)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
710 692
711 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
712} 694}
713 695
714sub _draw { 696sub size_allocate {
715 my ($self) = @_; 697 my ($self, $w, $h) = @_;
716 698
717 $self->{children}[1]->draw; 699 $self->update;
718} 700}
719 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
720 781
721############################################################################# 782#############################################################################
722 783
723package CFClient::UI::Frame; 784package CFClient::UI::Frame;
724 785
… …
781 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
782 843
783 my $self = $class->SUPER::new ( 844 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
786 border => 0.8, 847 border => 0.6,
787 can_events => 1, 848 can_events => 1,
788 @_ 849 @_
789 ); 850 );
790 851
791 $self->{title} &&= new CFClient::UI::Label 852 $self->{title} &&= new CFClient::UI::Label
792 align => 0, 853 align => 0,
793 valign => 1, 854 valign => 1,
794 text => $self->{title}, 855 text => $self->{title},
795 fontsize => 1; 856 fontsize => $self->{border};
796 857
797 $self 858 $self
798} 859}
799 860
800sub border { 861sub border {
… …
825} 886}
826 887
827sub button_down { 888sub button_down {
828 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
829 890
891 my ($w, $h) = @$self{qw(w h)};
830 my $border = $self->border; 892 my $border = $self->border;
831 893
832 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
833 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
834 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
835 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
837 901
902 my $mx = $x < $border;
903 my $my = $y < $border;
904
838 $self->{motion} = sub { 905 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
840 907
841 ($x, $y) = ($ev->{x}, $ev->{y}); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
842 910
843 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
844 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
845 $self->check_size; 914 $self->check_size;
846 }; 915 };
847 916
848 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
853 920
854 $self->{motion} = sub { 921 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
… …
891 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
895 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
896 my $bg = $tex[0]; 964 my $bg = $tex[0];
897 965
898 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
900 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
901 969
902 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
903 971
904 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
908 976
909 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
911 980
912 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
913 $self->child->draw; 983 $self->child->draw;
914} 984}
915 985
916############################################################################# 986#############################################################################
917 987
… …
1141} 1211}
1142 1212
1143sub size_allocate { 1213sub size_allocate {
1144 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1145 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1146 my $children = $self->{children}; 1218 my $children = $self->{children};
1147 1219
1148 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1149 1221
1150 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1189 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1190 1262
1191 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1193 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1194 fontsize => 1, 1269 fontsize => 1,
1195 text => "",
1196 align => -1, 1270 align => -1,
1197 valign => -1, 1271 valign => -1,
1198 padding => 2, 1272 padding => 2,
1199 layout => new CFClient::Layout,
1200 can_events => 0, 1273 can_events => 0,
1201 %arg 1274 %arg
1202 ); 1275 );
1203 1276
1204 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout; 1280 $self->{template} = $layout;
1208 } 1281 }
1209 1282
1210 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1211 $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 }
1212 1288
1213 $self 1289 $self
1214} 1290}
1215 1291
1216sub escape { 1292sub escape {
… …
1228 1304
1229 delete $self->{texture}; 1305 delete $self->{texture};
1230 $self->SUPER::update; 1306 $self->SUPER::update;
1231} 1307}
1232 1308
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1239sub set_text { 1309sub set_text {
1240 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1241 1311
1242 return if $self->{text} eq "T$text"; 1312 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text"; 1313 $self->{text} = "T$text";
1244 1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1245 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1246 1317
1247 delete $self->{texture};
1248 $self->update; 1318 $self->update;
1249 $self->check_size; 1319 $self->check_size;
1250} 1320}
1251 1321
1252sub set_markup { 1322sub set_markup {
1253 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1254 1324
1255 return if $self->{text} eq "M$markup"; 1325 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup"; 1326 $self->{text} = "M$markup";
1257 1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1258 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1259 1332
1260 delete $self->{texture};
1261 $self->update; 1333 $self->update;
1262 $self->check_size; 1334 $self->check_size;
1263} 1335}
1264 1336
1265sub size_request { 1337sub size_request {
… …
1296sub set_fontsize { 1368sub set_fontsize {
1297 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1298 1370
1299 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1300 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1301 $self->check_size; 1375 $self->check_size;
1302 $self->update;
1303} 1376}
1304 1377
1305sub _draw { 1378sub _draw {
1306 my ($self) = @_; 1379 my ($self) = @_;
1307 1380
1308 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1309 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1311 $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
1312 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
1313 }; 1398 };
1314 1399
1315 glEnable GL_BLEND;
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319 1402
1403 if ($tex->{format} == GL_ALPHA) {
1320 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1321
1322 $self->{ox} = int (
1323 $self->{align} < 0 ? $self->{padding}
1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1325 : ($self->{w} - $tex->{w}) * 0.5
1326 );
1327
1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1331 : ($self->{h} - $tex->{h}) * 0.5
1332 );
1333
1334 $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 }
1335 1409
1336 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1337 glDisable GL_BLEND;
1338} 1411}
1339 1412
1340############################################################################# 1413#############################################################################
1341 1414
1342package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1377 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1378 1451
1379 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1380} 1453}
1381 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
1382sub get_text { 1464sub get_text {
1383 $_[0]{text} 1465 $_[0]{text}
1384} 1466}
1385 1467
1386sub size_request { 1468sub size_request {
… …
1393 1475
1394sub size_allocate { 1476sub size_allocate {
1395 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1396 1478
1397 $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
1398}
1399
1400sub set_text {
1401 my ($self, $text) = @_;
1402
1403 $self->{cursor} = length $text;
1404 $self->_set_text ($text);
1405 $self->update;
1406} 1480}
1407 1481
1408sub key_down { 1482sub key_down {
1409 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1410 1484
… …
1598 1672
1599 if ($GRAB == $self) { 1673 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg}; 1674 $self->{fg} = $self->{active_fg};
1601 } 1675 }
1602 1676
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D; 1677 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1; 1679 glColor 0, 0, 0, 1;
1608 1680
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1681 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1610 1682
1611 glDisable GL_TEXTURE_2D; 1683 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613 1684
1614 $self->SUPER::_draw; 1685 $self->SUPER::_draw;
1615} 1686}
1616 1687
1617############################################################################# 1688#############################################################################
… …
1664 1735
1665 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1666 1737
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668 1739
1669 glEnable GL_BLEND;
1670 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672 1741
1673 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674 1743
1675 $tex->draw_quad (0, 0, $s, $s); 1744 $tex->draw_quad_alpha (0, 0, $s, $s);
1676 1745
1677 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679} 1747}
1680 1748
1681############################################################################# 1749#############################################################################
1682 1750
1683package CFClient::UI::Image; 1751package CFClient::UI::Image;
… …
1726 glTranslate 0, -$self->{w}, 0; 1794 glTranslate 0, -$self->{w}, 0;
1727 1795
1728 ($w, $h) = ($h, $w); 1796 ($w, $h) = ($h, $w);
1729 } 1797 }
1730 1798
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D; 1799 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735 1801
1736 $tex->draw_quad (0, 0, $w, $h); 1802 $tex->draw_quad_alpha (0, 0, $w, $h);
1737 1803
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1740} 1805}
1741 1806
1742############################################################################# 1807#############################################################################
1743 1808
… …
1941 # TODO: calculations are off 2006 # TODO: calculations are off
1942 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1944 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1945 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1946 req_w => 20, 2011 req_w => $::WIDTH / 80,
1947 req_h => 20, 2012 req_h => $::WIDTH / 80,
1948 vertical => 0, 2013 vertical => 0,
1949 can_hover => 1, 2014 can_hover => 1,
1950 inner_pad => 5, 2015 inner_pad => 5,
1951 @_ 2016 @_
1952 ); 2017 );
… …
2035 $page ||= 2; 2100 $page ||= 2;
2036 2101
2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2039 2104
2040 glEnable GL_BLEND;
2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2105 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 2107
2045 # draw background 2108 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h); 2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2047 2110
2048 # draw handle 2111 # draw handle
2049 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2050 2113
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D; 2114 glDisable GL_TEXTURE_2D;
2053} 2115}
2054 2116
2055############################################################################# 2117#############################################################################
2056 2118
… …
2067 fontsize => 1, 2129 fontsize => 1,
2068 can_events => 0, 2130 can_events => 0,
2069 #font => default_font 2131 #font => default_font
2070 @_, 2132 @_,
2071 2133
2072 layout => (new CFClient::Layout), 2134 layout => (new CFClient::Layout 1),
2073 par => [], 2135 par => [],
2074 height => 0, 2136 height => 0,
2075 children => [ 2137 children => [
2076 (new CFClient::UI::Empty expand => 1), 2138 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1), 2139 (new CFClient::UI::Slider vertical => 1),
2078 ], 2140 ],
2079 ); 2141 );
2080 2142
2081 $self->{children}[1]->connect (changed => sub { 2143 $self->{children}[1]->connect (changed => sub { $self->update });
2082 $self->update;
2083 });
2084 2144
2085 $self 2145 $self
2086} 2146}
2087 2147
2088sub set_fontsize { 2148sub set_fontsize {
… …
2096 my ($self, $text) = @_; 2156 my ($self, $text) = @_;
2097 2157
2098 my $layout = $self->{layout}; 2158 my $layout = $self->{layout};
2099 2159
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w}); 2161 $layout->set_width ($self->{children}[0]{w});
2102 $layout->set_text ($text); 2162 $layout->set_markup ($text);
2103 2163
2104 ($layout->size)[1] 2164 ($layout->size)[1]
2105} 2165}
2106 2166
2107sub reflow { 2167sub reflow {
… …
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2160 2220
2161 delete $self->{texture}; 2221 delete $self->{texture};
2162 } 2222 }
2163 2223
2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2165 glClearColor 0, 0, 0, 1; 2225 glClearColor 0, 0, 0, 0;
2166 glClear GL_COLOR_BUFFER_BIT; 2226 glClear GL_COLOR_BUFFER_BIT;
2167 2227
2168 glEnable GL_BLEND;
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D; 2228 glEnable GL_TEXTURE_2D;
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172 2230
2173 my $top = int $self->{children}[1]{range}[0]; 2231 my $top = int $self->{children}[1]{range}[0];
2174 2232
… …
2183 2241
2184 for my $par (@{$self->{par}}) { 2242 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0]; 2243 my $h = $par->[0];
2186 2244
2187 if ($y0 < $y + $h && $y < $y1) { 2245 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] });
2188 $layout->set_text ($par->[2]); 2247 $layout->set_markup ($par->[2]);
2189 2248
2190 glColor @{ $par->[1] };
2191 my ($W, $H) = $layout->size; 2249 my ($W, $H) = $layout->size;
2192 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2193 } 2251 }
2194 2252
2195 $y += $h; 2253 $y += $h;
2196 } 2254 }
2197 2255
2198 glDisable GL_TEXTURE_2D; 2256 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND;
2200 }; 2257 };
2201 }); 2258 });
2202} 2259}
2203 2260
2204sub _draw { 2261sub _draw {
2205 my ($self) = @_; 2262 my ($self) = @_;
2206 2263
2207 if ($self->{texture}) {
2208 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1; 2266 glColor 1, 1, 1, 1;
2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2212 glDisable GL_TEXTURE_2D; 2268 glDisable GL_TEXTURE_2D;
2213 }
2214 2269
2215 $self->{children}[1]->draw; 2270 $self->{children}[1]->draw;
2216 2271
2217} 2272}
2218 2273
… …
2313 can_events => 0, 2368 can_events => 0,
2314 ) 2369 )
2315} 2370}
2316 2371
2317sub set_markup { 2372sub set_markup {
2318 my ($self, $text) = @_; 2373 my ($self, $text, $font) = @_;
2319 2374
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2375 $self->{label} = new CFClient::UI::Label
2376 fontsize => 0.8,
2377 fg => [0, 0, 0],
2378 font => ($font || $::FONT_PROP);
2379
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2321 $self->{label}->set_markup ($text); 2381 $self->{label}->set_markup ($text);
2322 $self->add ($self->{label}); 2382 $self->add ($self->{label});
2323} 2383}
2324 2384
2325sub size_request { 2385sub size_request {
2326 my ($self) = @_; 2386 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329 2387
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2388 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331 2389
2332 ($w + 4, $h + 4) 2390 ($w + 4, $h + 4)
2333} 2391}
… …
2387 2445
2388sub size_request { 2446sub size_request {
2389 (32, 8) 2447 (32, 8)
2390} 2448}
2391 2449
2392sub draw { 2450sub _draw {
2393 my ($self) = @_; 2451 my ($self) = @_;
2394 2452
2453 return unless $::CONN;#d# manage and cache textures differently
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2396 2455
2456 # TODO animation
2397 if ($tex) { 2457 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D; 2458 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1; 2460 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D; 2462 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND; 2463 }
2464}
2465
2466#############################################################################
2467
2468package CFClient::UI::InventoryItem;
2469
2470our @ISA = CFClient::UI::HBox::;
2471
2472sub new {
2473 my $class = shift;
2474
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new (
2485 can_hover => 1,
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_,
2544 );
2545
2546 $self
2547}
2548
2549sub set_items {
2550 my ($self, $items) = @_;
2551
2552 $self->{scrolled}->clear;
2553 return unless $items;
2554
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2556
2557 $self->{real_items} = \@items;
2558
2559 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2565 }
2566
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::Menu;
2578
2579our @ISA = CFClient::UI::FancyFrame::;
2580
2581use CFClient::OpenGL;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 items => [],
2588 z => 100,
2589 @_,
2590 );
2591
2592 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2593
2594 for my $item (@{ $self->{items} }) {
2595 my ($widget, $cb) = @$item;
2596
2597 # handle various types of items, only text for now
2598 if (!ref $widget) {
2599 $widget = new CFClient::UI::Label
2600 can_hover => 1,
2601 can_events => 1,
2602 text => $widget;
2603 }
2604
2605 $self->{item}{$widget} = $item;
2606
2607 $self->{vbox}->add ($widget);
2608 }
2609
2610 $self
2611}
2612
2613# popup given the event (must be a mouse button down event currently)
2614sub popup {
2615 my ($self, $ev) = @_;
2616
2617 $self->emit ("popdown");
2618
2619 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self;
2621 $self->{button} = $ev->{button};
2622
2623 $self->show;
2624 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2625}
2626
2627sub mouse_motion {
2628 my ($self, $ev, $x, $y) = @_;
2629
2630 # TODO: should use vbox->find_widget or so
2631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2632 $self->{hover} = $self->{item}{$HOVER};
2633}
2634
2635sub button_up {
2636 my ($self, $ev, $x, $y) = @_;
2637
2638 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB;
2640 $self->hide;
2641
2642 $self->emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover};
2644 }
2645}
2646
2647#############################################################################
2648
2649package CFClient::UI::Statusbox;
2650
2651our @ISA = CFClient::UI::VBox::;
2652
2653sub reorder {
2654 my ($self) = @_;
2655 my $NOW = time;
2656
2657 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 }
2660
2661 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2663 my $count = 10 + 1;
2664 for my $item (@items) {
2665 last unless --$count;
2666
2667 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text};
2670 for ($short) {
2671 s/^\s+//;
2672 s/\012.*//s;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 }
2676
2677 new CFClient::UI::Label
2678 markup => $short,
2679 tooltip => delete $item->{tooltip},
2680 fontsize => delete $item->{fontsize},
2681 color => delete $item->{color},
2682 can_events => 1,
2683 can_hover => 1,
2684 };
2685 }
2686
2687 $self->clear;
2688 $self->SUPER::add (@widgets);
2689}
2690
2691sub add {
2692 my ($self, $text, %arg) = @_;
2693
2694 my $item = {
2695 time => time,
2696 text => $text,
2697 timeout => 60,
2698 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8],
2701 %arg,
2406 } 2702 };
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708
2709 $self->reorder;
2407} 2710}
2408 2711
2409############################################################################# 2712#############################################################################
2410 2713
2411package CFClient::UI::Root; 2714package CFClient::UI::Root;
2412 2715
2413our @ISA = CFClient::UI::Container::; 2716our @ISA = CFClient::UI::Container::;
2414 2717
2415use CFClient::OpenGL; 2718use CFClient::OpenGL;
2416 2719
2417sub check_size { 2720sub new {
2418 my ($self) = @_; 2721 my $class = shift;
2419 2722
2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2723 $class->SUPER::new (
2421} 2724 @_,
2422 2725 )
2423sub size_request {
2424 ($::WIDTH, $::HEIGHT)
2425} 2726}
2426 2727
2427sub configure { 2728sub configure {
2428 my ($self, $x, $y, $w, $h) = @_; 2729 my ($self, $x, $y, $w, $h) = @_;
2429 2730
2430 $self->SUPER::configure ($x, $y, $w, $h); 2731 $self->{w} = $w;
2732 $self->{h} = $h;
2733}
2431 2734
2735sub check_size {
2736 my ($self) = @_;
2737
2738 $self->size_allocate ($self->{w}, $self->{h})
2739 if $self->{w};
2740}
2741
2742sub size_request {
2743 my ($self) = @_;
2744
2745 ($self->{w}, $self->{h})
2746}
2747
2748sub size_allocate {
2749 my ($self, $w, $h) = @_;
2750
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2432 for my $child (@{$self->{children}}) { 2767 for my $child ($self->children) {
2433 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2434 2769
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2770 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2436 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2437 $child->configure ($X, $Y, $W,$H); 2772 $child->configure ($X, $Y, $W, $H);
2438 } 2773 }
2439}
2440 2774
2441sub _topleft { 2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777}
2778
2779sub coord2local {
2442 my ($self, $x, $y) = @_; 2780 my ($self, $x, $y) = @_;
2443 2781
2444 ($x, $y) 2782 ($x, $y)
2445} 2783}
2446 2784
2785sub coord2global {
2786 my ($self, $x, $y) = @_;
2787
2788 ($x, $y)
2789}
2790
2447sub update { 2791sub update {
2448 my ($self) = @_; 2792 my ($self) = @_;
2449 2793
2450 $self->check_size; 2794 $self->check_size;
2451 ::refresh (); 2795 $::WANT_REFRESH++;
2452} 2796}
2453 2797
2454sub add { 2798sub add {
2455 my ($self, $child) = @_; 2799 my ($self, $child) = @_;
2456 2800
2457 # integerize window positions 2801 # integerise window positions
2458 $child->{x} = int $child->{x}; 2802 $child->{x} = int $child->{x};
2459 $child->{y} = int $child->{y}; 2803 $child->{y} = int $child->{y};
2460 2804
2461 $self->SUPER::add ($child); 2805 $self->SUPER::add ($child);
2462} 2806}
… …
2465 my ($self, $id, $cb) = @_; 2809 my ($self, $id, $cb) = @_;
2466 2810
2467 $self->{refresh_hook}{$id} = $cb; 2811 $self->{refresh_hook}{$id} = $cb;
2468} 2812}
2469 2813
2470sub draw { 2814sub draw {
2471 my ($self) = @_; 2815 my ($self) = @_;
2472 2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860
2473 while (my $rcb = delete $self->{refresh_hook}) { 2861 while ($self->{refresh_hook}) {
2474 $_->() for values %$rcb; 2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2475 } 2864 }
2476 2865
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2866 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT; 2868 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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