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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 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};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
40 if (!$GRAB) { 45 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
43 48
44 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
45 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
46 53
47 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
48 55
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 57
51 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 59 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 60 }
63 61
64 return; 62 return;
65 } 63 }
66 } 64 }
… …
172sub rescale_widgets { 170sub rescale_widgets {
173 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
174 172
175 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $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
185 } 188 }
186 } 189 }
187 190
188 reconfigure_widgets; 191 reconfigure_widgets;
189} 192}
… …
198 201
199sub new { 202sub new {
200 my $class = shift; 203 my $class = shift;
201 204
202 my $self = bless { 205 my $self = bless {
203 x => 0, 206 x => "center",
204 y => 0, 207 y => "center",
205 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
206 can_events => 1, 211 can_events => 1,
207 @_ 212 @_
208 }, $class; 213 }, $class;
214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 216
210 for (keys %$self) { 217 for (keys %$self) {
211 if (/^on_(.*)$/) { 218 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
213 } 220 }
214 } 221 }
215 222
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
223 } 233 }
224 234
225 $self 235 $self
226} 236}
227 237
… …
232 %$self = (); 242 %$self = ();
233} 243}
234 244
235sub show { 245sub show {
236 my ($self) = @_; 246 my ($self) = @_;
247
237 return if $self->{parent}; 248 return if $self->{parent};
238 249
239 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
240} 251}
241 252
242sub show_centered { 253sub set_visible {
243 my ($self) = @_; 254 my ($self) = @_;
255
244 return if $self->{parent}; 256 return if $self->{visible};
245 257
246 $self->show; 258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
247 260
248 $CFClient::UI::ROOT->on_post_alloc ( 261 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 262
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 263 $self->realloc if !exists $self->{req_w};
251 }, 264
252 ); 265 $_->set_visible for $self->children;
253} 266}
254 267
255sub set_invisible { 268sub set_invisible {
256 my ($self) = @_; 269 my ($self) = @_;
257 270
258 # broken show/hide model 271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
259 274
260 delete $self->{root}; 275 delete $self->{root};
261 delete $self->{visible}; 276 delete $self->{visible};
262 277
263 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
265 280
266 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
268 283
269 $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;
270} 304}
271 305
272sub hide { 306sub hide {
273 my ($self) = @_; 307 my ($self) = @_;
274 308
… …
276 310
277 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
278 if $self->{parent}; 312 if $self->{parent};
279} 313}
280 314
281sub move { 315sub move_abs {
282 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
283 317
284 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
287 321
288 $self->update; 322 $self->update;
289} 323}
290 324
291sub set_size { 325sub set_size {
292 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
293 327
294 $self->{user_w} = $w; 328 $self->{force_w} = $w;
295 $self->{user_h} = $h; 329 $self->{force_h} = $h;
296 330
297 $self->check_size; 331 $self->realloc;
298} 332}
299 333
300sub size_request { 334sub size_request {
301 require Carp; 335 require Carp;
302 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
304 338
305sub configure { 339sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
307 341
308 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
311 347
312 # use alignment to adjust x, y 348 # use alignment to adjust x, y
313 349
314 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 352 }
319 353
320 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 355 $self->{x} = $x;
322 $self->{y} = $y; 356 $self->{y} = $y;
323 $self->update; 357 $self->update;
324 } 358 }
325 359
326 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
361 return unless $self->{visible};
362
327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
328 } 364 }
329} 365}
330 366
331sub size_allocate { 367sub size_allocate {
332 # nothing to be done 368 # nothing to be done
333}
334
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340} 369}
341 370
342sub children { 371sub children {
343} 372}
344 373
… …
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
426sub 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}
427 525
428sub draw { 526sub draw {
429 my ($self) = @_; 527 my ($self) = @_;
430 528
431 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
448 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
449 glEnd; 547 glEnd;
450 glDisable GL_BLEND; 548 glDisable GL_BLEND;
451 } 549 }
452 550
453 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
454 glPushMatrix; 552 glPushMatrix;
455 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 556 glVertex 0 , 0;
… …
469 my ($self) = @_; 567 my ($self) = @_;
470 568
471 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
472} 570}
473 571
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 572sub DESTROY {
535 my ($self) = @_; 573 my ($self) = @_;
536 574
537 delete $WIDGET{$self+0}; 575 delete $WIDGET{$self+0};
538 #$self->deactivate; 576 #$self->deactivate;
… …
594 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
596} 634}
597 635
598sub size_request { 636sub size_request {
599 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
600} 640}
601 641
602sub draw { } 642sub draw { }
603 643
604############################################################################# 644#############################################################################
… …
633 $self->{children} = [ 673 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 675 @{$self->{children}}, @widgets
636 ]; 676 ];
637 677
638 $self->check_size (1); 678 $self->realloc;
639 $self->update;
640} 679}
641 680
642sub children { 681sub children {
643 @{ $_[0]{children} } 682 @{ $_[0]{children} }
644} 683}
… …
649 delete $child->{parent}; 688 delete $child->{parent};
650 $child->hide; 689 $child->hide;
651 690
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 692
654 $self->check_size (1); 693 $self->realloc;
655 $self->update;
656} 694}
657 695
658sub clear { 696sub clear {
659 my ($self) = @_; 697 my ($self) = @_;
660 698
… …
664 for (@$children) { 702 for (@$children) {
665 delete $_->{parent}; 703 delete $_->{parent};
666 $_->hide; 704 $_->hide;
667 } 705 }
668 706
669 $self->check_size; 707 $self->realloc;
670 $self->update;
671} 708}
672 709
673sub find_widget { 710sub find_widget {
674 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
675 712
… …
728sub size_request { 765sub size_request {
729 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
730} 767}
731 768
732sub size_allocate { 769sub size_allocate {
733 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
734 771
735 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
736} 773}
737 774
738############################################################################# 775#############################################################################
… …
755 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
756 $self->SUPER::update; 793 $self->SUPER::update;
757} 794}
758 795
759sub size_allocate { 796sub size_allocate {
760 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
761 798
762 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
763 $self->update; 800 $self->update
801 if $changed;
764} 802}
765 803
766sub _render { 804sub _render {
767 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
768} 806}
… …
812} 850}
813 851
814sub size_request { 852sub size_request {
815 my ($self) = @_; 853 my ($self) = @_;
816 854
817 @$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)};
818 856
819 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
820} 861}
821 862
822sub size_allocate { 863sub size_allocate {
823 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
824 865
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827 868
828 $self->child->configure (0, 0, $w, $h); 869 $self->child->configure (0, 0, $w, $h);
… …
915 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
917} 958}
918 959
919sub size_allocate { 960sub size_allocate {
920 my ($self, $w, $h) = @_; 961 my ($self, $w, $h, $changed) = @_;
921 962
922 $self->SUPER::size_allocate ($w, $h); 963 $self->SUPER::size_allocate ($w, $h, $changed);
923 964
924 my $child = $self->{vp}->child; 965 my $child = $self->{vp}->child;
925 $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]);
926} 967}
927 968
… …
974 1015
975our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
976 1017
977use CFClient::OpenGL; 1018use CFClient::OpenGL;
978 1019
979my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 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);
982 1027
983sub new { 1028sub new {
984 my $class = shift; 1029 my $class = shift;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1030
988 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1034 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
994 @_ 1038 @_
995 ); 1039 );
996 1040
997 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
998 align => 0, 1042 align => 0,
… …
1017 $h + $self->border * 2, 1061 $h + $self->border * 2,
1018 ) 1062 )
1019} 1063}
1020 1064
1021sub size_allocate { 1065sub size_allocate {
1022 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
1023 1069
1024 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
1026 1072
1027 $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)
… …
1051 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
1052 1098
1053 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
1055 1101
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1104
1061 $self->check_size; 1105 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1062 }; 1107 };
1063 1108
1064 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1113 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
1070 1115
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1117
1073 $self->{user_x} = $bx + $x - $ox; 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy;
1075 $self->move ($self->{user_x}, $self->{user_y});
1076 $self->update;
1077 }; 1119 };
1078 } 1120 }
1079} 1121}
1080 1122
1081sub button_up { 1123sub button_up {
… …
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1143
1102 my $border = $self->border; 1144 my $border = $self->border;
1103 1145
1104 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1151
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
1112 1154
1113 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
1116
1117 glColor @{ $self->{bg} };
1118
1119 $bg->{s} = $rep_x;
1120 $bg->{t} = $rep_y;
1121 $bg->{wrap_mode} = 1;
1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1160 }
1124 1161
1125 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
1126 1163
… …
1156 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1157 1194
1158 $child->set_parent ($self); 1195 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1160 1197
1161 $self->check_size (1); 1198 $self->realloc;
1162} 1199}
1163 1200
1164# TODO: move to container class maybe? send children a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
1165sub clear { 1202sub clear {
1166 my ($self) = @_; 1203 my ($self) = @_;
… …
1171 for (@children) { 1208 for (@children) {
1172 delete $_->{parent}; 1209 delete $_->{parent};
1173 $_->hide; 1210 $_->hide;
1174 } 1211 }
1175 1212
1176 $self->check_size (1); 1213 $self->realloc;
1177 $self->update;
1178} 1214}
1179 1215
1180sub get_wh { 1216sub get_wh {
1181 my ($self) = @_; 1217 my ($self) = @_;
1182 1218
… …
1209 (sum @$hs), 1245 (sum @$hs),
1210 ) 1246 )
1211} 1247}
1212 1248
1213sub size_allocate { 1249sub size_allocate {
1214 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1215 1251
1216 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1217 1253
1218 my $req_w = (sum @$ws) || 1; 1254 my $req_w = (sum @$ws) || 1;
1219 my $req_h = (sum @$hs) || 1; 1255 my $req_h = (sum @$hs) || 1;
… …
1278 } 1314 }
1279} 1315}
1280 1316
1281############################################################################# 1317#############################################################################
1282 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
1283package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1284 1380
1285# TODO: wrap into common Box base class
1286
1287our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1288 1382
1289sub size_request { 1383sub new {
1290 my ($self) = @_; 1384 my $class = shift;
1291 1385
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1293 1387 vertical => 0,
1294 ( 1388 @_,
1295 (List::Util::sum map $_->[0], @alloc),
1296 (List::Util::max map $_->[1], @alloc),
1297 ) 1389 )
1298} 1390}
1299 1391
1300sub size_allocate {
1301 my ($self, $w, $h) = @_;
1302
1303 ($h, $w) = ($w, $h);
1304
1305 my $children = $self->{children};
1306
1307 my @h = map $_->{req_w}, @$children;
1308
1309 my $req_h = List::Util::sum @h;
1310
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } else {
1315 my $exp = List::Util::sum map $_->{expand}, @$children;
1316 $exp ||= 1;
1317
1318 for (0 .. $#$children) {
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 }
1325 }
1326
1327 CFClient::UI::harmonize \@h;
1328
1329 my $y = 0;
1330 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_];
1333 $child->configure ($y, 0, $h, $w);
1334
1335 $y += $h;
1336 }
1337
1338 1
1339}
1340
1341############################################################################# 1392#############################################################################
1342 1393
1343package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1344 1395
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1348 1397
1349sub size_request { 1398sub new {
1350 my ($self) = @_; 1399 my $class = shift;
1351 1400
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1353 1402 vertical => 1,
1354 ( 1403 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1404 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1405}
1398 1406
1399############################################################################# 1407#############################################################################
1400 1408
1401package CFClient::UI::Label; 1409package CFClient::UI::Label;
… …
1418 ellipsise => 3, # end 1426 ellipsise => 3, # end
1419 layout => (new CFClient::Layout), 1427 layout => (new CFClient::Layout),
1420 fontsize => 1, 1428 fontsize => 1,
1421 align => -1, 1429 align => -1,
1422 valign => -1, 1430 valign => -1,
1423 padding => 2, 1431 padding_x => 2,
1432 padding_y => 2,
1424 can_events => 0, 1433 can_events => 0,
1425 %arg 1434 %arg
1426 ); 1435 );
1427 1436
1428 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1464 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1465 1474
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1468 1477
1478 $self->realloc;
1469 $self->update; 1479 $self->update;
1470 $self->check_size;
1471} 1480}
1472 1481
1473sub set_markup { 1482sub set_markup {
1474 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1475 1484
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1489
1481 $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;
1482 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1483 1492
1493 $self->realloc;
1484 $self->update; 1494 $self->update;
1485 $self->check_size;
1486} 1495}
1487 1496
1488sub size_request { 1497sub size_request {
1489 my ($self) = @_; 1498 my ($self) = @_;
1490 1499
… …
1504 1513
1505 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1507 } 1516 }
1508 1517
1509 ( 1518 ($w, $h)
1510 $w + $self->{padding} * 2,
1511 $h + $self->{padding} * 2,
1512 )
1513} 1519}
1514 1520
1515sub size_allocate { 1521sub size_allocate {
1516 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1517 1523
1518 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1519} 1526}
1520 1527
1521sub set_fontsize { 1528sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1523 1530
1524 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1532 delete $self->{texture};
1526 1533
1527 $self->update; 1534 $self->realloc;
1528 $self->check_size;
1529} 1535}
1530 1536
1531sub _draw { 1537sub _draw {
1532 my ($self) = @_; 1538 my ($self) = @_;
1533 1539
… …
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543 1549
1544 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1545 1551
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548 : ($self->{w} - $tex->{w}) * 0.5); 1554 : ($self->{w} - $tex->{w}) * 0.5);
1549 1555
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552 : ($self->{h} - $tex->{h}) * 0.5); 1558 : ($self->{h} - $tex->{h}) * 0.5);
1553 1559
1554 $tex 1560 $tex
1555 }; 1561 };
1556 1562
… …
1613sub set_text { 1619sub set_text {
1614 my ($self, $text) = @_; 1620 my ($self, $text) = @_;
1615 1621
1616 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1623 $self->_set_text ($text);
1618 $self->update; 1624
1619 $self->check_size; 1625 $self->realloc;
1620} 1626}
1621 1627
1622sub get_text { 1628sub get_text {
1623 $_[0]{text} 1629 $_[0]{text}
1624} 1630}
… …
1657 } elsif ($uni) { 1663 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1659 } 1665 }
1660 1666
1661 $self->_set_text ($text); 1667 $self->_set_text ($text);
1662 $self->update; 1668
1663 $self->check_size; 1669 $self->realloc;
1664} 1670}
1665 1671
1666sub focus_in { 1672sub focus_in {
1667 my ($self) = @_; 1673 my ($self) = @_;
1668 1674
… …
1795 1801
1796sub new { 1802sub new {
1797 my $class = shift; 1803 my $class = shift;
1798 1804
1799 $class->SUPER::new ( 1805 $class->SUPER::new (
1800 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1801 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1802 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1803 can_hover => 1, 1810 can_hover => 1,
1804 align => 0, 1811 align => 0,
1805 valign => 0, 1812 valign => 0,
… …
1852 1859
1853sub new { 1860sub new {
1854 my $class = shift; 1861 my $class = shift;
1855 1862
1856 $class->SUPER::new ( 1863 $class->SUPER::new (
1857 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1858 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1859 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2], 1868 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5], 1869 active_bg => [1, 1, 1, 0.5],
1862 state => 0, 1870 state => 0,
… …
1866} 1874}
1867 1875
1868sub size_request { 1876sub size_request {
1869 my ($self) = @_; 1877 my ($self) = @_;
1870 1878
1871 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1872} 1880}
1873 1881
1874sub button_down { 1882sub button_down {
1875 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1876 1884
1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1880 $self->_emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1881 } 1889 }
1882} 1890}
1883 1891
1884sub _draw { 1892sub _draw {
1885 my ($self) = @_; 1893 my ($self) = @_;
1886 1894
1887 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1888 1896
1889 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890 1898
1891 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;
1892 1902
1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894 1904
1895 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896 1906
… …
2161 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2173 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2174 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2175 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2168 vertical => 0, 2178 vertical => 0,
2169 can_hover => 1, 2179 can_hover => 1,
2170 inner_pad => 0.02, 2180 inner_pad => 0.02,
2171 @_ 2181 @_
2172 ); 2182 );
… …
2175 $self->update; 2185 $self->update;
2176 2186
2177 $self 2187 $self
2178} 2188}
2179 2189
2190sub changed { }
2191
2180sub set_range { 2192sub set_range {
2181 my ($self, $range) = @_; 2193 my ($self, $range) = @_;
2182 2194
2183 ($range, $self->{range}) = ($self->{range}, $range); 2195 ($range, $self->{range}) = ($self->{range}, $range);
2184 2196
… …
2210} 2222}
2211 2223
2212sub size_request { 2224sub size_request {
2213 my ($self) = @_; 2225 my ($self) = @_;
2214 2226
2215 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2228}
2220 2229
2221sub button_down { 2230sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2223 2232
… …
2373 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2383 $self->reflow;
2375} 2384}
2376 2385
2377sub size_allocate { 2386sub size_allocate {
2378 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2379 2388
2380 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2381 2392
2382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2385 2396
… …
2579 state => 0, 2590 state => 0,
2580 on_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2581 @_ 2592 @_
2582 ); 2593 );
2583 2594
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2595 $self
2590} 2596}
2591 2597
2592sub toggle_flopper { 2598sub toggle_flopper {
2593 my ($self) = @_; 2599 my ($self) = @_;
2594 2600
2595 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2602}
2607 2603
2608############################################################################# 2604#############################################################################
2609 2605
2610package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2642 2638
2643 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2644} 2640}
2645 2641
2646sub size_allocate { 2642sub size_allocate {
2647 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2648 2644
2645 return unless $changed;
2646
2649 $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 });
2650} 2666}
2651 2667
2652sub _draw { 2668sub _draw {
2653 my ($self) = @_; 2669 my ($self) = @_;
2654 2670
… …
2671 glVertex $w, $h; 2687 glVertex $w, $h;
2672 glVertex $w, 0; 2688 glVertex $w, 0;
2673 glEnd; 2689 glEnd;
2674 2690
2675 glTranslate 2 - 0.375, 2 - 0.375; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2676 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2677} 2694}
2678 2695
2679############################################################################# 2696#############################################################################
2680 2697
… …
2796 2813
2797 $row++; 2814 $row++;
2798 } 2815 }
2799} 2816}
2800 2817
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805
2806############################################################################# 2818#############################################################################
2807 2819
2808package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
2809 2821
2810our @ISA = CFClient::UI::FancyFrame::; 2822our @ISA = CFClient::UI::FancyFrame::;
… …
2850 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self; 2863 $GRAB = $self;
2852 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2853 2865
2854 $self->show; 2866 $self->show;
2855 $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);
2856} 2868}
2857 2869
2858sub mouse_motion { 2870sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2860 2872
… …
2994use CFClient::OpenGL; 3006use CFClient::OpenGL;
2995 3007
2996sub new { 3008sub new {
2997 my $class = shift; 3009 my $class = shift;
2998 3010
2999 $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
3000 visible => 1, 3012 visible => 1,
3001 @_, 3013 @_,
3002 ) 3014 );
3015
3016 Scalar::Util::weaken ($self->{root} = $self);
3017
3018 $self
3003} 3019}
3004 3020
3005sub configure { 3021sub configure {
3006 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
3007 3023
3008 $self->{w} = $w; 3024 $self->{w} = $w;
3009 $self->{h} = $h; 3025 $self->{h} = $h;
3010} 3026}
3011 3027
3012sub check_size { 3028sub reconfigure {
3013 my ($self) = @_; 3029 my ($self) = @_;
3014 3030
3031 $self->SUPER::reconfigure;
3032
3015 $self->size_allocate ($self->{w}, $self->{h}) 3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3016 if $self->{w}; 3034 if $self->{w};
3017} 3035}
3018 3036
3019sub size_request { 3037sub size_request {
3020 my ($self) = @_; 3038 my ($self) = @_;
3021 3039
3022 ($self->{w}, $self->{h}) 3040 ($self->{w}, $self->{h})
3023} 3041}
3024 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
3025sub size_allocate { 3057sub size_allocate {
3026 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h, $changed) = @_;
3027 3059
3028 for my $child ($self->children) { 3060 for my $child ($self->children) {
3029 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)};
3030 3062
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3063 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3033 3065
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3066 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3067 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3068
3040 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
3041 } 3070 }
3042} 3071}
3043 3072
… …
3054} 3083}
3055 3084
3056sub update { 3085sub update {
3057 my ($self) = @_; 3086 my ($self) = @_;
3058 3087
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3088 $::WANT_REFRESH++;
3061} 3089}
3062 3090
3063sub add { 3091sub add {
3064 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3065 3093
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3094 $_->{is_toplevel} = 1
3074 3095 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3096
3080 $self->SUPER::add (@children); 3097 $self->SUPER::add (@children);
3081} 3098}
3082 3099
3083sub remove { 3100sub remove {
3084 my ($self, @children) = @_; 3101 my ($self, @children) = @_;
3085 3102
3086 $self->SUPER::remove (@children); 3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3087 3107
3088 while (@children) { 3108 while (@children) {
3089 my $w = pop @children; 3109 my $w = pop @children;
3090 push @children, $w->children; 3110 push @children, $w->children;
3091 $w->set_invisible; 3111 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
3111 $_->() 3131 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{refresh_hook}};
3113 } 3133 }
3114 3134
3115 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
3116 my @queue; 3136 my @queue;
3117 3137
3118 for (;;) { 3138 while () {
3119 if ($self->{check_size}) { 3139 if ($self->{realloc}) {
3120 #TODO use array-of-depth approach 3140 #TODO use array-of-depth approach
3121 3141
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3123 @queue, values %{delete $self->{check_size}}; 3143 @queue, values %{delete $self->{realloc}};
3124 } 3144 }
3125 3145
3126 my $widget = pop @queue || last; 3146 my $widget = pop @queue || last;
3127 3147
3128 defined $widget->{visible} or last; # do not resize invisible widgets 3148 $widget->{visible} or last; # do not resize invisible widgets
3129 3149
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request; 3150 my ($w, $h) = $widget->size_request;
3133 3151
3134 if (delete $widget->{force_alloc} 3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3154
3137 3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3138 $widget->{req_w} = $w; 3158 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3159 $widget->{req_h} = $h;
3140 3160
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3142 3162
3143 $widget->{parent}->check_size 3163 push @queue, $widget->{parent}
3144 if $widget->{parent}; 3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3145 }
3146 } 3165 }
3147 } 3166 }
3148 3167
3149 while ($self->{size_alloc}) { 3168 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 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;
3152 3177
3153 $w = 0 if $w < 0; 3178 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3179 $h = 0 if $h < 0;
3155 3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3156 $widget->{w} = $w; 3186 $widget->{w} = $w;
3157 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3158 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h, $changed);
3159 } 3190 }
3160 } 3191 }
3161 3192
3162 while ($self->{post_alloc_hook}) { 3193 while ($self->{post_alloc_hook}) {
3163 $_->() 3194 $_->()

Diff Legend

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