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

Diff Legend

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