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

Diff Legend

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