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.176 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 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_tooltip_from ($widget);
29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31 31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) { 34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 } 36 }
37 37
38 $TOOLTIP->move ($x, $y); 38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
39 } 41 }
40 42
41 return; 43 return;
42 } 44 }
43 } 45 }
… …
232 $self->{y} = $y; 234 $self->{y} = $y;
233 $self->update; 235 $self->update;
234 } 236 }
235 237
236 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 240 }
243} 241}
244 242
245sub size_allocate { 243sub size_allocate {
246 # nothing to be done 244 # nothing to be done
247} 245}
248 246
249sub children { 247sub children {
250} 248}
251 249
252# call when resoltuion changes etc. 250# call when resolution changes etc.
253sub reconfigure { 251sub reconfigure {
254 my ($self) = @_; 252 my ($self) = @_;
255 253
256 $_->reconfigure 254 $_->reconfigure
257 for $self->children; 255 for $self->children;
258 256
259 $_->check_size; 257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260} 260}
261 261
262sub set_max_size { 262sub set_max_size {
263 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
264 264
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 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} 267}
278 268
279# translate global coordinates to local coordinate system 269# translate global coordinates to local coordinate system
280sub coord2local { 270sub coord2local {
281 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
282 272
283 my ($X, $Y) = $self->_topleft; 273 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 274}
286 275
287# translate local coordinates to global coordinate system 276# translate local coordinates to global coordinate system
288sub coord2global { 277sub coord2global {
289 my ($self, $x, $y) = @_; 278 my ($self, $x, $y) = @_;
290 279
291 my ($X, $Y) = $self->_topleft; 280 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 281}
294 282
295sub focus_in { 283sub focus_in {
296 my ($self) = @_; 284 my ($self) = @_;
297 285
… …
395 383
396sub set_parent { 384sub set_parent {
397 my ($self, $parent) = @_; 385 my ($self, $parent) = @_;
398 386
399 Scalar::Util::weaken ($self->{parent} = $parent); 387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
400} 391}
401 392
402sub check_size { 393sub check_size {
403 my ($self) = @_; 394 my ($self, $forced) = @_;
404 395
405 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
406 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
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} 398}
427 399
428sub update { 400sub update {
429 my ($self) = @_; 401 my ($self) = @_;
430 402
… …
527 499
528 $self 500 $self
529} 501}
530 502
531sub add { 503sub add {
532 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
533 505
534 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
535 508
536 use sort 'stable'; 509 use sort 'stable';
537 510
538 $self->{children} = [ 511 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
541 ]; 514 ];
542 515
543 $child->check_size; 516 $self->check_size (1);
517 $self->update;
544} 518}
545 519
546sub children { 520sub children {
547 @{ $_[0]{children} } 521 @{ $_[0]{children} }
548} 522}
… …
567 541
568 for (@$children) { 542 for (@$children) {
569 delete $_->{parent}; 543 delete $_->{parent};
570 $_->hide; 544 $_->hide;
571 } 545 }
546
547 $self->check_size;
548 $self->update;
572} 549}
573 550
574sub find_widget { 551sub find_widget {
575 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
576 553
… …
662 639
663 $self->SUPER::size_allocate ($w, $h); 640 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 641 $self->update;
665} 642}
666 643
644sub _render {
645 $_[0]{children}[0]->draw;
646}
647
667sub render_child { 648sub render_child {
668 my ($self) = @_; 649 my ($self) = @_;
669 650
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 652 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 653 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 654
655 $self->_render;
674# glColorMask 1, 1, 1, 0; 656# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 657# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 659# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 660# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
687 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
688 670
689 my $tex = $self->{texture} 671 my $tex = $self->{texture}
690 or return; 672 or return;
691 673
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 676 glColor 0, 0, 0, 1;
697 677
698 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 679
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
702} 681}
703 682
704############################################################################# 683#############################################################################
705 684
706package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
707 686
708our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
709 688
710sub new { die }
711
712sub size_request { 689sub size_request {
713 my ($self) = @_; 690 my ($self) = @_;
714 691
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 694
718 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
719} 696}
720 697
721sub _draw { 698sub size_allocate {
722 my ($self) = @_; 699 my ($self, $w, $h) = @_;
723 700
724 $self->{children}[1]->draw; 701 $self->update;
725} 702}
726 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
727 706
728############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
729 709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
730package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
731 752
732our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 754
736sub new { 755sub new {
737 my $class = shift; 756 my $class = shift;
738 757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
739 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
741 border_bg => [1, 1, 1, 1], 770 slider => $slider,
742 border => 0.8,
743 @_ 771 @_,
744 ); 772 );
745 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
746 $self 778 $self
747} 779}
748 780
749sub _draw { 781#TODO# update range on size_allocate depeneing on child
750 my ($self) = @_; 782# update viewport offset on scroll
751 783
752 my ($w, $h) = ($self->{w}, $self->{h}); 784#############################################################################
753 785
754 glEnable GL_BLEND; 786package CFClient::UI::Frame;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D;
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 787
759# glBegin GL_QUADS; 788our @ISA = CFClient::UI::Bin::;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0;
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
766 789
767 790use CFClient::OpenGL;
768 $self->child->draw;
769 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D;
771}
772 791
773############################################################################# 792#############################################################################
774 793
775package CFClient::UI::FancyFrame; 794package CFClient::UI::FancyFrame;
776 795
… …
891 my ($self) = @_; 910 my ($self) = @_;
892 911
893 my ($w, $h ) = ($self->{w}, $self->{h}); 912 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 914
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 917
901 my $border = $self->border; 918 my $border = $self->border;
902 919
903 glColor @{ $self->{border_bg} }; 920 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 921 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 925
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
909 my $bg = $tex[0]; 927 my $bg = $tex[0];
910 928
911 # TODO: repeat texture not scale 929 # TODO: repeat texture not scale
912 my $rep_x = $cw / $bg->{w}; 930 my $rep_x = $cw / $bg->{w};
913 my $rep_y = $ch / $bg->{h}; 931 my $rep_y = $ch / $bg->{h};
914 932
915 glColor @{ $self->{bg} }; 933 glColor @{ $self->{bg} };
916 934
917 $bg->{s} = $rep_x; 935 $bg->{s} = $rep_x;
918 $bg->{t} = $rep_y; 936 $bg->{t} = $rep_y;
919 $bg->{wrap_mode} = 1; 937 $bg->{wrap_mode} = 1;
920 $bg->draw_quad ($border, $border, $cw, $ch); 938 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 }
921 940
922 glDisable GL_TEXTURE_2D; 941 glDisable GL_TEXTURE_2D;
923 glDisable GL_BLEND;
924 942
925 $self->{title}->draw if $self->{title}; 943 $self->{title}->draw if $self->{title};
944
926 $self->child->draw; 945 $self->child->draw;
927} 946}
928 947
929############################################################################# 948#############################################################################
930 949
… …
1154} 1173}
1155 1174
1156sub size_allocate { 1175sub size_allocate {
1157 my ($self, $w, $h) = @_; 1176 my ($self, $w, $h) = @_;
1158 1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1159 my $children = $self->{children}; 1180 my $children = $self->{children};
1160 1181
1161 my @h = map $_->{req_h}, @$children; 1182 my @h = map $_->{req_h}, @$children;
1162 1183
1163 my $req_h = List::Util::sum @h; 1184 my $req_h = List::Util::sum @h;
… …
1202 my ($class, %arg) = @_; 1223 my ($class, %arg) = @_;
1203 1224
1204 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
1205 fg => [1, 1, 1], 1226 fg => [1, 1, 1],
1206 #font => default_font 1227 #font => default_font
1228 #text => initial text
1229 #markup => initial narkup
1230 layout => (new CFClient::Layout),
1207 fontsize => 1, 1231 fontsize => 1,
1208 text => "",
1209 align => -1, 1232 align => -1,
1210 valign => -1, 1233 valign => -1,
1211 padding => 2, 1234 padding => 2,
1212 layout => new CFClient::Layout,
1213 can_events => 0, 1235 can_events => 0,
1214 %arg 1236 %arg
1215 ); 1237 );
1216 1238
1217 if (exists $self->{template}) { 1239 if (exists $self->{template}) {
1218 my $layout = new CFClient::Layout; 1240 my $layout = new CFClient::Layout;
1219 $layout->set_text (delete $self->{template}); 1241 $layout->set_text (delete $self->{template});
1220 $self->{template} = $layout; 1242 $self->{template} = $layout;
1221 } 1243 }
1222 1244
1223 $self->set_text (delete $self->{text}) if exists $self->{text}; 1245 if (exists $self->{markup}) {
1224 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1246 $self->set_markup (delete $self->{markup});
1247 } else {
1248 $self->set_text (delete $self->{text});
1249 }
1225 1250
1226 $self 1251 $self
1227} 1252}
1228 1253
1229sub escape { 1254sub escape {
… …
1241 1266
1242 delete $self->{texture}; 1267 delete $self->{texture};
1243 $self->SUPER::update; 1268 $self->SUPER::update;
1244} 1269}
1245 1270
1246sub reconfigure {
1247 my ($self) = @_;
1248
1249 delete $self->{texture};
1250}
1251
1252sub set_text { 1271sub set_text {
1253 my ($self, $text) = @_; 1272 my ($self, $text) = @_;
1254 1273
1255 return if $self->{text} eq "T$text"; 1274 return if $self->{text} eq "T$text";
1256 $self->{text} = "T$text"; 1275 $self->{text} = "T$text";
1257 1276
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1258 $self->{layout}->set_text ($text); 1278 $self->{layout}->set_text ($text);
1259 1279
1260 delete $self->{texture};
1261 $self->update; 1280 $self->update;
1262 $self->check_size; 1281 $self->check_size;
1263} 1282}
1264 1283
1265sub set_markup { 1284sub set_markup {
1266 my ($self, $markup) = @_; 1285 my ($self, $markup) = @_;
1267 1286
1268 return if $self->{text} eq "M$markup"; 1287 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup"; 1288 $self->{text} = "M$markup";
1270 1289
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1271 $self->{layout}->set_markup ($markup); 1293 $self->{layout}->set_markup ($markup);
1272 1294
1273 delete $self->{texture};
1274 $self->update; 1295 $self->update;
1275 $self->check_size; 1296 $self->check_size;
1276} 1297}
1277 1298
1278sub size_request { 1299sub size_request {
… …
1309sub set_fontsize { 1330sub set_fontsize {
1310 my ($self, $fontsize) = @_; 1331 my ($self, $fontsize) = @_;
1311 1332
1312 $self->{fontsize} = $fontsize; 1333 $self->{fontsize} = $fontsize;
1313 delete $self->{texture}; 1334 delete $self->{texture};
1335
1336 $self->update;
1314 $self->check_size; 1337 $self->check_size;
1315 $self->update;
1316} 1338}
1317 1339
1318sub _draw { 1340sub _draw {
1319 my ($self) = @_; 1341 my ($self) = @_;
1320 1342
1321 my $tex = $self->{texture} ||= do { 1343 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}});
1322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1345 $self->{layout}->set_font ($self->{font}) if $self->{font};
1323 $self->{layout}->set_width ($self->{w}); 1346 $self->{layout}->set_width ($self->{w});
1324 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1348
1325 new_from_layout CFClient::Texture $self->{layout} 1349 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5;
1354
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5;
1358
1359 $tex
1326 }; 1360 };
1327 1361
1328 glEnable GL_BLEND;
1329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1330 glEnable GL_TEXTURE_2D; 1362 glEnable GL_TEXTURE_2D;
1331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1332 1364
1365 if ($tex->{format} == GL_ALPHA) {
1333 glColor @{$self->{fg}}; 1366 glColor @{$self->{fg}};
1334
1335 $self->{ox} = int (
1336 $self->{align} < 0 ? $self->{padding}
1337 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1338 : ($self->{w} - $tex->{w}) * 0.5
1339 );
1340
1341 $self->{oy} = int (
1342 $self->{valign} < 0 ? $self->{padding}
1343 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1344 : ($self->{h} - $tex->{h}) * 0.5
1345 );
1346
1347 $tex->draw_quad ($self->{ox}, $self->{oy}); 1367 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1368 } else {
1369 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1370 }
1348 1371
1349 glDisable GL_TEXTURE_2D; 1372 glDisable GL_TEXTURE_2D;
1350 glDisable GL_BLEND;
1351} 1373}
1352 1374
1353############################################################################# 1375#############################################################################
1354 1376
1355package CFClient::UI::EntryBase; 1377package CFClient::UI::EntryBase;
… …
1390 $self->{layout}->set_text ("$text "); 1412 $self->{layout}->set_text ("$text ");
1391 1413
1392 $self->emit (changed => $self->{text}); 1414 $self->emit (changed => $self->{text});
1393} 1415}
1394 1416
1417sub set_text {
1418 my ($self, $text) = @_;
1419
1420 $self->{cursor} = length $text;
1421 $self->_set_text ($text);
1422 $self->check_size;
1423 $self->update;
1424}
1425
1395sub get_text { 1426sub get_text {
1396 $_[0]{text} 1427 $_[0]{text}
1397} 1428}
1398 1429
1399sub size_request { 1430sub size_request {
… …
1406 1437
1407sub size_allocate { 1438sub size_allocate {
1408 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1409 1440
1410 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1411}
1412
1413sub set_text {
1414 my ($self, $text) = @_;
1415
1416 $self->{cursor} = length $text;
1417 $self->_set_text ($text);
1418 $self->update;
1419} 1442}
1420 1443
1421sub key_down { 1444sub key_down {
1422 my ($self, $ev) = @_; 1445 my ($self, $ev) = @_;
1423 1446
… …
1611 1634
1612 if ($GRAB == $self) { 1635 if ($GRAB == $self) {
1613 $self->{fg} = $self->{active_fg}; 1636 $self->{fg} = $self->{active_fg};
1614 } 1637 }
1615 1638
1616 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 glColor 0, 0, 0, 1; 1641 glColor 0, 0, 0, 1;
1621 1642
1622 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1643 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1623 1644
1624 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1625 glDisable GL_BLEND;
1626 1646
1627 $self->SUPER::_draw; 1647 $self->SUPER::_draw;
1628} 1648}
1629 1649
1630############################################################################# 1650#############################################################################
… …
1677 1697
1678 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1679 1699
1680 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1681 1701
1682 glEnable GL_BLEND; 1702 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703
1683 glEnable GL_TEXTURE_2D; 1704 glEnable GL_TEXTURE_2D;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685
1686 my $tex = $self->{state} ? $tex[1] : $tex[0];
1687
1688 $tex->draw_quad (0, 0, $s, $s); 1705 $tex->draw_quad_alpha (0, 0, $s, $s);
1689
1690 glDisable GL_TEXTURE_2D; 1706 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND;
1692} 1707}
1693 1708
1694############################################################################# 1709#############################################################################
1695 1710
1696package CFClient::UI::Image; 1711package CFClient::UI::Image;
… …
1739 glTranslate 0, -$self->{w}, 0; 1754 glTranslate 0, -$self->{w}, 0;
1740 1755
1741 ($w, $h) = ($h, $w); 1756 ($w, $h) = ($h, $w);
1742 } 1757 }
1743 1758
1744 glEnable GL_BLEND;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1747 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1748 1761
1749 $tex->draw_quad (0, 0, $w, $h); 1762 $tex->draw_quad_alpha (0, 0, $w, $h);
1750 1763
1751 glDisable GL_BLEND;
1752 glDisable GL_TEXTURE_2D; 1764 glDisable GL_TEXTURE_2D;
1753} 1765}
1754 1766
1755############################################################################# 1767#############################################################################
1756 1768
… …
1954 # TODO: calculations are off 1966 # TODO: calculations are off
1955 my $self = $class->SUPER::new ( 1967 my $self = $class->SUPER::new (
1956 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1957 active_fg => [0, 0, 0], 1969 active_fg => [0, 0, 0],
1958 range => [0, 0, 100, 10], 1970 range => [0, 0, 100, 10],
1959 req_w => 20, 1971 req_w => $::WIDTH / 80,
1960 req_h => 20, 1972 req_h => $::WIDTH / 80,
1961 vertical => 0, 1973 vertical => 0,
1962 can_hover => 1, 1974 can_hover => 1,
1963 inner_pad => 5, 1975 inner_pad => 5,
1964 @_ 1976 @_
1965 ); 1977 );
… …
2048 $page ||= 2; 2060 $page ||= 2;
2049 2061
2050 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2051 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2052 2064
2053 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2065 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2067
2058 # draw background 2068 # draw background
2059 $tex[1]->draw_quad (0, 0, $w, $h); 2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2060 2070
2061 # draw handle 2071 # draw handle
2062 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2063 2073
2064 glDisable GL_BLEND;
2065 glDisable GL_TEXTURE_2D; 2074 glDisable GL_TEXTURE_2D;
2066} 2075}
2067 2076
2068############################################################################# 2077#############################################################################
2069 2078
… …
2080 fontsize => 1, 2089 fontsize => 1,
2081 can_events => 0, 2090 can_events => 0,
2082 #font => default_font 2091 #font => default_font
2083 @_, 2092 @_,
2084 2093
2085 layout => (new CFClient::Layout), 2094 layout => (new CFClient::Layout 1),
2086 par => [], 2095 par => [],
2087 height => 0, 2096 height => 0,
2088 children => [ 2097 children => [
2089 (new CFClient::UI::Empty expand => 1), 2098 (new CFClient::UI::Empty expand => 1),
2090 (new CFClient::UI::Slider vertical => 1), 2099 (new CFClient::UI::Slider vertical => 1),
… …
2108 2117
2109 my $layout = $self->{layout}; 2118 my $layout = $self->{layout};
2110 2119
2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2112 $layout->set_width ($self->{children}[0]{w}); 2121 $layout->set_width ($self->{children}[0]{w});
2113 $layout->set_text ($text); 2122 $layout->set_markup ($text);
2114 2123
2115 ($layout->size)[1] 2124 ($layout->size)[1]
2116} 2125}
2117 2126
2118sub reflow { 2127sub reflow {
… …
2174 2183
2175 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2176 glClearColor 0, 0, 0, 0; 2185 glClearColor 0, 0, 0, 0;
2177 glClear GL_COLOR_BUFFER_BIT; 2186 glClear GL_COLOR_BUFFER_BIT;
2178 2187
2179 glEnable GL_BLEND;
2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2181 glEnable GL_TEXTURE_2D; 2188 glEnable GL_TEXTURE_2D;
2182 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2183 2190
2184 my $top = int $self->{children}[1]{range}[0]; 2191 my $top = int $self->{children}[1]{range}[0];
2185 2192
… …
2194 2201
2195 for my $par (@{$self->{par}}) { 2202 for my $par (@{$self->{par}}) {
2196 my $h = $par->[0]; 2203 my $h = $par->[0];
2197 2204
2198 if ($y0 < $y + $h && $y < $y1) { 2205 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] });
2199 $layout->set_text ($par->[2]); 2207 $layout->set_markup ($par->[2]);
2200 2208
2201 glColor @{ $par->[1] };
2202 my ($W, $H) = $layout->size; 2209 my ($W, $H) = $layout->size;
2203 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2204 } 2211 }
2205 2212
2206 $y += $h; 2213 $y += $h;
2207 } 2214 }
2208 2215
2209 glDisable GL_TEXTURE_2D; 2216 glDisable GL_TEXTURE_2D;
2210 glDisable GL_BLEND;
2211 }; 2217 };
2212 }); 2218 });
2213} 2219}
2214 2220
2215sub _draw { 2221sub _draw {
2216 my ($self) = @_; 2222 my ($self) = @_;
2217 2223
2218 glEnable GL_BLEND;
2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2220 glEnable GL_TEXTURE_2D; 2224 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 1, 1, 1, 1; 2226 glColor 1, 1, 1, 1;
2223 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2224 glDisable GL_TEXTURE_2D; 2228 glDisable GL_TEXTURE_2D;
2225 glDisable GL_BLEND;
2226 2229
2227 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2228 2231
2229} 2232}
2230 2233
… …
2324 @_, 2327 @_,
2325 can_events => 0, 2328 can_events => 0,
2326 ) 2329 )
2327} 2330}
2328 2331
2329sub set_markup { 2332sub set_tooltip_from {
2330 my ($self, $text) = @_; 2333 my ($self, $widget) = @_;
2331 2334
2332 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2335 $self->add (new CFClient::UI::Label
2333 $self->{label}->set_markup ($text); 2336 markup => $widget->{tooltip},
2334 $self->add ($self->{label}); 2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8,
2339 fg => [0, 0, 0, 1],
2340 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 );
2335} 2342}
2336 2343
2337sub size_request { 2344sub size_request {
2338 my ($self) = @_; 2345 my ($self) = @_;
2339
2340 $self->child->set_max_size ($::WIDTH * 0.3);
2341 2346
2342 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2343 2348
2344 ($w + 4, $h + 4) 2349 ($w + 4, $h + 4)
2345} 2350}
… …
2351} 2356}
2352 2357
2353sub _draw { 2358sub _draw {
2354 my ($self) = @_; 2359 my ($self) = @_;
2355 2360
2356 glPushMatrix;
2357 glTranslate 0.375, 0.375; 2361 glTranslate 0.375, 0.375;
2358 2362
2359 my ($w, $h) = @$self{qw(w h)}; 2363 my ($w, $h) = @$self{qw(w h)};
2360 2364
2361 glColor 1, 0.8, 0.4; 2365 glColor 1, 0.8, 0.4;
… …
2372 glVertex 0 , $h; 2376 glVertex 0 , $h;
2373 glVertex $w, $h; 2377 glVertex $w, $h;
2374 glVertex $w, 0; 2378 glVertex $w, 0;
2375 glEnd; 2379 glEnd;
2376 2380
2377 glPopMatrix; 2381 glTranslate 2 - 0.375, 2 - 0.375;
2378
2379 glTranslate 2, 2;
2380 $self->SUPER::_draw; 2382 $self->SUPER::_draw;
2381} 2383}
2382 2384
2383############################################################################# 2385#############################################################################
2384 2386
… …
2399 2401
2400sub size_request { 2402sub size_request {
2401 (32, 8) 2403 (32, 8)
2402} 2404}
2403 2405
2404sub draw { 2406sub _draw {
2405 my ($self) = @_; 2407 my ($self) = @_;
2406 2408
2409 return unless $::CONN;#d# manage and cache textures differently
2407 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2408 2411
2412 # TODO animation
2409 if ($tex) { 2413 if ($tex) {
2410 glEnable GL_BLEND;
2411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412 glEnable GL_TEXTURE_2D; 2414 glEnable GL_TEXTURE_2D;
2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2414 glColor 1, 1, 1, 1; 2416 glColor 1, 1, 1, 1;
2415 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2416 glDisable GL_TEXTURE_2D; 2418 glDisable GL_TEXTURE_2D;
2417 glDisable GL_BLEND;
2418 } 2419 }
2420}
2421
2422#############################################################################
2423
2424package CFClient::UI::InventoryItem;
2425
2426our @ISA = CFClient::UI::HBox::;
2427
2428sub new {
2429 my $class = shift;
2430
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new (
2441 can_hover => 1,
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487
2488#############################################################################
2489
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_,
2500 );
2501
2502 $self
2503}
2504
2505sub set_items {
2506 my ($self, $items) = @_;
2507
2508 $self->{scrolled}->clear;
2509 return unless $items;
2510
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2512
2513 $self->{real_items} = \@items;
2514
2515 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2521 }
2522
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524}
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Menu;
2534
2535our @ISA = CFClient::UI::FancyFrame::;
2536
2537use CFClient::OpenGL;
2538
2539sub new {
2540 my $class = shift;
2541
2542 my $self = $class->SUPER::new (
2543 items => [],
2544 z => 100,
2545 @_,
2546 );
2547
2548 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2549
2550 for my $item (@{ $self->{items} }) {
2551 my ($widget, $cb) = @$item;
2552
2553 # handle various types of items, only text for now
2554 if (!ref $widget) {
2555 $widget = new CFClient::UI::Label
2556 can_hover => 1,
2557 can_events => 1,
2558 text => $widget;
2559 }
2560
2561 $self->{item}{$widget} = $item;
2562
2563 $self->{vbox}->add ($widget);
2564 }
2565
2566 $self
2567}
2568
2569# popup given the event (must be a mouse button down event currently)
2570sub popup {
2571 my ($self, $ev) = @_;
2572
2573 $self->emit ("popdown");
2574
2575 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self;
2577 $self->{button} = $ev->{button};
2578
2579 $self->show;
2580 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2581}
2582
2583sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_;
2585
2586 # TODO: should use vbox->find_widget or so
2587 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2588 $self->{hover} = $self->{item}{$HOVER};
2589}
2590
2591sub button_up {
2592 my ($self, $ev, $x, $y) = @_;
2593
2594 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB;
2596 $self->hide;
2597
2598 $self->emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover};
2600 }
2601}
2602
2603#############################################################################
2604
2605package CFClient::UI::Statusbox;
2606
2607our @ISA = CFClient::UI::VBox::;
2608
2609sub reorder {
2610 my ($self) = @_;
2611 my $NOW = time;
2612
2613 while (my ($k, $v) = each %{ $self->{item} }) {
2614 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2615 }
2616
2617 my @widgets;
2618
2619 my @items = sort {
2620 $a->{pri} <=> $b->{pri}
2621 or $b->{id} <=> $a->{id}
2622 } values %{ $self->{item} };
2623
2624 my $count = 10 + 1;
2625 for my $item (@items) {
2626 last unless --$count;
2627
2628 push @widgets, $item->{label} ||= do {
2629 # TODO: doesn't handle markup well (read as: at all)
2630 my $short = $item->{count} > 1
2631 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text};
2633
2634 for ($short) {
2635 s/^\s+//;
2636 s/\012.*/…/s;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 }
2640
2641 new CFClient::UI::Label
2642 markup => $short,
2643 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize},
2647 color => $item->{color},
2648 can_events => 1,
2649 can_hover => 1
2650 };
2651 }
2652
2653 $self->clear;
2654 $self->SUPER::add (reverse @widgets);
2655}
2656
2657sub add {
2658 my ($self, $text, %arg) = @_;
2659
2660 my $timeout = time + ((delete $arg{timeout}) || 60);
2661
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663
2664 if (my $item = $self->{item}{$group}) {
2665 if ($item->{text} eq $text) {
2666 $item->{count}++;
2667 } else {
2668 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text;
2670 }
2671 $item->{timeout} = $timeout;
2672 delete $item->{label};
2673 } else {
2674 $self->{item}{$group} = {
2675 id => ++$self->{id},
2676 text => $text,
2677 timeout => $timeout,
2678 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0,
2682 count => 1,
2683 %arg,
2684 };
2685 }
2686
2687 $self->reorder;
2419} 2688}
2420 2689
2421############################################################################# 2690#############################################################################
2422 2691
2423package CFClient::UI::Root; 2692package CFClient::UI::Root;
2424 2693
2425our @ISA = CFClient::UI::Container::; 2694our @ISA = CFClient::UI::Container::;
2426 2695
2427use CFClient::OpenGL; 2696use CFClient::OpenGL;
2428 2697
2429sub check_size { 2698sub new {
2430 my ($self) = @_; 2699 my $class = shift;
2431 2700
2432 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2701 $class->SUPER::new (
2433} 2702 @_,
2434 2703 )
2435sub size_request {
2436 ($::WIDTH, $::HEIGHT)
2437} 2704}
2438 2705
2439sub configure { 2706sub configure {
2440 my ($self, $x, $y, $w, $h) = @_; 2707 my ($self, $x, $y, $w, $h) = @_;
2441 2708
2442 $self->SUPER::configure ($x, $y, $w, $h); 2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2443 2712
2713sub check_size {
2714 my ($self) = @_;
2715
2716 $self->size_allocate ($self->{w}, $self->{h})
2717 if $self->{w};
2718}
2719
2720sub size_request {
2721 my ($self) = @_;
2722
2723 ($self->{w}, $self->{h})
2724}
2725
2726sub size_allocate {
2727 my ($self, $w, $h) = @_;
2728
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744
2444 for my $child (@{$self->{children}}) { 2745 for my $child ($self->children) {
2445 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2446 2747
2447 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2748 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2448 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2449 $child->configure ($X, $Y, $W,$H); 2750 $child->configure ($X, $Y, $W, $H);
2450 } 2751 }
2451}
2452 2752
2453sub _topleft { 2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755}
2756
2757sub coord2local {
2454 my ($self, $x, $y) = @_; 2758 my ($self, $x, $y) = @_;
2455 2759
2456 ($x, $y) 2760 ($x, $y)
2457} 2761}
2458 2762
2763sub coord2global {
2764 my ($self, $x, $y) = @_;
2765
2766 ($x, $y)
2767}
2768
2459sub update { 2769sub update {
2460 my ($self) = @_; 2770 my ($self) = @_;
2461 2771
2462 $self->check_size; 2772 $self->check_size;
2463 ::refresh (); 2773 $::WANT_REFRESH++;
2464} 2774}
2465 2775
2466sub add { 2776sub add {
2467 my ($self, $child) = @_; 2777 my ($self, $child) = @_;
2468 2778
2469 # integerize window positions 2779 # integerise window positions
2470 $child->{x} = int $child->{x}; 2780 $child->{x} = int $child->{x};
2471 $child->{y} = int $child->{y}; 2781 $child->{y} = int $child->{y};
2472 2782
2473 $self->SUPER::add ($child); 2783 $self->SUPER::add ($child);
2474} 2784}
… …
2477 my ($self, $id, $cb) = @_; 2787 my ($self, $id, $cb) = @_;
2478 2788
2479 $self->{refresh_hook}{$id} = $cb; 2789 $self->{refresh_hook}{$id} = $cb;
2480} 2790}
2481 2791
2482sub draw { 2792sub draw {
2483 my ($self) = @_; 2793 my ($self) = @_;
2484 2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839
2485 while (my $rcb = delete $self->{refresh_hook}) { 2840 while ($self->{refresh_hook}) {
2486 $_->() for values %$rcb; 2841 $_->()
2842 for values %{delete $self->{refresh_hook}};
2487 } 2843 }
2488 2844
2489 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2845 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2490 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2491 glClear GL_COLOR_BUFFER_BIT; 2847 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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