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

Diff Legend

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