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.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00:55 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) = @_;
… …
172 %$self = (); 206 %$self = ();
173} 207}
174 208
175sub show { 209sub show {
176 my ($self) = @_; 210 my ($self) = @_;
177
178 return if $self->{parent}; 211 return if $self->{parent};
179 212
180 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
181} 227}
182 228
183sub hide { 229sub hide {
184 my ($self) = @_; 230 my ($self) = @_;
185 231
… …
242 288
243sub size_allocate { 289sub size_allocate {
244 # nothing to be done 290 # nothing to be done
245} 291}
246 292
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure { 293sub reconfigure {
252 my ($self) = @_; 294 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256 295
257 $self->check_size (1); 296 $self->check_size (1);
258 $self->update; 297 $self->update;
259} 298}
260 299
300sub children {
301}
302
261sub set_max_size { 303sub set_max_size {
262 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
263 305
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 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 }
266} 319}
267 320
268# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
269sub coord2local { 322sub coord2local {
270 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
359 glEnd; 412 glEnd;
360 glPopMatrix; 413 glPopMatrix;
361 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;
362 } 415 }
363} 416}
364 417
365sub _draw { 418sub _draw {
366 my ($self) = @_; 419 my ($self) = @_;
… …
383sub set_parent { 436sub set_parent {
384 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
385 438
386 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
387 440
388
389 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size 442 $self->check_size
391 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
392} 446}
393 447
394sub check_size { 448sub check_size {
395 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
396 450
… …
418} 472}
419 473
420sub DESTROY { 474sub DESTROY {
421 my ($self) = @_; 475 my ($self) = @_;
422 476
477 delete $WIDGET{$self+0};
423 #$self->deactivate; 478 #$self->deactivate;
424} 479}
425 480
426############################################################################# 481#############################################################################
427 482
… …
436 my $class = shift; 491 my $class = shift;
437 492
438 # range [value, low, high, page] 493 # range [value, low, high, page]
439 494
440 $class->SUPER::new ( 495 $class->SUPER::new (
441 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
442 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
443 @_ 498 @_
444 ) 499 )
445} 500}
446 501
447sub _draw { 502sub _draw {
448 my ($self) = @_; 503 my ($self) = @_;
449 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
450 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
451 511
452 glEnable GL_BLEND; 512 glEnable GL_BLEND;
453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
455 515
456 glBegin GL_QUADS; 516 glBegin GL_QUADS;
457 glVertex 0 , 0; 517 glVertex 0 , 0;
458 glVertex 0 , $h; 518 glVertex 0 , $h;
459 glVertex $w, $h; 519 glVertex $w, $h;
460 glVertex $w, 0; 520 glVertex $w, 0;
461 glEnd; 521 glEnd;
462 522
463 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
464} 525}
465 526
466############################################################################# 527#############################################################################
467 528
468package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
652 $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 {
653 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
655 716
656 $self->_render; 717 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 }; 718 };
665} 719}
666 720
667sub _draw { 721sub _draw {
668 my ($self) = @_; 722 my ($self) = @_;
… …
672 my $tex = $self->{texture} 726 my $tex = $self->{texture}
673 or return; 727 or return;
674 728
675 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
678 732
679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
680 734
681 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
682} 736}
… …
765 $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}));
766 }, 820 },
767 ; 821 ;
768 822
769 $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort), 824 vp => (new CFClient::UI::ViewPort expand => 1),
771 slider => $slider, 825 slider => $slider,
772 @_, 826 @_,
773 ); 827 );
774 828
775 $self->{vp}->add ($self->{scrolled}); 829 $self->{vp}->add ($self->{scrolled});
… …
777 $self->add ($self->{slider}); 831 $self->add ($self->{slider});
778 832
779 $self 833 $self
780} 834}
781 835
782#TODO# update range on size_allocate depeneing on child 836#TODO# update range on size_allocate depending on child
783# update viewport offset on scroll 837# update viewport offset on scroll
784 838
785############################################################################# 839#############################################################################
786 840
787package CFClient::UI::Frame; 841package CFClient::UI::Frame;
788 842
789our @ISA = CFClient::UI::Bin::; 843our @ISA = CFClient::UI::Bin::;
790 844
791use 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}
792 878
793############################################################################# 879#############################################################################
794 880
795package CFClient::UI::FancyFrame; 881package CFClient::UI::FancyFrame;
796 882
… …
809 895
810 my $self = $class->SUPER::new ( 896 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1], 897 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1], 898 border_bg => [1, 1, 1, 1],
813 border => 0.6, 899 border => 0.6,
900 toplevel => 1,
814 can_events => 1, 901 can_events => 1,
815 @_ 902 @_
816 ); 903 );
817 904
818 $self->{title} &&= new CFClient::UI::Label 905 $self->{title} &&= new CFClient::UI::Label
… …
843 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
844 931
845 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
846 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
847 934
848 $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)
849 if $self->{title}; 936 if $self->{title};
850 937
851 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
852} 939}
853 940
… …
1214 1301
1215############################################################################# 1302#############################################################################
1216 1303
1217package CFClient::UI::Label; 1304package CFClient::UI::Label;
1218 1305
1219our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1220 1307
1221use CFClient::OpenGL; 1308use CFClient::OpenGL;
1222 1309
1223sub new { 1310sub new {
1224 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1225 1312
1226 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1228 #font => default_font 1317 #font => default_font
1229 #text => initial text 1318 #text => initial text
1230 #markup => initial narkup 1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1322 layout => (new CFClient::Layout),
1232 fontsize => 1, 1323 fontsize => 1,
1233 align => -1, 1324 align => -1,
1234 valign => -1, 1325 valign => -1,
1235 padding => 2, 1326 padding => 2,
… …
1250 } 1341 }
1251 1342
1252 $self 1343 $self
1253} 1344}
1254 1345
1255sub escape { 1346sub escape($) {
1256 local $_ = $_[1]; 1347 local $_ = $_[0];
1257 1348
1258 s/&/&amp;/g; 1349 s/&/&amp;/g;
1259 s/>/&gt;/g; 1350 s/>/&gt;/g;
1260 s/</&lt;/g; 1351 s/</&lt;/g;
1261 1352
1262 $_[1] 1353 $_
1263} 1354}
1264 1355
1265sub update { 1356sub update {
1266 my ($self) = @_; 1357 my ($self) = @_;
1267 1358
… …
1300sub size_request { 1391sub size_request {
1301 my ($self) = @_; 1392 my ($self) = @_;
1302 1393
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $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});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1399
1307 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1308 1401
1309 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1339} 1432}
1340 1433
1341sub _draw { 1434sub _draw {
1342 my ($self) = @_; 1435 my ($self) = @_;
1343 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1344 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1440 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $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});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1446
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351 1448
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5; 1451 : ($self->{w} - $tex->{w}) * 0.5);
1355 1452
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5; 1455 : ($self->{h} - $tex->{h}) * 0.5);
1359 1456
1360 $tex 1457 $tex
1361 }; 1458 };
1362 1459
1363 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
… …
1418sub set_text { 1515sub set_text {
1419 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1420 1517
1421 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1519 $self->_set_text ($text);
1520 $self->update;
1423 $self->check_size; 1521 $self->check_size;
1424 $self->update;
1425} 1522}
1426 1523
1427sub get_text { 1524sub get_text {
1428 $_[0]{text} 1525 $_[0]{text}
1429} 1526}
… …
1449 my $sym = $ev->{sym}; 1546 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1547 my $uni = $ev->{unicode};
1451 1548
1452 my $text = $self->get_text; 1549 my $text = $self->get_text;
1453 1550
1454 if ($sym == 8) { 1551 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1552 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1553 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1554 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1555 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1556 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1557 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1558 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1559 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1560 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1561 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1562 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1563 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1564 $self->emit ('escape');
1468 } elsif ($uni) { 1565 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1470 } 1567 }
1471 1568
1472 $self->_set_text ($text); 1569 $self->_set_text ($text);
1473 $self->update; 1570 $self->update;
1571 $self->check_size;
1474} 1572}
1475 1573
1476sub focus_in { 1574sub focus_in {
1477 my ($self) = @_; 1575 my ($self) = @_;
1478 1576
… …
1607 my $class = shift; 1705 my $class = shift;
1608 1706
1609 $class->SUPER::new ( 1707 $class->SUPER::new (
1610 padding => 4, 1708 padding => 4,
1611 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1614 can_hover => 1, 1711 can_hover => 1,
1615 align => 0, 1712 align => 0,
1616 valign => 0, 1713 valign => 0,
1617 can_events => 1, 1714 can_events => 1,
… …
1665 1762
1666 $class->SUPER::new ( 1763 $class->SUPER::new (
1667 padding => 2, 1764 padding => 2,
1668 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1669 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],
1670 state => 0, 1769 state => 0,
1671 can_hover => 1, 1770 can_hover => 1,
1672 @_ 1771 @_
1673 ) 1772 )
1674} 1773}
… …
1958 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
1959 2058
1960sub new { 2059sub new {
1961 my $class = shift; 2060 my $class = shift;
1962 2061
1963 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
1964 2063
1965 # TODO: 0-width page 2064 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2066 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
1970 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],
1971 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
1972 req_w => $::WIDTH / 80, 2073 req_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2074 req_h => $::WIDTH / 80,
1974 vertical => 0, 2075 vertical => 0,
1975 can_hover => 1, 2076 can_hover => 1,
1976 inner_pad => 5, 2077 inner_pad => 0.02,
1977 @_ 2078 @_
1978 ); 2079 );
1979 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
1980 $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 }
1981} 2108}
1982 2109
1983sub size_request { 2110sub size_request {
1984 my ($self) = @_; 2111 my ($self) = @_;
1985 2112
… …
1998 2125
1999sub mouse_motion { 2126sub mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
2001 2128
2002 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
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
2004 2147
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
2006 2149
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2009 2151
2010 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
2012 $x = $lo if $x < $lo;
2013 $x = $hi - $page if $x > $hi - $page;
2014 $self->{range}[0] = $x;
2015 2154
2016 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2017 $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;
2018 } 2162 });
2019}
2020 2163
2021# the inner_* stuff is for generating a padding for the slider handle, 2164 $self->SUPER::update;
2022# so that the handle doesn't leave the texture. This calculation isn't 100%
2023# correct propably, but it does the job for now
2024sub _calc_inner_pad_px {
2025 my ($self, $w) = @_;
2026 ($w / 100) * $self->{inner_pad} # % to pixels
2027} 2165}
2028 2166
2029sub _draw { 2167sub _draw {
2030 my ($self) = @_; 2168 my ($self) = @_;
2031 2169
2032 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
2033 2171
2034 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
2035 2173
2036 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
2038 2176
2177 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2179 }
2044 2180
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2183
2048 my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050 $hi = $value + 1 if $lo == $hi;
2051
2052 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055 $page = int $page * $inner_w / ($hi - $lo);
2056 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058 $w -= $page;
2059 $page &= ~1;
2060 glTranslate $page * 0.5, 0, 0;
2061 $page ||= 2;
2062
2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2186
2069 # draw background 2187 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2189
2072 # draw handle 2190 # draw handle
2073 $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);
2074 2192
2075 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
2076} 2194}
2077 2195
2078############################################################################# 2196#############################################################################
… …
2111 2229
2112 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
2113 $self->reflow; 2231 $self->reflow;
2114} 2232}
2115 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
2116sub text_height { 2246sub text_height {
2117 my ($self, $text) = @_; 2247 my ($self, $text, $indent) = @_;
2118 2248
2119 my $layout = $self->{layout}; 2249 my $layout = $self->{layout};
2120 2250
2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122 $layout->set_width ($self->{children}[0]{w}); 2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2123 $layout->set_markup ($text); 2253 $layout->set_markup ($text);
2124 2254
2125 ($layout->size)[1] 2255 ($layout->size)[1]
2126} 2256}
2127 2257
… …
2130 2260
2131 $self->{need_reflow}++; 2261 $self->{need_reflow}++;
2132 $self->update; 2262 $self->update;
2133} 2263}
2134 2264
2135sub size_allocate {
2136 my ($self, $w, $h) = @_;
2137
2138 $self->SUPER::size_allocate ($w, $h);
2139
2140 $self->{layout}->set_font ($self->{font}) if $self->{font};
2141 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2142 $self->{layout}->set_width ($self->{children}[0]{w});
2143
2144 $self->reflow;
2145}
2146
2147sub add_paragraph { 2265sub add_paragraph {
2148 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2149 2267
2150 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2151 2269
2270 for my $line (split /\n/, $text) {
2152 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2153
2154 $self->{height} += $height; 2272 $self->{height} += $height;
2155
2156 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2157 2275
2158 $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}];
2159 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2160} 2278}
2161 2279
… …
2170 2288
2171 $ROOT->on_post_alloc ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2172 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2173 my $height = 0; 2291 my $height = 0;
2174 2292
2175 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2176 for @{$self->{par}}; 2294 for @{$self->{par}};
2177 2295
2178 $self->{height} = $height; 2296 $self->{height} = $height;
2179 2297
2180 $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;
2181 2300
2182 delete $self->{texture}; 2301 delete $self->{texture};
2183 } 2302 }
2184 2303
2185 $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 {
2186 glClearColor 0, 0, 0, 0; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2188
2189 glEnable GL_TEXTURE_2D;
2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191 2307
2192 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2193 2309
2194 my $y0 = $top; 2310 my $y0 = $top;
2195 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2198 2314
2199 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2200 2316
2201 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2202 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2203 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2204 my $h = $par->[0]; 2323 my $h = $par->[0];
2205 2324
2206 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] }); 2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2208 $layout->set_markup ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2209 2329
2210 my ($W, $H) = $layout->size; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2211 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;
2212 } 2334 }
2213 2335
2214 $y += $h; 2336 $y += $h;
2215 } 2337 }
2216 2338
2217 glDisable GL_TEXTURE_2D; 2339 glDisable GL_BLEND;
2218 }; 2340 };
2219 }); 2341 });
2220} 2342}
2221 2343
2222sub _draw { 2344sub _draw {
2223 my ($self) = @_; 2345 my ($self) = @_;
2224 2346
2225 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 2349 glColor 1, 1, 1, 1;
2228 $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});
2229 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2230 2352
2231 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2232 2354
2233} 2355}
… …
2332 2454
2333sub set_tooltip_from { 2455sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2456 my ($self, $widget) = @_;
2335 2457
2336 $self->add (new CFClient::UI::Label 2458 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2459 markup => $widget->{tooltip},
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2461 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2465 );
2343} 2466}
2344 2467
2345sub size_request { 2468sub size_request {
2346 my ($self) = @_; 2469 my ($self) = @_;
… …
2392use CFClient::OpenGL; 2515use CFClient::OpenGL;
2393 2516
2394sub new { 2517sub new {
2395 my $class = shift; 2518 my $class = shift;
2396 2519
2397 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2398 aspect => 1, 2521 aspect => 1,
2399 @_, 2522 @_,
2400 ) 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
2401} 2540}
2402 2541
2403sub size_request { 2542sub size_request {
2404 (32, 8) 2543 (32, 8)
2405} 2544}
2406 2545
2546sub update {
2547 my ($self) = @_;
2548
2549 return unless $self->{visible};
2550
2551 $self->SUPER::update;
2552}
2553
2407sub _draw { 2554sub _draw {
2408 my ($self) = @_; 2555 my ($self) = @_;
2409 2556
2410 return unless $::CONN;#d# manage and cache textures differently 2557 return unless $::CONN;#d# manage and cache textures differently
2558
2559 my $face;
2560
2561 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}];
2563
2564 $face = $anim->[ $self->{frame} % @$anim ]
2565 if $anim && @$anim;
2566 }
2567
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 2569
2413 # TODO animation
2414 if ($tex) { 2570 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 2571 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2573 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2575 glDisable GL_TEXTURE_2D;
2420 } 2576 }
2421} 2577}
2422 2578
2579sub DESTROY {
2580 my ($self) = @_;
2581
2582 $self->{timer}->cancel
2583 if $self->{timer};
2584
2585 $self->SUPER::DESTROY;
2586}
2587
2423############################################################################# 2588#############################################################################
2424 2589
2425package CFClient::UI::InventoryItem; 2590package CFClient::UI::InventoryItem;
2426 2591
2427our @ISA = CFClient::UI::HBox::; 2592our @ISA = CFClient::UI::HBox::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2428 2619
2429sub new { 2620sub new {
2430 my $class = shift; 2621 my $class = shift;
2431 2622
2432 my %args = @_; 2623 my %args = @_;
2433 2624
2434 my $item = delete $args{item}; 2625 my $item = delete $args{item};
2435 2626
2436 my $desc = $item->{nrof} < 2 2627 my $desc = _item_to_desc ($item);
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440 2628
2441 my $self = $class->SUPER::new ( 2629 my $self = $class->SUPER::new (
2442 can_hover => 1, 2630 can_hover => 1,
2443 can_events => 1, 2631 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc) 2632 tooltip => ((CFClient::UI::Label::escape $desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub { 2634 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2448 2636
2449 # todo: maybe put examine on 1? but should just be a tooltip :( 2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2450 if ($ev->{button} == 1) { 2646 } elsif ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2647 $::CONN->send ("examine $item->{tag}");
2452 } elsif ($ev->{button} == 2) { 2648 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}"); 2649 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) { 2650 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new ( 2651 my @menu_items = (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2465 ], 2664 ),
2466 )->popup ($ev); 2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2467 } 2668 }
2468 2669
2469 1 2670 1
2470 }, 2671 },
2471 %args 2672 %args
2472 ); 2673 );
2674
2473 2675
2474 $self->add (new CFClient::UI::Face 2676 $self->add (new CFClient::UI::Face
2475 can_events => 0, 2677 can_events => 0,
2476 face => $item->{face}, 2678 face => $item->{face},
2477 anim => $item->{anim}, 2679 anim => $item->{anim},
2478 animspeed => $item->{animspeed}, 2680 animspeed => $item->{animspeed},
2479 ); 2681 );
2480 2682
2481 $self->add (new CFClient::UI::Label 2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2482 can_events => 0, 2684
2483 text => $desc, 2685 $self->{item} = $item;
2484 ); 2686
2687 $self->update_item;
2485 2688
2486 $self 2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2487} 2698}
2488 2699
2489############################################################################# 2700#############################################################################
2490 2701
2491package CFClient::UI::Inventory; 2702package CFClient::UI::Inventory;
… …
2494 2705
2495sub new { 2706sub new {
2496 my $class = shift; 2707 my $class = shift;
2497 2708
2498 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox), 2710 scrolled => (new CFClient::UI::Table),
2500 @_, 2711 @_,
2501 ); 2712 );
2502 2713
2503 $self 2714 $self
2504} 2715}
… …
2507 my ($self, $items) = @_; 2718 my ($self, $items) = @_;
2508 2719
2509 $self->{scrolled}->clear; 2720 $self->{scrolled}->clear;
2510 return unless $items; 2721 return unless $items;
2511 2722
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2513 2727
2514 $self->{real_items} = \@items; 2728 $self->{real_items} = \@items;
2515 2729
2516 for my $item (@items) { 2730 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2 2731 $item->{item} = $item;
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2522 } 2741 }
2523 2742
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525} 2744}
2526 2745
… …
2605 2824
2606package CFClient::UI::Statusbox; 2825package CFClient::UI::Statusbox;
2607 2826
2608our @ISA = CFClient::UI::VBox::; 2827our @ISA = CFClient::UI::VBox::;
2609 2828
2829sub new {
2830 my $class = shift;
2831
2832 $class->SUPER::new (
2833 fontsize => 0.8,
2834 @_,
2835 )
2836}
2837
2610sub reorder { 2838sub reorder {
2611 my ($self) = @_; 2839 my ($self) = @_;
2612 my $NOW = time; 2840 my $NOW = time;
2613 2841
2614 while (my ($k, $v) = each %{ $self->{item} }) { 2842 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2632 ? "<b>$item->{count} ×</b> $item->{text}" 2860 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 2861 : $item->{text};
2634 2862
2635 for ($short) { 2863 for ($short) {
2636 s/^\s+//; 2864 s/^\s+//;
2637 s/\012.*/…/s; 2865 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 2866 }
2641 2867
2642 new CFClient::UI::Label 2868 new CFClient::UI::Label
2643 markup => $short, 2869 markup => $short,
2644 tooltip => $item->{tooltip}, 2870 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 2871 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 2872 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 2873 fontsize => $item->{fontsize} || $self->{fontsize},
2874 max_w => $::WIDTH * 0.44,
2648 color => $item->{color}, 2875 fg => $item->{fg},
2649 can_events => 1, 2876 can_events => 1,
2650 can_hover => 1 2877 can_hover => 1
2651 }; 2878 };
2652 } 2879 }
2653 2880
… …
2679 $self->{item}{$group} = { 2906 $self->{item}{$group} = {
2680 id => ++$self->{id}, 2907 id => ++$self->{id},
2681 text => $text, 2908 text => $text,
2682 timeout => $timeout, 2909 timeout => $timeout,
2683 tooltip => $text, 2910 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 2911 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 2912 pri => 0,
2687 count => 1, 2913 count => 1,
2688 %arg, 2914 %arg,
2689 }; 2915 };
2690 } 2916 }
2691 2917
2692 $self->reorder; 2918 $self->reorder;
2693} 2919}
2694 2920
2921sub reconfigure {
2922 my ($self) = @_;
2923
2924 delete $_->{label}
2925 for values %{ $self->{item} || {} };
2926
2927 $self->reorder;
2928 $self->SUPER::reconfigure;
2929}
2930
2695############################################################################# 2931#############################################################################
2696 2932
2697package CFClient::UI::Root; 2933package CFClient::UI::Root;
2698 2934
2699our @ISA = CFClient::UI::Container::; 2935our @ISA = CFClient::UI::Container::;
… …
2729} 2965}
2730 2966
2731sub size_allocate { 2967sub size_allocate {
2732 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2733 2969
2734 my $old_w = $self->{old_w}; 2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2735 my $old_h = $self->{old_h}; 2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2736 2972
2737 if ($old_w && $old_h) { 2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2738 for my $child ($self->children) { 2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749 2975
2750 for my $child ($self->children) { 2976 for my $child ($self->children) {
2751 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2752 2978
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2980 if exists $child->{req_x};
2981
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2983 if exists $child->{req_y};
2984
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2754 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987
2755 $child->configure ($X, $Y, $W, $H); 2988 $child->configure ($X, $Y, $W, $H);
2756 } 2989 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760} 2990}
2761 2991
2762sub coord2local { 2992sub coord2local {
2763 my ($self, $x, $y) = @_; 2993 my ($self, $x, $y) = @_;
2764 2994
… …
2777 $self->check_size; 3007 $self->check_size;
2778 $::WANT_REFRESH++; 3008 $::WANT_REFRESH++;
2779} 3009}
2780 3010
2781sub add { 3011sub add {
2782 my ($self, $child) = @_; 3012 my ($self, @children) = @_;
2783 3013
3014 for my $child (@children) {
3015 $child->{toplevel} = 1;
3016
2784 # integerise window positions 3017 # integerise window positions
2785 $child->{x} = int $child->{x}; 3018 $child->{x} = int $child->{x};
2786 $child->{y} = int $child->{y}; 3019 $child->{y} = int $child->{y};
3020 }
2787 3021
2788 $self->SUPER::add ($child); 3022 $self->SUPER::add (@children);
3023
3024 while (@children) {
3025 my $w = pop @children;
3026 push @children, $w->children;
3027 $w->{visible} = 1;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 }
2789} 3041}
2790 3042
2791sub on_refresh { 3043sub on_refresh {
2792 my ($self, $id, $cb) = @_; 3044 my ($self, $id, $cb) = @_;
2793 3045
… …
2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863 glClear GL_COLOR_BUFFER_BIT; 3115 glClear GL_COLOR_BUFFER_BIT;
2864 3116
2865 glMatrixMode GL_PROJECTION; 3117 glMatrixMode GL_PROJECTION;
2866 glLoadIdentity; 3118 glLoadIdentity;
2867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868 glMatrixMode GL_MODELVIEW; 3120 glMatrixMode GL_MODELVIEW;
2869 glLoadIdentity; 3121 glLoadIdentity;
2870 3122
2871 $self->_draw; 3123 $self->_draw;
2872} 3124}
… …
2874############################################################################# 3126#############################################################################
2875 3127
2876package CFClient::UI; 3128package CFClient::UI;
2877 3129
2878$ROOT = new CFClient::UI::Root; 3130$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3131$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3132
28811 31331
2882 3134

Diff Legend

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