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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.192 by root, Tue May 9 22:49:32 2006 UTC

… …
232 $self->{y} = $y; 232 $self->{y} = $y;
233 $self->update; 233 $self->update;
234 } 234 }
235 235
236 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 238 }
243} 239}
244 240
245sub size_allocate { 241sub size_allocate {
246 # nothing to be done 242 # nothing to be done
247} 243}
248 244
249sub children { 245sub children {
250} 246}
251 247
252# call when resoltuion changes etc. 248# call when resolution changes etc.
253sub reconfigure { 249sub reconfigure {
254 my ($self) = @_; 250 my ($self) = @_;
255 251
256 $_->reconfigure 252 $_->reconfigure
257 for $self->children; 253 for $self->children;
258 254
259 $_->check_size; 255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
260} 258}
261 259
262sub set_max_size { 260sub set_max_size {
263 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
264 262
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277} 265}
278 266
279# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
280sub coord2local { 268sub coord2local {
281 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
282 270
283 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 272}
286 273
287# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
288sub coord2global { 275sub coord2global {
289 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
290 277
291 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 279}
294 280
295sub focus_in { 281sub focus_in {
296 my ($self) = @_; 282 my ($self) = @_;
297 283
… …
394} 380}
395 381
396sub set_parent { 382sub set_parent {
397 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
398 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
399 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
400} 387}
401 388
402sub check_size { 389sub check_size {
403 my ($self) = @_; 390 my ($self) = @_;
404 391
405 $self->{parent} 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 393}
427 394
428sub update { 395sub update {
429 my ($self) = @_; 396 my ($self) = @_;
430 397
… …
527 494
528 $self 495 $self
529} 496}
530 497
531sub add { 498sub add {
532 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
533 500
534 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
535 503
536 use sort 'stable'; 504 use sort 'stable';
537 505
538 $self->{children} = [ 506 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
541 ]; 509 ];
542 510
543 $child->check_size; 511 $_->check_size
512 for @widgets;
513
514 $self->update;
544} 515}
545 516
546sub children { 517sub children {
547 @{ $_[0]{children} } 518 @{ $_[0]{children} }
548} 519}
… …
567 538
568 for (@$children) { 539 for (@$children) {
569 delete $_->{parent}; 540 delete $_->{parent};
570 $_->hide; 541 $_->hide;
571 } 542 }
543
544 $self->check_size;
545 $self->update;
572} 546}
573 547
574sub find_widget { 548sub find_widget {
575 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
576 550
… …
662 636
663 $self->SUPER::size_allocate ($w, $h); 637 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 638 $self->update;
665} 639}
666 640
641sub _render {
642 $_[0]{children}[0]->draw;
643}
644
667sub render_child { 645sub render_child {
668 my ($self) = @_; 646 my ($self) = @_;
669 647
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 649 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 650 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 651
652 $self->_render;
674# glColorMask 1, 1, 1, 0; 653# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 654# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 656# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 657# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
705 684
706package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
707 686
708our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
709 688
710sub new { die }
711
712sub size_request { 689sub size_request {
713 my ($self) = @_; 690 my ($self) = @_;
714 691
715 @$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)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 694
718 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
719} 696}
720 697
721sub _draw { 698sub size_allocate {
722 my ($self) = @_; 699 my ($self, $w, $h) = @_;
723 700
724 $self->{children}[1]->draw; 701 $self->update;
725} 702}
726 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
727 783
728############################################################################# 784#############################################################################
729 785
730package CFClient::UI::Frame; 786package CFClient::UI::Frame;
731 787
… …
788 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
789 845
790 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
793 border => 0.8, 849 border => 0.6,
794 can_events => 1, 850 can_events => 1,
795 @_ 851 @_
796 ); 852 );
797 853
798 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 855 align => 0,
800 valign => 1, 856 valign => 1,
801 text => $self->{title}, 857 text => $self->{title},
802 fontsize => 1; 858 fontsize => $self->{border};
803 859
804 $self 860 $self
805} 861}
806 862
807sub border { 863sub border {
… …
832} 888}
833 889
834sub button_down { 890sub button_down {
835 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
836 892
893 my ($w, $h) = @$self{qw(w h)};
837 my $border = $self->border; 894 my $border = $self->border;
838 895
839 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
840 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
841 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
842 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
843 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
844 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
845 $self->{motion} = sub { 907 $self->{motion} = sub {
846 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
847 909
848 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
849 912
850 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
851 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
852 $self->check_size; 916 $self->check_size;
853 }; 917 };
854 918
855 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
856 && $y >= 0 && $y < $border) {
857
858 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
859 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
860 922
861 $self->{motion} = sub { 923 $self->{motion} = sub {
862 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
898 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
899 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
900 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
901 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
902 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
903 my $bg = $tex[0]; 966 my $bg = $tex[0];
904 967
905 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
906 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
907 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
908 971
909 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
910 973
911 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
912 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
913 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
914 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
915 978
916 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
917 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
918 982
919 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
920 $self->child->draw; 985 $self->child->draw;
921} 986}
922 987
923############################################################################# 988#############################################################################
924 989
… …
1235 1300
1236 delete $self->{texture}; 1301 delete $self->{texture};
1237 $self->SUPER::update; 1302 $self->SUPER::update;
1238} 1303}
1239 1304
1240sub reconfigure {
1241 my ($self) = @_;
1242
1243 delete $self->{texture};
1244}
1245
1246sub set_text { 1305sub set_text {
1247 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1248 1307
1249 return if $self->{text} eq "T$text"; 1308 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text"; 1309 $self->{text} = "T$text";
1251 1310
1252 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1253 1312
1254 delete $self->{texture};
1255 $self->update; 1313 $self->update;
1256 $self->check_size; 1314 $self->check_size;
1257} 1315}
1258 1316
1259sub set_markup { 1317sub set_markup {
… …
1262 return if $self->{text} eq "M$markup"; 1320 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup"; 1321 $self->{text} = "M$markup";
1264 1322
1265 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1266 1324
1267 delete $self->{texture};
1268 $self->update; 1325 $self->update;
1269 $self->check_size; 1326 $self->check_size;
1270} 1327}
1271 1328
1272sub size_request { 1329sub size_request {
… …
1303sub set_fontsize { 1360sub set_fontsize {
1304 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1305 1362
1306 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1307 delete $self->{texture}; 1364 delete $self->{texture};
1365
1366 $self->update;
1308 $self->check_size; 1367 $self->check_size;
1309 $self->update;
1310} 1368}
1311 1369
1312sub _draw { 1370sub _draw {
1313 my ($self) = @_; 1371 my ($self) = @_;
1314 1372
… …
1948 # TODO: calculations are off 2006 # TODO: calculations are off
1949 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1950 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1951 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1952 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1953 req_w => 20, 2011 req_w => $::WIDTH / 80,
1954 req_h => 20, 2012 req_h => $::WIDTH / 80,
1955 vertical => 0, 2013 vertical => 0,
1956 can_hover => 1, 2014 can_hover => 1,
1957 inner_pad => 5, 2015 inner_pad => 5,
1958 @_ 2016 @_
1959 ); 2017 );
… …
2083 (new CFClient::UI::Empty expand => 1), 2141 (new CFClient::UI::Empty expand => 1),
2084 (new CFClient::UI::Slider vertical => 1), 2142 (new CFClient::UI::Slider vertical => 1),
2085 ], 2143 ],
2086 ); 2144 );
2087 2145
2088 $self->{children}[1]->connect (changed => sub { 2146 $self->{children}[1]->connect (changed => sub { $self->update });
2089 $self->update;
2090 });
2091 2147
2092 $self 2148 $self
2093} 2149}
2094 2150
2095sub set_fontsize { 2151sub set_fontsize {
… …
2103 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
2104 2160
2105 my $layout = $self->{layout}; 2161 my $layout = $self->{layout};
2106 2162
2107 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2108 $layout->set_width ($self->{w}); 2164 $layout->set_width ($self->{children}[0]{w});
2109 $layout->set_text ($text); 2165 $layout->set_text ($text);
2110 2166
2111 ($layout->size)[1] 2167 ($layout->size)[1]
2112} 2168}
2113 2169
… …
2166 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2167 2223
2168 delete $self->{texture}; 2224 delete $self->{texture};
2169 } 2225 }
2170 2226
2171 $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 {
2172 glClearColor 0, 0, 0, 0; 2228 glClearColor 0, 0, 0, 0;
2173 glClear GL_COLOR_BUFFER_BIT; 2229 glClear GL_COLOR_BUFFER_BIT;
2174 2230
2175 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
2209} 2265}
2210 2266
2211sub _draw { 2267sub _draw {
2212 my ($self) = @_; 2268 my ($self) = @_;
2213 2269
2214 if ($self->{texture}) {
2215 glEnable GL_BLEND; 2270 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1; 2274 glColor 1, 1, 1, 1;
2220 $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});
2221 glDisable GL_TEXTURE_2D; 2276 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND; 2277 glDisable GL_BLEND;
2223 }
2224 2278
2225 $self->{children}[1]->draw; 2279 $self->{children}[1]->draw;
2226 2280
2227} 2281}
2228 2282
… …
2397 2451
2398sub size_request { 2452sub size_request {
2399 (32, 8) 2453 (32, 8)
2400} 2454}
2401 2455
2402sub draw { 2456sub _draw {
2403 my ($self) = @_; 2457 my ($self) = @_;
2404 2458
2459 return unless $::CONN;#d# manage and cache textures differently
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406 2461
2462 # TODO animation
2407 if ($tex) { 2463 if ($tex) {
2408 glEnable GL_BLEND; 2464 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D; 2466 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2416 } 2472 }
2417} 2473}
2418 2474
2419############################################################################# 2475#############################################################################
2420 2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = delete $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525
2526 $self->add (new CFClient::UI::Face
2527 can_events => 0,
2528 face => $item->{face},
2529 anim => $item->{anim},
2530 animspeed => $item->{animspeed},
2531 );
2532
2533 $self->add (new CFClient::UI::Label
2534 can_events => 0,
2535 text => $desc,
2536 );
2537
2538 $self
2539}
2540
2541#############################################################################
2542
2543package CFClient::UI::Inventory;
2544
2545our @ISA = CFClient::UI::ScrolledWindow::;
2546
2547sub new {
2548 my $class = shift;
2549
2550 my $self = $class->SUPER::new (
2551 scrolled => (new CFClient::UI::VBox),
2552 @_,
2553 );
2554
2555 $self
2556}
2557
2558sub set_items {
2559 my ($self, $items) = @_;
2560
2561 $self->{scrolled}->clear;
2562 return unless $items;
2563
2564 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2565
2566 $self->{real_items} = \@items;
2567
2568 for my $item (@items) {
2569 my $desc = $item->{nrof} < 2
2570 ? $item->{name}
2571 : "$item->{nrof} $item->{name_pl}";
2572
2573 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2574 }
2575
2576# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2577}
2578
2579sub size_request {
2580 my ($self) = @_;
2581 ($self->{req_w}, $self->{req_h});
2582}
2583
2584#############################################################################
2585
2586package CFClient::UI::Menu;
2587
2588our @ISA = CFClient::UI::FancyFrame::;
2589
2590use CFClient::OpenGL;
2591
2592sub new {
2593 my $class = shift;
2594
2595 my $self = $class->SUPER::new (
2596 items => [],
2597 z => 100,
2598 @_,
2599 );
2600
2601 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2602
2603 for my $item (@{ $self->{items} }) {
2604 my ($widget, $cb) = @$item;
2605
2606 # handle various types of items, only text for now
2607 if (!ref $widget) {
2608 $widget = new CFClient::UI::Label
2609 can_hover => 1,
2610 can_events => 1,
2611 text => $widget;
2612 }
2613
2614 $self->{item}{$widget} = $item;
2615
2616 $self->{vbox}->add ($widget);
2617 }
2618
2619 $self
2620}
2621
2622# popup given the event (must be a mouse button down event currently)
2623sub popup {
2624 my ($self, $ev) = @_;
2625
2626 $self->emit ("popdown");
2627
2628 # maybe save $GRAB? must be careful about events...
2629 $GRAB = $self;
2630 $self->{button} = $ev->{button};
2631
2632 $self->show;
2633 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2634}
2635
2636sub mouse_motion {
2637 my ($self, $ev, $x, $y) = @_;
2638
2639 # TODO: should use vbox->find_widget or so
2640 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2641 $self->{hover} = $self->{item}{$HOVER};
2642}
2643
2644sub button_up {
2645 my ($self, $ev, $x, $y) = @_;
2646
2647 if ($ev->{button} == $self->{button}) {
2648 undef $GRAB;
2649 $self->hide;
2650
2651 $self->emit ("popdown");
2652 $self->{hover}[1]->() if $self->{hover};
2653 }
2654}
2655
2656#############################################################################
2657
2421package CFClient::UI::Root; 2658package CFClient::UI::Root;
2422 2659
2423our @ISA = CFClient::UI::Container::; 2660our @ISA = CFClient::UI::Container::;
2424 2661
2425use CFClient::OpenGL; 2662use CFClient::OpenGL;
2426 2663
2427sub check_size { 2664sub new {
2428 my ($self) = @_; 2665 my $class = shift;
2429 2666
2430 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2667 $class->SUPER::new (
2431} 2668 @_,
2432 2669 )
2433sub size_request {
2434 ($::WIDTH, $::HEIGHT)
2435} 2670}
2436 2671
2437sub configure { 2672sub configure {
2438 my ($self, $x, $y, $w, $h) = @_; 2673 my ($self, $x, $y, $w, $h) = @_;
2439 2674
2440 $self->SUPER::configure ($x, $y, $w, $h); 2675 $self->{w} = $w;
2676 $self->{h} = $h;
2677}
2441 2678
2679sub check_size {
2680 my ($self) = @_;
2681
2682 $self->size_allocate ($self->{w}, $self->{h})
2683 if $self->{w};
2684}
2685
2686sub size_request {
2687 my ($self) = @_;
2688
2689 ($self->{w}, $self->{h})
2690}
2691
2692sub size_allocate {
2693 my ($self, $w, $h) = @_;
2694
2695 my $old_w = $self->{old_w};
2696 my $old_h = $self->{old_h};
2697
2698 if ($old_w && $old_h) {
2699 for my $child ($self->children) {
2700 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2701 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2702 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2703 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2704 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2705 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2706 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2707 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2708 }
2709 }
2710
2442 for my $child (@{$self->{children}}) { 2711 for my $child ($self->children) {
2443 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2712 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2444 2713
2445 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2714 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2446 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2715 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2447 $child->configure ($X, $Y, $W,$H); 2716 $child->configure ($X, $Y, $W, $H);
2448 } 2717 }
2449}
2450 2718
2451sub _topleft { 2719 $self->{old_w} = $w;
2720 $self->{old_h} = $h;
2721}
2722
2723sub coord2local {
2452 my ($self, $x, $y) = @_; 2724 my ($self, $x, $y) = @_;
2453 2725
2454 ($x, $y) 2726 ($x, $y)
2455} 2727}
2456 2728
2729sub coord2global {
2730 my ($self, $x, $y) = @_;
2731
2732 ($x, $y)
2733}
2734
2457sub update { 2735sub update {
2458 my ($self) = @_; 2736 my ($self) = @_;
2459 2737
2460 $self->check_size; 2738 $self->check_size;
2461 ::refresh (); 2739 $::WANT_REFRESH++;
2462} 2740}
2463 2741
2464sub add { 2742sub add {
2465 my ($self, $child) = @_; 2743 my ($self, $child) = @_;
2466 2744
2467 # integerize window positions 2745 # integerise window positions
2468 $child->{x} = int $child->{x}; 2746 $child->{x} = int $child->{x};
2469 $child->{y} = int $child->{y}; 2747 $child->{y} = int $child->{y};
2470 2748
2471 $self->SUPER::add ($child); 2749 $self->SUPER::add ($child);
2472} 2750}
… …
2475 my ($self, $id, $cb) = @_; 2753 my ($self, $id, $cb) = @_;
2476 2754
2477 $self->{refresh_hook}{$id} = $cb; 2755 $self->{refresh_hook}{$id} = $cb;
2478} 2756}
2479 2757
2480sub draw { 2758sub draw {
2481 my ($self) = @_; 2759 my ($self) = @_;
2482 2760
2761 if ($self->{check_size}) {
2762 my @queue = ([], []);
2763
2764 for (;;) {
2765 if ($self->{check_size}) {
2766 # heuristic: check containers last
2767 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2768 for values %{delete $self->{check_size}}
2769 }
2770
2771 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2772
2773 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2774 ? @$widget{qw(user_w user_h)}
2775 : $widget->size_request;
2776
2777 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2778 $widget->{req_w} = $w;
2779 $widget->{req_h} = $h;
2780
2781 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2782
2783 $widget->{parent}->check_size
2784 if $widget->{parent};
2785 }
2786 }
2787 }
2788
2789 while ($self->{size_alloc}) {
2790 for (values %{delete $self->{size_alloc}}) {
2791 my ($widget, $w, $h) = @$_;
2792
2793 $widget->{w} = $w;
2794 $widget->{h} = $h;
2795 $widget->size_allocate ($w, $h);
2796 $widget->emit (size_allocate => $w, $h);
2797 }
2798 }
2799
2483 while (my $rcb = delete $self->{refresh_hook}) { 2800 while ($self->{refresh_hook}) {
2484 $_->() for values %$rcb; 2801 $_->()
2802 for values %{delete $self->{refresh_hook}};
2485 } 2803 }
2486 2804
2487 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2805 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2488 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2489 glClear GL_COLOR_BUFFER_BIT; 2807 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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