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.182 by root, Sun Apr 30 11:17:08 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
… …
255 my ($self) = @_; 250 my ($self) = @_;
256 251
257 $_->reconfigure 252 $_->reconfigure
258 for $self->children; 253 for $self->children;
259 254
260 $_->check_size; 255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
261} 258}
262 259
263sub set_max_size { 260sub set_max_size {
264 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
265 262
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
268}
269
270# return top left coordinates
271sub _topleft {
272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
276
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
278} 265}
279 266
280# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
281sub coord2local { 268sub coord2local {
282 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
283 270
284 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 272}
287 273
288# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
289sub coord2global { 275sub coord2global {
290 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
291 277
292 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 279}
295 280
296sub focus_in { 281sub focus_in {
297 my ($self) = @_; 282 my ($self) = @_;
298 283
… …
395} 380}
396 381
397sub set_parent { 382sub set_parent {
398 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
399 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
400 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
401} 387}
402 388
403sub check_size { 389sub check_size {
404 my ($self) = @_; 390 my ($self) = @_;
405 391
406 $self->{parent} 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427} 393}
428 394
429sub update { 395sub update {
430 my ($self) = @_; 396 my ($self) = @_;
431 397
… …
528 494
529 $self 495 $self
530} 496}
531 497
532sub add { 498sub add {
533 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
534 500
535 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
536 503
537 use sort 'stable'; 504 use sort 'stable';
538 505
539 $self->{children} = [ 506 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
542 ]; 509 ];
543 510
544 $child->check_size; 511 $_->check_size
512 for @widgets;
513
545 $self->update; 514 $self->update;
546} 515}
547 516
548sub children { 517sub children {
549 @{ $_[0]{children} } 518 @{ $_[0]{children} }
… …
737 706
738 $self->{view_x} = int $x; 707 $self->{view_x} = int $x;
739 $self->{view_y} = int $y; 708 $self->{view_y} = int $y;
740 709
741 $self->update; 710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
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)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
742} 739}
743 740
744sub _render { 741sub _render {
745 my ($self) = @_; 742 my ($self) = @_;
746 743
… …
1303 1300
1304 delete $self->{texture}; 1301 delete $self->{texture};
1305 $self->SUPER::update; 1302 $self->SUPER::update;
1306} 1303}
1307 1304
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1305sub set_text {
1315 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1316 1307
1317 return if $self->{text} eq "T$text"; 1308 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1309 $self->{text} = "T$text";
1319 1310
1320 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1321 1312
1322 delete $self->{texture};
1323 $self->update; 1313 $self->update;
1324 $self->check_size; 1314 $self->check_size;
1325} 1315}
1326 1316
1327sub set_markup { 1317sub set_markup {
… …
1330 return if $self->{text} eq "M$markup"; 1320 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1321 $self->{text} = "M$markup";
1332 1322
1333 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1334 1324
1335 delete $self->{texture};
1336 $self->update; 1325 $self->update;
1337 $self->check_size; 1326 $self->check_size;
1338} 1327}
1339 1328
1340sub size_request { 1329sub size_request {
… …
1371sub set_fontsize { 1360sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1373 1362
1374 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1364 delete $self->{texture};
1365
1366 $self->update;
1376 $self->check_size; 1367 $self->check_size;
1377 $self->update;
1378} 1368}
1379 1369
1380sub _draw { 1370sub _draw {
1381 my ($self) = @_; 1371 my ($self) = @_;
1382 1372
… …
2464} 2454}
2465 2455
2466sub _draw { 2456sub _draw {
2467 my ($self) = @_; 2457 my ($self) = @_;
2468 2458
2459 return unless $::CONN;#d# manage and cache textures differently
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470 2461
2471 # TODO animation 2462 # TODO animation
2472 if ($tex) { 2463 if ($tex) {
2473 glEnable GL_BLEND; 2464 glEnable GL_BLEND;
… …
2481 } 2472 }
2482} 2473}
2483 2474
2484############################################################################# 2475#############################################################################
2485 2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_;
2556
2557 $self->{scrolled}->clear;
2558 return unless $items;
2559
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578}
2579
2580#############################################################################
2581
2486package CFClient::UI::Menu; 2582package CFClient::UI::Menu;
2487 2583
2488our @ISA = CFClient::UI::FancyFrame::; 2584our @ISA = CFClient::UI::FancyFrame::;
2489 2585
2490use CFClient::OpenGL; 2586use CFClient::OpenGL;
… …
2559 2655
2560our @ISA = CFClient::UI::Container::; 2656our @ISA = CFClient::UI::Container::;
2561 2657
2562use CFClient::OpenGL; 2658use CFClient::OpenGL;
2563 2659
2564sub check_size { 2660sub new {
2565 my ($self) = @_; 2661 my $class = shift;
2566 2662
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2663 $class->SUPER::new (
2568} 2664 @_,
2569 2665 )
2570sub size_request {
2571 ($::WIDTH, $::HEIGHT)
2572} 2666}
2573 2667
2574sub configure { 2668sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 2669 my ($self, $x, $y, $w, $h) = @_;
2576 2670
2577 $self->SUPER::configure ($x, $y, $w, $h); 2671 $self->{w} = $w;
2672 $self->{h} = $h;
2673}
2578 2674
2675sub check_size {
2676 my ($self) = @_;
2677
2678 $self->size_allocate ($self->{w}, $self->{h})
2679 if $self->{w};
2680}
2681
2682sub size_request {
2683 my ($self) = @_;
2684
2685 ($self->{w}, $self->{h})
2686}
2687
2688sub size_allocate {
2689 my ($self, $w, $h) = @_;
2690
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2579 for my $child (@{$self->{children}}) { 2707 for my $child ($self->children) {
2580 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)};
2581 2709
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2710 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2583 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2584 $child->configure ($X, $Y, $W,$H); 2712 $child->configure ($X, $Y, $W, $H);
2585 } 2713 }
2586}
2587 2714
2588sub _topleft { 2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717}
2718
2719sub coord2local {
2589 my ($self, $x, $y) = @_; 2720 my ($self, $x, $y) = @_;
2590 2721
2591 ($x, $y) 2722 ($x, $y)
2592} 2723}
2593 2724
2725sub coord2global {
2726 my ($self, $x, $y) = @_;
2727
2728 ($x, $y)
2729}
2730
2594sub update { 2731sub update {
2595 my ($self) = @_; 2732 my ($self) = @_;
2596 2733
2597 $self->check_size; 2734 $self->check_size;
2598 ::refresh (); 2735 $::WANT_REFRESH++;
2599} 2736}
2600 2737
2601sub add { 2738sub add {
2602 my ($self, $child) = @_; 2739 my ($self, $child) = @_;
2603 2740
2604 # integerize window positions 2741 # integerise window positions
2605 $child->{x} = int $child->{x}; 2742 $child->{x} = int $child->{x};
2606 $child->{y} = int $child->{y}; 2743 $child->{y} = int $child->{y};
2607 2744
2608 $self->SUPER::add ($child); 2745 $self->SUPER::add ($child);
2609} 2746}
… …
2612 my ($self, $id, $cb) = @_; 2749 my ($self, $id, $cb) = @_;
2613 2750
2614 $self->{refresh_hook}{$id} = $cb; 2751 $self->{refresh_hook}{$id} = $cb;
2615} 2752}
2616 2753
2617sub draw { 2754sub draw {
2618 my ($self) = @_; 2755 my ($self) = @_;
2619 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
2620 while (my $rcb = delete $self->{refresh_hook}) { 2796 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 2797 $_->()
2798 for values %{delete $self->{refresh_hook}};
2622 } 2799 }
2623 2800
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2801 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 2803 glClear GL_COLOR_BUFFER_BIT;
… …
2634 $self->_draw; 2811 $self->_draw;
2635} 2812}
2636 2813
2637############################################################################# 2814#############################################################################
2638 2815
2639package CFClient::UI::Inventory;
2640
2641our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2650
2651 $self
2652}
2653
2654sub set_items {
2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662 $self->{real_items} = \@items;
2663
2664 for my $item (@items) {
2665 my $desc = $item->{nrof} < 2
2666 ? $item->{name}
2667 : "$item->{nrof} $item->{name_pl}";
2668
2669 my $hb = new CFClient::UI::HBox;
2670
2671 $hb->add (my $f = new CFClient::UI::Face
2672 can_events => 0,
2673 face => $item->{face},
2674 anim => $item->{anim},
2675 animspeed => $item->{animspeed},
2676 expand => 1,
2677 );
2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2680 }
2681
2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683}
2684
2685sub size_request {
2686 my ($self) = @_;
2687 (100, 200)
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI; 2816package CFClient::UI;
2693 2817
2694$ROOT = new CFClient::UI::Root; 2818$ROOT = new CFClient::UI::Root;
2695$TOOLTIP = new CFClient::UI::Tooltip; 2819$TOOLTIP = new CFClient::UI::Tooltip;
2696 2820

Diff Legend

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