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

Diff Legend

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