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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.214 by root, Wed May 17 22:59:13 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);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $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;
135 } 161 }
136} 162}
137 163
138############################################################################# 164#############################################################################
139 165
… …
158 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
160 } 186 }
161 } 187 }
162 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
163 $self 191 $self
164} 192}
165 193
166sub destroy { 194sub destroy {
167 my ($self) = @_; 195 my ($self) = @_;
… …
240 268
241sub size_allocate { 269sub size_allocate {
242 # nothing to be done 270 # nothing to be done
243} 271}
244 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
245sub children { 280sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 281}
259 282
260sub set_max_size { 283sub set_max_size {
261 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
262 285
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 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 }
265} 299}
266 300
267# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
268sub coord2local { 302sub coord2local {
269 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
355 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
358 glEnd; 392 glEnd;
359 glPopMatrix; 393 glPopMatrix;
360 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;
361 } 395 }
362} 396}
363 397
364sub _draw { 398sub _draw {
365 my ($self) = @_; 399 my ($self) = @_;
… …
382sub set_parent { 416sub set_parent {
383 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
384 418
385 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
386 420
421 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 422 $self->check_size
388 unless exists $self->{req_w}; 423 unless exists $self->{req_w};
389} 424}
390 425
391sub check_size { 426sub check_size {
392 my ($self) = @_; 427 my ($self, $forced) = @_;
393 428
429 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 431}
396 432
397sub update { 433sub update {
398 my ($self) = @_; 434 my ($self) = @_;
… …
414} 450}
415 451
416sub DESTROY { 452sub DESTROY {
417 my ($self) = @_; 453 my ($self) = @_;
418 454
455 delete $WIDGET{$self+0};
419 #$self->deactivate; 456 #$self->deactivate;
420} 457}
421 458
422############################################################################# 459#############################################################################
423 460
… …
432 my $class = shift; 469 my $class = shift;
433 470
434 # range [value, low, high, page] 471 # range [value, low, high, page]
435 472
436 $class->SUPER::new ( 473 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
439 @_ 476 @_
440 ) 477 )
441} 478}
442 479
443sub _draw { 480sub _draw {
444 my ($self) = @_; 481 my ($self) = @_;
445 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
447 489
448 glEnable GL_BLEND; 490 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
451 493
452 glBegin GL_QUADS; 494 glBegin GL_QUADS;
453 glVertex 0 , 0; 495 glVertex 0 , 0;
454 glVertex 0 , $h; 496 glVertex 0 , $h;
455 glVertex $w, $h; 497 glVertex $w, $h;
456 glVertex $w, 0; 498 glVertex $w, 0;
457 glEnd; 499 glEnd;
458 500
459 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
460} 503}
461 504
462############################################################################# 505#############################################################################
463 506
464package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
508 $self->{children} = [ 551 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 553 @{$self->{children}}, @widgets
511 ]; 554 ];
512 555
513 $self->check_size; 556 $self->check_size (1);
514 $self->update; 557 $self->update;
515} 558}
516 559
517sub children { 560sub children {
518 @{ $_[0]{children} } 561 @{ $_[0]{children} }
… …
625} 668}
626 669
627sub update { 670sub update {
628 my ($self) = @_; 671 my ($self) = @_;
629 672
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 674 $self->SUPER::update;
632} 675}
633 676
634sub size_allocate { 677sub size_allocate {
635 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
… …
773 $self->add ($self->{slider}); 816 $self->add ($self->{slider});
774 817
775 $self 818 $self
776} 819}
777 820
778#TODO# update range on size_allocate depeneing on child 821#TODO# update range on size_allocate depending on child
779# update viewport offset on scroll 822# update viewport offset on scroll
780 823
781############################################################################# 824#############################################################################
782 825
783package CFClient::UI::Frame; 826package CFClient::UI::Frame;
… …
787use CFClient::OpenGL; 830use CFClient::OpenGL;
788 831
789sub new { 832sub new {
790 my $class = shift; 833 my $class = shift;
791 834
792 my $self = $class->SUPER::new ( 835 $class->SUPER::new (
793 bg => [1, 1, 1, 1], 836 bg => undef,
794 border_bg => [1, 1, 1, 1],
795 border => 0.8,
796 @_ 837 @_,
797 ); 838 )
798
799 $self
800} 839}
801 840
802sub _draw { 841sub _draw {
803 my ($self) = @_; 842 my ($self) = @_;
804 843
805 my ($w, $h) = ($self->{w}, $self->{h}); 844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
806 846
807 glEnable GL_BLEND; 847 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 849 glColor @{ $self->{bg} };
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811 850
812# glBegin GL_QUADS; 851 glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0; 852 glVertex 0 , 0;
815# glVertex 0 , $h; 853 glVertex 0 , $h;
816# glVertex $w, $h; 854 glVertex $w, $h;
817# glVertex $w, 0; 855 glVertex $w, 0;
818# glEnd; 856 glEnd;
819 857
820
821 $self->child->draw;
822 glDisable GL_BLEND; 858 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D; 859 }
860
861 $self->SUPER::_draw;
824} 862}
825 863
826############################################################################# 864#############################################################################
827 865
828package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
… …
842 880
843 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
846 border => 0.6, 884 border => 0.6,
885 toplevel => 1,
847 can_events => 1, 886 can_events => 1,
848 @_ 887 @_
849 ); 888 );
850 889
851 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
… …
876 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
877 916
878 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
879 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
880 919
881 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
882 if $self->{title}; 921 if $self->{title};
883 922
884 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
885} 924}
886 925
… …
944 my ($self) = @_; 983 my ($self) = @_;
945 984
946 my ($w, $h ) = ($self->{w}, $self->{h}); 985 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
948 987
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 988 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 990
954 my $border = $self->border; 991 my $border = $self->border;
955 992
956 glColor @{ $self->{border_bg} }; 993 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 994 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
961 998
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 1000 my $bg = $tex[0];
964 1001
965 # TODO: repeat texture not scale 1002 # TODO: repeat texture not scale
… …
969 glColor @{ $self->{bg} }; 1006 glColor @{ $self->{bg} };
970 1007
971 $bg->{s} = $rep_x; 1008 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y; 1009 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1; 1010 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 }
975 1013
976 glDisable GL_TEXTURE_2D; 1014 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 1015
980 $self->{title}->draw if $self->{title}; 1016 $self->{title}->draw if $self->{title};
981 1017
982 $self->child->draw; 1018 $self->child->draw;
983} 1019}
… …
1250 1286
1251############################################################################# 1287#############################################################################
1252 1288
1253package CFClient::UI::Label; 1289package CFClient::UI::Label;
1254 1290
1255our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1256 1292
1257use CFClient::OpenGL; 1293use CFClient::OpenGL;
1258 1294
1259sub new { 1295sub new {
1260 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1261 1297
1262 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1263 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1264 #font => default_font 1302 #font => default_font
1265 #text => initial text 1303 #text => initial text
1266 #markup => initial narkup 1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1267 layout => (new CFClient::Layout), 1307 layout => (new CFClient::Layout),
1268 fontsize => 1, 1308 fontsize => 1,
1269 align => -1, 1309 align => -1,
1270 valign => -1, 1310 valign => -1,
1271 padding => 2, 1311 padding => 2,
… …
1286 } 1326 }
1287 1327
1288 $self 1328 $self
1289} 1329}
1290 1330
1291sub escape { 1331sub escape($) {
1292 local $_ = $_[1]; 1332 local $_ = $_[0];
1293 1333
1294 s/&/&amp;/g; 1334 s/&/&amp;/g;
1295 s/>/&gt;/g; 1335 s/>/&gt;/g;
1296 s/</&lt;/g; 1336 s/</&lt;/g;
1297 1337
1298 $_[1] 1338 $_
1299} 1339}
1300 1340
1301sub update { 1341sub update {
1302 my ($self) = @_; 1342 my ($self) = @_;
1303 1343
… …
1336sub size_request { 1376sub size_request {
1337 my ($self) = @_; 1377 my ($self) = @_;
1338 1378
1339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $self->{layout}->set_width ($self->{max_w} || -1); 1380 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342 1384
1343 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1344 1386
1345 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1375} 1417}
1376 1418
1377sub _draw { 1419sub _draw {
1378 my ($self) = @_; 1420 my ($self) = @_;
1379 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1380 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}}); 1425 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1383 $self->{layout}->set_width ($self->{w}); 1427 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1431
1386 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1387 1433
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5; 1436 : ($self->{w} - $tex->{w}) * 0.5);
1391 1437
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394 : ($self->{h} - $tex->{h}) * 0.5; 1440 : ($self->{h} - $tex->{h}) * 0.5);
1395 1441
1396 $tex 1442 $tex
1397 }; 1443 };
1398 1444
1399 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
… …
1454sub set_text { 1500sub set_text {
1455 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1456 1502
1457 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1458 $self->_set_text ($text); 1504 $self->_set_text ($text);
1505 $self->update;
1459 $self->check_size; 1506 $self->check_size;
1460 $self->update;
1461} 1507}
1462 1508
1463sub get_text { 1509sub get_text {
1464 $_[0]{text} 1510 $_[0]{text}
1465} 1511}
… …
1485 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1487 1533
1488 my $text = $self->get_text; 1534 my $text = $self->get_text;
1489 1535
1490 if ($sym == 8) { 1536 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1549 $self->emit ('escape');
1504 } elsif ($uni) { 1550 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1506 } 1552 }
1507 1553
1508 $self->_set_text ($text); 1554 $self->_set_text ($text);
1509 $self->update; 1555 $self->update;
1556 $self->check_size;
1510} 1557}
1511 1558
1512sub focus_in { 1559sub focus_in {
1513 my ($self) = @_; 1560 my ($self) = @_;
1514 1561
… …
1643 my $class = shift; 1690 my $class = shift;
1644 1691
1645 $class->SUPER::new ( 1692 $class->SUPER::new (
1646 padding => 4, 1693 padding => 4,
1647 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1648 bg => [1, 1, 1, 0.2],
1649 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1650 can_hover => 1, 1696 can_hover => 1,
1651 align => 0, 1697 align => 0,
1652 valign => 0, 1698 valign => 0,
1653 can_events => 1, 1699 can_events => 1,
… …
1701 1747
1702 $class->SUPER::new ( 1748 $class->SUPER::new (
1703 padding => 2, 1749 padding => 2,
1704 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1705 active_fg => [1, 1, 0], 1751 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5],
1706 state => 0, 1754 state => 0,
1707 can_hover => 1, 1755 can_hover => 1,
1708 @_ 1756 @_
1709 ) 1757 )
1710} 1758}
… …
1734 1782
1735 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1736 1784
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 1786
1787 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788
1739 glEnable GL_TEXTURE_2D; 1789 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 1790 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1746} 1792}
1747 1793
1748############################################################################# 1794#############################################################################
1749 1795
… …
1996 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
1997 2043
1998sub new { 2044sub new {
1999 my $class = shift; 2045 my $class = shift;
2000 2046
2001 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
2002 2048
2003 # TODO: 0-width page 2049 # TODO: 0-width page
2004 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
2005 # TODO: calculations are off 2051 # TODO: calculations are off
2006 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
2007 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
2008 active_fg => [0, 0, 0], 2054 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5],
2009 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
2010 req_w => $::WIDTH / 80, 2058 req_w => $::WIDTH / 80,
2011 req_h => $::WIDTH / 80, 2059 req_h => $::WIDTH / 80,
2012 vertical => 0, 2060 vertical => 0,
2013 can_hover => 1, 2061 can_hover => 1,
2014 inner_pad => 5, 2062 inner_pad => .05,
2015 @_ 2063 @_
2016 ); 2064 );
2017 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
2018 $self 2069 $self
2070}
2071
2072sub set_value {
2073 my ($self, $value) = @_;
2074
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076
2077 $hi = $lo + 1 if $hi <= $lo;
2078
2079 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi;
2081
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088
2089 if ($value != $old_value) {
2090 $self->emit (changed => $value);
2091 $self->update;
2092 }
2019} 2093}
2020 2094
2021sub size_request { 2095sub size_request {
2022 my ($self) = @_; 2096 my ($self) = @_;
2023 2097
… …
2036 2110
2037sub mouse_motion { 2111sub mouse_motion {
2038 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
2039 2113
2040 if ($GRAB == $self) { 2114 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116
2117 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2120
2121 $self->set_value ($x * ($hi - $lo) + $lo);
2122 }
2123}
2124
2125sub update {
2126 my ($self) = @_;
2127
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]);
2130
2041 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
2042 2132
2043 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
2044 2134
2045 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2046 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2047 2136
2048 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2049 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
2050 $x = $lo if $x < $lo;
2051 $x = $hi - $page if $x > $hi - $page;
2052 $self->{range}[0] = $x;
2053 2139
2054 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2055 $self->update; 2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value;
2146 $self->{knob_w} = $page;
2056 } 2147 });
2057}
2058 2148
2059# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
2060# so that the handle doesn't leave the texture. This calculation isn't 100%
2061# correct propably, but it does the job for now
2062sub _calc_inner_pad_px {
2063 my ($self, $w) = @_;
2064 ($w / 100) * $self->{inner_pad} # % to pixels
2065} 2150}
2066 2151
2067sub _draw { 2152sub _draw {
2068 my ($self) = @_; 2153 my ($self) = @_;
2069 2154
2070 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2071 2156
2072 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2073 2158
2074 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2075 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2076 2161
2162 glTranslate 1, 0, 0;
2077 glRotate 90, 0, 0, 1; 2163 glRotate 90, 0, 0, 1;
2078 glTranslate 0, -$self->{w}, 0;
2079
2080 ($w, $h) = ($h, $w);
2081 } 2164 }
2082 2165
2083 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085 2168
2086 my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088 $hi = $value + 1 if $lo == $hi;
2089
2090 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093 $page = int $page * $inner_w / ($hi - $lo);
2094 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096 $w -= $page;
2097 $page &= ~1;
2098 glTranslate $page * 0.5, 0, 0;
2099 $page ||= 2;
2100
2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106 2171
2107 # draw background 2172 # draw background
2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109 2174
2110 # draw handle 2175 # draw handle
2111 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112 2177
2113 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2114} 2179}
2115 2180
2116############################################################################# 2181#############################################################################
… …
2204 2269
2205 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
2206 2271
2207 delete $self->{texture}; 2272 delete $self->{texture};
2208 2273
2209 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
2210 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2276 my $height = 0;
2212 2277
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
2214 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
2369} 2434}
2370 2435
2371sub set_tooltip_from { 2436sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2437 my ($self, $widget) = @_;
2373 2438
2374 $self->{label} = new CFClient::UI::Label 2439 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2440 markup => $widget->{tooltip},
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2442 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2446 );
2381 $self->add ($self->{label});
2382} 2447}
2383 2448
2384sub size_request { 2449sub size_request {
2385 my ($self) = @_; 2450 my ($self) = @_;
2386 2451
… …
2396} 2461}
2397 2462
2398sub _draw { 2463sub _draw {
2399 my ($self) = @_; 2464 my ($self) = @_;
2400 2465
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2466 glTranslate 0.375, 0.375;
2403 2467
2404 my ($w, $h) = @$self{qw(w h)}; 2468 my ($w, $h) = @$self{qw(w h)};
2405 2469
2406 glColor 1, 0.8, 0.4; 2470 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2481 glVertex 0 , $h;
2418 glVertex $w, $h; 2482 glVertex $w, $h;
2419 glVertex $w, 0; 2483 glVertex $w, 0;
2420 glEnd; 2484 glEnd;
2421 2485
2422 glPopMatrix; 2486 glTranslate 2 - 0.375, 2 - 0.375;
2423
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2487 $self->SUPER::_draw;
2426} 2488}
2427 2489
2428############################################################################# 2490#############################################################################
2429 2491
… …
2466 2528
2467package CFClient::UI::InventoryItem; 2529package CFClient::UI::InventoryItem;
2468 2530
2469our @ISA = CFClient::UI::HBox::; 2531our @ISA = CFClient::UI::HBox::;
2470 2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2471sub new { 2559sub new {
2472 my $class = shift; 2560 my $class = shift;
2473 2561
2474 my %args = @_; 2562 my %args = @_;
2475 2563
2476 my $item = delete $args{item}; 2564 my $item = delete $args{item};
2477 2565
2478 my $desc = $item->{nrof} < 2 2566 my $desc = _item_to_desc ($item);
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482 2567
2483 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2484 can_hover => 1, 2569 can_hover => 1,
2485 can_events => 1, 2570 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc) 2571 tooltip => ((CFClient::UI::Label::escape $desc)
2487 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2488 connect_button_down => sub { 2573 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_; 2574 my ($self, $ev, $x, $y) = @_;
2490 2575
2491 # todo: maybe put examine on 1? but should just be a tooltip :( 2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2492 if ($ev->{button} == 1) { 2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2584 $::CONN->send ("move $targ $item->{tag} 0");
2494 } elsif ($ev->{button} == 2) { 2585 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}"); 2586 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) { 2587 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new ( 2588 my @menu_items = (
2498 items => [
2499 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2500 [ 2593 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") }, 2595 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2505 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2507 ], 2596 ],
2508 )->popup ($ev); 2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2509 } 2600 }
2510 2601
2511 1 2602 1
2512 }, 2603 },
2513 %args 2604 %args
2514 ); 2605 );
2606
2515 2607
2516 $self->add (new CFClient::UI::Face 2608 $self->add (new CFClient::UI::Face
2517 can_events => 0, 2609 can_events => 0,
2518 face => $item->{face}, 2610 face => $item->{face},
2519 anim => $item->{anim}, 2611 anim => $item->{anim},
2520 animspeed => $item->{animspeed}, 2612 animspeed => $item->{animspeed},
2521 ); 2613 );
2522 2614
2523 $self->add (new CFClient::UI::Label 2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2524 can_events => 0, 2616
2525 text => $desc, 2617 $self->{item} = $item;
2526 ); 2618
2619 $self->update_item;
2527 2620
2528 $self 2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2529} 2630}
2530 2631
2531############################################################################# 2632#############################################################################
2532 2633
2533package CFClient::UI::Inventory; 2634package CFClient::UI::Inventory;
… …
2549 my ($self, $items) = @_; 2650 my ($self, $items) = @_;
2550 2651
2551 $self->{scrolled}->clear; 2652 $self->{scrolled}->clear;
2552 return unless $items; 2653 return unless $items;
2553 2654
2554 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2555 2659
2556 $self->{real_items} = \@items; 2660 $self->{real_items} = \@items;
2557 2661
2558 for my $item (@items) { 2662 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2564 } 2665 }
2666
2667 $self->{scrolled}->add (@items);
2565 2668
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567} 2670}
2568 2671
2569sub size_request { 2672sub size_request {
… …
2647 2750
2648package CFClient::UI::Statusbox; 2751package CFClient::UI::Statusbox;
2649 2752
2650our @ISA = CFClient::UI::VBox::; 2753our @ISA = CFClient::UI::VBox::;
2651 2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2761 )
2762}
2763
2652sub reorder { 2764sub reorder {
2653 my ($self) = @_; 2765 my ($self) = @_;
2654 my $NOW = time; 2766 my $NOW = time;
2655 2767
2656 while (my ($k, $v) = each %{ $self->{item} }) { 2768 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2769 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 2770 }
2659 2771
2660 my @widgets; 2772 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2773
2774 my @items = sort {
2775 $a->{pri} <=> $b->{pri}
2776 or $b->{id} <=> $a->{id}
2777 } values %{ $self->{item} };
2778
2662 my $count = 10 + 1; 2779 my $count = 10 + 1;
2663 for my $item (@items) { 2780 for my $item (@items) {
2664 last unless --$count; 2781 last unless --$count;
2665 2782
2666 push @widgets, $item->{label} ||= do { 2783 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 2784 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 2785 my $short = $item->{count} > 1
2786 ? "<b>$item->{count} ×</b> $item->{text}"
2787 : $item->{text};
2788
2669 for ($short) { 2789 for ($short) {
2670 s/^\s+//; 2790 s/^\s+//;
2671 s/\012.*//s; 2791 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 } 2792 }
2675 2793
2676 new CFClient::UI::Label 2794 new CFClient::UI::Label
2677 markup => $short, 2795 markup => $short,
2678 tooltip => delete $item->{tooltip}, 2796 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 2797 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 2798 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 2799 fontsize => $item->{fontsize} || $self->{fontsize},
2682 color => delete $item->{color}, 2800 max_w => $::WIDTH * 0.44,
2801 fg => $item->{fg},
2683 can_events => 1, 2802 can_events => 1,
2684 can_hover => 1, 2803 can_hover => 1
2685 }; 2804 };
2686 } 2805 }
2687 2806
2688 $self->clear; 2807 $self->clear;
2689 $self->SUPER::add (@widgets); 2808 $self->SUPER::add (reverse @widgets);
2690} 2809}
2691 2810
2692sub add { 2811sub add {
2693 my ($self, $text, %arg) = @_; 2812 my ($self, $text, %arg) = @_;
2694 2813
2695 my $item = { 2814 $text =~ s/^\s+//;
2696 time => time, 2815 $text =~ s/\s+$//;
2816
2817 my $timeout = time + ((delete $arg{timeout}) || 60);
2818
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820
2821 if (my $item = $self->{item}{$group}) {
2822 if ($item->{text} eq $text) {
2823 $item->{count}++;
2824 } else {
2825 $item->{count} = 1;
2826 $item->{text} = $item->{tooltip} = $text;
2827 }
2828 $item->{id} = ++$self->{id};
2829 $item->{timeout} = $timeout;
2830 delete $item->{label};
2831 } else {
2832 $self->{item}{$group} = {
2833 id => ++$self->{id},
2697 text => $text, 2834 text => $text,
2698 timeout => 60, 2835 timeout => $timeout,
2699 tooltip => $text, 2836 tooltip => $text,
2700 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8], 2837 fg => [0.8, 0.8, 0.8, 0.8],
2838 pri => 0,
2839 count => 1,
2702 %arg, 2840 %arg,
2841 };
2703 }; 2842 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 2843
2710 $self->reorder; 2844 $self->reorder;
2845}
2846
2847sub reconfigure {
2848 my ($self) = @_;
2849
2850 delete $_->{label}
2851 for values %{ $self->{item} || {} };
2852
2853 $self->reorder;
2854 $self->SUPER::reconfigure;
2711} 2855}
2712 2856
2713############################################################################# 2857#############################################################################
2714 2858
2715package CFClient::UI::Root; 2859package CFClient::UI::Root;
… …
2747} 2891}
2748 2892
2749sub size_allocate { 2893sub size_allocate {
2750 my ($self, $w, $h) = @_; 2894 my ($self, $w, $h) = @_;
2751 2895
2752 my $old_w = $self->{old_w}; 2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2753 my $old_h = $self->{old_h}; 2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2754 2898
2755 if ($old_w && $old_h) { 2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2756 for my $child ($self->children) { 2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767 2901
2768 for my $child ($self->children) { 2902 for my $child ($self->children) {
2769 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2770 2904
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906 if exists $child->{req_x};
2907
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909 if exists $child->{req_y};
2910
2771 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2772 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913
2773 $child->configure ($X, $Y, $W, $H); 2914 $child->configure ($X, $Y, $W, $H);
2774 } 2915 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 2916}
2779 2917
2780sub coord2local { 2918sub coord2local {
2781 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2782 2920
… …
2795 $self->check_size; 2933 $self->check_size;
2796 $::WANT_REFRESH++; 2934 $::WANT_REFRESH++;
2797} 2935}
2798 2936
2799sub add { 2937sub add {
2800 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2801 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2802 # integerise window positions 2943 # integerise window positions
2803 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2804 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2805 2947
2806 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2807} 2949}
2808 2950
2809sub on_refresh { 2951sub on_refresh {
2810 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2811 2953
2812 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2813} 2955}
2814 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2815sub draw { 2963sub draw {
2816 my ($self) = @_; 2964 my ($self) = @_;
2965
2966 while ($self->{refresh_hook}) {
2967 $_->()
2968 for values %{delete $self->{refresh_hook}};
2969 }
2817 2970
2818 if ($self->{check_size}) { 2971 if ($self->{check_size}) {
2819 my @queue = ([], []); 2972 my @queue = ([], []);
2820 2973
2821 for (;;) { 2974 for (;;) {
… …
2829 2982
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)} 2984 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request; 2985 : $widget->size_request;
2833 2986
2987 if (delete $widget->{force_alloc}
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2835 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836 2990
2837 $widget->{req_w} = $w; 2991 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h; 2992 $widget->{req_h} = $h;
2839 2993
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2841 2995
2842 $widget->{parent}->check_size 2996 $widget->{parent}->check_size
2843 if $widget->{parent}; 2997 if $widget->{parent};
2844 } 2998 }
2845 } 2999 }
… …
2857 $widget->size_allocate ($w, $h); 3011 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h); 3012 $widget->emit (size_allocate => $w, $h);
2859 } 3013 }
2860 } 3014 }
2861 3015
2862 while ($self->{refresh_hook}) { 3016 while ($self->{post_alloc_hook}) {
2863 $_->() 3017 $_->()
2864 for values %{delete $self->{refresh_hook}}; 3018 for values %{delete $self->{post_alloc_hook}};
2865 } 3019 }
2866 3020
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2880############################################################################# 3034#############################################################################
2881 3035
2882package CFClient::UI; 3036package CFClient::UI;
2883 3037
2884$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886 3040
28871 30411
2888 3042

Diff Legend

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