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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.200 by root, Sat May 13 00:27:09 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 (1);
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 # TODO: req_w _does_change after ->reconfigure
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
… …
651} 628}
652 629
653sub update { 630sub update {
654 my ($self) = @_; 631 my ($self) = @_;
655 632
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 634 $self->SUPER::update;
658} 635}
659 636
660sub size_allocate { 637sub size_allocate {
661 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
662 639
663 $self->SUPER::size_allocate ($w, $h); 640 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 641 $self->update;
642}
643
644sub _render {
645 $_[0]{children}[0]->draw;
665} 646}
666 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
781#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll
783
784#############################################################################
785
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use CFClient::OpenGL;
791
792sub new {
793 my $class = shift;
794
795 $class->SUPER::new (
796 bg => undef,
797 @_,
798 )
799}
800
749sub _draw { 801sub _draw {
750 my ($self) = @_; 802 my ($self) = @_;
751 803
752 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
753 806
754 glEnable GL_BLEND; 807 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 810
759# glBegin GL_QUADS; 811 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 812 glVertex 0 , 0;
762# glVertex 0 , $h; 813 glVertex 0 , $h;
763# glVertex $w, $h; 814 glVertex $w, $h;
764# glVertex $w, 0; 815 glVertex $w, 0;
765# glEnd; 816 glEnd;
766 817
767
768 $self->child->draw;
769 glDisable GL_BLEND; 818 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
771} 822}
772 823
773############################################################################# 824#############################################################################
774 825
775package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
891 my ($self) = @_; 942 my ($self) = @_;
892 943
893 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 946
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 949
901 my $border = $self->border; 950 my $border = $self->border;
902 951
903 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 957
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 959 my $bg = $tex[0];
911 960
912 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
… …
916 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
917 966
918 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
922 972
923 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 974
927 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
928 976
929 $self->child->draw; 977 $self->child->draw;
930} 978}
… …
1157} 1205}
1158 1206
1159sub size_allocate { 1207sub size_allocate {
1160 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1161 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1162 my $children = $self->{children}; 1212 my $children = $self->{children};
1163 1213
1164 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1165 1215
1166 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1205 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1206 1256
1207 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1209 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1210 fontsize => 1, 1263 fontsize => 1,
1211 text => "",
1212 align => -1, 1264 align => -1,
1213 valign => -1, 1265 valign => -1,
1214 padding => 2, 1266 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1267 can_events => 0,
1217 %arg 1268 %arg
1218 ); 1269 );
1219 1270
1220 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1274 $self->{template} = $layout;
1224 } 1275 }
1225 1276
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1278 $self->set_markup (delete $self->{markup});
1279 } else {
1280 $self->set_text (delete $self->{text});
1281 }
1228 1282
1229 $self 1283 $self
1230} 1284}
1231 1285
1232sub escape { 1286sub escape {
… …
1244 1298
1245 delete $self->{texture}; 1299 delete $self->{texture};
1246 $self->SUPER::update; 1300 $self->SUPER::update;
1247} 1301}
1248 1302
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1303sub set_text {
1256 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1257 1305
1258 return if $self->{text} eq "T$text"; 1306 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1307 $self->{text} = "T$text";
1260 1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1262 1311
1263 delete $self->{texture};
1264 $self->update; 1312 $self->update;
1265 $self->check_size; 1313 $self->check_size;
1266} 1314}
1267 1315
1268sub set_markup { 1316sub set_markup {
1269 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1270 1318
1271 return if $self->{text} eq "M$markup"; 1319 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1320 $self->{text} = "M$markup";
1273 1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1275 1326
1276 delete $self->{texture};
1277 $self->update; 1327 $self->update;
1278 $self->check_size; 1328 $self->check_size;
1279} 1329}
1280 1330
1281sub size_request { 1331sub size_request {
… …
1312sub set_fontsize { 1362sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1314 1364
1315 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1317 $self->check_size; 1369 $self->check_size;
1318 $self->update;
1319} 1370}
1320 1371
1321sub _draw { 1372sub _draw {
1322 my ($self) = @_; 1373 my ($self) = @_;
1323 1374
1324 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1380
1328 new_from_layout CFClient::Texture $self->{layout} 1381 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1329 }; 1392 };
1330 1393
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1396
1397 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1351 1403
1352 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1405}
1355 1406
1356############################################################################# 1407#############################################################################
1357 1408
1358package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1393 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1394 1445
1395 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1396} 1447}
1397 1448
1449sub set_text {
1450 my ($self, $text) = @_;
1451
1452 $self->{cursor} = length $text;
1453 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456}
1457
1398sub get_text { 1458sub get_text {
1399 $_[0]{text} 1459 $_[0]{text}
1400} 1460}
1401 1461
1402sub size_request { 1462sub size_request {
… …
1409 1469
1410sub size_allocate { 1470sub size_allocate {
1411 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1412 1472
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1474}
1423 1475
1424sub key_down { 1476sub key_down {
1425 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1426 1478
… …
1428 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1430 1482
1431 my $text = $self->get_text; 1483 my $text = $self->get_text;
1432 1484
1433 if ($sym == 8) { 1485 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1498 $self->emit ('escape');
1447 } elsif ($uni) { 1499 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1501 }
1450 1502
… …
1614 1666
1615 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1617 } 1669 }
1618 1670
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1624 1674
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1676
1627 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1678
1630 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1631} 1680}
1632 1681
1633############################################################################# 1682#############################################################################
… …
1680 1729
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1682 1731
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1733
1685 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1686 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1739}
1696 1740
1697############################################################################# 1741#############################################################################
1698 1742
1699package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1743 1787
1744 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1745 } 1789 }
1746 1790
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1793
1752 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1795
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1756} 1797}
1757 1798
1758############################################################################# 1799#############################################################################
1759 1800
… …
1957 # TODO: calculations are off 1998 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1961 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1962 req_w => 20, 2003 req_w => $::WIDTH / 80,
1963 req_h => 20, 2004 req_h => $::WIDTH / 80,
1964 vertical => 0, 2005 vertical => 0,
1965 can_hover => 1, 2006 can_hover => 1,
1966 inner_pad => 5, 2007 inner_pad => 5,
1967 @_ 2008 @_
1968 ); 2009 );
… …
2051 $page ||= 2; 2092 $page ||= 2;
2052 2093
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055 2096
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2099
2061 # draw background 2100 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2063 2102
2064 # draw handle 2103 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2066 2105
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
2069} 2107}
2070 2108
2071############################################################################# 2109#############################################################################
2072 2110
… …
2083 fontsize => 1, 2121 fontsize => 1,
2084 can_events => 0, 2122 can_events => 0,
2085 #font => default_font 2123 #font => default_font
2086 @_, 2124 @_,
2087 2125
2088 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
2089 par => [], 2127 par => [],
2090 height => 0, 2128 height => 0,
2091 children => [ 2129 children => [
2092 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
… …
2111 2149
2112 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
2113 2151
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w}); 2153 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text); 2154 $layout->set_markup ($text);
2117 2155
2118 ($layout->size)[1] 2156 ($layout->size)[1]
2119} 2157}
2120 2158
2121sub reflow { 2159sub reflow {
… …
2159 2197
2160 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2161 2199
2162 delete $self->{texture}; 2200 delete $self->{texture};
2163 2201
2164 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2165 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2204 my $height = 0;
2167 2205
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2169 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2177 2215
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2179 glClearColor 0, 0, 0, 0; 2217 glClearColor 0, 0, 0, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2181 2219
2182 glEnable GL_BLEND;
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186 2222
2187 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2188 2224
… …
2197 2233
2198 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2235 my $h = $par->[0];
2200 2236
2201 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2202 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2203 2240
2204 glColor @{ $par->[1] };
2205 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2207 } 2243 }
2208 2244
2209 $y += $h; 2245 $y += $h;
2210 } 2246 }
2211 2247
2212 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND;
2214 }; 2249 };
2215 }); 2250 });
2216} 2251}
2217 2252
2218sub _draw { 2253sub _draw {
2219 my ($self) = @_; 2254 my ($self) = @_;
2220 2255
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2258 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2261
2230 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2231 2263
2232} 2264}
2233 2265
… …
2327 @_, 2359 @_,
2328 can_events => 0, 2360 can_events => 0,
2329 ) 2361 )
2330} 2362}
2331 2363
2332sub set_markup { 2364sub set_tooltip_from {
2333 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2334 2366
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2368 markup => $widget->{tooltip},
2337 $self->add ($self->{label}); 2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8,
2371 fg => [0, 0, 0, 1],
2372 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 );
2338} 2374}
2339 2375
2340sub size_request { 2376sub size_request {
2341 my ($self) = @_; 2377 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2378
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2380
2347 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2348} 2382}
… …
2354} 2388}
2355 2389
2356sub _draw { 2390sub _draw {
2357 my ($self) = @_; 2391 my ($self) = @_;
2358 2392
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2361 2394
2362 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2363 2396
2364 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2408 glVertex 0 , $h;
2376 glVertex $w, $h; 2409 glVertex $w, $h;
2377 glVertex $w, 0; 2410 glVertex $w, 0;
2378 glEnd; 2411 glEnd;
2379 2412
2380 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2384} 2415}
2385 2416
2386############################################################################# 2417#############################################################################
2387 2418
… …
2405} 2436}
2406 2437
2407sub _draw { 2438sub _draw {
2408 my ($self) = @_; 2439 my ($self) = @_;
2409 2440
2441 return unless $::CONN;#d# manage and cache textures differently
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411 2443
2412 # TODO animation 2444 # TODO animation
2413 if ($tex) { 2445 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2446 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2448 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2451 }
2452}
2453
2454#############################################################################
2455
2456package CFClient::UI::InventoryItem;
2457
2458our @ISA = CFClient::UI::HBox::;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2423} 2561}
2424 2562
2425############################################################################# 2563#############################################################################
2426 2564
2427package CFClient::UI::Menu; 2565package CFClient::UI::Menu;
… …
2475} 2613}
2476 2614
2477sub mouse_motion { 2615sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2616 my ($self, $ev, $x, $y) = @_;
2479 2617
2480 # TODO: should use vbox->fdind_widget or so 2618 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2620 $self->{hover} = $self->{item}{$HOVER};
2483} 2621}
2484 2622
2485sub button_up { 2623sub button_up {
… …
2494 } 2632 }
2495} 2633}
2496 2634
2497############################################################################# 2635#############################################################################
2498 2636
2637package CFClient::UI::Statusbox;
2638
2639our @ISA = CFClient::UI::VBox::;
2640
2641sub reorder {
2642 my ($self) = @_;
2643 my $NOW = time;
2644
2645 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 }
2648
2649 my @widgets;
2650
2651 my @items = sort {
2652 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} };
2655
2656 my $count = 10 + 1;
2657 for my $item (@items) {
2658 last unless --$count;
2659
2660 push @widgets, $item->{label} ||= do {
2661 # TODO: doesn't handle markup well (read as: at all)
2662 my $short = $item->{count} > 1
2663 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text};
2665
2666 for ($short) {
2667 s/^\s+//;
2668 s/\012.*/…/s;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 }
2672
2673 new CFClient::UI::Label
2674 markup => $short,
2675 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize},
2679 color => $item->{color},
2680 can_events => 1,
2681 can_hover => 1
2682 };
2683 }
2684
2685 $self->clear;
2686 $self->SUPER::add (reverse @widgets);
2687}
2688
2689sub add {
2690 my ($self, $text, %arg) = @_;
2691
2692 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//;
2694
2695 my $timeout = time + ((delete $arg{timeout}) || 60);
2696
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698
2699 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) {
2701 $item->{count}++;
2702 } else {
2703 $item->{count} = 1;
2704 $item->{text} = $item->{tooltip} = $text;
2705 }
2706 $item->{id} = ++$self->{id};
2707 $item->{timeout} = $timeout;
2708 delete $item->{label};
2709 } else {
2710 $self->{item}{$group} = {
2711 id => ++$self->{id},
2712 text => $text,
2713 timeout => $timeout,
2714 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0,
2718 count => 1,
2719 %arg,
2720 };
2721 }
2722
2723 $self->reorder;
2724}
2725
2726#############################################################################
2727
2499package CFClient::UI::Root; 2728package CFClient::UI::Root;
2500 2729
2501our @ISA = CFClient::UI::Container::; 2730our @ISA = CFClient::UI::Container::;
2502 2731
2503use CFClient::OpenGL; 2732use CFClient::OpenGL;
2504 2733
2505sub check_size { 2734sub new {
2506 my ($self) = @_; 2735 my $class = shift;
2507 2736
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2737 $class->SUPER::new (
2509} 2738 @_,
2510 2739 )
2511sub size_request {
2512 ($::WIDTH, $::HEIGHT)
2513} 2740}
2514 2741
2515sub configure { 2742sub configure {
2516 my ($self, $x, $y, $w, $h) = @_; 2743 my ($self, $x, $y, $w, $h) = @_;
2517 2744
2518 $self->SUPER::configure ($x, $y, $w, $h); 2745 $self->{w} = $w;
2746 $self->{h} = $h;
2747}
2519 2748
2749sub check_size {
2750 my ($self) = @_;
2751
2752 $self->size_allocate ($self->{w}, $self->{h})
2753 if $self->{w};
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758
2759 ($self->{w}, $self->{h})
2760}
2761
2762sub size_allocate {
2763 my ($self, $w, $h) = @_;
2764
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780
2520 for my $child (@{$self->{children}}) { 2781 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 2783
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2784 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2525 $child->configure ($X, $Y, $W,$H); 2786 $child->configure ($X, $Y, $W, $H);
2526 } 2787 }
2527}
2528 2788
2529sub _topleft { 2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791}
2792
2793sub coord2local {
2530 my ($self, $x, $y) = @_; 2794 my ($self, $x, $y) = @_;
2531 2795
2532 ($x, $y) 2796 ($x, $y)
2533} 2797}
2534 2798
2799sub coord2global {
2800 my ($self, $x, $y) = @_;
2801
2802 ($x, $y)
2803}
2804
2535sub update { 2805sub update {
2536 my ($self) = @_; 2806 my ($self) = @_;
2537 2807
2538 $self->check_size; 2808 $self->check_size;
2539 ::refresh (); 2809 $::WANT_REFRESH++;
2540} 2810}
2541 2811
2542sub add { 2812sub add {
2543 my ($self, $child) = @_; 2813 my ($self, $child) = @_;
2544 2814
2545 # integerize window positions 2815 # integerise window positions
2546 $child->{x} = int $child->{x}; 2816 $child->{x} = int $child->{x};
2547 $child->{y} = int $child->{y}; 2817 $child->{y} = int $child->{y};
2548 2818
2549 $self->SUPER::add ($child); 2819 $self->SUPER::add ($child);
2550} 2820}
… …
2553 my ($self, $id, $cb) = @_; 2823 my ($self, $id, $cb) = @_;
2554 2824
2555 $self->{refresh_hook}{$id} = $cb; 2825 $self->{refresh_hook}{$id} = $cb;
2556} 2826}
2557 2827
2828sub on_post_alloc {
2829 my ($self, $id, $cb) = @_;
2830
2831 $self->{post_alloc_hook}{$id} = $cb;
2832}
2833
2558sub draw { 2834sub draw {
2559 my ($self) = @_; 2835 my ($self) = @_;
2560 2836
2561 while (my $rcb = delete $self->{refresh_hook}) { 2837 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 2838 $_->()
2839 for values %{delete $self->{refresh_hook}};
2840 }
2841
2842 if ($self->{check_size}) {
2843 my @queue = ([], []);
2844
2845 for (;;) {
2846 if ($self->{check_size}) {
2847 # heuristic: check containers last
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2849 for values %{delete $self->{check_size}}
2850 }
2851
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2853
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2855 ? @$widget{qw(user_w user_h)}
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861
2862 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h;
2864
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2866
2867 $widget->{parent}->check_size
2868 if $widget->{parent};
2869 }
2870 }
2871 }
2872
2873 while ($self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) {
2875 my ($widget, $w, $h) = @$_;
2876
2877 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0;
2879
2880 $widget->{w} = $w;
2881 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h);
2883 $widget->emit (size_allocate => $w, $h);
2884 }
2885 }
2886
2887 while ($self->{post_alloc_hook}) {
2888 $_->()
2889 for values %{delete $self->{post_alloc_hook}};
2563 } 2890 }
2564 2891
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2892 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 2894 glClear GL_COLOR_BUFFER_BIT;
… …
2575 $self->_draw; 2902 $self->_draw;
2576} 2903}
2577 2904
2578############################################################################# 2905#############################################################################
2579 2906
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 2907package CFClient::UI;
2688 2908
2689$ROOT = new CFClient::UI::Root; 2909$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 2910$TOOLTIP = new CFClient::UI::Tooltip;
2691 2911

Diff Legend

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