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.307 by root, Sun Jun 18 19:13:20 2006 UTC vs.
Revision 1.326 by root, Sun Jul 16 20:04:08 2006 UTC

… …
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338} 338}
339 339
340sub baseline_shift {
341 0
342}
343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
343 if ($self->{aspect}) { 347 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 348 my ($ow, $oh) = ($w, $h);
… …
419 my ($self) = @_; 423 my ($self) = @_;
420 424
421 return if $FOCUS == $self; 425 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
423 427
424 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
425 429
426 $focus->update if $focus; 430 $self->update;
427 $FOCUS->update;
428 431
429 0 432 0
430} 433}
431 434
432sub invoke_focus_out { 435sub invoke_focus_out {
433 my ($self) = @_; 436 my ($self) = @_;
434 437
435 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
436 439
437 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
438 441
439 $focus->update if $focus; #? 442 $self->update;
440 443
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 445 unless $FOCUS;
443 446
444 0 447 0
445} 448}
446 449
447sub grab_focus { 450sub grab_focus {
448 my ($self) = @_; 451 my ($self) = @_;
449 452
453 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 454 $self->emit ("focus_in");
451} 455}
452 456
453sub invoke_mouse_motion { 1 } 457sub invoke_mouse_motion { 1 }
454sub invoke_button_up { 1 } 458sub invoke_button_up { 1 }
… …
470} 474}
471 475
472sub emit { 476sub emit {
473 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
474 478
479 #d##TODO# stop propagating at first true, do not use sum
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure 481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478} 483}
479 484
480sub find_widget { 485sub find_widget {
481 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
482 487
… …
534 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
535 540
536 # update screen rectangle 541 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 544
542 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 548
… …
584} 587}
585 588
586sub DESTROY { 589sub DESTROY {
587 my ($self) = @_; 590 my ($self) = @_;
588 591
592 return if CFClient::in_destruct;
593
589 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
590 595
591 eval { $self->destroy }; 596 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
593} 598}
… …
983 $self->add ($child) if $child; 988 $self->add ($child) if $child;
984 989
985 $self 990 $self
986} 991}
987 992
993#TODO# update range on size_allocate depending on child
994
988sub add { 995sub add {
989 my ($self, $widget) = @_; 996 my ($self, $widget) = @_;
990 997
991 $self->{vp}->add ($self->{child} = $widget); 998 $self->{vp}->add ($self->{child} = $widget);
992} 999}
993 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
994sub update { 1007sub update {
995 my ($self) = @_; 1008 my ($self) = @_;
996 1009
997 $self->SUPER::update; 1010 $self->SUPER::update;
998 1011
999 # todo: overwrite size_allocate of child 1012 $self->update_slider;
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1013}
1003 1014
1004sub invoke_size_allocate { 1015sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1016 my ($self, $w, $h) = @_;
1006 1017
1007 my $child = $self->{vp}->child; 1018 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009 1019
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1020 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1021}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1022
1016############################################################################# 1023#############################################################################
1017 1024
1018package CFClient::UI::Frame; 1025package CFClient::UI::Frame;
1019 1026
… …
1075 my $self = $class->SUPER::new ( 1082 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1083 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1084 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1085 border => 0.6,
1079 can_events => 1, 1086 can_events => 1,
1080 min_w => 16, 1087 min_w => 64,
1081 min_h => 16, 1088 min_h => 32,
1082 %arg, 1089 %arg,
1083 ); 1090 );
1084 1091
1085 $self->{title_widget} = new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1093 align => 0,
… …
1090 if exists $self->{title}; 1097 if exists $self->{title};
1091 1098
1092 if ($self->{has_close_button}) { 1099 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1100 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1101 new CFClient::UI::ImageButton
1095 image => 'x1_close.png', 1102 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1103 on_activate => sub { $self->emit ("delete") };
1097 1104
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1105 $self->CFClient::UI::Container::add ($self->{close_button});
1099 } 1106 }
1100 1107
1101 $self 1108 $self
… …
1147 $self->child->configure ($border, $border, $w, $h); 1154 $self->child->configure ($border, $border, $w, $h);
1148 1155
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1157 if $self->{close_button};
1151 1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1166
1152 1 1167 1
1153} 1168}
1154 1169
1155sub invoke_button_down { 1170sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
… …
1437 1452
1438sub invoke_size_allocate { 1453sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1454 my ($self, $w, $h) = @_;
1440 1455
1441 my $space = $self->{vertical} ? $h : $w; 1456 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1457 my @children = $self->visible_children;
1443 1458
1444 my @req; 1459 my @req;
1445 1460
1446 if ($self->{homogeneous}) { 1461 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1462 @req = ($space / (@children || 1)) x @children;
1448 } else { 1463 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1464 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1465 my $req = List::Util::sum @req;
1451 1466
1452 if ($req > $space) { 1467 if ($req > $space) {
1453 # ah well, not enough space 1468 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1469 $_ *= $space / $req for @req;
1455 } else { 1470 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1471 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1472
1458 $space = ($space - $req) / $expand; # remaining space to give away 1473 $space = ($space - $req) / $expand; # remaining space to give away
1459 1474
1460 $req[$_] += $space * $children->[$_]{expand} 1475 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1476 for 0 .. $#children;
1462 } 1477 }
1463 } 1478 }
1464 1479
1465 CFClient::UI::harmonize \@req; 1480 CFClient::UI::harmonize \@req;
1466 1481
1467 my $pos = 0; 1482 my $pos = 0;
1468 for (0 .. $#$children) { 1483 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1484 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1486
1472 $pos += $alloc; 1487 $pos += $alloc;
1473 } 1488 }
1474 1489
1475 1 1490 1
… …
1578 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1579 1594
1580 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1582 1597
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1585 1599
1586 delete $self->{size_req}; 1600 delete $self->{size_req};
1587 $self->realloc; 1601 $self->realloc;
1588 $self->update; 1602 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1596 1610
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1612
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1601 1614
1602 delete $self->{size_req}; 1615 delete $self->{size_req};
1603 $self->realloc; 1616 $self->realloc;
1604 $self->update; 1617 $self->update;
… …
1616 1629
1617 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1618 1631
1619 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1620 $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);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1636
1623 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1624 1638
1625 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
… …
1630 }; 1644 };
1631 1645
1632 @{ $self->{size_req} } 1646 @{ $self->{size_req} }
1633} 1647}
1634 1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1635sub invoke_size_allocate { 1653sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1637 1655
1638 delete $self->{ox}; 1656 delete $self->{ox};
1639 1657
… …
1645 1663
1646sub set_fontsize { 1664sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1648 1666
1649 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1650 delete $self->{texture}; 1669 delete $self->{texture};
1651 1670
1652 $self->realloc; 1671 $self->realloc;
1653} 1672}
1654 1673
1655sub reconfigure { 1674sub reconfigure {
1656 my ($self) = @_; 1675 my ($self) = @_;
1657 1676
1658 delete $self->{size_req}; 1677 delete $self->{size_req};
1678 delete $self->{texture};
1659 1679
1660 $self->SUPER::reconfigure; 1680 $self->SUPER::reconfigure;
1661} 1681}
1662 1682
1663sub _draw { 1683sub _draw {
1664 my ($self) = @_; 1684 my ($self) = @_;
1665 1685
1666 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1667 1687
1668 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 1695
1676 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1677 }; 1697 };
1678 1698
1679 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1683 1703
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 1707 };
1688 1708
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 1711
1694 if ($tex->{format} == GL_ALPHA) { 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696 glColor @{$self->{fg}};
1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701 }
1702
1703 glDisable GL_TEXTURE_2D;
1704} 1713}
1705 1714
1706############################################################################# 1715#############################################################################
1707 1716
1708package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1819 1828
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 1830
1822 # byte-index to char-index 1831 # byte-index to char-index
1823 my $text = $self->{text}; 1832 my $text = $self->{text};
1824 utf8::encode $text; 1833 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length $text;
1826 1835
1827 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1828 $self->update; 1837 $self->update;
1829 1838
1830 1 1839 1
… …
2050 my ($self) = @_; 2059 my ($self) = @_;
2051 2060
2052 (6) x 2 2061 (6) x 2
2053} 2062}
2054 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2055sub invoke_button_down { 2072sub invoke_button_down {
2056 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
2057 2074
2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2060 $self->{state} = !$self->{state}; 2077 $self->toggle;
2061 $self->emit (changed => $self->{state});
2062 } else { 2078 } else {
2063 return 0 2079 return 0
2064 } 2080 }
2065 2081
2066 1 2082 1
… …
2091package CFClient::UI::Image; 2107package CFClient::UI::Image;
2092 2108
2093our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
2094 2110
2095use CFClient::OpenGL; 2111use CFClient::OpenGL;
2096use Carp qw/confess/;
2097 2112
2098our %loaded_images; 2113our %texture_cache;
2099 2114
2100sub new { 2115sub new {
2101 my $class = shift; 2116 my $class = shift;
2102 2117
2103 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2104 2122
2105 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2123 $self->{path}
2124 or Carp::croak "required attribute 'path' not set";
2106 2125
2107 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2108 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2109 2128
2110 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2111 2130
2112 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2113
2114 $self->{aspect} = $tex->{w} / $tex->{h};
2115 2132
2116 $self 2133 $self
2117} 2134}
2118 2135
2119sub size_request { 2136sub size_request {
2120 my ($self) = @_; 2137 my ($self) = @_;
2121 2138
2122 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
2123} 2140}
2124 2141
2125sub _draw { 2142sub _draw {
2126 my ($self) = @_; 2143 my ($self) = @_;
2127 2144
… …
2236 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2237 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2238 2255
2239 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2240 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);
2241 2261
2242 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
… …
2264 2284
2265 if ($t3) { 2285 if ($t3) {
2266 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2267 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2268 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272 glEnd; 2292 glEnd;
2273 } 2293 }
2274 2294
2275 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2544 can_events => 0, 2564 can_events => 0,
2545 indent => 0, 2565 indent => 0,
2546 #font => default_font 2566 #font => default_font
2547 @_, 2567 @_,
2548 2568
2549 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2550 par => [], 2570 par => [],
2551 height => 0, 2571 height => 0,
2552 children => [ 2572 children => [
2553 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2554 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2565 2585
2566 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2567 $self->reflow; 2587 $self->reflow;
2568} 2588}
2569 2589
2590sub size_request {
2591 my ($self) = @_;
2592
2593 my ($empty, $slider) = @{ $self->{children} };
2594
2595 local $self->{children} = [$empty, $slider];
2596 $self->SUPER::size_request
2597}
2598
2570sub invoke_size_allocate { 2599sub invoke_size_allocate {
2571 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2572 2601
2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2604
2573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577 2609
2578 $self->reflow; 2610 $self->reflow;
2579 2611
2612 local $self->{children} = [$empty, $slider];
2580 $self->SUPER::invoke_size_allocate ($w, $h) 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2581} 2614}
2582 2615
2583sub text_size { 2616sub get_layout {
2584 my ($self, $text, $indent) = @_; 2617 my ($self, $para) = @_;
2585 2618
2586 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2587 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589 $layout->set_width ($self->{children}[0]{w} - $indent); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591 $layout->set_markup ($text); 2626 $layout->set_markup ($para->{markup});
2627
2628 $layout->set_shapes (
2629 map
2630 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2631 @{$para->{widget}}
2592 2632 );
2633
2593 $layout->size 2634 $layout
2594} 2635}
2595 2636
2596sub reflow { 2637sub reflow {
2597 my ($self) = @_; 2638 my ($self) = @_;
2598 2639
… …
2607 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2608} 2649}
2609 2650
2610sub clear { 2651sub clear {
2611 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2612 2656
2613 $self->{par} = []; 2657 $self->{par} = [];
2614 $self->{height} = 0; 2658 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616} 2660}
2617 2661
2618sub add_paragraph { 2662sub add_paragraph {
2619 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2620 2664
2621 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2622 my ($w, $h) = $self->text_size ($line); 2666
2623 $self->{height} += $h; 2667 $para = {
2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2668 w => 1e10,
2669 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2625 } 2674 };
2626 2675
2627 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2676 $self->add (@w) if @w;
2677 push @{$self->{par}}, $para;
2678
2679 $self->{need_reflow}++;
2680 $self->update;
2681}
2682
2683sub scroll_to_bottom {
2684 my ($self) = @_;
2685
2686 $self->{scroll_to_bottom} = 1;
2687 $self->update;
2628} 2688}
2629 2689
2630sub update { 2690sub update {
2631 my ($self) = @_; 2691 my ($self) = @_;
2632 2692
… …
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641 2701
2642 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2643 my $height = 0; 2703 my $height = 0;
2644 2704
2645 my $layout = $self->{layout};
2646
2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2651 $layout->set_width ($W - $_->[3]); 2707 my $layout = $self->get_layout ($para);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653 $layout->set_markup ($_->[4]);
2654 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2655 $_->[0] = $w + $_->[3]; 2709
2656 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2657 } 2713 }
2658 2714
2659 $height += $_->[1]; 2715 $height += $para->{h};
2660 } 2716 }
2661 2717
2662 $self->{height} = $height; 2718 $self->{height} = $height;
2663 2719
2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2665 2721
2666 delete $self->{texture}; 2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2667 } 2727 }
2668 2728
2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2670 glClearColor 0, 0, 0, 0; 2730 glClearColor 0, 0, 0, 0;
2671 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
… …
2675 my $y0 = $top; 2735 my $y0 = $top;
2676 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2677 2737
2678 my $y = 0; 2738 my $y = 0;
2679 2739
2680 my $layout = $self->{layout};
2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683
2684 glEnable GL_BLEND;
2685 #TODO# not correct in windows where rgba is forced off
2686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687
2688 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2689 my $h = $par->[1]; 2741 my $h = $para->{h};
2690 2742
2691 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2692 $layout->set_foreground (@{ $par->[2] });
2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2695 $layout->set_markup ($par->[4]);
2696 2744
2697 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2698 2746
2699 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2748
2749 if (my @w = @{ $para->{widget} }) {
2750 my @s = $layout->get_shapes;
2751
2752 for (@w) {
2753 my ($dx, $dy) = splice @s, 0, 2, ();
2754
2755 $_->{x} = $dx + $para->{indent};
2756 $_->{y} = $dy + $y - $y0;
2757
2758 $_->draw;
2759 }
2760 }
2701 } 2761 }
2702 2762
2703 $y += $h; 2763 $y += $h;
2704 } 2764 }
2705
2706 glDisable GL_BLEND;
2707 }; 2765 };
2708 }); 2766 });
2767}
2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2709} 2776}
2710 2777
2711sub _draw { 2778sub _draw {
2712 my ($self) = @_; 2779 my ($self) = @_;
2713 2780
… …
2716 glColor 0, 0, 0, 1; 2783 glColor 0, 0, 0, 1;
2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2719 2786
2720 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2721
2722} 2788}
2723 2789
2724############################################################################# 2790#############################################################################
2725 2791
2726package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2999 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
3000 my ($widget, $cb, $tooltip) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
3001 3067
3002 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
3003 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 {
3004 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
3005 can_hover => 1, 3085 can_hover => 1,
3006 can_events => 1, 3086 can_events => 1,
3007 markup => $widget, 3087 markup => $widget,
3008 tooltip => $tooltip 3088 tooltip => $tooltip;
3089 }
3009 } 3090 }
3010 3091
3011 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
3012 3093
3013 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
3080 3161
3081 $self->SUPER::add (@widgets); 3162 $self->SUPER::add (@widgets);
3082 3163
3083 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} }; 3165 if @{ $self->{children} };
3166}
3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3085} 3172}
3086 3173
3087sub set_current_page { 3174sub set_current_page {
3088 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
3089 3176
… …
3155 tooltip => $tooltip, 3242 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) }, 3243 on_activate => sub { $self->set_current_page ($widget) },
3157 ); 3244 );
3158 3245
3159 $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
3160} 3253}
3161 3254
3162sub set_current_page { 3255sub set_current_page {
3163 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3164 3257
… …
3342 count => 1, 3435 count => 1,
3343 %arg, 3436 %arg,
3344 }; 3437 };
3345 } 3438 }
3346 3439
3440 $ROOT->on_refresh (reorder => sub {
3347 $self->reorder; 3441 $self->reorder;
3442 });
3348} 3443}
3349 3444
3350sub reconfigure { 3445sub reconfigure {
3351 my ($self) = @_; 3446 my ($self) = @_;
3352 3447
… …
3367 3462
3368############################################################################# 3463#############################################################################
3369 3464
3370package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3371 3466
3372our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3373 3468
3374sub new { 3469sub new {
3375 my $class = shift; 3470 my $class = shift;
3376 3471
3377 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3379 @_, 3474 @_,
3380 ); 3475 );
3381 3476
3382 $self 3477 $self
3383} 3478}
3384 3479
3385sub set_items { 3480sub set_items {
3386 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3387 3482
3388 $self->{child}->clear; 3483 $self->clear;
3389 return unless $items; 3484 return unless $items;
3390 3485
3391 my @items = sort { 3486 my @items = sort {
3392 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3394 } @$items; 3489 } values %$items;
3395 3490
3396 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3397 3492
3398 my $row = 0; 3493 my $row = 0;
3399 for my $item (@items) { 3494 for my $item (@items) {
3400 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3401 3496
3402 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3405 3500
3406 $row++; 3501 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 } 3502 }
3606} 3503}
3607 3504
3608############################################################################# 3505#############################################################################
3609 3506
… …
3663 } elsif ($ev->{button} == 2) { 3560 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}"); 3561 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) { 3562 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu 3563 (new CFClient::UI::Menu
3667 items => [ 3564 items => [
3668 ["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}"]) }],
3669 ["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}"]) }],
3670 ], 3567 ],
3671 )->popup ($ev); 3568 )->popup ($ev);
3672 } else { 3569 } else {
3673 return 0; 3570 return 0;
… …
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920 3817
3921 $w = 0 if $w < 0; 3818 $w = 0 if $w < 0;
3922 $h = 0 if $h < 0; 3819 $h = 0 if $h < 0;
3923 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
3924 $w = int $w + 0.5; 3827 $w = int $w + 0.5;
3925 $h = int $h + 0.5; 3828 $h = int $h + 0.5;
3926 3829
3927 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}) {
3928 $widget->{old_w} = $widget->{w}; 3831 $widget->{old_w} = $widget->{w};

Diff Legend

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