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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.193 by root, Wed May 10 21:12:26 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
… …
256 251
257 $_->reconfigure 252 $_->reconfigure
258 for $self->children; 253 for $self->children;
259 254
260 $self->check_size; 255 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h}); 256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
262 $self->update; 257 $self->update;
263} 258}
264 259
265sub set_max_size { 260sub set_max_size {
266 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
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}
271
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} 265}
281 266
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
… …
398 381
399sub set_parent { 382sub set_parent {
400 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
401 384
402 Scalar::Util::weaken ($self->{parent} = $parent); 385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
403} 389}
404 390
405sub check_size { 391sub check_size {
406 my ($self) = @_; 392 my ($self) = @_;
407 393
408 $self->_check_size;
409 return;
410 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
411
412 $check_size->{$self} = $self;
413
414 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
415 while (%$check_size) {
416 my @widgets = values %$check_size;
417 $_->_check_size
418 for @widgets;
419 }
420 });
421}
422
423sub _check_size {
424 my ($self) = @_;
425
426 delete $CFClient::UI::ROOT->{_check_size}{$self}; 394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
427
428 $self->{parent}
429 or return 1;
430
431 my ($w, $h) = $self->{user_w} && $self->{user_h}
432 ? @$self{qw(user_w user_h)}
433 : $self->size_request;
434
435 if ($w != $self->{req_w} || $h != $self->{req_h}) {
436 $self->{req_w} = $w;
437 $self->{req_h} = $h;
438
439 $self->{parent}->_check_size
440 or $self->size_allocate (
441 (List::Util::max $self->{w}, $w),
442 (List::Util::max $self->{h}, $h),
443 );
444
445 1
446 } else {
447 0
448 }
449} 395}
450 396
451sub update { 397sub update {
452 my ($self) = @_; 398 my ($self) = @_;
453 399
454 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 400 $self->{parent}->update
455 401 if $self->{parent};
456 $update->{$self} = $self;
457
458 $CFClient::UI::ROOT->on_refresh (_update => sub {
459 while (%$update) {
460 my @widgets = values %$update;
461 %$update = ();
462
463 $_->{parent} && $_->{parent}->update
464 for @widgets;
465 }
466 });
467} 402}
468 403
469sub connect { 404sub connect {
470 my ($self, $signal, $cb) = @_; 405 my ($self, $signal, $cb) = @_;
471 406
… …
573 $self->{children} = [ 508 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 510 @{$self->{children}}, @widgets
576 ]; 511 ];
577 512
578 $_->check_size 513 $self->check_size;
579 for @widgets;
580
581 $self->update; 514 $self->update;
582} 515}
583 516
584sub children { 517sub children {
585 @{ $_[0]{children} } 518 @{ $_[0]{children} }
… …
775 $self->{view_y} = int $y; 708 $self->{view_y} = int $y;
776 709
777 $self->update; 710 $self->update;
778} 711}
779 712
780# 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
781sub _topleft { 714sub coord2local {
782 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
783 716
784 $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)
785} 727}
786 728
787sub find_widget { 729sub find_widget {
788 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
789 731
… …
1270 ) 1212 )
1271} 1213}
1272 1214
1273sub size_allocate { 1215sub size_allocate {
1274 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1275 1219
1276 my $children = $self->{children}; 1220 my $children = $self->{children};
1277 1221
1278 my @h = map $_->{req_h}, @$children; 1222 my @h = map $_->{req_h}, @$children;
1279 1223
… …
1366 return if $self->{text} eq "T$text"; 1310 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1311 $self->{text} = "T$text";
1368 1312
1369 $self->{layout}->set_text ($text); 1313 $self->{layout}->set_text ($text);
1370 1314
1371 delete $self->{texture};
1372 $self->update; 1315 $self->update;
1373 $self->check_size; 1316 $self->check_size;
1374} 1317}
1375 1318
1376sub set_markup { 1319sub set_markup {
… …
1379 return if $self->{text} eq "M$markup"; 1322 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup"; 1323 $self->{text} = "M$markup";
1381 1324
1382 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1383 1326
1384 delete $self->{texture};
1385 $self->update; 1327 $self->update;
1386 $self->check_size; 1328 $self->check_size;
1387} 1329}
1388 1330
1389sub size_request { 1331sub size_request {
… …
2541sub new { 2483sub new {
2542 my $class = shift; 2484 my $class = shift;
2543 2485
2544 my %args = @_; 2486 my %args = @_;
2545 2487
2546 my $item = $args{item}; 2488 my $item = delete $args{item};
2547 2489
2548 my $desc = $item->{nrof} < 2 2490 my $desc = $item->{nrof} < 2
2549 ? $item->{name} 2491 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}"; 2492 : "$item->{nrof} $item->{name_pl}";
2551 2493
… …
2580 2522
2581 1 2523 1
2582 }, 2524 },
2583 %args 2525 %args
2584 ); 2526 );
2527
2585 $self->add(new CFClient::UI::Face 2528 $self->add (new CFClient::UI::Face
2586 can_events => 0, 2529 can_events => 0,
2587 face => $item->{face}, 2530 face => $item->{face},
2588 anim => $item->{anim}, 2531 anim => $item->{anim},
2589 animspeed => $item->{animspeed}); 2532 animspeed => $item->{animspeed},
2533 );
2534
2590 $self->add(new CFClient::UI::Label 2535 $self->add (new CFClient::UI::Label
2591 can_events => 0, 2536 can_events => 0,
2592 text => $desc); 2537 text => $desc,
2538 );
2593 2539
2594 $self 2540 $self
2595} 2541}
2596 2542
2597############################################################################# 2543#############################################################################
… …
2624 for my $item (@items) { 2570 for my $item (@items) {
2625 my $desc = $item->{nrof} < 2 2571 my $desc = $item->{nrof} < 2
2626 ? $item->{name} 2572 ? $item->{name}
2627 : "$item->{nrof} $item->{name_pl}"; 2573 : "$item->{nrof} $item->{name_pl}";
2628 2574
2629 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2630 } 2576 }
2631 2577
2632# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633} 2579}
2634 2580
… …
2715 2661
2716our @ISA = CFClient::UI::Container::; 2662our @ISA = CFClient::UI::Container::;
2717 2663
2718use CFClient::OpenGL; 2664use CFClient::OpenGL;
2719 2665
2666sub new {
2667 my $class = shift;
2668
2669 $class->SUPER::new (
2670 @_,
2671 )
2672}
2673
2674sub configure {
2675 my ($self, $x, $y, $w, $h) = @_;
2676
2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2680
2720sub check_size { 2681sub check_size {
2721 my ($self) = @_; 2682 my ($self) = @_;
2722 2683
2723 $self->configure (0, 0, $self->{w}, $self->{h}); 2684 $self->size_allocate ($self->{w}, $self->{h})
2685 if $self->{w};
2724} 2686}
2725 2687
2726sub size_request { 2688sub size_request {
2727 my ($self) = @_; 2689 my ($self) = @_;
2728 2690
… …
2746 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h}; 2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h}; 2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748 } 2710 }
2749 } 2711 }
2750 2712
2751 $self->{old_w} = $w;
2752 $self->{old_h} = $h;
2753}
2754
2755sub configure {
2756 my ($self, $x, $y, $w, $h) = @_;
2757
2758 $self->SUPER::configure ($x, $y, $w, $h);
2759
2760 for my $child ($self->children) { 2713 for my $child ($self->children) {
2761 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2762 2715
2763 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2716 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2764 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2765 $child->configure ($X, $Y, $W, $H); 2718 $child->configure ($X, $Y, $W, $H);
2766 } 2719 }
2767}
2768 2720
2769sub _topleft { 2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723}
2724
2725sub coord2local {
2770 my ($self, $x, $y) = @_; 2726 my ($self, $x, $y) = @_;
2771 2727
2772 ($x, $y) 2728 ($x, $y)
2773} 2729}
2774 2730
2731sub coord2global {
2732 my ($self, $x, $y) = @_;
2733
2734 ($x, $y)
2735}
2736
2775sub update { 2737sub update {
2776 my ($self) = @_; 2738 my ($self) = @_;
2777 2739
2778 $self->check_size; 2740 $self->check_size;
2779 ::refresh (); 2741 $::WANT_REFRESH++;
2780} 2742}
2781 2743
2782sub add { 2744sub add {
2783 my ($self, $child) = @_; 2745 my ($self, $child) = @_;
2784 2746
2785 # integerize window positions 2747 # integerise window positions
2786 $child->{x} = int $child->{x}; 2748 $child->{x} = int $child->{x};
2787 $child->{y} = int $child->{y}; 2749 $child->{y} = int $child->{y};
2788 2750
2789 $self->SUPER::add ($child); 2751 $self->SUPER::add ($child);
2790} 2752}
… …
2793 my ($self, $id, $cb) = @_; 2755 my ($self, $id, $cb) = @_;
2794 2756
2795 $self->{refresh_hook}{$id} = $cb; 2757 $self->{refresh_hook}{$id} = $cb;
2796} 2758}
2797 2759
2798sub draw { 2760sub draw {
2799 my ($self) = @_; 2761 my ($self) = @_;
2800 2762
2763 if ($self->{check_size}) {
2764 my @queue = ([], []);
2765
2766 for (;;) {
2767 if ($self->{check_size}) {
2768 # heuristic: check containers last
2769 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2770 for values %{delete $self->{check_size}}
2771 }
2772
2773 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2774
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request;
2778
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781
2782 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h;
2784
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2786
2787 $widget->{parent}->check_size
2788 if $widget->{parent};
2789 }
2790 }
2791 }
2792
2793 while ($self->{size_alloc}) {
2794 for (values %{delete $self->{size_alloc}}) {
2795 my ($widget, $w, $h) = @$_;
2796
2797 $w = 0 if $w < 0;
2798 $h = 0 if $h < 0;
2799
2800 $widget->{w} = $w;
2801 $widget->{h} = $h;
2802 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h);
2804 }
2805 }
2806
2801 while (my $rcb = delete $self->{refresh_hook}) { 2807 while ($self->{refresh_hook}) {
2802 $_->() for values %$rcb; 2808 $_->()
2809 for values %{delete $self->{refresh_hook}};
2803 } 2810 }
2804 2811
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2812 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 2814 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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