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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 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}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 183 }
167
168 $widget->reconfigure;
169 } 184 }
185
186 reconfigure_widgets;
170} 187}
171 188
172############################################################################# 189#############################################################################
173 190
174package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
187 can_events => 1, 204 can_events => 1,
188 @_ 205 @_
189 }, $class; 206 }, $class;
190 207
191 for (keys %$self) { 208 for (keys %$self) {
192 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
194 } 211 }
195 } 212 }
196 213
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
199 $self 223 $self
200} 224}
201 225
202sub destroy { 226sub destroy {
203 my ($self) = @_; 227 my ($self) = @_;
… …
206 %$self = (); 230 %$self = ();
207} 231}
208 232
209sub show { 233sub show {
210 my ($self) = @_; 234 my ($self) = @_;
235
211 return if $self->{parent}; 236 return if $self->{parent};
212 237
213 $CFClient::UI::ROOT->add ($self); 238 $CFClient::UI::ROOT->add ($self);
214} 239}
215 240
216sub show_centered { 241sub center {
217 my ($self) = @_; 242 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221 243
222 $CFClient::UI::ROOT->on_post_alloc ( 244 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub { 245 "center_$self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
225 }, 247 },
226 ); 248 );
227}
228 249
229sub hide { 250 $self->update;
251}
252
253sub set_visible {
230 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262}
263
264sub set_invisible {
265 my ($self) = @_;
266
267 return unless $self->{visible};
268
269 # broken show/hide model
270
271 delete $self->{root};
272 delete $self->{visible};
231 273
232 undef $GRAB if $GRAB == $self; 274 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 275 undef $HOVER if $HOVER == $self;
276
277 CFClient::UI::check_tooltip
278 if $CFClient::UI::TOOLTIP->{owner} == $self;
279
280 $self->focus_out;
281
282 $self->emit (visibility_change => 0);
283}
284
285sub set_visibility {
286 my ($self, $visible) = @_;
287
288 return if $self->{visible} == $visible;
289
290 $visible ? $self->hide
291 : $self->show;
292}
293
294sub toggle_visibility {
295 my ($self) = @_;
296
297 $self->{visible}
298 ? $self->hide
299 : $self->show;
300}
301
302sub hide {
303 my ($self) = @_;
304
305 $self->set_invisible;
234 306
235 $self->{parent}->remove ($self) 307 $self->{parent}->remove ($self)
236 if $self->{parent}; 308 if $self->{parent};
237} 309}
238 310
… …
247} 319}
248 320
249sub set_size { 321sub set_size {
250 my ($self, $w, $h) = @_; 322 my ($self, $w, $h) = @_;
251 323
252 $self->{user_w} = $w; 324 $self->{def_w} = $w;
253 $self->{user_h} = $h; 325 $self->{def_h} = $h;
254 326
255 $self->check_size; 327 $self->check_size;
256} 328}
257 329
258sub size_request { 330sub size_request {
… …
280 $self->{y} = $y; 352 $self->{y} = $y;
281 $self->update; 353 $self->update;
282 } 354 }
283 355
284 if ($self->{w} != $w || $self->{h} != $h) { 356 if ($self->{w} != $w || $self->{h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
286 } 358 }
287} 359}
288 360
289sub size_allocate { 361sub size_allocate {
290 # nothing to be done 362 # nothing to be done
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 379 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 380}
309 381
310sub set_tooltip { 382sub set_tooltip {
311 my ($self, $tooltip) = @_; 383 my ($self, $tooltip) = @_;
384
385 $tooltip =~ s/^\s+//;
386 $tooltip =~ s/\s+$//;
387
388 return if $self->{tooltip} eq $tooltip;
312 389
313 $self->{tooltip} = $tooltip; 390 $self->{tooltip} = $tooltip;
314 391
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 392 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 393 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 415 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 416 return unless $self->{can_focus};
340 417
341 my $focus = $FOCUS; $FOCUS = $self; 418 my $focus = $FOCUS; $FOCUS = $self;
342 419
343 $self->emit (focus_in => $focus); 420 $self->_emit (focus_in => $focus);
344 421
345 $focus->update if $focus; 422 $focus->update if $focus;
346 $FOCUS->update; 423 $FOCUS->update;
347} 424}
348 425
… …
351 428
352 return unless $FOCUS == $self; 429 return unless $FOCUS == $self;
353 430
354 my $focus = $FOCUS; undef $FOCUS; 431 my $focus = $FOCUS; undef $FOCUS;
355 432
356 $self->emit (focus_out => $focus); 433 $self->_emit (focus_out => $focus);
357 434
358 $focus->update if $focus; #? 435 $focus->update if $focus; #?
436
437 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438 unless $FOCUS;
359} 439}
360 440
361sub mouse_motion { } 441sub mouse_motion { }
362sub button_up { } 442sub button_up { }
363sub key_down { } 443sub key_down { }
364sub key_up { } 444sub key_up { }
365 445
366sub button_down { 446sub button_down {
367 my ($self, $ev, $x, $y) = @_; 447 my ($self, $ev, $x, $y) = @_;
368 448
369 $self->focus_in; 449 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 483 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 484 glPushMatrix;
405 glColor 1, 1, 0, 1; 485 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 487 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 488 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 489 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 490 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 491 glVertex 0 , $self->{h} - 1;
412 glEnd; 492 glEnd;
413 glPopMatrix; 493 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 494 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 495 }
416} 496}
… …
436sub set_parent { 516sub set_parent {
437 my ($self, $parent) = @_; 517 my ($self, $parent) = @_;
438 518
439 Scalar::Util::weaken ($self->{parent} = $parent); 519 Scalar::Util::weaken ($self->{parent} = $parent);
440 520
441 # TODO: req_w _does_change after ->reconfigure 521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
442 $self->check_size 523 $self->check_size;
443 unless exists $self->{req_w};
444
445 $self->show;
446} 524}
447 525
448sub check_size { 526sub check_size {
449 my ($self, $forced) = @_; 527 my ($self, $forced) = @_;
450 528
… …
463 my ($self, $signal, $cb) = @_; 541 my ($self, $signal, $cb) = @_;
464 542
465 push @{ $self->{signal_cb}{$signal} }, $cb; 543 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 544}
467 545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
468sub emit { 552sub emit {
469 my ($self, $signal, @args) = @_; 553 my ($self, $signal, @args) = @_;
470 554
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
472} 561}
473 562
474sub DESTROY { 563sub DESTROY {
475 my ($self) = @_; 564 my ($self) = @_;
476 565
… …
589 delete $child->{parent}; 678 delete $child->{parent};
590 $child->hide; 679 $child->hide;
591 680
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 682
594 $self->check_size; 683 $self->check_size (1);
595 $self->update; 684 $self->update;
596} 685}
597 686
598sub clear { 687sub clear {
599 my ($self) = @_; 688 my ($self) = @_;
… …
739 828
740package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
741 830
742our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
743 832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
744sub size_request { 843sub size_request {
745 my ($self) = @_; 844 my ($self) = @_;
746 845
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 847
749 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
750} 852}
751 853
752sub size_allocate { 854sub size_allocate {
753 my ($self, $w, $h) = @_; 855 my ($self, $w, $h) = @_;
754 856
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
859
757 $self->child->configure (0, 0, $cw, $ch); 860 $self->child->configure (0, 0, $w, $h);
758 $self->update; 861 $self->update;
759} 862}
760 863
761sub set_offset { 864sub set_offset {
762 my ($self, $x, $y) = @_; 865 my ($self, $x, $y) = @_;
… …
813 my $class = shift; 916 my $class = shift;
814 917
815 my $self; 918 my $self;
816 919
817 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
818 vertical => 1, 921 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 923 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 924 $self->{vp}->set_offset (0, $_[1]);
822 }, 925 },
823 ; 926 ;
824 927
825 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 929 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 934 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 935 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
834 937
835 $self 938 $self
939}
940
941sub update {
942 my ($self) = @_;
943
944 $self->SUPER::update;
945
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
951sub size_allocate {
952 my ($self, $w, $h) = @_;
953
954 $self->SUPER::size_allocate ($w, $h);
955
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 958}
837 959
838#TODO# update range on size_allocate depending on child 960#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 961# update viewport offset on scroll
840 962
… …
891 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1014
893sub new { 1015sub new {
894 my $class = shift; 1016 my $class = shift;
895 1017
896 # TODO: user_x, user_y, overwrite moveto?
897
898 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1021 border => 0.6,
902 toplevel => 1, 1022 is_toplevel => 1,
903 can_events => 1, 1023 can_events => 1,
904 @_ 1024 @_
905 ); 1025 );
906 1026
907 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 1028 align => 0,
… …
961 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
962 1082
963 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
965 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
969 $self->check_size; 1091 $self->check_size;
970 }; 1092 };
971 1093
972 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
976 $self->{motion} = sub { 1098 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
978 1100
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
980 1102
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1103 $self->{user_x} = $bx + $x - $ox;
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
982 $self->update; 1107 $self->update;
983 }; 1108 };
984 } 1109 }
985} 1110}
986 1111
… …
1048sub new { 1173sub new {
1049 my $class = shift; 1174 my $class = shift;
1050 1175
1051 $class->SUPER::new ( 1176 $class->SUPER::new (
1052 col_expand => [], 1177 col_expand => [],
1053 @_ 1178 @_,
1054 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1184}
1056 1185
1057sub add { 1186sub add {
1058 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
1059 1188
1060 $child->set_parent ($self); 1189 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
1062 1191
1063 $child->check_size; 1192 $self->check_size (1);
1064} 1193}
1065 1194
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1195# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1196sub clear {
1072 my ($self) = @_; 1197 my ($self) = @_;
1073 1198
1074 my @children = $self->children; 1199 my @children = $self->children;
1075 delete $self->{children}; 1200 delete $self->{children};
… …
1077 for (@children) { 1202 for (@children) {
1078 delete $_->{parent}; 1203 delete $_->{parent};
1079 $_->hide; 1204 $_->hide;
1080 } 1205 }
1081 1206
1207 $self->check_size (1);
1082 $self->update; 1208 $self->update;
1083} 1209}
1084 1210
1085sub get_wh { 1211sub get_wh {
1086 my ($self) = @_; 1212 my ($self) = @_;
… …
1118sub size_allocate { 1244sub size_allocate {
1119 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h) = @_;
1120 1246
1121 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1122 1248
1123 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1125 1251
1126 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1309 }
1184} 1310}
1185 1311
1186############################################################################# 1312#############################################################################
1187 1313
1188package CFClient::UI::HBox; 1314package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1315
1192our @ISA = CFClient::UI::Container::; 1316our @ISA = CFClient::UI::Container::;
1193 1317
1194sub size_request { 1318sub size_request {
1195 my ($self) = @_; 1319 my ($self) = @_;
1196 1320
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1321 $self->{vertical}
1198 1322 ? (
1199 ( 1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1325 )
1202 ) 1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1203} 1330}
1204 1331
1205sub size_allocate { 1332sub size_allocate {
1206 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h) = @_;
1207 1334
1208 ($h, $w) = ($w, $h); 1335 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1336 my $children = $self->{children};
1211 1337
1212 my @h = map $_->{req_w}, @$children; 1338 my @req;
1213 1339
1214 my $req_h = List::Util::sum @h; 1340 if ($self->{homogeneous}) {
1215 1341 @req = ($space / (@$children || 1)) x @$children;
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else { 1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1223 for (0 .. $#$children) { 1355 for 0 .. $#$children;
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 } 1356 }
1230 } 1357 }
1231 1358
1232 CFClient::UI::harmonize \@h; 1359 CFClient::UI::harmonize \@req;
1233 1360
1234 my $y = 0; 1361 my $pos = 0;
1235 for (0 .. $#$children) { 1362 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1363 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1365
1240 $y += $h; 1366 $pos += $alloc;
1241 } 1367 }
1242 1368
1243 1 1369 1
1244} 1370}
1245 1371
1246############################################################################# 1372#############################################################################
1247 1373
1374package CFClient::UI::HBox;
1375
1376our @ISA = CFClient::UI::Box::;
1377
1378sub new {
1379 my $class = shift;
1380
1381 $class->SUPER::new (
1382 vertical => 0,
1383 @_,
1384 )
1385}
1386
1387#############################################################################
1388
1248package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1249 1390
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1253 1392
1254sub size_request { 1393sub new {
1255 my ($self) = @_; 1394 my $class = shift;
1256 1395
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1258 1397 vertical => 1,
1259 ( 1398 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1399 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1400}
1303 1401
1304############################################################################# 1402#############################################################################
1305 1403
1306package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
1510 $self->{text} = $text; 1608 $self->{text} = $text;
1511 1609
1512 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1514 1612
1515 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1516} 1614}
1517 1615
1518sub set_text { 1616sub set_text {
1519 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1520 1618
… …
1532 my ($self) = @_; 1630 my ($self) = @_;
1533 1631
1534 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1535 1633
1536 ($w + 1, $h) # add 1 for cursor 1634 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1635}
1544 1636
1545sub key_down { 1637sub key_down {
1546 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1547 1639
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1658 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1659 $self->_emit ('escape');
1568 } elsif ($uni) { 1660 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1662 }
1571 1663
1572 $self->_set_text ($text); 1664 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1751 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1665 $self->update; 1757 $self->update;
1666 1758
1667 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1809 can_events => 1,
1718 @_ 1810 @_
1719 ) 1811 )
1720} 1812}
1721 1813
1814sub activate { }
1815
1722sub button_up { 1816sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1724 1818
1819 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1822}
1730 1823
1731sub _draw { 1824sub _draw {
1732 my ($self) = @_; 1825 my ($self) = @_;
1733 1826
… …
1785 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1786 1879
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1791 } 1884 }
1792} 1885}
1793 1886
1794sub _draw { 1887sub _draw {
1795 my ($self) = @_; 1888 my ($self) = @_;
… …
2088} 2181}
2089 2182
2090sub set_range { 2183sub set_range {
2091 my ($self, $range) = @_; 2184 my ($self, $range) = @_;
2092 2185
2093 $self->{range} = $range; 2186 ($range, $self->{range}) = ($self->{range}, $range);
2094 2187
2095 $self->update; 2188 $self->update
2189 if "@$range" ne "@{$self->{range}}";
2096} 2190}
2097 2191
2098sub set_value { 2192sub set_value {
2099 my ($self, $value) = @_; 2193 my ($self, $value) = @_;
2100 2194
… …
2111 if $unit; 2205 if $unit;
2112 2206
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2207 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2208
2115 if ($value != $old_value) { 2209 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2210 $self->_emit (changed => $value);
2117 $self->update; 2211 $self->update;
2118 } 2212 }
2119} 2213}
2120 2214
2121sub size_request { 2215sub size_request {
… …
2483 2577
2484sub new { 2578sub new {
2485 my $class = shift; 2579 my $class = shift;
2486 2580
2487 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2488 state => 0, 2582 state => 0,
2489 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2490 @_ 2584 @_
2491 ); 2585 );
2492 2586
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2587 $self
2499} 2588}
2500 2589
2501sub toggle_flopper { 2590sub toggle_flopper {
2502 my ($self) = @_; 2591 my ($self) = @_;
2503 2592
2504 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2505 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open");
2509 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close");
2512 }
2513
2514 $self->emit (changed => $self->{state});
2515} 2594}
2516 2595
2517############################################################################# 2596#############################################################################
2518 2597
2519package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2595 2674
2596sub new { 2675sub new {
2597 my $class = shift; 2676 my $class = shift;
2598 2677
2599 my $self = $class->SUPER::new ( 2678 my $self = $class->SUPER::new (
2600 aspect => 1, 2679 aspect => 1,
2680 can_events => 0,
2601 @_, 2681 @_,
2602 ); 2682 );
2603 2683
2604 if ($self->{anim} && $self->{animspeed}) { 2684 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2685 Scalar::Util::weaken (my $widget = $self);
… …
2664 $self->SUPER::DESTROY; 2744 $self->SUPER::DESTROY;
2665} 2745}
2666 2746
2667############################################################################# 2747#############################################################################
2668 2748
2669package CFClient::UI::InventoryItem; 2749package CFClient::UI::Inventory;
2670 2750
2671our @ISA = CFClient::UI::HBox::; 2751our @ISA = CFClient::UI::ScrolledWindow::;
2672
2673sub _item_to_desc {
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2698 2752
2699sub new { 2753sub new {
2700 my $class = shift; 2754 my $class = shift;
2701 2755
2702 my %args = @_;
2703
2704 my $item = delete $args{item};
2705
2706 my $desc = _item_to_desc ($item);
2707
2708 my $self = $class->SUPER::new ( 2756 my $self = $class->SUPER::new (
2709 can_hover => 1,
2710 can_events => 1,
2711 tooltip => ((CFClient::UI::Label::escape $desc)
2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713 connect_button_down => sub {
2714 my ($self, $ev, $x, $y) = @_;
2715
2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2727 } elsif ($ev->{button} == 2) {
2728 $::CONN->send ("apply $item->{tag}");
2729 } elsif ($ev->{button} == 3) {
2730 my @menu_items = (
2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2743 ),
2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747 }
2748
2749 1
2750 },
2751 %args
2752 );
2753
2754
2755 $self->add (new CFClient::UI::Face
2756 can_events => 0,
2757 face => $item->{face},
2758 anim => $item->{anim},
2759 animspeed => $item->{animspeed},
2760 );
2761
2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764 $self->{item} = $item;
2765
2766 $self->update_item;
2767
2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2777}
2778
2779#############################################################################
2780
2781package CFClient::UI::Inventory;
2782
2783our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785sub new {
2786 my $class = shift;
2787
2788 my $self = $class->SUPER::new (
2789 scrolled => (new CFClient::UI::Table), 2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2790 @_, 2758 @_,
2791 ); 2759 );
2792 2760
2793 $self 2761 $self
2794} 2762}
… …
2804 or ($a->{name} cmp $b->{name}) 2772 or ($a->{name} cmp $b->{name})
2805 } @$items; 2773 } @$items;
2806 2774
2807 $self->{real_items} = \@items; 2775 $self->{real_items} = \@items;
2808 2776
2777 my $row = 0;
2809 for my $item (@items) { 2778 for my $item (@items) {
2810 $item->{item} = $item; 2779 CFClient::Item::update_widgets $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814 2780
2815 my $i = 0; 2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2816 for (@items) { 2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2817 $self->{scrolled}->add (0, $i, $_); 2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2821 2784
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2785 $row++;
2823} 2786 }
2824
2825sub size_request {
2826 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h});
2828} 2787}
2829 2788
2830############################################################################# 2789#############################################################################
2831 2790
2832package CFClient::UI::Menu; 2791package CFClient::UI::Menu;
… …
2867 2826
2868# popup given the event (must be a mouse button down event currently) 2827# popup given the event (must be a mouse button down event currently)
2869sub popup { 2828sub popup {
2870 my ($self, $ev) = @_; 2829 my ($self, $ev) = @_;
2871 2830
2872 $self->emit ("popdown"); 2831 $self->_emit ("popdown");
2873 2832
2874 # maybe save $GRAB? must be careful about events... 2833 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 2834 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 2835 $self->{button} = $ev->{button};
2877 2836
… …
2892 2851
2893 if ($ev->{button} == $self->{button}) { 2852 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 2853 undef $GRAB;
2895 $self->hide; 2854 $self->hide;
2896 2855
2897 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2857 $self->{hover}[1]->() if $self->{hover};
2899 } 2858 }
2900} 2859}
2901 2860
2902############################################################################# 2861#############################################################################
… …
2964sub add { 2923sub add {
2965 my ($self, $text, %arg) = @_; 2924 my ($self, $text, %arg) = @_;
2966 2925
2967 $text =~ s/^\s+//; 2926 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 2927 $text =~ s/\s+$//;
2928
2929 return unless $text;
2969 2930
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 2931 my $timeout = time + ((delete $arg{timeout}) || 60);
2971 2932
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 2934
… …
3017 2978
3018sub new { 2979sub new {
3019 my $class = shift; 2980 my $class = shift;
3020 2981
3021 $class->SUPER::new ( 2982 $class->SUPER::new (
2983 visible => 1,
3022 @_, 2984 @_,
3023 ) 2985 )
3024} 2986}
3025 2987
3026sub configure { 2988sub configure {
… …
3044} 3006}
3045 3007
3046sub size_allocate { 3008sub size_allocate {
3047 my ($self, $w, $h) = @_; 3009 my ($self, $w, $h) = @_;
3048 3010
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055 for my $child ($self->children) { 3011 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3013
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3059 if exists $child->{req_x}; 3015 if exists $child->{req_x};
3060 3016
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3062 if exists $child->{req_y}; 3018 if exists $child->{req_y};
3063 3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3064 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066 3024
3067 $child->configure ($X, $Y, $W, $H); 3025 $child->configure ($X, $Y, $W, $H);
3068 } 3026 }
… …
3089 3047
3090sub add { 3048sub add {
3091 my ($self, @children) = @_; 3049 my ($self, @children) = @_;
3092 3050
3093 for my $child (@children) { 3051 for my $child (@children) {
3094 $child->{toplevel} = 1; 3052 $child->{is_toplevel} = 1;
3095 3053
3096 # integerise window positions 3054 # integerise window positions
3097 $child->{x} = int $child->{x}; 3055 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y}; 3056 $child->{y} = int $child->{y};
3099 } 3057 }
3100 3058
3101 $self->SUPER::add (@children); 3059 $self->SUPER::add (@children);
3102 3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066}
3067
3068sub remove {
3069 my ($self, @children) = @_;
3070
3071 $self->SUPER::remove (@children);
3072
3103 while (@children) { 3073 while (@children) {
3104 my $w = pop @children; 3074 my $w = pop @children;
3105 push @children, $w->children; 3075 push @children, $w->children;
3106 $w->{visible} = 1; 3076 $w->set_invisible;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 } 3077 }
3120} 3078}
3121 3079
3122sub on_refresh { 3080sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3081 my ($self, $id, $cb) = @_;
… …
3138 $_->() 3096 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3097 for values %{delete $self->{refresh_hook}};
3140 } 3098 }
3141 3099
3142 if ($self->{check_size}) { 3100 if ($self->{check_size}) {
3143 my @queue = ([], []); 3101 my @queue;
3144 3102
3145 for (;;) { 3103 while () {
3146 if ($self->{check_size}) { 3104 if ($self->{check_size}) {
3147 # heuristic: check containers last 3105 #TODO use array-of-depth approach
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3106
3107 @queue = sort { $a->{visible} <=> $b->{visible} }
3149 for values %{delete $self->{check_size}} 3108 @queue, values %{delete $self->{check_size}};
3150 } 3109 }
3151 3110
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3111 my $widget = pop @queue || last;
3153 3112
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3155 ? @$widget{qw(user_w user_h)} 3116 ? @$widget{qw(def_w def_h)}
3156 : $widget->size_request; 3117 : $widget->size_request;
3157 3118
3158 if (delete $widget->{force_alloc} 3119 if (delete $widget->{force_alloc}
3159 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
… …
3168 if $widget->{parent}; 3129 if $widget->{parent};
3169 } 3130 }
3170 } 3131 }
3171 } 3132 }
3172 3133
3173 while ($self->{size_alloc}) { 3134 while (my $size_alloc = delete $self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) { 3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3175 my ($widget, $w, $h) = @$_; 3136 values %$size_alloc;
3137
3138 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last };
3176 3140
3177 $w = 0 if $w < 0; 3141 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3142 $h = 0 if $h < 0;
3179 3143
3180 $widget->{w} = $w; 3144 $widget->{w} = $w;
3181 $widget->{h} = $h; 3145 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h);
3183 $widget->emit (size_allocate => $w, $h); 3146 $widget->emit (size_allocate => $w, $h);
3184 } 3147 }
3185 } 3148 }
3186 3149
3187 while ($self->{post_alloc_hook}) { 3150 while ($self->{post_alloc_hook}) {

Diff Legend

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