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.225 by root, Tue May 23 21:14:41 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}
… …
689 743
690sub size_request { 744sub size_request {
691 my ($self) = @_; 745 my ($self) = @_;
692 746
693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
695 748
696 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
697} 750}
698 751
699sub size_allocate { 752sub size_allocate {
700 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
701 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
702 $self->update; 758 $self->update;
703} 759}
704 760
705sub set_offset { 761sub set_offset {
706 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
766 }, 822 },
767 ; 823 ;
768 824
769 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
771 slider => $slider, 827 slider => $slider,
772 @_, 828 @_,
773 ); 829 );
774 830
775 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
777 $self->add ($self->{slider}); 833 $self->add ($self->{slider});
778 834
779 $self 835 $self
780} 836}
781 837
782#TODO# update range on size_allocate depeneing on child 838#TODO# update range on size_allocate depending on child
783# update viewport offset on scroll 839# update viewport offset on scroll
784 840
785############################################################################# 841#############################################################################
786 842
787package CFClient::UI::Frame; 843package CFClient::UI::Frame;
788 844
789our @ISA = CFClient::UI::Bin::; 845our @ISA = CFClient::UI::Bin::;
790 846
791use CFClient::OpenGL; 847use CFClient::OpenGL;
848
849sub new {
850 my $class = shift;
851
852 $class->SUPER::new (
853 bg => undef,
854 @_,
855 )
856}
857
858sub _draw {
859 my ($self) = @_;
860
861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
863
864 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} };
867
868 glBegin GL_QUADS;
869 glVertex 0 , 0;
870 glVertex 0 , $h;
871 glVertex $w, $h;
872 glVertex $w, 0;
873 glEnd;
874
875 glDisable GL_BLEND;
876 }
877
878 $self->SUPER::_draw;
879}
792 880
793############################################################################# 881#############################################################################
794 882
795package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
796 884
… …
809 897
810 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
813 border => 0.6, 901 border => 0.6,
902 toplevel => 1,
814 can_events => 1, 903 can_events => 1,
815 @_ 904 @_
816 ); 905 );
817 906
818 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
… …
843 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
844 933
845 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
846 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
847 936
848 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
849 if $self->{title}; 938 if $self->{title};
850 939
851 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
852} 941}
853 942
… …
1214 1303
1215############################################################################# 1304#############################################################################
1216 1305
1217package CFClient::UI::Label; 1306package CFClient::UI::Label;
1218 1307
1219our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1220 1309
1221use CFClient::OpenGL; 1310use CFClient::OpenGL;
1222 1311
1223sub new { 1312sub new {
1224 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1225 1314
1226 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1228 #font => default_font 1319 #font => default_font
1229 #text => initial text 1320 #text => initial text
1230 #markup => initial narkup 1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1324 layout => (new CFClient::Layout),
1232 fontsize => 1, 1325 fontsize => 1,
1233 align => -1, 1326 align => -1,
1234 valign => -1, 1327 valign => -1,
1235 padding => 2, 1328 padding => 2,
… …
1250 } 1343 }
1251 1344
1252 $self 1345 $self
1253} 1346}
1254 1347
1255sub escape { 1348sub escape($) {
1256 local $_ = $_[1]; 1349 local $_ = $_[0];
1257 1350
1258 s/&/&amp;/g; 1351 s/&/&amp;/g;
1259 s/>/&gt;/g; 1352 s/>/&gt;/g;
1260 s/</&lt;/g; 1353 s/</&lt;/g;
1261 1354
1262 $_[1] 1355 $_
1263} 1356}
1264 1357
1265sub update { 1358sub update {
1266 my ($self) = @_; 1359 my ($self) = @_;
1267 1360
… …
1300sub size_request { 1393sub size_request {
1301 my ($self) = @_; 1394 my ($self) = @_;
1302 1395
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $self->{layout}->set_width ($self->{max_w} || -1); 1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1401
1307 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1308 1403
1309 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1339} 1434}
1340 1435
1341sub _draw { 1436sub _draw {
1342 my ($self) = @_; 1437 my ($self) = @_;
1343 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1344 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1442 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1448
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351 1450
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5; 1453 : ($self->{w} - $tex->{w}) * 0.5);
1355 1454
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5; 1457 : ($self->{h} - $tex->{h}) * 0.5);
1359 1458
1360 $tex 1459 $tex
1361 }; 1460 };
1362 1461
1363 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
… …
1391 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1392 can_hover => 1, 1491 can_hover => 1,
1393 can_focus => 1, 1492 can_focus => 1,
1394 valign => 0, 1493 valign => 0,
1395 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1396 @_ 1496 @_
1397 ) 1497 )
1398} 1498}
1399 1499
1400sub _set_text { 1500sub _set_text {
… …
1418sub set_text { 1518sub set_text {
1419 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1420 1520
1421 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1522 $self->_set_text ($text);
1523 $self->update;
1423 $self->check_size; 1524 $self->check_size;
1424 $self->update;
1425} 1525}
1426 1526
1427sub get_text { 1527sub get_text {
1428 $_[0]{text} 1528 $_[0]{text}
1429} 1529}
… …
1449 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1451 1551
1452 my $text = $self->get_text; 1552 my $text = $self->get_text;
1453 1553
1454 if ($sym == 8) { 1554 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1567 $self->emit ('escape');
1468 } elsif ($uni) { 1568 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1470 } 1570 }
1471 1571
1472 $self->_set_text ($text); 1572 $self->_set_text ($text);
1473 $self->update; 1573 $self->update;
1574 $self->check_size;
1474} 1575}
1475 1576
1476sub focus_in { 1577sub focus_in {
1477 my ($self) = @_; 1578 my ($self) = @_;
1478 1579
… …
1607 my $class = shift; 1708 my $class = shift;
1608 1709
1609 $class->SUPER::new ( 1710 $class->SUPER::new (
1610 padding => 4, 1711 padding => 4,
1611 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1614 can_hover => 1, 1714 can_hover => 1,
1615 align => 0, 1715 align => 0,
1616 valign => 0, 1716 valign => 0,
1617 can_events => 1, 1717 can_events => 1,
… …
1665 1765
1666 $class->SUPER::new ( 1766 $class->SUPER::new (
1667 padding => 2, 1767 padding => 2,
1668 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1669 active_fg => [1, 1, 0], 1769 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5],
1670 state => 0, 1772 state => 0,
1671 can_hover => 1, 1773 can_hover => 1,
1672 @_ 1774 @_
1673 ) 1775 )
1674} 1776}
… …
1958 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1959 2061
1960sub new { 2062sub new {
1961 my $class = shift; 2063 my $class = shift;
1962 2064
1963 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
1964 2066
1965 # TODO: 0-width page 2067 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2069 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
1970 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5],
1971 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
1972 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
1974 vertical => 0, 2078 vertical => 0,
1975 can_hover => 1, 2079 can_hover => 1,
1976 inner_pad => 5, 2080 inner_pad => 0.02,
1977 @_ 2081 @_
1978 ); 2082 );
1979 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
1980 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2098sub set_value {
2099 my ($self, $value) = @_;
2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102
2103 $hi = $lo + 1 if $hi <= $lo;
2104
2105 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi;
2107
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
1981} 2119}
1982 2120
1983sub size_request { 2121sub size_request {
1984 my ($self) = @_; 2122 my ($self) = @_;
1985 2123
… …
1998 2136
1999sub mouse_motion { 2137sub mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
2001 2139
2002 if ($GRAB == $self) { 2140 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142
2143 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2146
2147 $self->set_value ($x * ($hi - $lo) + $lo);
2148 }
2149}
2150
2151sub update {
2152 my ($self) = @_;
2153
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]);
2156
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2157 my ($value, $lo, $hi, $page) = @{$self->{range}};
2004 2158
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2159 my $inner_w = 1 - 2 * $self->{inner_pad};
2006 2160
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2009 2162
2010 $x -= $inner_pad_px; # substract the padding 2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2164 $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 2165
2016 $self->emit (changed => $x); 2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2017 $self->update; 2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value;
2172 $self->{knob_w} = $page;
2018 } 2173 });
2019}
2020 2174
2021# the inner_* stuff is for generating a padding for the slider handle, 2175 $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} 2176}
2028 2177
2029sub _draw { 2178sub _draw {
2030 my ($self) = @_; 2179 my ($self) = @_;
2031 2180
2032 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
2033 2182
2034 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
2035 2184
2036 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2038 2187
2188 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2190 }
2044 2191
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2194
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; 2195 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2197
2069 # draw background 2198 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2200
2072 # draw handle 2201 # draw handle
2073 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2074 2203
2075 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2076} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2077 2247
2078############################################################################# 2248#############################################################################
2079 2249
2080package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2081 2251
… …
2111 2281
2112 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2113 $self->reflow; 2283 $self->reflow;
2114} 2284}
2115 2285
2286sub size_allocate {
2287 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290
2291 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294
2295 $self->reflow;
2296}
2297
2116sub text_height { 2298sub text_height {
2117 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2118 2300
2119 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2120 2302
2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2123 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2124 2306
2125 ($layout->size)[1] 2307 ($layout->size)[1]
2126} 2308}
2127 2309
… …
2130 2312
2131 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2132 $self->update; 2314 $self->update;
2133} 2315}
2134 2316
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 { 2317sub add_paragraph {
2148 my ($self, $color, $text) = @_; 2318 my ($self, $color, $text, $indent) = @_;
2149 2319
2150 #TODO: intelligently "reformat" paragraph 2320 #TODO: intelligently "reformat" paragraph
2151 2321
2322 for my $line (split /\n/, $text) {
2152 my $height = $self->text_height ($text); 2323 my $height = $self->text_height ($line);
2153
2154 $self->{height} += $height; 2324 $self->{height} += $height;
2155
2156 push @{$self->{par}}, [$height, $color, $text]; 2325 push @{$self->{par}}, [$height, $color, $indent, $line];
2326 }
2157 2327
2158 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2159 $self->{children}[1]->update; 2329 $self->{children}[1]->update;
2160} 2330}
2161 2331
… …
2170 2340
2171 $ROOT->on_post_alloc ($self, sub { 2341 $ROOT->on_post_alloc ($self, sub {
2172 if (delete $self->{need_reflow}) { 2342 if (delete $self->{need_reflow}) {
2173 my $height = 0; 2343 my $height = 0;
2174 2344
2175 $height += $_->[0] = $self->text_height ($_->[2]) 2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2176 for @{$self->{par}}; 2346 for @{$self->{par}};
2177 2347
2178 $self->{height} = $height; 2348 $self->{height} = $height;
2179 2349
2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2351 $self->{children}[1]->update;
2181 2352
2182 delete $self->{texture}; 2353 delete $self->{texture};
2183 } 2354 }
2184 2355
2185 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2186 glClearColor 0, 0, 0, 0; 2357 glClearColor 0.5, 0.5, 0.5, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 2358 glClear GL_COLOR_BUFFER_BIT;
2188
2189 glEnable GL_TEXTURE_2D;
2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191 2359
2192 my $top = int $self->{children}[1]{range}[0]; 2360 my $top = int $self->{children}[1]{range}[0];
2193 2361
2194 my $y0 = $top; 2362 my $y0 = $top;
2195 my $y1 = $top + $self->{h}; 2363 my $y1 = $top + $self->{h};
… …
2198 2366
2199 my $layout = $self->{layout}; 2367 my $layout = $self->{layout};
2200 2368
2201 $layout->set_font ($self->{font}) if $self->{font}; 2369 $layout->set_font ($self->{font}) if $self->{font};
2202 2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2203 for my $par (@{$self->{par}}) { 2374 for my $par (@{$self->{par}}) {
2204 my $h = $par->[0]; 2375 my $h = $par->[0];
2205 2376
2206 if ($y0 < $y + $h && $y < $y1) { 2377 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] }); 2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2208 $layout->set_markup ($par->[2]); 2380 $layout->set_markup ($par->[3]);
2209 2381
2210 my ($W, $H) = $layout->size; 2382 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2211 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2383
2384 glRasterPos $par->[2], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2212 } 2386 }
2213 2387
2214 $y += $h; 2388 $y += $h;
2215 } 2389 }
2216 2390
2217 glDisable GL_TEXTURE_2D; 2391 glDisable GL_BLEND;
2218 }; 2392 };
2219 }); 2393 });
2220} 2394}
2221 2395
2222sub _draw { 2396sub _draw {
2223 my ($self) = @_; 2397 my ($self) = @_;
2224 2398
2225 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 2401 glColor 1, 1, 1, 1;
2228 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2402 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2229 glDisable GL_TEXTURE_2D; 2403 glDisable GL_TEXTURE_2D;
2230 2404
2231 $self->{children}[1]->draw; 2405 $self->{children}[1]->draw;
2232 2406
2233} 2407}
… …
2332 2506
2333sub set_tooltip_from { 2507sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2508 my ($self, $widget) = @_;
2335 2509
2336 $self->add (new CFClient::UI::Label 2510 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2511 markup => $widget->{tooltip},
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2513 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2514 fg => [0, 0, 0, 1],
2515 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2516 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2517 );
2343} 2518}
2344 2519
2345sub size_request { 2520sub size_request {
2346 my ($self) = @_; 2521 my ($self) = @_;
… …
2392use CFClient::OpenGL; 2567use CFClient::OpenGL;
2393 2568
2394sub new { 2569sub new {
2395 my $class = shift; 2570 my $class = shift;
2396 2571
2397 $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2398 aspect => 1, 2573 aspect => 1,
2399 @_, 2574 @_,
2400 ) 2575 );
2576
2577 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self);
2579
2580 $self->{timer} = Event->timer (
2581 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2582 hard => 1,
2583 interval => $self->{animspeed},
2584 cb => sub {
2585 ++$widget->{frame};
2586 $widget->update;
2587 },
2588 );
2589 }
2590
2591 $self
2401} 2592}
2402 2593
2403sub size_request { 2594sub size_request {
2404 (32, 8) 2595 (32, 8)
2405} 2596}
2406 2597
2598sub update {
2599 my ($self) = @_;
2600
2601 return unless $self->{visible};
2602
2603 $self->SUPER::update;
2604}
2605
2407sub _draw { 2606sub _draw {
2408 my ($self) = @_; 2607 my ($self) = @_;
2409 2608
2410 return unless $::CONN;#d# manage and cache textures differently 2609 return unless $::CONN;#d# manage and cache textures differently
2610
2611 my $face;
2612
2613 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}];
2615
2616 $face = $anim->[ $self->{frame} % @$anim ]
2617 if $anim && @$anim;
2618 }
2619
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 2621
2413 # TODO animation
2414 if ($tex) { 2622 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 2623 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2625 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2420 } 2628 }
2421} 2629}
2422 2630
2631sub DESTROY {
2632 my ($self) = @_;
2633
2634 $self->{timer}->cancel
2635 if $self->{timer};
2636
2637 $self->SUPER::DESTROY;
2638}
2639
2423############################################################################# 2640#############################################################################
2424 2641
2425package CFClient::UI::InventoryItem; 2642package CFClient::UI::InventoryItem;
2426 2643
2427our @ISA = CFClient::UI::HBox::; 2644our @ISA = CFClient::UI::HBox::;
2645
2646sub _item_to_desc {
2647 my ($item) = @_;
2648
2649 my $desc =
2650 $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} × $item->{name_pl}";
2653
2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2655 and $desc .= " (open)";
2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2657 and $desc .= " (applied)";
2658 $item->{flags} & Crossfire::Protocol::F_UNPAID
2659 and $desc .= " (unpaid)";
2660 $item->{flags} & Crossfire::Protocol::F_MAGIC
2661 and $desc .= " (magic)";
2662 $item->{flags} & Crossfire::Protocol::F_CURSED
2663 and $desc .= " (cursed)";
2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2665 and $desc .= " (damned)";
2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2667 and $desc .= " *";
2668
2669 $desc
2670}
2428 2671
2429sub new { 2672sub new {
2430 my $class = shift; 2673 my $class = shift;
2431 2674
2432 my %args = @_; 2675 my %args = @_;
2433 2676
2434 my $item = delete $args{item}; 2677 my $item = delete $args{item};
2435 2678
2436 my $desc = $item->{nrof} < 2 2679 my $desc = _item_to_desc ($item);
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440 2680
2441 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2442 can_hover => 1, 2682 can_hover => 1,
2443 can_events => 1, 2683 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc) 2684 tooltip => ((CFClient::UI::Label::escape $desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub { 2686 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_; 2687 my ($self, $ev, $x, $y) = @_;
2448 2688
2449 # todo: maybe put examine on 1? but should just be a tooltip :( 2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2691 my $targ = $::CONN->{player}{tag};
2692
2693 if ($item->{container} == $::CONN->{player}{tag}) {
2694 $targ = $main::OPENCONT;
2695 }
2696
2697 $::CONN->send ("move $targ $item->{tag} 0");
2450 if ($ev->{button} == 1) { 2698 } elsif ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2699 $::CONN->send ("examine $item->{tag}");
2452 } elsif ($ev->{button} == 2) { 2700 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}"); 2701 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) { 2702 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new ( 2703 my @menu_items = (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2704 ["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}") }], 2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2706 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2707 (
2708 $item->{flags} & Crossfire::Protocol::F_LOCKED
2709 ? (
2710 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2711 )
2712 : (
2713 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2465 ], 2716 ),
2466 )->popup ($ev); 2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2467 } 2720 }
2468 2721
2469 1 2722 1
2470 }, 2723 },
2471 %args 2724 %args
2472 ); 2725 );
2726
2473 2727
2474 $self->add (new CFClient::UI::Face 2728 $self->add (new CFClient::UI::Face
2475 can_events => 0, 2729 can_events => 0,
2476 face => $item->{face}, 2730 face => $item->{face},
2477 anim => $item->{anim}, 2731 anim => $item->{anim},
2478 animspeed => $item->{animspeed}, 2732 animspeed => $item->{animspeed},
2479 ); 2733 );
2480 2734
2481 $self->add (new CFClient::UI::Label 2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2482 can_events => 0, 2736
2483 text => $desc, 2737 $self->{item} = $item;
2484 ); 2738
2739 $self->update_item;
2485 2740
2486 $self 2741 $self
2742}
2743
2744sub update_item {
2745 my ($self) = @_;
2746
2747 my $desc = _item_to_desc ($self->{item});
2748
2749 $self->{name_lbl}->set_text ($desc);
2487} 2750}
2488 2751
2489############################################################################# 2752#############################################################################
2490 2753
2491package CFClient::UI::Inventory; 2754package CFClient::UI::Inventory;
… …
2494 2757
2495sub new { 2758sub new {
2496 my $class = shift; 2759 my $class = shift;
2497 2760
2498 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox), 2762 scrolled => (new CFClient::UI::Table),
2500 @_, 2763 @_,
2501 ); 2764 );
2502 2765
2503 $self 2766 $self
2504} 2767}
… …
2507 my ($self, $items) = @_; 2770 my ($self, $items) = @_;
2508 2771
2509 $self->{scrolled}->clear; 2772 $self->{scrolled}->clear;
2510 return unless $items; 2773 return unless $items;
2511 2774
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2513 2779
2514 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2515 2781
2516 for my $item (@items) { 2782 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2 2783 $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); 2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2786 }
2787
2788 my $i = 0;
2789 for (@items) {
2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2522 } 2793 }
2523 2794
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525} 2796}
2526 2797
… …
2605 2876
2606package CFClient::UI::Statusbox; 2877package CFClient::UI::Statusbox;
2607 2878
2608our @ISA = CFClient::UI::VBox::; 2879our @ISA = CFClient::UI::VBox::;
2609 2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2610sub reorder { 2890sub reorder {
2611 my ($self) = @_; 2891 my ($self) = @_;
2612 my $NOW = time; 2892 my $NOW = time;
2613 2893
2614 while (my ($k, $v) = each %{ $self->{item} }) { 2894 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2632 ? "<b>$item->{count} ×</b> $item->{text}" 2912 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 2913 : $item->{text};
2634 2914
2635 for ($short) { 2915 for ($short) {
2636 s/^\s+//; 2916 s/^\s+//;
2637 s/\012.*/…/s; 2917 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 2918 }
2641 2919
2642 new CFClient::UI::Label 2920 new CFClient::UI::Label
2643 markup => $short, 2921 markup => $short,
2644 tooltip => $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 2923 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 2924 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2648 color => $item->{color}, 2927 fg => $item->{fg},
2649 can_events => 1, 2928 can_events => 1,
2650 can_hover => 1 2929 can_hover => 1
2651 }; 2930 };
2652 } 2931 }
2653 2932
… …
2679 $self->{item}{$group} = { 2958 $self->{item}{$group} = {
2680 id => ++$self->{id}, 2959 id => ++$self->{id},
2681 text => $text, 2960 text => $text,
2682 timeout => $timeout, 2961 timeout => $timeout,
2683 tooltip => $text, 2962 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 2963 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 2964 pri => 0,
2687 count => 1, 2965 count => 1,
2688 %arg, 2966 %arg,
2689 }; 2967 };
2690 } 2968 }
2691 2969
2692 $self->reorder; 2970 $self->reorder;
2693} 2971}
2694 2972
2973sub reconfigure {
2974 my ($self) = @_;
2975
2976 delete $_->{label}
2977 for values %{ $self->{item} || {} };
2978
2979 $self->reorder;
2980 $self->SUPER::reconfigure;
2981}
2982
2695############################################################################# 2983#############################################################################
2696 2984
2697package CFClient::UI::Root; 2985package CFClient::UI::Root;
2698 2986
2699our @ISA = CFClient::UI::Container::; 2987our @ISA = CFClient::UI::Container::;
… …
2729} 3017}
2730 3018
2731sub size_allocate { 3019sub size_allocate {
2732 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h) = @_;
2733 3021
2734 my $old_w = $self->{old_w}; 3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2735 my $old_h = $self->{old_h}; 3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2736 3024
2737 if ($old_w && $old_h) { 3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2738 for my $child ($self->children) { 3026 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 3027
2750 for my $child ($self->children) { 3028 for my $child ($self->children) {
2751 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2752 3030
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x};
3033
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3037 $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; 3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
2755 $child->configure ($X, $Y, $W, $H); 3040 $child->configure ($X, $Y, $W, $H);
2756 } 3041 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760} 3042}
2761 3043
2762sub coord2local { 3044sub coord2local {
2763 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2764 3046
… …
2777 $self->check_size; 3059 $self->check_size;
2778 $::WANT_REFRESH++; 3060 $::WANT_REFRESH++;
2779} 3061}
2780 3062
2781sub add { 3063sub add {
2782 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2783 3065
3066 for my $child (@children) {
3067 $child->{toplevel} = 1;
3068
2784 # integerise window positions 3069 # integerise window positions
2785 $child->{x} = int $child->{x}; 3070 $child->{x} = int $child->{x};
2786 $child->{y} = int $child->{y}; 3071 $child->{y} = int $child->{y};
3072 }
2787 3073
2788 $self->SUPER::add ($child); 3074 $self->SUPER::add (@children);
3075
3076 while (@children) {
3077 my $w = pop @children;
3078 push @children, $w->children;
3079 $w->{visible} = 1;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 }
2789} 3093}
2790 3094
2791sub on_refresh { 3095sub on_refresh {
2792 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2793 3097
… …
2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863 glClear GL_COLOR_BUFFER_BIT; 3167 glClear GL_COLOR_BUFFER_BIT;
2864 3168
2865 glMatrixMode GL_PROJECTION; 3169 glMatrixMode GL_PROJECTION;
2866 glLoadIdentity; 3170 glLoadIdentity;
2867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868 glMatrixMode GL_MODELVIEW; 3172 glMatrixMode GL_MODELVIEW;
2869 glLoadIdentity; 3173 glLoadIdentity;
2870 3174
2871 $self->_draw; 3175 $self->_draw;
2872} 3176}
… …
2874############################################################################# 3178#############################################################################
2875 3179
2876package CFClient::UI; 3180package CFClient::UI;
2877 3181
2878$ROOT = new CFClient::UI::Root; 3182$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3183$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3184
28811 31851
2882 3186

Diff Legend

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