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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.316 by root, Sun Jul 2 13:57:58 2006 UTC

… …
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338} 338}
339 339
340sub baseline_shift {
341 0
342}
343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
343 if ($self->{aspect}) { 347 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 348 my ($ow, $oh) = ($w, $h);
… …
470} 474}
471 475
472sub emit { 476sub emit {
473 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
474 478
479 #d##TODO# stop propagating at first true, do not use sum
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure 481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478} 483}
479 484
480sub find_widget { 485sub find_widget {
481 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
482 487
… …
534 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
535 540
536 # update screen rectangle 541 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 544
542 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 548
… …
983 $self->add ($child) if $child; 986 $self->add ($child) if $child;
984 987
985 $self 988 $self
986} 989}
987 990
991#TODO# update range on size_allocate depending on child
992
988sub add { 993sub add {
989 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
990 995
991 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
992} 997}
993 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
994sub update { 1005sub update {
995 my ($self) = @_; 1006 my ($self) = @_;
996 1007
997 $self->SUPER::update; 1008 $self->SUPER::update;
998 1009
999 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1011}
1003 1012
1004sub invoke_size_allocate { 1013sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1006 1015
1007 my $child = $self->{vp}->child; 1016 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009 1017
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1019}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1020
1016############################################################################# 1021#############################################################################
1017 1022
1018package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1019 1024
… …
1090 if exists $self->{title}; 1095 if exists $self->{title};
1091 1096
1092 if ($self->{has_close_button}) { 1097 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1098 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1095 image => 'x1_close.png', 1100 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->hide };
1097 1102
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1099 } 1104 }
1100 1105
… …
1437 1442
1438sub invoke_size_allocate { 1443sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1440 1445
1441 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1443 1448
1444 my @req; 1449 my @req;
1445 1450
1446 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1448 } else { 1453 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1451 1456
1452 if ($req > $space) { 1457 if ($req > $space) {
1453 # ah well, not enough space 1458 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1455 } else { 1460 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1462
1458 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1459 1464
1460 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1466 for 0 .. $#children;
1462 } 1467 }
1463 } 1468 }
1464 1469
1465 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1466 1471
1467 my $pos = 0; 1472 my $pos = 0;
1468 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1476
1472 $pos += $alloc; 1477 $pos += $alloc;
1473 } 1478 }
1474 1479
1475 1 1480 1
… …
1630 }; 1635 };
1631 1636
1632 @{ $self->{size_req} } 1637 @{ $self->{size_req} }
1633} 1638}
1634 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1635sub invoke_size_allocate { 1644sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1637 1646
1638 delete $self->{ox}; 1647 delete $self->{ox};
1639 1648
… …
1645 1654
1646sub set_fontsize { 1655sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1648 1657
1649 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1650 delete $self->{texture}; 1660 delete $self->{texture};
1651 1661
1652 $self->realloc; 1662 $self->realloc;
1653} 1663}
1654 1664
… …
1891 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1892 1902
1893 if ($sym == 13) { 1903 if ($sym == 13) {
1894 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1896 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1897 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1898 $self->emit (activate => $txt); 1909 $self->emit (activate => $txt);
1899 $self->update; 1910 $self->update;
1900 1911
… …
2090package CFClient::UI::Image; 2101package CFClient::UI::Image;
2091 2102
2092our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
2093 2104
2094use CFClient::OpenGL; 2105use CFClient::OpenGL;
2095use Carp qw/confess/;
2096 2106
2097our %loaded_images; 2107our %texture_cache;
2098 2108
2099sub new { 2109sub new {
2100 my $class = shift; 2110 my $class = shift;
2101 2111
2102 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2103 2116
2104 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2105 2119
2106 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2107 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2108 2122
2109 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2110 2124
2111 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2112
2113 $self->{aspect} = $tex->{w} / $tex->{h};
2114 2126
2115 $self 2127 $self
2116} 2128}
2117 2129
2118sub size_request { 2130sub size_request {
2119 my ($self) = @_; 2131 my ($self) = @_;
2120 2132
2121 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
2122} 2134}
2123 2135
2124sub _draw { 2136sub _draw {
2125 my ($self) = @_; 2137 my ($self) = @_;
2126 2138
… …
2409 2421
2410 $self->SUPER::invoke_button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2411 2423
2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413 2425
2414 $self->mouse_motion ($ev, $x, $y) 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2415} 2427}
2416 2428
2417sub invoke_mouse_motion { 2429sub invoke_mouse_motion {
2418 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2419 2431
… …
2564 2576
2565 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2566 $self->reflow; 2578 $self->reflow;
2567} 2579}
2568 2580
2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2569sub invoke_size_allocate { 2590sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2571 2592
2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2595
2572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576 2600
2577 $self->reflow; 2601 $self->reflow;
2578 2602
2603 local $self->{children} = [$empty, $slider];
2579 $self->SUPER::invoke_size_allocate ($w, $h) 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2580} 2605}
2581 2606
2582sub text_size { 2607sub get_layout {
2583 my ($self, $text, $indent) = @_; 2608 my ($self, $para) = @_;
2584 2609
2585 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2586 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2591 2623 );
2624
2592 $layout->size 2625 $layout
2593} 2626}
2594 2627
2595sub reflow { 2628sub reflow {
2596 my ($self) = @_; 2629 my ($self) = @_;
2597 2630
… …
2606 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2607} 2640}
2608 2641
2609sub clear { 2642sub clear {
2610 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2611 2647
2612 $self->{par} = []; 2648 $self->{par} = [];
2613 $self->{height} = 0; 2649 $self->{height} = 0;
2614 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615} 2651}
2616 2652
2617sub add_paragraph { 2653sub add_paragraph {
2618 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2619 2655
2620 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2621 my ($w, $h) = $self->text_size ($line); 2657
2622 $self->{height} += $h; 2658 $para = {
2623 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2624 } 2665 };
2625 2666
2626 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2669
2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2673
2674sub scroll_to_bottom {
2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2627} 2679}
2628 2680
2629sub update { 2681sub update {
2630 my ($self) = @_; 2682 my ($self) = @_;
2631 2683
… …
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640 2692
2641 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2642 my $height = 0; 2694 my $height = 0;
2643 2695
2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2650 $layout->set_width ($W - $_->[3]); 2698 my $layout = $self->get_layout ($para);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652 $layout->set_markup ($_->[4]);
2653 my ($w, $h) = $layout->size; 2699 my ($w, $h) = $layout->size;
2654 $_->[0] = $w + $_->[3]; 2700
2655 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2656 } 2704 }
2657 2705
2658 $height += $_->[1]; 2706 $height += $para->{h};
2659 } 2707 }
2660 2708
2661 $self->{height} = $height; 2709 $self->{height} = $height;
2662 2710
2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2664 2712
2665 delete $self->{texture}; 2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2666 } 2718 }
2667 2719
2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2669 glClearColor 0, 0, 0, 0; 2721 glClearColor 0, 0, 0, 0;
2670 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
… …
2674 my $y0 = $top; 2726 my $y0 = $top;
2675 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2676 2728
2677 my $y = 0; 2729 my $y = 0;
2678 2730
2679 my $layout = $self->{layout};
2680
2681 $layout->set_font ($self->{font}) if $self->{font};
2682
2683 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2684 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2685 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686 2734
2687 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2688 my $h = $par->[1]; 2736 my $h = $para->{h};
2689 2737
2690 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2691 $layout->set_foreground (@{ $par->[2] }); 2739
2692 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694 $layout->set_markup ($par->[4]);
2695 2741
2696 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2697 2743
2698 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2699 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2700 } 2762 }
2701 2763
2702 $y += $h; 2764 $y += $h;
2703 } 2765 }
2704 2766
2705 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2706 }; 2768 };
2707 }); 2769 });
2770}
2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2708} 2779}
2709 2780
2710sub _draw { 2781sub _draw {
2711 my ($self) = @_; 2782 my ($self) = @_;
2712 2783
… …
2715 glColor 0, 0, 0, 1; 2786 glColor 0, 0, 0, 1;
2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2718 2789
2719 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2720
2721} 2791}
2722 2792
2723############################################################################# 2793#############################################################################
2724 2794
2725package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
3341 count => 1, 3411 count => 1,
3342 %arg, 3412 %arg,
3343 }; 3413 };
3344 } 3414 }
3345 3415
3416 $ROOT->on_refresh (reorder => sub {
3346 $self->reorder; 3417 $self->reorder;
3418 });
3347} 3419}
3348 3420
3349sub reconfigure { 3421sub reconfigure {
3350 my ($self) = @_; 3422 my ($self) = @_;
3351 3423
… …
3388 return unless $items; 3460 return unless $items;
3389 3461
3390 my @items = sort { 3462 my @items = sort {
3391 ($a->{type} <=> $b->{type}) 3463 ($a->{type} <=> $b->{type})
3392 or ($a->{name} cmp $b->{name}) 3464 or ($a->{name} cmp $b->{name})
3393 } @$items; 3465 } values %$items;
3394 3466
3395 $self->{real_items} = \@items; 3467 $self->{real_items} = \@items;
3396 3468
3397 my $row = 0; 3469 my $row = 0;
3398 for my $item (@items) { 3470 for my $item (@items) {
… …
3401 $self->{child}->add (0, $row, $item->{face_widget}); 3473 $self->{child}->add (0, $row, $item->{face_widget});
3402 $self->{child}->add (1, $row, $item->{desc_widget}); 3474 $self->{child}->add (1, $row, $item->{desc_widget});
3403 $self->{child}->add (2, $row, $item->{weight_widget}); 3475 $self->{child}->add (2, $row, $item->{weight_widget});
3404 3476
3405 $row++; 3477 $row++;
3406 }
3407}
3408
3409#############################################################################
3410
3411package CFClient::UI::BindEditor;
3412
3413our @ISA = CFClient::UI::FancyFrame::;
3414
3415sub new {
3416 my $class = shift;
3417
3418 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420 $self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424 text => "start recording",
3425 tooltip => "Start/Stops recording of actions."
3426 ."All subsequent actions after the recording started will be captured."
3427 ."The actions are displayed after the record was stopped."
3428 ."To bind the action you have to click on the 'Bind' button",
3429 on_activate => sub {
3430 unless ($self->{recording}) {
3431 $self->start;
3432 } else {
3433 $self->stop;
3434 }
3435 });
3436
3437 $vb->add (new CFClient::UI::Label text => "Actions:");
3438 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3441 $vb->add (my $hb = new CFClient::UI::HBox);
3442 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443 $hb->add (new CFClient::UI::Button
3444 text => "bind",
3445 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446 on_activate => sub {
3447 $self->ask_for_bind;
3448 });
3449
3450 $vb->add (my $hb = new CFClient::UI::HBox);
3451 $hb->add (new CFClient::UI::Button
3452 text => "ok",
3453 expand => 1,
3454 tooltip => "This closes the binding editor and saves the binding",
3455 on_activate => sub {
3456 $self->hide;
3457 $self->commit;
3458 });
3459
3460 $hb->add (new CFClient::UI::Button
3461 text => "cancel",
3462 expand => 1,
3463 tooltip => "This closes the binding editor without saving",
3464 on_activate => sub {
3465 $self->hide;
3466 $self->{binding_cancel}->()
3467 if $self->{binding_cancel};
3468 });
3469
3470 $self->update_binding_widgets;
3471
3472 $self
3473}
3474
3475sub commit {
3476 my ($self) = @_;
3477 my ($mod, $sym, $cmds) = $self->get_binding;
3478 if ($sym != 0 && @$cmds > 0) {
3479 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480 ."'. Don't forget 'Save Config'!");
3481 $self->{binding_change}->($mod, $sym, $cmds)
3482 if $self->{binding_change};
3483 } else {
3484 $::STATUSBOX->add ("No action bound, no key or action specified!");
3485 $self->{binding_cancel}->()
3486 if $self->{binding_cancel};
3487 }
3488}
3489
3490sub start {
3491 my ($self) = @_;
3492
3493 $self->{rec_btn}->set_text ("stop recording");
3494 $self->{recording} = 1;
3495 $self->clear_command_list;
3496 $::CONN->start_record if $::CONN;
3497}
3498
3499sub stop {
3500 my ($self) = @_;
3501
3502 $self->{rec_btn}->set_text ("start recording");
3503 $self->{recording} = 0;
3504
3505 my $rec;
3506 $rec = $::CONN->stop_record if $::CONN;
3507 return unless ref $rec eq 'ARRAY';
3508 $self->set_command_list ($rec);
3509}
3510
3511
3512sub ask_for_bind_and_commit {
3513 my ($self) = @_;
3514 $self->ask_for_bind (1);
3515}
3516
3517sub ask_for_bind {
3518 my ($self, $commit, $end_cb) = @_;
3519
3520 CFClient::Binder::open_binding_dialog (sub {
3521 my ($mod, $sym) = @_;
3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523 $self->update_binding_widgets;
3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3526 });
3527}
3528
3529# $mod and $sym are the modifiers and key symbol
3530# $cmds is a array ref of strings (the commands)
3531# $cb is the callback that is executed on OK
3532# $ccb is the callback that is executed on CANCEL and
3533# when the binding was unsuccessful on OK
3534sub set_binding {
3535 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537 $self->clear_command_list;
3538 $self->{recording} = 0;
3539 $self->{rec_btn}->set_text ("start recording");
3540
3541 $self->{binding} = [$mod, $sym];
3542 $self->{commands} = $cmds;
3543
3544 $self->{binding_change} = $cb;
3545 $self->{binding_cancel} = $ccb;
3546
3547 $self->update_binding_widgets;
3548}
3549
3550# this is a shortcut method that asks for a binding
3551# and then just binds it.
3552sub do_quick_binding {
3553 my ($self, $cmds, $end_cb) = @_;
3554 $self->set_binding (undef, undef, $cmds, sub {
3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556 });
3557 $self->ask_for_bind (1, $end_cb);
3558}
3559
3560sub update_binding_widgets {
3561 my ($self) = @_;
3562 my ($mod, $sym, $cmds) = $self->get_binding;
3563 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564 $self->set_command_list ($cmds);
3565}
3566
3567sub get_binding {
3568 my ($self) = @_;
3569 return (
3570 $self->{binding}->[0],
3571 $self->{binding}->[1],
3572 [ grep { defined $_ } @{$self->{commands}} ]
3573 );
3574}
3575
3576sub clear_command_list {
3577 my ($self) = @_;
3578 $self->{cmdbox}->clear ();
3579}
3580
3581sub set_command_list {
3582 my ($self, $cmds) = @_;
3583
3584 $self->{cmdbox}->clear ();
3585 $self->{commands} = $cmds;
3586
3587 my $idx = 0;
3588
3589 for (@$cmds) {
3590 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592 my $i = $idx;
3593 $hb->add (new CFClient::UI::Label text => $_);
3594 $hb->add (new CFClient::UI::Button
3595 text => "delete",
3596 tooltip => "Deletes the action from the record",
3597 on_activate => sub {
3598 $self->{cmdbox}->remove ($hb);
3599 $cmds->[$i] = undef;
3600 });
3601
3602
3603 $idx++
3604 } 3478 }
3605} 3479}
3606 3480
3607############################################################################# 3481#############################################################################
3608 3482
… …
3662 } elsif ($ev->{button} == 2) { 3536 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}"); 3537 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) { 3538 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu 3539 (new CFClient::UI::Menu
3666 items => [ 3540 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ], 3543 ],
3670 )->popup ($ev); 3544 )->popup ($ev);
3671 } else { 3545 } else {
3672 return 0; 3546 return 0;

Diff Legend

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