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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.195 by root, Thu May 11 23:54:31 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_markup ($widget->{tooltip}); 29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 30
30 $TOOLTIP->show; 31 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
31 } 40 }
32 41
33 return; 42 return;
34 } 43 }
35 } 44 }
… …
224 $self->{y} = $y; 233 $self->{y} = $y;
225 $self->update; 234 $self->update;
226 } 235 }
227 236
228 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 239 }
235} 240}
236 241
237sub size_allocate { 242sub size_allocate {
238 # nothing to be done 243 # nothing to be done
239} 244}
240 245
246sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259}
260
241sub set_max_size { 261sub set_max_size {
242 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
243 263
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
246}
247
248# return top left coordinates
249sub _topleft {
250 my ($self, $x, $y) = @_;
251
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253} 266}
254 267
255# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
256sub coord2local { 269sub coord2local {
257 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
258 271
259 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 273}
262 274
263# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
264sub coord2global { 276sub coord2global {
265 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
266 278
267 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 280}
270 281
271sub focus_in { 282sub focus_in {
272 my ($self) = @_; 283 my ($self) = @_;
273 284
… …
371 382
372sub set_parent { 383sub set_parent {
373 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
374 385
375 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
376} 390}
377 391
378sub check_size { 392sub check_size {
379 my ($self) = @_; 393 my ($self) = @_;
380 394
381 $self->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 396}
403 397
404sub update { 398sub update {
405 my ($self) = @_; 399 my ($self) = @_;
406 400
… …
503 497
504 $self 498 $self
505} 499}
506 500
507sub add { 501sub add {
508 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
509 503
510 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
511 506
512 use sort 'stable'; 507 use sort 'stable';
513 508
514 $self->{children} = [ 509 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
517 ]; 512 ];
518 513
519 $child->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub children {
519 @{ $_[0]{children} }
520} 520}
521 521
522sub remove { 522sub remove {
523 my ($self, $child) = @_; 523 my ($self, $child) = @_;
524 524
… …
539 539
540 for (@$children) { 540 for (@$children) {
541 delete $_->{parent}; 541 delete $_->{parent};
542 $_->hide; 542 $_->hide;
543 } 543 }
544
545 $self->check_size;
546 $self->update;
544} 547}
545 548
546sub find_widget { 549sub find_widget {
547 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
548 551
… …
623} 626}
624 627
625sub update { 628sub update {
626 my ($self) = @_; 629 my ($self) = @_;
627 630
628 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 632 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 633}
642 634
643sub size_allocate { 635sub size_allocate {
644 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
645 637
646 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
647 641
642sub _render {
643 $_[0]{children}[0]->draw;
644}
645
646sub render_child {
647 my ($self) = @_;
648
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT;
652
648 $self->render_chld; 653 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 };
649} 662}
650 663
651sub _draw { 664sub _draw {
652 my ($self) = @_; 665 my ($self) = @_;
653 666
654 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
655 668
656 my $tex = $self->{texture} 669 my $tex = $self->{texture}
657 or return; 670 or return;
658 671
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1;
663 675
664 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 677
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
668} 679}
669 680
670############################################################################# 681#############################################################################
671 682
672package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
673 684
674our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
675 686
676sub new { die }
677
678sub size_request { 687sub size_request {
679 my ($self) = @_; 688 my ($self) = @_;
680 689
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
683 692
684 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
685} 694}
686 695
687sub _draw { 696sub size_allocate {
688 my ($self) = @_; 697 my ($self, $w, $h) = @_;
689 698
690 $self->{children}[1]->draw; 699 $self->update;
691} 700}
692 701
702sub set_offset {
703 my ($self, $x, $y) = @_;
704
705 $self->{view_x} = int $x;
706 $self->{view_y} = int $y;
707
708 $self->update;
709}
710
711# hmm, this does not work for topleft of $self... but we should not ask for that
712sub coord2local {
713 my ($self, $x, $y) = @_;
714
715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
725}
726
727sub find_widget {
728 my ($self, $x, $y) = @_;
729
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y)
736 }
737}
738
739sub _render {
740 my ($self) = @_;
741
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743
744 $self->SUPER::_render;
745}
746
747#############################################################################
748
749package CFClient::UI::ScrolledWindow;
750
751our @ISA = CFClient::UI::HBox::;
752
753sub new {
754 my $class = shift;
755
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort),
768 slider => $slider,
769 @_,
770 );
771
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
693 781
694############################################################################# 782#############################################################################
695 783
696package CFClient::UI::Frame; 784package CFClient::UI::Frame;
697 785
… …
754 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
755 843
756 my $self = $class->SUPER::new ( 844 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
759 border => 0.8, 847 border => 0.6,
760 can_events => 1, 848 can_events => 1,
761 @_ 849 @_
762 ); 850 );
763 851
764 $self->{title} &&= new CFClient::UI::Label 852 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 853 align => 0,
766 valign => 1, 854 valign => 1,
767 text => $self->{title}, 855 text => $self->{title},
768 fontsize => 1; 856 fontsize => $self->{border};
769 857
770 $self 858 $self
771} 859}
772 860
773sub border { 861sub border {
… …
798} 886}
799 887
800sub button_down { 888sub button_down {
801 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
802 890
891 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 892 my $border = $self->border;
804 893
805 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
810 901
902 my $mx = $x < $border;
903 my $my = $y < $border;
904
811 $self->{motion} = sub { 905 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
813 907
814 ($x, $y) = ($ev->{x}, $ev->{y}); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
815 910
816 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 914 $self->check_size;
819 }; 915 };
820 916
821 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
826 920
827 $self->{motion} = sub { 921 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
… …
864 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
868 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 964 my $bg = $tex[0];
870 965
871 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
874 969
875 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
876 971
877 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
881 976
882 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
884 980
885 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
886 $self->child->draw; 983 $self->child->draw;
887} 984}
888 985
889############################################################################# 986#############################################################################
890 987
… …
912 $self->{children}[$y][$x] = $child; 1009 $self->{children}[$y][$x] = $child;
913 1010
914 $child->check_size; 1011 $child->check_size;
915} 1012}
916 1013
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
917# TODO: move to container class maybe? send childs a signal on removal? 1018# TODO: move to container class maybe? send childs a signal on removal?
918sub clear { 1019sub clear {
919 my ($self) = @_; 1020 my ($self) = @_;
920 1021
921 my $children = delete $self->{children}; 1022 my @children = $self->children;
1023 delete $self->{children};
922 1024
923 for (grep $_, map @$_, grep $_, @$children) { 1025 for (@children) {
924 delete $_->{parent}; 1026 delete $_->{parent};
925 $_->hide; 1027 $_->hide;
926 } 1028 }
927 1029
928 $self->update; 1030 $self->update;
… …
1109} 1211}
1110 1212
1111sub size_allocate { 1213sub size_allocate {
1112 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1113 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1114 my $children = $self->{children}; 1218 my $children = $self->{children};
1115 1219
1116 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1117 1221
1118 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1157 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1158 1262
1159 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1161 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1162 fontsize => 1, 1269 fontsize => 1,
1163 text => "",
1164 align => -1, 1270 align => -1,
1165 valign => -1, 1271 valign => -1,
1166 padding => 2, 1272 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1273 can_events => 0,
1169 %arg 1274 %arg
1170 ); 1275 );
1171 1276
1172 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1280 $self->{template} = $layout;
1176 } 1281 }
1177 1282
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1180 1288
1181 $self 1289 $self
1182} 1290}
1183 1291
1184sub escape { 1292sub escape {
… …
1189 s/</&lt;/g; 1297 s/</&lt;/g;
1190 1298
1191 $_[1] 1299 $_[1]
1192} 1300}
1193 1301
1302sub update {
1303 my ($self) = @_;
1304
1305 delete $self->{texture};
1306 $self->SUPER::update;
1307}
1308
1194sub set_text { 1309sub set_text {
1195 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1196 1311
1312 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text";
1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1198 1317
1199 delete $self->{texture}; 1318 $self->update;
1200 $self->check_size; 1319 $self->check_size;
1201 $self->update;
1202} 1320}
1203 1321
1204sub set_markup { 1322sub set_markup {
1205 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1206 1324
1325 return if $self->{text} eq "M$markup";
1326 $self->{text} = "M$markup";
1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1208 1332
1209 delete $self->{texture}; 1333 $self->update;
1210 $self->check_size; 1334 $self->check_size;
1211 $self->update;
1212} 1335}
1213 1336
1214sub size_request { 1337sub size_request {
1215 my ($self) = @_; 1338 my ($self) = @_;
1216 1339
… …
1245sub set_fontsize { 1368sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1247 1370
1248 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1250 $self->check_size; 1375 $self->check_size;
1251 $self->update;
1252} 1376}
1253 1377
1254sub _draw { 1378sub _draw {
1255 my ($self) = @_; 1379 my ($self) = @_;
1256 1380
1257 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1261 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1262 }; 1398 };
1263 1399
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1402
1403 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1284 1409
1285 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1411}
1288 1412
1289############################################################################# 1413#############################################################################
1290 1414
1291package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1326 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1327 1451
1328 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1329} 1453}
1330 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1331sub get_text { 1464sub get_text {
1332 $_[0]{text} 1465 $_[0]{text}
1333} 1466}
1334 1467
1335sub size_request { 1468sub size_request {
… …
1342 1475
1343sub size_allocate { 1476sub size_allocate {
1344 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1345 1478
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355} 1480}
1356 1481
1357sub key_down { 1482sub key_down {
1358 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1359 1484
… …
1469 1594
1470 if ($sym == 13) { 1595 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1596 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1597 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1598 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1600 $self->emit (activate => $txt);
1475 $self->update; 1601 $self->update;
1476 1602
1477 } elsif ($sym == CFClient::SDLK_UP) { 1603 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1604 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1605 $self->{history_saveback} = $self->get_text;
1480 } 1606 }
1607 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1608 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1609 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1610 $self->{history_pointer} = @{$self->{history} || []} - 1;
1611 }
1612 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1613 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1614
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1615 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1616 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1617 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1618
… …
1544 1672
1545 if ($GRAB == $self) { 1673 if ($GRAB == $self) {
1546 $self->{fg} = $self->{active_fg}; 1674 $self->{fg} = $self->{active_fg};
1547 } 1675 }
1548 1676
1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D; 1677 glEnable GL_TEXTURE_2D;
1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1; 1679 glColor 0, 0, 0, 1;
1554 1680
1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1681 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556 1682
1557 glDisable GL_TEXTURE_2D; 1683 glDisable GL_TEXTURE_2D;
1558 glDisable GL_BLEND;
1559 1684
1560 $self->SUPER::_draw; 1685 $self->SUPER::_draw;
1561} 1686}
1562 1687
1563############################################################################# 1688#############################################################################
… …
1610 1735
1611 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1612 1737
1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614 1739
1615 glEnable GL_BLEND;
1616 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 1741
1619 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1620 1743
1621 $tex->draw_quad (0, 0, $s, $s); 1744 $tex->draw_quad_alpha (0, 0, $s, $s);
1622 1745
1623 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625} 1747}
1626 1748
1627############################################################################# 1749#############################################################################
1628 1750
1629package CFClient::UI::Image; 1751package CFClient::UI::Image;
… …
1672 glTranslate 0, -$self->{w}, 0; 1794 glTranslate 0, -$self->{w}, 0;
1673 1795
1674 ($w, $h) = ($h, $w); 1796 ($w, $h) = ($h, $w);
1675 } 1797 }
1676 1798
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1799 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 1801
1682 $tex->draw_quad (0, 0, $w, $h); 1802 $tex->draw_quad_alpha (0, 0, $w, $h);
1683 1803
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1686} 1805}
1687 1806
1688############################################################################# 1807#############################################################################
1689 1808
… …
1737} 1856}
1738 1857
1739sub set_max { 1858sub set_max {
1740 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1741 1860
1861 return if $self->{max_val} == $max;
1862
1742 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1743} 1865}
1744 1866
1745sub set_value { 1867sub set_value {
1746 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1747 1869
1748 $self->set_max ($max) 1870 $self->set_max ($max)
1749 if defined $max; 1871 if defined $max;
1750 1872
1751 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1752 $self->{val} = $val; 1875 $self->{val} = $val;
1753
1754 $self->update; 1876 $self->update;
1755} 1877}
1756 1878
1757sub _draw { 1879sub _draw {
1758 my ($self) = @_; 1880 my ($self) = @_;
… …
1821 1943
1822sub new { 1944sub new {
1823 my ($class, %arg) = @_; 1945 my ($class, %arg) = @_;
1824 1946
1825 my $self = $class->SUPER::new ( 1947 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 1948 tooltip => $arg{type},
1827 can_hover => 1, 1949 can_hover => 1,
1950 can_events => 1,
1828 %arg, 1951 %arg,
1829 ); 1952 );
1830 1953
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1954 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1840 1963
1841 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1843} 1966}
1844 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1845sub set_value { 1975sub set_value {
1846 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1847 1977
1848 $self->set_max ($max) 1978 $self->set_max ($max)
1849 if defined $max; 1979 if defined $max;
1850 1980
1851 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 1982 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 1983}
1861 1984
1862############################################################################# 1985#############################################################################
1863 1986
1864package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1883 # TODO: calculations are off 2006 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1886 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1887 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1888 req_w => 20, 2011 req_w => $::WIDTH / 80,
1889 req_h => 20, 2012 req_h => $::WIDTH / 80,
1890 vertical => 0, 2013 vertical => 0,
1891 can_hover => 1, 2014 can_hover => 1,
1892 inner_pad => 5, 2015 inner_pad => 5,
1893 @_ 2016 @_
1894 ); 2017 );
… …
1977 $page ||= 2; 2100 $page ||= 2;
1978 2101
1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981 2104
1982 glEnable GL_BLEND;
1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984 glEnable GL_TEXTURE_2D; 2105 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2107
1987 # draw background 2108 # draw background
1988 $tex[1]->draw_quad (0, 0, $w, $h); 2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1989 2110
1990 # draw handle 2111 # draw handle
1991 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1992 2113
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D; 2114 glDisable GL_TEXTURE_2D;
1995} 2115}
1996 2116
1997############################################################################# 2117#############################################################################
1998 2118
… …
2009 fontsize => 1, 2129 fontsize => 1,
2010 can_events => 0, 2130 can_events => 0,
2011 #font => default_font 2131 #font => default_font
2012 @_, 2132 @_,
2013 2133
2014 layout => (new CFClient::Layout), 2134 layout => (new CFClient::Layout 1),
2015 par => [], 2135 par => [],
2016 height => 0, 2136 height => 0,
2017 children => [ 2137 children => [
2018 (new CFClient::UI::Empty expand => 1), 2138 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2139 (new CFClient::UI::Slider vertical => 1),
2020 ], 2140 ],
2021 ); 2141 );
2022 2142
2023 $self->{children}[1]->connect (changed => sub { 2143 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2144
2027 $self 2145 $self
2028} 2146}
2029 2147
2030sub set_fontsize { 2148sub set_fontsize {
… …
2038 my ($self, $text) = @_; 2156 my ($self, $text) = @_;
2039 2157
2040 my $layout = $self->{layout}; 2158 my $layout = $self->{layout};
2041 2159
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w}); 2161 $layout->set_width ($self->{children}[0]{w});
2044 $layout->set_text ($text); 2162 $layout->set_markup ($text);
2045 2163
2046 ($layout->size)[1] 2164 ($layout->size)[1]
2047} 2165}
2048 2166
2049sub reflow { 2167sub reflow {
… …
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2102 2220
2103 delete $self->{texture}; 2221 delete $self->{texture};
2104 } 2222 }
2105 2223
2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2107 glClearColor 0, 0, 0, 1; 2225 glClearColor 0, 0, 0, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2226 glClear GL_COLOR_BUFFER_BIT;
2109 2227
2110 glEnable GL_BLEND;
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D; 2228 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114 2230
2115 my $top = int $self->{children}[1]{range}[0]; 2231 my $top = int $self->{children}[1]{range}[0];
2116 2232
… …
2125 2241
2126 for my $par (@{$self->{par}}) { 2242 for my $par (@{$self->{par}}) {
2127 my $h = $par->[0]; 2243 my $h = $par->[0];
2128 2244
2129 if ($y0 < $y + $h && $y < $y1) { 2245 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] });
2130 $layout->set_text ($par->[2]); 2247 $layout->set_markup ($par->[2]);
2131 2248
2132 glColor @{ $par->[1] };
2133 my ($W, $H) = $layout->size; 2249 my ($W, $H) = $layout->size;
2134 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2135 } 2251 }
2136 2252
2137 $y += $h; 2253 $y += $h;
2138 } 2254 }
2139 2255
2140 glDisable GL_TEXTURE_2D; 2256 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND;
2142 }; 2257 };
2143 }); 2258 });
2144} 2259}
2145 2260
2146sub _draw { 2261sub _draw {
2147 my ($self) = @_; 2262 my ($self) = @_;
2148 2263
2149 if ($self->{texture}) {
2150 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2266 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2153 glDisable GL_TEXTURE_2D; 2268 glDisable GL_TEXTURE_2D;
2154 }
2155 2269
2156 $self->{children}[1]->draw; 2270 $self->{children}[1]->draw;
2157 2271
2158} 2272}
2159 2273
… …
2254 can_events => 0, 2368 can_events => 0,
2255 ) 2369 )
2256} 2370}
2257 2371
2258sub set_markup { 2372sub set_markup {
2259 my ($self, $text) = @_; 2373 my ($self, $text, $font) = @_;
2260 2374
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2375 $self->{label} = new CFClient::UI::Label
2376 fontsize => 0.8,
2377 fg => [0, 0, 0],
2378 font => ($font || $::FONT_PROP);
2379
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2262 $self->{label}->set_markup ($text); 2381 $self->{label}->set_markup ($text);
2263 $self->add ($self->{label}); 2382 $self->add ($self->{label});
2264} 2383}
2265 2384
2266sub size_request { 2385sub size_request {
2267 my ($self) = @_; 2386 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270 2387
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2388 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272 2389
2273 ($w + 4, $h + 4) 2390 ($w + 4, $h + 4)
2274} 2391}
… …
2328 2445
2329sub size_request { 2446sub size_request {
2330 (32, 8) 2447 (32, 8)
2331} 2448}
2332 2449
2333sub draw { 2450sub _draw {
2334 my ($self) = @_; 2451 my ($self) = @_;
2335 2452
2453 return unless $::CONN;#d# manage and cache textures differently
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337 2455
2456 # TODO animation
2338 if ($tex) { 2457 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D; 2458 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1; 2460 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D; 2462 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND; 2463 }
2464}
2465
2466#############################################################################
2467
2468package CFClient::UI::InventoryItem;
2469
2470our @ISA = CFClient::UI::HBox::;
2471
2472sub new {
2473 my $class = shift;
2474
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new (
2485 can_hover => 1,
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_,
2544 );
2545
2546 $self
2547}
2548
2549sub set_items {
2550 my ($self, $items) = @_;
2551
2552 $self->{scrolled}->clear;
2553 return unless $items;
2554
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2556
2557 $self->{real_items} = \@items;
2558
2559 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2565 }
2566
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::Menu;
2578
2579our @ISA = CFClient::UI::FancyFrame::;
2580
2581use CFClient::OpenGL;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 items => [],
2588 z => 100,
2589 @_,
2590 );
2591
2592 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2593
2594 for my $item (@{ $self->{items} }) {
2595 my ($widget, $cb) = @$item;
2596
2597 # handle various types of items, only text for now
2598 if (!ref $widget) {
2599 $widget = new CFClient::UI::Label
2600 can_hover => 1,
2601 can_events => 1,
2602 text => $widget;
2603 }
2604
2605 $self->{item}{$widget} = $item;
2606
2607 $self->{vbox}->add ($widget);
2608 }
2609
2610 $self
2611}
2612
2613# popup given the event (must be a mouse button down event currently)
2614sub popup {
2615 my ($self, $ev) = @_;
2616
2617 $self->emit ("popdown");
2618
2619 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self;
2621 $self->{button} = $ev->{button};
2622
2623 $self->show;
2624 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2625}
2626
2627sub mouse_motion {
2628 my ($self, $ev, $x, $y) = @_;
2629
2630 # TODO: should use vbox->find_widget or so
2631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2632 $self->{hover} = $self->{item}{$HOVER};
2633}
2634
2635sub button_up {
2636 my ($self, $ev, $x, $y) = @_;
2637
2638 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB;
2640 $self->hide;
2641
2642 $self->emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover};
2644 }
2645}
2646
2647#############################################################################
2648
2649package CFClient::UI::Statusbox;
2650
2651our @ISA = CFClient::UI::VBox::;
2652
2653sub reorder {
2654 my ($self) = @_;
2655 my $NOW = time;
2656
2657 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 }
2660
2661 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2663 my $count = 10 + 1;
2664 for my $item (@items) {
2665 last unless --$count;
2666
2667 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text};
2670 for ($short) {
2671 s/^\s+//;
2672 s/\012.*//s;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 }
2676
2677 new CFClient::UI::Label
2678 markup => $short,
2679 tooltip => delete $item->{tooltip},
2680 fontsize => delete $item->{fontsize},
2681 color => delete $item->{color},
2682 can_events => 1,
2683 can_hover => 1,
2684 };
2685 }
2686
2687 $self->clear;
2688 $self->SUPER::add (@widgets);
2689}
2690
2691sub add {
2692 my ($self, $text, %arg) = @_;
2693
2694 my $item = {
2695 time => time,
2696 text => $text,
2697 timeout => 60,
2698 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8],
2701 %arg,
2347 } 2702 };
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708
2709 $self->reorder;
2348} 2710}
2349 2711
2350############################################################################# 2712#############################################################################
2351 2713
2352package CFClient::UI::Root; 2714package CFClient::UI::Root;
2353 2715
2354our @ISA = CFClient::UI::Container::; 2716our @ISA = CFClient::UI::Container::;
2355 2717
2356use CFClient::OpenGL; 2718use CFClient::OpenGL;
2357 2719
2358sub check_size { 2720sub new {
2359 my ($self) = @_; 2721 my $class = shift;
2360 2722
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2723 $class->SUPER::new (
2362} 2724 @_,
2363 2725 )
2364sub size_request {
2365 ($::WIDTH, $::HEIGHT)
2366} 2726}
2367 2727
2368sub configure { 2728sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 2729 my ($self, $x, $y, $w, $h) = @_;
2370 2730
2371 $self->SUPER::configure ($x, $y, $w, $h); 2731 $self->{w} = $w;
2732 $self->{h} = $h;
2733}
2372 2734
2735sub check_size {
2736 my ($self) = @_;
2737
2738 $self->size_allocate ($self->{w}, $self->{h})
2739 if $self->{w};
2740}
2741
2742sub size_request {
2743 my ($self) = @_;
2744
2745 ($self->{w}, $self->{h})
2746}
2747
2748sub size_allocate {
2749 my ($self, $w, $h) = @_;
2750
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2373 for my $child (@{$self->{children}}) { 2767 for my $child ($self->children) {
2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375 2769
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2770 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H); 2772 $child->configure ($X, $Y, $W, $H);
2379 } 2773 }
2380}
2381 2774
2382sub _topleft { 2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777}
2778
2779sub coord2local {
2383 my ($self, $x, $y) = @_; 2780 my ($self, $x, $y) = @_;
2384 2781
2385 ($x, $y) 2782 ($x, $y)
2386} 2783}
2387 2784
2785sub coord2global {
2786 my ($self, $x, $y) = @_;
2787
2788 ($x, $y)
2789}
2790
2388sub update { 2791sub update {
2389 my ($self) = @_; 2792 my ($self) = @_;
2390 2793
2391 $self->check_size; 2794 $self->check_size;
2392 ::refresh (); 2795 $::WANT_REFRESH++;
2393} 2796}
2394 2797
2395sub add { 2798sub add {
2396 my ($self, $child) = @_; 2799 my ($self, $child) = @_;
2397 2800
2398 # integerize window positions 2801 # integerise window positions
2399 $child->{x} = int $child->{x}; 2802 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y}; 2803 $child->{y} = int $child->{y};
2401 2804
2402 $self->SUPER::add ($child); 2805 $self->SUPER::add ($child);
2403} 2806}
… …
2406 my ($self, $id, $cb) = @_; 2809 my ($self, $id, $cb) = @_;
2407 2810
2408 $self->{refresh_hook}{$id} = $cb; 2811 $self->{refresh_hook}{$id} = $cb;
2409} 2812}
2410 2813
2411sub draw { 2814sub draw {
2412 my ($self) = @_; 2815 my ($self) = @_;
2413 2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860
2414 while (my $rcb = delete $self->{refresh_hook}) { 2861 while ($self->{refresh_hook}) {
2415 $_->() for values %$rcb; 2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2416 } 2864 }
2417 2865
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2866 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 2868 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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