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.163 by root, Mon Apr 24 06:40:29 2006 UTC vs.
Revision 1.184 by root, Wed May 3 19:56:05 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 }
… …
137 145
138sub new { 146sub new {
139 my $class = shift; 147 my $class = shift;
140 148
141 my $self = bless { 149 my $self = bless {
142 x => 0, 150 x => 0,
143 y => 0, 151 y => 0,
144 z => 0, 152 z => 0,
145 can_events => 1, 153 can_events => 1,
146 @_ 154 @_
147 }, $class; 155 }, $class;
148 156
149 for (keys %$self) { 157 for (keys %$self) {
… …
229 $self->{w} = $w; 237 $self->{w} = $w;
230 $self->{h} = $h; 238 $self->{h} = $h;
231 239
232 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
233 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
234 } 243 }
235} 244}
236 245
237sub size_allocate { 246sub size_allocate {
238 # nothing to be done 247 # nothing to be done
248}
249
250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
239} 261}
240 262
241sub set_max_size { 263sub set_max_size {
242 my ($self, $w, $h) = @_; 264 my ($self, $w, $h) = @_;
243 265
… …
246} 268}
247 269
248# return top left coordinates 270# return top left coordinates
249sub _topleft { 271sub _topleft {
250 my ($self, $x, $y) = @_; 272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
251 276
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253} 278}
254 279
255# translate global coordinates to local coordinate system 280# translate global coordinates to local coordinate system
… …
492sub new { 517sub new {
493 my ($class, %arg) = @_; 518 my ($class, %arg) = @_;
494 519
495 my $children = delete $arg{children} || []; 520 my $children = delete $arg{children} || [];
496 521
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 522 my $self = $class->SUPER::new (
523 children => [],
524 can_events => 0,
525 %arg,
526 );
498 $self->add ($_) for @$children; 527 $self->add ($_) for @$children;
499 528
500 $self 529 $self
501} 530}
502 531
… …
511 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 541 @{$self->{children}}, $child
513 ]; 542 ];
514 543
515 $child->check_size; 544 $child->check_size;
545 $self->update;
546}
547
548sub children {
549 @{ $_[0]{children} }
516} 550}
517 551
518sub remove { 552sub remove {
519 my ($self, $child) = @_; 553 my ($self, $child) = @_;
520 554
… …
535 569
536 for (@$children) { 570 for (@$children) {
537 delete $_->{parent}; 571 delete $_->{parent};
538 $_->hide; 572 $_->hide;
539 } 573 }
574
575 $self->check_size;
576 $self->update;
540} 577}
541 578
542sub find_widget { 579sub find_widget {
543 my ($self, $x, $y) = @_; 580 my ($self, $x, $y) = @_;
544 581
… …
619} 656}
620 657
621sub update { 658sub update {
622 my ($self) = @_; 659 my ($self) = @_;
623 660
624 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 662 $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} 663}
638 664
639sub size_allocate { 665sub size_allocate {
640 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
641 667
642 $self->child->configure (0, 0, $w, $h); 668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
643 671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
676sub render_child {
677 my ($self) = @_;
678
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT;
682
644 $self->render_chld; 683 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 };
645} 692}
646 693
647sub _draw { 694sub _draw {
648 my ($self) = @_; 695 my ($self) = @_;
649 696
… …
651 698
652 my $tex = $self->{texture} 699 my $tex = $self->{texture}
653 or return; 700 or return;
654 701
655 glEnable GL_BLEND; 702 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1;
659 707
660 $tex->draw_quad (0, 0, $w, $h); 708 $tex->draw_quad (0, 0, $w, $h);
661 709
662 glDisable GL_BLEND; 710 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 711 glDisable GL_TEXTURE_2D;
… …
667 715
668package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
669 717
670our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
671 719
672sub new { die }
673
674sub size_request { 720sub size_request {
675 my ($self) = @_; 721 my ($self) = @_;
676 722
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 723 @$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)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
679 725
680 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
681} 727}
682 728
683sub _draw { 729sub size_allocate {
684 my ($self) = @_; 730 my ($self, $w, $h) = @_;
685 731
686 $self->{children}[1]->draw; 732 $self->update;
687} 733}
688 734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744# hmm, this does not work for topleft of $self... but we should not aks for that
745sub _topleft {
746 my ($self, $x, $y) = @_;
747
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
749}
750
751sub find_widget {
752 my ($self, $x, $y) = @_;
753
754 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
756 ) {
757 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758 } else {
759 $self->CFClient::UI::Base::find_widget ($x, $y)
760 }
761}
762
763sub _render {
764 my ($self) = @_;
765
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767
768 $self->SUPER::_render;
769}
770
771#############################################################################
772
773package CFClient::UI::ScrolledWindow;
774
775our @ISA = CFClient::UI::HBox::;
776
777sub new {
778 my $class = shift;
779
780 my $self;
781
782 my $slider = new CFClient::UI::Slider
783 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 },
788 ;
789
790 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort),
792 slider => $slider,
793 @_,
794 );
795
796 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp});
798 $self->add ($self->{slider});
799
800 $self
801}
802
803#TODO# update range on size_allocate depeneing on child
804# update viewport offset on scroll
689 805
690############################################################################# 806#############################################################################
691 807
692package CFClient::UI::Frame; 808package CFClient::UI::Frame;
693 809
… …
748 my $class = shift; 864 my $class = shift;
749 865
750 # TODO: user_x, user_y, overwrite moveto? 866 # TODO: user_x, user_y, overwrite moveto?
751 867
752 my $self = $class->SUPER::new ( 868 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 869 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 870 border_bg => [1, 1, 1, 1],
755 border => 0.8, 871 border => 0.6,
756 can_events => 1, 872 can_events => 1,
757 @_ 873 @_
758 ); 874 );
759 875
760 $self->{title} &&= new CFClient::UI::Label 876 $self->{title} &&= new CFClient::UI::Label
761 align => 0, 877 align => 0,
762 valign => 1, 878 valign => 1,
763 text => $self->{title}, 879 text => $self->{title},
764 fontsize => 1; 880 fontsize => $self->{border};
765 881
766 $self 882 $self
767} 883}
768 884
769sub border { 885sub border {
… …
794} 910}
795 911
796sub button_down { 912sub button_down {
797 my ($self, $ev, $x, $y) = @_; 913 my ($self, $ev, $x, $y) = @_;
798 914
915 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 916 my $border = $self->border;
800 917
801 if ($x < $self->{w} && $x >= $self->{w} - $border 918 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 919 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 920
921 if ($lr & $td) {
922 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 924 my ($bw, $bh) = ($self->{w}, $self->{h});
806 925
926 my $mx = $x < $border;
927 my $my = $y < $border;
928
807 $self->{motion} = sub { 929 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 930 my ($ev, $x, $y) = @_;
809 931
810 ($x, $y) = ($ev->{x}, $ev->{y}); 932 my $dx = $ev->{x} - $ox;
933 my $dy = $ev->{y} - $oy;
811 934
812 $self->{user_w} = $bw + $x - $ox; 935 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 936 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
937 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
814 $self->check_size; 938 $self->check_size;
815 }; 939 };
816 940
817 } elsif ($x >= 0 && $x < $self->{w} 941 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 942 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 943 my ($bx, $by) = ($self->{x}, $self->{y});
822 944
823 $self->{motion} = sub { 945 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 946 my ($ev, $x, $y) = @_;
… …
860 $tex[1]->draw_quad (0, 0, $w, $border); 982 $tex[1]->draw_quad (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 983 $tex[3]->draw_quad (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 985 $tex[4]->draw_quad (0, $h - $border, $w, $border);
864 986
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
865 my $bg = $tex[0]; 988 my $bg = $tex[0];
866 989
867 # TODO: repeat texture not scale 990 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 991 my $rep_x = $cw / $bg->{w};
869 my $rep_y = $ch / $bg->{h}; 992 my $rep_y = $ch / $bg->{h};
870 993
871 glColor @{ $self->{bg} }; 994 glColor @{ $self->{bg} };
872 995
873 $bg->{s} = $rep_x; 996 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y; 997 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1; 998 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 999 $bg->draw_quad ($border, $border, $cw, $ch);
877 1000
878 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1003 }
880 1004
881 $self->{title}->draw if $self->{title}; 1005 $self->{title}->draw if $self->{title};
1006
882 $self->child->draw; 1007 $self->child->draw;
883} 1008}
884 1009
885############################################################################# 1010#############################################################################
886 1011
… …
908 $self->{children}[$y][$x] = $child; 1033 $self->{children}[$y][$x] = $child;
909 1034
910 $child->check_size; 1035 $child->check_size;
911} 1036}
912 1037
1038sub children {
1039 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040}
1041
913# TODO: move to container class maybe? send childs a signal on removal? 1042# TODO: move to container class maybe? send childs a signal on removal?
914sub clear { 1043sub clear {
915 my ($self) = @_; 1044 my ($self) = @_;
916 1045
917 my $children = delete $self->{children}; 1046 my @children = $self->children;
1047 delete $self->{children};
918 1048
919 for (grep $_, map @$_, grep $_, @$children) { 1049 for (@children) {
920 delete $_->{parent}; 1050 delete $_->{parent};
921 $_->hide; 1051 $_->hide;
922 } 1052 }
923 1053
924 $self->update; 1054 $self->update;
… …
1151 1281
1152sub new { 1282sub new {
1153 my ($class, %arg) = @_; 1283 my ($class, %arg) = @_;
1154 1284
1155 my $self = $class->SUPER::new ( 1285 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1286 fg => [1, 1, 1],
1157 #font => default_font 1287 #font => default_font
1158 fontsize => 1, 1288 fontsize => 1,
1159 text => "", 1289 text => "",
1160 align => -1, 1290 align => -1,
1161 valign => -1, 1291 valign => -1,
1162 padding => 2, 1292 padding => 2,
1163 layout => new CFClient::Layout, 1293 layout => new CFClient::Layout,
1164 can_events => 0, 1294 can_events => 0,
1165 %arg 1295 %arg
1166 ); 1296 );
1167 1297
1168 if (exists $self->{template}) { 1298 if (exists $self->{template}) {
… …
1185 s/</&lt;/g; 1315 s/</&lt;/g;
1186 1316
1187 $_[1] 1317 $_[1]
1188} 1318}
1189 1319
1320sub update {
1321 my ($self) = @_;
1322
1323 delete $self->{texture};
1324 $self->SUPER::update;
1325}
1326
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1190sub set_text { 1333sub set_text {
1191 my ($self, $text) = @_; 1334 my ($self, $text) = @_;
1192 1335
1336 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text";
1338
1193 $self->{layout}->set_text ($text); 1339 $self->{layout}->set_text ($text);
1194 1340
1195 delete $self->{texture}; 1341 delete $self->{texture};
1342 $self->update;
1196 $self->check_size; 1343 $self->check_size;
1197 $self->update;
1198} 1344}
1199 1345
1200sub set_markup { 1346sub set_markup {
1201 my ($self, $markup) = @_; 1347 my ($self, $markup) = @_;
1202 1348
1349 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup";
1351
1203 $self->{layout}->set_markup ($markup); 1352 $self->{layout}->set_markup ($markup);
1204 1353
1205 delete $self->{texture}; 1354 delete $self->{texture};
1355 $self->update;
1206 $self->check_size; 1356 $self->check_size;
1207 $self->update;
1208} 1357}
1209 1358
1210sub size_request { 1359sub size_request {
1211 my ($self) = @_; 1360 my ($self) = @_;
1212 1361
… …
1292 1441
1293sub new { 1442sub new {
1294 my $class = shift; 1443 my $class = shift;
1295 1444
1296 $class->SUPER::new ( 1445 $class->SUPER::new (
1297 fg => [1, 1, 1], 1446 fg => [1, 1, 1],
1298 bg => [0, 0, 0, 0.2], 1447 bg => [0, 0, 0, 0.2],
1299 active_bg => [1, 1, 1, 0.5], 1448 active_bg => [1, 1, 1, 0.5],
1300 active_fg => [0, 0, 0], 1449 active_fg => [0, 0, 0],
1301 can_hover => 1, 1450 can_hover => 1,
1302 can_focus => 1, 1451 can_focus => 1,
1303 valign => 0, 1452 valign => 0,
1304 can_events => 1, 1453 can_events => 1,
1305 @_ 1454 @_
1306 ) 1455 )
1307} 1456}
1308 1457
… …
1462 my ($self, $ev) = @_; 1611 my ($self, $ev) = @_;
1463 1612
1464 my $sym = $ev->{sym}; 1613 my $sym = $ev->{sym};
1465 1614
1466 if ($sym == 13) { 1615 if ($sym == 13) {
1616 unshift @{$self->{history}},
1617 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1620 $self->emit (activate => $txt);
1468 $self->update; 1621 $self->update;
1622
1623 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text;
1626 }
1627 if (@{$self->{history} || []} > 0) {
1628 $self->{history_pointer}++;
1629 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1630 $self->{history_pointer} = @{$self->{history} || []} - 1;
1631 }
1632 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1633 }
1634
1635 } elsif ($sym == CFClient::SDLK_DOWN) {
1636 $self->{history_pointer}--;
1637 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1638
1639 if ($self->{history_pointer} >= 0) {
1640 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1641 } else {
1642 $self->set_text ($self->{history_saveback});
1643 }
1469 1644
1470 } else { 1645 } else {
1471 $self->SUPER::key_down ($ev); 1646 $self->SUPER::key_down ($ev);
1472 } 1647 }
1473 1648
… …
1487 1662
1488sub new { 1663sub new {
1489 my $class = shift; 1664 my $class = shift;
1490 1665
1491 $class->SUPER::new ( 1666 $class->SUPER::new (
1492 padding => 4, 1667 padding => 4,
1493 fg => [1, 1, 1], 1668 fg => [1, 1, 1],
1494 bg => [1, 1, 1, 0.2], 1669 bg => [1, 1, 1, 0.2],
1495 active_fg => [0, 0, 1], 1670 active_fg => [0, 0, 1],
1496 can_hover => 1, 1671 can_hover => 1,
1497 align => 0, 1672 align => 0,
1498 valign => 0, 1673 valign => 0,
1499 can_events => 1, 1674 can_events => 1,
1500 @_ 1675 @_
1501 ) 1676 )
1502} 1677}
1503 1678
… …
1710} 1885}
1711 1886
1712sub set_max { 1887sub set_max {
1713 my ($self, $max) = @_; 1888 my ($self, $max) = @_;
1714 1889
1890 return if $self->{max_val} == $max;
1891
1715 $self->{max_val} = $max; 1892 $self->{max_val} = $max;
1893 $self->update;
1716} 1894}
1717 1895
1718sub set_value { 1896sub set_value {
1719 my ($self, $val, $max) = @_; 1897 my ($self, $val, $max) = @_;
1720 1898
1721 $self->set_max ($max) 1899 $self->set_max ($max)
1722 if defined $max; 1900 if defined $max;
1723 1901
1724 $max = $self->{max_val}; 1902 return if $self->{val} == $val;
1903
1725 $self->{val} = $val; 1904 $self->{val} = $val;
1726
1727 $self->update; 1905 $self->update;
1728} 1906}
1729 1907
1730sub _draw { 1908sub _draw {
1731 my ($self) = @_; 1909 my ($self) = @_;
… …
1794 1972
1795sub new { 1973sub new {
1796 my ($class, %arg) = @_; 1974 my ($class, %arg) = @_;
1797 1975
1798 my $self = $class->SUPER::new ( 1976 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 1977 tooltip => $arg{type},
1978 can_hover => 1,
1800 can_events => 1, 1979 can_events => 1,
1801 can_hover => 1,
1802 %arg, 1980 %arg,
1803 ); 1981 );
1804 1982
1805 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1983 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1806 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1984 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1814 1992
1815 $self->{value}->set_fontsize ($fsize); 1993 $self->{value}->set_fontsize ($fsize);
1816 $self->{max} ->set_fontsize ($fsize); 1994 $self->{max} ->set_fontsize ($fsize);
1817} 1995}
1818 1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
2002}
2003
1819sub set_value { 2004sub set_value {
1820 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1821 2006
1822 $self->set_max ($max) 2007 $self->set_max ($max)
1823 if defined $max; 2008 if defined $max;
1824 2009
1825 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1826 $self->{value}->set_text ($val); 2011 $self->{value}->set_text ($val);
1827}
1828
1829sub set_max {
1830 my ($self, $max) = @_;
1831
1832 $self->{gauge}->set_max ($max);
1833 $self->{max}->set_text ($max);
1834} 2012}
1835 2013
1836############################################################################# 2014#############################################################################
1837 2015
1838package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1857 # TODO: calculations are off 2035 # TODO: calculations are off
1858 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1859 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1860 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1861 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1862 req_w => 20, 2040 req_w => $::WIDTH / 80,
1863 req_h => 20, 2041 req_h => $::WIDTH / 80,
1864 vertical => 0, 2042 vertical => 0,
1865 can_hover => 1, 2043 can_hover => 1,
1866 inner_pad => 5, 2044 inner_pad => 5,
1867 @_ 2045 @_
1868 ); 2046 );
… …
1978 2156
1979sub new { 2157sub new {
1980 my $class = shift; 2158 my $class = shift;
1981 2159
1982 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1983 fontsize => 1, 2161 fontsize => 1,
2162 can_events => 0,
1984 #font => default_font 2163 #font => default_font
1985 @_, 2164 @_,
1986 2165
1987 layout => (new CFClient::Layout), 2166 layout => (new CFClient::Layout),
1988 par => [], 2167 par => [],
1989 height => 0, 2168 height => 0,
1990 children => [ 2169 children => [
1991 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
1993 ], 2172 ],
1994 ); 2173 );
1995 2174
1996 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2176
2000 $self 2177 $self
2001} 2178}
2002 2179
2003sub set_fontsize { 2180sub set_fontsize {
… …
2011 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
2012 2189
2013 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
2014 2191
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
2017 $layout->set_text ($text); 2194 $layout->set_text ($text);
2018 2195
2019 ($layout->size)[1] 2196 ($layout->size)[1]
2020} 2197}
2021 2198
… …
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2075 2252
2076 delete $self->{texture}; 2253 delete $self->{texture};
2077 } 2254 }
2078 2255
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2080 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
2082 2259
2083 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2117} 2294}
2118 2295
2119sub _draw { 2296sub _draw {
2120 my ($self) = @_; 2297 my ($self) = @_;
2121 2298
2122 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2123 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1;
2125 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2127 } 2306 glDisable GL_BLEND;
2128 2307
2129 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2130 2309
2131} 2310}
2132 2311
… …
2180 2359
2181sub new { 2360sub new {
2182 my $class = shift; 2361 my $class = shift;
2183 2362
2184 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
2185 state => 0, 2364 state => 0,
2186 connect_activate => \&toggle_flopper, 2365 connect_activate => \&toggle_flopper,
2187 can_events => 1,
2188 @_ 2366 @_
2189 ); 2367 );
2190 2368
2191 if ($self->{state}) { 2369 if ($self->{state}) {
2192 $self->{state} = 0; 2370 $self->{state} = 0;
… …
2302 2480
2303sub size_request { 2481sub size_request {
2304 (32, 8) 2482 (32, 8)
2305} 2483}
2306 2484
2307sub draw { 2485sub _draw {
2308 my ($self) = @_; 2486 my ($self) = @_;
2309 2487
2310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2311 2489
2490 # TODO animation
2312 if ($tex) { 2491 if ($tex) {
2313 glEnable GL_BLEND; 2492 glEnable GL_BLEND;
2314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315 glEnable GL_TEXTURE_2D; 2494 glEnable GL_TEXTURE_2D;
2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2321 } 2500 }
2322} 2501}
2323 2502
2324############################################################################# 2503#############################################################################
2325 2504
2505package CFClient::UI::Menu;
2506
2507our @ISA = CFClient::UI::FancyFrame::;
2508
2509use CFClient::OpenGL;
2510
2511sub new {
2512 my $class = shift;
2513
2514 my $self = $class->SUPER::new (
2515 items => [],
2516 z => 100,
2517 @_,
2518 );
2519
2520 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2521
2522 for my $item (@{ $self->{items} }) {
2523 my ($widget, $cb) = @$item;
2524
2525 # handle various types of items, only text for now
2526 if (!ref $widget) {
2527 $widget = new CFClient::UI::Label
2528 can_hover => 1,
2529 can_events => 1,
2530 text => $widget;
2531 }
2532
2533 $self->{item}{$widget} = $item;
2534
2535 $self->{vbox}->add ($widget);
2536 }
2537
2538 $self
2539}
2540
2541# popup given the event (must be a mouse button down event currently)
2542sub popup {
2543 my ($self, $ev) = @_;
2544
2545 $self->emit ("popdown");
2546
2547 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self;
2549 $self->{button} = $ev->{button};
2550
2551 $self->show;
2552 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2553}
2554
2555sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_;
2557
2558 # TODO: should use vbox->find_widget or so
2559 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560 $self->{hover} = $self->{item}{$HOVER};
2561}
2562
2563sub button_up {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB;
2568 $self->hide;
2569
2570 $self->emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover};
2572 }
2573}
2574
2575#############################################################################
2576
2326package CFClient::UI::Root; 2577package CFClient::UI::Root;
2327 2578
2328our @ISA = CFClient::UI::Container::; 2579our @ISA = CFClient::UI::Container::;
2329 2580
2330use CFClient::OpenGL; 2581use CFClient::OpenGL;
… …
2402 $self->_draw; 2653 $self->_draw;
2403} 2654}
2404 2655
2405############################################################################# 2656#############################################################################
2406 2657
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_;
2666
2667 my $item = $args{item};
2668
2669 my $desc = $item->{nrof} < 2
2670 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}";
2672
2673
2674 my $self = $class->SUPER::new (
2675 can_hover => 1,
2676 can_events => 1,
2677 tooltip => (CFClient::UI::Label->escape ($desc)
2678 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679 connect_button_down => sub {
2680 my ($self, $ev, $x, $y) = @_;
2681
2682 # todo: maybe put examine on 1? but should just be a tooltip :(
2683 if ($ev->{button} == 1) {
2684 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685 } elsif ($ev->{button} == 2) {
2686 $::CONN->send ("apply $item->{tag}");
2687 } elsif ($ev->{button} == 3) {
2688 CFClient::UI::Menu->new (
2689 items => [
2690 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691 [
2692 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693 sub { $::CONN->send ("lock $item->{tag}") },
2694 ],
2695 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698 ],
2699 )->popup ($ev);
2700 }
2701
2702 1
2703 },
2704 %args
2705 );
2706 $self->add(new CFClient::UI::Face
2707 can_events => 0,
2708 face => $item->{face},
2709 anim => $item->{anim},
2710 animspeed => $item->{animspeed});
2711 $self->add(new CFClient::UI::Label
2712 can_events => 0,
2713 text => $desc);
2714
2715 $self
2716}
2717
2718#############################################################################
2719
2720package CFClient::UI::Inventory;
2721
2722our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724sub new {
2725 my $class = shift;
2726
2727 my $self = $class->SUPER::new (
2728 scrolled => (new CFClient::UI::VBox),
2729 @_,
2730 );
2731
2732 $self
2733}
2734
2735sub set_items {
2736 my ($self, $items) = @_;
2737
2738 $self->{scrolled}->clear;
2739 return unless $items;
2740
2741 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743 $self->{real_items} = \@items;
2744
2745 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2
2747 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}";
2749
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2407package CFClient::UI; 2763package CFClient::UI;
2408 2764
2409$ROOT = new CFClient::UI::Root; 2765$ROOT = new CFClient::UI::Root;
2410$TOOLTIP = new CFClient::UI::Tooltip; 2766$TOOLTIP = new CFClient::UI::Tooltip;
2411 2767

Diff Legend

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