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.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.230 by root, Wed May 24 21:59:54 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 }
… …
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;
137 } 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
149sub reconfigure_widgets {
150 # make a copy, otherwise C<for> complains about freed values.
151 my @widgets = values %WIDGET;
152
153 $_->reconfigure
154 for @widgets;
155}
156
157# call when resolution changes etc.
158sub rescale_widgets {
159 my ($sx, $sy) = @_;
160
161 for my $widget (values %WIDGET) {
162 if ($widget->{is_toplevel}) {
163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
171 }
172 }
173
174 reconfigure_widgets;
138} 175}
139 176
140############################################################################# 177#############################################################################
141 178
142package CFClient::UI::Base; 179package CFClient::UI::Base;
… …
160 if (/^connect_(.*)$/) { 197 if (/^connect_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 198 $self->connect ($1 => delete $self->{$_});
162 } 199 }
163 } 200 }
164 201
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
203
165 $self 204 $self
166} 205}
167 206
168sub destroy { 207sub destroy {
169 my ($self) = @_; 208 my ($self) = @_;
… …
172 %$self = (); 211 %$self = ();
173} 212}
174 213
175sub show { 214sub show {
176 my ($self) = @_; 215 my ($self) = @_;
177
178 return if $self->{parent}; 216 return if $self->{parent};
179 217
180 $CFClient::UI::ROOT->add ($self); 218 $CFClient::UI::ROOT->add ($self);
219}
220
221sub show_centered {
222 my ($self) = @_;
223 return if $self->{parent};
224
225 $self->show;
226
227 $CFClient::UI::ROOT->on_post_alloc (
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
181} 232}
182 233
183sub hide { 234sub hide {
184 my ($self) = @_; 235 my ($self) = @_;
185 236
… …
242 293
243sub size_allocate { 294sub size_allocate {
244 # nothing to be done 295 # nothing to be done
245} 296}
246 297
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure { 298sub reconfigure {
252 my ($self) = @_; 299 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256 300
257 $self->check_size (1); 301 $self->check_size (1);
258 $self->update; 302 $self->update;
259} 303}
260 304
305sub children {
306}
307
261sub set_max_size { 308sub set_max_size {
262 my ($self, $w, $h) = @_; 309 my ($self, $w, $h) = @_;
263 310
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 311 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 312 delete $self->{max_h}; $self->{max_h} = $h if $h;
313}
314
315sub set_tooltip {
316 my ($self, $tooltip) = @_;
317
318 $self->{tooltip} = $tooltip;
319
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip;
323 }
266} 324}
267 325
268# translate global coordinates to local coordinate system 326# translate global coordinates to local coordinate system
269sub coord2local { 327sub coord2local {
270 my ($self, $x, $y) = @_; 328 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 414 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 415 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 416 glVertex 0 , $self->{h};
359 glEnd; 417 glEnd;
360 glPopMatrix; 418 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 420 }
363} 421}
364 422
365sub _draw { 423sub _draw {
366 my ($self) = @_; 424 my ($self) = @_;
… …
386 Scalar::Util::weaken ($self->{parent} = $parent); 444 Scalar::Util::weaken ($self->{parent} = $parent);
387 445
388 # TODO: req_w _does_change after ->reconfigure 446 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size 447 $self->check_size
390 unless exists $self->{req_w}; 448 unless exists $self->{req_w};
449
450 $self->show;
391} 451}
392 452
393sub check_size { 453sub check_size {
394 my ($self, $forced) = @_; 454 my ($self, $forced) = @_;
395 455
… …
417} 477}
418 478
419sub DESTROY { 479sub DESTROY {
420 my ($self) = @_; 480 my ($self) = @_;
421 481
482 delete $WIDGET{$self+0};
422 #$self->deactivate; 483 #$self->deactivate;
423} 484}
424 485
425############################################################################# 486#############################################################################
426 487
… …
435 my $class = shift; 496 my $class = shift;
436 497
437 # range [value, low, high, page] 498 # range [value, low, high, page]
438 499
439 $class->SUPER::new ( 500 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 501 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 502 #active_bg => [1, 1, 1, 0.5],
442 @_ 503 @_
443 ) 504 )
444} 505}
445 506
446sub _draw { 507sub _draw {
447 my ($self) = @_; 508 my ($self) = @_;
448 509
510 my $color = $FOCUS == $self && $self->{active_bg}
511 ? $self->{active_bg}
512 : $self->{bg};
513
514 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 515 my ($w, $h) = @$self{qw(w h)};
450 516
451 glEnable GL_BLEND; 517 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 519 glColor @$color;
454 520
455 glBegin GL_QUADS; 521 glBegin GL_QUADS;
456 glVertex 0 , 0; 522 glVertex 0 , 0;
457 glVertex 0 , $h; 523 glVertex 0 , $h;
458 glVertex $w, $h; 524 glVertex $w, $h;
459 glVertex $w, 0; 525 glVertex $w, 0;
460 glEnd; 526 glEnd;
461 527
462 glDisable GL_BLEND; 528 glDisable GL_BLEND;
529 }
463} 530}
464 531
465############################################################################# 532#############################################################################
466 533
467package CFClient::UI::Empty; 534package CFClient::UI::Empty;
… …
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 719 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 720 glClear GL_COLOR_BUFFER_BIT;
654 721
655 $self->_render; 722 $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 }; 723 };
664} 724}
665 725
666sub _draw { 726sub _draw {
667 my ($self) = @_; 727 my ($self) = @_;
… …
671 my $tex = $self->{texture} 731 my $tex = $self->{texture}
672 or return; 732 or return;
673 733
674 glEnable GL_TEXTURE_2D; 734 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 736 glColor 1, 1, 1, 1;
677 737
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 739
680 glDisable GL_TEXTURE_2D; 740 glDisable GL_TEXTURE_2D;
681} 741}
… …
688 748
689sub size_request { 749sub size_request {
690 my ($self) = @_; 750 my ($self) = @_;
691 751
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 753
695 @$self{qw(child_w child_h)} 754 @$self{qw(child_w child_h)}
696} 755}
697 756
698sub size_allocate { 757sub size_allocate {
699 my ($self, $w, $h) = @_; 758 my ($self, $w, $h) = @_;
700 759
760 my ($cw, $ch) = @$self{qw(child_w child_h)};
761# $w = $self->{w};
762 $self->child->configure (0, 0, $cw, $ch);
701 $self->update; 763 $self->update;
702} 764}
703 765
704sub set_offset { 766sub set_offset {
705 my ($self, $x, $y) = @_; 767 my ($self, $x, $y) = @_;
… …
759 821
760 my $slider = new CFClient::UI::Slider 822 my $slider = new CFClient::UI::Slider
761 vertical => 1, 823 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 824 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 825 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 826 $self->{vp}->set_offset (0, $_[1]);
765 }, 827 },
766 ; 828 ;
767 829
768 $self = $class->SUPER::new ( 830 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 831 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 832 slider => $slider,
771 @_, 833 @_,
772 ); 834 );
773 835
774 $self->{vp}->add ($self->{scrolled}); 836 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp}); 837 $self->add ($self->{vp});
776 $self->add ($self->{slider}); 838 $self->add ($self->{slider});
777 839
778 $self 840 $self
841}
842
843sub size_allocate {
844 my ($self, $w, $h) = @_;
845
846 $self->SUPER::size_allocate ($w, $h);
847
848 my $child = $self->{vp}->child;
849 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
779} 850}
780 851
781#TODO# update range on size_allocate depending on child 852#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 853# update viewport offset on scroll
783 854
… …
837 my $class = shift; 908 my $class = shift;
838 909
839 # TODO: user_x, user_y, overwrite moveto? 910 # TODO: user_x, user_y, overwrite moveto?
840 911
841 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 913 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 914 border_bg => [1, 1, 1, 1],
844 border => 0.6, 915 border => 0.6,
916 is_toplevel => 1,
845 can_events => 1, 917 can_events => 1,
846 @_ 918 @_
847 ); 919 );
848 920
849 $self->{title} &&= new CFClient::UI::Label 921 $self->{title} &&= new CFClient::UI::Label
850 align => 0, 922 align => 0,
… …
874 my ($self, $w, $h) = @_; 946 my ($self, $w, $h) = @_;
875 947
876 $h -= List::Util::max 0, $self->border * 2; 948 $h -= List::Util::max 0, $self->border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 949 $w -= List::Util::max 0, $self->border * 2;
878 950
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
880 if $self->{title}; 952 if $self->{title};
881 953
882 $self->child->configure ($self->border, $self->border, $w, $h); 954 $self->child->configure ($self->border, $self->border, $w, $h);
883} 955}
884 956
… …
1245 1317
1246############################################################################# 1318#############################################################################
1247 1319
1248package CFClient::UI::Label; 1320package CFClient::UI::Label;
1249 1321
1250our @ISA = CFClient::UI::Base::; 1322our @ISA = CFClient::UI::DrawBG::;
1251 1323
1252use CFClient::OpenGL; 1324use CFClient::OpenGL;
1253 1325
1254sub new { 1326sub new {
1255 my ($class, %arg) = @_; 1327 my ($class, %arg) = @_;
1256 1328
1257 my $self = $class->SUPER::new ( 1329 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1330 fg => [1, 1, 1],
1331 #bg => none
1332 #active_bg => none
1259 #font => default_font 1333 #font => default_font
1260 #text => initial text 1334 #text => initial text
1261 #markup => initial narkup 1335 #markup => initial narkup
1336 #max_w => maximum pixel width
1337 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1338 layout => (new CFClient::Layout),
1263 fontsize => 1, 1339 fontsize => 1,
1264 align => -1, 1340 align => -1,
1265 valign => -1, 1341 valign => -1,
1266 padding => 2, 1342 padding => 2,
… …
1281 } 1357 }
1282 1358
1283 $self 1359 $self
1284} 1360}
1285 1361
1286sub escape { 1362sub escape($) {
1287 local $_ = $_[1]; 1363 local $_ = $_[0];
1288 1364
1289 s/&/&amp;/g; 1365 s/&/&amp;/g;
1290 s/>/&gt;/g; 1366 s/>/&gt;/g;
1291 s/</&lt;/g; 1367 s/</&lt;/g;
1292 1368
1293 $_[1] 1369 $_
1294} 1370}
1295 1371
1296sub update { 1372sub update {
1297 my ($self) = @_; 1373 my ($self) = @_;
1298 1374
… …
1331sub size_request { 1407sub size_request {
1332 my ($self) = @_; 1408 my ($self) = @_;
1333 1409
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1410 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1411 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1415
1338 my ($w, $h) = $self->{layout}->size; 1416 my ($w, $h) = $self->{layout}->size;
1339 1417
1340 if (exists $self->{template}) { 1418 if (exists $self->{template}) {
… …
1370} 1448}
1371 1449
1372sub _draw { 1450sub _draw {
1373 my ($self) = @_; 1451 my ($self) = @_;
1374 1452
1453 $self->SUPER::_draw; # draw background, if applicable
1454
1375 my $tex = $self->{texture} ||= do { 1455 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1456 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1457 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $self->{layout}->set_width ($self->{w}); 1458 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1462
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1463 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382 1464
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5; 1467 : ($self->{w} - $tex->{w}) * 0.5);
1386 1468
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5; 1471 : ($self->{h} - $tex->{h}) * 0.5);
1390 1472
1391 $tex 1473 $tex
1392 }; 1474 };
1393 1475
1394 glEnable GL_TEXTURE_2D; 1476 glEnable GL_TEXTURE_2D;
… …
1422 active_fg => [0, 0, 0], 1504 active_fg => [0, 0, 0],
1423 can_hover => 1, 1505 can_hover => 1,
1424 can_focus => 1, 1506 can_focus => 1,
1425 valign => 0, 1507 valign => 0,
1426 can_events => 1, 1508 can_events => 1,
1509 #text => ...
1427 @_ 1510 @_
1428 ) 1511 )
1429} 1512}
1430 1513
1431sub _set_text { 1514sub _set_text {
… …
1449sub set_text { 1532sub set_text {
1450 my ($self, $text) = @_; 1533 my ($self, $text) = @_;
1451 1534
1452 $self->{cursor} = length $text; 1535 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1536 $self->_set_text ($text);
1537 $self->update;
1454 $self->check_size; 1538 $self->check_size;
1455 $self->update;
1456} 1539}
1457 1540
1458sub get_text { 1541sub get_text {
1459 $_[0]{text} 1542 $_[0]{text}
1460} 1543}
… …
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1583 substr $text, $self->{cursor}++, 0, chr $uni;
1501 } 1584 }
1502 1585
1503 $self->_set_text ($text); 1586 $self->_set_text ($text);
1504 $self->update; 1587 $self->update;
1588 $self->check_size;
1505} 1589}
1506 1590
1507sub focus_in { 1591sub focus_in {
1508 my ($self) = @_; 1592 my ($self) = @_;
1509 1593
… …
1638 my $class = shift; 1722 my $class = shift;
1639 1723
1640 $class->SUPER::new ( 1724 $class->SUPER::new (
1641 padding => 4, 1725 padding => 4,
1642 fg => [1, 1, 1], 1726 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1727 active_fg => [0, 0, 1],
1645 can_hover => 1, 1728 can_hover => 1,
1646 align => 0, 1729 align => 0,
1647 valign => 0, 1730 valign => 0,
1648 can_events => 1, 1731 can_events => 1,
… …
1696 1779
1697 $class->SUPER::new ( 1780 $class->SUPER::new (
1698 padding => 2, 1781 padding => 2,
1699 fg => [1, 1, 1], 1782 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 1783 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 1786 state => 0,
1702 can_hover => 1, 1787 can_hover => 1,
1703 @_ 1788 @_
1704 ) 1789 )
1705} 1790}
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2074 qw(s1_slider.png s1_slider_bg.png);
1990 2075
1991sub new { 2076sub new {
1992 my $class = shift; 2077 my $class = shift;
1993 2078
1994 # range [value, low, high, page] 2079 # range [value, low, high, page, unit]
1995 2080
1996 # TODO: 0-width page 2081 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2082 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2083 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2084 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2001 active_fg => [0, 0, 0], 2086 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5],
2002 range => [0, 0, 100, 10], 2089 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2090 req_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2091 req_h => $::WIDTH / 80,
2005 vertical => 0, 2092 vertical => 0,
2006 can_hover => 1, 2093 can_hover => 1,
2007 inner_pad => 5, 2094 inner_pad => 0.02,
2008 @_ 2095 @_
2009 ); 2096 );
2010 2097
2098 $self->set_value ($self->{range}[0]);
2099 $self->update;
2100
2011 $self 2101 $self
2102}
2103
2104sub set_range {
2105 my ($self, $range) = @_;
2106
2107 $self->{range} = $range;
2108
2109 $self->update;
2110}
2111
2112sub set_value {
2113 my ($self, $value) = @_;
2114
2115 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2116
2117 $hi = $lo + 1 if $hi <= $lo;
2118
2119 $page = $hi - $lo if $page > $hi - $lo;
2120
2121 $value = $lo if $value < $lo;
2122 $value = $hi - $page if $value > $hi - $page;
2123
2124 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2125 if $unit;
2126
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128
2129 if ($value != $old_value) {
2130 $self->emit (changed => $value);
2131 $self->update;
2132 }
2012} 2133}
2013 2134
2014sub size_request { 2135sub size_request {
2015 my ($self) = @_; 2136 my ($self) = @_;
2016 2137
… …
2022 2143
2023sub button_down { 2144sub button_down {
2024 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
2025 2146
2026 $self->SUPER::button_down ($ev, $x, $y); 2147 $self->SUPER::button_down ($ev, $x, $y);
2148
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150
2027 $self->mouse_motion ($ev, $x, $y); 2151 $self->mouse_motion ($ev, $x, $y);
2028} 2152}
2029 2153
2030sub mouse_motion { 2154sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2155 my ($self, $ev, $x, $y) = @_;
2032 2156
2033 if ($GRAB == $self) { 2157 if ($GRAB == $self) {
2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2159
2160 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2165 }
2166}
2167
2168sub update {
2169 my ($self) = @_;
2170
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2172 $self->set_value ($self->{range}[0]);
2173
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2174 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100;
2035 2176
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2177 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2178
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2179 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2180 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2181
2041 $x -= $inner_pad_px; # substract the padding 2182 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2183 $value = $value * $self->{scale} + $self->{offset};
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2184
2047 $self->emit (changed => $x); 2185 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2186 $self->{knob_w} = $knob_w;
2049 } 2187 });
2050}
2051 2188
2052# the inner_* stuff is for generating a padding for the slider handle, 2189 $self->SUPER::update;
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058} 2190}
2059 2191
2060sub _draw { 2192sub _draw {
2061 my ($self) = @_; 2193 my ($self) = @_;
2062 2194
2063 $self->SUPER::_draw (); 2195 $self->SUPER::_draw ();
2064 2196
2065 my ($w, $h) = @$self{qw(w h)}; 2197 glScale $self->{w}, $self->{h};
2066 2198
2067 if ($self->{vertical}) { 2199 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2200 # draw a vertical slider like a rotated horizontal slider
2069 2201
2202 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2203 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2204 }
2075 2205
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2206 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2207 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2208
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2209 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2211
2100 # draw background 2212 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2213 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2214
2103 # draw handle 2215 # draw handle
2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2216 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105 2217
2106 glDisable GL_TEXTURE_2D; 2218 glDisable GL_TEXTURE_2D;
2107} 2219}
2220
2221#############################################################################
2222
2223package CFClient::UI::ValSlider;
2224
2225our @ISA = CFClient::UI::HBox::;
2226
2227sub new {
2228 my ($class, %arg) = @_;
2229
2230 my $range = delete $arg{range};
2231
2232 my $self = $class->SUPER::new (
2233 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2234 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2235 to_value => sub { shift },
2236 from_value => sub { shift },
2237 %arg,
2238 );
2239
2240 $self->{slider}->connect (changed => sub {
2241 my ($self, $value) = @_;
2242 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2243 $self->{parent}->emit (changed => $value);
2244 });
2245
2246# $self->{entry}->connect (changed => sub {
2247# my ($self, $value) = @_;
2248# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2249# $self->{parent}->emit (changed => $value);
2250# });
2251
2252 $self->add ($self->{slider}, $self->{entry});
2253
2254 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2255
2256 $self
2257}
2258
2259sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) }
2108 2261
2109############################################################################# 2262#############################################################################
2110 2263
2111package CFClient::UI::TextView; 2264package CFClient::UI::TextView;
2112 2265
… …
2142 2295
2143 $self->{fontsize} = $fontsize; 2296 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2297 $self->reflow;
2145} 2298}
2146 2299
2147sub text_height {
2148 my ($self, $text) = @_;
2149
2150 my $layout = $self->{layout};
2151
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w});
2154 $layout->set_markup ($text);
2155
2156 ($layout->size)[1]
2157}
2158
2159sub reflow {
2160 my ($self) = @_;
2161
2162 $self->{need_reflow}++;
2163 $self->update;
2164}
2165
2166sub size_allocate { 2300sub size_allocate {
2167 my ($self, $w, $h) = @_; 2301 my ($self, $w, $h) = @_;
2168 2302
2169 $self->SUPER::size_allocate ($w, $h); 2303 $self->SUPER::size_allocate ($w, $h);
2170 2304
… …
2173 $self->{layout}->set_width ($self->{children}[0]{w}); 2307 $self->{layout}->set_width ($self->{children}[0]{w});
2174 2308
2175 $self->reflow; 2309 $self->reflow;
2176} 2310}
2177 2311
2312sub text_size {
2313 my ($self, $text, $indent) = @_;
2314
2315 my $layout = $self->{layout};
2316
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent);
2319 $layout->set_markup ($text);
2320
2321 $layout->size
2322}
2323
2324sub reflow {
2325 my ($self) = @_;
2326
2327 $self->{need_reflow}++;
2328 $self->update;
2329}
2330
2331sub set_offset {
2332 my ($self, $offset) = @_;
2333
2334 # todo: base offset on lines or so, not on pixels
2335 $self->{children}[1]->set_value ($offset);
2336}
2337
2338sub clear {
2339 my ($self) = @_;
2340
2341 $self->{par} = [];
2342 $self->{height} = 0;
2343 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2344}
2345
2178sub add_paragraph { 2346sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2347 my ($self, $color, $text, $indent) = @_;
2180 2348
2181 #TODO: intelligently "reformat" paragraph 2349 for my $line (split /\n/, $text) {
2182 2350 my ($w, $h) = $self->text_size ($line);
2183 my $height = $self->text_height ($text);
2184
2185 $self->{height} += $height; 2351 $self->{height} += $h;
2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2353 }
2186 2354
2187 push @{$self->{par}}, [$height, $color, $text];
2188
2189 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2355 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2190 $self->{children}[1]->update;
2191} 2356}
2192 2357
2193sub update { 2358sub update {
2194 my ($self) = @_; 2359 my ($self) = @_;
2195 2360
… …
2198 return unless $self->{h} > 0; 2363 return unless $self->{h} > 0;
2199 2364
2200 delete $self->{texture}; 2365 delete $self->{texture};
2201 2366
2202 $ROOT->on_post_alloc ($self, sub { 2367 $ROOT->on_post_alloc ($self, sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369
2203 if (delete $self->{need_reflow}) { 2370 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2371 my $height = 0;
2205 2372
2206 $height += $_->[0] = $self->text_height ($_->[2]) 2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2207 for @{$self->{par}}; 2377 for (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2379 $layout->set_width ($W - $_->[3]);
2380 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3];
2383 $_->[1] = $h;
2384 }
2385
2386 $height += $_->[1];
2387 }
2208 2388
2209 $self->{height} = $height; 2389 $self->{height} = $height;
2210 2390
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212 2392
2213 delete $self->{texture}; 2393 delete $self->{texture};
2214 } 2394 }
2215 2395
2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2217 glClearColor 0, 0, 0, 0; 2397 glClearColor 0.5, 0.5, 0.5, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2398 glClear GL_COLOR_BUFFER_BIT;
2219 2399
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223 my $top = int $self->{children}[1]{range}[0]; 2400 my $top = int $self->{children}[1]{range}[0];
2224 2401
2225 my $y0 = $top; 2402 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2403 my $y1 = $top + $H;
2227 2404
2228 my $y = 0; 2405 my $y = 0;
2229 2406
2230 my $layout = $self->{layout}; 2407 my $layout = $self->{layout};
2231 2408
2232 $layout->set_font ($self->{font}) if $self->{font}; 2409 $layout->set_font ($self->{font}) if $self->{font};
2233 2410
2411 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off
2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2414
2234 for my $par (@{$self->{par}}) { 2415 for my $par (@{$self->{par}}) {
2235 my $h = $par->[0]; 2416 my $h = $par->[1];
2236 2417
2237 if ($y0 < $y + $h && $y < $y1) { 2418 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] }); 2419 $layout->set_foreground (@{ $par->[2] });
2420 $layout->set_width ($W - $par->[3]);
2239 $layout->set_markup ($par->[2]); 2421 $layout->set_markup ($par->[4]);
2240 2422
2241 my ($W, $H) = $layout->size; 2423 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2424
2425 glRasterPos $par->[3], $y - $y0;
2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2243 } 2427 }
2244 2428
2245 $y += $h; 2429 $y += $h;
2246 } 2430 }
2247 2431
2248 glDisable GL_TEXTURE_2D; 2432 glDisable GL_BLEND;
2249 }; 2433 };
2250 }); 2434 });
2251} 2435}
2252 2436
2253sub _draw { 2437sub _draw {
2254 my ($self) = @_; 2438 my ($self) = @_;
2255 2439
2256 glEnable GL_TEXTURE_2D; 2440 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2442 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2261 2445
2262 $self->{children}[1]->draw; 2446 $self->{children}[1]->draw;
2263 2447
2264} 2448}
… …
2363 2547
2364sub set_tooltip_from { 2548sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2549 my ($self, $widget) = @_;
2366 2550
2367 $self->add (new CFClient::UI::Label 2551 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2552 markup => $widget->{tooltip},
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2554 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2555 fg => [0, 0, 0, 1],
2556 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2557 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2558 );
2374} 2559}
2375 2560
2376sub size_request { 2561sub size_request {
2377 my ($self) = @_; 2562 my ($self) = @_;
… …
2423use CFClient::OpenGL; 2608use CFClient::OpenGL;
2424 2609
2425sub new { 2610sub new {
2426 my $class = shift; 2611 my $class = shift;
2427 2612
2428 $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2429 aspect => 1, 2614 aspect => 1,
2430 @_, 2615 @_,
2431 ) 2616 );
2617
2618 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self);
2620
2621 $self->{timer} = Event->timer (
2622 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2623 hard => 1,
2624 interval => $self->{animspeed},
2625 cb => sub {
2626 ++$widget->{frame};
2627 $widget->update;
2628 },
2629 );
2630 }
2631
2632 $self
2432} 2633}
2433 2634
2434sub size_request { 2635sub size_request {
2435 (32, 8) 2636 (32, 8)
2436} 2637}
2437 2638
2639sub update {
2640 my ($self) = @_;
2641
2642 return unless $self->{visible};
2643
2644 $self->SUPER::update;
2645}
2646
2438sub _draw { 2647sub _draw {
2439 my ($self) = @_; 2648 my ($self) = @_;
2440 2649
2441 return unless $::CONN;#d# manage and cache textures differently 2650 return unless $::CONN;
2651
2652 my $face;
2653
2654 if ($self->{frame}) {
2655 my $anim = $::CONN->{anim}[$self->{anim}];
2656
2657 $face = $anim->[ $self->{frame} % @$anim ]
2658 if $anim && @$anim;
2659 }
2660
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2662
2444 # TODO animation
2445 if ($tex) { 2663 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2664 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2666 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2668 glDisable GL_TEXTURE_2D;
2451 } 2669 }
2452} 2670}
2453 2671
2672sub DESTROY {
2673 my ($self) = @_;
2674
2675 $self->{timer}->cancel
2676 if $self->{timer};
2677
2678 $self->SUPER::DESTROY;
2679}
2680
2454############################################################################# 2681#############################################################################
2455 2682
2456package CFClient::UI::InventoryItem; 2683package CFClient::UI::InventoryItem;
2457 2684
2458our @ISA = CFClient::UI::HBox::; 2685our @ISA = CFClient::UI::HBox::;
2686
2687sub _item_to_desc {
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2459 2712
2460sub new { 2713sub new {
2461 my $class = shift; 2714 my $class = shift;
2462 2715
2463 my %args = @_; 2716 my %args = @_;
2464 2717
2465 my $item = delete $args{item}; 2718 my $item = delete $args{item};
2466 2719
2467 my $desc = $item->{nrof} < 2 2720 my $desc = _item_to_desc ($item);
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471 2721
2472 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2473 can_hover => 1, 2723 can_hover => 1,
2474 can_events => 1, 2724 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc) 2725 tooltip => ((CFClient::UI::Label::escape $desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub { 2727 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2479 2729
2480 # todo: maybe put examine on 1? but should just be a tooltip :( 2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2481 if ($ev->{button} == 1) { 2739 } elsif ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2740 $::CONN->send ("examine $item->{tag}");
2483 } elsif ($ev->{button} == 2) { 2741 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}"); 2742 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) { 2743 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new ( 2744 my @menu_items = (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2496 ], 2757 ),
2497 )->popup ($ev); 2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2498 } 2761 }
2499 2762
2500 1 2763 1
2501 }, 2764 },
2502 %args 2765 %args
2503 ); 2766 );
2767
2504 2768
2505 $self->add (new CFClient::UI::Face 2769 $self->add (new CFClient::UI::Face
2506 can_events => 0, 2770 can_events => 0,
2507 face => $item->{face}, 2771 face => $item->{face},
2508 anim => $item->{anim}, 2772 anim => $item->{anim},
2509 animspeed => $item->{animspeed}, 2773 animspeed => $item->{animspeed},
2510 ); 2774 );
2511 2775
2512 $self->add (new CFClient::UI::Label 2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2513 can_events => 0, 2777
2514 text => $desc, 2778 $self->{item} = $item;
2515 ); 2779
2780 $self->update_item;
2516 2781
2517 $self 2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2518} 2791}
2519 2792
2520############################################################################# 2793#############################################################################
2521 2794
2522package CFClient::UI::Inventory; 2795package CFClient::UI::Inventory;
… …
2525 2798
2526sub new { 2799sub new {
2527 my $class = shift; 2800 my $class = shift;
2528 2801
2529 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox), 2803 scrolled => (new CFClient::UI::Table),
2531 @_, 2804 @_,
2532 ); 2805 );
2533 2806
2534 $self 2807 $self
2535} 2808}
… …
2546 } @$items; 2819 } @$items;
2547 2820
2548 $self->{real_items} = \@items; 2821 $self->{real_items} = \@items;
2549 2822
2550 for my $item (@items) { 2823 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2 2824 $item->{item} = $item;
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2556 } 2827 }
2557 2828
2829 my $i = 0;
2830 for (@items) {
2558 $self->{scrolled}->add (@items); 2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2559 2835
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561} 2837}
2562 2838
2563sub size_request { 2839sub size_request {
… …
2641 2917
2642package CFClient::UI::Statusbox; 2918package CFClient::UI::Statusbox;
2643 2919
2644our @ISA = CFClient::UI::VBox::; 2920our @ISA = CFClient::UI::VBox::;
2645 2921
2922sub new {
2923 my $class = shift;
2924
2925 $class->SUPER::new (
2926 fontsize => 0.8,
2927 @_,
2928 )
2929}
2930
2646sub reorder { 2931sub reorder {
2647 my ($self) = @_; 2932 my ($self) = @_;
2648 my $NOW = time; 2933 my $NOW = time;
2649 2934
2650 while (my ($k, $v) = each %{ $self->{item} }) { 2935 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2668 ? "<b>$item->{count} ×</b> $item->{text}" 2953 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text}; 2954 : $item->{text};
2670 2955
2671 for ($short) { 2956 for ($short) {
2672 s/^\s+//; 2957 s/^\s+//;
2673 s/\012.*/…/s; 2958 s/\s+/ /g;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 } 2959 }
2677 2960
2678 new CFClient::UI::Label 2961 new CFClient::UI::Label
2679 markup => $short, 2962 markup => $short,
2680 tooltip => $item->{tooltip}, 2963 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP, 2964 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67, 2965 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize}, 2966 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44,
2684 color => $item->{color}, 2968 fg => $item->{fg},
2685 can_events => 1, 2969 can_events => 1,
2686 can_hover => 1 2970 can_hover => 1
2687 }; 2971 };
2688 } 2972 }
2689 2973
… …
2715 $self->{item}{$group} = { 2999 $self->{item}{$group} = {
2716 id => ++$self->{id}, 3000 id => ++$self->{id},
2717 text => $text, 3001 text => $text,
2718 timeout => $timeout, 3002 timeout => $timeout,
2719 tooltip => $text, 3003 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8], 3004 fg => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0, 3005 pri => 0,
2723 count => 1, 3006 count => 1,
2724 %arg, 3007 %arg,
2725 }; 3008 };
2726 } 3009 }
2727 3010
2728 $self->reorder; 3011 $self->reorder;
2729} 3012}
2730 3013
3014sub reconfigure {
3015 my ($self) = @_;
3016
3017 delete $_->{label}
3018 for values %{ $self->{item} || {} };
3019
3020 $self->reorder;
3021 $self->SUPER::reconfigure;
3022}
3023
2731############################################################################# 3024#############################################################################
2732 3025
2733package CFClient::UI::Root; 3026package CFClient::UI::Root;
2734 3027
2735our @ISA = CFClient::UI::Container::; 3028our @ISA = CFClient::UI::Container::;
… …
2765} 3058}
2766 3059
2767sub size_allocate { 3060sub size_allocate {
2768 my ($self, $w, $h) = @_; 3061 my ($self, $w, $h) = @_;
2769 3062
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785
2786 for my $child ($self->children) { 3063 for my $child ($self->children) {
2787 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2788 3065
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3067 if exists $child->{req_x};
3068
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3070 if exists $child->{req_y};
3071
2789 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074
2791 $child->configure ($X, $Y, $W, $H); 3075 $child->configure ($X, $Y, $W, $H);
2792 } 3076 }
2793
2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796} 3077}
2797 3078
2798sub coord2local { 3079sub coord2local {
2799 my ($self, $x, $y) = @_; 3080 my ($self, $x, $y) = @_;
2800 3081
… …
2813 $self->check_size; 3094 $self->check_size;
2814 $::WANT_REFRESH++; 3095 $::WANT_REFRESH++;
2815} 3096}
2816 3097
2817sub add { 3098sub add {
2818 my ($self, $child) = @_; 3099 my ($self, @children) = @_;
2819 3100
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1;
3109
2820 # integerise window positions 3110 # integerise window positions
2821 $child->{x} = int $child->{x}; 3111 $child->{x} = int $child->{x};
2822 $child->{y} = int $child->{y}; 3112 $child->{y} = int $child->{y};
3113 }
2823 3114
2824 $self->SUPER::add ($child); 3115 $self->SUPER::add (@children);
3116}
3117
3118sub remove {
3119 my ($self, @children) = @_;
3120
3121 $self->SUPER::remove (@children);
3122
3123 while (@children) {
3124 my $w = pop @children;
3125 push @children, $w->children;
3126 delete $w->{visible};
3127 }
2825} 3128}
2826 3129
2827sub on_refresh { 3130sub on_refresh {
2828 my ($self, $id, $cb) = @_; 3131 my ($self, $id, $cb) = @_;
2829 3132
… …
2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2900 3203
2901 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2902 glLoadIdentity; 3205 glLoadIdentity;
2903 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2905 glLoadIdentity; 3208 glLoadIdentity;
2906 3209
2907 $self->_draw; 3210 $self->_draw;
2908} 3211}
… …
2910############################################################################# 3213#############################################################################
2911 3214
2912package CFClient::UI; 3215package CFClient::UI;
2913 3216
2914$ROOT = new CFClient::UI::Root; 3217$ROOT = new CFClient::UI::Root;
2915$TOOLTIP = new CFClient::UI::Tooltip; 3218$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916 3219
29171 32201
2918 3221

Diff Legend

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