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.165 by root, Mon Apr 24 08:22:22 2006 UTC vs.
Revision 1.192 by root, Tue May 9 22:49:32 2006 UTC

… …
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_markup ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
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
… …
370} 380}
371 381
372sub set_parent { 382sub set_parent {
373 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
374 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
375 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
376} 387}
377 388
378sub check_size { 389sub check_size {
379 my ($self) = @_; 390 my ($self) = @_;
380 391
381 $self->{parent} 392 $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} 393}
403 394
404sub update { 395sub update {
405 my ($self) = @_; 396 my ($self) = @_;
406 397
… …
492sub new { 483sub new {
493 my ($class, %arg) = @_; 484 my ($class, %arg) = @_;
494 485
495 my $children = delete $arg{children} || []; 486 my $children = delete $arg{children} || [];
496 487
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 488 my $self = $class->SUPER::new (
489 children => [],
490 can_events => 0,
491 %arg,
492 );
498 $self->add ($_) for @$children; 493 $self->add ($_) for @$children;
499 494
500 $self 495 $self
501} 496}
502 497
503sub add { 498sub add {
504 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
505 500
506 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
507 503
508 use sort 'stable'; 504 use sort 'stable';
509 505
510 $self->{children} = [ 506 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
513 ]; 509 ];
514 510
515 $child->check_size; 511 $_->check_size
512 for @widgets;
513
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
516} 519}
517 520
518sub remove { 521sub remove {
519 my ($self, $child) = @_; 522 my ($self, $child) = @_;
520 523
… …
535 538
536 for (@$children) { 539 for (@$children) {
537 delete $_->{parent}; 540 delete $_->{parent};
538 $_->hide; 541 $_->hide;
539 } 542 }
543
544 $self->check_size;
545 $self->update;
540} 546}
541 547
542sub find_widget { 548sub find_widget {
543 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
544 550
… …
619} 625}
620 626
621sub update { 627sub update {
622 my ($self) = @_; 628 my ($self) = @_;
623 629
624 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 631 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 632}
638 633
639sub size_allocate { 634sub size_allocate {
640 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
641 636
642 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
643 640
641sub _render {
642 $_[0]{children}[0]->draw;
643}
644
645sub render_child {
646 my ($self) = @_;
647
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT;
651
644 $self->render_chld; 652 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 };
645} 661}
646 662
647sub _draw { 663sub _draw {
648 my ($self) = @_; 664 my ($self) = @_;
649 665
… …
651 667
652 my $tex = $self->{texture} 668 my $tex = $self->{texture}
653 or return; 669 or return;
654 670
655 glEnable GL_BLEND; 671 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1;
659 676
660 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
661 678
662 glDisable GL_BLEND; 679 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
667 684
668package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
669 686
670our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
671 688
672sub new { die }
673
674sub size_request { 689sub size_request {
675 my ($self) = @_; 690 my ($self) = @_;
676 691
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
679 694
680 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
681} 696}
682 697
683sub _draw { 698sub size_allocate {
684 my ($self) = @_; 699 my ($self, $w, $h) = @_;
685 700
686 $self->{children}[1]->draw; 701 $self->update;
687} 702}
688 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
706
707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
751package CFClient::UI::ScrolledWindow;
752
753our @ISA = CFClient::UI::HBox::;
754
755sub new {
756 my $class = shift;
757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort),
770 slider => $slider,
771 @_,
772 );
773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
689 783
690############################################################################# 784#############################################################################
691 785
692package CFClient::UI::Frame; 786package CFClient::UI::Frame;
693 787
… …
750 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
751 845
752 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
755 border => 0.8, 849 border => 0.6,
850 can_events => 1,
756 @_ 851 @_
757 ); 852 );
758 853
759 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
760 align => 0, 855 align => 0,
761 valign => 1, 856 valign => 1,
762 text => $self->{title}, 857 text => $self->{title},
763 fontsize => 1; 858 fontsize => $self->{border};
764 859
765 $self 860 $self
766} 861}
767 862
768sub border { 863sub border {
… …
793} 888}
794 889
795sub button_down { 890sub button_down {
796 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
797 892
893 my ($w, $h) = @$self{qw(w h)};
798 my $border = $self->border; 894 my $border = $self->border;
799 895
800 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
801 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
802 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
803 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
804 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
805 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
806 $self->{motion} = sub { 907 $self->{motion} = sub {
807 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
808 909
809 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
810 912
811 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
812 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
813 $self->check_size; 916 $self->check_size;
814 }; 917 };
815 918
816 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
817 && $y >= 0 && $y < $border) {
818
819 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
820 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
821 922
822 $self->{motion} = sub { 923 $self->{motion} = sub {
823 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
859 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
860 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
861 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
862 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
863 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
864 my $bg = $tex[0]; 966 my $bg = $tex[0];
865 967
866 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
867 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
868 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
869 971
870 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
871 973
872 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
873 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
874 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
875 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
876 978
877 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
878 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
879 982
880 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
881 $self->child->draw; 985 $self->child->draw;
882} 986}
883 987
884############################################################################# 988#############################################################################
885 989
… …
907 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
908 1012
909 $child->check_size; 1013 $child->check_size;
910} 1014}
911 1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
912# TODO: move to container class maybe? send childs a signal on removal? 1020# TODO: move to container class maybe? send childs a signal on removal?
913sub clear { 1021sub clear {
914 my ($self) = @_; 1022 my ($self) = @_;
915 1023
916 my $children = delete $self->{children}; 1024 my @children = $self->children;
1025 delete $self->{children};
917 1026
918 for (grep $_, map @$_, grep $_, @$children) { 1027 for (@children) {
919 delete $_->{parent}; 1028 delete $_->{parent};
920 $_->hide; 1029 $_->hide;
921 } 1030 }
922 1031
923 $self->update; 1032 $self->update;
… …
1184 s/</&lt;/g; 1293 s/</&lt;/g;
1185 1294
1186 $_[1] 1295 $_[1]
1187} 1296}
1188 1297
1298sub update {
1299 my ($self) = @_;
1300
1301 delete $self->{texture};
1302 $self->SUPER::update;
1303}
1304
1189sub set_text { 1305sub set_text {
1190 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1191 1307
1308 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text";
1310
1192 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1193 1312
1194 delete $self->{texture}; 1313 $self->update;
1195 $self->check_size; 1314 $self->check_size;
1196 $self->update;
1197} 1315}
1198 1316
1199sub set_markup { 1317sub set_markup {
1200 my ($self, $markup) = @_; 1318 my ($self, $markup) = @_;
1201 1319
1320 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup";
1322
1202 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1203 1324
1204 delete $self->{texture}; 1325 $self->update;
1205 $self->check_size; 1326 $self->check_size;
1206 $self->update;
1207} 1327}
1208 1328
1209sub size_request { 1329sub size_request {
1210 my ($self) = @_; 1330 my ($self) = @_;
1211 1331
… …
1240sub set_fontsize { 1360sub set_fontsize {
1241 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1242 1362
1243 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1244 delete $self->{texture}; 1364 delete $self->{texture};
1365
1366 $self->update;
1245 $self->check_size; 1367 $self->check_size;
1246 $self->update;
1247} 1368}
1248 1369
1249sub _draw { 1370sub _draw {
1250 my ($self) = @_; 1371 my ($self) = @_;
1251 1372
… …
1461 my ($self, $ev) = @_; 1582 my ($self, $ev) = @_;
1462 1583
1463 my $sym = $ev->{sym}; 1584 my $sym = $ev->{sym};
1464 1585
1465 if ($sym == 13) { 1586 if ($sym == 13) {
1587 unshift @{$self->{history}},
1588 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = '';
1466 $self->emit (activate => $self->get_text); 1591 $self->emit (activate => $txt);
1467 $self->update; 1592 $self->update;
1593
1594 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text;
1597 }
1598 if (@{$self->{history} || []} > 0) {
1599 $self->{history_pointer}++;
1600 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1601 $self->{history_pointer} = @{$self->{history} || []} - 1;
1602 }
1603 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1604 }
1605
1606 } elsif ($sym == CFClient::SDLK_DOWN) {
1607 $self->{history_pointer}--;
1608 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1609
1610 if ($self->{history_pointer} >= 0) {
1611 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1612 } else {
1613 $self->set_text ($self->{history_saveback});
1614 }
1468 1615
1469 } else { 1616 } else {
1470 $self->SUPER::key_down ($ev); 1617 $self->SUPER::key_down ($ev);
1471 } 1618 }
1472 1619
… …
1709} 1856}
1710 1857
1711sub set_max { 1858sub set_max {
1712 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1713 1860
1861 return if $self->{max_val} == $max;
1862
1714 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1715} 1865}
1716 1866
1717sub set_value { 1867sub set_value {
1718 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1719 1869
1720 $self->set_max ($max) 1870 $self->set_max ($max)
1721 if defined $max; 1871 if defined $max;
1722 1872
1723 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1724 $self->{val} = $val; 1875 $self->{val} = $val;
1725
1726 $self->update; 1876 $self->update;
1727} 1877}
1728 1878
1729sub _draw { 1879sub _draw {
1730 my ($self) = @_; 1880 my ($self) = @_;
… …
1793 1943
1794sub new { 1944sub new {
1795 my ($class, %arg) = @_; 1945 my ($class, %arg) = @_;
1796 1946
1797 my $self = $class->SUPER::new ( 1947 my $self = $class->SUPER::new (
1798 tooltip => $arg{type}, 1948 tooltip => $arg{type},
1799 can_hover => 1, 1949 can_hover => 1,
1950 can_events => 1,
1800 %arg, 1951 %arg,
1801 ); 1952 );
1802 1953
1803 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1954 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1804 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1812 1963
1813 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1814 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1815} 1966}
1816 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1817sub set_value { 1975sub set_value {
1818 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1819 1977
1820 $self->set_max ($max) 1978 $self->set_max ($max)
1821 if defined $max; 1979 if defined $max;
1822 1980
1823 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1824 $self->{value}->set_text ($val); 1982 $self->{value}->set_text ($val);
1825}
1826
1827sub set_max {
1828 my ($self, $max) = @_;
1829
1830 $self->{gauge}->set_max ($max);
1831 $self->{max}->set_text ($max);
1832} 1983}
1833 1984
1834############################################################################# 1985#############################################################################
1835 1986
1836package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1855 # TODO: calculations are off 2006 # TODO: calculations are off
1856 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1857 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1858 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1859 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1860 req_w => 20, 2011 req_w => $::WIDTH / 80,
1861 req_h => 20, 2012 req_h => $::WIDTH / 80,
1862 vertical => 0, 2013 vertical => 0,
1863 can_hover => 1, 2014 can_hover => 1,
1864 inner_pad => 5, 2015 inner_pad => 5,
1865 @_ 2016 @_
1866 ); 2017 );
… …
1990 (new CFClient::UI::Empty expand => 1), 2141 (new CFClient::UI::Empty expand => 1),
1991 (new CFClient::UI::Slider vertical => 1), 2142 (new CFClient::UI::Slider vertical => 1),
1992 ], 2143 ],
1993 ); 2144 );
1994 2145
1995 $self->{children}[1]->connect (changed => sub { 2146 $self->{children}[1]->connect (changed => sub { $self->update });
1996 $self->update;
1997 });
1998 2147
1999 $self 2148 $self
2000} 2149}
2001 2150
2002sub set_fontsize { 2151sub set_fontsize {
… …
2010 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
2011 2160
2012 my $layout = $self->{layout}; 2161 my $layout = $self->{layout};
2013 2162
2014 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2015 $layout->set_width ($self->{w}); 2164 $layout->set_width ($self->{children}[0]{w});
2016 $layout->set_text ($text); 2165 $layout->set_text ($text);
2017 2166
2018 ($layout->size)[1] 2167 ($layout->size)[1]
2019} 2168}
2020 2169
… …
2073 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2074 2223
2075 delete $self->{texture}; 2224 delete $self->{texture};
2076 } 2225 }
2077 2226
2078 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2079 glClearColor 0, 0, 0, 1; 2228 glClearColor 0, 0, 0, 0;
2080 glClear GL_COLOR_BUFFER_BIT; 2229 glClear GL_COLOR_BUFFER_BIT;
2081 2230
2082 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
2083 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2084 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
… …
2116} 2265}
2117 2266
2118sub _draw { 2267sub _draw {
2119 my ($self) = @_; 2268 my ($self) = @_;
2120 2269
2121 if ($self->{texture}) { 2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2122 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
2123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1;
2124 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2125 glDisable GL_TEXTURE_2D; 2276 glDisable GL_TEXTURE_2D;
2126 } 2277 glDisable GL_BLEND;
2127 2278
2128 $self->{children}[1]->draw; 2279 $self->{children}[1]->draw;
2129 2280
2130} 2281}
2131 2282
… …
2300 2451
2301sub size_request { 2452sub size_request {
2302 (32, 8) 2453 (32, 8)
2303} 2454}
2304 2455
2305sub draw { 2456sub _draw {
2306 my ($self) = @_; 2457 my ($self) = @_;
2307 2458
2459 return unless $::CONN;#d# manage and cache textures differently
2308 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2309 2461
2462 # TODO animation
2310 if ($tex) { 2463 if ($tex) {
2311 glEnable GL_BLEND; 2464 glEnable GL_BLEND;
2312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2313 glEnable GL_TEXTURE_2D; 2466 glEnable GL_TEXTURE_2D;
2314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2319 } 2472 }
2320} 2473}
2321 2474
2322############################################################################# 2475#############################################################################
2323 2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = delete $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525
2526 $self->add (new CFClient::UI::Face
2527 can_events => 0,
2528 face => $item->{face},
2529 anim => $item->{anim},
2530 animspeed => $item->{animspeed},
2531 );
2532
2533 $self->add (new CFClient::UI::Label
2534 can_events => 0,
2535 text => $desc,
2536 );
2537
2538 $self
2539}
2540
2541#############################################################################
2542
2543package CFClient::UI::Inventory;
2544
2545our @ISA = CFClient::UI::ScrolledWindow::;
2546
2547sub new {
2548 my $class = shift;
2549
2550 my $self = $class->SUPER::new (
2551 scrolled => (new CFClient::UI::VBox),
2552 @_,
2553 );
2554
2555 $self
2556}
2557
2558sub set_items {
2559 my ($self, $items) = @_;
2560
2561 $self->{scrolled}->clear;
2562 return unless $items;
2563
2564 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2565
2566 $self->{real_items} = \@items;
2567
2568 for my $item (@items) {
2569 my $desc = $item->{nrof} < 2
2570 ? $item->{name}
2571 : "$item->{nrof} $item->{name_pl}";
2572
2573 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2574 }
2575
2576# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2577}
2578
2579sub size_request {
2580 my ($self) = @_;
2581 ($self->{req_w}, $self->{req_h});
2582}
2583
2584#############################################################################
2585
2586package CFClient::UI::Menu;
2587
2588our @ISA = CFClient::UI::FancyFrame::;
2589
2590use CFClient::OpenGL;
2591
2592sub new {
2593 my $class = shift;
2594
2595 my $self = $class->SUPER::new (
2596 items => [],
2597 z => 100,
2598 @_,
2599 );
2600
2601 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2602
2603 for my $item (@{ $self->{items} }) {
2604 my ($widget, $cb) = @$item;
2605
2606 # handle various types of items, only text for now
2607 if (!ref $widget) {
2608 $widget = new CFClient::UI::Label
2609 can_hover => 1,
2610 can_events => 1,
2611 text => $widget;
2612 }
2613
2614 $self->{item}{$widget} = $item;
2615
2616 $self->{vbox}->add ($widget);
2617 }
2618
2619 $self
2620}
2621
2622# popup given the event (must be a mouse button down event currently)
2623sub popup {
2624 my ($self, $ev) = @_;
2625
2626 $self->emit ("popdown");
2627
2628 # maybe save $GRAB? must be careful about events...
2629 $GRAB = $self;
2630 $self->{button} = $ev->{button};
2631
2632 $self->show;
2633 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2634}
2635
2636sub mouse_motion {
2637 my ($self, $ev, $x, $y) = @_;
2638
2639 # TODO: should use vbox->find_widget or so
2640 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2641 $self->{hover} = $self->{item}{$HOVER};
2642}
2643
2644sub button_up {
2645 my ($self, $ev, $x, $y) = @_;
2646
2647 if ($ev->{button} == $self->{button}) {
2648 undef $GRAB;
2649 $self->hide;
2650
2651 $self->emit ("popdown");
2652 $self->{hover}[1]->() if $self->{hover};
2653 }
2654}
2655
2656#############################################################################
2657
2324package CFClient::UI::Root; 2658package CFClient::UI::Root;
2325 2659
2326our @ISA = CFClient::UI::Container::; 2660our @ISA = CFClient::UI::Container::;
2327 2661
2328use CFClient::OpenGL; 2662use CFClient::OpenGL;
2329 2663
2330sub check_size { 2664sub new {
2331 my ($self) = @_; 2665 my $class = shift;
2332 2666
2333 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2667 $class->SUPER::new (
2334} 2668 @_,
2335 2669 )
2336sub size_request {
2337 ($::WIDTH, $::HEIGHT)
2338} 2670}
2339 2671
2340sub configure { 2672sub configure {
2341 my ($self, $x, $y, $w, $h) = @_; 2673 my ($self, $x, $y, $w, $h) = @_;
2342 2674
2343 $self->SUPER::configure ($x, $y, $w, $h); 2675 $self->{w} = $w;
2676 $self->{h} = $h;
2677}
2344 2678
2679sub check_size {
2680 my ($self) = @_;
2681
2682 $self->size_allocate ($self->{w}, $self->{h})
2683 if $self->{w};
2684}
2685
2686sub size_request {
2687 my ($self) = @_;
2688
2689 ($self->{w}, $self->{h})
2690}
2691
2692sub size_allocate {
2693 my ($self, $w, $h) = @_;
2694
2695 my $old_w = $self->{old_w};
2696 my $old_h = $self->{old_h};
2697
2698 if ($old_w && $old_h) {
2699 for my $child ($self->children) {
2700 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2701 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2702 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2703 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2704 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2705 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2706 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2707 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2708 }
2709 }
2710
2345 for my $child (@{$self->{children}}) { 2711 for my $child ($self->children) {
2346 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2712 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2347 2713
2348 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2714 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2349 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2715 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2350 $child->configure ($X, $Y, $W,$H); 2716 $child->configure ($X, $Y, $W, $H);
2351 } 2717 }
2352}
2353 2718
2354sub _topleft { 2719 $self->{old_w} = $w;
2720 $self->{old_h} = $h;
2721}
2722
2723sub coord2local {
2355 my ($self, $x, $y) = @_; 2724 my ($self, $x, $y) = @_;
2356 2725
2357 ($x, $y) 2726 ($x, $y)
2358} 2727}
2359 2728
2729sub coord2global {
2730 my ($self, $x, $y) = @_;
2731
2732 ($x, $y)
2733}
2734
2360sub update { 2735sub update {
2361 my ($self) = @_; 2736 my ($self) = @_;
2362 2737
2363 $self->check_size; 2738 $self->check_size;
2364 ::refresh (); 2739 $::WANT_REFRESH++;
2365} 2740}
2366 2741
2367sub add { 2742sub add {
2368 my ($self, $child) = @_; 2743 my ($self, $child) = @_;
2369 2744
2370 # integerize window positions 2745 # integerise window positions
2371 $child->{x} = int $child->{x}; 2746 $child->{x} = int $child->{x};
2372 $child->{y} = int $child->{y}; 2747 $child->{y} = int $child->{y};
2373 2748
2374 $self->SUPER::add ($child); 2749 $self->SUPER::add ($child);
2375} 2750}
… …
2378 my ($self, $id, $cb) = @_; 2753 my ($self, $id, $cb) = @_;
2379 2754
2380 $self->{refresh_hook}{$id} = $cb; 2755 $self->{refresh_hook}{$id} = $cb;
2381} 2756}
2382 2757
2383sub draw { 2758sub draw {
2384 my ($self) = @_; 2759 my ($self) = @_;
2385 2760
2761 if ($self->{check_size}) {
2762 my @queue = ([], []);
2763
2764 for (;;) {
2765 if ($self->{check_size}) {
2766 # heuristic: check containers last
2767 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2768 for values %{delete $self->{check_size}}
2769 }
2770
2771 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2772
2773 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2774 ? @$widget{qw(user_w user_h)}
2775 : $widget->size_request;
2776
2777 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2778 $widget->{req_w} = $w;
2779 $widget->{req_h} = $h;
2780
2781 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2782
2783 $widget->{parent}->check_size
2784 if $widget->{parent};
2785 }
2786 }
2787 }
2788
2789 while ($self->{size_alloc}) {
2790 for (values %{delete $self->{size_alloc}}) {
2791 my ($widget, $w, $h) = @$_;
2792
2793 $widget->{w} = $w;
2794 $widget->{h} = $h;
2795 $widget->size_allocate ($w, $h);
2796 $widget->emit (size_allocate => $w, $h);
2797 }
2798 }
2799
2386 while (my $rcb = delete $self->{refresh_hook}) { 2800 while ($self->{refresh_hook}) {
2387 $_->() for values %$rcb; 2801 $_->()
2802 for values %{delete $self->{refresh_hook}};
2388 } 2803 }
2389 2804
2390 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2805 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2391 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2392 glClear GL_COLOR_BUFFER_BIT; 2807 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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