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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 183 }
167
168 $widget->reconfigure;
169 } 184 }
185
186 reconfigure_widgets;
170} 187}
171 188
172############################################################################# 189#############################################################################
173 190
174package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
187 can_events => 1, 204 can_events => 1,
188 @_ 205 @_
189 }, $class; 206 }, $class;
190 207
191 for (keys %$self) { 208 for (keys %$self) {
192 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
194 } 211 }
195 } 212 }
196 213
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
199 $self 223 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
200} 234}
201 235
202sub destroy { 236sub destroy {
203 my ($self) = @_; 237 my ($self) = @_;
204 238
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 259 },
226 ); 260 );
227} 261}
228 262
229sub hide { 263sub set_visible {
230 my ($self) = @_; 264 my ($self) = @_;
265
266 return if $self->{visible};
267
268 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1;
270
271 $self->emit (visibility_change => 1)
272}
273
274sub set_invisible {
275 my ($self) = @_;
276
277 return unless $self->{visible};
278
279 # broken show/hide model
280
281 delete $self->{root};
282 delete $self->{visible};
231 283
232 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 285 undef $HOVER if $HOVER == $self;
286
287 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self;
289
290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
293}
294
295sub hide {
296 my ($self) = @_;
297
298 $self->set_invisible;
234 299
235 $self->{parent}->remove ($self) 300 $self->{parent}->remove ($self)
236 if $self->{parent}; 301 if $self->{parent};
237} 302}
238 303
… …
247} 312}
248 313
249sub set_size { 314sub set_size {
250 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
251 316
252 $self->{user_w} = $w; 317 $self->{def_w} = $w;
253 $self->{user_h} = $h; 318 $self->{def_h} = $h;
254 319
255 $self->check_size; 320 $self->check_size;
256} 321}
257 322
258sub size_request { 323sub size_request {
… …
308} 373}
309 374
310sub set_tooltip { 375sub set_tooltip {
311 my ($self, $tooltip) = @_; 376 my ($self, $tooltip) = @_;
312 377
378 $tooltip =~ s/^\s+//;
379 $tooltip =~ s/\s+$//;
380
381 return if $self->{tooltip} eq $tooltip;
382
313 $self->{tooltip} = $tooltip; 383 $self->{tooltip} = $tooltip;
314 384
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 385 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 386 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 387 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 408 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
340 410
341 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
342 412
343 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
344 414
345 $focus->update if $focus; 415 $focus->update if $focus;
346 $FOCUS->update; 416 $FOCUS->update;
347} 417}
348 418
… …
351 421
352 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
353 423
354 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
355 425
356 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
357 427
358 $focus->update if $focus; #? 428 $focus->update if $focus; #?
429
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431 unless $FOCUS;
359} 432}
360 433
361sub mouse_motion { } 434sub mouse_motion { }
362sub button_up { } 435sub button_up { }
363sub key_down { } 436sub key_down { }
364sub key_up { } 437sub key_up { }
365 438
366sub button_down { 439sub button_down {
367 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
368 441
369 $self->focus_in; 442 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 477 glPushMatrix;
405 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 481 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
412 glEnd; 485 glEnd;
413 glPopMatrix; 486 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 488 }
416} 489}
… …
436sub set_parent { 509sub set_parent {
437 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
438 511
439 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
440 513
441 # TODO: req_w _does_change after ->reconfigure 514 $self->set_visible;
515
442 $self->check_size 516 $self->check_size;
443 unless exists $self->{req_w};
444
445 $self->show; 517 $self->show;
446} 518}
447 519
448sub check_size { 520sub check_size {
449 my ($self, $forced) = @_; 521 my ($self, $forced) = @_;
… …
463 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
464 536
465 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 538}
467 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
468sub emit { 546sub emit {
469 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
470 548
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
472} 555}
473 556
474sub DESTROY { 557sub DESTROY {
475 my ($self) = @_; 558 my ($self) = @_;
476 559
… …
589 delete $child->{parent}; 672 delete $child->{parent};
590 $child->hide; 673 $child->hide;
591 674
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 676
594 $self->check_size; 677 $self->check_size (1);
595 $self->update; 678 $self->update;
596} 679}
597 680
598sub clear { 681sub clear {
599 my ($self) = @_; 682 my ($self) = @_;
… …
739 822
740package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
741 824
742our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
743 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
744sub size_request { 837sub size_request {
745 my ($self) = @_; 838 my ($self) = @_;
746 839
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 841
… …
750} 843}
751 844
752sub size_allocate { 845sub size_allocate {
753 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
754 847
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
757 $self->child->configure (0, 0, $cw, $ch); 851 $self->child->configure (0, 0, $w, $h);
758 $self->update; 852 $self->update;
759} 853}
760 854
761sub set_offset { 855sub set_offset {
762 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
813 my $class = shift; 907 my $class = shift;
814 908
815 my $self; 909 my $self;
816 910
817 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
818 vertical => 1, 912 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 914 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 915 $self->{vp}->set_offset (0, $_[1]);
822 }, 916 },
823 ; 917 ;
824 918
825 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 920 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 926 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
834 928
835 $self 929 $self
930}
931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940}
941
942sub size_allocate {
943 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 949}
837 950
838#TODO# update range on size_allocate depending on child 951#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 952# update viewport offset on scroll
840 953
… …
891 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1005
893sub new { 1006sub new {
894 my $class = shift; 1007 my $class = shift;
895 1008
896 # TODO: user_x, user_y, overwrite moveto?
897
898 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1010 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1011 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1012 border => 0.6,
902 toplevel => 1, 1013 is_toplevel => 1,
903 can_events => 1, 1014 can_events => 1,
904 @_ 1015 @_
905 ); 1016 );
906 1017
907 $self->{title} &&= new CFClient::UI::Label 1018 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 1019 align => 0,
… …
961 my ($ev, $x, $y) = @_; 1072 my ($ev, $x, $y) = @_;
962 1073
963 my $dx = $ev->{x} - $ox; 1074 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1075 my $dy = $ev->{y} - $oy;
965 1076
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1081 $self->move ($self->{user_x}, $self->{user_y});
969 $self->check_size; 1082 $self->check_size;
970 }; 1083 };
971 1084
972 } elsif ($lr ^ $td) { 1085 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1086 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
976 $self->{motion} = sub { 1089 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1090 my ($ev, $x, $y) = @_;
978 1091
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1092 ($x, $y) = ($ev->{x}, $ev->{y});
980 1093
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1094 $self->{user_x} = $bx + $x - $ox;
1095 $self->{user_y} = $by + $y - $oy;
1096
1097 $self->move ($self->{user_x}, $self->{user_y});
982 $self->update; 1098 $self->update;
983 }; 1099 };
984 } 1100 }
985} 1101}
986 1102
… …
1048sub new { 1164sub new {
1049 my $class = shift; 1165 my $class = shift;
1050 1166
1051 $class->SUPER::new ( 1167 $class->SUPER::new (
1052 col_expand => [], 1168 col_expand => [],
1053 @_ 1169 @_,
1054 ) 1170 )
1171}
1172
1173sub children {
1174 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1175}
1056 1176
1057sub add { 1177sub add {
1058 my ($self, $x, $y, $child) = @_; 1178 my ($self, $x, $y, $child) = @_;
1059 1179
1060 $child->set_parent ($self); 1180 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1181 $self->{children}[$y][$x] = $child;
1062 1182
1063 $child->check_size; 1183 $self->check_size (1);
1064} 1184}
1065 1185
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1186# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1187sub clear {
1072 my ($self) = @_; 1188 my ($self) = @_;
1073 1189
1074 my @children = $self->children; 1190 my @children = $self->children;
1075 delete $self->{children}; 1191 delete $self->{children};
… …
1077 for (@children) { 1193 for (@children) {
1078 delete $_->{parent}; 1194 delete $_->{parent};
1079 $_->hide; 1195 $_->hide;
1080 } 1196 }
1081 1197
1198 $self->check_size (1);
1082 $self->update; 1199 $self->update;
1083} 1200}
1084 1201
1085sub get_wh { 1202sub get_wh {
1086 my ($self) = @_; 1203 my ($self) = @_;
… …
1118sub size_allocate { 1235sub size_allocate {
1119 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1120 1237
1121 my ($ws, $hs) = $self->get_wh; 1238 my ($ws, $hs) = $self->get_wh;
1122 1239
1123 my $req_w = sum @$ws; 1240 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1241 my $req_h = (sum @$hs) || 1;
1125 1242
1126 # TODO: nicer code && do row_expand 1243 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1244 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1245 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1246 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1300 }
1184} 1301}
1185 1302
1186############################################################################# 1303#############################################################################
1187 1304
1188package CFClient::UI::HBox; 1305package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1306
1192our @ISA = CFClient::UI::Container::; 1307our @ISA = CFClient::UI::Container::;
1193 1308
1194sub size_request { 1309sub size_request {
1195 my ($self) = @_; 1310 my ($self) = @_;
1196 1311
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1312 $self->{vertical}
1198 1313 ? (
1199 ( 1314 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1315 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1316 )
1202 ) 1317 : (
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 )
1203} 1321}
1204 1322
1205sub size_allocate { 1323sub size_allocate {
1206 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1207 1325
1208 ($h, $w) = ($w, $h); 1326 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1327 my $children = $self->{children};
1211 1328
1212 my @h = map $_->{req_w}, @$children; 1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1213
1214 my $req_h = List::Util::sum @h; 1330 my $req = List::Util::sum @req;
1215 1331
1216 if ($req_h > $h) { 1332 if ($req > $space) {
1217 # ah well, not enough space 1333 # ah well, not enough space
1218 $_ *= $h / $req_h for @h; 1334 $_ *= $space / $req for @req;
1219 } else { 1335 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1337
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1223 for (0 .. $#$children) { 1339 for 0 .. $#$children;
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 }
1230 } 1340 }
1231 1341
1232 CFClient::UI::harmonize \@h; 1342 CFClient::UI::harmonize \@req;
1233 1343
1234 my $y = 0; 1344 my $pos = 0;
1235 for (0 .. $#$children) { 1345 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1346 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1348
1240 $y += $h; 1349 $pos += $alloc;
1241 } 1350 }
1242 1351
1243 1 1352 1
1244} 1353}
1245 1354
1246############################################################################# 1355#############################################################################
1247 1356
1357package CFClient::UI::HBox;
1358
1359our @ISA = CFClient::UI::Box::;
1360
1361sub new {
1362 my $class = shift;
1363
1364 $class->SUPER::new (
1365 vertical => 0,
1366 @_,
1367 )
1368}
1369
1370#############################################################################
1371
1248package CFClient::UI::VBox; 1372package CFClient::UI::VBox;
1249 1373
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1374our @ISA = CFClient::UI::Box::;
1253 1375
1254sub size_request { 1376sub new {
1255 my ($self) = @_; 1377 my $class = shift;
1256 1378
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1379 $class->SUPER::new (
1258 1380 vertical => 1,
1259 ( 1381 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1382 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1383}
1303 1384
1304############################################################################# 1385#############################################################################
1305 1386
1306package CFClient::UI::Label; 1387package CFClient::UI::Label;
… …
1510 $self->{text} = $text; 1591 $self->{text} = $text;
1511 1592
1512 $text =~ s/./*/g if $self->{hidden}; 1593 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1594 $self->{layout}->set_text ("$text ");
1514 1595
1515 $self->emit (changed => $self->{text}); 1596 $self->_emit (changed => $self->{text});
1516} 1597}
1517 1598
1518sub set_text { 1599sub set_text {
1519 my ($self, $text) = @_; 1600 my ($self, $text) = @_;
1520 1601
… …
1532 my ($self) = @_; 1613 my ($self) = @_;
1533 1614
1534 my ($w, $h) = $self->SUPER::size_request; 1615 my ($w, $h) = $self->SUPER::size_request;
1535 1616
1536 ($w + 1, $h) # add 1 for cursor 1617 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1618}
1544 1619
1545sub key_down { 1620sub key_down {
1546 my ($self, $ev) = @_; 1621 my ($self, $ev) = @_;
1547 1622
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1637 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1638 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1639 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1640 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1641 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1642 $self->_emit ('escape');
1568 } elsif ($uni) { 1643 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1644 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1645 }
1571 1646
1572 $self->_set_text ($text); 1647 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1734 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1735 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1736 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1737 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1738 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1739 $self->_emit (activate => $txt);
1665 $self->update; 1740 $self->update;
1666 1741
1667 } elsif ($sym == CFClient::SDLK_UP) { 1742 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1743 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1744 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1792 can_events => 1,
1718 @_ 1793 @_
1719 ) 1794 )
1720} 1795}
1721 1796
1797sub activate { }
1798
1722sub button_up { 1799sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1800 my ($self, $ev, $x, $y) = @_;
1724 1801
1802 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1803 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1804 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1805}
1730 1806
1731sub _draw { 1807sub _draw {
1732 my ($self) = @_; 1808 my ($self) = @_;
1733 1809
… …
1785 my ($self, $ev, $x, $y) = @_; 1861 my ($self, $ev, $x, $y) = @_;
1786 1862
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1865 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1866 $self->_emit (changed => $self->{state});
1791 } 1867 }
1792} 1868}
1793 1869
1794sub _draw { 1870sub _draw {
1795 my ($self) = @_; 1871 my ($self) = @_;
… …
2088} 2164}
2089 2165
2090sub set_range { 2166sub set_range {
2091 my ($self, $range) = @_; 2167 my ($self, $range) = @_;
2092 2168
2093 $self->{range} = $range; 2169 ($range, $self->{range}) = ($self->{range}, $range);
2094 2170
2095 $self->update; 2171 $self->update
2172 if "@$range" ne "@{$self->{range}}";
2096} 2173}
2097 2174
2098sub set_value { 2175sub set_value {
2099 my ($self, $value) = @_; 2176 my ($self, $value) = @_;
2100 2177
… …
2111 if $unit; 2188 if $unit;
2112 2189
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2190 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2191
2115 if ($value != $old_value) { 2192 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2193 $self->_emit (changed => $value);
2117 $self->update; 2194 $self->update;
2118 } 2195 }
2119} 2196}
2120 2197
2121sub size_request { 2198sub size_request {
… …
2483 2560
2484sub new { 2561sub new {
2485 my $class = shift; 2562 my $class = shift;
2486 2563
2487 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2488 state => 0, 2565 state => 0,
2489 connect_activate => \&toggle_flopper, 2566 on_activate => \&toggle_flopper,
2490 @_ 2567 @_
2491 ); 2568 );
2492 2569
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2570 $self
2499} 2571}
2500 2572
2501sub toggle_flopper { 2573sub toggle_flopper {
2502 my ($self) = @_; 2574 my ($self) = @_;
2503 2575
2504 # TODO: use animation 2576 $self->{other}->toggle_visibility;
2505 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open");
2509 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close");
2512 }
2513
2514 $self->emit (changed => $self->{state});
2515} 2577}
2516 2578
2517############################################################################# 2579#############################################################################
2518 2580
2519package CFClient::UI::Tooltip; 2581package CFClient::UI::Tooltip;
… …
2595 2657
2596sub new { 2658sub new {
2597 my $class = shift; 2659 my $class = shift;
2598 2660
2599 my $self = $class->SUPER::new ( 2661 my $self = $class->SUPER::new (
2600 aspect => 1, 2662 aspect => 1,
2663 can_events => 0,
2601 @_, 2664 @_,
2602 ); 2665 );
2603 2666
2604 if ($self->{anim} && $self->{animspeed}) { 2667 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2668 Scalar::Util::weaken (my $widget = $self);
… …
2664 $self->SUPER::DESTROY; 2727 $self->SUPER::DESTROY;
2665} 2728}
2666 2729
2667############################################################################# 2730#############################################################################
2668 2731
2669package CFClient::UI::InventoryItem; 2732package CFClient::UI::Inventory;
2670 2733
2671our @ISA = CFClient::UI::HBox::; 2734our @ISA = CFClient::UI::ScrolledWindow::;
2672
2673sub _item_to_desc {
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2698 2735
2699sub new { 2736sub new {
2700 my $class = shift; 2737 my $class = shift;
2701 2738
2702 my %args = @_;
2703
2704 my $item = delete $args{item};
2705
2706 my $desc = _item_to_desc ($item);
2707
2708 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
2709 can_hover => 1,
2710 can_events => 1,
2711 tooltip => ((CFClient::UI::Label::escape $desc)
2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713 connect_button_down => sub {
2714 my ($self, $ev, $x, $y) = @_;
2715
2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2727 } elsif ($ev->{button} == 2) {
2728 $::CONN->send ("apply $item->{tag}");
2729 } elsif ($ev->{button} == 3) {
2730 my @menu_items = (
2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2743 ),
2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747 }
2748
2749 1
2750 },
2751 %args
2752 );
2753
2754
2755 $self->add (new CFClient::UI::Face
2756 can_events => 0,
2757 face => $item->{face},
2758 anim => $item->{anim},
2759 animspeed => $item->{animspeed},
2760 );
2761
2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764 $self->{item} = $item;
2765
2766 $self->update_item;
2767
2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2777}
2778
2779#############################################################################
2780
2781package CFClient::UI::Inventory;
2782
2783our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785sub new {
2786 my $class = shift;
2787
2788 my $self = $class->SUPER::new (
2789 scrolled => (new CFClient::UI::Table), 2740 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2790 @_, 2741 @_,
2791 ); 2742 );
2792 2743
2793 $self 2744 $self
2794} 2745}
… …
2804 or ($a->{name} cmp $b->{name}) 2755 or ($a->{name} cmp $b->{name})
2805 } @$items; 2756 } @$items;
2806 2757
2807 $self->{real_items} = \@items; 2758 $self->{real_items} = \@items;
2808 2759
2760 my $row = 0;
2809 for my $item (@items) { 2761 for my $item (@items) {
2810 $item->{item} = $item; 2762 CFClient::Item::update_widgets $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814 2763
2815 my $i = 0; 2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2816 for (@items) { 2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2817 $self->{scrolled}->add (0, $i, $_); 2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2821 2767
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2768 $row++;
2823} 2769 }
2824
2825sub size_request {
2826 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h});
2828} 2770}
2829 2771
2830############################################################################# 2772#############################################################################
2831 2773
2832package CFClient::UI::Menu; 2774package CFClient::UI::Menu;
… …
2867 2809
2868# popup given the event (must be a mouse button down event currently) 2810# popup given the event (must be a mouse button down event currently)
2869sub popup { 2811sub popup {
2870 my ($self, $ev) = @_; 2812 my ($self, $ev) = @_;
2871 2813
2872 $self->emit ("popdown"); 2814 $self->_emit ("popdown");
2873 2815
2874 # maybe save $GRAB? must be careful about events... 2816 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 2817 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 2818 $self->{button} = $ev->{button};
2877 2819
… …
2892 2834
2893 if ($ev->{button} == $self->{button}) { 2835 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 2836 undef $GRAB;
2895 $self->hide; 2837 $self->hide;
2896 2838
2897 $self->emit ("popdown"); 2839 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2840 $self->{hover}[1]->() if $self->{hover};
2899 } 2841 }
2900} 2842}
2901 2843
2902############################################################################# 2844#############################################################################
… …
2964sub add { 2906sub add {
2965 my ($self, $text, %arg) = @_; 2907 my ($self, $text, %arg) = @_;
2966 2908
2967 $text =~ s/^\s+//; 2909 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 2910 $text =~ s/\s+$//;
2911
2912 return unless $text;
2969 2913
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 2914 my $timeout = time + ((delete $arg{timeout}) || 60);
2971 2915
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 2917
… …
3017 2961
3018sub new { 2962sub new {
3019 my $class = shift; 2963 my $class = shift;
3020 2964
3021 $class->SUPER::new ( 2965 $class->SUPER::new (
2966 visible => 1,
3022 @_, 2967 @_,
3023 ) 2968 )
3024} 2969}
3025 2970
3026sub configure { 2971sub configure {
… …
3044} 2989}
3045 2990
3046sub size_allocate { 2991sub size_allocate {
3047 my ($self, $w, $h) = @_; 2992 my ($self, $w, $h) = @_;
3048 2993
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055 for my $child ($self->children) { 2994 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 2996
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3059 if exists $child->{req_x}; 2998 if exists $child->{req_x};
3060 2999
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3062 if exists $child->{req_y}; 3001 if exists $child->{req_y};
3063 3002
3003 delete @$child{qw(req_x req_y)};
3004
3064 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066 3007
3067 $child->configure ($X, $Y, $W, $H); 3008 $child->configure ($X, $Y, $W, $H);
3068 } 3009 }
… …
3089 3030
3090sub add { 3031sub add {
3091 my ($self, @children) = @_; 3032 my ($self, @children) = @_;
3092 3033
3093 for my $child (@children) { 3034 for my $child (@children) {
3094 $child->{toplevel} = 1; 3035 $child->{is_toplevel} = 1;
3095 3036
3096 # integerise window positions 3037 # integerise window positions
3097 $child->{x} = int $child->{x}; 3038 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y}; 3039 $child->{y} = int $child->{y};
3099 } 3040 }
3100 3041
3101 $self->SUPER::add (@children); 3042 $self->SUPER::add (@children);
3102 3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049}
3050
3051sub remove {
3052 my ($self, @children) = @_;
3053
3054 $self->SUPER::remove (@children);
3055
3103 while (@children) { 3056 while (@children) {
3104 my $w = pop @children; 3057 my $w = pop @children;
3105 push @children, $w->children; 3058 push @children, $w->children;
3106 $w->{visible} = 1; 3059 $w->set_invisible;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 } 3060 }
3120} 3061}
3121 3062
3122sub on_refresh { 3063sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
… …
3138 $_->() 3079 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3080 for values %{delete $self->{refresh_hook}};
3140 } 3081 }
3141 3082
3142 if ($self->{check_size}) { 3083 if ($self->{check_size}) {
3143 my @queue = ([], []); 3084 my @queue;
3144 3085
3145 for (;;) { 3086 for (;;) {
3146 if ($self->{check_size}) { 3087 if ($self->{check_size}) {
3147 # heuristic: check containers last 3088 #TODO use array-of-depth approach
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3089
3090 @queue = sort { $a->{visible} <=> $b->{visible} }
3149 for values %{delete $self->{check_size}} 3091 @queue, values %{delete $self->{check_size}};
3150 } 3092 }
3151 3093
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3094 my $widget = pop @queue || last;
3153 3095
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3155 ? @$widget{qw(user_w user_h)} 3099 ? @$widget{qw(def_w def_h)}
3156 : $widget->size_request; 3100 : $widget->size_request;
3157 3101
3158 if (delete $widget->{force_alloc} 3102 if (delete $widget->{force_alloc}
3159 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
… …
3177 $w = 0 if $w < 0; 3121 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3122 $h = 0 if $h < 0;
3179 3123
3180 $widget->{w} = $w; 3124 $widget->{w} = $w;
3181 $widget->{h} = $h; 3125 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h);
3183 $widget->emit (size_allocate => $w, $h); 3126 $widget->emit (size_allocate => $w, $h);
3184 } 3127 }
3185 } 3128 }
3186 3129
3187 while ($self->{post_alloc_hook}) { 3130 while ($self->{post_alloc_hook}) {

Diff Legend

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