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

Diff Legend

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