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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.259 by root, Tue May 30 07:13:09 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->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_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->{alloc_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->{alloc_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 return unless $self->{visible}; 271 return unless $self->{visible};
259 272
260 # broken show/hide model 273 $_->set_invisible for $self->children;
261 274
262 delete $self->{root}; 275 delete $self->{root};
263 delete $self->{visible}; 276 delete $self->{visible};
264 277
265 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
267 280
268 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
270 283
271 $self->focus_out; 284 $self->focus_out;
272 285
273 $self->emit (visibility_change => 0); 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;
274} 304}
275 305
276sub hide { 306sub hide {
277 my ($self) = @_; 307 my ($self) = @_;
278 308
… …
280 310
281 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
282 if $self->{parent}; 312 if $self->{parent};
283} 313}
284 314
285sub move { 315sub move_abs {
286 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
287 317
288 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
289 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
290 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
291 321
292 $self->update; 322 $self->update;
293} 323}
294 324
295sub set_size { 325sub set_size {
296 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
297 327
298 $self->{user_w} = $w; 328 $self->{force_w} = $w;
299 $self->{user_h} = $h; 329 $self->{force_h} = $h;
300 330
301 $self->check_size; 331 $self->realloc;
302} 332}
303 333
304sub size_request { 334sub size_request {
305 require Carp; 335 require Carp;
306 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
308 338
309sub configure { 339sub configure {
310 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
311 341
312 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
313 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
314 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
315 347
316 # use alignment to adjust x, y 348 # use alignment to adjust x, y
317 349
318 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
319 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
320
321 ($w, $h) = ($w2, $h2);
322 } 352 }
323 353
324 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
325 $self->{x} = $x; 355 $self->{x} = $x;
326 $self->{y} = $y; 356 $self->{y} = $y;
327 $self->update; 357 $self->update;
328 } 358 }
329 359
330 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
332 } 367 }
333} 368}
334 369
335sub size_allocate { 370sub size_allocate {
336 # nothing to be done 371 # nothing to be done
337}
338
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344} 372}
345 373
346sub children { 374sub children {
347} 375}
348 376
… …
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
430sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
431 529
432sub draw { 530sub draw {
433 my ($self) = @_; 531 my ($self) = @_;
434 532
435 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
452 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
453 glEnd; 551 glEnd;
454 glDisable GL_BLEND; 552 glDisable GL_BLEND;
455 } 553 }
456 554
457 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
458 glPushMatrix; 556 glPushMatrix;
459 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
461 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
473 my ($self) = @_; 571 my ($self) = @_;
474 572
475 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
476} 574}
477 575
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545}
546
547sub DESTROY { 576sub DESTROY {
548 my ($self) = @_; 577 my ($self) = @_;
549 578
550 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
551 #$self->deactivate; 580 #$self->deactivate;
… …
607 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
608 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
609} 638}
610 639
611sub size_request { 640sub size_request {
612 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
613} 644}
614 645
615sub draw { } 646sub draw { }
616 647
617############################################################################# 648#############################################################################
… …
646 $self->{children} = [ 677 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
649 ]; 680 ];
650 681
651 $self->check_size (1); 682 $self->realloc;
652 $self->update;
653} 683}
654 684
655sub children { 685sub children {
656 @{ $_[0]{children} } 686 @{ $_[0]{children} }
657} 687}
… …
662 delete $child->{parent}; 692 delete $child->{parent};
663 $child->hide; 693 $child->hide;
664 694
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 696
667 $self->check_size (1); 697 $self->realloc;
668 $self->update;
669} 698}
670 699
671sub clear { 700sub clear {
672 my ($self) = @_; 701 my ($self) = @_;
673 702
… …
677 for (@$children) { 706 for (@$children) {
678 delete $_->{parent}; 707 delete $_->{parent};
679 $_->hide; 708 $_->hide;
680 } 709 }
681 710
682 $self->check_size; 711 $self->realloc;
683 $self->update;
684} 712}
685 713
686sub find_widget { 714sub find_widget {
687 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
688 716
… …
825} 853}
826 854
827sub size_request { 855sub size_request {
828 my ($self) = @_; 856 my ($self) = @_;
829 857
830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831 859
832 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
833} 864}
834 865
835sub size_allocate { 866sub size_allocate {
836 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
837 868
869 my $child = $self->child;
870
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840 873
841 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
842 $self->update; 875 $self->update;
843} 876}
844 877
… …
987 1020
988our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
989 1022
990use CFClient::OpenGL; 1023use CFClient::OpenGL;
991 1024
992my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
995 1032
996sub new { 1033sub new {
997 my $class = shift; 1034 my $class = shift;
998
999 # TODO: user_x, user_y, overwrite moveto?
1000 1035
1001 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1039 border => 0.6,
1005 is_toplevel => 1,
1006 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1007 @_ 1043 @_
1008 ); 1044 );
1009 1045
1010 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
1011 align => 0, 1047 align => 0,
… …
1064 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1065 1101
1066 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1068 1104
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1107
1074 $self->check_size; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1075 }; 1110 };
1076 1111
1077 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1081 $self->{motion} = sub { 1116 $self->{motion} = sub {
1082 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1083 1118
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1120
1086 $self->{user_x} = $bx + $x - $ox; 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087 $self->{user_y} = $by + $y - $oy;
1088 $self->move ($self->{user_x}, $self->{user_y});
1089 $self->update;
1090 }; 1122 };
1091 } 1123 }
1092} 1124}
1093 1125
1094sub button_up { 1126sub button_up {
… …
1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114 1146
1115 my $border = $self->border; 1147 my $border = $self->border;
1116 1148
1117 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122 1154
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1125 1157
1126 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1127 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1128 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1129
1130 glColor @{ $self->{bg} };
1131
1132 $bg->{s} = $rep_x;
1133 $bg->{t} = $rep_y;
1134 $bg->{wrap_mode} = 1;
1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 } 1163 }
1137 1164
1138 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1139 1166
… …
1169 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1170 1197
1171 $child->set_parent ($self); 1198 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1173 1200
1174 $self->check_size (1); 1201 $self->realloc;
1175} 1202}
1176 1203
1177# TODO: move to container class maybe? send children a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1178sub clear { 1205sub clear {
1179 my ($self) = @_; 1206 my ($self) = @_;
… …
1184 for (@children) { 1211 for (@children) {
1185 delete $_->{parent}; 1212 delete $_->{parent};
1186 $_->hide; 1213 $_->hide;
1187 } 1214 }
1188 1215
1189 $self->check_size (1); 1216 $self->realloc;
1190 $self->update;
1191} 1217}
1192 1218
1193sub get_wh { 1219sub get_wh {
1194 my ($self) = @_; 1220 my ($self) = @_;
1195 1221
… …
1291 } 1317 }
1292} 1318}
1293 1319
1294############################################################################# 1320#############################################################################
1295 1321
1296package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1297
1298# TODO: wrap into common Box base class
1299 1323
1300our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1301 1325
1302sub size_request { 1326sub size_request {
1303 my ($self) = @_; 1327 my ($self) = @_;
1304 1328
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1306 1330 ? (
1307 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1308 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309 (List::Util::max map $_->[1], @alloc), 1333 )
1310 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1311} 1338}
1312 1339
1313sub size_allocate { 1340sub size_allocate {
1314 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1315 1342
1316 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1317
1318 my $children = $self->{children}; 1344 my $children = $self->{children};
1319 1345
1320 my @h = map $_->{req_w}, @$children; 1346 my @req;
1321 1347
1322 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1323 1349 @req = ($space / (@$children || 1)) x @$children;
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1328 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329 $exp ||= 1;
1330 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1331 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 } 1364 }
1338 } 1365 }
1339 1366
1340 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1341 1368
1342 my $y = 0; 1369 my $pos = 0;
1343 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1346 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347 1373
1348 $y += $h; 1374 $pos += $alloc;
1349 } 1375 }
1350 1376
1351 1 1377 1
1352} 1378}
1353 1379
1354############################################################################# 1380#############################################################################
1355 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1356package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1357 1398
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1361 1400
1362sub size_request { 1401sub new {
1363 my ($self) = @_; 1402 my $class = shift;
1364 1403
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1366 1405 vertical => 1,
1367 ( 1406 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1407 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1408}
1411 1409
1412############################################################################# 1410#############################################################################
1413 1411
1414package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1431 ellipsise => 3, # end 1429 ellipsise => 3, # end
1432 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1433 fontsize => 1, 1431 fontsize => 1,
1434 align => -1, 1432 align => -1,
1435 valign => -1, 1433 valign => -1,
1436 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1437 can_events => 0, 1436 can_events => 0,
1438 %arg 1437 %arg
1439 ); 1438 );
1440 1439
1441 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1477 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1478 1477
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1481 1480
1481 $self->realloc;
1482 $self->update; 1482 $self->update;
1483 $self->check_size;
1484} 1483}
1485 1484
1486sub set_markup { 1485sub set_markup {
1487 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1488 1487
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1492
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1496 1495
1496 $self->realloc;
1497 $self->update; 1497 $self->update;
1498 $self->check_size;
1499} 1498}
1500 1499
1501sub size_request { 1500sub size_request {
1502 my ($self) = @_; 1501 my ($self) = @_;
1503 1502
… …
1517 1516
1518 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1520 } 1519 }
1521 1520
1522 ( 1521 ($w, $h)
1523 $w + $self->{padding} * 2,
1524 $h + $self->{padding} * 2,
1525 )
1526} 1522}
1527 1523
1528sub size_allocate { 1524sub size_allocate {
1529 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1530 1526
… …
1535 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1536 1532
1537 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1534 delete $self->{texture};
1539 1535
1540 $self->update; 1536 $self->realloc;
1541 $self->check_size;
1542} 1537}
1543 1538
1544sub _draw { 1539sub _draw {
1545 my ($self) = @_; 1540 my ($self) = @_;
1546 1541
… …
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556 1551
1557 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1558 1553
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1562 1557
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1566 1561
1567 $tex 1562 $tex
1568 }; 1563 };
1569 1564
… …
1626sub set_text { 1621sub set_text {
1627 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1628 1623
1629 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1625 $self->_set_text ($text);
1631 $self->update; 1626
1632 $self->check_size; 1627 $self->realloc;
1633} 1628}
1634 1629
1635sub get_text { 1630sub get_text {
1636 $_[0]{text} 1631 $_[0]{text}
1637} 1632}
… …
1670 } elsif ($uni) { 1665 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1672 } 1667 }
1673 1668
1674 $self->_set_text ($text); 1669 $self->_set_text ($text);
1675 $self->update; 1670
1676 $self->check_size; 1671 $self->realloc;
1677} 1672}
1678 1673
1679sub focus_in { 1674sub focus_in {
1680 my ($self) = @_; 1675 my ($self) = @_;
1681 1676
… …
1808 1803
1809sub new { 1804sub new {
1810 my $class = shift; 1805 my $class = shift;
1811 1806
1812 $class->SUPER::new ( 1807 $class->SUPER::new (
1813 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1814 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1815 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1816 can_hover => 1, 1812 can_hover => 1,
1817 align => 0, 1813 align => 0,
1818 valign => 0, 1814 valign => 0,
… …
1865 1861
1866sub new { 1862sub new {
1867 my $class = shift; 1863 my $class = shift;
1868 1864
1869 $class->SUPER::new ( 1865 $class->SUPER::new (
1870 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1871 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1872 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1875 state => 0, 1872 state => 0,
… …
1879} 1876}
1880 1877
1881sub size_request { 1878sub size_request {
1882 my ($self) = @_; 1879 my ($self) = @_;
1883 1880
1884 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1885} 1882}
1886 1883
1887sub button_down { 1884sub button_down {
1888 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1889 1886
1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1893 $self->_emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1894 } 1891 }
1895} 1892}
1896 1893
1897sub _draw { 1894sub _draw {
1898 my ($self) = @_; 1895 my ($self) = @_;
1899 1896
1900 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1901 1898
1902 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903 1900
1904 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905 1904
1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907 1906
1908 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909 1908
… …
2174 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2175 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2178 range => [0, 0, 100, 10, 0], 2177 range => [0, 0, 100, 10, 0],
2179 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2180 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2181 vertical => 0, 2180 vertical => 0,
2182 can_hover => 1, 2181 can_hover => 1,
2183 inner_pad => 0.02, 2182 inner_pad => 0.02,
2184 @_ 2183 @_
2185 ); 2184 );
… …
2188 $self->update; 2187 $self->update;
2189 2188
2190 $self 2189 $self
2191} 2190}
2192 2191
2192sub changed { }
2193
2193sub set_range { 2194sub set_range {
2194 my ($self, $range) = @_; 2195 my ($self, $range) = @_;
2195 2196
2196 ($range, $self->{range}) = ($self->{range}, $range); 2197 ($range, $self->{range}) = ($self->{range}, $range);
2197 2198
… …
2223} 2224}
2224 2225
2225sub size_request { 2226sub size_request {
2226 my ($self) = @_; 2227 my ($self) = @_;
2227 2228
2228 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2229 my $h = $self->{req_h};
2230
2231 $self->{vertical} ? ($h, $w) : ($w, $h)
2232} 2230}
2233 2231
2234sub button_down { 2232sub button_down {
2235 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2236 2234
… …
2592 state => 0, 2590 state => 0,
2593 on_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2594 @_ 2592 @_
2595 ); 2593 );
2596 2594
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2595 $self
2603} 2596}
2604 2597
2605sub toggle_flopper { 2598sub toggle_flopper {
2606 my ($self) = @_; 2599 my ($self) = @_;
2607 2600
2608 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2602}
2620 2603
2621############################################################################# 2604#############################################################################
2622 2605
2623package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2636} 2619}
2637 2620
2638sub set_tooltip_from { 2621sub set_tooltip_from {
2639 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2640 2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2641 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2642 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8, 2636 fontsize => 0.8,
2645 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2646 ellipsise => 0, 2638 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2658 2650
2659sub size_allocate { 2651sub size_allocate {
2660 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2661 2653
2662 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2663} 2673}
2664 2674
2665sub _draw { 2675sub _draw {
2666 my ($self) = @_; 2676 my ($self) = @_;
2667 2677
… …
2684 glVertex $w, $h; 2694 glVertex $w, $h;
2685 glVertex $w, 0; 2695 glVertex $w, 0;
2686 glEnd; 2696 glEnd;
2687 2697
2688 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2689 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2690} 2701}
2691 2702
2692############################################################################# 2703#############################################################################
2693 2704
… …
2809 2820
2810 $row++; 2821 $row++;
2811 } 2822 }
2812} 2823}
2813 2824
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817}
2818
2819############################################################################# 2825#############################################################################
2820 2826
2821package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
2822 2828
2823our @ISA = CFClient::UI::FancyFrame::; 2829our @ISA = CFClient::UI::FancyFrame::;
… …
2863 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2864 $GRAB = $self; 2870 $GRAB = $self;
2865 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2866 2872
2867 $self->show; 2873 $self->show;
2868 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869} 2875}
2870 2876
2871sub mouse_motion { 2877sub mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2873 2879
… …
3007use CFClient::OpenGL; 3013use CFClient::OpenGL;
3008 3014
3009sub new { 3015sub new {
3010 my $class = shift; 3016 my $class = shift;
3011 3017
3012 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
3013 visible => 1, 3019 visible => 1,
3014 @_, 3020 @_,
3015 ) 3021 );
3016}
3017 3022
3018sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
3019 my ($self, $x, $y, $w, $h) = @_;
3020 3024
3021 $self->{w} = $w; 3025 $self
3022 $self->{h} = $h;
3023}
3024
3025sub check_size {
3026 my ($self) = @_;
3027
3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
3030} 3026}
3031 3027
3032sub size_request { 3028sub size_request {
3033 my ($self) = @_; 3029 my ($self) = @_;
3034 3030
3035 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
3036} 3046}
3037 3047
3038sub size_allocate { 3048sub size_allocate {
3039 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
3040 3050
3041 for my $child ($self->children) { 3051 for my $child ($self->children) {
3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043 3053
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
3045 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3046 3056
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
3048 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055 3059
3056 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
3057 } 3061 }
3058} 3062}
3059 3063
… …
3070} 3074}
3071 3075
3072sub update { 3076sub update {
3073 my ($self) = @_; 3077 my ($self) = @_;
3074 3078
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
3077} 3080}
3078 3081
3079sub add { 3082sub add {
3080 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
3081 3084
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3085 $_->{is_toplevel} = 1
3090 3086 for @children;
3091 # integerise window positions
3092 $child->{x} = int $child->{x};
3093 $child->{y} = int $child->{y};
3094 }
3095 3087
3096 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3097} 3089}
3098 3090
3099sub remove { 3091sub remove {
3100 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3101 3093
3102 $self->SUPER::remove (@children); 3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3103 3098
3104 while (@children) { 3099 while (@children) {
3105 my $w = pop @children; 3100 my $w = pop @children;
3106 push @children, $w->children; 3101 push @children, $w->children;
3107 $w->set_invisible; 3102 $w->set_invisible;
… …
3126 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
3127 $_->() 3122 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3129 } 3124 }
3130 3125
3131 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
3132 my @queue; 3127 my @queue;
3133 3128
3134 for (;;) { 3129 while () {
3135 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
3136 #TODO use array-of-depth approach 3131 #TODO use array-of-depth approach
3137 3132
3133 use sort 'stable';
3134
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3139 @queue, values %{delete $self->{check_size}}; 3136 @queue, values %{delete $self->{realloc}};
3140 } 3137 }
3141 3138
3142 my $widget = pop @queue || last; 3139 my $widget = pop @queue || last;
3143 3140
3144 defined $widget->{visible} or last; # do not resize invisible widgets 3141 $widget->{visible} or last; # do not resize invisible widgets
3145 3142
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147 ? @$widget{qw(user_w user_h)}
3148 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
3149 3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3150 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153
3154 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
3156 3155
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
3158 3157
3159 $widget->{parent}->check_size
3160 if $widget->{parent}; 3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3161 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3162 } 3167 }
3163 } 3168 }
3164 3169
3165 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3167 my ($widget, $w, $h) = @$_; 3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168 3178
3169 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3171 3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3172 $widget->{w} = $w; 3186 $widget->{w} = $w;
3173 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3174 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3175 } 3191 }
3176 } 3192 }
3177 3193
3178 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3179 $_->() 3195 $_->()
3180 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3181 } 3197 }
3198
3182 3199
3183 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3186 3203

Diff Legend

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