ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.254 by root, Mon May 29 01:53:23 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
238 CFClient::UI::check_tooltip 274 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 275 if $TOOLTIP->{owner} == $self;
240 276
241 $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;
242} 297}
243 298
244sub hide { 299sub hide {
245 my ($self) = @_; 300 my ($self) = @_;
246 301
… …
261} 316}
262 317
263sub set_size { 318sub set_size {
264 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
265 320
266 $self->{user_w} = $w; 321 $self->{def_w} = $w;
267 $self->{user_h} = $h; 322 $self->{def_h} = $h;
268 323
269 $self->check_size; 324 $self->realloc;
270} 325}
271 326
272sub size_request { 327sub size_request {
273 require Carp; 328 require Carp;
274 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
294 $self->{y} = $y; 349 $self->{y} = $y;
295 $self->update; 350 $self->update;
296 } 351 }
297 352
298 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 357 }
301} 358}
302 359
303sub size_allocate { 360sub size_allocate {
304 # nothing to be done 361 # nothing to be done
305} 362}
306 363
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 364sub children {
315} 365}
316 366
317sub set_max_size { 367sub set_max_size {
318 my ($self, $w, $h) = @_; 368 my ($self, $w, $h) = @_;
… …
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 371 delete $self->{max_h}; $self->{max_h} = $h if $h;
322} 372}
323 373
324sub set_tooltip { 374sub set_tooltip {
325 my ($self, $tooltip) = @_; 375 my ($self, $tooltip) = @_;
376
377 $tooltip =~ s/^\s+//;
378 $tooltip =~ s/\s+$//;
379
380 return if $self->{tooltip} eq $tooltip;
326 381
327 $self->{tooltip} = $tooltip; 382 $self->{tooltip} = $tooltip;
328 383
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 384 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 385 delete $CFClient::UI::TOOLTIP->{owner};
… …
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
393sub 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}
394 512
395sub draw { 513sub draw {
396 my ($self) = @_; 514 my ($self) = @_;
397 515
398 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
420 if ($ENV{PCLIENT_DEBUG}) { 538 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix; 539 glPushMatrix;
422 glColor 1, 1, 0, 1; 540 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP; 542 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 543 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 544 glVertex $self->{w} - 1, 0;
427 glVertex $self->{w}, $self->{h}; 545 glVertex $self->{w} - 1, $self->{h} - 1;
428 glVertex 0 , $self->{h}; 546 glVertex 0 , $self->{h} - 1;
429 glEnd; 547 glEnd;
430 glPopMatrix; 548 glPopMatrix;
431 #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;
432 } 550 }
433} 551}
434 552
435sub _draw { 553sub _draw {
436 my ($self) = @_; 554 my ($self) = @_;
437 555
438 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
439}
440
441sub find_widget {
442 my ($self, $x, $y) = @_;
443
444 return () unless $self->{can_events};
445
446 return $self
447 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450 ()
451}
452
453sub set_parent {
454 my ($self, $parent) = @_;
455
456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
463}
464
465sub check_size {
466 my ($self, $forced) = @_;
467
468 $self->{force_alloc} = 1 if $forced;
469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
470}
471
472sub update {
473 my ($self) = @_;
474
475 $self->{parent}->update
476 if $self->{parent};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496} 557}
497 558
498sub DESTROY { 559sub DESTROY {
499 my ($self) = @_; 560 my ($self) = @_;
500 561
… …
597 $self->{children} = [ 658 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
600 ]; 661 ];
601 662
602 $self->check_size (1); 663 $self->realloc;
603 $self->update;
604} 664}
605 665
606sub children { 666sub children {
607 @{ $_[0]{children} } 667 @{ $_[0]{children} }
608} 668}
… …
613 delete $child->{parent}; 673 delete $child->{parent};
614 $child->hide; 674 $child->hide;
615 675
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 677
618 $self->check_size; 678 $self->realloc;
619 $self->update;
620} 679}
621 680
622sub clear { 681sub clear {
623 my ($self) = @_; 682 my ($self) = @_;
624 683
… …
628 for (@$children) { 687 for (@$children) {
629 delete $_->{parent}; 688 delete $_->{parent};
630 $_->hide; 689 $_->hide;
631 } 690 }
632 691
633 $self->check_size; 692 $self->realloc;
634 $self->update;
635} 693}
636 694
637sub find_widget { 695sub find_widget {
638 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
639 697
… …
692sub size_request { 750sub size_request {
693 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
694} 752}
695 753
696sub size_allocate { 754sub size_allocate {
697 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
698 756
699 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
700} 758}
701 759
702############################################################################# 760#############################################################################
… …
719 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
720 $self->SUPER::update; 778 $self->SUPER::update;
721} 779}
722 780
723sub size_allocate { 781sub size_allocate {
724 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
725 783
726 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
727 $self->update; 785 $self->update
786 if $changed;
728} 787}
729 788
730sub _render { 789sub _render {
731 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
732} 791}
… …
763 822
764package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
765 824
766our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
767 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
768sub size_request { 837sub size_request {
769 my ($self) = @_; 838 my ($self) = @_;
770 839
771 @$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)};
772 841
773 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
774} 846}
775 847
776sub size_allocate { 848sub size_allocate {
777 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
778 850
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
780# $w = $self->{w}; 852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
853
781 $self->child->configure (0, 0, $cw, $ch); 854 $self->child->configure (0, 0, $w, $h);
782 $self->update; 855 $self->update;
783} 856}
784 857
785sub set_offset { 858sub set_offset {
786 my ($self, $x, $y) = @_; 859 my ($self, $x, $y) = @_;
… …
837 my $class = shift; 910 my $class = shift;
838 911
839 my $self; 912 my $self;
840 913
841 my $slider = new CFClient::UI::Slider 914 my $slider = new CFClient::UI::Slider
842 vertical => 1, 915 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 916 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 917 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 918 $self->{vp}->set_offset (0, $_[1]);
846 }, 919 },
847 ; 920 ;
848 921
849 $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
… …
857 $self->add ($self->{slider}); 930 $self->add ($self->{slider});
858 931
859 $self 932 $self
860} 933}
861 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
862sub size_allocate { 945sub size_allocate {
863 my ($self, $w, $h) = @_; 946 my ($self, $w, $h, $changed) = @_;
864 947
865 $self->SUPER::size_allocate ($w, $h); 948 $self->SUPER::size_allocate ($w, $h, $changed);
866 949
867 my $child = $self->{vp}->child; 950 my $child = $self->{vp}->child;
868 $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]);
869} 952}
870 953
… …
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1008
926sub new { 1009sub new {
927 my $class = shift; 1010 my $class = shift;
928
929 # TODO: user_x, user_y, overwrite moveto?
930 1011
931 my $self = $class->SUPER::new ( 1012 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1013 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1014 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1015 border => 0.6,
… …
960 $h + $self->border * 2, 1041 $h + $self->border * 2,
961 ) 1042 )
962} 1043}
963 1044
964sub size_allocate { 1045sub size_allocate {
965 my ($self, $w, $h) = @_; 1046 my ($self, $w, $h, $changed) = @_;
1047
1048 return unless $changed;
966 1049
967 $h -= List::Util::max 0, $self->border * 2; 1050 $h -= List::Util::max 0, $self->border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1051 $w -= List::Util::max 0, $self->border * 2;
969 1052
970 $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)
… …
994 my ($ev, $x, $y) = @_; 1077 my ($ev, $x, $y) = @_;
995 1078
996 my $dx = $ev->{x} - $ox; 1079 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1080 my $dy = $ev->{y} - $oy;
998 1081
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1086 $self->move ($self->{user_x}, $self->{user_y});
1002 $self->check_size; 1087 $self->realloc;
1003 }; 1088 };
1004 1089
1005 } elsif ($lr ^ $td) { 1090 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1091 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1092 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1094 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1095 my ($ev, $x, $y) = @_;
1011 1096
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1097 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1098
1014 $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});
1015 $self->update; 1103 $self->realloc;
1016 }; 1104 };
1017 } 1105 }
1018} 1106}
1019 1107
1020sub button_up { 1108sub button_up {
… …
1081sub new { 1169sub new {
1082 my $class = shift; 1170 my $class = shift;
1083 1171
1084 $class->SUPER::new ( 1172 $class->SUPER::new (
1085 col_expand => [], 1173 col_expand => [],
1086 @_ 1174 @_,
1087 ) 1175 )
1176}
1177
1178sub children {
1179 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1180}
1089 1181
1090sub add { 1182sub add {
1091 my ($self, $x, $y, $child) = @_; 1183 my ($self, $x, $y, $child) = @_;
1092 1184
1093 $child->set_parent ($self); 1185 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1186 $self->{children}[$y][$x] = $child;
1095 1187
1096 $child->check_size; 1188 $self->realloc;
1097} 1189}
1098 1190
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# 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?
1104sub clear { 1192sub clear {
1105 my ($self) = @_; 1193 my ($self) = @_;
1106 1194
1107 my @children = $self->children; 1195 my @children = $self->children;
1108 delete $self->{children}; 1196 delete $self->{children};
… …
1110 for (@children) { 1198 for (@children) {
1111 delete $_->{parent}; 1199 delete $_->{parent};
1112 $_->hide; 1200 $_->hide;
1113 } 1201 }
1114 1202
1115 $self->update; 1203 $self->realloc;
1116} 1204}
1117 1205
1118sub get_wh { 1206sub get_wh {
1119 my ($self) = @_; 1207 my ($self) = @_;
1120 1208
… …
1147 (sum @$hs), 1235 (sum @$hs),
1148 ) 1236 )
1149} 1237}
1150 1238
1151sub size_allocate { 1239sub size_allocate {
1152 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h, $changed) = @_;
1153 1241
1154 my ($ws, $hs) = $self->get_wh; 1242 my ($ws, $hs) = $self->get_wh;
1155 1243
1156 my $req_w = sum @$ws; 1244 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1245 my $req_h = (sum @$hs) || 1;
1158 1246
1159 # TODO: nicer code && do row_expand 1247 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1248 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1249 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1250 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1304 }
1217} 1305}
1218 1306
1219############################################################################# 1307#############################################################################
1220 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
1221package CFClient::UI::HBox; 1369package CFClient::UI::HBox;
1222 1370
1223# TODO: wrap into common Box base class
1224
1225our @ISA = CFClient::UI::Container::; 1371our @ISA = CFClient::UI::Box::;
1226 1372
1227sub size_request { 1373sub new {
1228 my ($self) = @_; 1374 my $class = shift;
1229 1375
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1376 $class->SUPER::new (
1231 1377 vertical => 0,
1232 ( 1378 @_,
1233 (List::Util::sum map $_->[0], @alloc),
1234 (List::Util::max map $_->[1], @alloc),
1235 ) 1379 )
1236} 1380}
1237 1381
1238sub size_allocate {
1239 my ($self, $w, $h) = @_;
1240
1241 ($h, $w) = ($w, $h);
1242
1243 my $children = $self->{children};
1244
1245 my @h = map $_->{req_w}, @$children;
1246
1247 my $req_h = List::Util::sum @h;
1248
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children;
1254 $exp ||= 1;
1255
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 }
1263 }
1264
1265 CFClient::UI::harmonize \@h;
1266
1267 my $y = 0;
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_];
1271 $child->configure ($y, 0, $h, $w);
1272
1273 $y += $h;
1274 }
1275
1276 1
1277}
1278
1279############################################################################# 1382#############################################################################
1280 1383
1281package CFClient::UI::VBox; 1384package CFClient::UI::VBox;
1282 1385
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1386our @ISA = CFClient::UI::Box::;
1286 1387
1287sub size_request { 1388sub new {
1288 my ($self) = @_; 1389 my $class = shift;
1289 1390
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1391 $class->SUPER::new (
1291 1392 vertical => 1,
1292 ( 1393 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1394 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1395}
1336 1396
1337############################################################################# 1397#############################################################################
1338 1398
1339package CFClient::UI::Label; 1399package CFClient::UI::Label;
… …
1402 $self->{text} = "T$text"; 1462 $self->{text} = "T$text";
1403 1463
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1465 $self->{layout}->set_text ($text);
1406 1466
1467 $self->realloc;
1407 $self->update; 1468 $self->update;
1408 $self->check_size;
1409} 1469}
1410 1470
1411sub set_markup { 1471sub set_markup {
1412 my ($self, $markup) = @_; 1472 my ($self, $markup) = @_;
1413 1473
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1477 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1478
1419 $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;
1420 $self->{layout}->set_markup ($markup); 1480 $self->{layout}->set_markup ($markup);
1421 1481
1482 $self->realloc;
1422 $self->update; 1483 $self->update;
1423 $self->check_size;
1424} 1484}
1425 1485
1426sub size_request { 1486sub size_request {
1427 my ($self) = @_; 1487 my ($self) = @_;
1428 1488
… …
1449 $h + $self->{padding} * 2, 1509 $h + $self->{padding} * 2,
1450 ) 1510 )
1451} 1511}
1452 1512
1453sub size_allocate { 1513sub size_allocate {
1454 my ($self, $w, $h) = @_; 1514 my ($self, $w, $h, $changed) = @_;
1455 1515
1456 delete $self->{texture}; 1516 delete $self->{texture}
1517 if $changed;
1457} 1518}
1458 1519
1459sub set_fontsize { 1520sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1521 my ($self, $fontsize) = @_;
1461 1522
1462 $self->{fontsize} = $fontsize; 1523 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1524 delete $self->{texture};
1464 1525
1465 $self->update; 1526 $self->realloc;
1466 $self->check_size;
1467} 1527}
1468 1528
1469sub _draw { 1529sub _draw {
1470 my ($self) = @_; 1530 my ($self) = @_;
1471 1531
… …
1551sub set_text { 1611sub set_text {
1552 my ($self, $text) = @_; 1612 my ($self, $text) = @_;
1553 1613
1554 $self->{cursor} = length $text; 1614 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1615 $self->_set_text ($text);
1556 $self->update; 1616
1557 $self->check_size; 1617 $self->realloc;
1558} 1618}
1559 1619
1560sub get_text { 1620sub get_text {
1561 $_[0]{text} 1621 $_[0]{text}
1562} 1622}
… …
1595 } elsif ($uni) { 1655 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1656 substr $text, $self->{cursor}++, 0, chr $uni;
1597 } 1657 }
1598 1658
1599 $self->_set_text ($text); 1659 $self->_set_text ($text);
1600 $self->update; 1660
1601 $self->check_size; 1661 $self->realloc;
1602} 1662}
1603 1663
1604sub focus_in { 1664sub focus_in {
1605 my ($self) = @_; 1665 my ($self) = @_;
1606 1666
… …
2113 $self->update; 2173 $self->update;
2114 2174
2115 $self 2175 $self
2116} 2176}
2117 2177
2178sub changed { }
2179
2118sub set_range { 2180sub set_range {
2119 my ($self, $range) = @_; 2181 my ($self, $range) = @_;
2120 2182
2121 $self->{range} = $range; 2183 ($range, $self->{range}) = ($self->{range}, $range);
2122 2184
2123 $self->update; 2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2124} 2187}
2125 2188
2126sub set_value { 2189sub set_value {
2127 my ($self, $value) = @_; 2190 my ($self, $value) = @_;
2128 2191
… …
2310 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2311 $self->reflow; 2374 $self->reflow;
2312} 2375}
2313 2376
2314sub size_allocate { 2377sub size_allocate {
2315 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h, $changed) = @_;
2316 2379
2317 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2318 2383
2319 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2384 $self->{layout}->set_font ($self->{font}) if $self->{font};
2320 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2321 $self->{layout}->set_width ($self->{children}[0]{w}); 2386 $self->{layout}->set_width ($self->{children}[0]{w});
2322 2387
… …
2511 2576
2512sub new { 2577sub new {
2513 my $class = shift; 2578 my $class = shift;
2514 2579
2515 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2516 state => 0, 2581 state => 0,
2517 connect_activate => \&toggle_flopper, 2582 on_activate => \&toggle_flopper,
2518 @_ 2583 @_
2519 ); 2584 );
2520 2585
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2586 $self
2527} 2587}
2528 2588
2529sub toggle_flopper { 2589sub toggle_flopper {
2530 my ($self) = @_; 2590 my ($self) = @_;
2531 2591
2532 # TODO: use animation 2592 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2593}
2544 2594
2545############################################################################# 2595#############################################################################
2546 2596
2547package CFClient::UI::Tooltip; 2597package CFClient::UI::Tooltip;
… …
2579 2629
2580 ($w + 4, $h + 4) 2630 ($w + 4, $h + 4)
2581} 2631}
2582 2632
2583sub size_allocate { 2633sub size_allocate {
2584 my ($self, $w, $h) = @_; 2634 my ($self, $w, $h, $changed) = @_;
2585 2635
2636 return unless $changed;
2637
2586 $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 or return;
2649
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH;
2654
2655 $self->move ($x, $y);
2656 });
2587} 2657}
2588 2658
2589sub _draw { 2659sub _draw {
2590 my ($self) = @_; 2660 my ($self) = @_;
2591 2661
… …
2608 glVertex $w, $h; 2678 glVertex $w, $h;
2609 glVertex $w, 0; 2679 glVertex $w, 0;
2610 glEnd; 2680 glEnd;
2611 2681
2612 glTranslate 2 - 0.375, 2 - 0.375; 2682 glTranslate 2 - 0.375, 2 - 0.375;
2683
2613 $self->SUPER::_draw; 2684 $self->SUPER::_draw;
2614} 2685}
2615 2686
2616############################################################################# 2687#############################################################################
2617 2688
… …
2623 2694
2624sub new { 2695sub new {
2625 my $class = shift; 2696 my $class = shift;
2626 2697
2627 my $self = $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2628 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2629 @_, 2701 @_,
2630 ); 2702 );
2631 2703
2632 if ($self->{anim} && $self->{animspeed}) { 2704 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2705 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2764 $self->SUPER::DESTROY;
2693} 2765}
2694 2766
2695############################################################################# 2767#############################################################################
2696 2768
2697package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2698 2770
2699our @ISA = CFClient::UI::HBox::; 2771our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726 2772
2727sub new { 2773sub new {
2728 my $class = shift; 2774 my $class = shift;
2729 2775
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table), 2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2818 @_, 2778 @_,
2819 ); 2779 );
2820 2780
2821 $self 2781 $self
2822} 2782}
… …
2832 or ($a->{name} cmp $b->{name}) 2792 or ($a->{name} cmp $b->{name})
2833 } @$items; 2793 } @$items;
2834 2794
2835 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2836 2796
2797 my $row = 0;
2837 for my $item (@items) { 2798 for my $item (@items) {
2838 $item->{item} = $item; 2799 CFClient::Item::update_widgets $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842 2800
2843 my $i = 0; 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2844 for (@items) { 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2845 $self->{scrolled}->add (0, $i, $_); 2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849 2804
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2805 $row++;
2851} 2806 }
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856} 2807}
2857 2808
2858############################################################################# 2809#############################################################################
2859 2810
2860package CFClient::UI::Menu; 2811package CFClient::UI::Menu;
… …
2992sub add { 2943sub add {
2993 my ($self, $text, %arg) = @_; 2944 my ($self, $text, %arg) = @_;
2994 2945
2995 $text =~ s/^\s+//; 2946 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 2947 $text =~ s/\s+$//;
2948
2949 return unless $text;
2997 2950
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 2951 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 2952
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2953 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 2954
… …
3044use CFClient::OpenGL; 2997use CFClient::OpenGL;
3045 2998
3046sub new { 2999sub new {
3047 my $class = shift; 3000 my $class = shift;
3048 3001
3049 $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
3003 visible => 1,
3050 @_, 3004 @_,
3051 ) 3005 );
3006
3007 Scalar::Util::weaken ($self->{root} = $self);
3008
3009 $self
3052} 3010}
3053 3011
3054sub configure { 3012sub configure {
3055 my ($self, $x, $y, $w, $h) = @_; 3013 my ($self, $x, $y, $w, $h) = @_;
3056 3014
3057 $self->{w} = $w; 3015 $self->{w} = $w;
3058 $self->{h} = $h; 3016 $self->{h} = $h;
3059} 3017}
3060 3018
3061sub check_size { 3019sub reconfigure {
3062 my ($self) = @_; 3020 my ($self) = @_;
3063 3021
3022 $self->SUPER::reconfigure;
3023
3064 $self->size_allocate ($self->{w}, $self->{h}) 3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
3065 if $self->{w}; 3025 if $self->{w};
3066} 3026}
3067 3027
3068sub size_request { 3028sub size_request {
3069 my ($self) = @_; 3029 my ($self) = @_;
3070 3030
3071 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3072} 3032}
3073 3033
3074sub size_allocate { 3034sub size_allocate {
3075 my ($self, $w, $h) = @_; 3035 my ($self, $w, $h, $changed) = @_;
3076 3036
3077 for my $child ($self->children) { 3037 for my $child ($self->children) {
3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079 3039
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3081 if exists $child->{req_x}; 3041 if exists $child->{req_x};
3082 3042
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3084 if exists $child->{req_y}; 3044 if exists $child->{req_y};
3085 3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088 3050
3089 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
3090 } 3052 }
… …
3103} 3065}
3104 3066
3105sub update { 3067sub update {
3106 my ($self) = @_; 3068 my ($self) = @_;
3107 3069
3108 $self->check_size;
3109 $::WANT_REFRESH++; 3070 $::WANT_REFRESH++;
3110} 3071}
3111 3072
3112sub add { 3073sub add {
3113 my ($self, @children) = @_; 3074 my ($self, @children) = @_;
3114
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120 3075
3121 for my $child (@children) { 3076 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3077 $child->{is_toplevel} = 1;
3123 3078
3124 # integerise window positions 3079 # integerise window positions
… …
3159 while ($self->{refresh_hook}) { 3114 while ($self->{refresh_hook}) {
3160 $_->() 3115 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3116 for values %{delete $self->{refresh_hook}};
3162 } 3117 }
3163 3118
3164 if ($self->{check_size}) { 3119 if ($self->{realloc}) {
3165 my @queue = ([], []); 3120 my @queue;
3166 3121
3167 for (;;) { 3122 while () {
3168 if ($self->{check_size}) { 3123 if ($self->{realloc}) {
3169 # heuristic: check containers last 3124 #TODO use array-of-depth approach
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3125
3171 for values %{delete $self->{check_size}} 3126 @queue = sort { $a->{visible} <=> $b->{visible} }
3127 @queue, values %{delete $self->{realloc}};
3172 } 3128 }
3173 3129
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3130 my $widget = pop @queue || last;
3175 3131
3132 $widget->{visible} or last; # do not resize invisible widgets
3133
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3177 ? @$widget{qw(user_w user_h)} 3135 ? @$widget{qw(def_w def_h)}
3178 : $widget->size_request; 3136 : $widget->size_request;
3179 3137
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183 3139
3184 $widget->{req_w} = $w; 3140 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h; 3141 $widget->{req_h} = $h;
3186 3142
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3188 3144
3189 $widget->{parent}->check_size 3145 push @queue, $widget->{parent}
3190 if $widget->{parent}; 3146 if $widget->{parent};
3191 }
3192 } 3147 }
3193 } 3148 }
3194 3149
3195 while ($self->{size_alloc}) { 3150 while (my $size_alloc = delete $self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) { 3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3197 my ($widget, $w, $h) = @$_; 3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3198 3156
3199 $w = 0 if $w < 0; 3157 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3158 $h = 0 if $h < 0;
3201 3159
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3161
3202 $widget->{w} = $w; 3162 $widget->{w} = $w;
3203 $widget->{h} = $h; 3163 $widget->{h} = $h;
3164
3204 $widget->emit (size_allocate => $w, $h); 3165 $widget->emit (size_allocate => $w, $h, $changed);
3205 } 3166 }
3206 } 3167 }
3207 3168
3208 while ($self->{post_alloc_hook}) { 3169 while ($self->{post_alloc_hook}) {
3209 $_->() 3170 $_->()

Diff Legend

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