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.169 by elmex, Mon Apr 24 10:43: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
… …
503 496
504 $self 497 $self
505} 498}
506 499
507sub add { 500sub add {
508 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
509 502
510 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
511 505
512 use sort 'stable'; 506 use sort 'stable';
513 507
514 $self->{children} = [ 508 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
517 ]; 511 ];
518 512
519 $child->check_size; 513 $self->check_size;
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
520} 519}
521 520
522sub remove { 521sub remove {
523 my ($self, $child) = @_; 522 my ($self, $child) = @_;
524 523
… …
539 538
540 for (@$children) { 539 for (@$children) {
541 delete $_->{parent}; 540 delete $_->{parent};
542 $_->hide; 541 $_->hide;
543 } 542 }
543
544 $self->check_size;
545 $self->update;
544} 546}
545 547
546sub find_widget { 548sub find_widget {
547 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
548 550
… …
623} 625}
624 626
625sub update { 627sub update {
626 my ($self) = @_; 628 my ($self) = @_;
627 629
628 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 631 $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} 632}
642 633
643sub size_allocate { 634sub size_allocate {
644 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
645 636
646 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
647 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
648 $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 };
649} 661}
650 662
651sub _draw { 663sub _draw {
652 my ($self) = @_; 664 my ($self) = @_;
653 665
654 my ($w, $h) = ($self->w, $self->h); 666 my ($w, $h) = ($self->w, $self->h);
655 667
656 my $tex = $self->{texture} 668 my $tex = $self->{texture}
657 or return; 669 or return;
658 670
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 671 glEnable GL_TEXTURE_2D;
662 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;
663 674
664 $tex->draw_quad (0, 0, $w, $h); 675 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 676
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 677 glDisable GL_TEXTURE_2D;
668} 678}
669 679
670############################################################################# 680#############################################################################
671 681
672package CFClient::UI::ViewPort; 682package CFClient::UI::ViewPort;
673 683
674our @ISA = CFClient::UI::Window::; 684our @ISA = CFClient::UI::Window::;
675 685
676sub new { die }
677
678sub size_request { 686sub size_request {
679 my ($self) = @_; 687 my ($self) = @_;
680 688
681 @$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)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 690 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
683 691
684 @$self{qw(child_w child_h)} 692 @$self{qw(child_w child_h)}
685} 693}
686 694
687sub _draw { 695sub size_allocate {
688 my ($self) = @_; 696 my ($self, $w, $h) = @_;
689 697
690 $self->{children}[1]->draw; 698 $self->update;
691} 699}
692 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
693 780
694############################################################################# 781#############################################################################
695 782
696package CFClient::UI::Frame; 783package CFClient::UI::Frame;
697 784
… …
754 # TODO: user_x, user_y, overwrite moveto? 841 # TODO: user_x, user_y, overwrite moveto?
755 842
756 my $self = $class->SUPER::new ( 843 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 844 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 845 border_bg => [1, 1, 1, 1],
759 border => 0.8, 846 border => 0.6,
760 can_events => 1, 847 can_events => 1,
761 @_ 848 @_
762 ); 849 );
763 850
764 $self->{title} &&= new CFClient::UI::Label 851 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 852 align => 0,
766 valign => 1, 853 valign => 1,
767 text => $self->{title}, 854 text => $self->{title},
768 fontsize => 1; 855 fontsize => $self->{border};
769 856
770 $self 857 $self
771} 858}
772 859
773sub border { 860sub border {
… …
798} 885}
799 886
800sub button_down { 887sub button_down {
801 my ($self, $ev, $x, $y) = @_; 888 my ($self, $ev, $x, $y) = @_;
802 889
890 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 891 my $border = $self->border;
804 892
805 if ($x < $self->{w} && $x >= $self->{w} - $border 893 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 894 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 895
896 if ($lr & $td) {
897 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 898 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 899 my ($bw, $bh) = ($self->{w}, $self->{h});
810 900
901 my $mx = $x < $border;
902 my $my = $y < $border;
903
811 $self->{motion} = sub { 904 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 905 my ($ev, $x, $y) = @_;
813 906
814 ($x, $y) = ($ev->{x}, $ev->{y}); 907 my $dx = $ev->{x} - $ox;
908 my $dy = $ev->{y} - $oy;
815 909
816 $self->{user_w} = $bw + $x - $ox; 910 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 911 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
912 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 913 $self->check_size;
819 }; 914 };
820 915
821 } elsif ($x >= 0 && $x < $self->{w} 916 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 918 my ($bx, $by) = ($self->{x}, $self->{y});
826 919
827 $self->{motion} = sub { 920 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 921 my ($ev, $x, $y) = @_;
… …
864 $tex[1]->draw_quad (0, 0, $w, $border); 957 $tex[1]->draw_quad (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 958 $tex[3]->draw_quad (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 960 $tex[4]->draw_quad (0, $h - $border, $w, $border);
868 961
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 963 my $bg = $tex[0];
870 964
871 # TODO: repeat texture not scale 965 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 966 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 967 my $rep_y = $ch / $bg->{h};
874 968
875 glColor @{ $self->{bg} }; 969 glColor @{ $self->{bg} };
876 970
877 $bg->{s} = $rep_x; 971 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 972 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 973 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 974 $bg->draw_quad ($border, $border, $cw, $ch);
881 975
882 glDisable GL_TEXTURE_2D; 976 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND; 977 glDisable GL_BLEND;
978 }
884 979
885 $self->{title}->draw if $self->{title}; 980 $self->{title}->draw if $self->{title};
981
886 $self->child->draw; 982 $self->child->draw;
887} 983}
888 984
889############################################################################# 985#############################################################################
890 986
… …
912 $self->{children}[$y][$x] = $child; 1008 $self->{children}[$y][$x] = $child;
913 1009
914 $child->check_size; 1010 $child->check_size;
915} 1011}
916 1012
1013sub children {
1014 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1015}
1016
917# 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?
918sub clear { 1018sub clear {
919 my ($self) = @_; 1019 my ($self) = @_;
920 1020
921 my $children = delete $self->{children}; 1021 my @children = $self->children;
1022 delete $self->{children};
922 1023
923 for (grep $_, map @$_, grep $_, @$children) { 1024 for (@children) {
924 delete $_->{parent}; 1025 delete $_->{parent};
925 $_->hide; 1026 $_->hide;
926 } 1027 }
927 1028
928 $self->update; 1029 $self->update;
… …
1109} 1210}
1110 1211
1111sub size_allocate { 1212sub size_allocate {
1112 my ($self, $w, $h) = @_; 1213 my ($self, $w, $h) = @_;
1113 1214
1215 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1216
1114 my $children = $self->{children}; 1217 my $children = $self->{children};
1115 1218
1116 my @h = map $_->{req_h}, @$children; 1219 my @h = map $_->{req_h}, @$children;
1117 1220
1118 my $req_h = List::Util::sum @h; 1221 my $req_h = List::Util::sum @h;
… …
1157 my ($class, %arg) = @_; 1260 my ($class, %arg) = @_;
1158 1261
1159 my $self = $class->SUPER::new ( 1262 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1263 fg => [1, 1, 1],
1161 #font => default_font 1264 #font => default_font
1265 #text => initial text
1266 #markup => initial narkup
1267 layout => (new CFClient::Layout),
1162 fontsize => 1, 1268 fontsize => 1,
1163 text => "",
1164 align => -1, 1269 align => -1,
1165 valign => -1, 1270 valign => -1,
1166 padding => 2, 1271 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1272 can_events => 0,
1169 %arg 1273 %arg
1170 ); 1274 );
1171 1275
1172 if (exists $self->{template}) { 1276 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1277 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1278 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1279 $self->{template} = $layout;
1176 } 1280 }
1177 1281
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1282 if (exists $self->{markup}) {
1179 $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 }
1180 1287
1181 $self 1288 $self
1182} 1289}
1183 1290
1184sub escape { 1291sub escape {
… …
1189 s/</&lt;/g; 1296 s/</&lt;/g;
1190 1297
1191 $_[1] 1298 $_[1]
1192} 1299}
1193 1300
1301sub update {
1302 my ($self) = @_;
1303
1304 delete $self->{texture};
1305 $self->SUPER::update;
1306}
1307
1194sub set_text { 1308sub set_text {
1195 my ($self, $text) = @_; 1309 my ($self, $text) = @_;
1196 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;
1197 $self->{layout}->set_text ($text); 1315 $self->{layout}->set_text ($text);
1198 1316
1199 delete $self->{texture}; 1317 $self->update;
1200 $self->check_size; 1318 $self->check_size;
1201 $self->update;
1202} 1319}
1203 1320
1204sub set_markup { 1321sub set_markup {
1205 my ($self, $markup) = @_; 1322 my ($self, $markup) = @_;
1206 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;
1207 $self->{layout}->set_markup ($markup); 1330 $self->{layout}->set_markup ($markup);
1208 1331
1209 delete $self->{texture}; 1332 $self->update;
1210 $self->check_size; 1333 $self->check_size;
1211 $self->update;
1212} 1334}
1213 1335
1214sub size_request { 1336sub size_request {
1215 my ($self) = @_; 1337 my ($self) = @_;
1216 1338
… …
1245sub set_fontsize { 1367sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1368 my ($self, $fontsize) = @_;
1247 1369
1248 $self->{fontsize} = $fontsize; 1370 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1371 delete $self->{texture};
1372
1373 $self->update;
1250 $self->check_size; 1374 $self->check_size;
1251 $self->update;
1252} 1375}
1253 1376
1254sub _draw { 1377sub _draw {
1255 my ($self) = @_; 1378 my ($self) = @_;
1256 1379
1257 my $tex = $self->{texture} ||= do { 1380 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1382 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1383 $self->{layout}->set_width ($self->{w});
1260 $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
1261 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
1262 }; 1397 };
1263 1398
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1399 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1401
1402 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1403 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}); 1404 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1405 } else {
1406 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1407 }
1284 1408
1285 glDisable GL_TEXTURE_2D; 1409 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1410}
1288 1411
1289############################################################################# 1412#############################################################################
1290 1413
1291package CFClient::UI::EntryBase; 1414package CFClient::UI::EntryBase;
… …
1326 $self->{layout}->set_text ("$text "); 1449 $self->{layout}->set_text ("$text ");
1327 1450
1328 $self->emit (changed => $self->{text}); 1451 $self->emit (changed => $self->{text});
1329} 1452}
1330 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
1331sub get_text { 1463sub get_text {
1332 $_[0]{text} 1464 $_[0]{text}
1333} 1465}
1334 1466
1335sub size_request { 1467sub size_request {
… …
1342 1474
1343sub size_allocate { 1475sub size_allocate {
1344 my ($self, $w, $h) = @_; 1476 my ($self, $w, $h) = @_;
1345 1477
1346 $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
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355} 1479}
1356 1480
1357sub key_down { 1481sub key_down {
1358 my ($self, $ev) = @_; 1482 my ($self, $ev) = @_;
1359 1483
… …
1547 1671
1548 if ($GRAB == $self) { 1672 if ($GRAB == $self) {
1549 $self->{fg} = $self->{active_fg}; 1673 $self->{fg} = $self->{active_fg};
1550 } 1674 }
1551 1675
1552 glEnable GL_BLEND;
1553 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1554 glEnable GL_TEXTURE_2D; 1676 glEnable GL_TEXTURE_2D;
1555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1556 glColor 0, 0, 0, 1; 1678 glColor 0, 0, 0, 1;
1557 1679
1558 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1680 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1559 1681
1560 glDisable GL_TEXTURE_2D; 1682 glDisable GL_TEXTURE_2D;
1561 glDisable GL_BLEND;
1562 1683
1563 $self->SUPER::_draw; 1684 $self->SUPER::_draw;
1564} 1685}
1565 1686
1566############################################################################# 1687#############################################################################
… …
1613 1734
1614 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;
1615 1736
1616 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1617 1738
1618 glEnable GL_BLEND;
1619 glEnable GL_TEXTURE_2D; 1739 glEnable GL_TEXTURE_2D;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 1740
1622 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1623 1742
1624 $tex->draw_quad (0, 0, $s, $s); 1743 $tex->draw_quad_alpha (0, 0, $s, $s);
1625 1744
1626 glDisable GL_TEXTURE_2D; 1745 glDisable GL_TEXTURE_2D;
1627 glDisable GL_BLEND;
1628} 1746}
1629 1747
1630############################################################################# 1748#############################################################################
1631 1749
1632package CFClient::UI::Image; 1750package CFClient::UI::Image;
… …
1675 glTranslate 0, -$self->{w}, 0; 1793 glTranslate 0, -$self->{w}, 0;
1676 1794
1677 ($w, $h) = ($h, $w); 1795 ($w, $h) = ($h, $w);
1678 } 1796 }
1679 1797
1680 glEnable GL_BLEND;
1681 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1682 glEnable GL_TEXTURE_2D; 1798 glEnable GL_TEXTURE_2D;
1683 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1684 1800
1685 $tex->draw_quad (0, 0, $w, $h); 1801 $tex->draw_quad_alpha (0, 0, $w, $h);
1686 1802
1687 glDisable GL_BLEND;
1688 glDisable GL_TEXTURE_2D; 1803 glDisable GL_TEXTURE_2D;
1689} 1804}
1690 1805
1691############################################################################# 1806#############################################################################
1692 1807
… …
1740} 1855}
1741 1856
1742sub set_max { 1857sub set_max {
1743 my ($self, $max) = @_; 1858 my ($self, $max) = @_;
1744 1859
1860 return if $self->{max_val} == $max;
1861
1745 $self->{max_val} = $max; 1862 $self->{max_val} = $max;
1863 $self->update;
1746} 1864}
1747 1865
1748sub set_value { 1866sub set_value {
1749 my ($self, $val, $max) = @_; 1867 my ($self, $val, $max) = @_;
1750 1868
1751 $self->set_max ($max) 1869 $self->set_max ($max)
1752 if defined $max; 1870 if defined $max;
1753 1871
1754 $max = $self->{max_val}; 1872 return if $self->{val} == $val;
1873
1755 $self->{val} = $val; 1874 $self->{val} = $val;
1756
1757 $self->update; 1875 $self->update;
1758} 1876}
1759 1877
1760sub _draw { 1878sub _draw {
1761 my ($self) = @_; 1879 my ($self) = @_;
… …
1824 1942
1825sub new { 1943sub new {
1826 my ($class, %arg) = @_; 1944 my ($class, %arg) = @_;
1827 1945
1828 my $self = $class->SUPER::new ( 1946 my $self = $class->SUPER::new (
1829 tooltip => $arg{type}, 1947 tooltip => $arg{type},
1830 can_hover => 1, 1948 can_hover => 1,
1949 can_events => 1,
1831 %arg, 1950 %arg,
1832 ); 1951 );
1833 1952
1834 $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");
1835 $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);
… …
1843 1962
1844 $self->{value}->set_fontsize ($fsize); 1963 $self->{value}->set_fontsize ($fsize);
1845 $self->{max} ->set_fontsize ($fsize); 1964 $self->{max} ->set_fontsize ($fsize);
1846} 1965}
1847 1966
1967sub set_max {
1968 my ($self, $max) = @_;
1969
1970 $self->{gauge}->set_max ($max);
1971 $self->{max}->set_text ($max);
1972}
1973
1848sub set_value { 1974sub set_value {
1849 my ($self, $val, $max) = @_; 1975 my ($self, $val, $max) = @_;
1850 1976
1851 $self->set_max ($max) 1977 $self->set_max ($max)
1852 if defined $max; 1978 if defined $max;
1853 1979
1854 $self->{gauge}->set_value ($val, $max); 1980 $self->{gauge}->set_value ($val, $max);
1855 $self->{value}->set_text ($val); 1981 $self->{value}->set_text ($val);
1856}
1857
1858sub set_max {
1859 my ($self, $max) = @_;
1860
1861 $self->{gauge}->set_max ($max);
1862 $self->{max}->set_text ($max);
1863} 1982}
1864 1983
1865############################################################################# 1984#############################################################################
1866 1985
1867package CFClient::UI::Slider; 1986package CFClient::UI::Slider;
… …
1886 # TODO: calculations are off 2005 # TODO: calculations are off
1887 my $self = $class->SUPER::new ( 2006 my $self = $class->SUPER::new (
1888 fg => [1, 1, 1], 2007 fg => [1, 1, 1],
1889 active_fg => [0, 0, 0], 2008 active_fg => [0, 0, 0],
1890 range => [0, 0, 100, 10], 2009 range => [0, 0, 100, 10],
1891 req_w => 20, 2010 req_w => $::WIDTH / 80,
1892 req_h => 20, 2011 req_h => $::WIDTH / 80,
1893 vertical => 0, 2012 vertical => 0,
1894 can_hover => 1, 2013 can_hover => 1,
1895 inner_pad => 5, 2014 inner_pad => 5,
1896 @_ 2015 @_
1897 ); 2016 );
… …
1980 $page ||= 2; 2099 $page ||= 2;
1981 2100
1982 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1983 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1984 2103
1985 glEnable GL_BLEND;
1986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1987 glEnable GL_TEXTURE_2D; 2104 glEnable GL_TEXTURE_2D;
1988 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1989 2106
1990 # draw background 2107 # draw background
1991 $tex[1]->draw_quad (0, 0, $w, $h); 2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1992 2109
1993 # draw handle 2110 # draw handle
1994 $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);
1995 2112
1996 glDisable GL_BLEND;
1997 glDisable GL_TEXTURE_2D; 2113 glDisable GL_TEXTURE_2D;
1998} 2114}
1999 2115
2000############################################################################# 2116#############################################################################
2001 2117
… …
2012 fontsize => 1, 2128 fontsize => 1,
2013 can_events => 0, 2129 can_events => 0,
2014 #font => default_font 2130 #font => default_font
2015 @_, 2131 @_,
2016 2132
2017 layout => (new CFClient::Layout), 2133 layout => (new CFClient::Layout 1),
2018 par => [], 2134 par => [],
2019 height => 0, 2135 height => 0,
2020 children => [ 2136 children => [
2021 (new CFClient::UI::Empty expand => 1), 2137 (new CFClient::UI::Empty expand => 1),
2022 (new CFClient::UI::Slider vertical => 1), 2138 (new CFClient::UI::Slider vertical => 1),
2023 ], 2139 ],
2024 ); 2140 );
2025 2141
2026 $self->{children}[1]->connect (changed => sub { 2142 $self->{children}[1]->connect (changed => sub { $self->update });
2027 $self->update;
2028 });
2029 2143
2030 $self 2144 $self
2031} 2145}
2032 2146
2033sub set_fontsize { 2147sub set_fontsize {
… …
2041 my ($self, $text) = @_; 2155 my ($self, $text) = @_;
2042 2156
2043 my $layout = $self->{layout}; 2157 my $layout = $self->{layout};
2044 2158
2045 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2159 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2046 $layout->set_width ($self->{w}); 2160 $layout->set_width ($self->{children}[0]{w});
2047 $layout->set_text ($text); 2161 $layout->set_markup ($text);
2048 2162
2049 ($layout->size)[1] 2163 ($layout->size)[1]
2050} 2164}
2051 2165
2052sub reflow { 2166sub reflow {
… …
2104 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2218 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2105 2219
2106 delete $self->{texture}; 2220 delete $self->{texture};
2107 } 2221 }
2108 2222
2109 $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 {
2110 glClearColor 0, 0, 0, 1; 2224 glClearColor 0, 0, 0, 0;
2111 glClear GL_COLOR_BUFFER_BIT; 2225 glClear GL_COLOR_BUFFER_BIT;
2112 2226
2113 glEnable GL_BLEND;
2114 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2115 glEnable GL_TEXTURE_2D; 2227 glEnable GL_TEXTURE_2D;
2116 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2117 2229
2118 my $top = int $self->{children}[1]{range}[0]; 2230 my $top = int $self->{children}[1]{range}[0];
2119 2231
… …
2128 2240
2129 for my $par (@{$self->{par}}) { 2241 for my $par (@{$self->{par}}) {
2130 my $h = $par->[0]; 2242 my $h = $par->[0];
2131 2243
2132 if ($y0 < $y + $h && $y < $y1) { 2244 if ($y0 < $y + $h && $y < $y1) {
2245 $layout->set_foreground (@{ $par->[1] });
2133 $layout->set_text ($par->[2]); 2246 $layout->set_markup ($par->[2]);
2134 2247
2135 glColor @{ $par->[1] };
2136 my ($W, $H) = $layout->size; 2248 my ($W, $H) = $layout->size;
2137 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);
2138 } 2250 }
2139 2251
2140 $y += $h; 2252 $y += $h;
2141 } 2253 }
2142 2254
2143 glDisable GL_TEXTURE_2D; 2255 glDisable GL_TEXTURE_2D;
2144 glDisable GL_BLEND;
2145 }; 2256 };
2146 }); 2257 });
2147} 2258}
2148 2259
2149sub _draw { 2260sub _draw {
2150 my ($self) = @_; 2261 my ($self) = @_;
2151 2262
2152 if ($self->{texture}) {
2153 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 $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});
2156 glDisable GL_TEXTURE_2D; 2267 glDisable GL_TEXTURE_2D;
2157 }
2158 2268
2159 $self->{children}[1]->draw; 2269 $self->{children}[1]->draw;
2160 2270
2161} 2271}
2162 2272
… …
2256 @_, 2366 @_,
2257 can_events => 0, 2367 can_events => 0,
2258 ) 2368 )
2259} 2369}
2260 2370
2261sub set_markup { 2371sub set_tooltip_from {
2262 my ($self, $text) = @_; 2372 my ($self, $widget) = @_;
2263 2373
2264 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2374 $self->{label} = new CFClient::UI::Label
2265 $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
2266 $self->add ($self->{label}); 2381 $self->add ($self->{label});
2267} 2382}
2268 2383
2269sub size_request { 2384sub size_request {
2270 my ($self) = @_; 2385 my ($self) = @_;
2271
2272 $self->child->set_max_size ($::WIDTH * 0.3);
2273 2386
2274 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2387 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2275 2388
2276 ($w + 4, $h + 4) 2389 ($w + 4, $h + 4)
2277} 2390}
… …
2331 2444
2332sub size_request { 2445sub size_request {
2333 (32, 8) 2446 (32, 8)
2334} 2447}
2335 2448
2336sub draw { 2449sub _draw {
2337 my ($self) = @_; 2450 my ($self) = @_;
2338 2451
2452 return unless $::CONN;#d# manage and cache textures differently
2339 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2453 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2340 2454
2455 # TODO animation
2341 if ($tex) { 2456 if ($tex) {
2342 glEnable GL_BLEND;
2343 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2344 glEnable GL_TEXTURE_2D; 2457 glEnable GL_TEXTURE_2D;
2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2346 glColor 1, 1, 1, 1; 2459 glColor 1, 1, 1, 1;
2347 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2348 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2349 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,
2350 } 2703 };
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709
2710 $self->reorder;
2351} 2711}
2352 2712
2353############################################################################# 2713#############################################################################
2354 2714
2355package CFClient::UI::Root; 2715package CFClient::UI::Root;
2356 2716
2357our @ISA = CFClient::UI::Container::; 2717our @ISA = CFClient::UI::Container::;
2358 2718
2359use CFClient::OpenGL; 2719use CFClient::OpenGL;
2360 2720
2361sub check_size { 2721sub new {
2362 my ($self) = @_; 2722 my $class = shift;
2363 2723
2364 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2724 $class->SUPER::new (
2365} 2725 @_,
2366 2726 )
2367sub size_request {
2368 ($::WIDTH, $::HEIGHT)
2369} 2727}
2370 2728
2371sub configure { 2729sub configure {
2372 my ($self, $x, $y, $w, $h) = @_; 2730 my ($self, $x, $y, $w, $h) = @_;
2373 2731
2374 $self->SUPER::configure ($x, $y, $w, $h); 2732 $self->{w} = $w;
2733 $self->{h} = $h;
2734}
2375 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
2376 for my $child (@{$self->{children}}) { 2768 for my $child ($self->children) {
2377 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)};
2378 2770
2379 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2771 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2380 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2772 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2381 $child->configure ($X, $Y, $W,$H); 2773 $child->configure ($X, $Y, $W, $H);
2382 } 2774 }
2383}
2384 2775
2385sub _topleft { 2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778}
2779
2780sub coord2local {
2386 my ($self, $x, $y) = @_; 2781 my ($self, $x, $y) = @_;
2387 2782
2388 ($x, $y) 2783 ($x, $y)
2389} 2784}
2390 2785
2786sub coord2global {
2787 my ($self, $x, $y) = @_;
2788
2789 ($x, $y)
2790}
2791
2391sub update { 2792sub update {
2392 my ($self) = @_; 2793 my ($self) = @_;
2393 2794
2394 $self->check_size; 2795 $self->check_size;
2395 ::refresh (); 2796 $::WANT_REFRESH++;
2396} 2797}
2397 2798
2398sub add { 2799sub add {
2399 my ($self, $child) = @_; 2800 my ($self, $child) = @_;
2400 2801
2401 # integerize window positions 2802 # integerise window positions
2402 $child->{x} = int $child->{x}; 2803 $child->{x} = int $child->{x};
2403 $child->{y} = int $child->{y}; 2804 $child->{y} = int $child->{y};
2404 2805
2405 $self->SUPER::add ($child); 2806 $self->SUPER::add ($child);
2406} 2807}
… …
2409 my ($self, $id, $cb) = @_; 2810 my ($self, $id, $cb) = @_;
2410 2811
2411 $self->{refresh_hook}{$id} = $cb; 2812 $self->{refresh_hook}{$id} = $cb;
2412} 2813}
2413 2814
2414sub draw { 2815sub draw {
2415 my ($self) = @_; 2816 my ($self) = @_;
2416 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
2417 while (my $rcb = delete $self->{refresh_hook}) { 2862 while ($self->{refresh_hook}) {
2418 $_->() for values %$rcb; 2863 $_->()
2864 for values %{delete $self->{refresh_hook}};
2419 } 2865 }
2420 2866
2421 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2867 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2422 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2423 glClear GL_COLOR_BUFFER_BIT; 2869 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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