ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.327 by root, Mon Jul 17 01:41:53 2006 UTC

… …
423 my ($self) = @_; 423 my ($self) = @_;
424 424
425 return if $FOCUS == $self; 425 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
427 427
428 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
429 429
430 $focus->update if $focus; 430 $self->update;
431 $FOCUS->update;
432 431
433 0 432 0
434} 433}
435 434
436sub invoke_focus_out { 435sub invoke_focus_out {
437 my ($self) = @_; 436 my ($self) = @_;
438 437
439 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
440 439
441 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
442 441
443 $focus->update if $focus; #? 442 $self->update;
444 443
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 445 unless $FOCUS;
447 446
448 0 447 0
449} 448}
450 449
451sub grab_focus { 450sub grab_focus {
452 my ($self) = @_; 451 my ($self) = @_;
453 452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 454 $self->emit ("focus_in");
455} 455}
456 456
457sub invoke_mouse_motion { 1 } 457sub invoke_mouse_motion { 1 }
458sub invoke_button_up { 1 } 458sub invoke_button_up { 1 }
… …
539 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540 540
541 # update screen rectangle 541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 544
547 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 548
… …
589} 587}
590 588
591sub DESTROY { 589sub DESTROY {
592 my ($self) = @_; 590 my ($self) = @_;
593 591
592 return if CFClient::in_destruct;
593
594 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
595 595
596 eval { $self->destroy }; 596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 598}
… …
988 $self->add ($child) if $child; 988 $self->add ($child) if $child;
989 989
990 $self 990 $self
991} 991}
992 992
993#TODO# update range on size_allocate depending on child
994
993sub add { 995sub add {
994 my ($self, $widget) = @_; 996 my ($self, $widget) = @_;
995 997
996 $self->{vp}->add ($self->{child} = $widget); 998 $self->{vp}->add ($self->{child} = $widget);
997} 999}
998 1000
1001sub update_slider {
1002 my ($self) = @_;
1003
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005}
1006
999sub update { 1007sub update {
1000 my ($self) = @_; 1008 my ($self) = @_;
1001 1009
1002 $self->SUPER::update; 1010 $self->SUPER::update;
1003 1011
1004 # todo: overwrite size_allocate of child 1012 $self->update_slider;
1005 my $child = $self->{vp}->child;
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007} 1013}
1008 1014
1009sub invoke_size_allocate { 1015sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1016 my ($self, $w, $h) = @_;
1011 1017
1012 my $child = $self->{vp}->child; 1018 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014 1019
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1020 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1021}
1017
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020 1022
1021############################################################################# 1023#############################################################################
1022 1024
1023package CFClient::UI::Frame; 1025package CFClient::UI::Frame;
1024 1026
… …
1080 my $self = $class->SUPER::new ( 1082 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1083 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1084 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1085 border => 0.6,
1084 can_events => 1, 1086 can_events => 1,
1085 min_w => 16, 1087 min_w => 64,
1086 min_h => 16, 1088 min_h => 32,
1087 %arg, 1089 %arg,
1088 ); 1090 );
1089 1091
1090 $self->{title_widget} = new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1093 align => 0,
… …
1096 1098
1097 if ($self->{has_close_button}) { 1099 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1100 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1101 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1102 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1103 on_activate => sub { $self->emit ("delete") };
1102 1104
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1105 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1106 }
1105 1107
1106 $self 1108 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1154 $self->child->configure ($border, $border, $w, $h);
1153 1155
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1157 if $self->{close_button};
1156 1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1166
1157 1 1167 1
1158} 1168}
1159 1169
1160sub invoke_button_down { 1170sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1584 1594
1585 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1587 1597
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1590 1599
1591 delete $self->{size_req}; 1600 delete $self->{size_req};
1592 $self->realloc; 1601 $self->realloc;
1593 $self->update; 1602 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1601 1610
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1612
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1606 1614
1607 delete $self->{size_req}; 1615 delete $self->{size_req};
1608 $self->realloc; 1616 $self->realloc;
1609 $self->update; 1617 $self->update;
… …
1621 1629
1622 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1623 1631
1624 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1634 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1636
1628 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1629 1638
1630 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
… …
1654 1663
1655sub set_fontsize { 1664sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1657 1666
1658 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1659 delete $self->{texture}; 1669 delete $self->{texture};
1660 1670
1661 $self->realloc; 1671 $self->realloc;
1662} 1672}
1663 1673
1664sub reconfigure { 1674sub reconfigure {
1665 my ($self) = @_; 1675 my ($self) = @_;
1666 1676
1667 delete $self->{size_req}; 1677 delete $self->{size_req};
1678 delete $self->{texture};
1668 1679
1669 $self->SUPER::reconfigure; 1680 $self->SUPER::reconfigure;
1670} 1681}
1671 1682
1672sub _draw { 1683sub _draw {
1673 my ($self) = @_; 1684 my ($self) = @_;
1674 1685
1675 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1676 1687
1677 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1695
1685 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1686 }; 1697 };
1687 1698
1688 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1692 1703
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1707 };
1697 1708
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1711
1703 if ($tex->{format} == GL_ALPHA) { 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1713}
1714 1714
1715############################################################################# 1715#############################################################################
1716 1716
1717package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1828 1828
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 1830
1831 # byte-index to char-index 1831 # byte-index to char-index
1832 my $text = $self->{text}; 1832 my $text = $self->{text};
1833 utf8::encode $text; 1833 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length $text;
1835 1835
1836 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1837 $self->update; 1837 $self->update;
1838 1838
1839 1 1839 1
… …
2059 my ($self) = @_; 2059 my ($self) = @_;
2060 2060
2061 (6) x 2 2061 (6) x 2
2062} 2062}
2063 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2064sub invoke_button_down { 2072sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
2066 2074
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state}; 2077 $self->toggle;
2070 $self->emit (changed => $self->{state});
2071 } else { 2078 } else {
2072 return 0 2079 return 0
2073 } 2080 }
2074 2081
2075 1 2082 1
… …
2111 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
2112 can_events => 0, 2119 can_events => 0,
2113 @_, 2120 @_,
2114 ); 2121 );
2115 2122
2116 $self->{path} 2123 $self->{path} || $self->{tex}
2117 or Carp::croak "required attribute 'path' not set"; 2124 or Carp::croak "'path' or 'tex' attributes required";
2118 2125
2119 $self->{tex} = $texture_cache{$self->{path}} ||= 2126 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121 2128
2122 Scalar::Util::weaken $texture_cache{$self->{path}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2123 2130
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2255
2249 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2257 my $h2 = $self->{h} * (1 - $ycut2);
2258 my $h3 = $self->{h};
2259
2260 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2261
2252 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
… …
2274 2284
2275 if ($t3) { 2285 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2292 glEnd;
2283 } 2293 }
2284 2294
2285 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2554 can_events => 0, 2564 can_events => 0,
2555 indent => 0, 2565 indent => 0,
2556 #font => default_font 2566 #font => default_font
2557 @_, 2567 @_,
2558 2568
2559 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2560 par => [], 2570 par => [],
2561 height => 0, 2571 height => 0,
2562 children => [ 2572 children => [
2563 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2575 2585
2576 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2577 $self->reflow; 2587 $self->reflow;
2578} 2588}
2579 2589
2580sub visible_children { 2590sub size_request {
2581 my ($self) = @_; 2591 my ($self) = @_;
2582 2592
2583 @{$self->{children}}[0,1] 2593 my ($empty, $slider) = @{ $self->{children} };
2594
2595 local $self->{children} = [$empty, $slider];
2596 $self->SUPER::size_request
2584} 2597}
2585 2598
2586sub invoke_size_allocate { 2599sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2588 2601
… …
2594 $self->{layout}->set_width ($empty->{w}); 2607 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 2609
2597 $self->reflow; 2610 $self->reflow;
2598 2611
2612 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2600} 2614}
2601 2615
2602sub get_layout { 2616sub get_layout {
2603 my ($self, $para) = @_; 2617 my ($self, $para) = @_;
… …
2721 my $y0 = $top; 2735 my $y0 = $top;
2722 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2723 2737
2724 my $y = 0; 2738 my $y = 0;
2725 2739
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 2741 my $h = $para->{h};
2732 2742
2733 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2734 2744
2735 my $layout = $self->get_layout ($para); 2745 my $layout = $self->get_layout ($para);
2736 2746
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 2748
2742 if (my @w = @{ $para->{widget} }) { 2749 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 2750 my @s = $layout->get_shapes;
2744 2751
2745 for (@w) { 2752 for (@w) {
… …
2753 } 2760 }
2754 } 2761 }
2755 2762
2756 $y += $h; 2763 $y += $h;
2757 } 2764 }
2758
2759 glDisable GL_BLEND;
2760 }; 2765 };
2761 }); 2766 });
2762} 2767}
2763 2768
2764sub reconfigure { 2769sub reconfigure {
… …
3060 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
3062 3067
3063 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
3064 if (!ref $widget) { 3069 if (!ref $widget) {
3070 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2;
3072
3073 $widget = new CFClient::UI::HBox
3074 can_hover => 1,
3075 can_events => 1,
3076 tooltip => $tooltip,
3077 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1),
3080 ],
3081 ;
3082
3083 } else {
3065 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
3066 can_hover => 1, 3085 can_hover => 1,
3067 can_events => 1, 3086 can_events => 1,
3068 markup => $widget, 3087 markup => $widget,
3069 tooltip => $tooltip 3088 tooltip => $tooltip;
3089 }
3070 } 3090 }
3071 3091
3072 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
3073 3093
3074 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
3141 3161
3142 $self->SUPER::add (@widgets); 3162 $self->SUPER::add (@widgets);
3143 3163
3144 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3165 if @{ $self->{children} };
3166}
3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3146} 3172}
3147 3173
3148sub set_current_page { 3174sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
3150 3176
… …
3216 tooltip => $tooltip, 3242 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3243 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3244 );
3219 3245
3220 $self->{multiplexer}->add ($widget); 3246 $self->{multiplexer}->add ($widget);
3247}
3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3221} 3253}
3222 3254
3223sub set_current_page { 3255sub set_current_page {
3224 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3225 3257
… …
3403 count => 1, 3435 count => 1,
3404 %arg, 3436 %arg,
3405 }; 3437 };
3406 } 3438 }
3407 3439
3440 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3441 $self->reorder;
3442 });
3409} 3443}
3410 3444
3411sub reconfigure { 3445sub reconfigure {
3412 my ($self) = @_; 3446 my ($self) = @_;
3413 3447
… …
3428 3462
3429############################################################################# 3463#############################################################################
3430 3464
3431package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3432 3466
3433our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3434 3468
3435sub new { 3469sub new {
3436 my $class = shift; 3470 my $class = shift;
3437 3471
3438 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3440 @_, 3474 @_,
3441 ); 3475 );
3442 3476
3443 $self 3477 $self
3444} 3478}
3445 3479
3446sub set_items { 3480sub set_items {
3447 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3448 3482
3449 $self->{child}->clear; 3483 $self->clear;
3450 return unless $items; 3484 return unless $items;
3451 3485
3452 my @items = sort { 3486 my @items = sort {
3453 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3455 } @$items; 3489 } values %$items;
3456 3490
3457 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3458 3492
3459 my $row = 0; 3493 my $row = 0;
3460 for my $item (@items) { 3494 for my $item (@items) {
3461 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3462 3496
3463 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3466 3500
3467 $row++; 3501 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 } 3502 }
3677} 3503}
3678 3504
3679############################################################################# 3505#############################################################################
3680 3506
… …
3734 } elsif ($ev->{button} == 2) { 3560 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}"); 3561 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) { 3562 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu 3563 (new CFClient::UI::Menu
3738 items => [ 3564 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ], 3567 ],
3742 )->popup ($ev); 3568 )->popup ($ev);
3743 } else { 3569 } else {
3744 return 0; 3570 return 0;
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 3817
3992 $w = 0 if $w < 0; 3818 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 3819 $h = 0 if $h < 0;
3994 3820
3821 $w = max $widget->{min_w}, $w;
3822 $h = max $widget->{min_h}, $h;
3823
3824 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826
3995 $w = int $w + 0.5; 3827 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 3828 $h = int $h + 0.5;
3997 3829
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 3831 $widget->{old_w} = $widget->{w};

Diff Legend

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