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.305 by root, Sun Jun 18 17:13:12 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
… …
1891 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1892 1901
1893 if ($sym == 13) { 1902 if ($sym == 13) {
1894 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1896 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1897 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1898 $self->emit (activate => $txt); 1908 $self->emit (activate => $txt);
1899 $self->update; 1909 $self->update;
1900 1910
… …
2049 my ($self) = @_; 2059 my ($self) = @_;
2050 2060
2051 (6) x 2 2061 (6) x 2
2052} 2062}
2053 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2054sub invoke_button_down { 2072sub invoke_button_down {
2055 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
2056 2074
2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059 $self->{state} = !$self->{state}; 2077 $self->toggle;
2060 $self->emit (changed => $self->{state});
2061 } else { 2078 } else {
2062 return 0 2079 return 0
2063 } 2080 }
2064 2081
2065 1 2082 1
… …
2090package CFClient::UI::Image; 2107package CFClient::UI::Image;
2091 2108
2092our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
2093 2110
2094use CFClient::OpenGL; 2111use CFClient::OpenGL;
2095use Carp qw/confess/;
2096 2112
2097our %loaded_images; 2113our %texture_cache;
2098 2114
2099sub new { 2115sub new {
2100 my $class = shift; 2116 my $class = shift;
2101 2117
2102 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2103 2122
2104 $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";
2105 2125
2106 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2107 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;
2108 2128
2109 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2110 2130
2111 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2112
2113 $self->{aspect} = $tex->{w} / $tex->{h};
2114 2132
2115 $self 2133 $self
2116} 2134}
2117 2135
2118sub size_request { 2136sub size_request {
2119 my ($self) = @_; 2137 my ($self) = @_;
2120 2138
2121 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
2122} 2140}
2123 2141
2124sub _draw { 2142sub _draw {
2125 my ($self) = @_; 2143 my ($self) = @_;
2126 2144
… …
2235 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2236 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2237 2255
2238 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2239 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);
2240 2261
2241 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
… …
2263 2284
2264 if ($t3) { 2285 if ($t3) {
2265 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2266 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2267 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271 glEnd; 2292 glEnd;
2272 } 2293 }
2273 2294
2274 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2409 2430
2410 $self->SUPER::invoke_button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2411 2432
2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413 2434
2414 $self->mouse_motion ($ev, $x, $y) 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2415} 2436}
2416 2437
2417sub invoke_mouse_motion { 2438sub invoke_mouse_motion {
2418 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2419 2440
… …
2543 can_events => 0, 2564 can_events => 0,
2544 indent => 0, 2565 indent => 0,
2545 #font => default_font 2566 #font => default_font
2546 @_, 2567 @_,
2547 2568
2548 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2549 par => [], 2570 par => [],
2550 height => 0, 2571 height => 0,
2551 children => [ 2572 children => [
2552 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2553 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2564 2585
2565 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2566 $self->reflow; 2587 $self->reflow;
2567} 2588}
2568 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
2569sub invoke_size_allocate { 2599sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2571 2601
2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2604
2572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576 2609
2577 $self->reflow; 2610 $self->reflow;
2578 2611
2612 local $self->{children} = [$empty, $slider];
2579 $self->SUPER::invoke_size_allocate ($w, $h) 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2580} 2614}
2581 2615
2582sub text_size { 2616sub get_layout {
2583 my ($self, $text, $indent) = @_; 2617 my ($self, $para) = @_;
2584 2618
2585 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2586 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588 $layout->set_width ($self->{children}[0]{w} - $indent); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $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}}
2591 2632 );
2633
2592 $layout->size 2634 $layout
2593} 2635}
2594 2636
2595sub reflow { 2637sub reflow {
2596 my ($self) = @_; 2638 my ($self) = @_;
2597 2639
… …
2606 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2607} 2649}
2608 2650
2609sub clear { 2651sub clear {
2610 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2611 2656
2612 $self->{par} = []; 2657 $self->{par} = [];
2613 $self->{height} = 0; 2658 $self->{height} = 0;
2614 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615} 2660}
2616 2661
2617sub add_paragraph { 2662sub add_paragraph {
2618 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2619 2664
2620 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2621 my ($w, $h) = $self->text_size ($line); 2666
2622 $self->{height} += $h; 2667 $para = {
2623 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,
2624 } 2674 };
2625 2675
2626 $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;
2627} 2688}
2628 2689
2629sub update { 2690sub update {
2630 my ($self) = @_; 2691 my ($self) = @_;
2631 2692
… …
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640 2701
2641 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2642 my $height = 0; 2703 my $height = 0;
2643 2704
2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2650 $layout->set_width ($W - $_->[3]); 2707 my $layout = $self->get_layout ($para);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652 $layout->set_markup ($_->[4]);
2653 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2654 $_->[0] = $w + $_->[3]; 2709
2655 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2656 } 2713 }
2657 2714
2658 $height += $_->[1]; 2715 $height += $para->{h};
2659 } 2716 }
2660 2717
2661 $self->{height} = $height; 2718 $self->{height} = $height;
2662 2719
2663 $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]);
2664 2721
2665 delete $self->{texture}; 2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2666 } 2727 }
2667 2728
2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2669 glClearColor 0, 0, 0, 0; 2730 glClearColor 0, 0, 0, 0;
2670 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
… …
2674 my $y0 = $top; 2735 my $y0 = $top;
2675 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2676 2737
2677 my $y = 0; 2738 my $y = 0;
2678 2739
2679 my $layout = $self->{layout};
2680
2681 $layout->set_font ($self->{font}) if $self->{font};
2682
2683 glEnable GL_BLEND;
2684 #TODO# not correct in windows where rgba is forced off
2685 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2688 my $h = $par->[1]; 2741 my $h = $para->{h};
2689 2742
2690 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2691 $layout->set_foreground (@{ $par->[2] });
2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694 $layout->set_markup ($par->[4]);
2695 2744
2696 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2697 2746
2698 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2699 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 }
2700 } 2761 }
2701 2762
2702 $y += $h; 2763 $y += $h;
2703 } 2764 }
2704
2705 glDisable GL_BLEND;
2706 }; 2765 };
2707 }); 2766 });
2767}
2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2708} 2776}
2709 2777
2710sub _draw { 2778sub _draw {
2711 my ($self) = @_; 2779 my ($self) = @_;
2712 2780
… …
2715 glColor 0, 0, 0, 1; 2783 glColor 0, 0, 0, 1;
2716 $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});
2717 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2718 2786
2719 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2720
2721} 2788}
2722 2789
2723############################################################################# 2790#############################################################################
2724 2791
2725package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2998 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2999 my ($widget, $cb, $tooltip) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
3000 3067
3001 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
3002 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 {
3003 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
3004 can_hover => 1, 3085 can_hover => 1,
3005 can_events => 1, 3086 can_events => 1,
3006 markup => $widget, 3087 markup => $widget,
3007 tooltip => $tooltip 3088 tooltip => $tooltip;
3089 }
3008 } 3090 }
3009 3091
3010 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
3011 3093
3012 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
3079 3161
3080 $self->SUPER::add (@widgets); 3162 $self->SUPER::add (@widgets);
3081 3163
3082 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
3083 if @{ $self->{children} }; 3165 if @{ $self->{children} };
3166}
3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3084} 3172}
3085 3173
3086sub set_current_page { 3174sub set_current_page {
3087 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
3088 3176
… …
3154 tooltip => $tooltip, 3242 tooltip => $tooltip,
3155 on_activate => sub { $self->set_current_page ($widget) }, 3243 on_activate => sub { $self->set_current_page ($widget) },
3156 ); 3244 );
3157 3245
3158 $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
3159} 3253}
3160 3254
3161sub set_current_page { 3255sub set_current_page {
3162 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3163 3257
… …
3341 count => 1, 3435 count => 1,
3342 %arg, 3436 %arg,
3343 }; 3437 };
3344 } 3438 }
3345 3439
3440 $ROOT->on_refresh (reorder => sub {
3346 $self->reorder; 3441 $self->reorder;
3442 });
3347} 3443}
3348 3444
3349sub reconfigure { 3445sub reconfigure {
3350 my ($self) = @_; 3446 my ($self) = @_;
3351 3447
… …
3366 3462
3367############################################################################# 3463#############################################################################
3368 3464
3369package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3370 3466
3371our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3372 3468
3373sub new { 3469sub new {
3374 my $class = shift; 3470 my $class = shift;
3375 3471
3376 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3378 @_, 3474 @_,
3379 ); 3475 );
3380 3476
3381 $self 3477 $self
3382} 3478}
3383 3479
3384sub set_items { 3480sub set_items {
3385 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3386 3482
3387 $self->{child}->clear; 3483 $self->clear;
3388 return unless $items; 3484 return unless $items;
3389 3485
3390 my @items = sort { 3486 my @items = sort {
3391 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3392 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3393 } @$items; 3489 } values %$items;
3394 3490
3395 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3396 3492
3397 my $row = 0; 3493 my $row = 0;
3398 for my $item (@items) { 3494 for my $item (@items) {
3399 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3400 3496
3401 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3402 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3403 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3404 3500
3405 $row++; 3501 $row++;
3406 }
3407}
3408
3409#############################################################################
3410
3411package CFClient::UI::BindEditor;
3412
3413our @ISA = CFClient::UI::FancyFrame::;
3414
3415sub new {
3416 my $class = shift;
3417
3418 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420 $self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424 text => "start recording",
3425 tooltip => "Start/Stops recording of actions."
3426 ."All subsequent actions after the recording started will be captured."
3427 ."The actions are displayed after the record was stopped."
3428 ."To bind the action you have to click on the 'Bind' button",
3429 on_activate => sub {
3430 unless ($self->{recording}) {
3431 $self->start;
3432 } else {
3433 $self->stop;
3434 }
3435 });
3436
3437 $vb->add (new CFClient::UI::Label text => "Actions:");
3438 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3441 $vb->add (my $hb = new CFClient::UI::HBox);
3442 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443 $hb->add (new CFClient::UI::Button
3444 text => "bind",
3445 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446 on_activate => sub {
3447 $self->ask_for_bind;
3448 });
3449
3450 $vb->add (my $hb = new CFClient::UI::HBox);
3451 $hb->add (new CFClient::UI::Button
3452 text => "ok",
3453 expand => 1,
3454 tooltip => "This closes the binding editor and saves the binding",
3455 on_activate => sub {
3456 $self->hide;
3457 $self->commit;
3458 });
3459
3460 $hb->add (new CFClient::UI::Button
3461 text => "cancel",
3462 expand => 1,
3463 tooltip => "This closes the binding editor without saving",
3464 on_activate => sub {
3465 $self->hide;
3466 $self->{binding_cancel}->()
3467 if $self->{binding_cancel};
3468 });
3469
3470 $self->update_binding_widgets;
3471
3472 $self
3473}
3474
3475sub commit {
3476 my ($self) = @_;
3477 my ($mod, $sym, $cmds) = $self->get_binding;
3478 if ($sym != 0 && @$cmds > 0) {
3479 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480 ."'. Don't forget 'Save Config'!");
3481 $self->{binding_change}->($mod, $sym, $cmds)
3482 if $self->{binding_change};
3483 } else {
3484 $::STATUSBOX->add ("No action bound, no key or action specified!");
3485 $self->{binding_cancel}->()
3486 if $self->{binding_cancel};
3487 }
3488}
3489
3490sub start {
3491 my ($self) = @_;
3492
3493 $self->{rec_btn}->set_text ("stop recording");
3494 $self->{recording} = 1;
3495 $self->clear_command_list;
3496 $::CONN->start_record if $::CONN;
3497}
3498
3499sub stop {
3500 my ($self) = @_;
3501
3502 $self->{rec_btn}->set_text ("start recording");
3503 $self->{recording} = 0;
3504
3505 my $rec;
3506 $rec = $::CONN->stop_record if $::CONN;
3507 return unless ref $rec eq 'ARRAY';
3508 $self->set_command_list ($rec);
3509}
3510
3511
3512sub ask_for_bind_and_commit {
3513 my ($self) = @_;
3514 $self->ask_for_bind (1);
3515}
3516
3517sub ask_for_bind {
3518 my ($self, $commit, $end_cb) = @_;
3519
3520 CFClient::Binder::open_binding_dialog (sub {
3521 my ($mod, $sym) = @_;
3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523 $self->update_binding_widgets;
3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3526 });
3527}
3528
3529# $mod and $sym are the modifiers and key symbol
3530# $cmds is a array ref of strings (the commands)
3531# $cb is the callback that is executed on OK
3532# $ccb is the callback that is executed on CANCEL and
3533# when the binding was unsuccessful on OK
3534sub set_binding {
3535 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537 $self->clear_command_list;
3538 $self->{recording} = 0;
3539 $self->{rec_btn}->set_text ("start recording");
3540
3541 $self->{binding} = [$mod, $sym];
3542 $self->{commands} = $cmds;
3543
3544 $self->{binding_change} = $cb;
3545 $self->{binding_cancel} = $ccb;
3546
3547 $self->update_binding_widgets;
3548}
3549
3550# this is a shortcut method that asks for a binding
3551# and then just binds it.
3552sub do_quick_binding {
3553 my ($self, $cmds, $end_cb) = @_;
3554 $self->set_binding (undef, undef, $cmds, sub {
3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556 });
3557 $self->ask_for_bind (1, $end_cb);
3558}
3559
3560sub update_binding_widgets {
3561 my ($self) = @_;
3562 my ($mod, $sym, $cmds) = $self->get_binding;
3563 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564 $self->set_command_list ($cmds);
3565}
3566
3567sub get_binding {
3568 my ($self) = @_;
3569 return (
3570 $self->{binding}->[0],
3571 $self->{binding}->[1],
3572 [ grep { defined $_ } @{$self->{commands}} ]
3573 );
3574}
3575
3576sub clear_command_list {
3577 my ($self) = @_;
3578 $self->{cmdbox}->clear ();
3579}
3580
3581sub set_command_list {
3582 my ($self, $cmds) = @_;
3583
3584 $self->{cmdbox}->clear ();
3585 $self->{commands} = $cmds;
3586
3587 my $idx = 0;
3588
3589 for (@$cmds) {
3590 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592 my $i = $idx;
3593 $hb->add (new CFClient::UI::Label text => $_);
3594 $hb->add (new CFClient::UI::Button
3595 text => "delete",
3596 tooltip => "Deletes the action from the record",
3597 on_activate => sub {
3598 $self->{cmdbox}->remove ($hb);
3599 $cmds->[$i] = undef;
3600 });
3601
3602
3603 $idx++
3604 } 3502 }
3605} 3503}
3606 3504
3607############################################################################# 3505#############################################################################
3608 3506
… …
3662 } elsif ($ev->{button} == 2) { 3560 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}"); 3561 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) { 3562 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu 3563 (new CFClient::UI::Menu
3666 items => [ 3564 items => [
3667 ["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}"]) }],
3668 ["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}"]) }],
3669 ], 3567 ],
3670 )->popup ($ev); 3568 )->popup ($ev);
3671 } else { 3569 } else {
3672 return 0; 3570 return 0;
… …
3918 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919 3817
3920 $w = 0 if $w < 0; 3818 $w = 0 if $w < 0;
3921 $h = 0 if $h < 0; 3819 $h = 0 if $h < 0;
3922 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
3923 $w = int $w + 0.5; 3827 $w = int $w + 0.5;
3924 $h = int $h + 0.5; 3828 $h = int $h + 0.5;
3925 3829
3926 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}) {
3927 $widget->{old_w} = $widget->{w}; 3831 $widget->{old_w} = $widget->{w};

Diff Legend

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