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.329 by root, Sun Jul 23 02:44:06 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 { 0 }
458sub invoke_button_up { 1 } 458sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 459sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 460sub invoke_key_up { 0 }
461 461
462sub invoke_button_down { 462sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
464 464
465 $self->grab_focus; 465 $self->grab_focus;
466 466
467 1 467 0
468} 468}
469 469
470sub connect { 470sub connect {
471 my ($self, $signal, $cb) = @_; 471 my ($self, $signal, $cb) = @_;
472 472
473 push @{ $self->{signal_cb}{$signal} }, $cb; 473 push @{ $self->{signal_cb}{$signal} }, $cb;
474} 474}
475 475
476sub emit { 476sub emit {
477 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
478
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
478 480
479 #d##TODO# stop propagating at first true, do not use sum 481 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
… …
587} 589}
588 590
589sub DESTROY { 591sub DESTROY {
590 my ($self) = @_; 592 my ($self) = @_;
591 593
594 return if CFClient::in_destruct;
595
592 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
593 597
594 eval { $self->destroy }; 598 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 600}
… …
986 $self->add ($child) if $child; 990 $self->add ($child) if $child;
987 991
988 $self 992 $self
989} 993}
990 994
995#TODO# update range on size_allocate depending on child
996
991sub add { 997sub add {
992 my ($self, $widget) = @_; 998 my ($self, $widget) = @_;
993 999
994 $self->{vp}->add ($self->{child} = $widget); 1000 $self->{vp}->add ($self->{child} = $widget);
995} 1001}
996 1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
997sub update { 1017sub update {
998 my ($self) = @_; 1018 my ($self) = @_;
999 1019
1000 $self->SUPER::update; 1020 $self->SUPER::update;
1001 1021
1002 # todo: overwrite size_allocate of child 1022 $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} 1023}
1006 1024
1007sub invoke_size_allocate { 1025sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
1009 1027
1010 my $child = $self->{vp}->child; 1028 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012 1029
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1030 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1031}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1032
1019############################################################################# 1033#############################################################################
1020 1034
1021package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1022 1036
… …
1078 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1095 border => 0.6,
1082 can_events => 1, 1096 can_events => 1,
1083 min_w => 16, 1097 min_w => 64,
1084 min_h => 16, 1098 min_h => 32,
1085 %arg, 1099 %arg,
1086 ); 1100 );
1087 1101
1088 $self->{title_widget} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1103 align => 0,
… …
1094 1108
1095 if ($self->{has_close_button}) { 1109 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1110 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1111 new CFClient::UI::ImageButton
1098 path => 'x1_close.png', 1112 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1113 on_activate => sub { $self->emit ("delete") };
1100 1114
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1115 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1116 }
1103 1117
1104 $self 1118 $self
… …
1150 $self->child->configure ($border, $border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
1151 1165
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1167 if $self->{close_button};
1154 1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1176
1155 1 1177 1
1156} 1178}
1157 1179
1158sub invoke_button_down { 1180sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
… …
1581 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1582 1604
1583 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1585 1607
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1588 1609
1589 delete $self->{size_req}; 1610 delete $self->{size_req};
1590 $self->realloc; 1611 $self->realloc;
1591 $self->update; 1612 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1599 1620
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1622
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1604 1624
1605 delete $self->{size_req}; 1625 delete $self->{size_req};
1606 $self->realloc; 1626 $self->realloc;
1607 $self->update; 1627 $self->update;
… …
1619 1639
1620 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1621 1641
1622 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1646
1626 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1627 1648
1628 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
… …
1652 1673
1653sub set_fontsize { 1674sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1655 1676
1656 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1657 delete $self->{texture}; 1679 delete $self->{texture};
1658 1680
1659 $self->realloc; 1681 $self->realloc;
1660} 1682}
1661 1683
1662sub reconfigure { 1684sub reconfigure {
1663 my ($self) = @_; 1685 my ($self) = @_;
1664 1686
1665 delete $self->{size_req}; 1687 delete $self->{size_req};
1688 delete $self->{texture};
1666 1689
1667 $self->SUPER::reconfigure; 1690 $self->SUPER::reconfigure;
1668} 1691}
1669 1692
1670sub _draw { 1693sub _draw {
1671 my ($self) = @_; 1694 my ($self) = @_;
1672 1695
1673 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1674 1697
1675 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1705
1683 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1684 }; 1707 };
1685 1708
1686 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1690 1713
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1717 };
1695 1718
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1721
1701 if ($tex->{format} == GL_ALPHA) { 1722 $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} 1723}
1712 1724
1713############################################################################# 1725#############################################################################
1714 1726
1715package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1826 1838
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 1840
1829 # byte-index to char-index 1841 # byte-index to char-index
1830 my $text = $self->{text}; 1842 my $text = $self->{text};
1831 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1833 1845
1834 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1835 $self->update; 1847 $self->update;
1836 1848
1837 1 1849 1
… …
2057 my ($self) = @_; 2069 my ($self) = @_;
2058 2070
2059 (6) x 2 2071 (6) x 2
2060} 2072}
2061 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
2062sub invoke_button_down { 2082sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
2064 2084
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state}; 2087 $self->toggle;
2068 $self->emit (changed => $self->{state});
2069 } else { 2088 } else {
2070 return 0 2089 return 0
2071 } 2090 }
2072 2091
2073 1 2092 1
… …
2109 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
2110 can_events => 0, 2129 can_events => 0,
2111 @_, 2130 @_,
2112 ); 2131 );
2113 2132
2114 $self->{path} 2133 $self->{path} || $self->{tex}
2115 or Carp::croak "required attribute 'path' not set"; 2134 or Carp::croak "'path' or 'tex' attributes required";
2116 2135
2117 $self->{tex} = $texture_cache{$self->{path}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119 2138
2120 Scalar::Util::weaken $texture_cache{$self->{path}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2121 2140
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2265
2247 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2271
2250 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
… …
2272 2294
2273 if ($t3) { 2295 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2302 glEnd;
2281 } 2303 }
2282 2304
2283 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2552 can_events => 0, 2574 can_events => 0,
2553 indent => 0, 2575 indent => 0,
2554 #font => default_font 2576 #font => default_font
2555 @_, 2577 @_,
2556 2578
2557 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2558 par => [], 2580 par => [],
2559 height => 0, 2581 height => 0,
2560 children => [ 2582 children => [
2561 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2723 my $y0 = $top; 2745 my $y0 = $top;
2724 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2725 2747
2726 my $y = 0; 2748 my $y = 0;
2727 2749
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}}) { 2750 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 2751 my $h = $para->{h};
2734 2752
2735 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2736 2754
2737 my $layout = $self->get_layout ($para); 2755 my $layout = $self->get_layout ($para);
2738 2756
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 2758
2744 if (my @w = @{ $para->{widget} }) { 2759 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 2760 my @s = $layout->get_shapes;
2746 2761
2747 glDisable GL_BLEND;
2748 for (@w) { 2762 for (@w) {
2749 my ($dx, $dy) = splice @s, 0, 2, (); 2763 my ($dx, $dy) = splice @s, 0, 2, ();
2750 2764
2751 $_->{x} = $dx + $para->{indent}; 2765 $_->{x} = $dx + $para->{indent};
2752 $_->{y} = $dy + $y - $y0; 2766 $_->{y} = $dy + $y - $y0;
2753 2767
2754 $_->draw; 2768 $_->draw;
2755 } 2769 }
2756 glEnable GL_BLEND;
2757 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758 } 2770 }
2759 } 2771 }
2760 2772
2761 $y += $h; 2773 $y += $h;
2762 } 2774 }
2763
2764 glDisable GL_BLEND;
2765 }; 2775 };
2766 }); 2776 });
2767} 2777}
2768 2778
2769sub reconfigure { 2779sub reconfigure {
… …
3065 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
3067 3077
3068 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
3069 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
3070 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
3071 can_hover => 1, 3095 can_hover => 1,
3072 can_events => 1, 3096 can_events => 1,
3073 markup => $widget, 3097 markup => $widget,
3074 tooltip => $tooltip 3098 tooltip => $tooltip;
3099 }
3075 } 3100 }
3076 3101
3077 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
3078 3103
3079 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
3146 3171
3147 $self->SUPER::add (@widgets); 3172 $self->SUPER::add (@widgets);
3148 3173
3149 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
3150 if @{ $self->{children} }; 3175 if @{ $self->{children} };
3176}
3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3151} 3182}
3152 3183
3153sub set_current_page { 3184sub set_current_page {
3154 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
3155 3186
… …
3221 tooltip => $tooltip, 3252 tooltip => $tooltip,
3222 on_activate => sub { $self->set_current_page ($widget) }, 3253 on_activate => sub { $self->set_current_page ($widget) },
3223 ); 3254 );
3224 3255
3225 $self->{multiplexer}->add ($widget); 3256 $self->{multiplexer}->add ($widget);
3257}
3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3226} 3263}
3227 3264
3228sub set_current_page { 3265sub set_current_page {
3229 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3230 3267
… …
3408 count => 1, 3445 count => 1,
3409 %arg, 3446 %arg,
3410 }; 3447 };
3411 } 3448 }
3412 3449
3450 $ROOT->on_refresh (reorder => sub {
3413 $self->reorder; 3451 $self->reorder;
3452 });
3414} 3453}
3415 3454
3416sub reconfigure { 3455sub reconfigure {
3417 my ($self) = @_; 3456 my ($self) = @_;
3418 3457
… …
3433 3472
3434############################################################################# 3473#############################################################################
3435 3474
3436package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3437 3476
3438our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3439 3478
3440sub new { 3479sub new {
3441 my $class = shift; 3480 my $class = shift;
3442 3481
3443 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3444 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3445 @_, 3484 @_,
3446 ); 3485 );
3447 3486
3448 $self 3487 $self
3449} 3488}
3450 3489
3451sub set_items { 3490sub set_items {
3452 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3453 3492
3454 $self->{child}->clear; 3493 $self->clear;
3455 return unless $items; 3494 return unless $items;
3456 3495
3457 my @items = sort { 3496 my @items = sort {
3458 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3459 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3460 } @$items; 3499 } values %$items;
3461 3500
3462 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3463 3502
3464 my $row = 0; 3503 my $row = 0;
3465 for my $item (@items) { 3504 for my $item (@items) {
3466 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3467 3506
3468 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3469 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3470 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3471 3510
3472 $row++; 3511 $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 } 3512 }
3682} 3513}
3683 3514
3684############################################################################# 3515#############################################################################
3685 3516
… …
3739 } elsif ($ev->{button} == 2) { 3570 } elsif ($ev->{button} == 2) {
3740 $::CONN->user_send ("invoke $spell->{name}"); 3571 $::CONN->user_send ("invoke $spell->{name}");
3741 } elsif ($ev->{button} == 3) { 3572 } elsif ($ev->{button} == 3) {
3742 (new CFClient::UI::Menu 3573 (new CFClient::UI::Menu
3743 items => [ 3574 items => [
3744 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3575 ["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}"]) }], 3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746 ], 3577 ],
3747 )->popup ($ev); 3578 )->popup ($ev);
3748 } else { 3579 } else {
3749 return 0; 3580 return 0;
… …
3995 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996 3827
3997 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3998 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3999 3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836
4000 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
4001 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
4002 3839
4003 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004 $widget->{old_w} = $widget->{w}; 3841 $widget->{old_w} = $widget->{w};

Diff Legend

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