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.191 by root, Tue May 9 22:27:53 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) {
… …
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 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258}
259
241sub set_max_size { 260sub set_max_size {
242 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
243 262
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
246}
247
248# return top left coordinates
249sub _topleft {
250 my ($self, $x, $y) = @_;
251
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253} 265}
254 266
255# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
256sub coord2local { 268sub coord2local {
257 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
258 270
259 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 272}
262 273
263# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
264sub coord2global { 275sub coord2global {
265 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
266 277
267 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 279}
270 280
271sub focus_in { 281sub focus_in {
272 my ($self) = @_; 282 my ($self) = @_;
273 283
… …
370} 380}
371 381
372sub set_parent { 382sub set_parent {
373 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
374 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
375 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
376} 387}
377 388
378sub check_size { 389sub check_size {
379 my ($self) = @_; 390 my ($self) = @_;
380 391
381 $self->{parent} 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 393}
403 394
404sub update { 395sub update {
405 my ($self) = @_; 396 my ($self) = @_;
406 397
… …
492sub new { 483sub new {
493 my ($class, %arg) = @_; 484 my ($class, %arg) = @_;
494 485
495 my $children = delete $arg{children} || []; 486 my $children = delete $arg{children} || [];
496 487
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 488 my $self = $class->SUPER::new (
489 children => [],
490 can_events => 0,
491 %arg,
492 );
498 $self->add ($_) for @$children; 493 $self->add ($_) for @$children;
499 494
500 $self 495 $self
501} 496}
502 497
503sub add { 498sub add {
504 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
505 500
506 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
507 503
508 use sort 'stable'; 504 use sort 'stable';
509 505
510 $self->{children} = [ 506 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
513 ]; 509 ];
514 510
515 $child->check_size; 511 $_->check_size
512 for @widgets;
513
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
516} 519}
517 520
518sub remove { 521sub remove {
519 my ($self, $child) = @_; 522 my ($self, $child) = @_;
520 523
… …
535 538
536 for (@$children) { 539 for (@$children) {
537 delete $_->{parent}; 540 delete $_->{parent};
538 $_->hide; 541 $_->hide;
539 } 542 }
543
544 $self->check_size;
545 $self->update;
540} 546}
541 547
542sub find_widget { 548sub find_widget {
543 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
544 550
… …
619} 625}
620 626
621sub update { 627sub update {
622 my ($self) = @_; 628 my ($self) = @_;
623 629
624 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 631 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 632}
638 633
639sub size_allocate { 634sub size_allocate {
640 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
641 636
642 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
643 640
641sub _render {
642 $_[0]{children}[0]->draw;
643}
644
645sub render_child {
646 my ($self) = @_;
647
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT;
651
644 $self->render_chld; 652 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 };
645} 661}
646 662
647sub _draw { 663sub _draw {
648 my ($self) = @_; 664 my ($self) = @_;
649 665
… …
651 667
652 my $tex = $self->{texture} 668 my $tex = $self->{texture}
653 or return; 669 or return;
654 670
655 glEnable GL_BLEND; 671 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1;
659 676
660 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
661 678
662 glDisable GL_BLEND; 679 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
667 684
668package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
669 686
670our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
671 688
672sub new { die }
673
674sub size_request { 689sub size_request {
675 my ($self) = @_; 690 my ($self) = @_;
676 691
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
679 694
680 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
681} 696}
682 697
683sub _draw { 698sub size_allocate {
684 my ($self) = @_; 699 my ($self, $w, $h) = @_;
685 700
686 $self->{children}[1]->draw; 701 $self->update;
687} 702}
688 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
706
707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
751package CFClient::UI::ScrolledWindow;
752
753our @ISA = CFClient::UI::HBox::;
754
755sub new {
756 my $class = shift;
757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort),
770 slider => $slider,
771 @_,
772 );
773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
689 783
690############################################################################# 784#############################################################################
691 785
692package CFClient::UI::Frame; 786package CFClient::UI::Frame;
693 787
… …
748 my $class = shift; 842 my $class = shift;
749 843
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 => 1, 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;
… …
1151 1259
1152sub new { 1260sub new {
1153 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1154 1262
1155 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1157 #font => default_font 1265 #font => default_font
1158 fontsize => 1, 1266 fontsize => 1,
1159 text => "", 1267 text => "",
1160 align => -1, 1268 align => -1,
1161 valign => -1, 1269 valign => -1,
1162 padding => 2, 1270 padding => 2,
1163 layout => new CFClient::Layout, 1271 layout => new CFClient::Layout,
1164 can_events => 0, 1272 can_events => 0,
1165 %arg 1273 %arg
1166 ); 1274 );
1167 1275
1168 if (exists $self->{template}) { 1276 if (exists $self->{template}) {
… …
1185 s/</&lt;/g; 1293 s/</&lt;/g;
1186 1294
1187 $_[1] 1295 $_[1]
1188} 1296}
1189 1297
1298sub update {
1299 my ($self) = @_;
1300
1301 delete $self->{texture};
1302 $self->SUPER::update;
1303}
1304
1190sub set_text { 1305sub set_text {
1191 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1192 1307
1308 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text";
1310
1193 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1194 1312
1195 delete $self->{texture}; 1313 $self->update;
1196 $self->check_size; 1314 $self->check_size;
1197 $self->update;
1198} 1315}
1199 1316
1200sub set_markup { 1317sub set_markup {
1201 my ($self, $markup) = @_; 1318 my ($self, $markup) = @_;
1202 1319
1320 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup";
1322
1203 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1204 1324
1205 delete $self->{texture}; 1325 $self->update;
1206 $self->check_size; 1326 $self->check_size;
1207 $self->update;
1208} 1327}
1209 1328
1210sub size_request { 1329sub size_request {
1211 my ($self) = @_; 1330 my ($self) = @_;
1212 1331
… …
1241sub set_fontsize { 1360sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1243 1362
1244 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1364 delete $self->{texture};
1365
1366 $self->update;
1246 $self->check_size; 1367 $self->check_size;
1247 $self->update;
1248} 1368}
1249 1369
1250sub _draw { 1370sub _draw {
1251 my ($self) = @_; 1371 my ($self) = @_;
1252 1372
… …
1292 1412
1293sub new { 1413sub new {
1294 my $class = shift; 1414 my $class = shift;
1295 1415
1296 $class->SUPER::new ( 1416 $class->SUPER::new (
1297 fg => [1, 1, 1], 1417 fg => [1, 1, 1],
1298 bg => [0, 0, 0, 0.2], 1418 bg => [0, 0, 0, 0.2],
1299 active_bg => [1, 1, 1, 0.5], 1419 active_bg => [1, 1, 1, 0.5],
1300 active_fg => [0, 0, 0], 1420 active_fg => [0, 0, 0],
1301 can_hover => 1, 1421 can_hover => 1,
1302 can_focus => 1, 1422 can_focus => 1,
1303 valign => 0, 1423 valign => 0,
1304 can_events => 1, 1424 can_events => 1,
1305 @_ 1425 @_
1306 ) 1426 )
1307} 1427}
1308 1428
… …
1462 my ($self, $ev) = @_; 1582 my ($self, $ev) = @_;
1463 1583
1464 my $sym = $ev->{sym}; 1584 my $sym = $ev->{sym};
1465 1585
1466 if ($sym == 13) { 1586 if ($sym == 13) {
1587 unshift @{$self->{history}},
1588 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1591 $self->emit (activate => $txt);
1468 $self->update; 1592 $self->update;
1593
1594 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text;
1597 }
1598 if (@{$self->{history} || []} > 0) {
1599 $self->{history_pointer}++;
1600 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1601 $self->{history_pointer} = @{$self->{history} || []} - 1;
1602 }
1603 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1604 }
1605
1606 } elsif ($sym == CFClient::SDLK_DOWN) {
1607 $self->{history_pointer}--;
1608 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1609
1610 if ($self->{history_pointer} >= 0) {
1611 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1612 } else {
1613 $self->set_text ($self->{history_saveback});
1614 }
1469 1615
1470 } else { 1616 } else {
1471 $self->SUPER::key_down ($ev); 1617 $self->SUPER::key_down ($ev);
1472 } 1618 }
1473 1619
… …
1487 1633
1488sub new { 1634sub new {
1489 my $class = shift; 1635 my $class = shift;
1490 1636
1491 $class->SUPER::new ( 1637 $class->SUPER::new (
1492 padding => 4, 1638 padding => 4,
1493 fg => [1, 1, 1], 1639 fg => [1, 1, 1],
1494 bg => [1, 1, 1, 0.2], 1640 bg => [1, 1, 1, 0.2],
1495 active_fg => [0, 0, 1], 1641 active_fg => [0, 0, 1],
1496 can_hover => 1, 1642 can_hover => 1,
1497 align => 0, 1643 align => 0,
1498 valign => 0, 1644 valign => 0,
1499 can_events => 1, 1645 can_events => 1,
1500 @_ 1646 @_
1501 ) 1647 )
1502} 1648}
1503 1649
… …
1710} 1856}
1711 1857
1712sub set_max { 1858sub set_max {
1713 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1714 1860
1861 return if $self->{max_val} == $max;
1862
1715 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1716} 1865}
1717 1866
1718sub set_value { 1867sub set_value {
1719 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1720 1869
1721 $self->set_max ($max) 1870 $self->set_max ($max)
1722 if defined $max; 1871 if defined $max;
1723 1872
1724 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1725 $self->{val} = $val; 1875 $self->{val} = $val;
1726
1727 $self->update; 1876 $self->update;
1728} 1877}
1729 1878
1730sub _draw { 1879sub _draw {
1731 my ($self) = @_; 1880 my ($self) = @_;
… …
1794 1943
1795sub new { 1944sub new {
1796 my ($class, %arg) = @_; 1945 my ($class, %arg) = @_;
1797 1946
1798 my $self = $class->SUPER::new ( 1947 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 1948 tooltip => $arg{type},
1949 can_hover => 1,
1800 can_events => 1, 1950 can_events => 1,
1801 can_hover => 1,
1802 %arg, 1951 %arg,
1803 ); 1952 );
1804 1953
1805 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1954 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1806 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1814 1963
1815 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1816 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1817} 1966}
1818 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1819sub set_value { 1975sub set_value {
1820 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1821 1977
1822 $self->set_max ($max) 1978 $self->set_max ($max)
1823 if defined $max; 1979 if defined $max;
1824 1980
1825 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1826 $self->{value}->set_text ($val); 1982 $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} 1983}
1835 1984
1836############################################################################# 1985#############################################################################
1837 1986
1838package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1857 # TODO: calculations are off 2006 # TODO: calculations are off
1858 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1859 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1860 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1861 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1862 req_w => 20, 2011 req_w => $::WIDTH / 80,
1863 req_h => 20, 2012 req_h => $::WIDTH / 80,
1864 vertical => 0, 2013 vertical => 0,
1865 can_hover => 1, 2014 can_hover => 1,
1866 inner_pad => 5, 2015 inner_pad => 5,
1867 @_ 2016 @_
1868 ); 2017 );
… …
1978 2127
1979sub new { 2128sub new {
1980 my $class = shift; 2129 my $class = shift;
1981 2130
1982 my $self = $class->SUPER::new ( 2131 my $self = $class->SUPER::new (
1983 fontsize => 1, 2132 fontsize => 1,
2133 can_events => 0,
1984 #font => default_font 2134 #font => default_font
1985 @_, 2135 @_,
1986 2136
1987 layout => (new CFClient::Layout), 2137 layout => (new CFClient::Layout),
1988 par => [], 2138 par => [],
1989 height => 0, 2139 height => 0,
1990 children => [ 2140 children => [
1991 (new CFClient::UI::Empty expand => 1), 2141 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2142 (new CFClient::UI::Slider vertical => 1),
1993 ], 2143 ],
1994 ); 2144 );
1995 2145
1996 $self->{children}[1]->connect (changed => sub { 2146 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2147
2000 $self 2148 $self
2001} 2149}
2002 2150
2003sub set_fontsize { 2151sub set_fontsize {
… …
2011 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
2012 2160
2013 my $layout = $self->{layout}; 2161 my $layout = $self->{layout};
2014 2162
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w}); 2164 $layout->set_width ($self->{children}[0]{w});
2017 $layout->set_text ($text); 2165 $layout->set_text ($text);
2018 2166
2019 ($layout->size)[1] 2167 ($layout->size)[1]
2020} 2168}
2021 2169
… …
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2075 2223
2076 delete $self->{texture}; 2224 delete $self->{texture};
2077 } 2225 }
2078 2226
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2080 glClearColor 0, 0, 0, 1; 2228 glClearColor 0, 0, 0, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2229 glClear GL_COLOR_BUFFER_BIT;
2082 2230
2083 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
… …
2117} 2265}
2118 2266
2119sub _draw { 2267sub _draw {
2120 my ($self) = @_; 2268 my ($self) = @_;
2121 2269
2122 if ($self->{texture}) { 2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2123 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1;
2125 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126 glDisable GL_TEXTURE_2D; 2276 glDisable GL_TEXTURE_2D;
2127 } 2277 glDisable GL_BLEND;
2128 2278
2129 $self->{children}[1]->draw; 2279 $self->{children}[1]->draw;
2130 2280
2131} 2281}
2132 2282
… …
2180 2330
2181sub new { 2331sub new {
2182 my $class = shift; 2332 my $class = shift;
2183 2333
2184 my $self = $class->SUPER::new ( 2334 my $self = $class->SUPER::new (
2185 state => 0, 2335 state => 0,
2186 connect_activate => \&toggle_flopper, 2336 connect_activate => \&toggle_flopper,
2187 can_events => 1,
2188 @_ 2337 @_
2189 ); 2338 );
2190 2339
2191 if ($self->{state}) { 2340 if ($self->{state}) {
2192 $self->{state} = 0; 2341 $self->{state} = 0;
… …
2302 2451
2303sub size_request { 2452sub size_request {
2304 (32, 8) 2453 (32, 8)
2305} 2454}
2306 2455
2307sub draw { 2456sub _draw {
2308 my ($self) = @_; 2457 my ($self) = @_;
2309 2458
2459 return unless $::CONN;#d# manage and cache textures differently
2310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2311 2461
2462 # TODO animation
2312 if ($tex) { 2463 if ($tex) {
2313 glEnable GL_BLEND; 2464 glEnable GL_BLEND;
2314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315 glEnable GL_TEXTURE_2D; 2466 glEnable GL_TEXTURE_2D;
2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2321 } 2472 }
2322} 2473}
2323 2474
2324############################################################################# 2475#############################################################################
2325 2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_;
2556
2557 $self->{scrolled}->clear;
2558 return unless $items;
2559
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578}
2579
2580#############################################################################
2581
2582package CFClient::UI::Menu;
2583
2584our @ISA = CFClient::UI::FancyFrame::;
2585
2586use CFClient::OpenGL;
2587
2588sub new {
2589 my $class = shift;
2590
2591 my $self = $class->SUPER::new (
2592 items => [],
2593 z => 100,
2594 @_,
2595 );
2596
2597 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2598
2599 for my $item (@{ $self->{items} }) {
2600 my ($widget, $cb) = @$item;
2601
2602 # handle various types of items, only text for now
2603 if (!ref $widget) {
2604 $widget = new CFClient::UI::Label
2605 can_hover => 1,
2606 can_events => 1,
2607 text => $widget;
2608 }
2609
2610 $self->{item}{$widget} = $item;
2611
2612 $self->{vbox}->add ($widget);
2613 }
2614
2615 $self
2616}
2617
2618# popup given the event (must be a mouse button down event currently)
2619sub popup {
2620 my ($self, $ev) = @_;
2621
2622 $self->emit ("popdown");
2623
2624 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self;
2626 $self->{button} = $ev->{button};
2627
2628 $self->show;
2629 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2630}
2631
2632sub mouse_motion {
2633 my ($self, $ev, $x, $y) = @_;
2634
2635 # TODO: should use vbox->find_widget or so
2636 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2637 $self->{hover} = $self->{item}{$HOVER};
2638}
2639
2640sub button_up {
2641 my ($self, $ev, $x, $y) = @_;
2642
2643 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB;
2645 $self->hide;
2646
2647 $self->emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover};
2649 }
2650}
2651
2652#############################################################################
2653
2326package CFClient::UI::Root; 2654package CFClient::UI::Root;
2327 2655
2328our @ISA = CFClient::UI::Container::; 2656our @ISA = CFClient::UI::Container::;
2329 2657
2330use CFClient::OpenGL; 2658use CFClient::OpenGL;
2331 2659
2332sub check_size { 2660sub new {
2333 my ($self) = @_; 2661 my $class = shift;
2334 2662
2335 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2663 $class->SUPER::new (
2336} 2664 @_,
2337 2665 )
2338sub size_request {
2339 ($::WIDTH, $::HEIGHT)
2340} 2666}
2341 2667
2342sub configure { 2668sub configure {
2343 my ($self, $x, $y, $w, $h) = @_; 2669 my ($self, $x, $y, $w, $h) = @_;
2344 2670
2345 $self->SUPER::configure ($x, $y, $w, $h); 2671 $self->{w} = $w;
2672 $self->{h} = $h;
2673}
2346 2674
2675sub check_size {
2676 my ($self) = @_;
2677
2678 $self->size_allocate ($self->{w}, $self->{h})
2679 if $self->{w};
2680}
2681
2682sub size_request {
2683 my ($self) = @_;
2684
2685 ($self->{w}, $self->{h})
2686}
2687
2688sub size_allocate {
2689 my ($self, $w, $h) = @_;
2690
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2347 for my $child (@{$self->{children}}) { 2707 for my $child ($self->children) {
2348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2349 2709
2350 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2710 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2351 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2352 $child->configure ($X, $Y, $W,$H); 2712 $child->configure ($X, $Y, $W, $H);
2353 } 2713 }
2354}
2355 2714
2356sub _topleft { 2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717}
2718
2719sub coord2local {
2357 my ($self, $x, $y) = @_; 2720 my ($self, $x, $y) = @_;
2358 2721
2359 ($x, $y) 2722 ($x, $y)
2360} 2723}
2361 2724
2725sub coord2global {
2726 my ($self, $x, $y) = @_;
2727
2728 ($x, $y)
2729}
2730
2362sub update { 2731sub update {
2363 my ($self) = @_; 2732 my ($self) = @_;
2364 2733
2365 $self->check_size; 2734 $self->check_size;
2366 ::refresh (); 2735 $::WANT_REFRESH++;
2367} 2736}
2368 2737
2369sub add { 2738sub add {
2370 my ($self, $child) = @_; 2739 my ($self, $child) = @_;
2371 2740
2372 # integerize window positions 2741 # integerise window positions
2373 $child->{x} = int $child->{x}; 2742 $child->{x} = int $child->{x};
2374 $child->{y} = int $child->{y}; 2743 $child->{y} = int $child->{y};
2375 2744
2376 $self->SUPER::add ($child); 2745 $self->SUPER::add ($child);
2377} 2746}
… …
2380 my ($self, $id, $cb) = @_; 2749 my ($self, $id, $cb) = @_;
2381 2750
2382 $self->{refresh_hook}{$id} = $cb; 2751 $self->{refresh_hook}{$id} = $cb;
2383} 2752}
2384 2753
2385sub draw { 2754sub draw {
2386 my ($self) = @_; 2755 my ($self) = @_;
2387 2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795
2388 while (my $rcb = delete $self->{refresh_hook}) { 2796 while ($self->{refresh_hook}) {
2389 $_->() for values %$rcb; 2797 $_->()
2798 for values %{delete $self->{refresh_hook}};
2390 } 2799 }
2391 2800
2392 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2801 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2393 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2394 glClear GL_COLOR_BUFFER_BIT; 2803 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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