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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 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);
… …
419 my ($self) = @_; 423 my ($self) = @_;
420 424
421 return if $FOCUS == $self; 425 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
423 427
424 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
425 429
426 $focus->update if $focus; 430 $self->update;
427 $FOCUS->update;
428 431
429 0 432 0
430} 433}
431 434
432sub invoke_focus_out { 435sub invoke_focus_out {
433 my ($self) = @_; 436 my ($self) = @_;
434 437
435 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
436 439
437 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
438 441
439 $focus->update if $focus; #? 442 $self->update;
440 443
441 $::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
442 unless $FOCUS; 445 unless $FOCUS;
443 446
444 0 447 0
445} 448}
446 449
447sub grab_focus { 450sub grab_focus {
448 my ($self) = @_; 451 my ($self) = @_;
449 452
453 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 454 $self->emit ("focus_in");
451} 455}
452 456
453sub invoke_mouse_motion { 1 } 457sub invoke_mouse_motion { 1 }
454sub invoke_button_up { 1 } 458sub invoke_button_up { 1 }
… …
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
… …
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 path => 'x1_close.png', 1100 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->emit ("delete") };
1098 1102
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1104 }
1101 1105
1102 $self 1106 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1149 1153
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1155 if $self->{close_button};
1152 1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1153 1 1165 1
1154} 1166}
1155 1167
1156sub invoke_button_down { 1168sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
… …
1579 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1580 1592
1581 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1583 1595
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1586 1597
1587 delete $self->{size_req}; 1598 delete $self->{size_req};
1588 $self->realloc; 1599 $self->realloc;
1589 $self->update; 1600 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1597 1608
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1610
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1602 1612
1603 delete $self->{size_req}; 1613 delete $self->{size_req};
1604 $self->realloc; 1614 $self->realloc;
1605 $self->update; 1615 $self->update;
… …
1617 1627
1618 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1619 1629
1620 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1634
1624 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1625 1636
1626 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
… …
1631 }; 1642 };
1632 1643
1633 @{ $self->{size_req} } 1644 @{ $self->{size_req} }
1634} 1645}
1635 1646
1647sub baseline_shift {
1648 $_[0]{layout}->descent
1649}
1650
1636sub invoke_size_allocate { 1651sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1638 1653
1639 delete $self->{ox}; 1654 delete $self->{ox};
1640 1655
… …
1646 1661
1647sub set_fontsize { 1662sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1649 1664
1650 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1651 delete $self->{texture}; 1667 delete $self->{texture};
1652 1668
1653 $self->realloc; 1669 $self->realloc;
1654} 1670}
1655 1671
1656sub reconfigure { 1672sub reconfigure {
1657 my ($self) = @_; 1673 my ($self) = @_;
1658 1674
1659 delete $self->{size_req}; 1675 delete $self->{size_req};
1676 delete $self->{texture};
1660 1677
1661 $self->SUPER::reconfigure; 1678 $self->SUPER::reconfigure;
1662} 1679}
1663 1680
1664sub _draw { 1681sub _draw {
1665 my ($self) = @_; 1682 my ($self) = @_;
1666 1683
1667 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1668 1685
1669 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1693
1677 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1678 }; 1695 };
1679 1696
1680 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1684 1701
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1705 };
1689 1706
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1709
1695 if ($tex->{format} == GL_ALPHA) { 1710 $self->{layout}->render ($self->{ox}, $self->{oy});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1711}
1706 1712
1707############################################################################# 1713#############################################################################
1708 1714
1709package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
2051 my ($self) = @_; 2057 my ($self) = @_;
2052 2058
2053 (6) x 2 2059 (6) x 2
2054} 2060}
2055 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
2056sub invoke_button_down { 2070sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
2058 2072
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2075 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2076 } else {
2064 return 0 2077 return 0
2065 } 2078 }
2066 2079
2067 1 2080 1
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2253
2241 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2255 my $h2 = $self->{h} * (1 - $ycut2);
2256 my $h3 = $self->{h};
2257
2258 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2259
2244 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
… …
2266 2282
2267 if ($t3) { 2283 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2290 glEnd;
2275 } 2291 }
2276 2292
2277 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
… …
2546 can_events => 0, 2562 can_events => 0,
2547 indent => 0, 2563 indent => 0,
2548 #font => default_font 2564 #font => default_font
2549 @_, 2565 @_,
2550 2566
2551 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2552 par => [], 2568 par => [],
2553 height => 0, 2569 height => 0,
2554 children => [ 2570 children => [
2555 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2567 2583
2568 $self->{fontsize} = $fontsize; 2584 $self->{fontsize} = $fontsize;
2569 $self->reflow; 2585 $self->reflow;
2570} 2586}
2571 2587
2572sub visible_children { 2588sub size_request {
2573 my ($self) = @_; 2589 my ($self) = @_;
2574 2590
2575 @{$self->{children}}[0,1] 2591 my ($empty, $slider) = @{ $self->{children} };
2592
2593 local $self->{children} = [$empty, $slider];
2594 $self->SUPER::size_request
2576} 2595}
2577 2596
2578sub invoke_size_allocate { 2597sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 2598 my ($self, $w, $h) = @_;
2580 2599
2581 my (undef, undef, @other) = @{ $self->{children} }; 2600 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 2601 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 2602
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2603 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2604 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 2605 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2606 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 2607
2589 $self->reflow; 2608 $self->reflow;
2590 2609
2610 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 2611 $self->SUPER::invoke_size_allocate ($w, $h)
2592} 2612}
2593 2613
2594sub get_layout { 2614sub get_layout {
2595 my ($self, $para) = @_; 2615 my ($self, $para) = @_;
2596 2616
2597 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2598 2618
2599 $layout->set_font ($self->{font}) if $self->{font}; 2619 $layout->set_font ($self->{font}) if $self->{font};
2620 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2621 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 2622 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 2624 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 2625
2626 $layout->set_shapes (
2627 map
2628 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2629 @{$para->{widget}}
2630 );
2605 2631
2606 $layout 2632 $layout
2607} 2633}
2608 2634
2609sub reflow { 2635sub reflow {
… …
2677 for my $para (@{$self->{par}}) { 2703 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para); 2705 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size; 2706 my ($w, $h) = $layout->size;
2681 2707
2682 $para->{w} = $w + $para->{indent}; 2708 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h; 2709 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped; 2710 $para->{wrapped} = $layout->has_wrapped;
2685 } 2711 }
2686 2712
2687 $height += $para->{h}; 2713 $height += $para->{h};
2688 } 2714 }
… …
2707 my $y0 = $top; 2733 my $y0 = $top;
2708 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2709 2735
2710 my $y = 0; 2736 my $y = 0;
2711 2737
2712 glEnable GL_BLEND;
2713 #TODO# not correct in windows where rgba is forced off
2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716 for my $para (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 2739 my $h = $para->{h};
2718 2740
2719 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2720 2742
2721 my $layout = $self->get_layout ($para); 2743 my $layout = $self->get_layout ($para);
2722 2744
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 2746
2728 if (my @w = @{ $para->{widget} }) { 2747 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 2748 my @s = $layout->get_shapes;
2730 2749
2731 for (@w) { 2750 for (@w) {
… …
2739 } 2758 }
2740 } 2759 }
2741 2760
2742 $y += $h; 2761 $y += $h;
2743 } 2762 }
2744
2745 glDisable GL_BLEND;
2746 }; 2763 };
2747 }); 2764 });
2748} 2765}
2749 2766
2750sub reconfigure { 2767sub reconfigure {
… …
3046 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
3048 3065
3049 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
3050 if (!ref $widget) { 3067 if (!ref $widget) {
3068 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2;
3070
3071 $widget = new CFClient::UI::HBox
3072 can_hover => 1,
3073 can_events => 1,
3074 tooltip => $tooltip,
3075 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1),
3078 ],
3079 ;
3080
3081 } else {
3051 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
3052 can_hover => 1, 3083 can_hover => 1,
3053 can_events => 1, 3084 can_events => 1,
3054 markup => $widget, 3085 markup => $widget,
3055 tooltip => $tooltip 3086 tooltip => $tooltip;
3087 }
3056 } 3088 }
3057 3089
3058 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
3059 3091
3060 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
3127 3159
3128 $self->SUPER::add (@widgets); 3160 $self->SUPER::add (@widgets);
3129 3161
3130 $self->{current} = $self->{children}[0] 3162 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3163 if @{ $self->{children} };
3164}
3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3132} 3170}
3133 3171
3134sub set_current_page { 3172sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3173 my ($self, $page_or_widget) = @_;
3136 3174
… …
3202 tooltip => $tooltip, 3240 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3241 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3242 );
3205 3243
3206 $self->{multiplexer}->add ($widget); 3244 $self->{multiplexer}->add ($widget);
3245}
3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3207} 3251}
3208 3252
3209sub set_current_page { 3253sub set_current_page {
3210 my ($self, $page) = @_; 3254 my ($self, $page) = @_;
3211 3255
… …
3389 count => 1, 3433 count => 1,
3390 %arg, 3434 %arg,
3391 }; 3435 };
3392 } 3436 }
3393 3437
3438 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3439 $self->reorder;
3440 });
3395} 3441}
3396 3442
3397sub reconfigure { 3443sub reconfigure {
3398 my ($self) = @_; 3444 my ($self) = @_;
3399 3445
… …
3414 3460
3415############################################################################# 3461#############################################################################
3416 3462
3417package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3418 3464
3419our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3420 3466
3421sub new { 3467sub new {
3422 my $class = shift; 3468 my $class = shift;
3423 3469
3424 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3426 @_, 3472 @_,
3427 ); 3473 );
3428 3474
3429 $self 3475 $self
3430} 3476}
3431 3477
3432sub set_items { 3478sub set_items {
3433 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3434 3480
3435 $self->{child}->clear; 3481 $self->clear;
3436 return unless $items; 3482 return unless $items;
3437 3483
3438 my @items = sort { 3484 my @items = sort {
3439 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
3441 } @$items; 3487 } values %$items;
3442 3488
3443 $self->{real_items} = \@items; 3489 $self->{real_items} = \@items;
3444 3490
3445 my $row = 0; 3491 my $row = 0;
3446 for my $item (@items) { 3492 for my $item (@items) {
3447 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3448 3494
3449 $self->{child}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3452 3498
3453 $row++; 3499 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 } 3500 }
3663} 3501}
3664 3502
3665############################################################################# 3503#############################################################################
3666 3504
… …
3720 } elsif ($ev->{button} == 2) { 3558 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}"); 3559 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) { 3560 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu 3561 (new CFClient::UI::Menu
3724 items => [ 3562 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ], 3565 ],
3728 )->popup ($ev); 3566 )->popup ($ev);
3729 } else { 3567 } else {
3730 return 0; 3568 return 0;

Diff Legend

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