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.167 by elmex, Mon Apr 24 08:44:23 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
… …
503 496
504 $self 497 $self
505} 498}
506 499
507sub add { 500sub add {
508 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
509 502
510 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
511 505
512 use sort 'stable'; 506 use sort 'stable';
513 507
514 $self->{children} = [ 508 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
517 ]; 511 ];
518 512
519 $child->check_size; 513 $self->check_size;
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
520} 519}
521 520
522sub remove { 521sub remove {
523 my ($self, $child) = @_; 522 my ($self, $child) = @_;
524 523
… …
539 538
540 for (@$children) { 539 for (@$children) {
541 delete $_->{parent}; 540 delete $_->{parent};
542 $_->hide; 541 $_->hide;
543 } 542 }
543
544 $self->check_size;
545 $self->update;
544} 546}
545 547
546sub find_widget { 548sub find_widget {
547 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
548 550
… …
623} 625}
624 626
625sub update { 627sub update {
626 my ($self) = @_; 628 my ($self) = @_;
627 629
628 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 631 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 632}
642 633
643sub size_allocate { 634sub size_allocate {
644 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
645 636
646 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
647 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
648 $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 };
649} 661}
650 662
651sub _draw { 663sub _draw {
652 my ($self) = @_; 664 my ($self) = @_;
653 665
… …
655 667
656 my $tex = $self->{texture} 668 my $tex = $self->{texture}
657 or return; 669 or return;
658 670
659 glEnable GL_BLEND; 671 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
662 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;
663 676
664 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
665 678
666 glDisable GL_BLEND; 679 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
671 684
672package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
673 686
674our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
675 688
676sub new { die }
677
678sub size_request { 689sub size_request {
679 my ($self) = @_; 690 my ($self) = @_;
680 691
681 @$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)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
683 694
684 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
685} 696}
686 697
687sub _draw { 698sub size_allocate {
688 my ($self) = @_; 699 my ($self, $w, $h) = @_;
689 700
690 $self->{children}[1]->draw; 701 $self->update;
691} 702}
692 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
693 783
694############################################################################# 784#############################################################################
695 785
696package CFClient::UI::Frame; 786package CFClient::UI::Frame;
697 787
… …
754 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
755 845
756 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
759 border => 0.8, 849 border => 0.6,
760 can_events => 1, 850 can_events => 1,
761 @_ 851 @_
762 ); 852 );
763 853
764 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 855 align => 0,
766 valign => 1, 856 valign => 1,
767 text => $self->{title}, 857 text => $self->{title},
768 fontsize => 1; 858 fontsize => $self->{border};
769 859
770 $self 860 $self
771} 861}
772 862
773sub border { 863sub border {
… …
798} 888}
799 889
800sub button_down { 890sub button_down {
801 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
802 892
893 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 894 my $border = $self->border;
804 895
805 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
810 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
811 $self->{motion} = sub { 907 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
813 909
814 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
815 912
816 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 916 $self->check_size;
819 }; 917 };
820 918
821 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
826 922
827 $self->{motion} = sub { 923 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
864 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
868 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 966 my $bg = $tex[0];
870 967
871 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
874 971
875 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
876 973
877 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
881 978
882 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
884 982
885 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
886 $self->child->draw; 985 $self->child->draw;
887} 986}
888 987
889############################################################################# 988#############################################################################
890 989
… …
912 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
913 1012
914 $child->check_size; 1013 $child->check_size;
915} 1014}
916 1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
917# 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?
918sub clear { 1021sub clear {
919 my ($self) = @_; 1022 my ($self) = @_;
920 1023
921 my $children = delete $self->{children}; 1024 my @children = $self->children;
1025 delete $self->{children};
922 1026
923 for (grep $_, map @$_, grep $_, @$children) { 1027 for (@children) {
924 delete $_->{parent}; 1028 delete $_->{parent};
925 $_->hide; 1029 $_->hide;
926 } 1030 }
927 1031
928 $self->update; 1032 $self->update;
… …
1108 ) 1212 )
1109} 1213}
1110 1214
1111sub size_allocate { 1215sub size_allocate {
1112 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1113 1219
1114 my $children = $self->{children}; 1220 my $children = $self->{children};
1115 1221
1116 my @h = map $_->{req_h}, @$children; 1222 my @h = map $_->{req_h}, @$children;
1117 1223
… …
1189 s/</&lt;/g; 1295 s/</&lt;/g;
1190 1296
1191 $_[1] 1297 $_[1]
1192} 1298}
1193 1299
1300sub update {
1301 my ($self) = @_;
1302
1303 delete $self->{texture};
1304 $self->SUPER::update;
1305}
1306
1194sub set_text { 1307sub set_text {
1195 my ($self, $text) = @_; 1308 my ($self, $text) = @_;
1196 1309
1310 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text";
1312
1197 $self->{layout}->set_text ($text); 1313 $self->{layout}->set_text ($text);
1198 1314
1199 delete $self->{texture}; 1315 $self->update;
1200 $self->check_size; 1316 $self->check_size;
1201 $self->update;
1202} 1317}
1203 1318
1204sub set_markup { 1319sub set_markup {
1205 my ($self, $markup) = @_; 1320 my ($self, $markup) = @_;
1206 1321
1322 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup";
1324
1207 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1208 1326
1209 delete $self->{texture}; 1327 $self->update;
1210 $self->check_size; 1328 $self->check_size;
1211 $self->update;
1212} 1329}
1213 1330
1214sub size_request { 1331sub size_request {
1215 my ($self) = @_; 1332 my ($self) = @_;
1216 1333
… …
1245sub set_fontsize { 1362sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1247 1364
1248 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1250 $self->check_size; 1369 $self->check_size;
1251 $self->update;
1252} 1370}
1253 1371
1254sub _draw { 1372sub _draw {
1255 my ($self) = @_; 1373 my ($self) = @_;
1256 1374
… …
1469 1587
1470 if ($sym == 13) { 1588 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1589 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1590 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1591 $self->{history_pointer} = -1;
1592 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1593 $self->emit (activate => $txt);
1475 $self->update; 1594 $self->update;
1476 1595
1477 } elsif ($sym == CFClient::SDLK_UP) { 1596 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1597 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1598 $self->{history_saveback} = $self->get_text;
1480 } 1599 }
1600 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1601 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1602 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1603 $self->{history_pointer} = @{$self->{history} || []} - 1;
1604 }
1605 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1606 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1607
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1608 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1609 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1610 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1611
… …
1737} 1858}
1738 1859
1739sub set_max { 1860sub set_max {
1740 my ($self, $max) = @_; 1861 my ($self, $max) = @_;
1741 1862
1863 return if $self->{max_val} == $max;
1864
1742 $self->{max_val} = $max; 1865 $self->{max_val} = $max;
1866 $self->update;
1743} 1867}
1744 1868
1745sub set_value { 1869sub set_value {
1746 my ($self, $val, $max) = @_; 1870 my ($self, $val, $max) = @_;
1747 1871
1748 $self->set_max ($max) 1872 $self->set_max ($max)
1749 if defined $max; 1873 if defined $max;
1750 1874
1751 $max = $self->{max_val}; 1875 return if $self->{val} == $val;
1876
1752 $self->{val} = $val; 1877 $self->{val} = $val;
1753
1754 $self->update; 1878 $self->update;
1755} 1879}
1756 1880
1757sub _draw { 1881sub _draw {
1758 my ($self) = @_; 1882 my ($self) = @_;
… …
1821 1945
1822sub new { 1946sub new {
1823 my ($class, %arg) = @_; 1947 my ($class, %arg) = @_;
1824 1948
1825 my $self = $class->SUPER::new ( 1949 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 1950 tooltip => $arg{type},
1827 can_hover => 1, 1951 can_hover => 1,
1952 can_events => 1,
1828 %arg, 1953 %arg,
1829 ); 1954 );
1830 1955
1831 $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");
1832 $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);
… …
1840 1965
1841 $self->{value}->set_fontsize ($fsize); 1966 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 1967 $self->{max} ->set_fontsize ($fsize);
1843} 1968}
1844 1969
1970sub set_max {
1971 my ($self, $max) = @_;
1972
1973 $self->{gauge}->set_max ($max);
1974 $self->{max}->set_text ($max);
1975}
1976
1845sub set_value { 1977sub set_value {
1846 my ($self, $val, $max) = @_; 1978 my ($self, $val, $max) = @_;
1847 1979
1848 $self->set_max ($max) 1980 $self->set_max ($max)
1849 if defined $max; 1981 if defined $max;
1850 1982
1851 $self->{gauge}->set_value ($val, $max); 1983 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 1984 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 1985}
1861 1986
1862############################################################################# 1987#############################################################################
1863 1988
1864package CFClient::UI::Slider; 1989package CFClient::UI::Slider;
… …
1883 # TODO: calculations are off 2008 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2009 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2010 fg => [1, 1, 1],
1886 active_fg => [0, 0, 0], 2011 active_fg => [0, 0, 0],
1887 range => [0, 0, 100, 10], 2012 range => [0, 0, 100, 10],
1888 req_w => 20, 2013 req_w => $::WIDTH / 80,
1889 req_h => 20, 2014 req_h => $::WIDTH / 80,
1890 vertical => 0, 2015 vertical => 0,
1891 can_hover => 1, 2016 can_hover => 1,
1892 inner_pad => 5, 2017 inner_pad => 5,
1893 @_ 2018 @_
1894 ); 2019 );
… …
2018 (new CFClient::UI::Empty expand => 1), 2143 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2144 (new CFClient::UI::Slider vertical => 1),
2020 ], 2145 ],
2021 ); 2146 );
2022 2147
2023 $self->{children}[1]->connect (changed => sub { 2148 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2149
2027 $self 2150 $self
2028} 2151}
2029 2152
2030sub set_fontsize { 2153sub set_fontsize {
… …
2038 my ($self, $text) = @_; 2161 my ($self, $text) = @_;
2039 2162
2040 my $layout = $self->{layout}; 2163 my $layout = $self->{layout};
2041 2164
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w}); 2166 $layout->set_width ($self->{children}[0]{w});
2044 $layout->set_text ($text); 2167 $layout->set_text ($text);
2045 2168
2046 ($layout->size)[1] 2169 ($layout->size)[1]
2047} 2170}
2048 2171
… …
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2102 2225
2103 delete $self->{texture}; 2226 delete $self->{texture};
2104 } 2227 }
2105 2228
2106 $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 {
2107 glClearColor 0, 0, 0, 1; 2230 glClearColor 0, 0, 0, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2231 glClear GL_COLOR_BUFFER_BIT;
2109 2232
2110 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D; 2235 glEnable GL_TEXTURE_2D;
… …
2144} 2267}
2145 2268
2146sub _draw { 2269sub _draw {
2147 my ($self) = @_; 2270 my ($self) = @_;
2148 2271
2149 if ($self->{texture}) { 2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2151 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;
2152 $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});
2153 glDisable GL_TEXTURE_2D; 2278 glDisable GL_TEXTURE_2D;
2154 } 2279 glDisable GL_BLEND;
2155 2280
2156 $self->{children}[1]->draw; 2281 $self->{children}[1]->draw;
2157 2282
2158} 2283}
2159 2284
… …
2328 2453
2329sub size_request { 2454sub size_request {
2330 (32, 8) 2455 (32, 8)
2331} 2456}
2332 2457
2333sub draw { 2458sub _draw {
2334 my ($self) = @_; 2459 my ($self) = @_;
2335 2460
2461 return unless $::CONN;#d# manage and cache textures differently
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337 2463
2464 # TODO animation
2338 if ($tex) { 2465 if ($tex) {
2339 glEnable GL_BLEND; 2466 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D; 2468 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2347 } 2474 }
2348} 2475}
2349 2476
2350############################################################################# 2477#############################################################################
2351 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
2352package CFClient::UI::Root; 2660package CFClient::UI::Root;
2353 2661
2354our @ISA = CFClient::UI::Container::; 2662our @ISA = CFClient::UI::Container::;
2355 2663
2356use CFClient::OpenGL; 2664use CFClient::OpenGL;
2357 2665
2358sub check_size { 2666sub new {
2359 my ($self) = @_; 2667 my $class = shift;
2360 2668
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2669 $class->SUPER::new (
2362} 2670 @_,
2363 2671 )
2364sub size_request {
2365 ($::WIDTH, $::HEIGHT)
2366} 2672}
2367 2673
2368sub configure { 2674sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 2675 my ($self, $x, $y, $w, $h) = @_;
2370 2676
2371 $self->SUPER::configure ($x, $y, $w, $h); 2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2372 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
2373 for my $child (@{$self->{children}}) { 2713 for my $child ($self->children) {
2374 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)};
2375 2715
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2716 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H); 2718 $child->configure ($X, $Y, $W, $H);
2379 } 2719 }
2380}
2381 2720
2382sub _topleft { 2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723}
2724
2725sub coord2local {
2383 my ($self, $x, $y) = @_; 2726 my ($self, $x, $y) = @_;
2384 2727
2385 ($x, $y) 2728 ($x, $y)
2386} 2729}
2387 2730
2731sub coord2global {
2732 my ($self, $x, $y) = @_;
2733
2734 ($x, $y)
2735}
2736
2388sub update { 2737sub update {
2389 my ($self) = @_; 2738 my ($self) = @_;
2390 2739
2391 $self->check_size; 2740 $self->check_size;
2392 ::refresh (); 2741 $::WANT_REFRESH++;
2393} 2742}
2394 2743
2395sub add { 2744sub add {
2396 my ($self, $child) = @_; 2745 my ($self, $child) = @_;
2397 2746
2398 # integerize window positions 2747 # integerise window positions
2399 $child->{x} = int $child->{x}; 2748 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y}; 2749 $child->{y} = int $child->{y};
2401 2750
2402 $self->SUPER::add ($child); 2751 $self->SUPER::add ($child);
2403} 2752}
… …
2406 my ($self, $id, $cb) = @_; 2755 my ($self, $id, $cb) = @_;
2407 2756
2408 $self->{refresh_hook}{$id} = $cb; 2757 $self->{refresh_hook}{$id} = $cb;
2409} 2758}
2410 2759
2411sub draw { 2760sub draw {
2412 my ($self) = @_; 2761 my ($self) = @_;
2413 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
2414 while (my $rcb = delete $self->{refresh_hook}) { 2807 while ($self->{refresh_hook}) {
2415 $_->() for values %$rcb; 2808 $_->()
2809 for values %{delete $self->{refresh_hook}};
2416 } 2810 }
2417 2811
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2812 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 2814 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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