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

Diff Legend

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