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.212 by elmex, Wed May 17 14:55:14 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 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
136 } 158 }
137} 159}
138 160
139############################################################################# 161#############################################################################
140 162
… …
159 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
161 } 183 }
162 } 184 }
163 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
164 $self 188 $self
165} 189}
166 190
167sub destroy { 191sub destroy {
168 my ($self) = @_; 192 my ($self) = @_;
… …
241 265
242sub size_allocate { 266sub size_allocate {
243 # nothing to be done 267 # nothing to be done
244} 268}
245 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
246sub children { 277sub 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} 278}
260 279
261sub set_max_size { 280sub set_max_size {
262 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
263 282
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
285}
286
287sub set_tooltip {
288 my ($self, $tooltip) = @_;
289
290 $self->{tooltip} = $tooltip;
291
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip;
295 }
266} 296}
267 297
268# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
269sub coord2local { 299sub coord2local {
270 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 386 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 387 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 388 glVertex 0 , $self->{h};
359 glEnd; 389 glEnd;
360 glPopMatrix; 390 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 392 }
363} 393}
364 394
365sub _draw { 395sub _draw {
366 my ($self) = @_; 396 my ($self) = @_;
… …
383sub set_parent { 413sub set_parent {
384 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
385 415
386 Scalar::Util::weaken ($self->{parent} = $parent); 416 Scalar::Util::weaken ($self->{parent} = $parent);
387 417
418 # TODO: req_w _does_change after ->reconfigure
388 $self->check_size 419 $self->check_size
389 unless exists $self->{req_w}; 420 unless exists $self->{req_w};
390} 421}
391 422
392sub check_size { 423sub check_size {
393 my ($self) = @_; 424 my ($self, $forced) = @_;
394 425
426 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 428}
397 429
398sub update { 430sub update {
399 my ($self) = @_; 431 my ($self) = @_;
… …
415} 447}
416 448
417sub DESTROY { 449sub DESTROY {
418 my ($self) = @_; 450 my ($self) = @_;
419 451
452 delete $WIDGET{$self+0};
420 #$self->deactivate; 453 #$self->deactivate;
421} 454}
422 455
423############################################################################# 456#############################################################################
424 457
… …
433 my $class = shift; 466 my $class = shift;
434 467
435 # range [value, low, high, page] 468 # range [value, low, high, page]
436 469
437 $class->SUPER::new ( 470 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
440 @_ 473 @_
441 ) 474 )
442} 475}
443 476
444sub _draw { 477sub _draw {
445 my ($self) = @_; 478 my ($self) = @_;
446 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
448 486
449 glEnable GL_BLEND; 487 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
452 490
453 glBegin GL_QUADS; 491 glBegin GL_QUADS;
454 glVertex 0 , 0; 492 glVertex 0 , 0;
455 glVertex 0 , $h; 493 glVertex 0 , $h;
456 glVertex $w, $h; 494 glVertex $w, $h;
457 glVertex $w, 0; 495 glVertex $w, 0;
458 glEnd; 496 glEnd;
459 497
460 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
461} 500}
462 501
463############################################################################# 502#############################################################################
464 503
465package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
509 $self->{children} = [ 548 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 550 @{$self->{children}}, @widgets
512 ]; 551 ];
513 552
514 $self->check_size; 553 $self->check_size (1);
515 $self->update; 554 $self->update;
516} 555}
517 556
518sub children { 557sub children {
519 @{ $_[0]{children} } 558 @{ $_[0]{children} }
… …
626} 665}
627 666
628sub update { 667sub update {
629 my ($self) = @_; 668 my ($self) = @_;
630 669
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 671 $self->SUPER::update;
633} 672}
634 673
635sub size_allocate { 674sub size_allocate {
636 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
… …
774 $self->add ($self->{slider}); 813 $self->add ($self->{slider});
775 814
776 $self 815 $self
777} 816}
778 817
779#TODO# update range on size_allocate depeneing on child 818#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 819# update viewport offset on scroll
781 820
782############################################################################# 821#############################################################################
783 822
784package CFClient::UI::Frame; 823package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 827use CFClient::OpenGL;
789 828
790sub new { 829sub new {
791 my $class = shift; 830 my $class = shift;
792 831
793 my $self = $class->SUPER::new ( 832 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 833 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 834 @_,
798 ); 835 )
799
800 $self
801} 836}
802 837
803sub _draw { 838sub _draw {
804 my ($self) = @_; 839 my ($self) = @_;
805 840
806 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
807 843
808 glEnable GL_BLEND; 844 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 847
813# glBegin GL_QUADS; 848 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 849 glVertex 0 , 0;
816# glVertex 0 , $h; 850 glVertex 0 , $h;
817# glVertex $w, $h; 851 glVertex $w, $h;
818# glVertex $w, 0; 852 glVertex $w, 0;
819# glEnd; 853 glEnd;
820 854
821
822 $self->child->draw;
823 glDisable GL_BLEND; 855 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
825} 859}
826 860
827############################################################################# 861#############################################################################
828 862
829package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
843 877
844 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
847 border => 0.6, 881 border => 0.6,
882 toplevel => 1,
848 can_events => 1, 883 can_events => 1,
849 @_ 884 @_
850 ); 885 );
851 886
852 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
… …
877 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
878 913
879 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
881 916
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 918 if $self->{title};
884 919
885 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
886} 921}
887 922
… …
945 my ($self) = @_; 980 my ($self) = @_;
946 981
947 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 984
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 987
955 my $border = $self->border; 988 my $border = $self->border;
956 989
957 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 995
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 997 my $bg = $tex[0];
965 998
966 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
971 1004
972 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
976 1010
977 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1012
981 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
982 1014
983 $self->child->draw; 1015 $self->child->draw;
984} 1016}
… …
1251 1283
1252############################################################################# 1284#############################################################################
1253 1285
1254package CFClient::UI::Label; 1286package CFClient::UI::Label;
1255 1287
1256our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1257 1289
1258use CFClient::OpenGL; 1290use CFClient::OpenGL;
1259 1291
1260sub new { 1292sub new {
1261 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1262 1294
1263 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1265 #font => default_font 1299 #font => default_font
1266 #text => initial text 1300 #text => initial text
1267 #markup => initial narkup 1301 #markup => initial narkup
1268 layout => (new CFClient::Layout), 1302 layout => (new CFClient::Layout),
1269 fontsize => 1, 1303 fontsize => 1,
… …
1287 } 1321 }
1288 1322
1289 $self 1323 $self
1290} 1324}
1291 1325
1292sub escape { 1326sub escape($) {
1293 local $_ = $_[1]; 1327 local $_ = $_[0];
1294 1328
1295 s/&/&amp;/g; 1329 s/&/&amp;/g;
1296 s/>/&gt;/g; 1330 s/>/&gt;/g;
1297 s/</&lt;/g; 1331 s/</&lt;/g;
1298 1332
1299 $_[1] 1333 $_
1300} 1334}
1301 1335
1302sub update { 1336sub update {
1303 my ($self) = @_; 1337 my ($self) = @_;
1304 1338
… …
1375 $self->check_size; 1409 $self->check_size;
1376} 1410}
1377 1411
1378sub _draw { 1412sub _draw {
1379 my ($self) = @_; 1413 my ($self) = @_;
1414
1415 $self->SUPER::_draw; # draw background, if applicable
1380 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});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386 1422
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1423 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1424
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1427 : ($self->{w} - $tex->{w}) * 0.5);
1392 1428
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1431 : ($self->{h} - $tex->{h}) * 0.5);
1396 1432
1397 $tex 1433 $tex
1398 }; 1434 };
1399 1435
1400 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
… …
1455sub set_text { 1491sub set_text {
1456 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1457 1493
1458 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1495 $self->_set_text ($text);
1496 $self->update;
1460 $self->check_size; 1497 $self->check_size;
1461 $self->update;
1462} 1498}
1463 1499
1464sub get_text { 1500sub get_text {
1465 $_[0]{text} 1501 $_[0]{text}
1466} 1502}
… …
1486 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1488 1524
1489 my $text = $self->get_text; 1525 my $text = $self->get_text;
1490 1526
1491 if ($sym == 8) { 1527 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1540 $self->emit ('escape');
1505 } elsif ($uni) { 1541 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1543 }
1508 1544
1509 $self->_set_text ($text); 1545 $self->_set_text ($text);
1510 $self->update; 1546 $self->update;
1547 $self->check_size;
1511} 1548}
1512 1549
1513sub focus_in { 1550sub focus_in {
1514 my ($self) = @_; 1551 my ($self) = @_;
1515 1552
… …
1644 my $class = shift; 1681 my $class = shift;
1645 1682
1646 $class->SUPER::new ( 1683 $class->SUPER::new (
1647 padding => 4, 1684 padding => 4,
1648 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1651 can_hover => 1, 1687 can_hover => 1,
1652 align => 0, 1688 align => 0,
1653 valign => 0, 1689 valign => 0,
1654 can_events => 1, 1690 can_events => 1,
… …
1702 1738
1703 $class->SUPER::new ( 1739 $class->SUPER::new (
1704 padding => 2, 1740 padding => 2,
1705 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1706 active_fg => [1, 1, 0], 1742 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5],
1707 state => 0, 1745 state => 0,
1708 can_hover => 1, 1746 can_hover => 1,
1709 @_ 1747 @_
1710 ) 1748 )
1711} 1749}
… …
1735 1773
1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1737 1775
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 1777
1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1740 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1747} 1783}
1748 1784
1749############################################################################# 1785#############################################################################
1750 1786
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
1998 2034
1999sub new { 2035sub new {
2000 my $class = shift; 2036 my $class = shift;
2001 2037
2002 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
2003 2039
2004 # TODO: 0-width page 2040 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2042 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2045 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
2011 req_w => $::WIDTH / 80, 2049 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2050 req_h => $::WIDTH / 80,
2013 vertical => 0, 2051 vertical => 0,
2014 can_hover => 1, 2052 can_hover => 1,
2015 inner_pad => 5, 2053 inner_pad => .05,
2016 @_ 2054 @_
2017 ); 2055 );
2018 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
2019 $self 2060 $self
2061}
2062
2063sub set_value {
2064 my ($self, $value) = @_;
2065
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067
2068 $hi = $lo + 1 if $hi <= $lo;
2069
2070 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi;
2072
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079
2080 if ($value != $old_value) {
2081 $self->emit (changed => $value);
2082 $self->update;
2083 }
2020} 2084}
2021 2085
2022sub size_request { 2086sub size_request {
2023 my ($self) = @_; 2087 my ($self) = @_;
2024 2088
… …
2037 2101
2038sub mouse_motion { 2102sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
2040 2104
2041 if ($GRAB == $self) { 2105 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107
2108 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2111
2112 $self->set_value ($x * ($hi - $lo) + $lo);
2113 }
2114}
2115
2116sub update {
2117 my ($self) = @_;
2118
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]);
2121
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
2043 2123
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
2045 2125
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2048 2127
2049 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $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 2130
2055 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2056 $self->update; 2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value;
2137 $self->{knob_w} = $page;
2057 } 2138 });
2058}
2059 2139
2060# the inner_* stuff is for generating a padding for the slider handle, 2140 $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} 2141}
2067 2142
2068sub _draw { 2143sub _draw {
2069 my ($self) = @_; 2144 my ($self) = @_;
2070 2145
2071 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
2072 2147
2073 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
2074 2149
2075 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
2077 2152
2078 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2155 }
2083 2156
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2159
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; 2160 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2162
2108 # draw background 2163 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2165
2111 # draw handle 2166 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2168
2114 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2115} 2170}
2116 2171
2117############################################################################# 2172#############################################################################
… …
2205 2260
2206 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2207 2262
2208 delete $self->{texture}; 2263 delete $self->{texture};
2209 2264
2210 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2211 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2267 my $height = 0;
2213 2268
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2215 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2367 @_, 2422 @_,
2368 can_events => 0, 2423 can_events => 0,
2369 ) 2424 )
2370} 2425}
2371 2426
2372sub set_markup { 2427sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2428 my ($self, $widget) = @_;
2374 2429
2375 $self->{label} = new CFClient::UI::Label 2430 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip},
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2433 fontsize => 0.8,
2377 fg => [0, 0, 0], 2434 fg => [0, 0, 0, 1],
2378 font => ($font || $::FONT_PROP); 2435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2436 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2437}
2384 2438
2385sub size_request { 2439sub size_request {
2386 my ($self) = @_; 2440 my ($self) = @_;
2387 2441
… …
2397} 2451}
2398 2452
2399sub _draw { 2453sub _draw {
2400 my ($self) = @_; 2454 my ($self) = @_;
2401 2455
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2404 2457
2405 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2406 2459
2407 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2471 glVertex 0 , $h;
2419 glVertex $w, $h; 2472 glVertex $w, $h;
2420 glVertex $w, 0; 2473 glVertex $w, 0;
2421 glEnd; 2474 glEnd;
2422 2475
2423 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2427} 2478}
2428 2479
2429############################################################################# 2480#############################################################################
2430 2481
… …
2467 2518
2468package CFClient::UI::InventoryItem; 2519package CFClient::UI::InventoryItem;
2469 2520
2470our @ISA = CFClient::UI::HBox::; 2521our @ISA = CFClient::UI::HBox::;
2471 2522
2523sub _item_to_desc {
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2472sub new { 2549sub new {
2473 my $class = shift; 2550 my $class = shift;
2474 2551
2475 my %args = @_; 2552 my %args = @_;
2476 2553
2477 my $item = delete $args{item}; 2554 my $item = delete $args{item};
2478 2555
2479 my $desc = $item->{nrof} < 2 2556 my $desc = _item_to_desc ($item);
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483 2557
2484 my $self = $class->SUPER::new ( 2558 my $self = $class->SUPER::new (
2485 can_hover => 1, 2559 can_hover => 1,
2486 can_events => 1, 2560 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc) 2561 tooltip => ((CFClient::UI::Label::escape $desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub { 2563 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_; 2564 my ($self, $ev, $x, $y) = @_;
2491 2565
2492 # todo: maybe put examine on 1? but should just be a tooltip :( 2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) { 2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2574 $::CONN->send ("move $targ $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) { 2575 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}"); 2576 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) { 2577 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new ( 2578 my @menu_items = (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2501 [ 2583 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") }, 2585 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 ], 2586 ],
2509 )->popup ($ev); 2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2510 } 2590 }
2511 2591
2512 1 2592 1
2513 }, 2593 },
2514 %args 2594 %args
2515 ); 2595 );
2596
2516 2597
2517 $self->add (new CFClient::UI::Face 2598 $self->add (new CFClient::UI::Face
2518 can_events => 0, 2599 can_events => 0,
2519 face => $item->{face}, 2600 face => $item->{face},
2520 anim => $item->{anim}, 2601 anim => $item->{anim},
2521 animspeed => $item->{animspeed}, 2602 animspeed => $item->{animspeed},
2522 ); 2603 );
2523 2604
2524 $self->add (new CFClient::UI::Label 2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2525 can_events => 0, 2606
2526 text => $desc, 2607 $self->{item} = $item;
2527 ); 2608
2609 $self->update_item;
2528 2610
2529 $self 2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2530} 2620}
2531 2621
2532############################################################################# 2622#############################################################################
2533 2623
2534package CFClient::UI::Inventory; 2624package CFClient::UI::Inventory;
… …
2550 my ($self, $items) = @_; 2640 my ($self, $items) = @_;
2551 2641
2552 $self->{scrolled}->clear; 2642 $self->{scrolled}->clear;
2553 return unless $items; 2643 return unless $items;
2554 2644
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2556 2649
2557 $self->{real_items} = \@items; 2650 $self->{real_items} = \@items;
2558 2651
2559 for my $item (@items) { 2652 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); 2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2565 } 2655 }
2656
2657 $self->{scrolled}->add (@items);
2566 2658
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568} 2660}
2569 2661
2570sub size_request { 2662sub size_request {
… …
2648 2740
2649package CFClient::UI::Statusbox; 2741package CFClient::UI::Statusbox;
2650 2742
2651our @ISA = CFClient::UI::VBox::; 2743our @ISA = CFClient::UI::VBox::;
2652 2744
2745sub new {
2746 my $class = shift;
2747
2748 $class->SUPER::new (
2749 fontsize => 0.8,
2750 @_,
2751 )
2752}
2753
2653sub reorder { 2754sub reorder {
2654 my ($self) = @_; 2755 my ($self) = @_;
2655 my $NOW = time; 2756 my $NOW = time;
2656 2757
2657 while (my ($k, $v) = each %{ $self->{item} }) { 2758 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2759 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 2760 }
2660 2761
2661 my @widgets; 2762 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2763
2764 my @items = sort {
2765 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} };
2768
2663 my $count = 10 + 1; 2769 my $count = 10 + 1;
2664 for my $item (@items) { 2770 for my $item (@items) {
2665 last unless --$count; 2771 last unless --$count;
2666 2772
2667 push @widgets, $item->{label} ||= do { 2773 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 2774 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 2775 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text};
2778
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2670 for ($short) { 2781 for ($short) {
2671 s/^\s+//; 2782 s/^\s+//;
2672 s/\012.*//s; 2783 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize}; 2784 my $len = int 40 / $fontsize;
2674 substr $_, $len, length, "…" if $len < length; 2785 substr $_, $len, length, "…" if $len < length;
2675 } 2786 }
2676 2787
2677 new CFClient::UI::Label 2788 new CFClient::UI::Label
2678 markup => $short, 2789 markup => $short,
2679 tooltip => delete $item->{tooltip}, 2790 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67,
2680 fontsize => delete $item->{fontsize}, 2793 fontsize => $fontsize,
2681 color => delete $item->{color}, 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;
2710} 2838}
2711 2839
2712############################################################################# 2840#############################################################################
… …
2746} 2874}
2747 2875
2748sub size_allocate { 2876sub size_allocate {
2749 my ($self, $w, $h) = @_; 2877 my ($self, $w, $h) = @_;
2750 2878
2751 my $old_w = $self->{old_w}; 2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2752 my $old_h = $self->{old_h}; 2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2753 2881
2754 if ($old_w && $old_h) { 2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2755 for my $child ($self->children) { 2883 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 2884
2767 for my $child ($self->children) { 2885 for my $child ($self->children) {
2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769 2887
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889 if exists $child->{req_x};
2890
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2892 if exists $child->{req_y};
2893
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2894 $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; 2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896
2772 $child->configure ($X, $Y, $W, $H); 2897 $child->configure ($X, $Y, $W, $H);
2773 } 2898 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777} 2899}
2778 2900
2779sub coord2local { 2901sub coord2local {
2780 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2781 2903
… …
2794 $self->check_size; 2916 $self->check_size;
2795 $::WANT_REFRESH++; 2917 $::WANT_REFRESH++;
2796} 2918}
2797 2919
2798sub add { 2920sub add {
2799 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2800 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2801 # integerise window positions 2926 # integerise window positions
2802 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2803 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2804 2930
2805 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2806} 2932}
2807 2933
2808sub on_refresh { 2934sub on_refresh {
2809 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2810 2936
2811 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2812} 2938}
2813 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2814sub draw { 2946sub draw {
2815 my ($self) = @_; 2947 my ($self) = @_;
2948
2949 while ($self->{refresh_hook}) {
2950 $_->()
2951 for values %{delete $self->{refresh_hook}};
2952 }
2816 2953
2817 if ($self->{check_size}) { 2954 if ($self->{check_size}) {
2818 my @queue = ([], []); 2955 my @queue = ([], []);
2819 2956
2820 for (;;) { 2957 for (;;) {
… …
2828 2965
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)} 2967 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request; 2968 : $widget->size_request;
2832 2969
2970 if (delete $widget->{force_alloc}
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835 2973
2836 $widget->{req_w} = $w; 2974 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h; 2975 $widget->{req_h} = $h;
2838 2976
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2840 2978
2841 $widget->{parent}->check_size 2979 $widget->{parent}->check_size
2842 if $widget->{parent}; 2980 if $widget->{parent};
2843 } 2981 }
2844 } 2982 }
… …
2856 $widget->size_allocate ($w, $h); 2994 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h); 2995 $widget->emit (size_allocate => $w, $h);
2858 } 2996 }
2859 } 2997 }
2860 2998
2861 while ($self->{refresh_hook}) { 2999 while ($self->{post_alloc_hook}) {
2862 $_->() 3000 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3001 for values %{delete $self->{post_alloc_hook}};
2864 } 3002 }
2865 3003
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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