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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC

… …
232 $self->{y} = $y; 232 $self->{y} = $y;
233 $self->update; 233 $self->update;
234 } 234 }
235 235
236 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 238 }
244} 239}
245 240
246sub size_allocate { 241sub size_allocate {
247 # nothing to be done 242 # nothing to be done
… …
267 262
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 265}
271 266
272# return top left coordinates
273sub _topleft {
274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
278
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
280}
281
282# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
283sub coord2local { 268sub coord2local {
284 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
285 270
286 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 272}
289 273
290# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
291sub coord2global { 275sub coord2global {
292 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
293 277
294 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 279}
297 280
298sub focus_in { 281sub focus_in {
299 my ($self) = @_; 282 my ($self) = @_;
300 283
… …
397} 380}
398 381
399sub set_parent { 382sub set_parent {
400 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
401 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
402 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
403} 387}
404 388
405sub check_size { 389sub check_size {
406 my ($self) = @_; 390 my ($self) = @_;
407 391
408 $self->_check_size;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self}; 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
437 $self->{req_w} = $w;
438 $self->{req_h} = $h;
439
440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
449 }
450} 393}
451 394
452sub update { 395sub update {
453 my ($self) = @_; 396 my ($self) = @_;
454 397
455 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 398 $self->{parent}->update
456 399 if $self->{parent};
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
468} 400}
469 401
470sub connect { 402sub connect {
471 my ($self, $signal, $cb) = @_; 403 my ($self, $signal, $cb) = @_;
472 404
… …
776 $self->{view_y} = int $y; 708 $self->{view_y} = int $y;
777 709
778 $self->update; 710 $self->update;
779} 711}
780 712
781# hmm, this does not work for topleft of $self... but we should not aks for that 713# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 714sub coord2local {
783 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
784 716
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
786} 727}
787 728
788sub find_widget { 729sub find_widget {
789 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
790 731
… …
1367 return if $self->{text} eq "T$text"; 1308 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1309 $self->{text} = "T$text";
1369 1310
1370 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1371 1312
1372 delete $self->{texture};
1373 $self->update; 1313 $self->update;
1374 $self->check_size; 1314 $self->check_size;
1375} 1315}
1376 1316
1377sub set_markup { 1317sub set_markup {
… …
1380 return if $self->{text} eq "M$markup"; 1320 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1321 $self->{text} = "M$markup";
1382 1322
1383 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1384 1324
1385 delete $self->{texture};
1386 $self->update; 1325 $self->update;
1387 $self->check_size; 1326 $self->check_size;
1388} 1327}
1389 1328
1390sub size_request { 1329sub size_request {
… …
2716 2655
2717our @ISA = CFClient::UI::Container::; 2656our @ISA = CFClient::UI::Container::;
2718 2657
2719use CFClient::OpenGL; 2658use CFClient::OpenGL;
2720 2659
2660sub new {
2661 my $class = shift;
2662
2663 $class->SUPER::new (
2664 @_,
2665 )
2666}
2667
2668sub configure {
2669 my ($self, $x, $y, $w, $h) = @_;
2670
2671 $self->{w} = $w;
2672 $self->{h} = $h;
2673}
2674
2721sub check_size { 2675sub check_size {
2722 my ($self) = @_; 2676 my ($self) = @_;
2723 2677
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 2678 $self->size_allocate ($self->{w}, $self->{h})
2679 if $self->{w};
2725} 2680}
2726 2681
2727sub size_request { 2682sub size_request {
2728 my ($self) = @_; 2683 my ($self) = @_;
2729 2684
… …
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h}; 2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h}; 2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 } 2704 }
2750 } 2705 }
2751 2706
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2754}
2755
2756sub configure {
2757 my ($self, $x, $y, $w, $h) = @_;
2758
2759 $self->SUPER::configure ($x, $y, $w, $h);
2760
2761 for my $child ($self->children) { 2707 for my $child ($self->children) {
2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763 2709
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2710 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2766 $child->configure ($X, $Y, $W, $H); 2712 $child->configure ($X, $Y, $W, $H);
2767 } 2713 }
2768}
2769 2714
2770sub _topleft { 2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717}
2718
2719sub coord2local {
2771 my ($self, $x, $y) = @_; 2720 my ($self, $x, $y) = @_;
2772 2721
2773 ($x, $y) 2722 ($x, $y)
2774} 2723}
2775 2724
2725sub coord2global {
2726 my ($self, $x, $y) = @_;
2727
2728 ($x, $y)
2729}
2730
2776sub update { 2731sub update {
2777 my ($self) = @_; 2732 my ($self) = @_;
2778 2733
2779 $self->check_size; 2734 $self->check_size;
2780 ::refresh (); 2735 $::WANT_REFRESH++;
2781} 2736}
2782 2737
2783sub add { 2738sub add {
2784 my ($self, $child) = @_; 2739 my ($self, $child) = @_;
2785 2740
2786 # integerize window positions 2741 # integerise window positions
2787 $child->{x} = int $child->{x}; 2742 $child->{x} = int $child->{x};
2788 $child->{y} = int $child->{y}; 2743 $child->{y} = int $child->{y};
2789 2744
2790 $self->SUPER::add ($child); 2745 $self->SUPER::add ($child);
2791} 2746}
… …
2794 my ($self, $id, $cb) = @_; 2749 my ($self, $id, $cb) = @_;
2795 2750
2796 $self->{refresh_hook}{$id} = $cb; 2751 $self->{refresh_hook}{$id} = $cb;
2797} 2752}
2798 2753
2799sub draw { 2754sub draw {
2800 my ($self) = @_; 2755 my ($self) = @_;
2801 2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795
2802 while (my $rcb = delete $self->{refresh_hook}) { 2796 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 2797 $_->()
2798 for values %{delete $self->{refresh_hook}};
2804 } 2799 }
2805 2800
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2801 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 2803 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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