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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.194 by root, Thu May 11 23:41:47 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
… …
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_markup ($widget->{tooltip}); 29 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 30
30 $TOOLTIP->show; 31 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
31 } 40 }
32 41
33 return; 42 return;
34 } 43 }
35 } 44 }
… …
224 $self->{y} = $y; 233 $self->{y} = $y;
225 $self->update; 234 $self->update;
226 } 235 }
227 236
228 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 239 }
235} 240}
236 241
237sub size_allocate { 242sub size_allocate {
238 # nothing to be done 243 # nothing to be done
239} 244}
240 245
241sub children { 246sub children {
242} 247}
243 248
244# call when resoltuion changes etc. 249# call when resolution changes etc.
245sub reconfigure { 250sub reconfigure {
246 my ($self) = @_; 251 my ($self) = @_;
247 252
248 $_->reconfigure 253 $_->reconfigure
249 for $self->children; 254 for $self->children;
250 255
251 $_->check_size; 256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
252} 259}
253 260
254sub set_max_size { 261sub set_max_size {
255 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
256 263
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
259}
260
261# return top left coordinates
262sub _topleft {
263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
267
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
269} 266}
270 267
271# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
272sub coord2local { 269sub coord2local {
273 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
274 271
275 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 273}
278 274
279# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
280sub coord2global { 276sub coord2global {
281 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
282 278
283 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 280}
286 281
287sub focus_in { 282sub focus_in {
288 my ($self) = @_; 283 my ($self) = @_;
289 284
… …
387 382
388sub set_parent { 383sub set_parent {
389 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
390 385
391 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
392} 390}
393 391
394sub check_size { 392sub check_size {
395 my ($self) = @_; 393 my ($self) = @_;
396 394
397 $self->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398 or return 1;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 396}
419 397
420sub update { 398sub update {
421 my ($self) = @_; 399 my ($self) = @_;
422 400
… …
519 497
520 $self 498 $self
521} 499}
522 500
523sub add { 501sub add {
524 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
525 503
526 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
527 506
528 use sort 'stable'; 507 use sort 'stable';
529 508
530 $self->{children} = [ 509 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
533 ]; 512 ];
534 513
535 $child->check_size; 514 $self->check_size;
515 $self->update;
536} 516}
537 517
538sub children { 518sub children {
539 @{ $_[0]{children} } 519 @{ $_[0]{children} }
540} 520}
… …
559 539
560 for (@$children) { 540 for (@$children) {
561 delete $_->{parent}; 541 delete $_->{parent};
562 $_->hide; 542 $_->hide;
563 } 543 }
544
545 $self->check_size;
546 $self->update;
564} 547}
565 548
566sub find_widget { 549sub find_widget {
567 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
568 551
… …
643} 626}
644 627
645sub update { 628sub update {
646 my ($self) = @_; 629 my ($self) = @_;
647 630
648 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 632 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 633}
662 634
663sub size_allocate { 635sub size_allocate {
664 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
665 637
666 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
667 641
642sub _render {
643 $_[0]{children}[0]->draw;
644}
645
646sub render_child {
647 my ($self) = @_;
648
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT;
652
668 $self->render_chld; 653 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 };
669} 662}
670 663
671sub _draw { 664sub _draw {
672 my ($self) = @_; 665 my ($self) = @_;
673 666
674 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
675 668
676 my $tex = $self->{texture} 669 my $tex = $self->{texture}
677 or return; 670 or return;
678 671
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1;
683 675
684 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 677
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
688} 679}
689 680
690############################################################################# 681#############################################################################
691 682
692package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
693 684
694our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
695 686
696sub new { die }
697
698sub size_request { 687sub size_request {
699 my ($self) = @_; 688 my ($self) = @_;
700 689
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
703 692
704 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
705} 694}
706 695
707sub _draw { 696sub size_allocate {
708 my ($self) = @_; 697 my ($self, $w, $h) = @_;
709 698
710 $self->{children}[1]->draw; 699 $self->update;
711} 700}
712 701
702sub set_offset {
703 my ($self, $x, $y) = @_;
704
705 $self->{view_x} = int $x;
706 $self->{view_y} = int $y;
707
708 $self->update;
709}
710
711# hmm, this does not work for topleft of $self... but we should not ask for that
712sub coord2local {
713 my ($self, $x, $y) = @_;
714
715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
725}
726
727sub find_widget {
728 my ($self, $x, $y) = @_;
729
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y)
736 }
737}
738
739sub _render {
740 my ($self) = @_;
741
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743
744 $self->SUPER::_render;
745}
746
747#############################################################################
748
749package CFClient::UI::ScrolledWindow;
750
751our @ISA = CFClient::UI::HBox::;
752
753sub new {
754 my $class = shift;
755
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort),
768 slider => $slider,
769 @_,
770 );
771
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
713 781
714############################################################################# 782#############################################################################
715 783
716package CFClient::UI::Frame; 784package CFClient::UI::Frame;
717 785
… …
774 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
775 843
776 my $self = $class->SUPER::new ( 844 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
779 border => 0.8, 847 border => 0.6,
780 can_events => 1, 848 can_events => 1,
781 @_ 849 @_
782 ); 850 );
783 851
784 $self->{title} &&= new CFClient::UI::Label 852 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 853 align => 0,
786 valign => 1, 854 valign => 1,
787 text => $self->{title}, 855 text => $self->{title},
788 fontsize => 1; 856 fontsize => $self->{border};
789 857
790 $self 858 $self
791} 859}
792 860
793sub border { 861sub border {
… …
818} 886}
819 887
820sub button_down { 888sub button_down {
821 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
822 890
891 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 892 my $border = $self->border;
824 893
825 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
830 901
902 my $mx = $x < $border;
903 my $my = $y < $border;
904
831 $self->{motion} = sub { 905 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
833 907
834 ($x, $y) = ($ev->{x}, $ev->{y}); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
835 910
836 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 914 $self->check_size;
839 }; 915 };
840 916
841 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
846 920
847 $self->{motion} = sub { 921 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
… …
884 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
888 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 964 my $bg = $tex[0];
890 965
891 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
894 969
895 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
896 971
897 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
901 976
902 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
904 980
905 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
906 $self->child->draw; 983 $self->child->draw;
907} 984}
908 985
909############################################################################# 986#############################################################################
910 987
… …
1134} 1211}
1135 1212
1136sub size_allocate { 1213sub size_allocate {
1137 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1138 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1139 my $children = $self->{children}; 1218 my $children = $self->{children};
1140 1219
1141 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1142 1221
1143 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1182 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1183 1262
1184 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1186 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1187 fontsize => 1, 1269 fontsize => 1,
1188 text => "",
1189 align => -1, 1270 align => -1,
1190 valign => -1, 1271 valign => -1,
1191 padding => 2, 1272 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1273 can_events => 0,
1194 %arg 1274 %arg
1195 ); 1275 );
1196 1276
1197 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1280 $self->{template} = $layout;
1201 } 1281 }
1202 1282
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1205 1288
1206 $self 1289 $self
1207} 1290}
1208 1291
1209sub escape { 1292sub escape {
… …
1221 1304
1222 delete $self->{texture}; 1305 delete $self->{texture};
1223 $self->SUPER::update; 1306 $self->SUPER::update;
1224} 1307}
1225 1308
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1309sub set_text {
1233 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1234 1311
1235 return if $self->{text} eq "T$text"; 1312 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1313 $self->{text} = "T$text";
1237 1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1239 1317
1240 delete $self->{texture};
1241 $self->update; 1318 $self->update;
1242 $self->check_size; 1319 $self->check_size;
1243} 1320}
1244 1321
1245sub set_markup { 1322sub set_markup {
1246 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1247 1324
1248 return if $self->{text} eq "M$markup"; 1325 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1326 $self->{text} = "M$markup";
1250 1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1252 1332
1253 delete $self->{texture};
1254 $self->update; 1333 $self->update;
1255 $self->check_size; 1334 $self->check_size;
1256} 1335}
1257 1336
1258sub size_request { 1337sub size_request {
… …
1289sub set_fontsize { 1368sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1291 1370
1292 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1294 $self->check_size; 1375 $self->check_size;
1295 $self->update;
1296} 1376}
1297 1377
1298sub _draw { 1378sub _draw {
1299 my ($self) = @_; 1379 my ($self) = @_;
1300 1380
1301 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1305 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1306 }; 1398 };
1307 1399
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1402
1403 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1328 1409
1329 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1411}
1332 1412
1333############################################################################# 1413#############################################################################
1334 1414
1335package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1370 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1371 1451
1372 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1373} 1453}
1374 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1375sub get_text { 1464sub get_text {
1376 $_[0]{text} 1465 $_[0]{text}
1377} 1466}
1378 1467
1379sub size_request { 1468sub size_request {
… …
1386 1475
1387sub size_allocate { 1476sub size_allocate {
1388 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1389 1478
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399} 1480}
1400 1481
1401sub key_down { 1482sub key_down {
1402 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1403 1484
… …
1934 # TODO: calculations are off 2015 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2016 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2017 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2018 active_fg => [0, 0, 0],
1938 range => [0, 0, 100, 10], 2019 range => [0, 0, 100, 10],
1939 req_w => 20, 2020 req_w => $::WIDTH / 80,
1940 req_h => 20, 2021 req_h => $::WIDTH / 80,
1941 vertical => 0, 2022 vertical => 0,
1942 can_hover => 1, 2023 can_hover => 1,
1943 inner_pad => 5, 2024 inner_pad => 5,
1944 @_ 2025 @_
1945 ); 2026 );
… …
2069 (new CFClient::UI::Empty expand => 1), 2150 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2151 (new CFClient::UI::Slider vertical => 1),
2071 ], 2152 ],
2072 ); 2153 );
2073 2154
2074 $self->{children}[1]->connect (changed => sub { 2155 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2156
2078 $self 2157 $self
2079} 2158}
2080 2159
2081sub set_fontsize { 2160sub set_fontsize {
… …
2089 my ($self, $text) = @_; 2168 my ($self, $text) = @_;
2090 2169
2091 my $layout = $self->{layout}; 2170 my $layout = $self->{layout};
2092 2171
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w}); 2173 $layout->set_width ($self->{children}[0]{w});
2095 $layout->set_text ($text); 2174 $layout->set_text ($text);
2096 2175
2097 ($layout->size)[1] 2176 ($layout->size)[1]
2098} 2177}
2099 2178
… …
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153 2232
2154 delete $self->{texture}; 2233 delete $self->{texture};
2155 } 2234 }
2156 2235
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2158 glClearColor 0, 0, 0, 1; 2237 glClearColor 0, 0, 0, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2238 glClear GL_COLOR_BUFFER_BIT;
2160 2239
2161 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
… …
2195} 2274}
2196 2275
2197sub _draw { 2276sub _draw {
2198 my ($self) = @_; 2277 my ($self) = @_;
2199 2278
2200 if ($self->{texture}) { 2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2201 glEnable GL_TEXTURE_2D; 2281 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2283 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2284 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2285 glDisable GL_TEXTURE_2D;
2206 } 2286 glDisable GL_BLEND;
2207 2287
2208 $self->{children}[1]->draw; 2288 $self->{children}[1]->draw;
2209 2289
2210} 2290}
2211 2291
… …
2380 2460
2381sub size_request { 2461sub size_request {
2382 (32, 8) 2462 (32, 8)
2383} 2463}
2384 2464
2385sub draw { 2465sub _draw {
2386 my ($self) = @_; 2466 my ($self) = @_;
2387 2467
2468 return unless $::CONN;#d# manage and cache textures differently
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389 2470
2471 # TODO animation
2390 if ($tex) { 2472 if ($tex) {
2391 glEnable GL_BLEND; 2473 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2475 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2399 } 2481 }
2400} 2482}
2401 2483
2402############################################################################# 2484#############################################################################
2403 2485
2486package CFClient::UI::InventoryItem;
2487
2488our @ISA = CFClient::UI::HBox::;
2489
2490sub new {
2491 my $class = shift;
2492
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new (
2503 can_hover => 1,
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_,
2562 );
2563
2564 $self
2565}
2566
2567sub set_items {
2568 my ($self, $items) = @_;
2569
2570 $self->{scrolled}->clear;
2571 return unless $items;
2572
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2574
2575 $self->{real_items} = \@items;
2576
2577 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2583 }
2584
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591}
2592
2593#############################################################################
2594
2595package CFClient::UI::Menu;
2596
2597our @ISA = CFClient::UI::FancyFrame::;
2598
2599use CFClient::OpenGL;
2600
2601sub new {
2602 my $class = shift;
2603
2604 my $self = $class->SUPER::new (
2605 items => [],
2606 z => 100,
2607 @_,
2608 );
2609
2610 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2611
2612 for my $item (@{ $self->{items} }) {
2613 my ($widget, $cb) = @$item;
2614
2615 # handle various types of items, only text for now
2616 if (!ref $widget) {
2617 $widget = new CFClient::UI::Label
2618 can_hover => 1,
2619 can_events => 1,
2620 text => $widget;
2621 }
2622
2623 $self->{item}{$widget} = $item;
2624
2625 $self->{vbox}->add ($widget);
2626 }
2627
2628 $self
2629}
2630
2631# popup given the event (must be a mouse button down event currently)
2632sub popup {
2633 my ($self, $ev) = @_;
2634
2635 $self->emit ("popdown");
2636
2637 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self;
2639 $self->{button} = $ev->{button};
2640
2641 $self->show;
2642 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2643}
2644
2645sub mouse_motion {
2646 my ($self, $ev, $x, $y) = @_;
2647
2648 # TODO: should use vbox->find_widget or so
2649 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2650 $self->{hover} = $self->{item}{$HOVER};
2651}
2652
2653sub button_up {
2654 my ($self, $ev, $x, $y) = @_;
2655
2656 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB;
2658 $self->hide;
2659
2660 $self->emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover};
2662 }
2663}
2664
2665#############################################################################
2666
2667package CFClient::UI::Statusbox;
2668
2669our @ISA = CFClient::UI::VBox::;
2670
2671sub reorder {
2672 my ($self) = @_;
2673 my $NOW = time;
2674
2675 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 }
2678
2679 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2681 my $count = 10 + 1;
2682 for my $item (@items) {
2683 last unless --$count;
2684
2685 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text};
2688 for ($short) {
2689 s/^\s+//;
2690 s/\012.*//s;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 }
2694
2695 new CFClient::UI::Label
2696 markup => $short,
2697 tooltip => delete $item->{tooltip},
2698 fontsize => delete $item->{fontsize},
2699 color => delete $item->{color},
2700 can_events => 1,
2701 can_hover => 1,
2702 };
2703 }
2704
2705 $self->clear;
2706 $self->SUPER::add (@widgets);
2707}
2708
2709sub add {
2710 my ($self, $text, %arg) = @_;
2711
2712 my $item = {
2713 time => time,
2714 text => $text,
2715 timeout => 60,
2716 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8],
2719 %arg,
2720 };
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726
2727 $self->reorder;
2728}
2729
2730#############################################################################
2731
2404package CFClient::UI::Root; 2732package CFClient::UI::Root;
2405 2733
2406our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2407 2735
2408use CFClient::OpenGL; 2736use CFClient::OpenGL;
2409 2737
2410sub check_size { 2738sub new {
2411 my ($self) = @_; 2739 my $class = shift;
2412 2740
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2741 $class->SUPER::new (
2414} 2742 @_,
2415 2743 )
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418} 2744}
2419 2745
2420sub configure { 2746sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 2747 my ($self, $x, $y, $w, $h) = @_;
2422 2748
2423 $self->SUPER::configure ($x, $y, $w, $h); 2749 $self->{w} = $w;
2750 $self->{h} = $h;
2751}
2424 2752
2753sub check_size {
2754 my ($self) = @_;
2755
2756 $self->size_allocate ($self->{w}, $self->{h})
2757 if $self->{w};
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762
2763 ($self->{w}, $self->{h})
2764}
2765
2766sub size_allocate {
2767 my ($self, $w, $h) = @_;
2768
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784
2425 for my $child (@{$self->{children}}) { 2785 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 2787
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430 $child->configure ($X, $Y, $W,$H); 2790 $child->configure ($X, $Y, $W, $H);
2431 } 2791 }
2432}
2433 2792
2434sub _topleft { 2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2435 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2436 2799
2437 ($x, $y) 2800 ($x, $y)
2438} 2801}
2439 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2440sub update { 2809sub update {
2441 my ($self) = @_; 2810 my ($self) = @_;
2442 2811
2443 $self->check_size; 2812 $self->check_size;
2444 ::refresh (); 2813 $::WANT_REFRESH++;
2445} 2814}
2446 2815
2447sub add { 2816sub add {
2448 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2449 2818
2450 # integerize window positions 2819 # integerise window positions
2451 $child->{x} = int $child->{x}; 2820 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 2821 $child->{y} = int $child->{y};
2453 2822
2454 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2455} 2824}
… …
2458 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2459 2828
2460 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2461} 2830}
2462 2831
2463sub draw { 2832sub draw {
2464 my ($self) = @_; 2833 my ($self) = @_;
2465 2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878
2466 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2468 } 2882 }
2469 2883
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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