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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

… …
9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %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}
19 43
20sub check_tooltip { 44sub check_tooltip {
21 if (!$GRAB) { 45 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
24 48
25 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
26 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
27 53
28 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
29 55
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 57
32 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 59 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 60 }
44 61
45 return; 62 return;
46 } 63 }
47 } 64 }
… …
153sub rescale_widgets { 170sub rescale_widgets {
154 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
155 172
156 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $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};
164 $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};
165 $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
166 } 188 }
167 } 189 }
168 190
169 reconfigure_widgets; 191 reconfigure_widgets;
170} 192}
… …
179 201
180sub new { 202sub new {
181 my $class = shift; 203 my $class = shift;
182 204
183 my $self = bless { 205 my $self = bless {
184 x => 0, 206 x => "center",
185 y => 0, 207 y => "center",
186 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
187 can_events => 1, 211 can_events => 1,
188 @_ 212 @_
189 }, $class; 213 }, $class;
190 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
191 for (keys %$self) { 217 for (keys %$self) {
192 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
194 } 220 }
195 } 221 }
196 222
197 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 }
198 234
199 $self 235 $self
200} 236}
201 237
202sub destroy { 238sub destroy {
… …
206 %$self = (); 242 %$self = ();
207} 243}
208 244
209sub show { 245sub show {
210 my ($self) = @_; 246 my ($self) = @_;
247
211 return if $self->{parent}; 248 return if $self->{parent};
212 249
213 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
214} 251}
215 252
216sub show_centered { 253sub set_visible {
217 my ($self) = @_; 254 my ($self) = @_;
255
218 return if $self->{parent}; 256 return if $self->{visible};
219 257
220 $self->show; 258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
221 260
222 $CFClient::UI::ROOT->on_post_alloc ( 261 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 262
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 263 $self->realloc if !exists $self->{req_w};
225 }, 264
226 ); 265 $_->set_visible for $self->children;
227} 266}
228 267
229sub set_invisible { 268sub set_invisible {
230 my ($self) = @_; 269 my ($self) = @_;
231 270
232 # broken show/hide model 271 return unless $self->{visible};
233 272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
234 delete $self->{visible}; 276 delete $self->{visible};
235 277
236 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
238 280
239 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
241 283
242 $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;
243} 304}
244 305
245sub hide { 306sub hide {
246 my ($self) = @_; 307 my ($self) = @_;
247 308
… …
249 310
250 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
251 if $self->{parent}; 312 if $self->{parent};
252} 313}
253 314
254sub move { 315sub move_abs {
255 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
256 317
257 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
258 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
259 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
260 321
261 $self->update; 322 $self->update;
262} 323}
263 324
264sub set_size { 325sub set_size {
265 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
266 327
267 $self->{user_w} = $w; 328 $self->{force_w} = $w;
268 $self->{user_h} = $h; 329 $self->{force_h} = $h;
269 330
270 $self->check_size; 331 $self->realloc;
271} 332}
272 333
273sub size_request { 334sub size_request {
274 require Carp; 335 require Carp;
275 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
277 338
278sub configure { 339sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
280 341
281 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
284 347
285 # use alignment to adjust x, y 348 # use alignment to adjust x, y
286 349
287 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 352 }
292 353
293 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 355 $self->{x} = $x;
295 $self->{y} = $y; 356 $self->{y} = $y;
296 $self->update; 357 $self->update;
297 } 358 }
298 359
299 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
361 return unless $self->{visible};
362
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
301 } 364 }
302} 365}
303 366
304sub size_allocate { 367sub size_allocate {
305 # nothing to be done 368 # nothing to be done
306}
307
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313} 369}
314 370
315sub children { 371sub children {
316} 372}
317 373
… …
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
399sub 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}
400 525
401sub draw { 526sub draw {
402 my ($self) = @_; 527 my ($self) = @_;
403 528
404 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
421 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
422 glEnd; 547 glEnd;
423 glDisable GL_BLEND; 548 glDisable GL_BLEND;
424 } 549 }
425 550
426 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
427 glPushMatrix; 552 glPushMatrix;
428 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
430 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 556 glVertex 0 , 0;
… …
442 my ($self) = @_; 567 my ($self) = @_;
443 568
444 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
445} 570}
446 571
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505}
506
507sub DESTROY { 572sub DESTROY {
508 my ($self) = @_; 573 my ($self) = @_;
509 574
510 delete $WIDGET{$self+0}; 575 delete $WIDGET{$self+0};
511 #$self->deactivate; 576 #$self->deactivate;
… …
567 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
569} 634}
570 635
571sub size_request { 636sub size_request {
572 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
573} 640}
574 641
575sub draw { } 642sub draw { }
576 643
577############################################################################# 644#############################################################################
… …
606 $self->{children} = [ 673 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 675 @{$self->{children}}, @widgets
609 ]; 676 ];
610 677
611 $self->check_size (1); 678 $self->realloc;
612 $self->update;
613} 679}
614 680
615sub children { 681sub children {
616 @{ $_[0]{children} } 682 @{ $_[0]{children} }
617} 683}
… …
622 delete $child->{parent}; 688 delete $child->{parent};
623 $child->hide; 689 $child->hide;
624 690
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 692
627 $self->check_size (1); 693 $self->realloc;
628 $self->update;
629} 694}
630 695
631sub clear { 696sub clear {
632 my ($self) = @_; 697 my ($self) = @_;
633 698
… …
637 for (@$children) { 702 for (@$children) {
638 delete $_->{parent}; 703 delete $_->{parent};
639 $_->hide; 704 $_->hide;
640 } 705 }
641 706
642 $self->check_size; 707 $self->realloc;
643 $self->update;
644} 708}
645 709
646sub find_widget { 710sub find_widget {
647 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
648 712
… …
701sub size_request { 765sub size_request {
702 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
703} 767}
704 768
705sub size_allocate { 769sub size_allocate {
706 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
707 771
708 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
709} 773}
710 774
711############################################################################# 775#############################################################################
… …
728 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
729 $self->SUPER::update; 793 $self->SUPER::update;
730} 794}
731 795
732sub size_allocate { 796sub size_allocate {
733 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
734 798
735 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
736 $self->update; 800 $self->update
801 if $changed;
737} 802}
738 803
739sub _render { 804sub _render {
740 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
741} 806}
… …
785} 850}
786 851
787sub size_request { 852sub size_request {
788 my ($self) = @_; 853 my ($self) = @_;
789 854
790 @$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)};
791 856
792 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
793} 861}
794 862
795sub size_allocate { 863sub size_allocate {
796 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
797 865
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
800 868
801 $self->child->configure (0, 0, $w, $h); 869 $self->child->configure (0, 0, $w, $h);
… …
857 my $class = shift; 925 my $class = shift;
858 926
859 my $self; 927 my $self;
860 928
861 my $slider = new CFClient::UI::Slider 929 my $slider = new CFClient::UI::Slider
862 vertical => 1, 930 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 931 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 932 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 933 $self->{vp}->set_offset (0, $_[1]);
866 }, 934 },
867 ; 935 ;
868 936
869 $self = $class->SUPER::new ( 937 $self = $class->SUPER::new (
… …
888 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
889 $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]);
890} 958}
891 959
892sub size_allocate { 960sub size_allocate {
893 my ($self, $w, $h) = @_; 961 my ($self, $w, $h, $changed) = @_;
894 962
895 $self->SUPER::size_allocate ($w, $h); 963 $self->SUPER::size_allocate ($w, $h, $changed);
896 964
897 my $child = $self->{vp}->child; 965 my $child = $self->{vp}->child;
898 $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]);
899} 967}
900 968
… …
947 1015
948our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
949 1017
950use CFClient::OpenGL; 1018use CFClient::OpenGL;
951 1019
952my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 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);
955 1027
956sub new { 1028sub new {
957 my $class = shift; 1029 my $class = shift;
958
959 # TODO: user_x, user_y, overwrite moveto?
960 1030
961 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1034 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
967 @_ 1038 @_
968 ); 1039 );
969 1040
970 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
971 align => 0, 1042 align => 0,
… …
990 $h + $self->border * 2, 1061 $h + $self->border * 2,
991 ) 1062 )
992} 1063}
993 1064
994sub size_allocate { 1065sub size_allocate {
995 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
996 1069
997 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
999 1072
1000 $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)
… …
1024 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
1025 1098
1026 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
1028 1101
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size;
1033 }; 1107 };
1034 1108
1035 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1113 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
1041 1115
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1117
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update;
1046 }; 1119 };
1047 } 1120 }
1048} 1121}
1049 1122
1050sub button_up { 1123sub button_up {
… …
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1143
1071 my $border = $self->border; 1144 my $border = $self->border;
1072 1145
1073 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1151
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
1081 1154
1082 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1160 }
1093 1161
1094 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
1095 1163
… …
1125 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1126 1194
1127 $child->set_parent ($self); 1195 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1129 1197
1130 $self->check_size (1); 1198 $self->realloc;
1131} 1199}
1132 1200
1133# 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?
1134sub clear { 1202sub clear {
1135 my ($self) = @_; 1203 my ($self) = @_;
… …
1140 for (@children) { 1208 for (@children) {
1141 delete $_->{parent}; 1209 delete $_->{parent};
1142 $_->hide; 1210 $_->hide;
1143 } 1211 }
1144 1212
1145 $self->check_size (1); 1213 $self->realloc;
1146 $self->update;
1147} 1214}
1148 1215
1149sub get_wh { 1216sub get_wh {
1150 my ($self) = @_; 1217 my ($self) = @_;
1151 1218
… …
1178 (sum @$hs), 1245 (sum @$hs),
1179 ) 1246 )
1180} 1247}
1181 1248
1182sub size_allocate { 1249sub size_allocate {
1183 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1184 1251
1185 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1186 1253
1187 my $req_w = (sum @$ws) || 1; 1254 my $req_w = (sum @$ws) || 1;
1188 my $req_h = (sum @$hs) || 1; 1255 my $req_h = (sum @$hs) || 1;
… …
1247 } 1314 }
1248} 1315}
1249 1316
1250############################################################################# 1317#############################################################################
1251 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
1252package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1253 1380
1254# TODO: wrap into common Box base class
1255
1256our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1257 1382
1258sub size_request { 1383sub new {
1259 my ($self) = @_; 1384 my $class = shift;
1260 1385
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1262 1387 vertical => 0,
1263 ( 1388 @_,
1264 (List::Util::sum map $_->[0], @alloc),
1265 (List::Util::max map $_->[1], @alloc),
1266 ) 1389 )
1267} 1390}
1268 1391
1269sub size_allocate {
1270 my ($self, $w, $h) = @_;
1271
1272 ($h, $w) = ($w, $h);
1273
1274 my $children = $self->{children};
1275
1276 my @h = map $_->{req_w}, @$children;
1277
1278 my $req_h = List::Util::sum @h;
1279
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children;
1285 $exp ||= 1;
1286
1287 for (0 .. $#$children) {
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 }
1294 }
1295
1296 CFClient::UI::harmonize \@h;
1297
1298 my $y = 0;
1299 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_];
1302 $child->configure ($y, 0, $h, $w);
1303
1304 $y += $h;
1305 }
1306
1307 1
1308}
1309
1310############################################################################# 1392#############################################################################
1311 1393
1312package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1313 1395
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1317 1397
1318sub size_request { 1398sub new {
1319 my ($self) = @_; 1399 my $class = shift;
1320 1400
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1322 1402 vertical => 1,
1323 ( 1403 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1404 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1405}
1367 1406
1368############################################################################# 1407#############################################################################
1369 1408
1370package CFClient::UI::Label; 1409package CFClient::UI::Label;
… …
1387 ellipsise => 3, # end 1426 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1427 layout => (new CFClient::Layout),
1389 fontsize => 1, 1428 fontsize => 1,
1390 align => -1, 1429 align => -1,
1391 valign => -1, 1430 valign => -1,
1392 padding => 2, 1431 padding_x => 2,
1432 padding_y => 2,
1393 can_events => 0, 1433 can_events => 0,
1394 %arg 1434 %arg
1395 ); 1435 );
1396 1436
1397 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1433 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1434 1474
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1437 1477
1478 $self->realloc;
1438 $self->update; 1479 $self->update;
1439 $self->check_size;
1440} 1480}
1441 1481
1442sub set_markup { 1482sub set_markup {
1443 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1444 1484
… …
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1489
1450 $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;
1451 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1452 1492
1493 $self->realloc;
1453 $self->update; 1494 $self->update;
1454 $self->check_size;
1455} 1495}
1456 1496
1457sub size_request { 1497sub size_request {
1458 my ($self) = @_; 1498 my ($self) = @_;
1459 1499
… …
1473 1513
1474 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1476 } 1516 }
1477 1517
1478 ( 1518 ($w, $h)
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1519}
1483 1520
1484sub size_allocate { 1521sub size_allocate {
1485 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1486 1523
1487 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1488} 1526}
1489 1527
1490sub set_fontsize { 1528sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1492 1530
1493 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1532 delete $self->{texture};
1495 1533
1496 $self->update; 1534 $self->realloc;
1497 $self->check_size;
1498} 1535}
1499 1536
1500sub _draw { 1537sub _draw {
1501 my ($self) = @_; 1538 my ($self) = @_;
1502 1539
… …
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1549
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1514 1551
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517 : ($self->{w} - $tex->{w}) * 0.5); 1554 : ($self->{w} - $tex->{w}) * 0.5);
1518 1555
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521 : ($self->{h} - $tex->{h}) * 0.5); 1558 : ($self->{h} - $tex->{h}) * 0.5);
1522 1559
1523 $tex 1560 $tex
1524 }; 1561 };
1525 1562
… …
1582sub set_text { 1619sub set_text {
1583 my ($self, $text) = @_; 1620 my ($self, $text) = @_;
1584 1621
1585 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1623 $self->_set_text ($text);
1587 $self->update; 1624
1588 $self->check_size; 1625 $self->realloc;
1589} 1626}
1590 1627
1591sub get_text { 1628sub get_text {
1592 $_[0]{text} 1629 $_[0]{text}
1593} 1630}
… …
1626 } elsif ($uni) { 1663 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1628 } 1665 }
1629 1666
1630 $self->_set_text ($text); 1667 $self->_set_text ($text);
1631 $self->update; 1668
1632 $self->check_size; 1669 $self->realloc;
1633} 1670}
1634 1671
1635sub focus_in { 1672sub focus_in {
1636 my ($self) = @_; 1673 my ($self) = @_;
1637 1674
… …
1764 1801
1765sub new { 1802sub new {
1766 my $class = shift; 1803 my $class = shift;
1767 1804
1768 $class->SUPER::new ( 1805 $class->SUPER::new (
1769 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1770 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1772 can_hover => 1, 1810 can_hover => 1,
1773 align => 0, 1811 align => 0,
1774 valign => 0, 1812 valign => 0,
… …
1821 1859
1822sub new { 1860sub new {
1823 my $class = shift; 1861 my $class = shift;
1824 1862
1825 $class->SUPER::new ( 1863 $class->SUPER::new (
1826 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1827 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 1868 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 1869 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 1870 state => 0,
… …
1835} 1874}
1836 1875
1837sub size_request { 1876sub size_request {
1838 my ($self) = @_; 1877 my ($self) = @_;
1839 1878
1840 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1841} 1880}
1842 1881
1843sub button_down { 1882sub button_down {
1844 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1845 1884
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1849 $self->_emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1850 } 1889 }
1851} 1890}
1852 1891
1853sub _draw { 1892sub _draw {
1854 my ($self) = @_; 1893 my ($self) = @_;
1855 1894
1856 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1857 1896
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 1898
1860 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;
1861 1902
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 1904
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 1906
… …
2130 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2173 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2174 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2175 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2137 vertical => 0, 2178 vertical => 0,
2138 can_hover => 1, 2179 can_hover => 1,
2139 inner_pad => 0.02, 2180 inner_pad => 0.02,
2140 @_ 2181 @_
2141 ); 2182 );
… …
2144 $self->update; 2185 $self->update;
2145 2186
2146 $self 2187 $self
2147} 2188}
2148 2189
2190sub changed { }
2191
2149sub set_range { 2192sub set_range {
2150 my ($self, $range) = @_; 2193 my ($self, $range) = @_;
2151 2194
2152 ($range, $self->{range}) = ($self->{range}, $range); 2195 ($range, $self->{range}) = ($self->{range}, $range);
2153 2196
… …
2179} 2222}
2180 2223
2181sub size_request { 2224sub size_request {
2182 my ($self) = @_; 2225 my ($self) = @_;
2183 2226
2184 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2228}
2189 2229
2190sub button_down { 2230sub button_down {
2191 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2192 2232
… …
2342 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2343 $self->reflow; 2383 $self->reflow;
2344} 2384}
2345 2385
2346sub size_allocate { 2386sub size_allocate {
2347 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2348 2388
2349 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2350 2392
2351 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2352 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2353 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2354 2396
… …
2543 2585
2544sub new { 2586sub new {
2545 my $class = shift; 2587 my $class = shift;
2546 2588
2547 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2548 state => 0, 2590 state => 0,
2549 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2550 @_ 2592 @_
2551 ); 2593 );
2552 2594
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2595 $self
2559} 2596}
2560 2597
2561sub toggle_flopper { 2598sub toggle_flopper {
2562 my ($self) = @_; 2599 my ($self) = @_;
2563 2600
2564 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2602}
2576 2603
2577############################################################################# 2604#############################################################################
2578 2605
2579package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2611 2638
2612 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2613} 2640}
2614 2641
2615sub size_allocate { 2642sub size_allocate {
2616 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2617 2644
2645 return unless $changed;
2646
2618 $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 });
2619} 2666}
2620 2667
2621sub _draw { 2668sub _draw {
2622 my ($self) = @_; 2669 my ($self) = @_;
2623 2670
… …
2640 glVertex $w, $h; 2687 glVertex $w, $h;
2641 glVertex $w, 0; 2688 glVertex $w, 0;
2642 glEnd; 2689 glEnd;
2643 2690
2644 glTranslate 2 - 0.375, 2 - 0.375; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2645 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2646} 2694}
2647 2695
2648############################################################################# 2696#############################################################################
2649 2697
… …
2765 2813
2766 $row++; 2814 $row++;
2767 } 2815 }
2768} 2816}
2769 2817
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774
2775############################################################################# 2818#############################################################################
2776 2819
2777package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
2778 2821
2779our @ISA = CFClient::UI::FancyFrame::; 2822our @ISA = CFClient::UI::FancyFrame::;
… …
2819 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 2863 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2822 2865
2823 $self->show; 2866 $self->show;
2824 $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);
2825} 2868}
2826 2869
2827sub mouse_motion { 2870sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2829 2872
… …
2963use CFClient::OpenGL; 3006use CFClient::OpenGL;
2964 3007
2965sub new { 3008sub new {
2966 my $class = shift; 3009 my $class = shift;
2967 3010
2968 $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
3012 visible => 1,
2969 @_, 3013 @_,
2970 ) 3014 );
3015
3016 Scalar::Util::weaken ($self->{root} = $self);
3017
3018 $self
2971} 3019}
2972 3020
2973sub configure { 3021sub configure {
2974 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2975 3023
2976 $self->{w} = $w; 3024 $self->{w} = $w;
2977 $self->{h} = $h; 3025 $self->{h} = $h;
2978} 3026}
2979 3027
2980sub check_size { 3028sub reconfigure {
2981 my ($self) = @_; 3029 my ($self) = @_;
2982 3030
3031 $self->SUPER::reconfigure;
3032
2983 $self->size_allocate ($self->{w}, $self->{h}) 3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
2984 if $self->{w}; 3034 if $self->{w};
2985} 3035}
2986 3036
2987sub size_request { 3037sub size_request {
2988 my ($self) = @_; 3038 my ($self) = @_;
2989 3039
2990 ($self->{w}, $self->{h}) 3040 ($self->{w}, $self->{h})
2991} 3041}
2992 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
2993sub size_allocate { 3057sub size_allocate {
2994 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h, $changed) = @_;
2995 3059
2996 for my $child ($self->children) { 3060 for my $child ($self->children) {
2997 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)};
2998 3062
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3063 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3001 3065
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3066 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3067 $Y = _to_pixel $Y, $H, $self->{h};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3068
3008 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
3009 } 3070 }
3010} 3071}
3011 3072
… …
3022} 3083}
3023 3084
3024sub update { 3085sub update {
3025 my ($self) = @_; 3086 my ($self) = @_;
3026 3087
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3088 $::WANT_REFRESH++;
3029} 3089}
3030 3090
3031sub add { 3091sub add {
3032 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3033 3093
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3094 $_->{is_toplevel} = 1
3042 3095 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3096
3048 $self->SUPER::add (@children); 3097 $self->SUPER::add (@children);
3049} 3098}
3050 3099
3051sub remove { 3100sub remove {
3052 my ($self, @children) = @_; 3101 my ($self, @children) = @_;
3053 3102
3054 $self->SUPER::remove (@children); 3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3055 3107
3056 while (@children) { 3108 while (@children) {
3057 my $w = pop @children; 3109 my $w = pop @children;
3058 push @children, $w->children; 3110 push @children, $w->children;
3059 $w->set_invisible; 3111 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
3079 $_->() 3131 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{refresh_hook}};
3081 } 3133 }
3082 3134
3083 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
3084 my @queue = ([], []); 3136 my @queue;
3085 3137
3086 for (;;) { 3138 while () {
3087 if ($self->{check_size}) { 3139 if ($self->{realloc}) {
3088 # heuristic: check containers last 3140 #TODO use array-of-depth approach
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3141
3090 for values %{delete $self->{check_size}} 3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
3091 } 3144 }
3092 3145
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3146 my $widget = pop @queue || last;
3094 3147
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3148 $widget->{visible} or last; # do not resize invisible widgets
3096 ? @$widget{qw(user_w user_h)} 3149
3097 : $widget->size_request; 3150 my ($w, $h) = $widget->size_request;
3098 3151
3099 if (delete $widget->{force_alloc} 3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3154
3102 3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3103 $widget->{req_w} = $w; 3158 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3159 $widget->{req_h} = $h;
3105 3160
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3107 3162
3108 $widget->{parent}->check_size 3163 push @queue, $widget->{parent}
3109 if $widget->{parent}; 3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3110 }
3111 } 3165 }
3112 } 3166 }
3113 3167
3114 while ($self->{size_alloc}) { 3168 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3116 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;
3117 3177
3118 $w = 0 if $w < 0; 3178 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3179 $h = 0 if $h < 0;
3120 3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3121 $widget->{w} = $w; 3186 $widget->{w} = $w;
3122 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3123 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h, $changed);
3124 } 3190 }
3125 } 3191 }
3126 3192
3127 while ($self->{post_alloc_hook}) { 3193 while ($self->{post_alloc_hook}) {
3128 $_->() 3194 $_->()

Diff Legend

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