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.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
279 CFClient::UI::check_tooltip
280 if $TOOLTIP->{owner} == $self;
281
238 $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;
239} 302}
240 303
241sub hide { 304sub hide {
242 my ($self) = @_; 305 my ($self) = @_;
243 306
… …
258} 321}
259 322
260sub set_size { 323sub set_size {
261 my ($self, $w, $h) = @_; 324 my ($self, $w, $h) = @_;
262 325
263 $self->{user_w} = $w; 326 $self->{def_w} = $w;
264 $self->{user_h} = $h; 327 $self->{def_h} = $h;
265 328
266 $self->check_size; 329 $self->realloc;
267} 330}
268 331
269sub size_request { 332sub size_request {
270 require Carp; 333 require Carp;
271 Carp::confess "size_request is abstract"; 334 Carp::confess "size_request is abstract";
… …
291 $self->{y} = $y; 354 $self->{y} = $y;
292 $self->update; 355 $self->update;
293 } 356 }
294 357
295 if ($self->{w} != $w || $self->{h} != $h) { 358 if ($self->{w} != $w || $self->{h} != $h) {
359 return unless $self->{visible};
360
296 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
297 } 362 }
298} 363}
299 364
300sub size_allocate { 365sub size_allocate {
301 # nothing to be done 366 # nothing to be done
302} 367}
303 368
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
311sub children { 369sub children {
312} 370}
313 371
314sub set_max_size { 372sub set_max_size {
315 my ($self, $w, $h) = @_; 373 my ($self, $w, $h) = @_;
… …
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 376 delete $self->{max_h}; $self->{max_h} = $h if $h;
319} 377}
320 378
321sub set_tooltip { 379sub set_tooltip {
322 my ($self, $tooltip) = @_; 380 my ($self, $tooltip) = @_;
381
382 $tooltip =~ s/^\s+//;
383 $tooltip =~ s/\s+$//;
384
385 return if $self->{tooltip} eq $tooltip;
323 386
324 $self->{tooltip} = $tooltip; 387 $self->{tooltip} = $tooltip;
325 388
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 389 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 390 delete $CFClient::UI::TOOLTIP->{owner};
… …
386sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
387sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
388sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
389sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
390sub 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}
391 517
392sub draw { 518sub draw {
393 my ($self) = @_; 519 my ($self) = @_;
394 520
395 return unless $self->{h} && $self->{w}; 521 return unless $self->{h} && $self->{w};
… …
417 if ($ENV{PCLIENT_DEBUG}) { 543 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix; 544 glPushMatrix;
419 glColor 1, 1, 0, 1; 545 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP; 547 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 548 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 549 glVertex $self->{w} - 1, 0;
424 glVertex $self->{w}, $self->{h}; 550 glVertex $self->{w} - 1, $self->{h} - 1;
425 glVertex 0 , $self->{h}; 551 glVertex 0 , $self->{h} - 1;
426 glEnd; 552 glEnd;
427 glPopMatrix; 553 glPopMatrix;
428 #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;
429 } 555 }
430} 556}
431 557
432sub _draw { 558sub _draw {
433 my ($self) = @_; 559 my ($self) = @_;
434 560
435 warn "no draw defined for $self\n"; 561 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} 562}
494 563
495sub DESTROY { 564sub DESTROY {
496 my ($self) = @_; 565 my ($self) = @_;
497 566
… …
594 $self->{children} = [ 663 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 664 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 665 @{$self->{children}}, @widgets
597 ]; 666 ];
598 667
599 $self->check_size (1); 668 $self->realloc;
600 $self->update;
601} 669}
602 670
603sub children { 671sub children {
604 @{ $_[0]{children} } 672 @{ $_[0]{children} }
605} 673}
… …
610 delete $child->{parent}; 678 delete $child->{parent};
611 $child->hide; 679 $child->hide;
612 680
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 682
615 $self->check_size; 683 $self->realloc;
616 $self->update;
617} 684}
618 685
619sub clear { 686sub clear {
620 my ($self) = @_; 687 my ($self) = @_;
621 688
… …
625 for (@$children) { 692 for (@$children) {
626 delete $_->{parent}; 693 delete $_->{parent};
627 $_->hide; 694 $_->hide;
628 } 695 }
629 696
630 $self->check_size; 697 $self->realloc;
631 $self->update;
632} 698}
633 699
634sub find_widget { 700sub find_widget {
635 my ($self, $x, $y) = @_; 701 my ($self, $x, $y) = @_;
636 702
… …
689sub size_request { 755sub size_request {
690 $_[0]{children}[0]->size_request 756 $_[0]{children}[0]->size_request
691} 757}
692 758
693sub size_allocate { 759sub size_allocate {
694 my ($self, $w, $h) = @_; 760 my ($self, $w, $h, $changed) = @_;
695 761
696 $self->{children}[0]->configure (0, 0, $w, $h); 762 $self->{children}[0]->configure (0, 0, $w, $h);
697} 763}
698 764
699############################################################################# 765#############################################################################
… …
716 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 782 $ROOT->on_post_alloc ($self => sub { $self->render_child });
717 $self->SUPER::update; 783 $self->SUPER::update;
718} 784}
719 785
720sub size_allocate { 786sub size_allocate {
721 my ($self, $w, $h) = @_; 787 my ($self, $w, $h, $changed) = @_;
722 788
723 $self->SUPER::size_allocate ($w, $h); 789 $self->SUPER::size_allocate ($w, $h, $changed);
724 $self->update; 790 $self->update
791 if $changed;
725} 792}
726 793
727sub _render { 794sub _render {
728 $_[0]{children}[0]->draw; 795 $_[0]{children}[0]->draw;
729} 796}
… …
760 827
761package CFClient::UI::ViewPort; 828package CFClient::UI::ViewPort;
762 829
763our @ISA = CFClient::UI::Window::; 830our @ISA = CFClient::UI::Window::;
764 831
832sub new {
833 my $class = shift;
834
835 $class->SUPER::new (
836 scroll_x => 0,
837 scroll_y => 1,
838 @_,
839 )
840}
841
765sub size_request { 842sub size_request {
766 my ($self) = @_; 843 my ($self) = @_;
767 844
768 @$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)};
769 846
770 @$self{qw(child_w child_h)} 847 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y};
849
850 ($w, $h)
771} 851}
772 852
773sub size_allocate { 853sub size_allocate {
774 my ($self, $w, $h) = @_; 854 my ($self, $w, $h, $changed) = @_;
775 855
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
777# $w = $self->{w}; 857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
858
778 $self->child->configure (0, 0, $cw, $ch); 859 $self->child->configure (0, 0, $w, $h);
779 $self->update; 860 $self->update;
780} 861}
781 862
782sub set_offset { 863sub set_offset {
783 my ($self, $x, $y) = @_; 864 my ($self, $x, $y) = @_;
… …
834 my $class = shift; 915 my $class = shift;
835 916
836 my $self; 917 my $self;
837 918
838 my $slider = new CFClient::UI::Slider 919 my $slider = new CFClient::UI::Slider
839 vertical => 1, 920 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 921 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 922 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 923 $self->{vp}->set_offset (0, $_[1]);
843 }, 924 },
844 ; 925 ;
845 926
846 $self = $class->SUPER::new ( 927 $self = $class->SUPER::new (
… …
854 $self->add ($self->{slider}); 935 $self->add ($self->{slider});
855 936
856 $self 937 $self
857} 938}
858 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
859sub size_allocate { 950sub size_allocate {
860 my ($self, $w, $h) = @_; 951 my ($self, $w, $h, $changed) = @_;
861 952
862 $self->SUPER::size_allocate ($w, $h); 953 $self->SUPER::size_allocate ($w, $h, $changed);
863 954
864 my $child = $self->{vp}->child; 955 my $child = $self->{vp}->child;
865 $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]);
866} 957}
867 958
… …
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1011 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); 1012 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1013
923sub new { 1014sub new {
924 my $class = shift; 1015 my $class = shift;
925
926 # TODO: user_x, user_y, overwrite moveto?
927 1016
928 my $self = $class->SUPER::new ( 1017 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1018 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1019 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1020 border => 0.6,
… …
957 $h + $self->border * 2, 1046 $h + $self->border * 2,
958 ) 1047 )
959} 1048}
960 1049
961sub size_allocate { 1050sub size_allocate {
962 my ($self, $w, $h) = @_; 1051 my ($self, $w, $h, $changed) = @_;
1052
1053 return unless $changed;
963 1054
964 $h -= List::Util::max 0, $self->border * 2; 1055 $h -= List::Util::max 0, $self->border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1056 $w -= List::Util::max 0, $self->border * 2;
966 1057
967 $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)
… …
991 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
992 1083
993 my $dx = $ev->{x} - $ox; 1084 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1085 my $dy = $ev->{y} - $oy;
995 1086
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1091 $self->move ($self->{user_x}, $self->{user_y});
999 $self->check_size; 1092 $self->realloc;
1000 }; 1093 };
1001 1094
1002 } elsif ($lr ^ $td) { 1095 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1096 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1097 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1099 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1008 1101
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1103
1011 $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});
1012 $self->update; 1108 $self->realloc;
1013 }; 1109 };
1014 } 1110 }
1015} 1111}
1016 1112
1017sub button_up { 1113sub button_up {
… …
1078sub new { 1174sub new {
1079 my $class = shift; 1175 my $class = shift;
1080 1176
1081 $class->SUPER::new ( 1177 $class->SUPER::new (
1082 col_expand => [], 1178 col_expand => [],
1083 @_ 1179 @_,
1084 ) 1180 )
1181}
1182
1183sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1185}
1086 1186
1087sub add { 1187sub add {
1088 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1089 1189
1090 $child->set_parent ($self); 1190 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1092 1192
1093 $child->check_size; 1193 $self->realloc;
1094} 1194}
1095 1195
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# 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?
1101sub clear { 1197sub clear {
1102 my ($self) = @_; 1198 my ($self) = @_;
1103 1199
1104 my @children = $self->children; 1200 my @children = $self->children;
1105 delete $self->{children}; 1201 delete $self->{children};
… …
1107 for (@children) { 1203 for (@children) {
1108 delete $_->{parent}; 1204 delete $_->{parent};
1109 $_->hide; 1205 $_->hide;
1110 } 1206 }
1111 1207
1112 $self->update; 1208 $self->realloc;
1113} 1209}
1114 1210
1115sub get_wh { 1211sub get_wh {
1116 my ($self) = @_; 1212 my ($self) = @_;
1117 1213
… …
1144 (sum @$hs), 1240 (sum @$hs),
1145 ) 1241 )
1146} 1242}
1147 1243
1148sub size_allocate { 1244sub size_allocate {
1149 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1150 1246
1151 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1152 1248
1153 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1155 1251
1156 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1309 }
1214} 1310}
1215 1311
1216############################################################################# 1312#############################################################################
1217 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
1218package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1219 1375
1220# TODO: wrap into common Box base class
1221
1222our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1223 1377
1224sub size_request { 1378sub new {
1225 my ($self) = @_; 1379 my $class = shift;
1226 1380
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1228 1382 vertical => 0,
1229 ( 1383 @_,
1230 (List::Util::sum map $_->[0], @alloc),
1231 (List::Util::max map $_->[1], @alloc),
1232 ) 1384 )
1233} 1385}
1234 1386
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############################################################################# 1387#############################################################################
1277 1388
1278package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1279 1390
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1283 1392
1284sub size_request { 1393sub new {
1285 my ($self) = @_; 1394 my $class = shift;
1286 1395
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1288 1397 vertical => 1,
1289 ( 1398 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1399 )
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} 1400}
1333 1401
1334############################################################################# 1402#############################################################################
1335 1403
1336package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
1399 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1400 1468
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1403 1471
1472 $self->realloc;
1404 $self->update; 1473 $self->update;
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
1487 $self->realloc;
1419 $self->update; 1488 $self->update;
1420 $self->check_size;
1421} 1489}
1422 1490
1423sub size_request { 1491sub size_request {
1424 my ($self) = @_; 1492 my ($self) = @_;
1425 1493
… …
1446 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1447 ) 1515 )
1448} 1516}
1449 1517
1450sub size_allocate { 1518sub size_allocate {
1451 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1452 1520
1453 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1454} 1523}
1455 1524
1456sub set_fontsize { 1525sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1458 1527
1459 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1529 delete $self->{texture};
1461 1530
1462 $self->update; 1531 $self->realloc;
1463 $self->check_size;
1464} 1532}
1465 1533
1466sub _draw { 1534sub _draw {
1467 my ($self) = @_; 1535 my ($self) = @_;
1468 1536
… …
1548sub set_text { 1616sub set_text {
1549 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1550 1618
1551 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1620 $self->_set_text ($text);
1553 $self->update; 1621
1554 $self->check_size; 1622 $self->realloc;
1555} 1623}
1556 1624
1557sub get_text { 1625sub get_text {
1558 $_[0]{text} 1626 $_[0]{text}
1559} 1627}
… …
1562 my ($self) = @_; 1630 my ($self) = @_;
1563 1631
1564 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1565 1633
1566 ($w + 1, $h) # add 1 for cursor 1634 ($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} 1635}
1574 1636
1575sub key_down { 1637sub key_down {
1576 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1577 1639
… …
1598 } elsif ($uni) { 1660 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1600 } 1662 }
1601 1663
1602 $self->_set_text ($text); 1664 $self->_set_text ($text);
1603 $self->update; 1665
1604 $self->check_size; 1666 $self->realloc;
1605} 1667}
1606 1668
1607sub focus_in { 1669sub focus_in {
1608 my ($self) = @_; 1670 my ($self) = @_;
1609 1671
… …
2116 $self->update; 2178 $self->update;
2117 2179
2118 $self 2180 $self
2119} 2181}
2120 2182
2183sub changed { }
2184
2121sub set_range { 2185sub set_range {
2122 my ($self, $range) = @_; 2186 my ($self, $range) = @_;
2123 2187
2124 $self->{range} = $range; 2188 ($range, $self->{range}) = ($self->{range}, $range);
2125 2189
2126 $self->update; 2190 $self->update
2191 if "@$range" ne "@{$self->{range}}";
2127} 2192}
2128 2193
2129sub set_value { 2194sub set_value {
2130 my ($self, $value) = @_; 2195 my ($self, $value) = @_;
2131 2196
… …
2313 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2314 $self->reflow; 2379 $self->reflow;
2315} 2380}
2316 2381
2317sub size_allocate { 2382sub size_allocate {
2318 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2319 2384
2320 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2321 2388
2322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2323 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2324 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2325 2392
… …
2514 2581
2515sub new { 2582sub new {
2516 my $class = shift; 2583 my $class = shift;
2517 2584
2518 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2519 state => 0, 2586 state => 0,
2520 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2521 @_ 2588 @_
2522 ); 2589 );
2523 2590
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2591 $self
2530} 2592}
2531 2593
2532sub toggle_flopper { 2594sub toggle_flopper {
2533 my ($self) = @_; 2595 my ($self) = @_;
2534 2596
2535 # TODO: use animation 2597 $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} 2598}
2547 2599
2548############################################################################# 2600#############################################################################
2549 2601
2550package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2582 2634
2583 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2584} 2636}
2585 2637
2586sub size_allocate { 2638sub size_allocate {
2587 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2588 2640
2641 return unless $changed;
2642
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2590} 2644}
2591 2645
2592sub _draw { 2646sub _draw {
2593 my ($self) = @_; 2647 my ($self) = @_;
2594 2648
… …
2611 glVertex $w, $h; 2665 glVertex $w, $h;
2612 glVertex $w, 0; 2666 glVertex $w, 0;
2613 glEnd; 2667 glEnd;
2614 2668
2615 glTranslate 2 - 0.375, 2 - 0.375; 2669 glTranslate 2 - 0.375, 2 - 0.375;
2670
2616 $self->SUPER::_draw; 2671 $self->SUPER::_draw;
2617} 2672}
2618 2673
2619############################################################################# 2674#############################################################################
2620 2675
… …
2626 2681
2627sub new { 2682sub new {
2628 my $class = shift; 2683 my $class = shift;
2629 2684
2630 my $self = $class->SUPER::new ( 2685 my $self = $class->SUPER::new (
2631 aspect => 1, 2686 aspect => 1,
2687 can_events => 0,
2632 @_, 2688 @_,
2633 ); 2689 );
2634 2690
2635 if ($self->{anim} && $self->{animspeed}) { 2691 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2692 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2751 $self->SUPER::DESTROY;
2696} 2752}
2697 2753
2698############################################################################# 2754#############################################################################
2699 2755
2700package CFClient::UI::InventoryItem; 2756package CFClient::UI::Inventory;
2701 2757
2702our @ISA = CFClient::UI::HBox::; 2758our @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 2759
2730sub new { 2760sub new {
2731 my $class = shift; 2761 my $class = shift;
2732 2762
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 ( 2763 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), 2764 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2821 @_, 2765 @_,
2822 ); 2766 );
2823 2767
2824 $self 2768 $self
2825} 2769}
… …
2835 or ($a->{name} cmp $b->{name}) 2779 or ($a->{name} cmp $b->{name})
2836 } @$items; 2780 } @$items;
2837 2781
2838 $self->{real_items} = \@items; 2782 $self->{real_items} = \@items;
2839 2783
2784 my $row = 0;
2840 for my $item (@items) { 2785 for my $item (@items) {
2841 $item->{item} = $item; 2786 CFClient::Item::update_widgets $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845 2787
2846 my $i = 0; 2788 $self->{scrolled}->add (0, $row, $item->{face_widget});
2847 for (@items) { 2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2848 $self->{scrolled}->add (0, $i, $_); 2790 $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 2791
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2792 $row++;
2854} 2793 }
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859} 2794}
2860 2795
2861############################################################################# 2796#############################################################################
2862 2797
2863package CFClient::UI::Menu; 2798package CFClient::UI::Menu;
… …
2995sub add { 2930sub add {
2996 my ($self, $text, %arg) = @_; 2931 my ($self, $text, %arg) = @_;
2997 2932
2998 $text =~ s/^\s+//; 2933 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 2934 $text =~ s/\s+$//;
2935
2936 return unless $text;
3000 2937
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 2938 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 2939
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2940 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 2941
… …
3047use CFClient::OpenGL; 2984use CFClient::OpenGL;
3048 2985
3049sub new { 2986sub new {
3050 my $class = shift; 2987 my $class = shift;
3051 2988
3052 $class->SUPER::new ( 2989 my $self = $class->SUPER::new (
2990 visible => 1,
3053 @_, 2991 @_,
3054 ) 2992 );
2993
2994 Scalar::Util::weaken ($self->{root} = $self);
2995
2996 $self
3055} 2997}
3056 2998
3057sub configure { 2999sub configure {
3058 my ($self, $x, $y, $w, $h) = @_; 3000 my ($self, $x, $y, $w, $h) = @_;
3059 3001
3060 $self->{w} = $w; 3002 $self->{w} = $w;
3061 $self->{h} = $h; 3003 $self->{h} = $h;
3062} 3004}
3063 3005
3064sub check_size { 3006sub reconfigure {
3065 my ($self) = @_; 3007 my ($self) = @_;
3066 3008
3009 $self->SUPER::reconfigure;
3010
3067 $self->size_allocate ($self->{w}, $self->{h}) 3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
3068 if $self->{w}; 3012 if $self->{w};
3069} 3013}
3070 3014
3071sub size_request { 3015sub size_request {
3072 my ($self) = @_; 3016 my ($self) = @_;
3073 3017
3074 ($self->{w}, $self->{h}) 3018 ($self->{w}, $self->{h})
3075} 3019}
3076 3020
3077sub size_allocate { 3021sub size_allocate {
3078 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h, $changed) = @_;
3079 3023
3080 for my $child ($self->children) { 3024 for my $child ($self->children) {
3081 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)};
3082 3026
3083 $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
3084 if exists $child->{req_x}; 3028 if exists $child->{req_x};
3085 3029
3086 $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
3087 if exists $child->{req_y}; 3031 if exists $child->{req_y};
3088 3032
3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3089 $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;
3090 $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;
3091 3037
3092 $child->configure ($X, $Y, $W, $H); 3038 $child->configure ($X, $Y, $W, $H);
3093 } 3039 }
… …
3106} 3052}
3107 3053
3108sub update { 3054sub update {
3109 my ($self) = @_; 3055 my ($self) = @_;
3110 3056
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3057 $::WANT_REFRESH++;
3113} 3058}
3114 3059
3115sub add { 3060sub add {
3116 my ($self, @children) = @_; 3061 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 3062
3124 for my $child (@children) { 3063 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3064 $child->{is_toplevel} = 1;
3126 3065
3127 # integerise window positions 3066 # integerise window positions
… …
3162 while ($self->{refresh_hook}) { 3101 while ($self->{refresh_hook}) {
3163 $_->() 3102 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3103 for values %{delete $self->{refresh_hook}};
3165 } 3104 }
3166 3105
3167 if ($self->{check_size}) { 3106 if ($self->{realloc}) {
3168 my @queue = ([], []); 3107 my @queue;
3169 3108
3170 for (;;) { 3109 while () {
3171 if ($self->{check_size}) { 3110 if ($self->{realloc}) {
3172 # heuristic: check containers last 3111 #TODO use array-of-depth approach
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3112
3174 for values %{delete $self->{check_size}} 3113 @queue = sort { $a->{visible} <=> $b->{visible} }
3114 @queue, values %{delete $self->{realloc}};
3175 } 3115 }
3176 3116
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3117 my $widget = pop @queue || last;
3178 3118
3119 $widget->{visible} or last; # do not resize invisible widgets
3120
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3180 ? @$widget{qw(user_w user_h)} 3122 ? @$widget{qw(def_w def_h)}
3181 : $widget->size_request; 3123 : $widget->size_request;
3182 3124
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# 3125 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186 3126
3187 $widget->{req_w} = $w; 3127 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3128 $widget->{req_h} = $h;
3189 3129
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3191 3131
3192 $widget->{parent}->check_size 3132 push @queue, $widget->{parent}
3193 if $widget->{parent}; 3133 if $widget->{parent};
3194 }
3195 } 3134 }
3196 } 3135 }
3197 3136
3198 while ($self->{size_alloc}) { 3137 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3200 my ($widget, $w, $h) = @$_; 3139 values %$size_alloc;
3140
3141 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last };
3201 3143
3202 $w = 0 if $w < 0; 3144 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3145 $h = 0 if $h < 0;
3204 3146
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3148
3205 $widget->{w} = $w; 3149 $widget->{w} = $w;
3206 $widget->{h} = $h; 3150 $widget->{h} = $h;
3151
3207 $widget->emit (size_allocate => $w, $h); 3152 $widget->emit (size_allocate => $w, $h, $changed);
3208 } 3153 }
3209 } 3154 }
3210 3155
3211 while ($self->{post_alloc_hook}) { 3156 while ($self->{post_alloc_hook}) {
3212 $_->() 3157 $_->()

Diff Legend

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