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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

… …
82} 82}
83 83
84sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
85 my ($ev) = @_; 85 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
87
88 warn "button down $ev->{button}\n";#d#
87 89
88 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
90 92
91 $GRAB = $widget; 93 $GRAB = $widget;
… …
423 my ($self) = @_; 425 my ($self) = @_;
424 426
425 return if $FOCUS == $self; 427 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
427 429
428 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
429 431
430 $focus->update if $focus; 432 $self->update;
431 $FOCUS->update;
432 433
433 0 434 0
434} 435}
435 436
436sub invoke_focus_out { 437sub invoke_focus_out {
437 my ($self) = @_; 438 my ($self) = @_;
438 439
439 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
440 441
441 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
442 443
443 $focus->update if $focus; #? 444 $self->update;
444 445
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 447 unless $FOCUS;
447 448
448 0 449 0
449} 450}
450 451
451sub grab_focus { 452sub grab_focus {
452 my ($self) = @_; 453 my ($self) = @_;
453 454
455 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 456 $self->emit ("focus_in");
455} 457}
456 458
457sub invoke_mouse_motion { 1 } 459sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 460sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 461sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 462sub invoke_key_up { 0 }
461 463
462sub invoke_button_down { 464sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
464 466
465 $self->grab_focus; 467 $self->grab_focus;
466 468
469 warn "button down $ev->{button} $x $y\n";#d#
470
467 1 471 0
468} 472}
469 473
470sub connect { 474sub connect {
471 my ($self, $signal, $cb) = @_; 475 my ($self, $signal, $cb) = @_;
472 476
… …
587} 591}
588 592
589sub DESTROY { 593sub DESTROY {
590 my ($self) = @_; 594 my ($self) = @_;
591 595
596 return if CFClient::in_destruct;
597
592 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
593 599
594 eval { $self->destroy }; 600 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 602}
… …
986 $self->add ($child) if $child; 992 $self->add ($child) if $child;
987 993
988 $self 994 $self
989} 995}
990 996
997#TODO# update range on size_allocate depending on child
998
991sub add { 999sub add {
992 my ($self, $widget) = @_; 1000 my ($self, $widget) = @_;
993 1001
994 $self->{vp}->add ($self->{child} = $widget); 1002 $self->{vp}->add ($self->{child} = $widget);
995} 1003}
996 1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
997sub update { 1019sub update {
998 my ($self) = @_; 1020 my ($self) = @_;
999 1021
1000 $self->SUPER::update; 1022 $self->SUPER::update;
1001 1023
1002 # todo: overwrite size_allocate of child 1024 $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} 1025}
1006 1026
1007sub invoke_size_allocate { 1027sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1028 my ($self, $w, $h) = @_;
1009 1029
1010 my $child = $self->{vp}->child; 1030 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012 1031
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1032 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1033}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1034
1019############################################################################# 1035#############################################################################
1020 1036
1021package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
1022 1038
… …
1078 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1097 border => 0.6,
1082 can_events => 1, 1098 can_events => 1,
1083 min_w => 16, 1099 min_w => 64,
1084 min_h => 16, 1100 min_h => 32,
1085 %arg, 1101 %arg,
1086 ); 1102 );
1087 1103
1088 $self->{title_widget} = new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1105 align => 0,
… …
1094 1110
1095 if ($self->{has_close_button}) { 1111 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1112 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1113 new CFClient::UI::ImageButton
1098 path => 'x1_close.png', 1114 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1115 on_activate => sub { $self->emit ("delete") };
1100 1116
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1117 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1118 }
1103 1119
1104 $self 1120 $self
… …
1150 $self->child->configure ($border, $border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
1151 1167
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1169 if $self->{close_button};
1154 1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1178
1155 1 1179 1
1156} 1180}
1157 1181
1158sub invoke_button_down { 1182sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
… …
1581 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1582 1606
1583 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1585 1609
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1588 1611
1589 delete $self->{size_req}; 1612 delete $self->{size_req};
1590 $self->realloc; 1613 $self->realloc;
1591 $self->update; 1614 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1599 1622
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1624
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1604 1626
1605 delete $self->{size_req}; 1627 delete $self->{size_req};
1606 $self->realloc; 1628 $self->realloc;
1607 $self->update; 1629 $self->update;
… …
1619 1641
1620 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1621 1643
1622 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1648
1626 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1627 1650
1628 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
… …
1652 1675
1653sub set_fontsize { 1676sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1655 1678
1656 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1657 delete $self->{texture}; 1681 delete $self->{texture};
1658 1682
1659 $self->realloc; 1683 $self->realloc;
1660} 1684}
1661 1685
1662sub reconfigure { 1686sub reconfigure {
1663 my ($self) = @_; 1687 my ($self) = @_;
1664 1688
1665 delete $self->{size_req}; 1689 delete $self->{size_req};
1690 delete $self->{texture};
1666 1691
1667 $self->SUPER::reconfigure; 1692 $self->SUPER::reconfigure;
1668} 1693}
1669 1694
1670sub _draw { 1695sub _draw {
1671 my ($self) = @_; 1696 my ($self) = @_;
1672 1697
1673 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1674 1699
1675 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1707
1683 new_from_layout CFClient::Texture $self->{layout} 1708 [$self->{layout}->size]
1684 }; 1709 };
1685 1710
1686 unless (exists $self->{ox}) { 1711 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1690 1715
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1719 };
1695 1720
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1723
1701 if ($tex->{format} == GL_ALPHA) { 1724 $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} 1725}
1712 1726
1713############################################################################# 1727#############################################################################
1714 1728
1715package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1826 1840
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 1842
1829 # byte-index to char-index 1843 # byte-index to char-index
1830 my $text = $self->{text}; 1844 my $text = $self->{text};
1831 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1833 1847
1834 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1835 $self->update; 1849 $self->update;
1836 1850
1837 1 1851 1
… …
2057 my ($self) = @_; 2071 my ($self) = @_;
2058 2072
2059 (6) x 2 2073 (6) x 2
2060} 2074}
2061 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
2062sub invoke_button_down { 2084sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
2064 2086
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state}; 2089 $self->toggle;
2068 $self->emit (changed => $self->{state});
2069 } else { 2090 } else {
2070 return 0 2091 return 0
2071 } 2092 }
2072 2093
2073 1 2094 1
… …
2109 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2110 can_events => 0, 2131 can_events => 0,
2111 @_, 2132 @_,
2112 ); 2133 );
2113 2134
2114 $self->{path} 2135 $self->{path} || $self->{tex}
2115 or Carp::croak "required attribute 'path' not set"; 2136 or Carp::croak "'path' or 'tex' attributes required";
2116 2137
2117 $self->{tex} = $texture_cache{$self->{path}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119 2140
2120 Scalar::Util::weaken $texture_cache{$self->{path}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2121 2142
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2267
2247 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2273
2250 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
… …
2272 2296
2273 if ($t3) { 2297 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2304 glEnd;
2281 } 2305 }
2282 2306
2283 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2552 can_events => 0, 2576 can_events => 0,
2553 indent => 0, 2577 indent => 0,
2554 #font => default_font 2578 #font => default_font
2555 @_, 2579 @_,
2556 2580
2557 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2558 par => [], 2582 par => [],
2559 height => 0, 2583 height => 0,
2560 children => [ 2584 children => [
2561 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2723 my $y0 = $top; 2747 my $y0 = $top;
2724 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2725 2749
2726 my $y = 0; 2750 my $y = 0;
2727 2751
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}}) { 2752 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 2753 my $h = $para->{h};
2734 2754
2735 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2736 2756
2737 my $layout = $self->get_layout ($para); 2757 my $layout = $self->get_layout ($para);
2738 2758
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 2760
2744 if (my @w = @{ $para->{widget} }) { 2761 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 2762 my @s = $layout->get_shapes;
2746 2763
2747 for (@w) { 2764 for (@w) {
… …
2755 } 2772 }
2756 } 2773 }
2757 2774
2758 $y += $h; 2775 $y += $h;
2759 } 2776 }
2760
2761 glDisable GL_BLEND;
2762 }; 2777 };
2763 }); 2778 });
2764} 2779}
2765 2780
2766sub reconfigure { 2781sub reconfigure {
… …
3062 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
3064 3079
3065 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
3066 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
3067 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
3068 can_hover => 1, 3097 can_hover => 1,
3069 can_events => 1, 3098 can_events => 1,
3070 markup => $widget, 3099 markup => $widget,
3071 tooltip => $tooltip 3100 tooltip => $tooltip;
3101 }
3072 } 3102 }
3073 3103
3074 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
3075 3105
3076 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
3143 3173
3144 $self->SUPER::add (@widgets); 3174 $self->SUPER::add (@widgets);
3145 3175
3146 $self->{current} = $self->{children}[0] 3176 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3177 if @{ $self->{children} };
3178}
3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3148} 3184}
3149 3185
3150sub set_current_page { 3186sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3187 my ($self, $page_or_widget) = @_;
3152 3188
… …
3218 tooltip => $tooltip, 3254 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) }, 3255 on_activate => sub { $self->set_current_page ($widget) },
3220 ); 3256 );
3221 3257
3222 $self->{multiplexer}->add ($widget); 3258 $self->{multiplexer}->add ($widget);
3259}
3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3223} 3265}
3224 3266
3225sub set_current_page { 3267sub set_current_page {
3226 my ($self, $page) = @_; 3268 my ($self, $page) = @_;
3227 3269
… …
3405 count => 1, 3447 count => 1,
3406 %arg, 3448 %arg,
3407 }; 3449 };
3408 } 3450 }
3409 3451
3452 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 3453 $self->reorder;
3454 });
3411} 3455}
3412 3456
3413sub reconfigure { 3457sub reconfigure {
3414 my ($self) = @_; 3458 my ($self) = @_;
3415 3459
… …
3430 3474
3431############################################################################# 3475#############################################################################
3432 3476
3433package CFClient::UI::Inventory; 3477package CFClient::UI::Inventory;
3434 3478
3435our @ISA = CFClient::UI::ScrolledWindow::; 3479our @ISA = CFClient::UI::Table::;
3436 3480
3437sub new { 3481sub new {
3438 my $class = shift; 3482 my $class = shift;
3439 3483
3440 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3485 col_expand => [0, 1, 0],
3442 @_, 3486 @_,
3443 ); 3487 );
3444 3488
3445 $self 3489 $self
3446} 3490}
3447 3491
3448sub set_items { 3492sub set_items {
3449 my ($self, $items) = @_; 3493 my ($self, $items) = @_;
3450 3494
3451 $self->{child}->clear; 3495 $self->clear;
3452 return unless $items; 3496 return unless $items;
3453 3497
3454 my @items = sort { 3498 my @items = sort {
3455 ($a->{type} <=> $b->{type}) 3499 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name}) 3500 or ($a->{name} cmp $b->{name})
3457 } @$items; 3501 } values %$items;
3458 3502
3459 $self->{real_items} = \@items; 3503 $self->{real_items} = \@items;
3460 3504
3461 my $row = 0; 3505 my $row = 0;
3462 for my $item (@items) { 3506 for my $item (@items) {
3463 CFClient::Item::update_widgets $item; 3507 CFClient::Item::update_widgets $item;
3464 3508
3465 $self->{child}->add (0, $row, $item->{face_widget}); 3509 $self->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget}); 3510 $self->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget}); 3511 $self->add (2, $row, $item->{weight_widget});
3468 3512
3469 $row++; 3513 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 } 3514 }
3679} 3515}
3680 3516
3681############################################################################# 3517#############################################################################
3682 3518
… …
3736 } elsif ($ev->{button} == 2) { 3572 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}"); 3573 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) { 3574 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu 3575 (new CFClient::UI::Menu
3740 items => [ 3576 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ], 3579 ],
3744 )->popup ($ev); 3580 )->popup ($ev);
3745 } else { 3581 } else {
3746 return 0; 3582 return 0;
… …
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 3829
3994 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3995 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3996 3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838
3997 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3999 3841
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 3843 $widget->{old_w} = $widget->{w};

Diff Legend

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