ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.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 # broken show/hide model 271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
259 274
260 delete $self->{root}; 275 delete $self->{root};
261 delete $self->{visible}; 276 delete $self->{visible};
262 277
263 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
265 280
266 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
268 283
269 $self->focus_out; 284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
270} 304}
271 305
272sub hide { 306sub hide {
273 my ($self) = @_; 307 my ($self) = @_;
274 308
… …
276 310
277 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
278 if $self->{parent}; 312 if $self->{parent};
279} 313}
280 314
281sub move { 315sub move_abs {
282 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
283 317
284 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
287 321
288 $self->update; 322 $self->update;
289} 323}
290 324
291sub set_size { 325sub set_size {
292 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
293 327
294 $self->{user_w} = $w; 328 $self->{force_w} = $w;
295 $self->{user_h} = $h; 329 $self->{force_h} = $h;
296 330
297 $self->check_size; 331 $self->realloc;
298} 332}
299 333
300sub size_request { 334sub size_request {
301 require Carp; 335 require Carp;
302 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
304 338
305sub configure { 339sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
307 341
308 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
311 347
312 # use alignment to adjust x, y 348 # use alignment to adjust x, y
313 349
314 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 352 }
319 353
320 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 355 $self->{x} = $x;
322 $self->{y} = $y; 356 $self->{y} = $y;
323 $self->update; 357 $self->update;
324 } 358 }
325 359
326 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $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;
328 } 367 }
329} 368}
330 369
331sub size_allocate { 370sub size_allocate {
332 # nothing to be done 371 # nothing to be done
333}
334
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340} 372}
341 373
342sub children { 374sub children {
343} 375}
344 376
… …
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
426sub 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}
427 529
428sub draw { 530sub draw {
429 my ($self) = @_; 531 my ($self) = @_;
430 532
431 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
448 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
449 glEnd; 551 glEnd;
450 glDisable GL_BLEND; 552 glDisable GL_BLEND;
451 } 553 }
452 554
453 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 556 glPushMatrix;
455 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
469 my ($self) = @_; 571 my ($self) = @_;
470 572
471 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
472} 574}
473 575
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 576sub DESTROY {
535 my ($self) = @_; 577 my ($self) = @_;
536 578
537 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
538 #$self->deactivate; 580 #$self->deactivate;
… …
594 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
596} 638}
597 639
598sub size_request { 640sub size_request {
599 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
600} 644}
601 645
602sub draw { } 646sub draw { }
603 647
604############################################################################# 648#############################################################################
… …
633 $self->{children} = [ 677 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
636 ]; 680 ];
637 681
638 $self->check_size (1); 682 $self->realloc;
639 $self->update;
640} 683}
641 684
642sub children { 685sub children {
643 @{ $_[0]{children} } 686 @{ $_[0]{children} }
644} 687}
… …
649 delete $child->{parent}; 692 delete $child->{parent};
650 $child->hide; 693 $child->hide;
651 694
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 696
654 $self->check_size (1); 697 $self->realloc;
655 $self->update;
656} 698}
657 699
658sub clear { 700sub clear {
659 my ($self) = @_; 701 my ($self) = @_;
660 702
… …
664 for (@$children) { 706 for (@$children) {
665 delete $_->{parent}; 707 delete $_->{parent};
666 $_->hide; 708 $_->hide;
667 } 709 }
668 710
669 $self->check_size; 711 $self->realloc;
670 $self->update;
671} 712}
672 713
673sub find_widget { 714sub find_widget {
674 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
675 716
… …
812} 853}
813 854
814sub size_request { 855sub size_request {
815 my ($self) = @_; 856 my ($self) = @_;
816 857
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 859
819 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
820} 864}
821 865
822sub size_allocate { 866sub size_allocate {
823 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
824 868
869 my $child = $self->child;
870
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 873
828 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
829 $self->update; 875 $self->update;
830} 876}
831 877
… …
974 1020
975our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
976 1022
977use CFClient::OpenGL; 1023use CFClient::OpenGL;
978 1024
979my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1032
983sub new { 1033sub new {
984 my $class = shift; 1034 my $class = shift;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1035
988 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1039 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
994 @_ 1043 @_
995 ); 1044 );
996 1045
997 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
998 align => 0, 1047 align => 0,
… …
1051 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1052 1101
1053 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1055 1104
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1107
1061 $self->check_size; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1062 }; 1110 };
1063 1111
1064 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1116 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1070 1118
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1120
1073 $self->{user_x} = $bx + $x - $ox; 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy;
1075 $self->move ($self->{user_x}, $self->{user_y});
1076 $self->update;
1077 }; 1122 };
1078 } 1123 }
1079} 1124}
1080 1125
1081sub button_up { 1126sub button_up {
… …
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1146
1102 my $border = $self->border; 1147 my $border = $self->border;
1103 1148
1104 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1154
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1112 1157
1113 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1116
1117 glColor @{ $self->{bg} };
1118
1119 $bg->{s} = $rep_x;
1120 $bg->{t} = $rep_y;
1121 $bg->{wrap_mode} = 1;
1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1163 }
1124 1164
1125 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1126 1166
… …
1156 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1157 1197
1158 $child->set_parent ($self); 1198 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1160 1200
1161 $self->check_size (1); 1201 $self->realloc;
1162} 1202}
1163 1203
1164# 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?
1165sub clear { 1205sub clear {
1166 my ($self) = @_; 1206 my ($self) = @_;
… …
1171 for (@children) { 1211 for (@children) {
1172 delete $_->{parent}; 1212 delete $_->{parent};
1173 $_->hide; 1213 $_->hide;
1174 } 1214 }
1175 1215
1176 $self->check_size (1); 1216 $self->realloc;
1177 $self->update;
1178} 1217}
1179 1218
1180sub get_wh { 1219sub get_wh {
1181 my ($self) = @_; 1220 my ($self) = @_;
1182 1221
… …
1278 } 1317 }
1279} 1318}
1280 1319
1281############################################################################# 1320#############################################################################
1282 1321
1283package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1284
1285# TODO: wrap into common Box base class
1286 1323
1287our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1288 1325
1289sub size_request { 1326sub size_request {
1290 my ($self) = @_; 1327 my ($self) = @_;
1291 1328
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1293 1330 ? (
1294 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1295 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296 (List::Util::max map $_->[1], @alloc), 1333 )
1297 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1298} 1338}
1299 1339
1300sub size_allocate { 1340sub size_allocate {
1301 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1302 1342
1303 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1304
1305 my $children = $self->{children}; 1344 my $children = $self->{children};
1306 1345
1307 my @h = map $_->{req_w}, @$children; 1346 my @req;
1308 1347
1309 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1310 1349 @req = ($space / (@$children || 1)) x @$children;
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } 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 {
1315 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316 $exp ||= 1;
1317 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1318 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 } 1364 }
1325 } 1365 }
1326 1366
1327 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1328 1368
1329 my $y = 0; 1369 my $pos = 0;
1330 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1333 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334 1373
1335 $y += $h; 1374 $pos += $alloc;
1336 } 1375 }
1337 1376
1338 1 1377 1
1339} 1378}
1340 1379
1341############################################################################# 1380#############################################################################
1342 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
1343package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1344 1398
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1348 1400
1349sub size_request { 1401sub new {
1350 my ($self) = @_; 1402 my $class = shift;
1351 1403
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1353 1405 vertical => 1,
1354 ( 1406 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1407 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1408}
1398 1409
1399############################################################################# 1410#############################################################################
1400 1411
1401package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1418 ellipsise => 3, # end 1429 ellipsise => 3, # end
1419 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1420 fontsize => 1, 1431 fontsize => 1,
1421 align => -1, 1432 align => -1,
1422 valign => -1, 1433 valign => -1,
1423 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1424 can_events => 0, 1436 can_events => 0,
1425 %arg 1437 %arg
1426 ); 1438 );
1427 1439
1428 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1464 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1465 1477
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1468 1480
1481 $self->realloc;
1469 $self->update; 1482 $self->update;
1470 $self->check_size;
1471} 1483}
1472 1484
1473sub set_markup { 1485sub set_markup {
1474 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1475 1487
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1492
1481 $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;
1482 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1483 1495
1496 $self->realloc;
1484 $self->update; 1497 $self->update;
1485 $self->check_size;
1486} 1498}
1487 1499
1488sub size_request { 1500sub size_request {
1489 my ($self) = @_; 1501 my ($self) = @_;
1490 1502
… …
1504 1516
1505 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1507 } 1519 }
1508 1520
1509 ( 1521 ($w, $h)
1510 $w + $self->{padding} * 2,
1511 $h + $self->{padding} * 2,
1512 )
1513} 1522}
1514 1523
1515sub size_allocate { 1524sub size_allocate {
1516 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1517 1526
… …
1522 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1523 1532
1524 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1534 delete $self->{texture};
1526 1535
1527 $self->update; 1536 $self->realloc;
1528 $self->check_size;
1529} 1537}
1530 1538
1531sub _draw { 1539sub _draw {
1532 my ($self) = @_; 1540 my ($self) = @_;
1533 1541
… …
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543 1551
1544 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1545 1553
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1549 1557
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1553 1561
1554 $tex 1562 $tex
1555 }; 1563 };
1556 1564
… …
1613sub set_text { 1621sub set_text {
1614 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1615 1623
1616 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1625 $self->_set_text ($text);
1618 $self->update; 1626
1619 $self->check_size; 1627 $self->realloc;
1620} 1628}
1621 1629
1622sub get_text { 1630sub get_text {
1623 $_[0]{text} 1631 $_[0]{text}
1624} 1632}
… …
1657 } elsif ($uni) { 1665 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1659 } 1667 }
1660 1668
1661 $self->_set_text ($text); 1669 $self->_set_text ($text);
1662 $self->update; 1670
1663 $self->check_size; 1671 $self->realloc;
1664} 1672}
1665 1673
1666sub focus_in { 1674sub focus_in {
1667 my ($self) = @_; 1675 my ($self) = @_;
1668 1676
… …
1795 1803
1796sub new { 1804sub new {
1797 my $class = shift; 1805 my $class = shift;
1798 1806
1799 $class->SUPER::new ( 1807 $class->SUPER::new (
1800 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1801 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1802 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1803 can_hover => 1, 1812 can_hover => 1,
1804 align => 0, 1813 align => 0,
1805 valign => 0, 1814 valign => 0,
… …
1852 1861
1853sub new { 1862sub new {
1854 my $class = shift; 1863 my $class = shift;
1855 1864
1856 $class->SUPER::new ( 1865 $class->SUPER::new (
1857 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1858 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1859 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1862 state => 0, 1872 state => 0,
… …
1866} 1876}
1867 1877
1868sub size_request { 1878sub size_request {
1869 my ($self) = @_; 1879 my ($self) = @_;
1870 1880
1871 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1872} 1882}
1873 1883
1874sub button_down { 1884sub button_down {
1875 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1876 1886
1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1880 $self->_emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1881 } 1891 }
1882} 1892}
1883 1893
1884sub _draw { 1894sub _draw {
1885 my ($self) = @_; 1895 my ($self) = @_;
1886 1896
1887 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1888 1898
1889 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890 1900
1891 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;
1892 1904
1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894 1906
1895 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896 1908
… …
2161 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2177 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2168 vertical => 0, 2180 vertical => 0,
2169 can_hover => 1, 2181 can_hover => 1,
2170 inner_pad => 0.02, 2182 inner_pad => 0.02,
2171 @_ 2183 @_
2172 ); 2184 );
… …
2175 $self->update; 2187 $self->update;
2176 2188
2177 $self 2189 $self
2178} 2190}
2179 2191
2192sub changed { }
2193
2180sub set_range { 2194sub set_range {
2181 my ($self, $range) = @_; 2195 my ($self, $range) = @_;
2182 2196
2183 ($range, $self->{range}) = ($self->{range}, $range); 2197 ($range, $self->{range}) = ($self->{range}, $range);
2184 2198
… …
2210} 2224}
2211 2225
2212sub size_request { 2226sub size_request {
2213 my ($self) = @_; 2227 my ($self) = @_;
2214 2228
2215 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2230}
2220 2231
2221sub button_down { 2232sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2223 2234
… …
2579 state => 0, 2590 state => 0,
2580 on_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2581 @_ 2592 @_
2582 ); 2593 );
2583 2594
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2595 $self
2590} 2596}
2591 2597
2592sub toggle_flopper { 2598sub toggle_flopper {
2593 my ($self) = @_; 2599 my ($self) = @_;
2594 2600
2595 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2602}
2607 2603
2608############################################################################# 2604#############################################################################
2609 2605
2610package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2623} 2619}
2624 2620
2625sub set_tooltip_from { 2621sub set_tooltip_from {
2626 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2627 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
2628 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8, 2636 fontsize => 0.8,
2632 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2633 ellipsise => 0, 2638 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2645 2650
2646sub size_allocate { 2651sub size_allocate {
2647 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2648 2653
2649 $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 });
2650} 2673}
2651 2674
2652sub _draw { 2675sub _draw {
2653 my ($self) = @_; 2676 my ($self) = @_;
2654 2677
… …
2671 glVertex $w, $h; 2694 glVertex $w, $h;
2672 glVertex $w, 0; 2695 glVertex $w, 0;
2673 glEnd; 2696 glEnd;
2674 2697
2675 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2676 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2677} 2701}
2678 2702
2679############################################################################# 2703#############################################################################
2680 2704
… …
2796 2820
2797 $row++; 2821 $row++;
2798 } 2822 }
2799} 2823}
2800 2824
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805
2806############################################################################# 2825#############################################################################
2807 2826
2808package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
2809 2828
2810our @ISA = CFClient::UI::FancyFrame::; 2829our @ISA = CFClient::UI::FancyFrame::;
… …
2850 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self; 2870 $GRAB = $self;
2852 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2853 2872
2854 $self->show; 2873 $self->show;
2855 $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);
2856} 2875}
2857 2876
2858sub mouse_motion { 2877sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2860 2879
… …
2994use CFClient::OpenGL; 3013use CFClient::OpenGL;
2995 3014
2996sub new { 3015sub new {
2997 my $class = shift; 3016 my $class = shift;
2998 3017
2999 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
3000 visible => 1, 3019 visible => 1,
3001 @_, 3020 @_,
3002 ) 3021 );
3003}
3004 3022
3005sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
3006 my ($self, $x, $y, $w, $h) = @_;
3007 3024
3008 $self->{w} = $w; 3025 $self
3009 $self->{h} = $h;
3010}
3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017} 3026}
3018 3027
3019sub size_request { 3028sub size_request {
3020 my ($self) = @_; 3029 my ($self) = @_;
3021 3030
3022 ($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
3023} 3046}
3024 3047
3025sub size_allocate { 3048sub size_allocate {
3026 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
3027 3050
3028 for my $child ($self->children) { 3051 for my $child ($self->children) {
3029 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)};
3030 3053
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3033 3056
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3059
3040 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
3041 } 3061 }
3042} 3062}
3043 3063
… …
3054} 3074}
3055 3075
3056sub update { 3076sub update {
3057 my ($self) = @_; 3077 my ($self) = @_;
3058 3078
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
3061} 3080}
3062 3081
3063sub add { 3082sub add {
3064 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
3065 3084
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3085 $_->{is_toplevel} = 1
3074 3086 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3087
3080 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3081} 3089}
3082 3090
3083sub remove { 3091sub remove {
3084 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3085 3093
3086 $self->SUPER::remove (@children); 3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3087 3098
3088 while (@children) { 3099 while (@children) {
3089 my $w = pop @children; 3100 my $w = pop @children;
3090 push @children, $w->children; 3101 push @children, $w->children;
3091 $w->set_invisible; 3102 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
3111 $_->() 3122 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3113 } 3124 }
3114 3125
3115 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
3116 my @queue; 3127 my @queue;
3117 3128
3118 for (;;) { 3129 while () {
3119 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
3120 #TODO use array-of-depth approach 3131 #TODO use array-of-depth approach
3121 3132
3133 use sort 'stable';
3134
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3123 @queue, values %{delete $self->{check_size}}; 3136 @queue, values %{delete $self->{realloc}};
3124 } 3137 }
3125 3138
3126 my $widget = pop @queue || last; 3139 my $widget = pop @queue || last;
3127 3140
3128 defined $widget->{visible} or last; # do not resize invisible widgets 3141 $widget->{visible} or last; # do not resize invisible widgets
3129 3142
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
3133 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
3134 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137
3138 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
3140 3155
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
3142 3157
3143 $widget->{parent}->check_size
3144 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 }
3145 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3146 } 3167 }
3147 } 3168 }
3148 3169
3149 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3151 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)};
3152 3178
3153 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3155 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}) {
3156 $widget->{w} = $w; 3186 $widget->{w} = $w;
3157 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3158 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3159 } 3191 }
3160 } 3192 }
3161 3193
3162 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3163 $_->() 3195 $_->()
3164 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3165 } 3197 }
3198
3166 3199
3167 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3170 3203

Diff Legend

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