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.164 by root, Mon Apr 24 06:57:39 2006 UTC vs.
Revision 1.193 by root, Wed May 10 21:12:26 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
… …
371 381
372sub set_parent { 382sub set_parent {
373 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
374 384
375 Scalar::Util::weaken ($self->{parent} = $parent); 385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
376} 389}
377 390
378sub check_size { 391sub check_size {
379 my ($self) = @_; 392 my ($self) = @_;
380 393
381 $self->{parent} 394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 395}
403 396
404sub update { 397sub update {
405 my ($self) = @_; 398 my ($self) = @_;
406 399
… …
492sub new { 485sub new {
493 my ($class, %arg) = @_; 486 my ($class, %arg) = @_;
494 487
495 my $children = delete $arg{children} || []; 488 my $children = delete $arg{children} || [];
496 489
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 490 my $self = $class->SUPER::new (
491 children => [],
492 can_events => 0,
493 %arg,
494 );
498 $self->add ($_) for @$children; 495 $self->add ($_) for @$children;
499 496
500 $self 497 $self
501} 498}
502 499
503sub add { 500sub add {
504 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
505 502
506 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
507 505
508 use sort 'stable'; 506 use sort 'stable';
509 507
510 $self->{children} = [ 508 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
513 ]; 511 ];
514 512
515 $child->check_size; 513 $self->check_size;
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,
756 can_events => 0, 850 can_events => 1,
757 @_ 851 @_
758 ); 852 );
759 853
760 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
761 align => 0, 855 align => 0,
762 valign => 1, 856 valign => 1,
763 text => $self->{title}, 857 text => $self->{title},
764 fontsize => 1; 858 fontsize => $self->{border};
765 859
766 $self 860 $self
767} 861}
768 862
769sub border { 863sub border {
… …
794} 888}
795 889
796sub button_down { 890sub button_down {
797 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
798 892
893 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 894 my $border = $self->border;
800 895
801 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
806 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
807 $self->{motion} = sub { 907 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
809 909
810 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
811 912
812 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
814 $self->check_size; 916 $self->check_size;
815 }; 917 };
816 918
817 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
822 922
823 $self->{motion} = sub { 923 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
860 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
864 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
865 my $bg = $tex[0]; 966 my $bg = $tex[0];
866 967
867 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
869 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
870 971
871 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
872 973
873 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
877 978
878 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
880 982
881 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
882 $self->child->draw; 985 $self->child->draw;
883} 986}
884 987
885############################################################################# 988#############################################################################
886 989
… …
908 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
909 1012
910 $child->check_size; 1013 $child->check_size;
911} 1014}
912 1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
913# 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?
914sub clear { 1021sub clear {
915 my ($self) = @_; 1022 my ($self) = @_;
916 1023
917 my $children = delete $self->{children}; 1024 my @children = $self->children;
1025 delete $self->{children};
918 1026
919 for (grep $_, map @$_, grep $_, @$children) { 1027 for (@children) {
920 delete $_->{parent}; 1028 delete $_->{parent};
921 $_->hide; 1029 $_->hide;
922 } 1030 }
923 1031
924 $self->update; 1032 $self->update;
… …
1104 ) 1212 )
1105} 1213}
1106 1214
1107sub size_allocate { 1215sub size_allocate {
1108 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1109 1219
1110 my $children = $self->{children}; 1220 my $children = $self->{children};
1111 1221
1112 my @h = map $_->{req_h}, @$children; 1222 my @h = map $_->{req_h}, @$children;
1113 1223
… …
1185 s/</&lt;/g; 1295 s/</&lt;/g;
1186 1296
1187 $_[1] 1297 $_[1]
1188} 1298}
1189 1299
1300sub update {
1301 my ($self) = @_;
1302
1303 delete $self->{texture};
1304 $self->SUPER::update;
1305}
1306
1190sub set_text { 1307sub set_text {
1191 my ($self, $text) = @_; 1308 my ($self, $text) = @_;
1192 1309
1310 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text";
1312
1193 $self->{layout}->set_text ($text); 1313 $self->{layout}->set_text ($text);
1194 1314
1195 delete $self->{texture}; 1315 $self->update;
1196 $self->check_size; 1316 $self->check_size;
1197 $self->update;
1198} 1317}
1199 1318
1200sub set_markup { 1319sub set_markup {
1201 my ($self, $markup) = @_; 1320 my ($self, $markup) = @_;
1202 1321
1322 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup";
1324
1203 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1204 1326
1205 delete $self->{texture}; 1327 $self->update;
1206 $self->check_size; 1328 $self->check_size;
1207 $self->update;
1208} 1329}
1209 1330
1210sub size_request { 1331sub size_request {
1211 my ($self) = @_; 1332 my ($self) = @_;
1212 1333
… …
1241sub set_fontsize { 1362sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1243 1364
1244 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1246 $self->check_size; 1369 $self->check_size;
1247 $self->update;
1248} 1370}
1249 1371
1250sub _draw { 1372sub _draw {
1251 my ($self) = @_; 1373 my ($self) = @_;
1252 1374
… …
1462 my ($self, $ev) = @_; 1584 my ($self, $ev) = @_;
1463 1585
1464 my $sym = $ev->{sym}; 1586 my $sym = $ev->{sym};
1465 1587
1466 if ($sym == 13) { 1588 if ($sym == 13) {
1589 unshift @{$self->{history}},
1590 my $txt = $self->get_text;
1591 $self->{history_pointer} = -1;
1592 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1593 $self->emit (activate => $txt);
1468 $self->update; 1594 $self->update;
1595
1596 } elsif ($sym == CFClient::SDLK_UP) {
1597 if ($self->{history_pointer} < 0) {
1598 $self->{history_saveback} = $self->get_text;
1599 }
1600 if (@{$self->{history} || []} > 0) {
1601 $self->{history_pointer}++;
1602 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1603 $self->{history_pointer} = @{$self->{history} || []} - 1;
1604 }
1605 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1606 }
1607
1608 } elsif ($sym == CFClient::SDLK_DOWN) {
1609 $self->{history_pointer}--;
1610 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1611
1612 if ($self->{history_pointer} >= 0) {
1613 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1614 } else {
1615 $self->set_text ($self->{history_saveback});
1616 }
1469 1617
1470 } else { 1618 } else {
1471 $self->SUPER::key_down ($ev); 1619 $self->SUPER::key_down ($ev);
1472 } 1620 }
1473 1621
… …
1710} 1858}
1711 1859
1712sub set_max { 1860sub set_max {
1713 my ($self, $max) = @_; 1861 my ($self, $max) = @_;
1714 1862
1863 return if $self->{max_val} == $max;
1864
1715 $self->{max_val} = $max; 1865 $self->{max_val} = $max;
1866 $self->update;
1716} 1867}
1717 1868
1718sub set_value { 1869sub set_value {
1719 my ($self, $val, $max) = @_; 1870 my ($self, $val, $max) = @_;
1720 1871
1721 $self->set_max ($max) 1872 $self->set_max ($max)
1722 if defined $max; 1873 if defined $max;
1723 1874
1724 $max = $self->{max_val}; 1875 return if $self->{val} == $val;
1876
1725 $self->{val} = $val; 1877 $self->{val} = $val;
1726
1727 $self->update; 1878 $self->update;
1728} 1879}
1729 1880
1730sub _draw { 1881sub _draw {
1731 my ($self) = @_; 1882 my ($self) = @_;
… …
1794 1945
1795sub new { 1946sub new {
1796 my ($class, %arg) = @_; 1947 my ($class, %arg) = @_;
1797 1948
1798 my $self = $class->SUPER::new ( 1949 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 1950 tooltip => $arg{type},
1800 can_hover => 1, 1951 can_hover => 1,
1952 can_events => 1,
1801 %arg, 1953 %arg,
1802 ); 1954 );
1803 1955
1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1956 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1957 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1813 1965
1814 $self->{value}->set_fontsize ($fsize); 1966 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize); 1967 $self->{max} ->set_fontsize ($fsize);
1816} 1968}
1817 1969
1970sub set_max {
1971 my ($self, $max) = @_;
1972
1973 $self->{gauge}->set_max ($max);
1974 $self->{max}->set_text ($max);
1975}
1976
1818sub set_value { 1977sub set_value {
1819 my ($self, $val, $max) = @_; 1978 my ($self, $val, $max) = @_;
1820 1979
1821 $self->set_max ($max) 1980 $self->set_max ($max)
1822 if defined $max; 1981 if defined $max;
1823 1982
1824 $self->{gauge}->set_value ($val, $max); 1983 $self->{gauge}->set_value ($val, $max);
1825 $self->{value}->set_text ($val); 1984 $self->{value}->set_text ($val);
1826}
1827
1828sub set_max {
1829 my ($self, $max) = @_;
1830
1831 $self->{gauge}->set_max ($max);
1832 $self->{max}->set_text ($max);
1833} 1985}
1834 1986
1835############################################################################# 1987#############################################################################
1836 1988
1837package CFClient::UI::Slider; 1989package CFClient::UI::Slider;
… …
1856 # TODO: calculations are off 2008 # TODO: calculations are off
1857 my $self = $class->SUPER::new ( 2009 my $self = $class->SUPER::new (
1858 fg => [1, 1, 1], 2010 fg => [1, 1, 1],
1859 active_fg => [0, 0, 0], 2011 active_fg => [0, 0, 0],
1860 range => [0, 0, 100, 10], 2012 range => [0, 0, 100, 10],
1861 req_w => 20, 2013 req_w => $::WIDTH / 80,
1862 req_h => 20, 2014 req_h => $::WIDTH / 80,
1863 vertical => 0, 2015 vertical => 0,
1864 can_hover => 1, 2016 can_hover => 1,
1865 inner_pad => 5, 2017 inner_pad => 5,
1866 @_ 2018 @_
1867 ); 2019 );
… …
1991 (new CFClient::UI::Empty expand => 1), 2143 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2144 (new CFClient::UI::Slider vertical => 1),
1993 ], 2145 ],
1994 ); 2146 );
1995 2147
1996 $self->{children}[1]->connect (changed => sub { 2148 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2149
2000 $self 2150 $self
2001} 2151}
2002 2152
2003sub set_fontsize { 2153sub set_fontsize {
… …
2011 my ($self, $text) = @_; 2161 my ($self, $text) = @_;
2012 2162
2013 my $layout = $self->{layout}; 2163 my $layout = $self->{layout};
2014 2164
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w}); 2166 $layout->set_width ($self->{children}[0]{w});
2017 $layout->set_text ($text); 2167 $layout->set_text ($text);
2018 2168
2019 ($layout->size)[1] 2169 ($layout->size)[1]
2020} 2170}
2021 2171
… …
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2075 2225
2076 delete $self->{texture}; 2226 delete $self->{texture};
2077 } 2227 }
2078 2228
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2080 glClearColor 0, 0, 0, 1; 2230 glClearColor 0, 0, 0, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2231 glClear GL_COLOR_BUFFER_BIT;
2082 2232
2083 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D; 2235 glEnable GL_TEXTURE_2D;
… …
2117} 2267}
2118 2268
2119sub _draw { 2269sub _draw {
2120 my ($self) = @_; 2270 my ($self) = @_;
2121 2271
2122 if ($self->{texture}) { 2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2123 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1;
2125 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126 glDisable GL_TEXTURE_2D; 2278 glDisable GL_TEXTURE_2D;
2127 } 2279 glDisable GL_BLEND;
2128 2280
2129 $self->{children}[1]->draw; 2281 $self->{children}[1]->draw;
2130 2282
2131} 2283}
2132 2284
… …
2301 2453
2302sub size_request { 2454sub size_request {
2303 (32, 8) 2455 (32, 8)
2304} 2456}
2305 2457
2306sub draw { 2458sub _draw {
2307 my ($self) = @_; 2459 my ($self) = @_;
2308 2460
2461 return unless $::CONN;#d# manage and cache textures differently
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2310 2463
2464 # TODO animation
2311 if ($tex) { 2465 if ($tex) {
2312 glEnable GL_BLEND; 2466 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D; 2468 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2320 } 2474 }
2321} 2475}
2322 2476
2323############################################################################# 2477#############################################################################
2324 2478
2479package CFClient::UI::InventoryItem;
2480
2481our @ISA = CFClient::UI::HBox::;
2482
2483sub new {
2484 my $class = shift;
2485
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new (
2496 can_hover => 1,
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542
2543#############################################################################
2544
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_,
2555 );
2556
2557 $self
2558}
2559
2560sub set_items {
2561 my ($self, $items) = @_;
2562
2563 $self->{scrolled}->clear;
2564 return unless $items;
2565
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2567
2568 $self->{real_items} = \@items;
2569
2570 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2
2572 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}";
2574
2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2576 }
2577
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579}
2580
2581sub size_request {
2582 my ($self) = @_;
2583 ($self->{req_w}, $self->{req_h});
2584}
2585
2586#############################################################################
2587
2588package CFClient::UI::Menu;
2589
2590our @ISA = CFClient::UI::FancyFrame::;
2591
2592use CFClient::OpenGL;
2593
2594sub new {
2595 my $class = shift;
2596
2597 my $self = $class->SUPER::new (
2598 items => [],
2599 z => 100,
2600 @_,
2601 );
2602
2603 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2604
2605 for my $item (@{ $self->{items} }) {
2606 my ($widget, $cb) = @$item;
2607
2608 # handle various types of items, only text for now
2609 if (!ref $widget) {
2610 $widget = new CFClient::UI::Label
2611 can_hover => 1,
2612 can_events => 1,
2613 text => $widget;
2614 }
2615
2616 $self->{item}{$widget} = $item;
2617
2618 $self->{vbox}->add ($widget);
2619 }
2620
2621 $self
2622}
2623
2624# popup given the event (must be a mouse button down event currently)
2625sub popup {
2626 my ($self, $ev) = @_;
2627
2628 $self->emit ("popdown");
2629
2630 # maybe save $GRAB? must be careful about events...
2631 $GRAB = $self;
2632 $self->{button} = $ev->{button};
2633
2634 $self->show;
2635 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2636}
2637
2638sub mouse_motion {
2639 my ($self, $ev, $x, $y) = @_;
2640
2641 # TODO: should use vbox->find_widget or so
2642 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2643 $self->{hover} = $self->{item}{$HOVER};
2644}
2645
2646sub button_up {
2647 my ($self, $ev, $x, $y) = @_;
2648
2649 if ($ev->{button} == $self->{button}) {
2650 undef $GRAB;
2651 $self->hide;
2652
2653 $self->emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover};
2655 }
2656}
2657
2658#############################################################################
2659
2325package CFClient::UI::Root; 2660package CFClient::UI::Root;
2326 2661
2327our @ISA = CFClient::UI::Container::; 2662our @ISA = CFClient::UI::Container::;
2328 2663
2329use CFClient::OpenGL; 2664use CFClient::OpenGL;
2330 2665
2331sub check_size { 2666sub new {
2332 my ($self) = @_; 2667 my $class = shift;
2333 2668
2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2669 $class->SUPER::new (
2335} 2670 @_,
2336 2671 )
2337sub size_request {
2338 ($::WIDTH, $::HEIGHT)
2339} 2672}
2340 2673
2341sub configure { 2674sub configure {
2342 my ($self, $x, $y, $w, $h) = @_; 2675 my ($self, $x, $y, $w, $h) = @_;
2343 2676
2344 $self->SUPER::configure ($x, $y, $w, $h); 2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2345 2680
2681sub check_size {
2682 my ($self) = @_;
2683
2684 $self->size_allocate ($self->{w}, $self->{h})
2685 if $self->{w};
2686}
2687
2688sub size_request {
2689 my ($self) = @_;
2690
2691 ($self->{w}, $self->{h})
2692}
2693
2694sub size_allocate {
2695 my ($self, $w, $h) = @_;
2696
2697 my $old_w = $self->{old_w};
2698 my $old_h = $self->{old_h};
2699
2700 if ($old_w && $old_h) {
2701 for my $child ($self->children) {
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712
2346 for my $child (@{$self->{children}}) { 2713 for my $child ($self->children) {
2347 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2348 2715
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2716 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2350 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2351 $child->configure ($X, $Y, $W,$H); 2718 $child->configure ($X, $Y, $W, $H);
2352 } 2719 }
2353}
2354 2720
2355sub _topleft { 2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723}
2724
2725sub coord2local {
2356 my ($self, $x, $y) = @_; 2726 my ($self, $x, $y) = @_;
2357 2727
2358 ($x, $y) 2728 ($x, $y)
2359} 2729}
2360 2730
2731sub coord2global {
2732 my ($self, $x, $y) = @_;
2733
2734 ($x, $y)
2735}
2736
2361sub update { 2737sub update {
2362 my ($self) = @_; 2738 my ($self) = @_;
2363 2739
2364 $self->check_size; 2740 $self->check_size;
2365 ::refresh (); 2741 $::WANT_REFRESH++;
2366} 2742}
2367 2743
2368sub add { 2744sub add {
2369 my ($self, $child) = @_; 2745 my ($self, $child) = @_;
2370 2746
2371 # integerize window positions 2747 # integerise window positions
2372 $child->{x} = int $child->{x}; 2748 $child->{x} = int $child->{x};
2373 $child->{y} = int $child->{y}; 2749 $child->{y} = int $child->{y};
2374 2750
2375 $self->SUPER::add ($child); 2751 $self->SUPER::add ($child);
2376} 2752}
… …
2379 my ($self, $id, $cb) = @_; 2755 my ($self, $id, $cb) = @_;
2380 2756
2381 $self->{refresh_hook}{$id} = $cb; 2757 $self->{refresh_hook}{$id} = $cb;
2382} 2758}
2383 2759
2384sub draw { 2760sub draw {
2385 my ($self) = @_; 2761 my ($self) = @_;
2386 2762
2763 if ($self->{check_size}) {
2764 my @queue = ([], []);
2765
2766 for (;;) {
2767 if ($self->{check_size}) {
2768 # heuristic: check containers last
2769 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2770 for values %{delete $self->{check_size}}
2771 }
2772
2773 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2774
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request;
2778
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781
2782 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h;
2784
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2786
2787 $widget->{parent}->check_size
2788 if $widget->{parent};
2789 }
2790 }
2791 }
2792
2793 while ($self->{size_alloc}) {
2794 for (values %{delete $self->{size_alloc}}) {
2795 my ($widget, $w, $h) = @$_;
2796
2797 $w = 0 if $w < 0;
2798 $h = 0 if $h < 0;
2799
2800 $widget->{w} = $w;
2801 $widget->{h} = $h;
2802 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h);
2804 }
2805 }
2806
2387 while (my $rcb = delete $self->{refresh_hook}) { 2807 while ($self->{refresh_hook}) {
2388 $_->() for values %$rcb; 2808 $_->()
2809 for values %{delete $self->{refresh_hook}};
2389 } 2810 }
2390 2811
2391 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2812 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2392 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2393 glClear GL_COLOR_BUFFER_BIT; 2814 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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