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.231 by root, Thu May 25 00:26:19 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
280 CFClient::UI::check_tooltip
281 if $TOOLTIP->{owner} == $self;
282
238 $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;
239} 303}
240 304
241sub hide { 305sub hide {
242 my ($self) = @_; 306 my ($self) = @_;
243 307
… …
258} 322}
259 323
260sub set_size { 324sub set_size {
261 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
262 326
263 $self->{user_w} = $w; 327 $self->{def_w} = $w;
264 $self->{user_h} = $h; 328 $self->{def_h} = $h;
265 329
266 $self->check_size; 330 $self->realloc;
267} 331}
268 332
269sub size_request { 333sub size_request {
270 require Carp; 334 require Carp;
271 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
291 $self->{y} = $y; 355 $self->{y} = $y;
292 $self->update; 356 $self->update;
293 } 357 }
294 358
295 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
296 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
297 } 363 }
298} 364}
299 365
300sub size_allocate { 366sub size_allocate {
301 # nothing to be done 367 # nothing to be done
302} 368}
303 369
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
311sub children { 370sub children {
312} 371}
313 372
314sub set_max_size { 373sub set_max_size {
315 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
… …
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 377 delete $self->{max_h}; $self->{max_h} = $h if $h;
319} 378}
320 379
321sub set_tooltip { 380sub set_tooltip {
322 my ($self, $tooltip) = @_; 381 my ($self, $tooltip) = @_;
382
383 $tooltip =~ s/^\s+//;
384 $tooltip =~ s/\s+$//;
385
386 return if $self->{tooltip} eq $tooltip;
323 387
324 $self->{tooltip} = $tooltip; 388 $self->{tooltip} = $tooltip;
325 389
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 390 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 391 delete $CFClient::UI::TOOLTIP->{owner};
… …
386sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
387sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
388sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
389sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
390sub 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}
391 518
392sub draw { 519sub draw {
393 my ($self) = @_; 520 my ($self) = @_;
394 521
395 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
417 if ($ENV{PCLIENT_DEBUG}) { 544 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix; 545 glPushMatrix;
419 glColor 1, 1, 0, 1; 546 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP; 548 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 549 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 550 glVertex $self->{w} - 1, 0;
424 glVertex $self->{w}, $self->{h}; 551 glVertex $self->{w} - 1, $self->{h} - 1;
425 glVertex 0 , $self->{h}; 552 glVertex 0 , $self->{h} - 1;
426 glEnd; 553 glEnd;
427 glPopMatrix; 554 glPopMatrix;
428 #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;
429 } 556 }
430} 557}
431 558
432sub _draw { 559sub _draw {
433 my ($self) = @_; 560 my ($self) = @_;
434 561
435 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
436}
437
438sub find_widget {
439 my ($self, $x, $y) = @_;
440
441 return () unless $self->{can_events};
442
443 return $self
444 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447 ()
448}
449
450sub set_parent {
451 my ($self, $parent) = @_;
452
453 Scalar::Util::weaken ($self->{parent} = $parent);
454
455 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size
457 unless exists $self->{req_w};
458
459 $self->show;
460}
461
462sub check_size {
463 my ($self, $forced) = @_;
464
465 $self->{force_alloc} = 1 if $forced;
466 $CFClient::UI::ROOT->{check_size}{$self} = $self;
467}
468
469sub update {
470 my ($self) = @_;
471
472 $self->{parent}->update
473 if $self->{parent};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493} 563}
494 564
495sub DESTROY { 565sub DESTROY {
496 my ($self) = @_; 566 my ($self) = @_;
497 567
… …
594 $self->{children} = [ 664 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
597 ]; 667 ];
598 668
599 $self->check_size (1); 669 $self->realloc;
600 $self->update;
601} 670}
602 671
603sub children { 672sub children {
604 @{ $_[0]{children} } 673 @{ $_[0]{children} }
605} 674}
… …
610 delete $child->{parent}; 679 delete $child->{parent};
611 $child->hide; 680 $child->hide;
612 681
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 683
615 $self->check_size; 684 $self->realloc;
616 $self->update;
617} 685}
618 686
619sub clear { 687sub clear {
620 my ($self) = @_; 688 my ($self) = @_;
621 689
… …
625 for (@$children) { 693 for (@$children) {
626 delete $_->{parent}; 694 delete $_->{parent};
627 $_->hide; 695 $_->hide;
628 } 696 }
629 697
630 $self->check_size; 698 $self->realloc;
631 $self->update;
632} 699}
633 700
634sub find_widget { 701sub find_widget {
635 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
636 703
… …
689sub size_request { 756sub size_request {
690 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
691} 758}
692 759
693sub size_allocate { 760sub size_allocate {
694 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
695 762
696 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
697} 764}
698 765
699############################################################################# 766#############################################################################
… …
716 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
717 $self->SUPER::update; 784 $self->SUPER::update;
718} 785}
719 786
720sub size_allocate { 787sub size_allocate {
721 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
722 789
723 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
724 $self->update; 791 $self->update
792 if $changed;
725} 793}
726 794
727sub _render { 795sub _render {
728 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
729} 797}
… …
760 828
761package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
762 830
763our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
764 832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
765sub size_request { 843sub size_request {
766 my ($self) = @_; 844 my ($self) = @_;
767 845
768 @$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)};
769 847
770 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
771} 852}
772 853
773sub size_allocate { 854sub size_allocate {
774 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
775 856
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
777# $w = $self->{w}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
859
778 $self->child->configure (0, 0, $cw, $ch); 860 $self->child->configure (0, 0, $w, $h);
779 $self->update; 861 $self->update;
780} 862}
781 863
782sub set_offset { 864sub set_offset {
783 my ($self, $x, $y) = @_; 865 my ($self, $x, $y) = @_;
… …
834 my $class = shift; 916 my $class = shift;
835 917
836 my $self; 918 my $self;
837 919
838 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
839 vertical => 1, 921 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 923 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 924 $self->{vp}->set_offset (0, $_[1]);
843 }, 925 },
844 ; 926 ;
845 927
846 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
… …
854 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
855 937
856 $self 938 $self
857} 939}
858 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
859sub size_allocate { 951sub size_allocate {
860 my ($self, $w, $h) = @_; 952 my ($self, $w, $h, $changed) = @_;
861 953
862 $self->SUPER::size_allocate ($w, $h); 954 $self->SUPER::size_allocate ($w, $h, $changed);
863 955
864 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
865 $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]);
866} 958}
867 959
… …
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921 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);
922 1014
923sub new { 1015sub new {
924 my $class = shift; 1016 my $class = shift;
925
926 # TODO: user_x, user_y, overwrite moveto?
927 1017
928 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1021 border => 0.6,
… …
957 $h + $self->border * 2, 1047 $h + $self->border * 2,
958 ) 1048 )
959} 1049}
960 1050
961sub size_allocate { 1051sub size_allocate {
962 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
963 1055
964 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
966 1058
967 $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)
… …
991 my ($ev, $x, $y) = @_; 1083 my ($ev, $x, $y) = @_;
992 1084
993 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
995 1087
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1092 $self->move ($self->{user_x}, $self->{user_y});
999 $self->check_size; 1093 $self->realloc;
1000 }; 1094 };
1001 1095
1002 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1100 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
1008 1102
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1104
1011 $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});
1012 $self->update; 1109 $self->realloc;
1013 }; 1110 };
1014 } 1111 }
1015} 1112}
1016 1113
1017sub button_up { 1114sub button_up {
… …
1078sub new { 1175sub new {
1079 my $class = shift; 1176 my $class = shift;
1080 1177
1081 $class->SUPER::new ( 1178 $class->SUPER::new (
1082 col_expand => [], 1179 col_expand => [],
1083 @_ 1180 @_,
1084 ) 1181 )
1182}
1183
1184sub children {
1185 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1186}
1086 1187
1087sub add { 1188sub add {
1088 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1089 1190
1090 $child->set_parent ($self); 1191 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1092 1193
1093 $child->check_size; 1194 $self->realloc;
1094} 1195}
1095 1196
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# 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?
1101sub clear { 1198sub clear {
1102 my ($self) = @_; 1199 my ($self) = @_;
1103 1200
1104 my @children = $self->children; 1201 my @children = $self->children;
1105 delete $self->{children}; 1202 delete $self->{children};
… …
1107 for (@children) { 1204 for (@children) {
1108 delete $_->{parent}; 1205 delete $_->{parent};
1109 $_->hide; 1206 $_->hide;
1110 } 1207 }
1111 1208
1112 $self->update; 1209 $self->realloc;
1113} 1210}
1114 1211
1115sub get_wh { 1212sub get_wh {
1116 my ($self) = @_; 1213 my ($self) = @_;
1117 1214
… …
1144 (sum @$hs), 1241 (sum @$hs),
1145 ) 1242 )
1146} 1243}
1147 1244
1148sub size_allocate { 1245sub size_allocate {
1149 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1150 1247
1151 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1152 1249
1153 my $req_w = sum @$ws; 1250 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1251 my $req_h = (sum @$hs) || 1;
1155 1252
1156 # TODO: nicer code && do row_expand 1253 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1254 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1255 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1256 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1310 }
1214} 1311}
1215 1312
1216############################################################################# 1313#############################################################################
1217 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
1218package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1219 1376
1220# TODO: wrap into common Box base class
1221
1222our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1223 1378
1224sub size_request { 1379sub new {
1225 my ($self) = @_; 1380 my $class = shift;
1226 1381
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1228 1383 vertical => 0,
1229 ( 1384 @_,
1230 (List::Util::sum map $_->[0], @alloc),
1231 (List::Util::max map $_->[1], @alloc),
1232 ) 1385 )
1233} 1386}
1234 1387
1235sub size_allocate {
1236 my ($self, $w, $h) = @_;
1237
1238 ($h, $w) = ($w, $h);
1239
1240 my $children = $self->{children};
1241
1242 my @h = map $_->{req_w}, @$children;
1243
1244 my $req_h = List::Util::sum @h;
1245
1246 if ($req_h > $h) {
1247 # ah well, not enough space
1248 $_ *= $h / $req_h for @h;
1249 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children;
1251 $exp ||= 1;
1252
1253 for (0 .. $#$children) {
1254 my $child = $children->[$_];
1255
1256 my $alloc_h = $h[$_];
1257 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258 $h[$_] = $alloc_h;
1259 }
1260 }
1261
1262 CFClient::UI::harmonize \@h;
1263
1264 my $y = 0;
1265 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_];
1268 $child->configure ($y, 0, $h, $w);
1269
1270 $y += $h;
1271 }
1272
1273 1
1274}
1275
1276############################################################################# 1388#############################################################################
1277 1389
1278package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1279 1391
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1283 1393
1284sub size_request { 1394sub new {
1285 my ($self) = @_; 1395 my $class = shift;
1286 1396
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1288 1398 vertical => 1,
1289 ( 1399 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1400 )
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300 my $children = $self->{children};
1301
1302 my @h = map $_->{req_h}, @$children;
1303
1304 my $req_h = List::Util::sum @h;
1305
1306 if ($req_h > $h) {
1307 # ah well, not enough space
1308 $_ *= $h / $req_h for @h;
1309 } else {
1310 my $exp = List::Util::sum map $_->{expand}, @$children;
1311 $exp ||= 1;
1312
1313 for (0 .. $#$children) {
1314 my $child = $children->[$_];
1315
1316 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317 }
1318 }
1319
1320 CFClient::UI::harmonize \@h;
1321
1322 my $y = 0;
1323 for (0 .. $#$children) {
1324 my $child = $children->[$_];
1325 my $h = $h[$_];
1326 $child->configure (0, $y, $w, $h);
1327
1328 $y += $h;
1329 }
1330
1331 1
1332} 1401}
1333 1402
1334############################################################################# 1403#############################################################################
1335 1404
1336package CFClient::UI::Label; 1405package CFClient::UI::Label;
… …
1399 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1400 1469
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1403 1472
1404 $self->update; 1473 $self->realloc;
1405 $self->check_size;
1406} 1474}
1407 1475
1408sub set_markup { 1476sub set_markup {
1409 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1410 1478
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1483
1416 $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;
1417 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1418 1486
1419 $self->update; 1487 $self->realloc;
1420 $self->check_size;
1421} 1488}
1422 1489
1423sub size_request { 1490sub size_request {
1424 my ($self) = @_; 1491 my ($self) = @_;
1425 1492
… …
1446 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1447 ) 1514 )
1448} 1515}
1449 1516
1450sub size_allocate { 1517sub size_allocate {
1451 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1452 1519
1453 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1454} 1522}
1455 1523
1456sub set_fontsize { 1524sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1458 1526
1459 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1528 delete $self->{texture};
1461 1529
1462 $self->update; 1530 $self->realloc;
1463 $self->check_size;
1464} 1531}
1465 1532
1466sub _draw { 1533sub _draw {
1467 my ($self) = @_; 1534 my ($self) = @_;
1468 1535
… …
1548sub set_text { 1615sub set_text {
1549 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1550 1617
1551 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1619 $self->_set_text ($text);
1553 $self->update; 1620
1554 $self->check_size; 1621 $self->realloc;
1555} 1622}
1556 1623
1557sub get_text { 1624sub get_text {
1558 $_[0]{text} 1625 $_[0]{text}
1559} 1626}
… …
1562 my ($self) = @_; 1629 my ($self) = @_;
1563 1630
1564 my ($w, $h) = $self->SUPER::size_request; 1631 my ($w, $h) = $self->SUPER::size_request;
1565 1632
1566 ($w + 1, $h) # add 1 for cursor 1633 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1634}
1574 1635
1575sub key_down { 1636sub key_down {
1576 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1577 1638
… …
1598 } elsif ($uni) { 1659 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1600 } 1661 }
1601 1662
1602 $self->_set_text ($text); 1663 $self->_set_text ($text);
1603 $self->update; 1664
1604 $self->check_size; 1665 $self->realloc;
1605} 1666}
1606 1667
1607sub focus_in { 1668sub focus_in {
1608 my ($self) = @_; 1669 my ($self) = @_;
1609 1670
… …
2116 $self->update; 2177 $self->update;
2117 2178
2118 $self 2179 $self
2119} 2180}
2120 2181
2182sub changed { }
2183
2121sub set_range { 2184sub set_range {
2122 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2123 2186
2124 $self->{range} = $range; 2187 ($range, $self->{range}) = ($self->{range}, $range);
2125 2188
2126 $self->update; 2189 $self->update
2190 if "@$range" ne "@{$self->{range}}";
2127} 2191}
2128 2192
2129sub set_value { 2193sub set_value {
2130 my ($self, $value) = @_; 2194 my ($self, $value) = @_;
2131 2195
… …
2313 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2314 $self->reflow; 2378 $self->reflow;
2315} 2379}
2316 2380
2317sub size_allocate { 2381sub size_allocate {
2318 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2319 2383
2320 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2321 2387
2322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2323 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2324 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2325 2391
… …
2514 2580
2515sub new { 2581sub new {
2516 my $class = shift; 2582 my $class = shift;
2517 2583
2518 my $self = $class->SUPER::new ( 2584 my $self = $class->SUPER::new (
2519 state => 0, 2585 state => 0,
2520 connect_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2521 @_ 2587 @_
2522 ); 2588 );
2523 2589
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2590 $self
2530} 2591}
2531 2592
2532sub toggle_flopper { 2593sub toggle_flopper {
2533 my ($self) = @_; 2594 my ($self) = @_;
2534 2595
2535 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2536 if ($self->{state} = !$self->{state}) {
2537 $CFClient::UI::ROOT->add ($self->{other});
2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2539 $self->_emit ("open");
2540 } else {
2541 $CFClient::UI::ROOT->remove ($self->{other});
2542 $self->_emit ("close");
2543 }
2544
2545 $self->_emit (changed => $self->{state});
2546} 2597}
2547 2598
2548############################################################################# 2599#############################################################################
2549 2600
2550package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2582 2633
2583 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2584} 2635}
2585 2636
2586sub size_allocate { 2637sub size_allocate {
2587 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2588 2639
2640 return unless $changed;
2641
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2590} 2643}
2591 2644
2592sub _draw { 2645sub _draw {
2593 my ($self) = @_; 2646 my ($self) = @_;
2594 2647
… …
2626 2679
2627sub new { 2680sub new {
2628 my $class = shift; 2681 my $class = shift;
2629 2682
2630 my $self = $class->SUPER::new ( 2683 my $self = $class->SUPER::new (
2631 aspect => 1, 2684 aspect => 1,
2685 can_events => 0,
2632 @_, 2686 @_,
2633 ); 2687 );
2634 2688
2635 if ($self->{anim} && $self->{animspeed}) { 2689 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2690 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2749 $self->SUPER::DESTROY;
2696} 2750}
2697 2751
2698############################################################################# 2752#############################################################################
2699 2753
2700package CFClient::UI::InventoryItem; 2754package CFClient::UI::Inventory;
2701 2755
2702our @ISA = CFClient::UI::HBox::; 2756our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub _item_to_desc {
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729 2757
2730sub new { 2758sub new {
2731 my $class = shift; 2759 my $class = shift;
2732 2760
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table), 2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2821 @_, 2763 @_,
2822 ); 2764 );
2823 2765
2824 $self 2766 $self
2825} 2767}
… …
2835 or ($a->{name} cmp $b->{name}) 2777 or ($a->{name} cmp $b->{name})
2836 } @$items; 2778 } @$items;
2837 2779
2838 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2839 2781
2782 my $row = 0;
2840 for my $item (@items) { 2783 for my $item (@items) {
2841 $item->{item} = $item; 2784 CFClient::Item::update_widgets $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845 2785
2846 my $i = 0; 2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2847 for (@items) { 2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2848 $self->{scrolled}->add (0, $i, $_); 2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852 2789
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2790 $row++;
2854} 2791 }
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859} 2792}
2860 2793
2861############################################################################# 2794#############################################################################
2862 2795
2863package CFClient::UI::Menu; 2796package CFClient::UI::Menu;
… …
2995sub add { 2928sub add {
2996 my ($self, $text, %arg) = @_; 2929 my ($self, $text, %arg) = @_;
2997 2930
2998 $text =~ s/^\s+//; 2931 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 2932 $text =~ s/\s+$//;
2933
2934 return unless $text;
3000 2935
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 2936 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 2937
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 2939
… …
3047use CFClient::OpenGL; 2982use CFClient::OpenGL;
3048 2983
3049sub new { 2984sub new {
3050 my $class = shift; 2985 my $class = shift;
3051 2986
3052 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
2988 visible => 1,
3053 @_, 2989 @_,
3054 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
3055} 2995}
3056 2996
3057sub configure { 2997sub configure {
3058 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
3059 2999
3060 $self->{w} = $w; 3000 $self->{w} = $w;
3061 $self->{h} = $h; 3001 $self->{h} = $h;
3062} 3002}
3063 3003
3064sub check_size { 3004sub reconfigure {
3065 my ($self) = @_; 3005 my ($self) = @_;
3066 3006
3007 $self->SUPER::reconfigure;
3008
3067 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3068 if $self->{w}; 3010 if $self->{w};
3069} 3011}
3070 3012
3071sub size_request { 3013sub size_request {
3072 my ($self) = @_; 3014 my ($self) = @_;
3073 3015
3074 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
3075} 3017}
3076 3018
3077sub size_allocate { 3019sub size_allocate {
3078 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
3079 3021
3080 for my $child ($self->children) { 3022 for my $child ($self->children) {
3081 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)};
3082 3024
3083 $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
3084 if exists $child->{req_x}; 3026 if exists $child->{req_x};
3085 3027
3086 $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
3087 if exists $child->{req_y}; 3029 if exists $child->{req_y};
3088 3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3089 $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;
3090 $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;
3091 3035
3092 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
3093 } 3037 }
… …
3106} 3050}
3107 3051
3108sub update { 3052sub update {
3109 my ($self) = @_; 3053 my ($self) = @_;
3110 3054
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
3113} 3056}
3114 3057
3115sub add { 3058sub add {
3116 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
3117
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123 3060
3124 for my $child (@children) { 3061 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3062 $child->{is_toplevel} = 1;
3126 3063
3127 # integerise window positions 3064 # integerise window positions
… …
3162 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
3163 $_->() 3100 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
3165 } 3102 }
3166 3103
3167 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
3168 my @queue = ([], []); 3105 my @queue;
3169 3106
3170 for (;;) { 3107 while () {
3171 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
3172 # heuristic: check containers last 3109 #TODO use array-of-depth approach
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3110
3174 for values %{delete $self->{check_size}} 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3112 @queue, values %{delete $self->{realloc}};
3175 } 3113 }
3176 3114
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3115 my $widget = pop @queue || last;
3178 3116
3117 $widget->{visible} or last; # do not resize invisible widgets
3118
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3180 ? @$widget{qw(user_w user_h)} 3120 ? @$widget{qw(def_w def_h)}
3181 : $widget->size_request; 3121 : $widget->size_request;
3182 3122
3183 if (delete $widget->{force_alloc}
3184 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185 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#
3186 3124
3187 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
3189 3127
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3191 3129
3192 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
3193 if $widget->{parent}; 3131 if $widget->{parent};
3194 }
3195 } 3132 }
3196 } 3133 }
3197 3134
3198 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3200 my ($widget, $w, $h) = @$_; 3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3201 3141
3202 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
3204 3144
3205 $widget->{w} = $w; 3145 $widget->{w} = $w;
3206 $widget->{h} = $h; 3146 $widget->{h} = $h;
3207 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
3208 } 3148 }
3209 } 3149 }
3210 3150
3211 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
3212 $_->() 3152 $_->()

Diff Legend

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