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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.221 by root, Mon May 22 03:48:50 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size; 40 $TOOLTIP->check_size;
40 $TOOLTIP->update; 41 $TOOLTIP->update;
41 } 42 }
… …
132 133
133 for (@$vals) { 134 for (@$vals) {
134 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
135 $rem += $_ - $i; 136 $rem += $_ - $i;
136 $_ = $i; 137 $_ = $i;
138 }
139}
140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
137 } 169 }
138} 170}
139 171
140############################################################################# 172#############################################################################
141 173
… …
160 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
162 } 194 }
163 } 195 }
164 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
165 $self 199 $self
166} 200}
167 201
168sub destroy { 202sub destroy {
169 my ($self) = @_; 203 my ($self) = @_;
… …
173} 207}
174 208
175sub show { 209sub show {
176 my ($self) = @_; 210 my ($self) = @_;
177 211
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
178 return if $self->{parent}; 218 return if $self->{parent};
179 219
180 $CFClient::UI::ROOT->add ($self); 220 $CFClient::UI::ROOT->add ($self);
181} 221}
182 222
183sub hide { 223sub hide {
184 my ($self) = @_; 224 my ($self) = @_;
225
226 for (my @w = $self; @w; ) {
227 my $w = pop @w;
228 push @w, $w->children;
229 $w->{visible} = 1;
230 }
185 231
186 undef $GRAB if $GRAB == $self; 232 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 233 undef $HOVER if $HOVER == $self;
188 234
189 $self->{parent}->remove ($self) 235 $self->{parent}->remove ($self)
… …
242 288
243sub size_allocate { 289sub size_allocate {
244 # nothing to be done 290 # nothing to be done
245} 291}
246 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
247sub children { 300sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260} 301}
261 302
262sub set_max_size { 303sub set_max_size {
263 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
264 305
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
308}
309
310sub set_tooltip {
311 my ($self, $tooltip) = @_;
312
313 $self->{tooltip} = $tooltip;
314
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
267} 319}
268 320
269# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
270sub coord2local { 322sub coord2local {
271 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
357 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
358 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
359 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
360 glEnd; 412 glEnd;
361 glPopMatrix; 413 glPopMatrix;
362 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363 } 415 }
364} 416}
365 417
366sub _draw { 418sub _draw {
367 my ($self) = @_; 419 my ($self) = @_;
… …
384sub set_parent { 436sub set_parent {
385 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
386 438
387 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
388 440
441 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size 442 $self->check_size
390 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
391} 446}
392 447
393sub check_size { 448sub check_size {
394 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
395 450
… …
417} 472}
418 473
419sub DESTROY { 474sub DESTROY {
420 my ($self) = @_; 475 my ($self) = @_;
421 476
477 delete $WIDGET{$self+0};
422 #$self->deactivate; 478 #$self->deactivate;
423} 479}
424 480
425############################################################################# 481#############################################################################
426 482
… …
435 my $class = shift; 491 my $class = shift;
436 492
437 # range [value, low, high, page] 493 # range [value, low, high, page]
438 494
439 $class->SUPER::new ( 495 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
442 @_ 498 @_
443 ) 499 )
444} 500}
445 501
446sub _draw { 502sub _draw {
447 my ($self) = @_; 503 my ($self) = @_;
448 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
450 511
451 glEnable GL_BLEND; 512 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
454 515
455 glBegin GL_QUADS; 516 glBegin GL_QUADS;
456 glVertex 0 , 0; 517 glVertex 0 , 0;
457 glVertex 0 , $h; 518 glVertex 0 , $h;
458 glVertex $w, $h; 519 glVertex $w, $h;
459 glVertex $w, 0; 520 glVertex $w, 0;
460 glEnd; 521 glEnd;
461 522
462 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
463} 525}
464 526
465############################################################################# 527#############################################################################
466 528
467package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
628} 690}
629 691
630sub update { 692sub update {
631 my ($self) = @_; 693 my ($self) = @_;
632 694
633 $ROOT->on_refresh ($self => sub { $self->render_child }); 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 696 $self->SUPER::update;
635} 697}
636 698
637sub size_allocate { 699sub size_allocate {
638 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
… …
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
654 716
655 $self->_render; 717 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 718 };
664} 719}
665 720
666sub _draw { 721sub _draw {
667 my ($self) = @_; 722 my ($self) = @_;
… …
671 my $tex = $self->{texture} 726 my $tex = $self->{texture}
672 or return; 727 or return;
673 728
674 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
677 732
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 734
680 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
681} 736}
… …
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 }, 820 },
766 ; 821 ;
767 822
768 $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 824 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 825 slider => $slider,
771 @_, 826 @_,
772 ); 827 );
773 828
774 $self->{vp}->add ($self->{scrolled}); 829 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 831 $self->add ($self->{slider});
777 832
778 $self 833 $self
779} 834}
780 835
781#TODO# update range on size_allocate depeneing on child 836#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 837# update viewport offset on scroll
783 838
784############################################################################# 839#############################################################################
785 840
786package CFClient::UI::Frame; 841package CFClient::UI::Frame;
787 842
788our @ISA = CFClient::UI::Bin::; 843our @ISA = CFClient::UI::Bin::;
789 844
790use CFClient::OpenGL; 845use CFClient::OpenGL;
846
847sub new {
848 my $class = shift;
849
850 $class->SUPER::new (
851 bg => undef,
852 @_,
853 )
854}
855
856sub _draw {
857 my ($self) = @_;
858
859 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)};
861
862 glEnable GL_BLEND;
863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
864 glColor @{ $self->{bg} };
865
866 glBegin GL_QUADS;
867 glVertex 0 , 0;
868 glVertex 0 , $h;
869 glVertex $w, $h;
870 glVertex $w, 0;
871 glEnd;
872
873 glDisable GL_BLEND;
874 }
875
876 $self->SUPER::_draw;
877}
791 878
792############################################################################# 879#############################################################################
793 880
794package CFClient::UI::FancyFrame; 881package CFClient::UI::FancyFrame;
795 882
… …
808 895
809 my $self = $class->SUPER::new ( 896 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 897 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 898 border_bg => [1, 1, 1, 1],
812 border => 0.6, 899 border => 0.6,
900 toplevel => 1,
813 can_events => 1, 901 can_events => 1,
814 @_ 902 @_
815 ); 903 );
816 904
817 $self->{title} &&= new CFClient::UI::Label 905 $self->{title} &&= new CFClient::UI::Label
… …
842 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
843 931
844 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
846 934
847 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848 if $self->{title}; 936 if $self->{title};
849 937
850 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
851} 939}
852 940
… …
1213 1301
1214############################################################################# 1302#############################################################################
1215 1303
1216package CFClient::UI::Label; 1304package CFClient::UI::Label;
1217 1305
1218our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1219 1307
1220use CFClient::OpenGL; 1308use CFClient::OpenGL;
1221 1309
1222sub new { 1310sub new {
1223 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1224 1312
1225 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1227 #font => default_font 1317 #font => default_font
1228 #text => initial text 1318 #text => initial text
1229 #markup => initial narkup 1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1322 layout => (new CFClient::Layout),
1231 fontsize => 1, 1323 fontsize => 1,
1232 align => -1, 1324 align => -1,
1233 valign => -1, 1325 valign => -1,
1234 padding => 2, 1326 padding => 2,
… …
1249 } 1341 }
1250 1342
1251 $self 1343 $self
1252} 1344}
1253 1345
1254sub escape { 1346sub escape($) {
1255 local $_ = $_[1]; 1347 local $_ = $_[0];
1256 1348
1257 s/&/&amp;/g; 1349 s/&/&amp;/g;
1258 s/>/&gt;/g; 1350 s/>/&gt;/g;
1259 s/</&lt;/g; 1351 s/</&lt;/g;
1260 1352
1261 $_[1] 1353 $_
1262} 1354}
1263 1355
1264sub update { 1356sub update {
1265 my ($self) = @_; 1357 my ($self) = @_;
1266 1358
… …
1299sub size_request { 1391sub size_request {
1300 my ($self) = @_; 1392 my ($self) = @_;
1301 1393
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{max_w} || -1); 1395 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1399
1306 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1307 1401
1308 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1338} 1432}
1339 1433
1340sub _draw { 1434sub _draw {
1341 my ($self) = @_; 1435 my ($self) = @_;
1342 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1343 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1440 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $self->{layout}->set_width ($self->{w}); 1442 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1446
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350 1448
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1451 : ($self->{w} - $tex->{w}) * 0.5);
1354 1452
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1455 : ($self->{h} - $tex->{h}) * 0.5);
1358 1456
1359 $tex 1457 $tex
1360 }; 1458 };
1361 1459
1362 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
… …
1417sub set_text { 1515sub set_text {
1418 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1419 1517
1420 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1519 $self->_set_text ($text);
1520 $self->update;
1422 $self->check_size; 1521 $self->check_size;
1423 $self->update;
1424} 1522}
1425 1523
1426sub get_text { 1524sub get_text {
1427 $_[0]{text} 1525 $_[0]{text}
1428} 1526}
… …
1448 my $sym = $ev->{sym}; 1546 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1547 my $uni = $ev->{unicode};
1450 1548
1451 my $text = $self->get_text; 1549 my $text = $self->get_text;
1452 1550
1453 if ($sym == 8) { 1551 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1552 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1553 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1554 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1555 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1556 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1557 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1558 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1559 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1560 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1561 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1562 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1563 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1564 $self->emit ('escape');
1467 } elsif ($uni) { 1565 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1567 }
1470 1568
1471 $self->_set_text ($text); 1569 $self->_set_text ($text);
1472 $self->update; 1570 $self->update;
1571 $self->check_size;
1473} 1572}
1474 1573
1475sub focus_in { 1574sub focus_in {
1476 my ($self) = @_; 1575 my ($self) = @_;
1477 1576
… …
1606 my $class = shift; 1705 my $class = shift;
1607 1706
1608 $class->SUPER::new ( 1707 $class->SUPER::new (
1609 padding => 4, 1708 padding => 4,
1610 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1613 can_hover => 1, 1711 can_hover => 1,
1614 align => 0, 1712 align => 0,
1615 valign => 0, 1713 valign => 0,
1616 can_events => 1, 1714 can_events => 1,
… …
1664 1762
1665 $class->SUPER::new ( 1763 $class->SUPER::new (
1666 padding => 2, 1764 padding => 2,
1667 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1668 active_fg => [1, 1, 0], 1766 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5],
1669 state => 0, 1769 state => 0,
1670 can_hover => 1, 1770 can_hover => 1,
1671 @_ 1771 @_
1672 ) 1772 )
1673} 1773}
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
1958 2058
1959sub new { 2059sub new {
1960 my $class = shift; 2060 my $class = shift;
1961 2061
1962 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
1963 2063
1964 # TODO: 0-width page 2064 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2066 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
1969 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5],
1970 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
1971 req_w => $::WIDTH / 80, 2073 req_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2074 req_h => $::WIDTH / 80,
1973 vertical => 0, 2075 vertical => 0,
1974 can_hover => 1, 2076 can_hover => 1,
1975 inner_pad => 5, 2077 inner_pad => 0.02,
1976 @_ 2078 @_
1977 ); 2079 );
1978 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
1979 $self 2084 $self
2085}
2086
2087sub set_value {
2088 my ($self, $value) = @_;
2089
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091
2092 $hi = $lo + 1 if $hi <= $lo;
2093
2094 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi;
2096
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103
2104 if ($value != $old_value) {
2105 $self->emit (changed => $value);
2106 $self->update;
2107 }
1980} 2108}
1981 2109
1982sub size_request { 2110sub size_request {
1983 my ($self) = @_; 2111 my ($self) = @_;
1984 2112
… …
1997 2125
1998sub mouse_motion { 2126sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
2000 2128
2001 if ($GRAB == $self) { 2129 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131
2132 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2135
2136 $self->set_value ($x * ($hi - $lo) + $lo);
2137 }
2138}
2139
2140sub update {
2141 my ($self) = @_;
2142
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]);
2145
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
2003 2147
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
2005 2149
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2008 2151
2009 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2154
2015 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2016 $self->update; 2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value;
2161 $self->{knob_w} = $page;
2017 } 2162 });
2018}
2019 2163
2020# the inner_* stuff is for generating a padding for the slider handle, 2164 $self->SUPER::update;
2021# so that the handle doesn't leave the texture. This calculation isn't 100%
2022# correct propably, but it does the job for now
2023sub _calc_inner_pad_px {
2024 my ($self, $w) = @_;
2025 ($w / 100) * $self->{inner_pad} # % to pixels
2026} 2165}
2027 2166
2028sub _draw { 2167sub _draw {
2029 my ($self) = @_; 2168 my ($self) = @_;
2030 2169
2031 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
2032 2171
2033 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
2034 2173
2035 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
2037 2176
2177 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2179 }
2043 2180
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2183
2047 my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049 $hi = $value + 1 if $lo == $hi;
2050
2051 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054 $page = int $page * $inner_w / ($hi - $lo);
2055 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057 $w -= $page;
2058 $page &= ~1;
2059 glTranslate $page * 0.5, 0, 0;
2060 $page ||= 2;
2061
2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2186
2068 # draw background 2187 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2189
2071 # draw handle 2190 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2192
2074 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
2075} 2194}
2076 2195
2077############################################################################# 2196#############################################################################
… …
2110 2229
2111 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2231 $self->reflow;
2113} 2232}
2114 2233
2234sub size_allocate {
2235 my ($self, $w, $h) = @_;
2236
2237 $self->SUPER::size_allocate ($w, $h);
2238
2239 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $self->{layout}->set_width ($self->{children}[0]{w});
2242
2243 $self->reflow;
2244}
2245
2115sub text_height { 2246sub text_height {
2116 my ($self, $text) = @_; 2247 my ($self, $text, $indent) = @_;
2117 2248
2118 my $layout = $self->{layout}; 2249 my $layout = $self->{layout};
2119 2250
2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $layout->set_width ($self->{children}[0]{w}); 2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2122 $layout->set_markup ($text); 2253 $layout->set_markup ($text);
2123 2254
2124 ($layout->size)[1] 2255 ($layout->size)[1]
2125} 2256}
2126 2257
… …
2129 2260
2130 $self->{need_reflow}++; 2261 $self->{need_reflow}++;
2131 $self->update; 2262 $self->update;
2132} 2263}
2133 2264
2134sub size_allocate {
2135 my ($self, $w, $h) = @_;
2136
2137 $self->SUPER::size_allocate ($w, $h);
2138
2139 $self->{layout}->set_font ($self->{font}) if $self->{font};
2140 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2141 $self->{layout}->set_width ($self->{children}[0]{w});
2142
2143 $self->reflow;
2144}
2145
2146sub add_paragraph { 2265sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2148 2267
2149 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2150 2269
2270 for my $line (split /\n/, $text) {
2151 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2152
2153 $self->{height} += $height; 2272 $self->{height} += $height;
2154
2155 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2156 2275
2157 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2158 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2159} 2278}
2160 2279
… …
2165 2284
2166 return unless $self->{h} > 0; 2285 return unless $self->{h} > 0;
2167 2286
2168 delete $self->{texture}; 2287 delete $self->{texture};
2169 2288
2170 $ROOT->on_refresh ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2171 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2291 my $height = 0;
2173 2292
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2175 for @{$self->{par}}; 2294 for @{$self->{par}};
2176 2295
2177 $self->{height} = $height; 2296 $self->{height} = $height;
2178 2297
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2299 $self->{children}[1]->update;
2180 2300
2181 delete $self->{texture}; 2301 delete $self->{texture};
2182 } 2302 }
2183 2303
2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2185 glClearColor 0, 0, 0, 0; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2187
2188 glEnable GL_TEXTURE_2D;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190 2307
2191 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2192 2309
2193 my $y0 = $top; 2310 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2197 2314
2198 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2199 2316
2200 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2201 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2202 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2323 my $h = $par->[0];
2204 2324
2205 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2207 $layout->set_markup ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2208 2329
2209 my ($W, $H) = $layout->size; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2331
2332 glRasterPos $par->[2], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211 } 2334 }
2212 2335
2213 $y += $h; 2336 $y += $h;
2214 } 2337 }
2215 2338
2216 glDisable GL_TEXTURE_2D; 2339 glDisable GL_BLEND;
2217 }; 2340 };
2218 }); 2341 });
2219} 2342}
2220 2343
2221sub _draw { 2344sub _draw {
2222 my ($self) = @_; 2345 my ($self) = @_;
2223 2346
2224 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2349 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2229 2352
2230 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2231 2354
2232} 2355}
… …
2331 2454
2332sub set_tooltip_from { 2455sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2456 my ($self, $widget) = @_;
2334 2457
2335 $self->add (new CFClient::UI::Label 2458 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2459 markup => $widget->{tooltip},
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2461 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2465 );
2342} 2466}
2343 2467
2344sub size_request { 2468sub size_request {
2345 my ($self) = @_; 2469 my ($self) = @_;
… …
2391use CFClient::OpenGL; 2515use CFClient::OpenGL;
2392 2516
2393sub new { 2517sub new {
2394 my $class = shift; 2518 my $class = shift;
2395 2519
2396 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2397 aspect => 1, 2521 aspect => 1,
2398 @_, 2522 @_,
2399 ) 2523 );
2524
2525 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self);
2527
2528 $self->{timer} = Event->timer (
2529 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2530 hard => 1,
2531 interval => $self->{animspeed},
2532 cb => sub {
2533 ++$widget->{frame};
2534 $widget->update;
2535 },
2536 );
2537 }
2538
2539 $self
2400} 2540}
2401 2541
2402sub size_request { 2542sub size_request {
2403 (32, 8) 2543 (32, 8)
2404} 2544}
2405 2545
2406sub _draw { 2546sub _draw {
2407 my ($self) = @_; 2547 my ($self) = @_;
2408 2548
2409 return unless $::CONN;#d# manage and cache textures differently 2549 return unless $::CONN;#d# manage and cache textures differently
2550
2551 my $face;
2552
2553 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}];
2555
2556 $face = $anim->[ $self->{frame} % @$anim ]
2557 if $anim && @$anim;
2558 }
2559
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2560 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2561
2412 # TODO animation
2413 if ($tex) { 2562 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2563 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2565 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2567 glDisable GL_TEXTURE_2D;
2419 } 2568 }
2420} 2569}
2421 2570
2571sub DESTROY {
2572 my ($self) = @_;
2573
2574 $self->{timer}->cancel
2575 if $self->{timer};
2576
2577 $self->SUPER::DESTROY;
2578}
2579
2422############################################################################# 2580#############################################################################
2423 2581
2424package CFClient::UI::InventoryItem; 2582package CFClient::UI::InventoryItem;
2425 2583
2426our @ISA = CFClient::UI::HBox::; 2584our @ISA = CFClient::UI::HBox::;
2585
2586sub _item_to_desc {
2587 my ($item) = @_;
2588
2589 my $desc =
2590 $item->{nrof} < 2
2591 ? $item->{name}
2592 : "$item->{nrof} × $item->{name_pl}";
2593
2594 $item->{flags} & Crossfire::Protocol::F_OPEN
2595 and $desc .= " (open)";
2596 $item->{flags} & Crossfire::Protocol::F_APPLIED
2597 and $desc .= " (applied)";
2598 $item->{flags} & Crossfire::Protocol::F_UNPAID
2599 and $desc .= " (unpaid)";
2600 $item->{flags} & Crossfire::Protocol::F_MAGIC
2601 and $desc .= " (magic)";
2602 $item->{flags} & Crossfire::Protocol::F_CURSED
2603 and $desc .= " (cursed)";
2604 $item->{flags} & Crossfire::Protocol::F_DAMNED
2605 and $desc .= " (damned)";
2606 $item->{flags} & Crossfire::Protocol::F_LOCKED
2607 and $desc .= " *";
2608
2609 $desc
2610}
2427 2611
2428sub new { 2612sub new {
2429 my $class = shift; 2613 my $class = shift;
2430 2614
2431 my %args = @_; 2615 my %args = @_;
2432 2616
2433 my $item = delete $args{item}; 2617 my $item = delete $args{item};
2434 2618
2435 my $desc = $item->{nrof} < 2 2619 my $desc = _item_to_desc ($item);
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439 2620
2440 my $self = $class->SUPER::new ( 2621 my $self = $class->SUPER::new (
2441 can_hover => 1, 2622 can_hover => 1,
2442 can_events => 1, 2623 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc) 2624 tooltip => ((CFClient::UI::Label::escape $desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2625 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub { 2626 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_; 2627 my ($self, $ev, $x, $y) = @_;
2447 2628
2448 # todo: maybe put examine on 1? but should just be a tooltip :( 2629 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) { 2630 if ($ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag};
2632
2633 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT;
2635 }
2636
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2637 $::CONN->send ("move $targ $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) { 2638 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}"); 2639 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) { 2640 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new ( 2641 my @menu_items = (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2643 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2644 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645 (
2646 $item->{flags} & Crossfire::Protocol::F_LOCKED
2647 ? (
2648 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649 )
2650 : (
2651 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2652 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653 )
2464 ], 2654 ),
2465 )->popup ($ev); 2655 );
2656
2657 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2466 } 2658 }
2467 2659
2468 1 2660 1
2469 }, 2661 },
2470 %args 2662 %args
2471 ); 2663 );
2664
2472 2665
2473 $self->add (new CFClient::UI::Face 2666 $self->add (new CFClient::UI::Face
2474 can_events => 0, 2667 can_events => 0,
2475 face => $item->{face}, 2668 face => $item->{face},
2476 anim => $item->{anim}, 2669 anim => $item->{anim},
2477 animspeed => $item->{animspeed}, 2670 animspeed => $item->{animspeed},
2478 ); 2671 );
2479 2672
2480 $self->add (new CFClient::UI::Label 2673 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2481 can_events => 0, 2674
2482 text => $desc, 2675 $self->{item} = $item;
2483 ); 2676
2677 $self->update_item;
2484 2678
2485 $self 2679 $self
2680}
2681
2682sub update_item {
2683 my ($self) = @_;
2684
2685 my $desc = _item_to_desc ($self->{item});
2686
2687 $self->{name_lbl}->set_text ($desc);
2486} 2688}
2487 2689
2488############################################################################# 2690#############################################################################
2489 2691
2490package CFClient::UI::Inventory; 2692package CFClient::UI::Inventory;
… …
2506 my ($self, $items) = @_; 2708 my ($self, $items) = @_;
2507 2709
2508 $self->{scrolled}->clear; 2710 $self->{scrolled}->clear;
2509 return unless $items; 2711 return unless $items;
2510 2712
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2713 my @items = sort {
2714 ($a->{type} <=> $b->{type})
2715 or ($a->{name} cmp $b->{name})
2716 } @$items;
2512 2717
2513 $self->{real_items} = \@items; 2718 $self->{real_items} = \@items;
2514 2719
2515 for my $item (@items) { 2720 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item ();
2521 } 2723 }
2724
2725 $self->{scrolled}->add (@items);
2522 2726
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524} 2728}
2525 2729
2526sub size_request { 2730sub size_request {
… …
2604 2808
2605package CFClient::UI::Statusbox; 2809package CFClient::UI::Statusbox;
2606 2810
2607our @ISA = CFClient::UI::VBox::; 2811our @ISA = CFClient::UI::VBox::;
2608 2812
2813sub new {
2814 my $class = shift;
2815
2816 $class->SUPER::new (
2817 fontsize => 0.8,
2818 @_,
2819 )
2820}
2821
2609sub reorder { 2822sub reorder {
2610 my ($self) = @_; 2823 my ($self) = @_;
2611 my $NOW = time; 2824 my $NOW = time;
2612 2825
2613 while (my ($k, $v) = each %{ $self->{item} }) { 2826 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2844 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2845 : $item->{text};
2633 2846
2634 for ($short) { 2847 for ($short) {
2635 s/^\s+//; 2848 s/^\s+//;
2636 s/\012.*/…/s; 2849 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2850 }
2640 2851
2641 new CFClient::UI::Label 2852 new CFClient::UI::Label
2642 markup => $short, 2853 markup => $short,
2643 tooltip => $item->{tooltip}, 2854 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2855 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2856 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2857 fontsize => $item->{fontsize} || $self->{fontsize},
2858 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2859 fg => $item->{fg},
2648 can_events => 1, 2860 can_events => 1,
2649 can_hover => 1 2861 can_hover => 1
2650 }; 2862 };
2651 } 2863 }
2652 2864
… …
2654 $self->SUPER::add (reverse @widgets); 2866 $self->SUPER::add (reverse @widgets);
2655} 2867}
2656 2868
2657sub add { 2869sub add {
2658 my ($self, $text, %arg) = @_; 2870 my ($self, $text, %arg) = @_;
2871
2872 $text =~ s/^\s+//;
2873 $text =~ s/\s+$//;
2659 2874
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 2875 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 2876
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2877 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 2878
… …
2666 $item->{count}++; 2881 $item->{count}++;
2667 } else { 2882 } else {
2668 $item->{count} = 1; 2883 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 2884 $item->{text} = $item->{tooltip} = $text;
2670 } 2885 }
2886 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 2887 $item->{timeout} = $timeout;
2672 delete $item->{label}; 2888 delete $item->{label};
2673 } else { 2889 } else {
2674 $self->{item}{$group} = { 2890 $self->{item}{$group} = {
2675 id => ++$self->{id}, 2891 id => ++$self->{id},
2676 text => $text, 2892 text => $text,
2677 timeout => $timeout, 2893 timeout => $timeout,
2678 tooltip => $text, 2894 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 2895 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 2896 pri => 0,
2682 count => 1, 2897 count => 1,
2683 %arg, 2898 %arg,
2684 }; 2899 };
2685 } 2900 }
2686 2901
2687 $self->reorder; 2902 $self->reorder;
2688} 2903}
2689 2904
2905sub reconfigure {
2906 my ($self) = @_;
2907
2908 delete $_->{label}
2909 for values %{ $self->{item} || {} };
2910
2911 $self->reorder;
2912 $self->SUPER::reconfigure;
2913}
2914
2690############################################################################# 2915#############################################################################
2691 2916
2692package CFClient::UI::Root; 2917package CFClient::UI::Root;
2693 2918
2694our @ISA = CFClient::UI::Container::; 2919our @ISA = CFClient::UI::Container::;
… …
2724} 2949}
2725 2950
2726sub size_allocate { 2951sub size_allocate {
2727 my ($self, $w, $h) = @_; 2952 my ($self, $w, $h) = @_;
2728 2953
2729 my $old_w = $self->{old_w}; 2954 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2730 my $old_h = $self->{old_h}; 2955 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2731 2956
2732 if ($old_w && $old_h) { 2957 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2733 for my $child ($self->children) { 2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744 2959
2745 for my $child ($self->children) { 2960 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2961 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 2962
2963 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2964 if exists $child->{req_x};
2965
2966 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2967 if exists $child->{req_y};
2968
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2969 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2970 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971
2750 $child->configure ($X, $Y, $W, $H); 2972 $child->configure ($X, $Y, $W, $H);
2751 } 2973 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 2974}
2756 2975
2757sub coord2local { 2976sub coord2local {
2758 my ($self, $x, $y) = @_; 2977 my ($self, $x, $y) = @_;
2759 2978
… …
2772 $self->check_size; 2991 $self->check_size;
2773 $::WANT_REFRESH++; 2992 $::WANT_REFRESH++;
2774} 2993}
2775 2994
2776sub add { 2995sub add {
2777 my ($self, $child) = @_; 2996 my ($self, @children) = @_;
2778 2997
2998 for my $child (@children) {
2999 $child->{toplevel} = 1;
3000
2779 # integerise window positions 3001 # integerise window positions
2780 $child->{x} = int $child->{x}; 3002 $child->{x} = int $child->{x};
2781 $child->{y} = int $child->{y}; 3003 $child->{y} = int $child->{y};
3004 }
2782 3005
2783 $self->SUPER::add ($child); 3006 $self->SUPER::add (@children);
2784} 3007}
2785 3008
2786sub on_refresh { 3009sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3010 my ($self, $id, $cb) = @_;
2788 3011
2789 $self->{refresh_hook}{$id} = $cb; 3012 $self->{refresh_hook}{$id} = $cb;
2790} 3013}
2791 3014
3015sub on_post_alloc {
3016 my ($self, $id, $cb) = @_;
3017
3018 $self->{post_alloc_hook}{$id} = $cb;
3019}
3020
2792sub draw { 3021sub draw {
2793 my ($self) = @_; 3022 my ($self) = @_;
3023
3024 while ($self->{refresh_hook}) {
3025 $_->()
3026 for values %{delete $self->{refresh_hook}};
3027 }
2794 3028
2795 if ($self->{check_size}) { 3029 if ($self->{check_size}) {
2796 my @queue = ([], []); 3030 my @queue = ([], []);
2797 3031
2798 for (;;) { 3032 for (;;) {
… …
2835 $widget->size_allocate ($w, $h); 3069 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h); 3070 $widget->emit (size_allocate => $w, $h);
2837 } 3071 }
2838 } 3072 }
2839 3073
2840 while ($self->{refresh_hook}) { 3074 while ($self->{post_alloc_hook}) {
2841 $_->() 3075 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3076 for values %{delete $self->{post_alloc_hook}};
2843 } 3077 }
2844 3078
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3079 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3081 glClear GL_COLOR_BUFFER_BIT;
2848 3082
2849 glMatrixMode GL_PROJECTION; 3083 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3084 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3085 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3086 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3087 glLoadIdentity;
2854 3088
2855 $self->_draw; 3089 $self->_draw;
2856} 3090}
… …
2858############################################################################# 3092#############################################################################
2859 3093
2860package CFClient::UI; 3094package CFClient::UI;
2861 3095
2862$ROOT = new CFClient::UI::Root; 3096$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3097$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3098
28651 30991
2866 3100

Diff Legend

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