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.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.321 by root, Tue Jul 4 23:44:23 2006 UTC

… …
423 my ($self) = @_; 423 my ($self) = @_;
424 424
425 return if $FOCUS == $self; 425 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
427 427
428 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
429 429
430 $focus->update if $focus; 430 $self->update;
431 $FOCUS->update;
432 431
433 0 432 0
434} 433}
435 434
436sub invoke_focus_out { 435sub invoke_focus_out {
437 my ($self) = @_; 436 my ($self) = @_;
438 437
439 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
440 439
441 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
442 441
443 $focus->update if $focus; #? 442 $self->update;
444 443
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 445 unless $FOCUS;
447 446
448 0 447 0
449} 448}
450 449
451sub grab_focus { 450sub grab_focus {
452 my ($self) = @_; 451 my ($self) = @_;
453 452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 454 $self->emit ("focus_in");
455} 455}
456 456
457sub invoke_mouse_motion { 1 } 457sub invoke_mouse_motion { 1 }
458sub invoke_button_up { 1 } 458sub invoke_button_up { 1 }
… …
539 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540 540
541 # update screen rectangle 541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 544
547 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 548
… …
988 $self->add ($child) if $child; 986 $self->add ($child) if $child;
989 987
990 $self 988 $self
991} 989}
992 990
991#TODO# update range on size_allocate depending on child
992
993sub add { 993sub add {
994 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
995 995
996 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
997} 997}
998 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
999sub update { 1005sub update {
1000 my ($self) = @_; 1006 my ($self) = @_;
1001 1007
1002 $self->SUPER::update; 1008 $self->SUPER::update;
1003 1009
1004 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1005 my $child = $self->{vp}->child;
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007} 1011}
1008 1012
1009sub invoke_size_allocate { 1013sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1011 1015
1012 my $child = $self->{vp}->child; 1016 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014 1017
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1019}
1017
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020 1020
1021############################################################################# 1021#############################################################################
1022 1022
1023package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1024 1024
… …
1096 1096
1097 if ($self->{has_close_button}) { 1097 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->emit ("delete") };
1102 1102
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1104 }
1105 1105
1106 $self 1106 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1153 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1155 if $self->{close_button};
1156 1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1157 1 1165 1
1158} 1166}
1159 1167
1160sub invoke_button_down { 1168sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
… …
1528 #font => default_font 1536 #font => default_font
1529 #text => initial text 1537 #text => initial text
1530 #markup => initial narkup 1538 #markup => initial narkup
1531 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1532 ellipsise => 3, # end 1540 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1534 fontsize => 1, 1542 fontsize => 1,
1535 align => -1, 1543 align => -1,
1536 valign => -1, 1544 valign => -1,
1537 padding_x => 2, 1545 padding_x => 2,
1538 padding_y => 2, 1546 padding_y => 2,
1539 can_events => 0, 1547 can_events => 0,
1540 %arg 1548 %arg
1541 ); 1549 );
1542 1550
1543 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1545 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1554 $self->{template} = $layout;
1547 } 1555 }
1548 1556
1549 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
1583 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1584 1592
1585 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1587 1595
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1590 1597
1591 delete $self->{size_req}; 1598 delete $self->{size_req};
1592 $self->realloc; 1599 $self->realloc;
1593 $self->update; 1600 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1601 1608
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1610
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1606 1612
1607 delete $self->{size_req}; 1613 delete $self->{size_req};
1608 $self->realloc; 1614 $self->realloc;
1609 $self->update; 1615 $self->update;
… …
1654 1660
1655sub set_fontsize { 1661sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1657 1663
1658 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1659 delete $self->{texture}; 1666 delete $self->{texture};
1660 1667
1661 $self->realloc; 1668 $self->realloc;
1662} 1669}
1663 1670
1664sub reconfigure { 1671sub reconfigure {
1665 my ($self) = @_; 1672 my ($self) = @_;
1666 1673
1667 delete $self->{size_req}; 1674 delete $self->{size_req};
1675 delete $self->{texture};
1668 1676
1669 $self->SUPER::reconfigure; 1677 $self->SUPER::reconfigure;
1670} 1678}
1671 1679
1672sub _draw { 1680sub _draw {
1673 my ($self) = @_; 1681 my ($self) = @_;
1674 1682
1675 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1676 1684
1677 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1692
1685 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1686 }; 1694 };
1687 1695
1688 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1692 1700
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1704 };
1697 1705
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1708
1703 if ($tex->{format} == GL_ALPHA) { 1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1710}
1714 1711
1715############################################################################# 1712#############################################################################
1716 1713
1717package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
2059 my ($self) = @_; 2056 my ($self) = @_;
2060 2057
2061 (6) x 2 2058 (6) x 2
2062} 2059}
2063 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
2064sub invoke_button_down { 2069sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
2066 2071
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state}; 2074 $self->toggle;
2070 $self->emit (changed => $self->{state});
2071 } else { 2075 } else {
2072 return 0 2076 return 0
2073 } 2077 }
2074 2078
2075 1 2079 1
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2252
2249 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2258
2252 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2274 2281
2275 if ($t3) { 2282 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2289 glEnd;
2283 } 2290 }
2284 2291
2285 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2554 can_events => 0, 2561 can_events => 0,
2555 indent => 0, 2562 indent => 0,
2556 #font => default_font 2563 #font => default_font
2557 @_, 2564 @_,
2558 2565
2559 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2560 par => [], 2567 par => [],
2561 height => 0, 2568 height => 0,
2562 children => [ 2569 children => [
2563 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2575 2582
2576 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2577 $self->reflow; 2584 $self->reflow;
2578} 2585}
2579 2586
2580sub visible_children { 2587sub size_request {
2581 my ($self) = @_; 2588 my ($self) = @_;
2582 2589
2583 @{$self->{children}}[0,1] 2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2584} 2594}
2585 2595
2586sub invoke_size_allocate { 2596sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2588 2598
… …
2594 $self->{layout}->set_width ($empty->{w}); 2604 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 2606
2597 $self->reflow; 2607 $self->reflow;
2598 2608
2609 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2600} 2611}
2601 2612
2602sub get_layout { 2613sub get_layout {
2603 my ($self, $para) = @_; 2614 my ($self, $para) = @_;
… …
2721 my $y0 = $top; 2732 my $y0 = $top;
2722 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2723 2734
2724 my $y = 0; 2735 my $y = 0;
2725 2736
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 2738 my $h = $para->{h};
2732 2739
2733 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2734 2741
2735 my $layout = $self->get_layout ($para); 2742 my $layout = $self->get_layout ($para);
2736 2743
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 2745
2742 if (my @w = @{ $para->{widget} }) { 2746 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 2747 my @s = $layout->get_shapes;
2744 2748
2745 for (@w) { 2749 for (@w) {
… …
2753 } 2757 }
2754 } 2758 }
2755 2759
2756 $y += $h; 2760 $y += $h;
2757 } 2761 }
2758
2759 glDisable GL_BLEND;
2760 }; 2762 };
2761 }); 2763 });
2762} 2764}
2763 2765
2764sub reconfigure { 2766sub reconfigure {
… …
3143 3145
3144 $self->{current} = $self->{children}[0] 3146 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3147 if @{ $self->{children} };
3146} 3148}
3147 3149
3150sub get_current_page {
3151 my ($self) = @_;
3152
3153 $self->{current}
3154}
3155
3148sub set_current_page { 3156sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3157 my ($self, $page_or_widget) = @_;
3150 3158
3151 my $widget = ref $page_or_widget 3159 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3160 ? $page_or_widget
… …
3216 tooltip => $tooltip, 3224 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3225 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3226 );
3219 3227
3220 $self->{multiplexer}->add ($widget); 3228 $self->{multiplexer}->add ($widget);
3229}
3230
3231sub get_current_page {
3232 my ($self) = @_;
3233
3234 $self->{multiplexer}->get_current_page
3221} 3235}
3222 3236
3223sub set_current_page { 3237sub set_current_page {
3224 my ($self, $page) = @_; 3238 my ($self, $page) = @_;
3225 3239
… …
3403 count => 1, 3417 count => 1,
3404 %arg, 3418 %arg,
3405 }; 3419 };
3406 } 3420 }
3407 3421
3422 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3423 $self->reorder;
3424 });
3409} 3425}
3410 3426
3411sub reconfigure { 3427sub reconfigure {
3412 my ($self) = @_; 3428 my ($self) = @_;
3413 3429
… …
3428 3444
3429############################################################################# 3445#############################################################################
3430 3446
3431package CFClient::UI::Inventory; 3447package CFClient::UI::Inventory;
3432 3448
3433our @ISA = CFClient::UI::ScrolledWindow::; 3449our @ISA = CFClient::UI::Table::;
3434 3450
3435sub new { 3451sub new {
3436 my $class = shift; 3452 my $class = shift;
3437 3453
3438 my $self = $class->SUPER::new ( 3454 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3455 col_expand => [0, 1, 0],
3440 @_, 3456 @_,
3441 ); 3457 );
3442 3458
3443 $self 3459 $self
3444} 3460}
3445 3461
3446sub set_items { 3462sub set_items {
3447 my ($self, $items) = @_; 3463 my ($self, $items) = @_;
3448 3464
3449 $self->{child}->clear; 3465 $self->clear;
3450 return unless $items; 3466 return unless $items;
3451 3467
3452 my @items = sort { 3468 my @items = sort {
3453 ($a->{type} <=> $b->{type}) 3469 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name}) 3470 or ($a->{name} cmp $b->{name})
3455 } @$items; 3471 } values %$items;
3456 3472
3457 $self->{real_items} = \@items; 3473 $self->{real_items} = \@items;
3458 3474
3459 my $row = 0; 3475 my $row = 0;
3460 for my $item (@items) { 3476 for my $item (@items) {
3461 CFClient::Item::update_widgets $item; 3477 CFClient::Item::update_widgets $item;
3462 3478
3463 $self->{child}->add (0, $row, $item->{face_widget}); 3479 $self->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget}); 3480 $self->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget}); 3481 $self->add (2, $row, $item->{weight_widget});
3466 3482
3467 $row++; 3483 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 } 3484 }
3677} 3485}
3678 3486
3679############################################################################# 3487#############################################################################
3680 3488
… …
3734 } elsif ($ev->{button} == 2) { 3542 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}"); 3543 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) { 3544 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu 3545 (new CFClient::UI::Menu
3738 items => [ 3546 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3547 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3548 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ], 3549 ],
3742 )->popup ($ev); 3550 )->popup ($ev);
3743 } else { 3551 } else {
3744 return 0; 3552 return 0;

Diff Legend

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