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.205 by root, Mon May 15 00:15:08 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 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;
135 } 158 }
136} 159}
137 160
138############################################################################# 161#############################################################################
139 162
… …
158 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
160 } 183 }
161 } 184 }
162 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
163 $self 188 $self
164} 189}
165 190
166sub destroy { 191sub destroy {
167 my ($self) = @_; 192 my ($self) = @_;
… …
240 265
241sub size_allocate { 266sub size_allocate {
242 # nothing to be done 267 # nothing to be done
243} 268}
244 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
245sub children { 277sub 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} 278}
259 279
260sub set_max_size { 280sub set_max_size {
261 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
262 282
… …
355 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
358 glEnd; 378 glEnd;
359 glPopMatrix; 379 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 381 }
362} 382}
363 383
364sub _draw { 384sub _draw {
365 my ($self) = @_; 385 my ($self) = @_;
… …
382sub set_parent { 402sub set_parent {
383 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
384 404
385 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
386 406
407 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 408 $self->check_size
388 unless exists $self->{req_w}; 409 unless exists $self->{req_w};
389} 410}
390 411
391sub check_size { 412sub check_size {
392 my ($self) = @_; 413 my ($self, $forced) = @_;
393 414
415 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 417}
396 418
397sub update { 419sub update {
398 my ($self) = @_; 420 my ($self) = @_;
… …
414} 436}
415 437
416sub DESTROY { 438sub DESTROY {
417 my ($self) = @_; 439 my ($self) = @_;
418 440
441 delete $WIDGET{$self+0};
419 #$self->deactivate; 442 #$self->deactivate;
420} 443}
421 444
422############################################################################# 445#############################################################################
423 446
… …
508 $self->{children} = [ 531 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 533 @{$self->{children}}, @widgets
511 ]; 534 ];
512 535
513 $self->check_size; 536 $self->check_size (1);
514 $self->update; 537 $self->update;
515} 538}
516 539
517sub children { 540sub children {
518 @{ $_[0]{children} } 541 @{ $_[0]{children} }
… …
625} 648}
626 649
627sub update { 650sub update {
628 my ($self) = @_; 651 my ($self) = @_;
629 652
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 654 $self->SUPER::update;
632} 655}
633 656
634sub size_allocate { 657sub size_allocate {
635 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
… …
773 $self->add ($self->{slider}); 796 $self->add ($self->{slider});
774 797
775 $self 798 $self
776} 799}
777 800
778#TODO# update range on size_allocate depeneing on child 801#TODO# update range on size_allocate depending on child
779# update viewport offset on scroll 802# update viewport offset on scroll
780 803
781############################################################################# 804#############################################################################
782 805
783package CFClient::UI::Frame; 806package CFClient::UI::Frame;
… …
787use CFClient::OpenGL; 810use CFClient::OpenGL;
788 811
789sub new { 812sub new {
790 my $class = shift; 813 my $class = shift;
791 814
792 my $self = $class->SUPER::new ( 815 $class->SUPER::new (
793 bg => [1, 1, 1, 1], 816 bg => undef,
794 border_bg => [1, 1, 1, 1],
795 border => 0.8,
796 @_ 817 @_,
797 ); 818 )
798
799 $self
800} 819}
801 820
802sub _draw { 821sub _draw {
803 my ($self) = @_; 822 my ($self) = @_;
804 823
805 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
806 826
807 glEnable GL_BLEND; 827 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811 830
812# glBegin GL_QUADS; 831 glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0; 832 glVertex 0 , 0;
815# glVertex 0 , $h; 833 glVertex 0 , $h;
816# glVertex $w, $h; 834 glVertex $w, $h;
817# glVertex $w, 0; 835 glVertex $w, 0;
818# glEnd; 836 glEnd;
819 837
820
821 $self->child->draw;
822 glDisable GL_BLEND; 838 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
824} 842}
825 843
826############################################################################# 844#############################################################################
827 845
828package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
842 860
843 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
846 border => 0.6, 864 border => 0.6,
865 toplevel => 1,
847 can_events => 1, 866 can_events => 1,
848 @_ 867 @_
849 ); 868 );
850 869
851 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
… …
944 my ($self) = @_; 963 my ($self) = @_;
945 964
946 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
948 967
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 970
954 my $border = $self->border; 971 my $border = $self->border;
955 972
956 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
961 978
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 980 my $bg = $tex[0];
964 981
965 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
… …
969 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
970 987
971 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
975 993
976 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 995
980 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
981 997
982 $self->child->draw; 998 $self->child->draw;
983} 999}
… …
1485 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1487 1503
1488 my $text = $self->get_text; 1504 my $text = $self->get_text;
1489 1505
1490 if ($sym == 8) { 1506 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1519 $self->emit ('escape');
1504 } elsif ($uni) { 1520 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1506 } 1522 }
1507 1523
… …
1734 1750
1735 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1736 1752
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 1754
1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1739 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1746} 1760}
1747 1761
1748############################################################################# 1762#############################################################################
1749 1763
… …
2204 2218
2205 return unless $self->{h} > 0; 2219 return unless $self->{h} > 0;
2206 2220
2207 delete $self->{texture}; 2221 delete $self->{texture};
2208 2222
2209 $ROOT->on_refresh ($self, sub { 2223 $ROOT->on_post_alloc ($self, sub {
2210 if (delete $self->{need_reflow}) { 2224 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2225 my $height = 0;
2212 2226
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2227 $height += $_->[0] = $self->text_height ($_->[2])
2214 for @{$self->{par}}; 2228 for @{$self->{par}};
… …
2369} 2383}
2370 2384
2371sub set_tooltip_from { 2385sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2386 my ($self, $widget) = @_;
2373 2387
2374 $self->{label} = new CFClient::UI::Label 2388 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2389 markup => $widget->{tooltip},
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2390 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2391 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2392 fg => [0, 0, 0, 1],
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2393 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2394 );
2381 $self->add ($self->{label});
2382} 2395}
2383 2396
2384sub size_request { 2397sub size_request {
2385 my ($self) = @_; 2398 my ($self) = @_;
2386 2399
… …
2396} 2409}
2397 2410
2398sub _draw { 2411sub _draw {
2399 my ($self) = @_; 2412 my ($self) = @_;
2400 2413
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2414 glTranslate 0.375, 0.375;
2403 2415
2404 my ($w, $h) = @$self{qw(w h)}; 2416 my ($w, $h) = @$self{qw(w h)};
2405 2417
2406 glColor 1, 0.8, 0.4; 2418 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2429 glVertex 0 , $h;
2418 glVertex $w, $h; 2430 glVertex $w, $h;
2419 glVertex $w, 0; 2431 glVertex $w, 0;
2420 glEnd; 2432 glEnd;
2421 2433
2422 glPopMatrix; 2434 glTranslate 2 - 0.375, 2 - 0.375;
2423
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2435 $self->SUPER::_draw;
2426} 2436}
2427 2437
2428############################################################################# 2438#############################################################################
2429 2439
… …
2549 my ($self, $items) = @_; 2559 my ($self, $items) = @_;
2550 2560
2551 $self->{scrolled}->clear; 2561 $self->{scrolled}->clear;
2552 return unless $items; 2562 return unless $items;
2553 2563
2554 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2564 my @items = sort {
2565 ($a->{type} <=> $b->{type})
2566 or ($a->{name} cmp $b->{name})
2567 } @$items;
2555 2568
2556 $self->{real_items} = \@items; 2569 $self->{real_items} = \@items;
2557 2570
2558 for my $item (@items) { 2571 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2 2572 my $desc = $item->{nrof} < 2
2560 ? $item->{name} 2573 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}"; 2574 : "$item->{nrof} $item->{name_pl}";
2562 2575
2563 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2576 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2564 } 2577 }
2578
2579 $self->{scrolled}->add (@items);
2565 2580
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2581# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567} 2582}
2568 2583
2569sub size_request { 2584sub size_request {
… …
2656 while (my ($k, $v) = each %{ $self->{item} }) { 2671 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2672 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 2673 }
2659 2674
2660 my @widgets; 2675 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2676
2677 my @items = sort {
2678 $a->{pri} <=> $b->{pri}
2679 or $b->{id} <=> $a->{id}
2680 } values %{ $self->{item} };
2681
2662 my $count = 10 + 1; 2682 my $count = 10 + 1;
2663 for my $item (@items) { 2683 for my $item (@items) {
2664 last unless --$count; 2684 last unless --$count;
2665 2685
2666 push @widgets, $item->{label} ||= do { 2686 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 2687 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 2688 my $short = $item->{count} > 1
2689 ? "<b>$item->{count} ×</b> $item->{text}"
2690 : $item->{text};
2691
2669 for ($short) { 2692 for ($short) {
2670 s/^\s+//; 2693 s/^\s+//;
2671 s/\012.*//s; 2694 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize}; 2695 my $len = int 40 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length; 2696 substr $_, $len, length, "…" if $len < length;
2674 } 2697 }
2675 2698
2676 new CFClient::UI::Label 2699 new CFClient::UI::Label
2677 markup => $short, 2700 markup => $short,
2678 tooltip => delete $item->{tooltip}, 2701 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 2702 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 2703 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 2704 fontsize => $item->{fontsize},
2682 color => delete $item->{color}, 2705 fg => $item->{fg},
2683 can_events => 1, 2706 can_events => 1,
2684 can_hover => 1, 2707 can_hover => 1
2685 }; 2708 };
2686 } 2709 }
2687 2710
2688 $self->clear; 2711 $self->clear;
2689 $self->SUPER::add (@widgets); 2712 $self->SUPER::add (reverse @widgets);
2690} 2713}
2691 2714
2692sub add { 2715sub add {
2693 my ($self, $text, %arg) = @_; 2716 my ($self, $text, %arg) = @_;
2694 2717
2695 my $item = { 2718 $text =~ s/^\s+//;
2696 time => time, 2719 $text =~ s/\s+$//;
2720
2721 my $timeout = time + ((delete $arg{timeout}) || 60);
2722
2723 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2724
2725 if (my $item = $self->{item}{$group}) {
2726 if ($item->{text} eq $text) {
2727 $item->{count}++;
2728 } else {
2729 $item->{count} = 1;
2730 $item->{text} = $item->{tooltip} = $text;
2731 }
2732 $item->{id} = ++$self->{id};
2733 $item->{timeout} = $timeout;
2734 delete $item->{label};
2735 } else {
2736 $self->{item}{$group} = {
2737 id => ++$self->{id},
2697 text => $text, 2738 text => $text,
2698 timeout => 60, 2739 timeout => $timeout,
2699 tooltip => $text, 2740 tooltip => $text,
2700 fontsize => 0.8, 2741 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8], 2742 fg => [0.8, 0.8, 0.8, 0.8],
2743 pri => 0,
2744 count => 1,
2702 %arg, 2745 %arg,
2746 };
2703 }; 2747 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 2748
2710 $self->reorder; 2749 $self->reorder;
2711} 2750}
2712 2751
2713############################################################################# 2752#############################################################################
… …
2747} 2786}
2748 2787
2749sub size_allocate { 2788sub size_allocate {
2750 my ($self, $w, $h) = @_; 2789 my ($self, $w, $h) = @_;
2751 2790
2752 my $old_w = $self->{old_w}; 2791 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2753 my $old_h = $self->{old_h}; 2792 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2754 2793
2755 if ($old_w && $old_h) { 2794 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2756 for my $child ($self->children) { 2795 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 2796
2768 for my $child ($self->children) { 2797 for my $child ($self->children) {
2769 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2770 2799
2800 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2801 if exists $child->{req_x};
2802
2803 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2804 if exists $child->{req_y};
2805
2771 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2806 $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; 2807 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2808
2773 $child->configure ($X, $Y, $W, $H); 2809 $child->configure ($X, $Y, $W, $H);
2774 } 2810 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 2811}
2779 2812
2780sub coord2local { 2813sub coord2local {
2781 my ($self, $x, $y) = @_; 2814 my ($self, $x, $y) = @_;
2782 2815
… …
2795 $self->check_size; 2828 $self->check_size;
2796 $::WANT_REFRESH++; 2829 $::WANT_REFRESH++;
2797} 2830}
2798 2831
2799sub add { 2832sub add {
2800 my ($self, $child) = @_; 2833 my ($self, @children) = @_;
2801 2834
2835 for my $child (@children) {
2836 $child->{toplevel} = 1;
2837
2802 # integerise window positions 2838 # integerise window positions
2803 $child->{x} = int $child->{x}; 2839 $child->{x} = int $child->{x};
2804 $child->{y} = int $child->{y}; 2840 $child->{y} = int $child->{y};
2841 }
2805 2842
2806 $self->SUPER::add ($child); 2843 $self->SUPER::add (@children);
2807} 2844}
2808 2845
2809sub on_refresh { 2846sub on_refresh {
2810 my ($self, $id, $cb) = @_; 2847 my ($self, $id, $cb) = @_;
2811 2848
2812 $self->{refresh_hook}{$id} = $cb; 2849 $self->{refresh_hook}{$id} = $cb;
2813} 2850}
2814 2851
2852sub on_post_alloc {
2853 my ($self, $id, $cb) = @_;
2854
2855 $self->{post_alloc_hook}{$id} = $cb;
2856}
2857
2815sub draw { 2858sub draw {
2816 my ($self) = @_; 2859 my ($self) = @_;
2860
2861 while ($self->{refresh_hook}) {
2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2864 }
2817 2865
2818 if ($self->{check_size}) { 2866 if ($self->{check_size}) {
2819 my @queue = ([], []); 2867 my @queue = ([], []);
2820 2868
2821 for (;;) { 2869 for (;;) {
… …
2829 2877
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2878 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)} 2879 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request; 2880 : $widget->size_request;
2833 2881
2882 if (delete $widget->{force_alloc}
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2883 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2835 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 2884 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836 2885
2837 $widget->{req_w} = $w; 2886 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h; 2887 $widget->{req_h} = $h;
2839 2888
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2889 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2841 2890
2842 $widget->{parent}->check_size 2891 $widget->{parent}->check_size
2843 if $widget->{parent}; 2892 if $widget->{parent};
2844 } 2893 }
2845 } 2894 }
… …
2857 $widget->size_allocate ($w, $h); 2906 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h); 2907 $widget->emit (size_allocate => $w, $h);
2859 } 2908 }
2860 } 2909 }
2861 2910
2862 while ($self->{refresh_hook}) { 2911 while ($self->{post_alloc_hook}) {
2863 $_->() 2912 $_->()
2864 for values %{delete $self->{refresh_hook}}; 2913 for values %{delete $self->{post_alloc_hook}};
2865 } 2914 }
2866 2915
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2916 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2917 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 2918 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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