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.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
… …
539 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
540 542
541 # update screen rectangle 543 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 546
547 # skip widgets that are entirely outside the drawing area 547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 550
… …
589} 589}
590 590
591sub DESTROY { 591sub DESTROY {
592 my ($self) = @_; 592 my ($self) = @_;
593 593
594 return if CFClient::in_destruct;
595
594 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
595 597
596 eval { $self->destroy }; 598 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 600}
… …
988 $self->add ($child) if $child; 990 $self->add ($child) if $child;
989 991
990 $self 992 $self
991} 993}
992 994
995#TODO# update range on size_allocate depending on child
996
993sub add { 997sub add {
994 my ($self, $widget) = @_; 998 my ($self, $widget) = @_;
995 999
996 $self->{vp}->add ($self->{child} = $widget); 1000 $self->{vp}->add ($self->{child} = $widget);
997} 1001}
998 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
999sub update { 1017sub update {
1000 my ($self) = @_; 1018 my ($self) = @_;
1001 1019
1002 $self->SUPER::update; 1020 $self->SUPER::update;
1003 1021
1004 # todo: overwrite size_allocate of child 1022 $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} 1023}
1008 1024
1009sub invoke_size_allocate { 1025sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
1011 1027
1012 my $child = $self->{vp}->child; 1028 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014 1029
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1030 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1031}
1017
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020 1032
1021############################################################################# 1033#############################################################################
1022 1034
1023package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1024 1036
… …
1080 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1095 border => 0.6,
1084 can_events => 1, 1096 can_events => 1,
1085 min_w => 16, 1097 min_w => 64,
1086 min_h => 16, 1098 min_h => 32,
1087 %arg, 1099 %arg,
1088 ); 1100 );
1089 1101
1090 $self->{title_widget} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1103 align => 0,
… …
1096 1108
1097 if ($self->{has_close_button}) { 1109 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1110 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1111 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1112 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1113 on_activate => sub { $self->emit ("delete") };
1102 1114
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1115 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1116 }
1105 1117
1106 $self 1118 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
1153 1165
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1167 if $self->{close_button};
1156 1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1176
1157 1 1177 1
1158} 1178}
1159 1179
1160sub invoke_button_down { 1180sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1584 1604
1585 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1587 1607
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1590 1609
1591 delete $self->{size_req}; 1610 delete $self->{size_req};
1592 $self->realloc; 1611 $self->realloc;
1593 $self->update; 1612 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1601 1620
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1622
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1606 1624
1607 delete $self->{size_req}; 1625 delete $self->{size_req};
1608 $self->realloc; 1626 $self->realloc;
1609 $self->update; 1627 $self->update;
… …
1621 1639
1622 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1623 1641
1624 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1646
1628 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1629 1648
1630 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
… …
1654 1673
1655sub set_fontsize { 1674sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1657 1676
1658 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1659 delete $self->{texture}; 1679 delete $self->{texture};
1660 1680
1661 $self->realloc; 1681 $self->realloc;
1662} 1682}
1663 1683
1664sub reconfigure { 1684sub reconfigure {
1665 my ($self) = @_; 1685 my ($self) = @_;
1666 1686
1667 delete $self->{size_req}; 1687 delete $self->{size_req};
1688 delete $self->{texture};
1668 1689
1669 $self->SUPER::reconfigure; 1690 $self->SUPER::reconfigure;
1670} 1691}
1671 1692
1672sub _draw { 1693sub _draw {
1673 my ($self) = @_; 1694 my ($self) = @_;
1674 1695
1675 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1676 1697
1677 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1705
1685 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1686 }; 1707 };
1687 1708
1688 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1692 1713
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1717 };
1697 1718
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1721
1703 if ($tex->{format} == GL_ALPHA) { 1722 $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} 1723}
1714 1724
1715############################################################################# 1725#############################################################################
1716 1726
1717package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1828 1838
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 1840
1831 # byte-index to char-index 1841 # byte-index to char-index
1832 my $text = $self->{text}; 1842 my $text = $self->{text};
1833 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1835 1845
1836 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1837 $self->update; 1847 $self->update;
1838 1848
1839 1 1849 1
… …
2059 my ($self) = @_; 2069 my ($self) = @_;
2060 2070
2061 (6) x 2 2071 (6) x 2
2062} 2072}
2063 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
2064sub invoke_button_down { 2082sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
2066 2084
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state}; 2087 $self->toggle;
2070 $self->emit (changed => $self->{state});
2071 } else { 2088 } else {
2072 return 0 2089 return 0
2073 } 2090 }
2074 2091
2075 1 2092 1
… …
2111 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
2112 can_events => 0, 2129 can_events => 0,
2113 @_, 2130 @_,
2114 ); 2131 );
2115 2132
2116 $self->{path} 2133 $self->{path} || $self->{tex}
2117 or Carp::croak "required attribute 'path' not set"; 2134 or Carp::croak "'path' or 'tex' attributes required";
2118 2135
2119 $self->{tex} = $texture_cache{$self->{path}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2120 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;
2121 2138
2122 Scalar::Util::weaken $texture_cache{$self->{path}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2123 2140
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2265
2249 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2250 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);
2251 2271
2252 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
… …
2274 2294
2275 if ($t3) { 2295 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2302 glEnd;
2283 } 2303 }
2284 2304
2285 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2554 can_events => 0, 2574 can_events => 0,
2555 indent => 0, 2575 indent => 0,
2556 #font => default_font 2576 #font => default_font
2557 @_, 2577 @_,
2558 2578
2559 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2560 par => [], 2580 par => [],
2561 height => 0, 2581 height => 0,
2562 children => [ 2582 children => [
2563 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2575 2595
2576 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2577 $self->reflow; 2597 $self->reflow;
2578} 2598}
2579 2599
2580sub visible_children { 2600sub size_request {
2581 my ($self) = @_; 2601 my ($self) = @_;
2582 2602
2583 @{$self->{children}}[0,1] 2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2584} 2607}
2585 2608
2586sub invoke_size_allocate { 2609sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2588 2611
… …
2594 $self->{layout}->set_width ($empty->{w}); 2617 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 2619
2597 $self->reflow; 2620 $self->reflow;
2598 2621
2622 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2600} 2624}
2601 2625
2602sub get_layout { 2626sub get_layout {
2603 my ($self, $para) = @_; 2627 my ($self, $para) = @_;
… …
2721 my $y0 = $top; 2745 my $y0 = $top;
2722 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2723 2747
2724 my $y = 0; 2748 my $y = 0;
2725 2749
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}}) { 2750 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 2751 my $h = $para->{h};
2732 2752
2733 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2734 2754
2735 my $layout = $self->get_layout ($para); 2755 my $layout = $self->get_layout ($para);
2736 2756
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 2758
2742 if (my @w = @{ $para->{widget} }) { 2759 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 2760 my @s = $layout->get_shapes;
2744 2761
2745 for (@w) { 2762 for (@w) {
… …
2753 } 2770 }
2754 } 2771 }
2755 2772
2756 $y += $h; 2773 $y += $h;
2757 } 2774 }
2758
2759 glDisable GL_BLEND;
2760 }; 2775 };
2761 }); 2776 });
2762} 2777}
2763 2778
2764sub reconfigure { 2779sub reconfigure {
… …
3060 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
3062 3077
3063 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
3064 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 {
3065 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
3066 can_hover => 1, 3095 can_hover => 1,
3067 can_events => 1, 3096 can_events => 1,
3068 markup => $widget, 3097 markup => $widget,
3069 tooltip => $tooltip 3098 tooltip => $tooltip;
3099 }
3070 } 3100 }
3071 3101
3072 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
3073 3103
3074 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
3141 3171
3142 $self->SUPER::add (@widgets); 3172 $self->SUPER::add (@widgets);
3143 3173
3144 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3175 if @{ $self->{children} };
3176}
3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3146} 3182}
3147 3183
3148sub set_current_page { 3184sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
3150 3186
… …
3216 tooltip => $tooltip, 3252 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3253 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3254 );
3219 3255
3220 $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
3221} 3263}
3222 3264
3223sub set_current_page { 3265sub set_current_page {
3224 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3225 3267
… …
3403 count => 1, 3445 count => 1,
3404 %arg, 3446 %arg,
3405 }; 3447 };
3406 } 3448 }
3407 3449
3450 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3451 $self->reorder;
3452 });
3409} 3453}
3410 3454
3411sub reconfigure { 3455sub reconfigure {
3412 my ($self) = @_; 3456 my ($self) = @_;
3413 3457
… …
3428 3472
3429############################################################################# 3473#############################################################################
3430 3474
3431package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3432 3476
3433our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3434 3478
3435sub new { 3479sub new {
3436 my $class = shift; 3480 my $class = shift;
3437 3481
3438 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3440 @_, 3484 @_,
3441 ); 3485 );
3442 3486
3443 $self 3487 $self
3444} 3488}
3445 3489
3446sub set_items { 3490sub set_items {
3447 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3448 3492
3449 $self->{child}->clear; 3493 $self->clear;
3450 return unless $items; 3494 return unless $items;
3451 3495
3452 my @items = sort { 3496 my @items = sort {
3453 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3455 } @$items; 3499 } values %$items;
3456 3500
3457 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3458 3502
3459 my $row = 0; 3503 my $row = 0;
3460 for my $item (@items) { 3504 for my $item (@items) {
3461 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3462 3506
3463 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3466 3510
3467 $row++; 3511 $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 } 3512 }
3677} 3513}
3678 3514
3679############################################################################# 3515#############################################################################
3680 3516
… …
3734 } elsif ($ev->{button} == 2) { 3570 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}"); 3571 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) { 3572 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu 3573 (new CFClient::UI::Menu
3738 items => [ 3574 items => [
3739 ["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}"]) }],
3740 ["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}"]) }],
3741 ], 3577 ],
3742 )->popup ($ev); 3578 )->popup ($ev);
3743 } else { 3579 } else {
3744 return 0; 3580 return 0;
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 3827
3992 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3994 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
3995 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3997 3839
3998 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}) {
3999 $widget->{old_w} = $widget->{w}; 3841 $widget->{old_w} = $widget->{w};

Diff Legend

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