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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.216 by root, Fri May 19 16:43:57 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}) {
… …
24 26
25 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
26 28
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 30
29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font}); 31 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 32 $TOOLTIP->show;
32 33
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34 35
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
38 38
39 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
40 } 42 }
41 43
42 return; 44 return;
43 } 45 }
44 } 46 }
… …
131 133
132 for (@$vals) { 134 for (@$vals) {
133 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
134 $rem += $_ - $i; 136 $rem += $_ - $i;
135 $_ = $i; 137 $_ = $i;
138 }
139}
140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
136 } 161 }
137} 162}
138 163
139############################################################################# 164#############################################################################
140 165
… …
159 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
161 } 186 }
162 } 187 }
163 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
164 $self 191 $self
165} 192}
166 193
167sub destroy { 194sub destroy {
168 my ($self) = @_; 195 my ($self) = @_;
… …
241 268
242sub size_allocate { 269sub size_allocate {
243 # nothing to be done 270 # nothing to be done
244} 271}
245 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
246sub children { 280sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259} 281}
260 282
261sub set_max_size { 283sub set_max_size {
262 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
263 285
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
288}
289
290sub set_tooltip {
291 my ($self, $tooltip) = @_;
292
293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
266} 299}
267 300
268# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
269sub coord2local { 302sub coord2local {
270 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
359 glEnd; 392 glEnd;
360 glPopMatrix; 393 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 395 }
363} 396}
364 397
365sub _draw { 398sub _draw {
366 my ($self) = @_; 399 my ($self) = @_;
… …
383sub set_parent { 416sub set_parent {
384 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
385 418
386 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
387 420
421 # TODO: req_w _does_change after ->reconfigure
388 $self->check_size 422 $self->check_size
389 unless exists $self->{req_w}; 423 unless exists $self->{req_w};
390} 424}
391 425
392sub check_size { 426sub check_size {
393 my ($self) = @_; 427 my ($self, $forced) = @_;
394 428
429 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 431}
397 432
398sub update { 433sub update {
399 my ($self) = @_; 434 my ($self) = @_;
… …
415} 450}
416 451
417sub DESTROY { 452sub DESTROY {
418 my ($self) = @_; 453 my ($self) = @_;
419 454
455 delete $WIDGET{$self+0};
420 #$self->deactivate; 456 #$self->deactivate;
421} 457}
422 458
423############################################################################# 459#############################################################################
424 460
… …
433 my $class = shift; 469 my $class = shift;
434 470
435 # range [value, low, high, page] 471 # range [value, low, high, page]
436 472
437 $class->SUPER::new ( 473 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
440 @_ 476 @_
441 ) 477 )
442} 478}
443 479
444sub _draw { 480sub _draw {
445 my ($self) = @_; 481 my ($self) = @_;
446 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
448 489
449 glEnable GL_BLEND; 490 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
452 493
453 glBegin GL_QUADS; 494 glBegin GL_QUADS;
454 glVertex 0 , 0; 495 glVertex 0 , 0;
455 glVertex 0 , $h; 496 glVertex 0 , $h;
456 glVertex $w, $h; 497 glVertex $w, $h;
457 glVertex $w, 0; 498 glVertex $w, 0;
458 glEnd; 499 glEnd;
459 500
460 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
461} 503}
462 504
463############################################################################# 505#############################################################################
464 506
465package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
509 $self->{children} = [ 551 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 553 @{$self->{children}}, @widgets
512 ]; 554 ];
513 555
514 $self->check_size; 556 $self->check_size (1);
515 $self->update; 557 $self->update;
516} 558}
517 559
518sub children { 560sub children {
519 @{ $_[0]{children} } 561 @{ $_[0]{children} }
… …
626} 668}
627 669
628sub update { 670sub update {
629 my ($self) = @_; 671 my ($self) = @_;
630 672
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 674 $self->SUPER::update;
633} 675}
634 676
635sub size_allocate { 677sub size_allocate {
636 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
… …
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
652 694
653 $self->_render; 695 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 696 };
662} 697}
663 698
664sub _draw { 699sub _draw {
665 my ($self) = @_; 700 my ($self) = @_;
… …
669 my $tex = $self->{texture} 704 my $tex = $self->{texture}
670 or return; 705 or return;
671 706
672 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
675 710
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677 712
678 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
679} 714}
… …
774 $self->add ($self->{slider}); 809 $self->add ($self->{slider});
775 810
776 $self 811 $self
777} 812}
778 813
779#TODO# update range on size_allocate depeneing on child 814#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 815# update viewport offset on scroll
781 816
782############################################################################# 817#############################################################################
783 818
784package CFClient::UI::Frame; 819package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 823use CFClient::OpenGL;
789 824
790sub new { 825sub new {
791 my $class = shift; 826 my $class = shift;
792 827
793 my $self = $class->SUPER::new ( 828 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 829 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 830 @_,
798 ); 831 )
799
800 $self
801} 832}
802 833
803sub _draw { 834sub _draw {
804 my ($self) = @_; 835 my ($self) = @_;
805 836
806 my ($w, $h) = ($self->{w}, $self->{h}); 837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
807 839
808 glEnable GL_BLEND; 840 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 842 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 843
813# glBegin GL_QUADS; 844 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 845 glVertex 0 , 0;
816# glVertex 0 , $h; 846 glVertex 0 , $h;
817# glVertex $w, $h; 847 glVertex $w, $h;
818# glVertex $w, 0; 848 glVertex $w, 0;
819# glEnd; 849 glEnd;
820 850
821
822 $self->child->draw;
823 glDisable GL_BLEND; 851 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 852 }
853
854 $self->SUPER::_draw;
825} 855}
826 856
827############################################################################# 857#############################################################################
828 858
829package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
… …
843 873
844 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
847 border => 0.6, 877 border => 0.6,
878 toplevel => 1,
848 can_events => 1, 879 can_events => 1,
849 @_ 880 @_
850 ); 881 );
851 882
852 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
… …
877 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
878 909
879 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
881 912
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 914 if $self->{title};
884 915
885 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
886} 917}
887 918
… …
945 my ($self) = @_; 976 my ($self) = @_;
946 977
947 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 980
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 983
955 my $border = $self->border; 984 my $border = $self->border;
956 985
957 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 991
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 993 my $bg = $tex[0];
965 994
966 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
971 1000
972 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
976 1006
977 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1008
981 $self->{title}->draw if $self->{title}; 1009 $self->{title}->draw if $self->{title};
982 1010
983 $self->child->draw; 1011 $self->child->draw;
984} 1012}
… …
1251 1279
1252############################################################################# 1280#############################################################################
1253 1281
1254package CFClient::UI::Label; 1282package CFClient::UI::Label;
1255 1283
1256our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1257 1285
1258use CFClient::OpenGL; 1286use CFClient::OpenGL;
1259 1287
1260sub new { 1288sub new {
1261 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1262 1290
1263 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1265 #font => default_font 1295 #font => default_font
1266 #text => initial text 1296 #text => initial text
1267 #markup => initial narkup 1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1300 layout => (new CFClient::Layout),
1269 fontsize => 1, 1301 fontsize => 1,
1270 align => -1, 1302 align => -1,
1271 valign => -1, 1303 valign => -1,
1272 padding => 2, 1304 padding => 2,
… …
1287 } 1319 }
1288 1320
1289 $self 1321 $self
1290} 1322}
1291 1323
1292sub escape { 1324sub escape($) {
1293 local $_ = $_[1]; 1325 local $_ = $_[0];
1294 1326
1295 s/&/&amp;/g; 1327 s/&/&amp;/g;
1296 s/>/&gt;/g; 1328 s/>/&gt;/g;
1297 s/</&lt;/g; 1329 s/</&lt;/g;
1298 1330
1299 $_[1] 1331 $_
1300} 1332}
1301 1333
1302sub update { 1334sub update {
1303 my ($self) = @_; 1335 my ($self) = @_;
1304 1336
… …
1337sub size_request { 1369sub size_request {
1338 my ($self) = @_; 1370 my ($self) = @_;
1339 1371
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1377
1344 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1345 1379
1346 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1376} 1410}
1377 1411
1378sub _draw { 1412sub _draw {
1379 my ($self) = @_; 1413 my ($self) = @_;
1380 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1381 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1424
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1426
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1429 : ($self->{w} - $tex->{w}) * 0.5);
1392 1430
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1433 : ($self->{h} - $tex->{h}) * 0.5);
1396 1434
1397 $tex 1435 $tex
1398 }; 1436 };
1399 1437
1400 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
… …
1455sub set_text { 1493sub set_text {
1456 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1457 1495
1458 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1497 $self->_set_text ($text);
1498 $self->update;
1460 $self->check_size; 1499 $self->check_size;
1461 $self->update;
1462} 1500}
1463 1501
1464sub get_text { 1502sub get_text {
1465 $_[0]{text} 1503 $_[0]{text}
1466} 1504}
… …
1486 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1488 1526
1489 my $text = $self->get_text; 1527 my $text = $self->get_text;
1490 1528
1491 if ($sym == 8) { 1529 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1542 $self->emit ('escape');
1505 } elsif ($uni) { 1543 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1545 }
1508 1546
1509 $self->_set_text ($text); 1547 $self->_set_text ($text);
1510 $self->update; 1548 $self->update;
1549 $self->check_size;
1511} 1550}
1512 1551
1513sub focus_in { 1552sub focus_in {
1514 my ($self) = @_; 1553 my ($self) = @_;
1515 1554
… …
1644 my $class = shift; 1683 my $class = shift;
1645 1684
1646 $class->SUPER::new ( 1685 $class->SUPER::new (
1647 padding => 4, 1686 padding => 4,
1648 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1651 can_hover => 1, 1689 can_hover => 1,
1652 align => 0, 1690 align => 0,
1653 valign => 0, 1691 valign => 0,
1654 can_events => 1, 1692 can_events => 1,
… …
1702 1740
1703 $class->SUPER::new ( 1741 $class->SUPER::new (
1704 padding => 2, 1742 padding => 2,
1705 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1706 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1707 state => 0, 1747 state => 0,
1708 can_hover => 1, 1748 can_hover => 1,
1709 @_ 1749 @_
1710 ) 1750 )
1711} 1751}
… …
1735 1775
1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1737 1777
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 1779
1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1740 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 1784 glDisable GL_TEXTURE_2D;
1747} 1785}
1748 1786
1749############################################################################# 1787#############################################################################
1750 1788
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1998 2036
1999sub new { 2037sub new {
2000 my $class = shift; 2038 my $class = shift;
2001 2039
2002 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
2003 2041
2004 # TODO: 0-width page 2042 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2044 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2011 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2013 vertical => 0, 2053 vertical => 0,
2014 can_hover => 1, 2054 can_hover => 1,
2015 inner_pad => 5, 2055 inner_pad => .05,
2016 @_ 2056 @_
2017 ); 2057 );
2018 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
2019 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
2020} 2086}
2021 2087
2022sub size_request { 2088sub size_request {
2023 my ($self) = @_; 2089 my ($self) = @_;
2024 2090
… …
2037 2103
2038sub mouse_motion { 2104sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2040 2106
2041 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2043 2125
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2045 2127
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2048 2129
2049 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2132
2055 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2056 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
2057 } 2140 });
2058}
2059 2141
2060# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2143}
2067 2144
2068sub _draw { 2145sub _draw {
2069 my ($self) = @_; 2146 my ($self) = @_;
2070 2147
2071 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2072 2149
2073 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2074 2151
2075 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2077 2154
2155 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2157 }
2083 2158
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2161
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2164
2108 # draw background 2165 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2167
2111 # draw handle 2168 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2170
2114 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2115} 2172}
2116 2173
2117############################################################################# 2174#############################################################################
… …
2205 2262
2206 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2207 2264
2208 delete $self->{texture}; 2265 delete $self->{texture};
2209 2266
2210 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2211 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2269 my $height = 0;
2213 2270
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2215 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
2220 2277
2221 delete $self->{texture}; 2278 delete $self->{texture};
2222 } 2279 }
2223 2280
2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2225 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2226 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2227 2284
2228 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230 2287
… …
2262 my ($self) = @_; 2319 my ($self) = @_;
2263 2320
2264 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2268 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2269 2326
2270 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2271 2328
2272} 2329}
… …
2367 @_, 2424 @_,
2368 can_events => 0, 2425 can_events => 0,
2369 ) 2426 )
2370} 2427}
2371 2428
2372sub set_markup { 2429sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2430 my ($self, $widget) = @_;
2374 2431
2375 $self->{label} = new CFClient::UI::Label 2432 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip},
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2435 fontsize => 0.8,
2377 fg => [0, 0, 0], 2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2378 font => ($font || $::FONT_PROP); 2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2439 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2440}
2384 2441
2385sub size_request { 2442sub size_request {
2386 my ($self) = @_; 2443 my ($self) = @_;
2387 2444
… …
2397} 2454}
2398 2455
2399sub _draw { 2456sub _draw {
2400 my ($self) = @_; 2457 my ($self) = @_;
2401 2458
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2459 glTranslate 0.375, 0.375;
2404 2460
2405 my ($w, $h) = @$self{qw(w h)}; 2461 my ($w, $h) = @$self{qw(w h)};
2406 2462
2407 glColor 1, 0.8, 0.4; 2463 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2474 glVertex 0 , $h;
2419 glVertex $w, $h; 2475 glVertex $w, $h;
2420 glVertex $w, 0; 2476 glVertex $w, 0;
2421 glEnd; 2477 glEnd;
2422 2478
2423 glPopMatrix; 2479 glTranslate 2 - 0.375, 2 - 0.375;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2480 $self->SUPER::_draw;
2427} 2481}
2428 2482
2429############################################################################# 2483#############################################################################
2430 2484
… …
2467 2521
2468package CFClient::UI::InventoryItem; 2522package CFClient::UI::InventoryItem;
2469 2523
2470our @ISA = CFClient::UI::HBox::; 2524our @ISA = CFClient::UI::HBox::;
2471 2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2472sub new { 2552sub new {
2473 my $class = shift; 2553 my $class = shift;
2474 2554
2475 my %args = @_; 2555 my %args = @_;
2476 2556
2477 my $item = delete $args{item}; 2557 my $item = delete $args{item};
2478 2558
2479 my $desc = $item->{nrof} < 2 2559 my $desc = _item_to_desc ($item);
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483 2560
2484 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2485 can_hover => 1, 2562 can_hover => 1,
2486 can_events => 1, 2563 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc) 2564 tooltip => ((CFClient::UI::Label::escape $desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub { 2566 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_; 2567 my ($self, $ev, $x, $y) = @_;
2491 2568
2492 # todo: maybe put examine on 1? but should just be a tooltip :( 2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) { 2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2577 $::CONN->send ("move $targ $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) { 2578 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}"); 2579 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) { 2580 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new ( 2581 my @menu_items = (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2501 [ 2586 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") }, 2588 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ], 2589 ],
2509 )->popup ($ev); 2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2510 } 2593 }
2511 2594
2512 1 2595 1
2513 }, 2596 },
2514 %args 2597 %args
2515 ); 2598 );
2599
2516 2600
2517 $self->add (new CFClient::UI::Face 2601 $self->add (new CFClient::UI::Face
2518 can_events => 0, 2602 can_events => 0,
2519 face => $item->{face}, 2603 face => $item->{face},
2520 anim => $item->{anim}, 2604 anim => $item->{anim},
2521 animspeed => $item->{animspeed}, 2605 animspeed => $item->{animspeed},
2522 ); 2606 );
2523 2607
2524 $self->add (new CFClient::UI::Label 2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2525 can_events => 0, 2609
2526 text => $desc, 2610 $self->{item} = $item;
2527 ); 2611
2612 $self->update_item;
2528 2613
2529 $self 2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2530} 2623}
2531 2624
2532############################################################################# 2625#############################################################################
2533 2626
2534package CFClient::UI::Inventory; 2627package CFClient::UI::Inventory;
… …
2550 my ($self, $items) = @_; 2643 my ($self, $items) = @_;
2551 2644
2552 $self->{scrolled}->clear; 2645 $self->{scrolled}->clear;
2553 return unless $items; 2646 return unless $items;
2554 2647
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2556 2652
2557 $self->{real_items} = \@items; 2653 $self->{real_items} = \@items;
2558 2654
2559 for my $item (@items) { 2655 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2565 } 2658 }
2659
2660 $self->{scrolled}->add (@items);
2566 2661
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568} 2663}
2569 2664
2570sub size_request { 2665sub size_request {
… …
2648 2743
2649package CFClient::UI::Statusbox; 2744package CFClient::UI::Statusbox;
2650 2745
2651our @ISA = CFClient::UI::VBox::; 2746our @ISA = CFClient::UI::VBox::;
2652 2747
2748sub new {
2749 my $class = shift;
2750
2751 $class->SUPER::new (
2752 fontsize => 0.8,
2753 @_,
2754 )
2755}
2756
2653sub reorder { 2757sub reorder {
2654 my ($self) = @_; 2758 my ($self) = @_;
2655 my $NOW = time; 2759 my $NOW = time;
2656 2760
2657 while (my ($k, $v) = each %{ $self->{item} }) { 2761 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2762 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 2763 }
2660 2764
2661 my @widgets; 2765 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2766
2767 my @items = sort {
2768 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} };
2771
2663 my $count = 10 + 1; 2772 my $count = 10 + 1;
2664 for my $item (@items) { 2773 for my $item (@items) {
2665 last unless --$count; 2774 last unless --$count;
2666 2775
2667 push @widgets, $item->{label} ||= do { 2776 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 2777 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 2778 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text};
2781
2670 for ($short) { 2782 for ($short) {
2671 s/^\s+//; 2783 s/^\s+//;
2672 s/\012.*//s; 2784 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 } 2785 }
2676 2786
2677 new CFClient::UI::Label 2787 new CFClient::UI::Label
2678 markup => $short, 2788 markup => $short,
2679 tooltip => delete $item->{tooltip}, 2789 tooltip => $item->{tooltip},
2680 fontsize => delete $item->{fontsize}, 2790 tooltip_font => $::FONT_PROP,
2681 color => delete $item->{color}, 2791 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg},
2682 can_events => 1, 2795 can_events => 1,
2683 can_hover => 1, 2796 can_hover => 1
2684 }; 2797 };
2685 } 2798 }
2686 2799
2687 $self->clear; 2800 $self->clear;
2688 $self->SUPER::add (@widgets); 2801 $self->SUPER::add (reverse @widgets);
2689} 2802}
2690 2803
2691sub add { 2804sub add {
2692 my ($self, $text, %arg) = @_; 2805 my ($self, $text, %arg) = @_;
2693 2806
2694 my $item = { 2807 $text =~ s/^\s+//;
2695 time => time, 2808 $text =~ s/\s+$//;
2809
2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2811
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813
2814 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) {
2816 $item->{count}++;
2817 } else {
2818 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text;
2820 }
2821 $item->{id} = ++$self->{id};
2822 $item->{timeout} = $timeout;
2823 delete $item->{label};
2824 } else {
2825 $self->{item}{$group} = {
2826 id => ++$self->{id},
2696 text => $text, 2827 text => $text,
2697 timeout => 60, 2828 timeout => $timeout,
2698 tooltip => $text, 2829 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2701 %arg, 2833 %arg,
2834 };
2702 }; 2835 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 2836
2709 $self->reorder; 2837 $self->reorder;
2838}
2839
2840sub reconfigure {
2841 my ($self) = @_;
2842
2843 delete $_->{label}
2844 for values %{ $self->{item} || {} };
2845
2846 $self->reorder;
2847 $self->SUPER::reconfigure;
2710} 2848}
2711 2849
2712############################################################################# 2850#############################################################################
2713 2851
2714package CFClient::UI::Root; 2852package CFClient::UI::Root;
… …
2746} 2884}
2747 2885
2748sub size_allocate { 2886sub size_allocate {
2749 my ($self, $w, $h) = @_; 2887 my ($self, $w, $h) = @_;
2750 2888
2751 my $old_w = $self->{old_w}; 2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2752 my $old_h = $self->{old_h}; 2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2753 2891
2754 if ($old_w && $old_h) { 2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2755 for my $child ($self->children) { 2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766 2894
2767 for my $child ($self->children) { 2895 for my $child ($self->children) {
2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769 2897
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x};
2900
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902 if exists $child->{req_y};
2903
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906
2772 $child->configure ($X, $Y, $W, $H); 2907 $child->configure ($X, $Y, $W, $H);
2773 } 2908 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777} 2909}
2778 2910
2779sub coord2local { 2911sub coord2local {
2780 my ($self, $x, $y) = @_; 2912 my ($self, $x, $y) = @_;
2781 2913
… …
2794 $self->check_size; 2926 $self->check_size;
2795 $::WANT_REFRESH++; 2927 $::WANT_REFRESH++;
2796} 2928}
2797 2929
2798sub add { 2930sub add {
2799 my ($self, $child) = @_; 2931 my ($self, @children) = @_;
2800 2932
2933 for my $child (@children) {
2934 $child->{toplevel} = 1;
2935
2801 # integerise window positions 2936 # integerise window positions
2802 $child->{x} = int $child->{x}; 2937 $child->{x} = int $child->{x};
2803 $child->{y} = int $child->{y}; 2938 $child->{y} = int $child->{y};
2939 }
2804 2940
2805 $self->SUPER::add ($child); 2941 $self->SUPER::add (@children);
2806} 2942}
2807 2943
2808sub on_refresh { 2944sub on_refresh {
2809 my ($self, $id, $cb) = @_; 2945 my ($self, $id, $cb) = @_;
2810 2946
2811 $self->{refresh_hook}{$id} = $cb; 2947 $self->{refresh_hook}{$id} = $cb;
2812} 2948}
2813 2949
2950sub on_post_alloc {
2951 my ($self, $id, $cb) = @_;
2952
2953 $self->{post_alloc_hook}{$id} = $cb;
2954}
2955
2814sub draw { 2956sub draw {
2815 my ($self) = @_; 2957 my ($self) = @_;
2958
2959 while ($self->{refresh_hook}) {
2960 $_->()
2961 for values %{delete $self->{refresh_hook}};
2962 }
2816 2963
2817 if ($self->{check_size}) { 2964 if ($self->{check_size}) {
2818 my @queue = ([], []); 2965 my @queue = ([], []);
2819 2966
2820 for (;;) { 2967 for (;;) {
… …
2828 2975
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)} 2977 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request; 2978 : $widget->size_request;
2832 2979
2980 if (delete $widget->{force_alloc}
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835 2983
2836 $widget->{req_w} = $w; 2984 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h; 2985 $widget->{req_h} = $h;
2838 2986
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2840 2988
2841 $widget->{parent}->check_size 2989 $widget->{parent}->check_size
2842 if $widget->{parent}; 2990 if $widget->{parent};
2843 } 2991 }
2844 } 2992 }
… …
2856 $widget->size_allocate ($w, $h); 3004 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h); 3005 $widget->emit (size_allocate => $w, $h);
2858 } 3006 }
2859 } 3007 }
2860 3008
2861 while ($self->{refresh_hook}) { 3009 while ($self->{post_alloc_hook}) {
2862 $_->() 3010 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3011 for values %{delete $self->{post_alloc_hook}};
2864 } 3012 }
2865 3013
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3014 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 3016 glClear GL_COLOR_BUFFER_BIT;
… …
2879############################################################################# 3027#############################################################################
2880 3028
2881package CFClient::UI; 3029package CFClient::UI;
2882 3030
2883$ROOT = new CFClient::UI::Root; 3031$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip; 3032$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885 3033
28861 30341
2887 3035

Diff Legend

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