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.253 by root, Sun May 28 23:28:12 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}) {
23 43
24 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide;
46
25 $TOOLTIP->{owner} = $widget; 47 $TOOLTIP->{owner} = $widget;
26 48
27 my $tip = $widget->{tooltip}; 49 my $tip = $widget->{tooltip};
28 50
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 51 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 52
31 $TOOLTIP->set_tooltip_from ($widget); 53 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 54 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 55 }
43 56
44 return; 57 return;
45 } 58 }
46 } 59 }
… …
155 for my $widget (values %WIDGET) { 168 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 169 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 170 $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}; 171 $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}; 172 $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}; 173 $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}; 174 $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}; 175 $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 } 176 }
166 } 177 }
167 178
168 reconfigure_widgets; 179 reconfigure_widgets;
169} 180}
… …
186 can_events => 1, 197 can_events => 1,
187 @_ 198 @_
188 }, $class; 199 }, $class;
189 200
190 for (keys %$self) { 201 for (keys %$self) {
191 if (/^connect_(.*)$/) { 202 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 203 $self->connect ($1 => delete $self->{$_});
193 } 204 }
194 } 205 }
195 206
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH;
211 $self->{req_y} = $layout->{y} * $::HEIGHT;
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
214 }
215
198 $self 216 $self
199} 217}
200 218
201sub destroy { 219sub destroy {
202 my ($self) = @_; 220 my ($self) = @_;
… …
205 %$self = (); 223 %$self = ();
206} 224}
207 225
208sub show { 226sub show {
209 my ($self) = @_; 227 my ($self) = @_;
228
210 return if $self->{parent}; 229 return if $self->{parent};
211 230
212 $CFClient::UI::ROOT->add ($self); 231 $CFClient::UI::ROOT->add ($self);
213} 232}
214 233
215sub show_centered { 234sub center {
216 my ($self) = @_; 235 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 236
221 $CFClient::UI::ROOT->on_post_alloc ( 237 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 238 "center_$self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
224 }, 240 },
225 ); 241 );
242
243 $self->update;
244}
245
246sub set_visible {
247 my ($self) = @_;
248
249 return if $self->{visible};
250
251 $self->{root} = $self->{parent}{root};
252 $self->{visible} = $self->{parent}{visible} + 1;
253
254 $self->emit (visibility_change => 1);
255
256 $self->realloc if !exists $self->{req_w};
257
258 $_->set_visible for $self->children;
226} 259}
227 260
228sub set_invisible { 261sub set_invisible {
229 my ($self) = @_; 262 my ($self) = @_;
230 263
231 # broken show/hide model 264 return unless $self->{visible};
232 265
266 $_->set_invisible for $self->children;
267
268 delete $self->{root};
233 delete $self->{visible}; 269 delete $self->{visible};
234 270
235 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 272 undef $HOVER if $HOVER == $self;
237 273
274 CFClient::UI::check_tooltip
275 if $TOOLTIP->{owner} == $self;
276
238 $self->focus_out; 277 $self->focus_out;
278
279 $self->emit (visibility_change => 0);
280}
281
282sub set_visibility {
283 my ($self, $visible) = @_;
284
285 return if $self->{visible} == $visible;
286
287 $visible ? $self->hide
288 : $self->show;
289}
290
291sub toggle_visibility {
292 my ($self) = @_;
293
294 $self->{visible}
295 ? $self->hide
296 : $self->show;
239} 297}
240 298
241sub hide { 299sub hide {
242 my ($self) = @_; 300 my ($self) = @_;
243 301
… …
258} 316}
259 317
260sub set_size { 318sub set_size {
261 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
262 320
263 $self->{user_w} = $w; 321 $self->{def_w} = $w;
264 $self->{user_h} = $h; 322 $self->{def_h} = $h;
265 323
266 $self->check_size; 324 $self->realloc;
267} 325}
268 326
269sub size_request { 327sub size_request {
270 require Carp; 328 require Carp;
271 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
291 $self->{y} = $y; 349 $self->{y} = $y;
292 $self->update; 350 $self->update;
293 } 351 }
294 352
295 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
296 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
297 } 357 }
298} 358}
299 359
300sub size_allocate { 360sub size_allocate {
301 # nothing to be done 361 # nothing to be done
302} 362}
303 363
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
311sub children { 364sub children {
312} 365}
313 366
314sub set_max_size { 367sub set_max_size {
315 my ($self, $w, $h) = @_; 368 my ($self, $w, $h) = @_;
… …
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 371 delete $self->{max_h}; $self->{max_h} = $h if $h;
319} 372}
320 373
321sub set_tooltip { 374sub set_tooltip {
322 my ($self, $tooltip) = @_; 375 my ($self, $tooltip) = @_;
376
377 $tooltip =~ s/^\s+//;
378 $tooltip =~ s/\s+$//;
379
380 return if $self->{tooltip} eq $tooltip;
323 381
324 $self->{tooltip} = $tooltip; 382 $self->{tooltip} = $tooltip;
325 383
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 384 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 385 delete $CFClient::UI::TOOLTIP->{owner};
… …
386sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
387sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
388sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
389sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
390sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449
450sub find_widget {
451 my ($self, $x, $y) = @_;
452
453 return () unless $self->{can_events};
454
455 return $self
456 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
457 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
458
459 ()
460}
461
462sub set_parent {
463 my ($self, $parent) = @_;
464
465 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible};
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub _emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub emit {
483 my ($self, $signal, @args) = @_;
484
485 $self->_emit ($signal, @args)
486 || $self->$signal (@args);
487}
488
489sub visibility_change {
490 #my ($self, $visible) = @_;
491}
492
493sub realloc {
494 my ($self) = @_;
495
496 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self};
498
499 $self->{root}{realloc}{$self} = $self;
500 $self->{root}->update;
501 } else {
502 delete $self->{req_w};
503 }
504}
505
506sub update {
507 my ($self) = @_;
508
509 $self->{parent}->update
510 if $self->{parent};
511}
391 512
392sub draw { 513sub draw {
393 my ($self) = @_; 514 my ($self) = @_;
394 515
395 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
417 if ($ENV{PCLIENT_DEBUG}) { 538 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix; 539 glPushMatrix;
419 glColor 1, 1, 0, 1; 540 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP; 542 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 543 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 544 glVertex $self->{w} - 1, 0;
424 glVertex $self->{w}, $self->{h}; 545 glVertex $self->{w} - 1, $self->{h} - 1;
425 glVertex 0 , $self->{h}; 546 glVertex 0 , $self->{h} - 1;
426 glEnd; 547 glEnd;
427 glPopMatrix; 548 glPopMatrix;
428 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429 } 550 }
430} 551}
431 552
432sub _draw { 553sub _draw {
433 my ($self) = @_; 554 my ($self) = @_;
434 555
435 warn "no draw defined for $self\n"; 556 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} 557}
494 558
495sub DESTROY { 559sub DESTROY {
496 my ($self) = @_; 560 my ($self) = @_;
497 561
… …
594 $self->{children} = [ 658 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
597 ]; 661 ];
598 662
599 $self->check_size (1); 663 $self->realloc;
600 $self->update;
601} 664}
602 665
603sub children { 666sub children {
604 @{ $_[0]{children} } 667 @{ $_[0]{children} }
605} 668}
… …
610 delete $child->{parent}; 673 delete $child->{parent};
611 $child->hide; 674 $child->hide;
612 675
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 677
615 $self->check_size; 678 $self->realloc;
616 $self->update;
617} 679}
618 680
619sub clear { 681sub clear {
620 my ($self) = @_; 682 my ($self) = @_;
621 683
… …
625 for (@$children) { 687 for (@$children) {
626 delete $_->{parent}; 688 delete $_->{parent};
627 $_->hide; 689 $_->hide;
628 } 690 }
629 691
630 $self->check_size; 692 $self->realloc;
631 $self->update;
632} 693}
633 694
634sub find_widget { 695sub find_widget {
635 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
636 697
… …
689sub size_request { 750sub size_request {
690 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
691} 752}
692 753
693sub size_allocate { 754sub size_allocate {
694 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
695 756
696 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
697} 758}
698 759
699############################################################################# 760#############################################################################
… …
716 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
717 $self->SUPER::update; 778 $self->SUPER::update;
718} 779}
719 780
720sub size_allocate { 781sub size_allocate {
721 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
722 783
723 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
724 $self->update; 785 $self->update
786 if $changed;
725} 787}
726 788
727sub _render { 789sub _render {
728 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
729} 791}
… …
760 822
761package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
762 824
763our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
764 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
765sub size_request { 837sub size_request {
766 my ($self) = @_; 838 my ($self) = @_;
767 839
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
769 841
770 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
771} 846}
772 847
773sub size_allocate { 848sub size_allocate {
774 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
775 850
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
777# $w = $self->{w}; 852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
853
778 $self->child->configure (0, 0, $cw, $ch); 854 $self->child->configure (0, 0, $w, $h);
779 $self->update; 855 $self->update;
780} 856}
781 857
782sub set_offset { 858sub set_offset {
783 my ($self, $x, $y) = @_; 859 my ($self, $x, $y) = @_;
… …
834 my $class = shift; 910 my $class = shift;
835 911
836 my $self; 912 my $self;
837 913
838 my $slider = new CFClient::UI::Slider 914 my $slider = new CFClient::UI::Slider
839 vertical => 1, 915 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 916 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 917 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 918 $self->{vp}->set_offset (0, $_[1]);
843 }, 919 },
844 ; 920 ;
845 921
846 $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
… …
854 $self->add ($self->{slider}); 930 $self->add ($self->{slider});
855 931
856 $self 932 $self
857} 933}
858 934
935sub update {
936 my ($self) = @_;
937
938 $self->SUPER::update;
939
940 # todo: overwrite size_allocate of child
941 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943}
944
859sub size_allocate { 945sub size_allocate {
860 my ($self, $w, $h) = @_; 946 my ($self, $w, $h, $changed) = @_;
861 947
862 $self->SUPER::size_allocate ($w, $h); 948 $self->SUPER::size_allocate ($w, $h, $changed);
863 949
864 my $child = $self->{vp}->child; 950 my $child = $self->{vp}->child;
865 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
866} 952}
867 953
… …
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1006 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); 1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1008
923sub new { 1009sub new {
924 my $class = shift; 1010 my $class = shift;
925
926 # TODO: user_x, user_y, overwrite moveto?
927 1011
928 my $self = $class->SUPER::new ( 1012 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1013 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1014 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1015 border => 0.6,
… …
957 $h + $self->border * 2, 1041 $h + $self->border * 2,
958 ) 1042 )
959} 1043}
960 1044
961sub size_allocate { 1045sub size_allocate {
962 my ($self, $w, $h) = @_; 1046 my ($self, $w, $h, $changed) = @_;
1047
1048 return unless $changed;
963 1049
964 $h -= List::Util::max 0, $self->border * 2; 1050 $h -= List::Util::max 0, $self->border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1051 $w -= List::Util::max 0, $self->border * 2;
966 1052
967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
991 my ($ev, $x, $y) = @_; 1077 my ($ev, $x, $y) = @_;
992 1078
993 my $dx = $ev->{x} - $ox; 1079 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1080 my $dy = $ev->{y} - $oy;
995 1081
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1086 $self->move ($self->{user_x}, $self->{user_y});
999 $self->check_size; 1087 $self->realloc;
1000 }; 1088 };
1001 1089
1002 } elsif ($lr ^ $td) { 1090 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1091 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1092 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1094 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1095 my ($ev, $x, $y) = @_;
1008 1096
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1097 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1098
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1099 $self->{user_x} = $bx + $x - $ox;
1100 $self->{user_y} = $by + $y - $oy;
1101
1102 $self->move ($self->{user_x}, $self->{user_y});
1012 $self->update; 1103 $self->realloc;
1013 }; 1104 };
1014 } 1105 }
1015} 1106}
1016 1107
1017sub button_up { 1108sub button_up {
… …
1078sub new { 1169sub new {
1079 my $class = shift; 1170 my $class = shift;
1080 1171
1081 $class->SUPER::new ( 1172 $class->SUPER::new (
1082 col_expand => [], 1173 col_expand => [],
1083 @_ 1174 @_,
1084 ) 1175 )
1176}
1177
1178sub children {
1179 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1180}
1086 1181
1087sub add { 1182sub add {
1088 my ($self, $x, $y, $child) = @_; 1183 my ($self, $x, $y, $child) = @_;
1089 1184
1090 $child->set_parent ($self); 1185 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1186 $self->{children}[$y][$x] = $child;
1092 1187
1093 $child->check_size; 1188 $self->realloc;
1094} 1189}
1095 1190
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1191# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1192sub clear {
1102 my ($self) = @_; 1193 my ($self) = @_;
1103 1194
1104 my @children = $self->children; 1195 my @children = $self->children;
1105 delete $self->{children}; 1196 delete $self->{children};
… …
1107 for (@children) { 1198 for (@children) {
1108 delete $_->{parent}; 1199 delete $_->{parent};
1109 $_->hide; 1200 $_->hide;
1110 } 1201 }
1111 1202
1112 $self->update; 1203 $self->realloc;
1113} 1204}
1114 1205
1115sub get_wh { 1206sub get_wh {
1116 my ($self) = @_; 1207 my ($self) = @_;
1117 1208
… …
1144 (sum @$hs), 1235 (sum @$hs),
1145 ) 1236 )
1146} 1237}
1147 1238
1148sub size_allocate { 1239sub size_allocate {
1149 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h, $changed) = @_;
1150 1241
1151 my ($ws, $hs) = $self->get_wh; 1242 my ($ws, $hs) = $self->get_wh;
1152 1243
1153 my $req_w = sum @$ws; 1244 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1245 my $req_h = (sum @$hs) || 1;
1155 1246
1156 # TODO: nicer code && do row_expand 1247 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1248 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1249 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1250 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1304 }
1214} 1305}
1215 1306
1216############################################################################# 1307#############################################################################
1217 1308
1309package CFClient::UI::Box;
1310
1311our @ISA = CFClient::UI::Container::;
1312
1313sub size_request {
1314 my ($self) = @_;
1315
1316 $self->{vertical}
1317 ? (
1318 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1320 )
1321 : (
1322 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 )
1325}
1326
1327sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_;
1329
1330 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children};
1332
1333 my @req;
1334
1335 if ($self->{homogeneous}) {
1336 @req = ($space / (@$children || 1)) x @$children;
1337 } else {
1338 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1339 my $req = List::Util::sum @req;
1340
1341 if ($req > $space) {
1342 # ah well, not enough space
1343 $_ *= $space / $req for @req;
1344 } else {
1345 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1346
1347 $space = ($space - $req) / $expand; # remaining space to give away
1348
1349 $req[$_] += $space * $children->[$_]{expand}
1350 for 0 .. $#$children;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@req;
1355
1356 my $pos = 0;
1357 for (0 .. $#$children) {
1358 my $alloc = $req[$_];
1359 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1360
1361 $pos += $alloc;
1362 }
1363
1364 1
1365}
1366
1367#############################################################################
1368
1218package CFClient::UI::HBox; 1369package CFClient::UI::HBox;
1219 1370
1220# TODO: wrap into common Box base class
1221
1222our @ISA = CFClient::UI::Container::; 1371our @ISA = CFClient::UI::Box::;
1223 1372
1224sub size_request { 1373sub new {
1225 my ($self) = @_; 1374 my $class = shift;
1226 1375
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1376 $class->SUPER::new (
1228 1377 vertical => 0,
1229 ( 1378 @_,
1230 (List::Util::sum map $_->[0], @alloc),
1231 (List::Util::max map $_->[1], @alloc),
1232 ) 1379 )
1233} 1380}
1234 1381
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############################################################################# 1382#############################################################################
1277 1383
1278package CFClient::UI::VBox; 1384package CFClient::UI::VBox;
1279 1385
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1386our @ISA = CFClient::UI::Box::;
1283 1387
1284sub size_request { 1388sub new {
1285 my ($self) = @_; 1389 my $class = shift;
1286 1390
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1391 $class->SUPER::new (
1288 1392 vertical => 1,
1289 ( 1393 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1394 )
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} 1395}
1333 1396
1334############################################################################# 1397#############################################################################
1335 1398
1336package CFClient::UI::Label; 1399package CFClient::UI::Label;
… …
1399 $self->{text} = "T$text"; 1462 $self->{text} = "T$text";
1400 1463
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1465 $self->{layout}->set_text ($text);
1403 1466
1467 $self->realloc;
1404 $self->update; 1468 $self->update;
1405 $self->check_size;
1406} 1469}
1407 1470
1408sub set_markup { 1471sub set_markup {
1409 my ($self, $markup) = @_; 1472 my ($self, $markup) = @_;
1410 1473
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1477 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1478
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417 $self->{layout}->set_markup ($markup); 1480 $self->{layout}->set_markup ($markup);
1418 1481
1482 $self->realloc;
1419 $self->update; 1483 $self->update;
1420 $self->check_size;
1421} 1484}
1422 1485
1423sub size_request { 1486sub size_request {
1424 my ($self) = @_; 1487 my ($self) = @_;
1425 1488
… …
1446 $h + $self->{padding} * 2, 1509 $h + $self->{padding} * 2,
1447 ) 1510 )
1448} 1511}
1449 1512
1450sub size_allocate { 1513sub size_allocate {
1451 my ($self, $w, $h) = @_; 1514 my ($self, $w, $h, $changed) = @_;
1452 1515
1453 delete $self->{texture}; 1516 delete $self->{texture}
1517 if $changed;
1454} 1518}
1455 1519
1456sub set_fontsize { 1520sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1521 my ($self, $fontsize) = @_;
1458 1522
1459 $self->{fontsize} = $fontsize; 1523 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1524 delete $self->{texture};
1461 1525
1462 $self->update; 1526 $self->realloc;
1463 $self->check_size;
1464} 1527}
1465 1528
1466sub _draw { 1529sub _draw {
1467 my ($self) = @_; 1530 my ($self) = @_;
1468 1531
… …
1548sub set_text { 1611sub set_text {
1549 my ($self, $text) = @_; 1612 my ($self, $text) = @_;
1550 1613
1551 $self->{cursor} = length $text; 1614 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1615 $self->_set_text ($text);
1553 $self->update; 1616
1554 $self->check_size; 1617 $self->realloc;
1555} 1618}
1556 1619
1557sub get_text { 1620sub get_text {
1558 $_[0]{text} 1621 $_[0]{text}
1559} 1622}
… …
1562 my ($self) = @_; 1625 my ($self) = @_;
1563 1626
1564 my ($w, $h) = $self->SUPER::size_request; 1627 my ($w, $h) = $self->SUPER::size_request;
1565 1628
1566 ($w + 1, $h) # add 1 for cursor 1629 ($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} 1630}
1574 1631
1575sub key_down { 1632sub key_down {
1576 my ($self, $ev) = @_; 1633 my ($self, $ev) = @_;
1577 1634
… …
1598 } elsif ($uni) { 1655 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1656 substr $text, $self->{cursor}++, 0, chr $uni;
1600 } 1657 }
1601 1658
1602 $self->_set_text ($text); 1659 $self->_set_text ($text);
1603 $self->update; 1660
1604 $self->check_size; 1661 $self->realloc;
1605} 1662}
1606 1663
1607sub focus_in { 1664sub focus_in {
1608 my ($self) = @_; 1665 my ($self) = @_;
1609 1666
… …
2116 $self->update; 2173 $self->update;
2117 2174
2118 $self 2175 $self
2119} 2176}
2120 2177
2178sub changed { }
2179
2121sub set_range { 2180sub set_range {
2122 my ($self, $range) = @_; 2181 my ($self, $range) = @_;
2123 2182
2124 $self->{range} = $range; 2183 ($range, $self->{range}) = ($self->{range}, $range);
2125 2184
2126 $self->update; 2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2127} 2187}
2128 2188
2129sub set_value { 2189sub set_value {
2130 my ($self, $value) = @_; 2190 my ($self, $value) = @_;
2131 2191
… …
2313 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2314 $self->reflow; 2374 $self->reflow;
2315} 2375}
2316 2376
2317sub size_allocate { 2377sub size_allocate {
2318 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h, $changed) = @_;
2319 2379
2320 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2321 2383
2322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2384 $self->{layout}->set_font ($self->{font}) if $self->{font};
2323 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2324 $self->{layout}->set_width ($self->{children}[0]{w}); 2386 $self->{layout}->set_width ($self->{children}[0]{w});
2325 2387
… …
2514 2576
2515sub new { 2577sub new {
2516 my $class = shift; 2578 my $class = shift;
2517 2579
2518 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2519 state => 0, 2581 state => 0,
2520 connect_activate => \&toggle_flopper, 2582 on_activate => \&toggle_flopper,
2521 @_ 2583 @_
2522 ); 2584 );
2523 2585
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2586 $self
2530} 2587}
2531 2588
2532sub toggle_flopper { 2589sub toggle_flopper {
2533 my ($self) = @_; 2590 my ($self) = @_;
2534 2591
2535 # TODO: use animation 2592 $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} 2593}
2547 2594
2548############################################################################# 2595#############################################################################
2549 2596
2550package CFClient::UI::Tooltip; 2597package CFClient::UI::Tooltip;
… …
2582 2629
2583 ($w + 4, $h + 4) 2630 ($w + 4, $h + 4)
2584} 2631}
2585 2632
2586sub size_allocate { 2633sub size_allocate {
2587 my ($self, $w, $h) = @_; 2634 my ($self, $w, $h, $changed) = @_;
2588 2635
2636 return unless $changed;
2637
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2639}
2640
2641sub visibility_change {
2642 my ($self, $visible) = @_;
2643
2644 return unless $visible;
2645
2646 $self->{root}->on_post_alloc ("move_$self" => sub {
2647 my $widget = $self->{owner};
2648
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH;
2653
2654 $self->move ($x, $y);
2655 });
2590} 2656}
2591 2657
2592sub _draw { 2658sub _draw {
2593 my ($self) = @_; 2659 my ($self) = @_;
2594 2660
… …
2611 glVertex $w, $h; 2677 glVertex $w, $h;
2612 glVertex $w, 0; 2678 glVertex $w, 0;
2613 glEnd; 2679 glEnd;
2614 2680
2615 glTranslate 2 - 0.375, 2 - 0.375; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2682
2616 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2617} 2684}
2618 2685
2619############################################################################# 2686#############################################################################
2620 2687
… …
2626 2693
2627sub new { 2694sub new {
2628 my $class = shift; 2695 my $class = shift;
2629 2696
2630 my $self = $class->SUPER::new ( 2697 my $self = $class->SUPER::new (
2631 aspect => 1, 2698 aspect => 1,
2699 can_events => 0,
2632 @_, 2700 @_,
2633 ); 2701 );
2634 2702
2635 if ($self->{anim} && $self->{animspeed}) { 2703 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2704 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2763 $self->SUPER::DESTROY;
2696} 2764}
2697 2765
2698############################################################################# 2766#############################################################################
2699 2767
2700package CFClient::UI::InventoryItem; 2768package CFClient::UI::Inventory;
2701 2769
2702our @ISA = CFClient::UI::HBox::; 2770our @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 2771
2730sub new { 2772sub new {
2731 my $class = shift; 2773 my $class = shift;
2732 2774
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 ( 2775 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), 2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2821 @_, 2777 @_,
2822 ); 2778 );
2823 2779
2824 $self 2780 $self
2825} 2781}
… …
2835 or ($a->{name} cmp $b->{name}) 2791 or ($a->{name} cmp $b->{name})
2836 } @$items; 2792 } @$items;
2837 2793
2838 $self->{real_items} = \@items; 2794 $self->{real_items} = \@items;
2839 2795
2796 my $row = 0;
2840 for my $item (@items) { 2797 for my $item (@items) {
2841 $item->{item} = $item; 2798 CFClient::Item::update_widgets $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845 2799
2846 my $i = 0; 2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2847 for (@items) { 2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2848 $self->{scrolled}->add (0, $i, $_); 2802 $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 2803
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2804 $row++;
2854} 2805 }
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859} 2806}
2860 2807
2861############################################################################# 2808#############################################################################
2862 2809
2863package CFClient::UI::Menu; 2810package CFClient::UI::Menu;
… …
2995sub add { 2942sub add {
2996 my ($self, $text, %arg) = @_; 2943 my ($self, $text, %arg) = @_;
2997 2944
2998 $text =~ s/^\s+//; 2945 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 2946 $text =~ s/\s+$//;
2947
2948 return unless $text;
3000 2949
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 2950 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 2951
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 2953
… …
3047use CFClient::OpenGL; 2996use CFClient::OpenGL;
3048 2997
3049sub new { 2998sub new {
3050 my $class = shift; 2999 my $class = shift;
3051 3000
3052 $class->SUPER::new ( 3001 my $self = $class->SUPER::new (
3002 visible => 1,
3053 @_, 3003 @_,
3054 ) 3004 );
3005
3006 Scalar::Util::weaken ($self->{root} = $self);
3007
3008 $self
3055} 3009}
3056 3010
3057sub configure { 3011sub configure {
3058 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
3059 3013
3060 $self->{w} = $w; 3014 $self->{w} = $w;
3061 $self->{h} = $h; 3015 $self->{h} = $h;
3062} 3016}
3063 3017
3064sub check_size { 3018sub reconfigure {
3065 my ($self) = @_; 3019 my ($self) = @_;
3066 3020
3021 $self->SUPER::reconfigure;
3022
3067 $self->size_allocate ($self->{w}, $self->{h}) 3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3068 if $self->{w}; 3024 if $self->{w};
3069} 3025}
3070 3026
3071sub size_request { 3027sub size_request {
3072 my ($self) = @_; 3028 my ($self) = @_;
3073 3029
3074 ($self->{w}, $self->{h}) 3030 ($self->{w}, $self->{h})
3075} 3031}
3076 3032
3077sub size_allocate { 3033sub size_allocate {
3078 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h, $changed) = @_;
3079 3035
3080 for my $child ($self->children) { 3036 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3038
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3084 if exists $child->{req_x}; 3040 if exists $child->{req_x};
3085 3041
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3087 if exists $child->{req_y}; 3043 if exists $child->{req_y};
3088 3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3047 $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; 3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091 3049
3092 $child->configure ($X, $Y, $W, $H); 3050 $child->configure ($X, $Y, $W, $H);
3093 } 3051 }
… …
3106} 3064}
3107 3065
3108sub update { 3066sub update {
3109 my ($self) = @_; 3067 my ($self) = @_;
3110 3068
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3069 $::WANT_REFRESH++;
3113} 3070}
3114 3071
3115sub add { 3072sub add {
3116 my ($self, @children) = @_; 3073 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 3074
3124 for my $child (@children) { 3075 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3076 $child->{is_toplevel} = 1;
3126 3077
3127 # integerise window positions 3078 # integerise window positions
… …
3162 while ($self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
3163 $_->() 3114 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3115 for values %{delete $self->{refresh_hook}};
3165 } 3116 }
3166 3117
3167 if ($self->{check_size}) { 3118 if ($self->{realloc}) {
3168 my @queue = ([], []); 3119 my @queue;
3169 3120
3170 for (;;) { 3121 while () {
3171 if ($self->{check_size}) { 3122 if ($self->{realloc}) {
3172 # heuristic: check containers last 3123 #TODO use array-of-depth approach
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3124
3174 for values %{delete $self->{check_size}} 3125 @queue = sort { $a->{visible} <=> $b->{visible} }
3126 @queue, values %{delete $self->{realloc}};
3175 } 3127 }
3176 3128
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3129 my $widget = pop @queue || last;
3178 3130
3131 $widget->{visible} or last; # do not resize invisible widgets
3132
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3180 ? @$widget{qw(user_w user_h)} 3134 ? @$widget{qw(def_w def_h)}
3181 : $widget->size_request; 3135 : $widget->size_request;
3182 3136
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# 3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186 3138
3187 $widget->{req_w} = $w; 3139 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3140 $widget->{req_h} = $h;
3189 3141
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3191 3143
3192 $widget->{parent}->check_size 3144 push @queue, $widget->{parent}
3193 if $widget->{parent}; 3145 if $widget->{parent};
3194 }
3195 } 3146 }
3196 } 3147 }
3197 3148
3198 while ($self->{size_alloc}) { 3149 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3200 my ($widget, $w, $h) = @$_; 3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3201 3155
3202 $w = 0 if $w < 0; 3156 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3157 $h = 0 if $h < 0;
3204 3158
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3160
3205 $widget->{w} = $w; 3161 $widget->{w} = $w;
3206 $widget->{h} = $h; 3162 $widget->{h} = $h;
3163
3207 $widget->emit (size_allocate => $w, $h); 3164 $widget->emit (size_allocate => $w, $h, $changed);
3208 } 3165 }
3209 } 3166 }
3210 3167
3211 while ($self->{post_alloc_hook}) { 3168 while ($self->{post_alloc_hook}) {
3212 $_->() 3169 $_->()

Diff Legend

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