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.258 by root, Tue May 30 02:55:45 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 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
18 43
19sub check_tooltip { 44sub check_tooltip {
20 if (!$GRAB) { 45 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
23 48
24 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
25 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
26 53
27 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
28 55
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 57
31 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 59 $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 } 60 }
43 61
44 return; 62 return;
45 } 63 }
46 } 64 }
… …
152sub rescale_widgets { 170sub rescale_widgets {
153 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
154 172
155 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 179 $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}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_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}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $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}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
165 } 188 }
166 } 189 }
167 190
168 reconfigure_widgets; 191 reconfigure_widgets;
169} 192}
… …
178 201
179sub new { 202sub new {
180 my $class = shift; 203 my $class = shift;
181 204
182 my $self = bless { 205 my $self = bless {
183 x => 0, 206 x => "center",
184 y => 0, 207 y => "center",
185 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
186 can_events => 1, 211 can_events => 1,
187 @_ 212 @_
188 }, $class; 213 }, $class;
189 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
190 for (keys %$self) { 217 for (keys %$self) {
191 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
193 } 220 }
194 } 221 }
195 222
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
197 234
198 $self 235 $self
199} 236}
200 237
201sub destroy { 238sub destroy {
… …
205 %$self = (); 242 %$self = ();
206} 243}
207 244
208sub show { 245sub show {
209 my ($self) = @_; 246 my ($self) = @_;
247
210 return if $self->{parent}; 248 return if $self->{parent};
211 249
212 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
213} 251}
214 252
215sub show_centered { 253sub set_visible {
216 my ($self) = @_; 254 my ($self) = @_;
255
217 return if $self->{parent}; 256 return if $self->{visible};
218 257
219 $self->show; 258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
220 260
221 $CFClient::UI::ROOT->on_post_alloc ( 261 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 262
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 263 $self->realloc if !exists $self->{req_w};
224 }, 264
225 ); 265 $_->set_visible for $self->children;
226} 266}
227 267
228sub set_invisible { 268sub set_invisible {
229 my ($self) = @_; 269 my ($self) = @_;
230 270
231 # broken show/hide model 271 return unless $self->{visible};
232 272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
233 delete $self->{visible}; 276 delete $self->{visible};
234 277
235 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
237 280
238 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
240 283
241 $self->focus_out; 284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
242} 304}
243 305
244sub hide { 306sub hide {
245 my ($self) = @_; 307 my ($self) = @_;
246 308
… …
248 310
249 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
250 if $self->{parent}; 312 if $self->{parent};
251} 313}
252 314
253sub move { 315sub move_abs {
254 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
255 317
256 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
259 321
260 $self->update; 322 $self->update;
261} 323}
262 324
263sub set_size { 325sub set_size {
264 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
265 327
266 $self->{user_w} = $w; 328 $self->{force_w} = $w;
267 $self->{user_h} = $h; 329 $self->{force_h} = $h;
268 330
269 $self->check_size; 331 $self->realloc;
270} 332}
271 333
272sub size_request { 334sub size_request {
273 require Carp; 335 require Carp;
274 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
276 338
277sub configure { 339sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
279 341
280 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
283 347
284 # use alignment to adjust x, y 348 # use alignment to adjust x, y
285 349
286 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 352 }
291 353
292 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 355 $self->{x} = $x;
294 $self->{y} = $y; 356 $self->{y} = $y;
295 $self->update; 357 $self->update;
296 } 358 }
297 359
298 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
361 return unless $self->{visible};
362
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 364 }
301} 365}
302 366
303sub size_allocate { 367sub size_allocate {
304 # nothing to be done 368 # nothing to be done
305} 369}
306 370
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 371sub children {
315} 372}
316 373
317sub set_max_size { 374sub set_max_size {
318 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
… …
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
322} 379}
323 380
324sub set_tooltip { 381sub set_tooltip {
325 my ($self, $tooltip) = @_; 382 my ($self, $tooltip) = @_;
383
384 $tooltip =~ s/^\s+//;
385 $tooltip =~ s/\s+$//;
386
387 return if $self->{tooltip} eq $tooltip;
326 388
327 $self->{tooltip} = $tooltip; 389 $self->{tooltip} = $tooltip;
328 390
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 392 delete $CFClient::UI::TOOLTIP->{owner};
… …
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
393sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456
457sub find_widget {
458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
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}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self};
504
505 $self->{root}{realloc}{$self} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 }
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
518
519sub reconfigure {
520 my ($self) = @_;
521
522 $self->realloc;
523 $self->update;
524}
394 525
395sub draw { 526sub draw {
396 my ($self) = @_; 527 my ($self) = @_;
397 528
398 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
415 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
416 glEnd; 547 glEnd;
417 glDisable GL_BLEND; 548 glDisable GL_BLEND;
418 } 549 }
419 550
420 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
421 glPushMatrix; 552 glPushMatrix;
422 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 556 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
427 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
428 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
429 glEnd; 560 glEnd;
430 glPopMatrix; 561 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 563 }
433} 564}
434 565
435sub _draw { 566sub _draw {
436 my ($self) = @_; 567 my ($self) = @_;
437 568
438 warn "no draw defined for $self\n"; 569 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} 570}
497 571
498sub DESTROY { 572sub DESTROY {
499 my ($self) = @_; 573 my ($self) = @_;
500 574
… …
558 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
559 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
560} 634}
561 635
562sub size_request { 636sub size_request {
563 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
564} 640}
565 641
566sub draw { } 642sub draw { }
567 643
568############################################################################# 644#############################################################################
… …
597 $self->{children} = [ 673 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 675 @{$self->{children}}, @widgets
600 ]; 676 ];
601 677
602 $self->check_size (1); 678 $self->realloc;
603 $self->update;
604} 679}
605 680
606sub children { 681sub children {
607 @{ $_[0]{children} } 682 @{ $_[0]{children} }
608} 683}
… …
613 delete $child->{parent}; 688 delete $child->{parent};
614 $child->hide; 689 $child->hide;
615 690
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 692
618 $self->check_size; 693 $self->realloc;
619 $self->update;
620} 694}
621 695
622sub clear { 696sub clear {
623 my ($self) = @_; 697 my ($self) = @_;
624 698
… …
628 for (@$children) { 702 for (@$children) {
629 delete $_->{parent}; 703 delete $_->{parent};
630 $_->hide; 704 $_->hide;
631 } 705 }
632 706
633 $self->check_size; 707 $self->realloc;
634 $self->update;
635} 708}
636 709
637sub find_widget { 710sub find_widget {
638 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
639 712
… …
692sub size_request { 765sub size_request {
693 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
694} 767}
695 768
696sub size_allocate { 769sub size_allocate {
697 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
698 771
699 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
700} 773}
701 774
702############################################################################# 775#############################################################################
… …
719 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
720 $self->SUPER::update; 793 $self->SUPER::update;
721} 794}
722 795
723sub size_allocate { 796sub size_allocate {
724 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
725 798
726 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
727 $self->update; 800 $self->update
801 if $changed;
728} 802}
729 803
730sub _render { 804sub _render {
731 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
732} 806}
… …
763 837
764package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
765 839
766our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
767 841
842sub new {
843 my $class = shift;
844
845 $class->SUPER::new (
846 scroll_x => 0,
847 scroll_y => 1,
848 @_,
849 )
850}
851
768sub size_request { 852sub size_request {
769 my ($self) = @_; 853 my ($self) = @_;
770 854
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
772 856
773 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
774} 861}
775 862
776sub size_allocate { 863sub size_allocate {
777 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
778 865
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
780# $w = $self->{w}; 867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
781 $self->child->configure (0, 0, $cw, $ch); 869 $self->child->configure (0, 0, $w, $h);
782 $self->update; 870 $self->update;
783} 871}
784 872
785sub set_offset { 873sub set_offset {
786 my ($self, $x, $y) = @_; 874 my ($self, $x, $y) = @_;
… …
837 my $class = shift; 925 my $class = shift;
838 926
839 my $self; 927 my $self;
840 928
841 my $slider = new CFClient::UI::Slider 929 my $slider = new CFClient::UI::Slider
842 vertical => 1, 930 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 931 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 932 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 933 $self->{vp}->set_offset (0, $_[1]);
846 }, 934 },
847 ; 935 ;
848 936
849 $self = $class->SUPER::new ( 937 $self = $class->SUPER::new (
… …
857 $self->add ($self->{slider}); 945 $self->add ($self->{slider});
858 946
859 $self 947 $self
860} 948}
861 949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
862sub size_allocate { 960sub size_allocate {
863 my ($self, $w, $h) = @_; 961 my ($self, $w, $h, $changed) = @_;
864 962
865 $self->SUPER::size_allocate ($w, $h); 963 $self->SUPER::size_allocate ($w, $h, $changed);
866 964
867 my $child = $self->{vp}->child; 965 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869} 967}
870 968
… …
917 1015
918our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
919 1017
920use CFClient::OpenGL; 1018use CFClient::OpenGL;
921 1019
922my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 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); 1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1027
926sub new { 1028sub new {
927 my $class = shift; 1029 my $class = shift;
928
929 # TODO: user_x, user_y, overwrite moveto?
930 1030
931 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1034 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
937 @_ 1038 @_
938 ); 1039 );
939 1040
940 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
941 align => 0, 1042 align => 0,
… …
960 $h + $self->border * 2, 1061 $h + $self->border * 2,
961 ) 1062 )
962} 1063}
963 1064
964sub size_allocate { 1065sub size_allocate {
965 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
966 1069
967 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
969 1072
970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
994 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
995 1098
996 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
998 1101
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size;
1003 }; 1107 };
1004 1108
1005 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1113 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
1011 1115
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1117
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update;
1016 }; 1119 };
1017 } 1120 }
1018} 1121}
1019 1122
1020sub button_up { 1123sub button_up {
… …
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1143
1041 my $border = $self->border; 1144 my $border = $self->border;
1042 1145
1043 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1151
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
1051 1154
1052 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
1055
1056 glColor @{ $self->{bg} };
1057
1058 $bg->{s} = $rep_x;
1059 $bg->{t} = $rep_y;
1060 $bg->{wrap_mode} = 1;
1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1160 }
1063 1161
1064 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
1065 1163
… …
1081sub new { 1179sub new {
1082 my $class = shift; 1180 my $class = shift;
1083 1181
1084 $class->SUPER::new ( 1182 $class->SUPER::new (
1085 col_expand => [], 1183 col_expand => [],
1086 @_ 1184 @_,
1087 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1190}
1089 1191
1090sub add { 1192sub add {
1091 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1092 1194
1093 $child->set_parent ($self); 1195 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1095 1197
1096 $child->check_size; 1198 $self->realloc;
1097} 1199}
1098 1200
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1202sub clear {
1105 my ($self) = @_; 1203 my ($self) = @_;
1106 1204
1107 my @children = $self->children; 1205 my @children = $self->children;
1108 delete $self->{children}; 1206 delete $self->{children};
… …
1110 for (@children) { 1208 for (@children) {
1111 delete $_->{parent}; 1209 delete $_->{parent};
1112 $_->hide; 1210 $_->hide;
1113 } 1211 }
1114 1212
1115 $self->update; 1213 $self->realloc;
1116} 1214}
1117 1215
1118sub get_wh { 1216sub get_wh {
1119 my ($self) = @_; 1217 my ($self) = @_;
1120 1218
… …
1147 (sum @$hs), 1245 (sum @$hs),
1148 ) 1246 )
1149} 1247}
1150 1248
1151sub size_allocate { 1249sub size_allocate {
1152 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1153 1251
1154 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1155 1253
1156 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
1158 1256
1159 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1314 }
1217} 1315}
1218 1316
1219############################################################################# 1317#############################################################################
1220 1318
1319package CFClient::UI::Box;
1320
1321our @ISA = CFClient::UI::Container::;
1322
1323sub size_request {
1324 my ($self) = @_;
1325
1326 $self->{vertical}
1327 ? (
1328 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1330 )
1331 : (
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 )
1335}
1336
1337sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_;
1339
1340 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children};
1342
1343 my @req;
1344
1345 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children;
1347 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1349 my $req = List::Util::sum @req;
1350
1351 if ($req > $space) {
1352 # ah well, not enough space
1353 $_ *= $space / $req for @req;
1354 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1356
1357 $space = ($space - $req) / $expand; # remaining space to give away
1358
1359 $req[$_] += $space * $children->[$_]{expand}
1360 for 0 .. $#$children;
1361 }
1362 }
1363
1364 CFClient::UI::harmonize \@req;
1365
1366 my $pos = 0;
1367 for (0 .. $#$children) {
1368 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370
1371 $pos += $alloc;
1372 }
1373
1374 1
1375}
1376
1377#############################################################################
1378
1221package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1222 1380
1223# TODO: wrap into common Box base class
1224
1225our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1226 1382
1227sub size_request { 1383sub new {
1228 my ($self) = @_; 1384 my $class = shift;
1229 1385
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1231 1387 vertical => 0,
1232 ( 1388 @_,
1233 (List::Util::sum map $_->[0], @alloc),
1234 (List::Util::max map $_->[1], @alloc),
1235 ) 1389 )
1236} 1390}
1237 1391
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############################################################################# 1392#############################################################################
1280 1393
1281package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1282 1395
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1286 1397
1287sub size_request { 1398sub new {
1288 my ($self) = @_; 1399 my $class = shift;
1289 1400
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1291 1402 vertical => 1,
1292 ( 1403 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1404 )
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} 1405}
1336 1406
1337############################################################################# 1407#############################################################################
1338 1408
1339package CFClient::UI::Label; 1409package CFClient::UI::Label;
… …
1356 ellipsise => 3, # end 1426 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1427 layout => (new CFClient::Layout),
1358 fontsize => 1, 1428 fontsize => 1,
1359 align => -1, 1429 align => -1,
1360 valign => -1, 1430 valign => -1,
1361 padding => 2, 1431 padding_x => 2,
1432 padding_y => 2,
1362 can_events => 0, 1433 can_events => 0,
1363 %arg 1434 %arg
1364 ); 1435 );
1365 1436
1366 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1402 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1403 1474
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1406 1477
1478 $self->realloc;
1407 $self->update; 1479 $self->update;
1408 $self->check_size;
1409} 1480}
1410 1481
1411sub set_markup { 1482sub set_markup {
1412 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1413 1484
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1489
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1421 1492
1493 $self->realloc;
1422 $self->update; 1494 $self->update;
1423 $self->check_size;
1424} 1495}
1425 1496
1426sub size_request { 1497sub size_request {
1427 my ($self) = @_; 1498 my ($self) = @_;
1428 1499
… …
1442 1513
1443 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1445 } 1516 }
1446 1517
1447 ( 1518 ($w, $h)
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1519}
1452 1520
1453sub size_allocate { 1521sub size_allocate {
1454 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1455 1523
1456 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1457} 1526}
1458 1527
1459sub set_fontsize { 1528sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1461 1530
1462 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1532 delete $self->{texture};
1464 1533
1465 $self->update; 1534 $self->realloc;
1466 $self->check_size;
1467} 1535}
1468 1536
1469sub _draw { 1537sub _draw {
1470 my ($self) = @_; 1538 my ($self) = @_;
1471 1539
… …
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1549
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1483 1551
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1554 : ($self->{w} - $tex->{w}) * 0.5);
1487 1555
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1558 : ($self->{h} - $tex->{h}) * 0.5);
1491 1559
1492 $tex 1560 $tex
1493 }; 1561 };
1494 1562
… …
1551sub set_text { 1619sub set_text {
1552 my ($self, $text) = @_; 1620 my ($self, $text) = @_;
1553 1621
1554 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1623 $self->_set_text ($text);
1556 $self->update; 1624
1557 $self->check_size; 1625 $self->realloc;
1558} 1626}
1559 1627
1560sub get_text { 1628sub get_text {
1561 $_[0]{text} 1629 $_[0]{text}
1562} 1630}
… …
1595 } elsif ($uni) { 1663 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1597 } 1665 }
1598 1666
1599 $self->_set_text ($text); 1667 $self->_set_text ($text);
1600 $self->update; 1668
1601 $self->check_size; 1669 $self->realloc;
1602} 1670}
1603 1671
1604sub focus_in { 1672sub focus_in {
1605 my ($self) = @_; 1673 my ($self) = @_;
1606 1674
… …
1733 1801
1734sub new { 1802sub new {
1735 my $class = shift; 1803 my $class = shift;
1736 1804
1737 $class->SUPER::new ( 1805 $class->SUPER::new (
1738 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1739 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1741 can_hover => 1, 1810 can_hover => 1,
1742 align => 0, 1811 align => 0,
1743 valign => 0, 1812 valign => 0,
… …
1790 1859
1791sub new { 1860sub new {
1792 my $class = shift; 1861 my $class = shift;
1793 1862
1794 $class->SUPER::new ( 1863 $class->SUPER::new (
1795 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1796 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 1868 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 1869 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 1870 state => 0,
… …
1804} 1874}
1805 1875
1806sub size_request { 1876sub size_request {
1807 my ($self) = @_; 1877 my ($self) = @_;
1808 1878
1809 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1810} 1880}
1811 1881
1812sub button_down { 1882sub button_down {
1813 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1814 1884
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1819 } 1889 }
1820} 1890}
1821 1891
1822sub _draw { 1892sub _draw {
1823 my ($self) = @_; 1893 my ($self) = @_;
1824 1894
1825 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1826 1896
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 1898
1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1899 my ($w, $h) = @$self{qw(w h)};
1900
1901 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830 1902
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 1904
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 1906
… …
2099 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2173 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2174 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2175 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2106 vertical => 0, 2178 vertical => 0,
2107 can_hover => 1, 2179 can_hover => 1,
2108 inner_pad => 0.02, 2180 inner_pad => 0.02,
2109 @_ 2181 @_
2110 ); 2182 );
… …
2113 $self->update; 2185 $self->update;
2114 2186
2115 $self 2187 $self
2116} 2188}
2117 2189
2190sub changed { }
2191
2118sub set_range { 2192sub set_range {
2119 my ($self, $range) = @_; 2193 my ($self, $range) = @_;
2120 2194
2121 $self->{range} = $range; 2195 ($range, $self->{range}) = ($self->{range}, $range);
2122 2196
2123 $self->update; 2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2124} 2199}
2125 2200
2126sub set_value { 2201sub set_value {
2127 my ($self, $value) = @_; 2202 my ($self, $value) = @_;
2128 2203
… …
2147} 2222}
2148 2223
2149sub size_request { 2224sub size_request {
2150 my ($self) = @_; 2225 my ($self) = @_;
2151 2226
2152 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2228}
2157 2229
2158sub button_down { 2230sub button_down {
2159 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2160 2232
… …
2310 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2311 $self->reflow; 2383 $self->reflow;
2312} 2384}
2313 2385
2314sub size_allocate { 2386sub size_allocate {
2315 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2316 2388
2317 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2318 2392
2319 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2320 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2321 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2322 2396
… …
2511 2585
2512sub new { 2586sub new {
2513 my $class = shift; 2587 my $class = shift;
2514 2588
2515 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2516 state => 0, 2590 state => 0,
2517 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2518 @_ 2592 @_
2519 ); 2593 );
2520 2594
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2595 $self
2527} 2596}
2528 2597
2529sub toggle_flopper { 2598sub toggle_flopper {
2530 my ($self) = @_; 2599 my ($self) = @_;
2531 2600
2532 # TODO: use animation 2601 $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} 2602}
2544 2603
2545############################################################################# 2604#############################################################################
2546 2605
2547package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2579 2638
2580 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2581} 2640}
2582 2641
2583sub size_allocate { 2642sub size_allocate {
2584 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2585 2644
2645 return unless $changed;
2646
2586 $self->SUPER::size_allocate ($w - 4, $h - 4); 2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2648}
2649
2650sub visibility_change {
2651 my ($self, $visible) = @_;
2652
2653 return unless $visible;
2654
2655 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner}
2657 or return;
2658
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH;
2663
2664 $self->move_abs ($x, $y);
2665 });
2587} 2666}
2588 2667
2589sub _draw { 2668sub _draw {
2590 my ($self) = @_; 2669 my ($self) = @_;
2591 2670
… …
2608 glVertex $w, $h; 2687 glVertex $w, $h;
2609 glVertex $w, 0; 2688 glVertex $w, 0;
2610 glEnd; 2689 glEnd;
2611 2690
2612 glTranslate 2 - 0.375, 2 - 0.375; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2613 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2614} 2694}
2615 2695
2616############################################################################# 2696#############################################################################
2617 2697
… …
2623 2703
2624sub new { 2704sub new {
2625 my $class = shift; 2705 my $class = shift;
2626 2706
2627 my $self = $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2628 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2629 @_, 2710 @_,
2630 ); 2711 );
2631 2712
2632 if ($self->{anim} && $self->{animspeed}) { 2713 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2714 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2773 $self->SUPER::DESTROY;
2693} 2774}
2694 2775
2695############################################################################# 2776#############################################################################
2696 2777
2697package CFClient::UI::InventoryItem; 2778package CFClient::UI::Inventory;
2698 2779
2699our @ISA = CFClient::UI::HBox::; 2780our @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 2781
2727sub new { 2782sub new {
2728 my $class = shift; 2783 my $class = shift;
2729 2784
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 ( 2785 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), 2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2818 @_, 2787 @_,
2819 ); 2788 );
2820 2789
2821 $self 2790 $self
2822} 2791}
… …
2832 or ($a->{name} cmp $b->{name}) 2801 or ($a->{name} cmp $b->{name})
2833 } @$items; 2802 } @$items;
2834 2803
2835 $self->{real_items} = \@items; 2804 $self->{real_items} = \@items;
2836 2805
2806 my $row = 0;
2837 for my $item (@items) { 2807 for my $item (@items) {
2838 $item->{item} = $item; 2808 CFClient::Item::update_widgets $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842 2809
2843 my $i = 0; 2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2844 for (@items) { 2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2845 $self->{scrolled}->add (0, $i, $_); 2812 $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 2813
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2814 $row++;
2851} 2815 }
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856} 2816}
2857 2817
2858############################################################################# 2818#############################################################################
2859 2819
2860package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
… …
2902 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 2863 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2905 2865
2906 $self->show; 2866 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908} 2868}
2909 2869
2910sub mouse_motion { 2870sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2912 2872
… …
2992sub add { 2952sub add {
2993 my ($self, $text, %arg) = @_; 2953 my ($self, $text, %arg) = @_;
2994 2954
2995 $text =~ s/^\s+//; 2955 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2997 2959
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 2961
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 2963
… …
3044use CFClient::OpenGL; 3006use CFClient::OpenGL;
3045 3007
3046sub new { 3008sub new {
3047 my $class = shift; 3009 my $class = shift;
3048 3010
3049 $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
3012 visible => 1,
3050 @_, 3013 @_,
3051 ) 3014 );
3015
3016 Scalar::Util::weaken ($self->{root} = $self);
3017
3018 $self
3052} 3019}
3053 3020
3054sub configure { 3021sub configure {
3055 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
3056 3023
3057 $self->{w} = $w; 3024 $self->{w} = $w;
3058 $self->{h} = $h; 3025 $self->{h} = $h;
3059} 3026}
3060 3027
3061sub check_size { 3028sub reconfigure {
3062 my ($self) = @_; 3029 my ($self) = @_;
3063 3030
3031 $self->SUPER::reconfigure;
3032
3064 $self->size_allocate ($self->{w}, $self->{h}) 3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3065 if $self->{w}; 3034 if $self->{w};
3066} 3035}
3067 3036
3068sub size_request { 3037sub size_request {
3069 my ($self) = @_; 3038 my ($self) = @_;
3070 3039
3071 ($self->{w}, $self->{h}) 3040 ($self->{w}, $self->{h})
3072} 3041}
3073 3042
3043sub _to_pixel {
3044 my ($coord, $size, $max) = @_;
3045
3046 $coord =
3047 $coord eq "center" ? ($max - $size) * 0.5
3048 : $coord eq "max" ? $max
3049 : $coord;
3050
3051 $coord = 0 if $coord < 0;
3052 $coord = $max - $size if $coord > $max - $size;
3053
3054 int $coord + 0.5
3055}
3056
3074sub size_allocate { 3057sub size_allocate {
3075 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h, $changed) = @_;
3076 3059
3077 for my $child ($self->children) { 3060 for my $child ($self->children) {
3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079 3062
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3063 $X = $child->{force_x} if exists $child->{force_x};
3081 if exists $child->{req_x}; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3082 3065
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3066 $X = _to_pixel $X, $W, $self->{w};
3084 if exists $child->{req_y}; 3067 $Y = _to_pixel $Y, $H, $self->{h};
3085
3086 $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;
3088 3068
3089 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
3090 } 3070 }
3091} 3071}
3092 3072
… …
3103} 3083}
3104 3084
3105sub update { 3085sub update {
3106 my ($self) = @_; 3086 my ($self) = @_;
3107 3087
3108 $self->check_size;
3109 $::WANT_REFRESH++; 3088 $::WANT_REFRESH++;
3110} 3089}
3111 3090
3112sub add { 3091sub add {
3113 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3114 3093
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3094 $_->{is_toplevel} = 1
3123 3095 for @children;
3124 # integerise window positions
3125 $child->{x} = int $child->{x};
3126 $child->{y} = int $child->{y};
3127 }
3128 3096
3129 $self->SUPER::add (@children); 3097 $self->SUPER::add (@children);
3130} 3098}
3131 3099
3132sub remove { 3100sub remove {
3133 my ($self, @children) = @_; 3101 my ($self, @children) = @_;
3134 3102
3135 $self->SUPER::remove (@children); 3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3136 3107
3137 while (@children) { 3108 while (@children) {
3138 my $w = pop @children; 3109 my $w = pop @children;
3139 push @children, $w->children; 3110 push @children, $w->children;
3140 $w->set_invisible; 3111 $w->set_invisible;
… …
3159 while ($self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
3160 $_->() 3131 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{refresh_hook}};
3162 } 3133 }
3163 3134
3164 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
3165 my @queue = ([], []); 3136 my @queue;
3166 3137
3167 for (;;) { 3138 while () {
3168 if ($self->{check_size}) { 3139 if ($self->{realloc}) {
3169 # heuristic: check containers last 3140 #TODO use array-of-depth approach
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3141
3171 for values %{delete $self->{check_size}} 3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
3172 } 3144 }
3173 3145
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3146 my $widget = pop @queue || last;
3175 3147
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3148 $widget->{visible} or last; # do not resize invisible widgets
3177 ? @$widget{qw(user_w user_h)} 3149
3178 : $widget->size_request; 3150 my ($w, $h) = $widget->size_request;
3179 3151
3180 if (delete $widget->{force_alloc} 3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3154
3183 3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3184 $widget->{req_w} = $w; 3158 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h; 3159 $widget->{req_h} = $h;
3186 3160
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3188 3162
3189 $widget->{parent}->check_size 3163 push @queue, $widget->{parent}
3190 if $widget->{parent}; 3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3191 }
3192 } 3165 }
3193 } 3166 }
3194 3167
3195 while ($self->{size_alloc}) { 3168 while (my $size_alloc = delete $self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) { 3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3197 my ($widget, $w, $h) = @$_; 3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3198 3177
3199 $w = 0 if $w < 0; 3178 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3179 $h = 0 if $h < 0;
3201 3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3202 $widget->{w} = $w; 3186 $widget->{w} = $w;
3203 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3204 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h, $changed);
3205 } 3190 }
3206 } 3191 }
3207 3192
3208 while ($self->{post_alloc_hook}) { 3193 while ($self->{post_alloc_hook}) {
3209 $_->() 3194 $_->()

Diff Legend

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