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.233 by root, Thu May 25 03:42:40 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 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}) {
… …
35 55
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH; 57 if $x + $TOOLTIP->{w} > $::WIDTH;
38 58
39 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update; 60 $TOOLTIP->realloc;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 176 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 177 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 178 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 179 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 180 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 181 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 } 182 }
166 } 183 }
167 184
168 reconfigure_widgets; 185 reconfigure_widgets;
169} 186}
… …
186 can_events => 1, 203 can_events => 1,
187 @_ 204 @_
188 }, $class; 205 }, $class;
189 206
190 for (keys %$self) { 207 for (keys %$self) {
191 if (/^connect_(.*)$/) { 208 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 209 $self->connect ($1 => delete $self->{$_});
193 } 210 }
194 } 211 }
195 212
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH;
217 $self->{req_y} = $layout->{y} * $::HEIGHT;
218 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
219 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
220 }
221
198 $self 222 $self
199} 223}
200 224
201sub destroy { 225sub destroy {
202 my ($self) = @_; 226 my ($self) = @_;
… …
205 %$self = (); 229 %$self = ();
206} 230}
207 231
208sub show { 232sub show {
209 my ($self) = @_; 233 my ($self) = @_;
234
210 return if $self->{parent}; 235 return if $self->{parent};
211 236
212 $CFClient::UI::ROOT->add ($self); 237 $CFClient::UI::ROOT->add ($self);
213} 238}
214 239
215sub show_centered { 240sub center {
216 my ($self) = @_; 241 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 242
221 $CFClient::UI::ROOT->on_post_alloc ( 243 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 244 "center_$self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
224 }, 246 },
225 ); 247 );
248
249 $self->update;
250}
251
252sub set_visible {
253 my ($self) = @_;
254
255 return if $self->{visible};
256
257 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1;
259
260 $self->emit (visibility_change => 1);
261
262 $self->realloc unless exists $self->{req_w};
263
264 $_->set_visible for $self->children;
226} 265}
227 266
228sub set_invisible { 267sub set_invisible {
229 my ($self) = @_; 268 my ($self) = @_;
230 269
231 # broken show/hide model 270 return unless $self->{visible};
232 271
272 $_->set_invisible for $self->children;
273
274 delete $self->{root};
233 delete $self->{visible}; 275 delete $self->{visible};
234 276
235 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 278 undef $HOVER if $HOVER == $self;
237 279
238 CFClient::UI::check_tooltip 280 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 281 if $TOOLTIP->{owner} == $self;
240 282
241 $self->focus_out; 283 $self->focus_out;
284
285 $self->emit (visibility_change => 0);
286}
287
288sub set_visibility {
289 my ($self, $visible) = @_;
290
291 return if $self->{visible} == $visible;
292
293 $visible ? $self->hide
294 : $self->show;
295}
296
297sub toggle_visibility {
298 my ($self) = @_;
299
300 $self->{visible}
301 ? $self->hide
302 : $self->show;
242} 303}
243 304
244sub hide { 305sub hide {
245 my ($self) = @_; 306 my ($self) = @_;
246 307
… …
261} 322}
262 323
263sub set_size { 324sub set_size {
264 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
265 326
266 $self->{user_w} = $w; 327 $self->{def_w} = $w;
267 $self->{user_h} = $h; 328 $self->{def_h} = $h;
268 329
269 $self->check_size; 330 $self->realloc;
270} 331}
271 332
272sub size_request { 333sub size_request {
273 require Carp; 334 require Carp;
274 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
294 $self->{y} = $y; 355 $self->{y} = $y;
295 $self->update; 356 $self->update;
296 } 357 }
297 358
298 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 363 }
301} 364}
302 365
303sub size_allocate { 366sub size_allocate {
304 # nothing to be done 367 # nothing to be done
305} 368}
306 369
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 370sub children {
315} 371}
316 372
317sub set_max_size { 373sub set_max_size {
318 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
… …
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 377 delete $self->{max_h}; $self->{max_h} = $h if $h;
322} 378}
323 379
324sub set_tooltip { 380sub set_tooltip {
325 my ($self, $tooltip) = @_; 381 my ($self, $tooltip) = @_;
382
383 $tooltip =~ s/^\s+//;
384 $tooltip =~ s/\s+$//;
385
386 return if $self->{tooltip} eq $tooltip;
326 387
327 $self->{tooltip} = $tooltip; 388 $self->{tooltip} = $tooltip;
328 389
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 390 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 391 delete $CFClient::UI::TOOLTIP->{owner};
… …
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
393sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455
456sub find_widget {
457 my ($self, $x, $y) = @_;
458
459 return () unless $self->{can_events};
460
461 return $self
462 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
463 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
464
465 ()
466}
467
468sub set_parent {
469 my ($self, $parent) = @_;
470
471 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499}
500
501sub realloc {
502 my ($self) = @_;
503
504 return unless $self->{visible};
505
506 return if $self->{root}{realloc}{$self};
507
508 $self->{root}{realloc}{$self} = $self;
509 $self->{root}->update;
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
394 518
395sub draw { 519sub draw {
396 my ($self) = @_; 520 my ($self) = @_;
397 521
398 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
420 if ($ENV{PCLIENT_DEBUG}) { 544 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix; 545 glPushMatrix;
422 glColor 1, 1, 0, 1; 546 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP; 548 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 549 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 550 glVertex $self->{w} - 1, 0;
427 glVertex $self->{w}, $self->{h}; 551 glVertex $self->{w} - 1, $self->{h} - 1;
428 glVertex 0 , $self->{h}; 552 glVertex 0 , $self->{h} - 1;
429 glEnd; 553 glEnd;
430 glPopMatrix; 554 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 555 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 556 }
433} 557}
434 558
435sub _draw { 559sub _draw {
436 my ($self) = @_; 560 my ($self) = @_;
437 561
438 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
439}
440
441sub find_widget {
442 my ($self, $x, $y) = @_;
443
444 return () unless $self->{can_events};
445
446 return $self
447 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450 ()
451}
452
453sub set_parent {
454 my ($self, $parent) = @_;
455
456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
463}
464
465sub check_size {
466 my ($self, $forced) = @_;
467
468 $self->{force_alloc} = 1 if $forced;
469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
470}
471
472sub update {
473 my ($self) = @_;
474
475 $self->{parent}->update
476 if $self->{parent};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496} 563}
497 564
498sub DESTROY { 565sub DESTROY {
499 my ($self) = @_; 566 my ($self) = @_;
500 567
… …
597 $self->{children} = [ 664 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
600 ]; 667 ];
601 668
602 $self->check_size (1); 669 $self->realloc;
603 $self->update;
604} 670}
605 671
606sub children { 672sub children {
607 @{ $_[0]{children} } 673 @{ $_[0]{children} }
608} 674}
… …
613 delete $child->{parent}; 679 delete $child->{parent};
614 $child->hide; 680 $child->hide;
615 681
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 683
618 $self->check_size; 684 $self->realloc;
619 $self->update;
620} 685}
621 686
622sub clear { 687sub clear {
623 my ($self) = @_; 688 my ($self) = @_;
624 689
… …
628 for (@$children) { 693 for (@$children) {
629 delete $_->{parent}; 694 delete $_->{parent};
630 $_->hide; 695 $_->hide;
631 } 696 }
632 697
633 $self->check_size; 698 $self->realloc;
634 $self->update;
635} 699}
636 700
637sub find_widget { 701sub find_widget {
638 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
639 703
… …
692sub size_request { 756sub size_request {
693 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
694} 758}
695 759
696sub size_allocate { 760sub size_allocate {
697 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
698 762
699 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
700} 764}
701 765
702############################################################################# 766#############################################################################
… …
719 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
720 $self->SUPER::update; 784 $self->SUPER::update;
721} 785}
722 786
723sub size_allocate { 787sub size_allocate {
724 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
725 789
726 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
727 $self->update; 791 $self->update
792 if $changed;
728} 793}
729 794
730sub _render { 795sub _render {
731 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
732} 797}
… …
763 828
764package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
765 830
766our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
767 832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
768sub size_request { 843sub size_request {
769 my ($self) = @_; 844 my ($self) = @_;
770 845
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
772 847
773 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
774} 852}
775 853
776sub size_allocate { 854sub size_allocate {
777 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
778 856
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
780# $w = $self->{w}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
859
781 $self->child->configure (0, 0, $cw, $ch); 860 $self->child->configure (0, 0, $w, $h);
782 $self->update; 861 $self->update;
783} 862}
784 863
785sub set_offset { 864sub set_offset {
786 my ($self, $x, $y) = @_; 865 my ($self, $x, $y) = @_;
… …
837 my $class = shift; 916 my $class = shift;
838 917
839 my $self; 918 my $self;
840 919
841 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
842 vertical => 1, 921 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 923 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 924 $self->{vp}->set_offset (0, $_[1]);
846 }, 925 },
847 ; 926 ;
848 927
849 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
… …
857 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
858 937
859 $self 938 $self
860} 939}
861 940
941sub update {
942 my ($self) = @_;
943
944 $self->SUPER::update;
945
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
862sub size_allocate { 951sub size_allocate {
863 my ($self, $w, $h) = @_; 952 my ($self, $w, $h, $changed) = @_;
864 953
865 $self->SUPER::size_allocate ($w, $h); 954 $self->SUPER::size_allocate ($w, $h, $changed);
866 955
867 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869} 958}
870 959
… …
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1014
926sub new { 1015sub new {
927 my $class = shift; 1016 my $class = shift;
928
929 # TODO: user_x, user_y, overwrite moveto?
930 1017
931 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1021 border => 0.6,
… …
960 $h + $self->border * 2, 1047 $h + $self->border * 2,
961 ) 1048 )
962} 1049}
963 1050
964sub size_allocate { 1051sub size_allocate {
965 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
966 1055
967 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
969 1058
970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
994 my ($ev, $x, $y) = @_; 1083 my ($ev, $x, $y) = @_;
995 1084
996 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
998 1087
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1092 $self->move ($self->{user_x}, $self->{user_y});
1002 $self->check_size; 1093 $self->realloc;
1003 }; 1094 };
1004 1095
1005 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1100 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
1011 1102
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1104
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1105 $self->{user_x} = $bx + $x - $ox;
1106 $self->{user_y} = $by + $y - $oy;
1107
1108 $self->move ($self->{user_x}, $self->{user_y});
1015 $self->update; 1109 $self->realloc;
1016 }; 1110 };
1017 } 1111 }
1018} 1112}
1019 1113
1020sub button_up { 1114sub button_up {
… …
1081sub new { 1175sub new {
1082 my $class = shift; 1176 my $class = shift;
1083 1177
1084 $class->SUPER::new ( 1178 $class->SUPER::new (
1085 col_expand => [], 1179 col_expand => [],
1086 @_ 1180 @_,
1087 ) 1181 )
1182}
1183
1184sub children {
1185 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1186}
1089 1187
1090sub add { 1188sub add {
1091 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1092 1190
1093 $child->set_parent ($self); 1191 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1095 1193
1096 $child->check_size; 1194 $self->realloc;
1097} 1195}
1098 1196
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1197# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1198sub clear {
1105 my ($self) = @_; 1199 my ($self) = @_;
1106 1200
1107 my @children = $self->children; 1201 my @children = $self->children;
1108 delete $self->{children}; 1202 delete $self->{children};
… …
1110 for (@children) { 1204 for (@children) {
1111 delete $_->{parent}; 1205 delete $_->{parent};
1112 $_->hide; 1206 $_->hide;
1113 } 1207 }
1114 1208
1115 $self->update; 1209 $self->realloc;
1116} 1210}
1117 1211
1118sub get_wh { 1212sub get_wh {
1119 my ($self) = @_; 1213 my ($self) = @_;
1120 1214
… …
1147 (sum @$hs), 1241 (sum @$hs),
1148 ) 1242 )
1149} 1243}
1150 1244
1151sub size_allocate { 1245sub size_allocate {
1152 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1153 1247
1154 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1155 1249
1156 my $req_w = sum @$ws; 1250 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1251 my $req_h = (sum @$hs) || 1;
1158 1252
1159 # TODO: nicer code && do row_expand 1253 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1254 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1255 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1256 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1310 }
1217} 1311}
1218 1312
1219############################################################################# 1313#############################################################################
1220 1314
1315package CFClient::UI::Box;
1316
1317our @ISA = CFClient::UI::Container::;
1318
1319sub size_request {
1320 my ($self) = @_;
1321
1322 $self->{vertical}
1323 ? (
1324 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1325 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1326 )
1327 : (
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 )
1331}
1332
1333sub size_allocate {
1334 my ($self, $w, $h, $changed) = @_;
1335
1336 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children};
1338
1339 my @req;
1340
1341 if ($self->{homogeneous}) {
1342 @req = ($space / (@$children || 1)) x @$children;
1343 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1345 my $req = List::Util::sum @req;
1346
1347 if ($req > $space) {
1348 # ah well, not enough space
1349 $_ *= $space / $req for @req;
1350 } else {
1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1352
1353 $space = ($space - $req) / $expand; # remaining space to give away
1354
1355 $req[$_] += $space * $children->[$_]{expand}
1356 for 0 .. $#$children;
1357 }
1358 }
1359
1360 CFClient::UI::harmonize \@req;
1361
1362 my $pos = 0;
1363 for (0 .. $#$children) {
1364 my $alloc = $req[$_];
1365 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1366
1367 $pos += $alloc;
1368 }
1369
1370 1
1371}
1372
1373#############################################################################
1374
1221package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1222 1376
1223# TODO: wrap into common Box base class
1224
1225our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1226 1378
1227sub size_request { 1379sub new {
1228 my ($self) = @_; 1380 my $class = shift;
1229 1381
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1231 1383 vertical => 0,
1232 ( 1384 @_,
1233 (List::Util::sum map $_->[0], @alloc),
1234 (List::Util::max map $_->[1], @alloc),
1235 ) 1385 )
1236} 1386}
1237 1387
1238sub size_allocate {
1239 my ($self, $w, $h) = @_;
1240
1241 ($h, $w) = ($w, $h);
1242
1243 my $children = $self->{children};
1244
1245 my @h = map $_->{req_w}, @$children;
1246
1247 my $req_h = List::Util::sum @h;
1248
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children;
1254 $exp ||= 1;
1255
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 }
1263 }
1264
1265 CFClient::UI::harmonize \@h;
1266
1267 my $y = 0;
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_];
1271 $child->configure ($y, 0, $h, $w);
1272
1273 $y += $h;
1274 }
1275
1276 1
1277}
1278
1279############################################################################# 1388#############################################################################
1280 1389
1281package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1282 1391
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1286 1393
1287sub size_request { 1394sub new {
1288 my ($self) = @_; 1395 my $class = shift;
1289 1396
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1291 1398 vertical => 1,
1292 ( 1399 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1400 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1401}
1336 1402
1337############################################################################# 1403#############################################################################
1338 1404
1339package CFClient::UI::Label; 1405package CFClient::UI::Label;
… …
1402 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1403 1469
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1406 1472
1407 $self->update; 1473 $self->realloc;
1408 $self->check_size;
1409} 1474}
1410 1475
1411sub set_markup { 1476sub set_markup {
1412 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1413 1478
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1483
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1421 1486
1422 $self->update; 1487 $self->realloc;
1423 $self->check_size;
1424} 1488}
1425 1489
1426sub size_request { 1490sub size_request {
1427 my ($self) = @_; 1491 my ($self) = @_;
1428 1492
… …
1449 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1450 ) 1514 )
1451} 1515}
1452 1516
1453sub size_allocate { 1517sub size_allocate {
1454 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1455 1519
1456 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1457} 1522}
1458 1523
1459sub set_fontsize { 1524sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1461 1526
1462 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1528 delete $self->{texture};
1464 1529
1465 $self->update; 1530 $self->realloc;
1466 $self->check_size;
1467} 1531}
1468 1532
1469sub _draw { 1533sub _draw {
1470 my ($self) = @_; 1534 my ($self) = @_;
1471 1535
… …
1551sub set_text { 1615sub set_text {
1552 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1553 1617
1554 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1619 $self->_set_text ($text);
1556 $self->update; 1620
1557 $self->check_size; 1621 $self->realloc;
1558} 1622}
1559 1623
1560sub get_text { 1624sub get_text {
1561 $_[0]{text} 1625 $_[0]{text}
1562} 1626}
… …
1595 } elsif ($uni) { 1659 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1597 } 1661 }
1598 1662
1599 $self->_set_text ($text); 1663 $self->_set_text ($text);
1600 $self->update; 1664
1601 $self->check_size; 1665 $self->realloc;
1602} 1666}
1603 1667
1604sub focus_in { 1668sub focus_in {
1605 my ($self) = @_; 1669 my ($self) = @_;
1606 1670
… …
2113 $self->update; 2177 $self->update;
2114 2178
2115 $self 2179 $self
2116} 2180}
2117 2181
2182sub changed { }
2183
2118sub set_range { 2184sub set_range {
2119 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2120 2186
2121 $self->{range} = $range; 2187 ($range, $self->{range}) = ($self->{range}, $range);
2122 2188
2123 $self->update; 2189 $self->update
2190 if "@$range" ne "@{$self->{range}}";
2124} 2191}
2125 2192
2126sub set_value { 2193sub set_value {
2127 my ($self, $value) = @_; 2194 my ($self, $value) = @_;
2128 2195
… …
2310 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2311 $self->reflow; 2378 $self->reflow;
2312} 2379}
2313 2380
2314sub size_allocate { 2381sub size_allocate {
2315 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2316 2383
2317 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2318 2387
2319 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2320 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2321 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2322 2391
… …
2511 2580
2512sub new { 2581sub new {
2513 my $class = shift; 2582 my $class = shift;
2514 2583
2515 my $self = $class->SUPER::new ( 2584 my $self = $class->SUPER::new (
2516 state => 0, 2585 state => 0,
2517 connect_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2518 @_ 2587 @_
2519 ); 2588 );
2520 2589
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2590 $self
2527} 2591}
2528 2592
2529sub toggle_flopper { 2593sub toggle_flopper {
2530 my ($self) = @_; 2594 my ($self) = @_;
2531 2595
2532 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2597}
2544 2598
2545############################################################################# 2599#############################################################################
2546 2600
2547package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2579 2633
2580 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2581} 2635}
2582 2636
2583sub size_allocate { 2637sub size_allocate {
2584 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2585 2639
2640 return unless $changed;
2641
2586 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2587} 2643}
2588 2644
2589sub _draw { 2645sub _draw {
2590 my ($self) = @_; 2646 my ($self) = @_;
2591 2647
… …
2623 2679
2624sub new { 2680sub new {
2625 my $class = shift; 2681 my $class = shift;
2626 2682
2627 my $self = $class->SUPER::new ( 2683 my $self = $class->SUPER::new (
2628 aspect => 1, 2684 aspect => 1,
2685 can_events => 0,
2629 @_, 2686 @_,
2630 ); 2687 );
2631 2688
2632 if ($self->{anim} && $self->{animspeed}) { 2689 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2690 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2749 $self->SUPER::DESTROY;
2693} 2750}
2694 2751
2695############################################################################# 2752#############################################################################
2696 2753
2697package CFClient::UI::InventoryItem; 2754package CFClient::UI::Inventory;
2698 2755
2699our @ISA = CFClient::UI::HBox::; 2756our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726 2757
2727sub new { 2758sub new {
2728 my $class = shift; 2759 my $class = shift;
2729 2760
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table), 2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2818 @_, 2763 @_,
2819 ); 2764 );
2820 2765
2821 $self 2766 $self
2822} 2767}
… …
2832 or ($a->{name} cmp $b->{name}) 2777 or ($a->{name} cmp $b->{name})
2833 } @$items; 2778 } @$items;
2834 2779
2835 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2836 2781
2782 my $row = 0;
2837 for my $item (@items) { 2783 for my $item (@items) {
2838 $item->{item} = $item; 2784 CFClient::Item::update_widgets $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842 2785
2843 my $i = 0; 2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2844 for (@items) { 2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2845 $self->{scrolled}->add (0, $i, $_); 2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849 2789
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2790 $row++;
2851} 2791 }
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856} 2792}
2857 2793
2858############################################################################# 2794#############################################################################
2859 2795
2860package CFClient::UI::Menu; 2796package CFClient::UI::Menu;
… …
3046use CFClient::OpenGL; 2982use CFClient::OpenGL;
3047 2983
3048sub new { 2984sub new {
3049 my $class = shift; 2985 my $class = shift;
3050 2986
3051 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
2988 visible => 1,
3052 @_, 2989 @_,
3053 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
3054} 2995}
3055 2996
3056sub configure { 2997sub configure {
3057 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
3058 2999
3059 $self->{w} = $w; 3000 $self->{w} = $w;
3060 $self->{h} = $h; 3001 $self->{h} = $h;
3061} 3002}
3062 3003
3063sub check_size { 3004sub reconfigure {
3064 my ($self) = @_; 3005 my ($self) = @_;
3065 3006
3007 $self->SUPER::reconfigure;
3008
3066 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3067 if $self->{w}; 3010 if $self->{w};
3068} 3011}
3069 3012
3070sub size_request { 3013sub size_request {
3071 my ($self) = @_; 3014 my ($self) = @_;
3072 3015
3073 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
3074} 3017}
3075 3018
3076sub size_allocate { 3019sub size_allocate {
3077 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
3078 3021
3079 for my $child ($self->children) { 3022 for my $child ($self->children) {
3080 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3081 3024
3082 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3083 if exists $child->{req_x}; 3026 if exists $child->{req_x};
3084 3027
3085 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3086 if exists $child->{req_y}; 3029 if exists $child->{req_y};
3087 3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3088 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3089 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3090 3035
3091 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
3092 } 3037 }
… …
3105} 3050}
3106 3051
3107sub update { 3052sub update {
3108 my ($self) = @_; 3053 my ($self) = @_;
3109 3054
3110 $self->check_size;
3111 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
3112} 3056}
3113 3057
3114sub add { 3058sub add {
3115 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
3116
3117 for (my @widgets = @children; my $w = pop @widgets; ) {
3118 push @widgets, $w->children;
3119 $w->{root} = $self;
3120 $w->{visible} = 1;
3121 }
3122 3060
3123 for my $child (@children) { 3061 for my $child (@children) {
3124 $child->{is_toplevel} = 1; 3062 $child->{is_toplevel} = 1;
3125 3063
3126 # integerise window positions 3064 # integerise window positions
… …
3161 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
3162 $_->() 3100 $_->()
3163 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
3164 } 3102 }
3165 3103
3166 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
3167 my @queue = ([], []); 3105 my @queue;
3168 3106
3169 for (;;) { 3107 while () {
3170 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
3171 # heuristic: check containers last 3109 #TODO use array-of-depth approach
3172 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3110
3173 for values %{delete $self->{check_size}} 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3112 @queue, values %{delete $self->{realloc}};
3174 } 3113 }
3175 3114
3176 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3115 my $widget = pop @queue || last;
3177 3116
3117 $widget->{visible} or last; # do not resize invisible widgets
3118
3178 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3179 ? @$widget{qw(user_w user_h)} 3120 ? @$widget{qw(def_w def_h)}
3180 : $widget->size_request; 3121 : $widget->size_request;
3181 3122
3182 if (delete $widget->{force_alloc}
3183 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3184 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3185 3124
3186 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
3187 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
3188 3127
3189 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3190 3129
3191 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
3192 if $widget->{parent}; 3131 if $widget->{parent};
3193 }
3194 } 3132 }
3195 } 3133 }
3196 3134
3197 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
3198 for (values %{delete $self->{size_alloc}}) { 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3199 my ($widget, $w, $h) = @$_; 3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3200 3141
3201 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
3202 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
3203 3144
3204 $widget->{w} = $w; 3145 $widget->{w} = $w;
3205 $widget->{h} = $h; 3146 $widget->{h} = $h;
3206 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
3207 } 3148 }
3208 } 3149 }
3209 3150
3210 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
3211 $_->() 3152 $_->()

Diff Legend

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