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.306 by root, Sun Jun 18 17:39:36 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
… …
470} 474}
471 475
472sub emit { 476sub emit {
473 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
474 478
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480
481 #d##TODO# stop propagating at first true, do not use sum
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure 483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478} 485}
479 486
480sub find_widget { 487sub find_widget {
481 my ($self, $x, $y) = @_; 488 my ($self, $x, $y) = @_;
482 489
… …
534 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
535 542
536 # update screen rectangle 543 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 546
542 # skip widgets that are entirely outside the drawing area 547 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 550
… …
584} 589}
585 590
586sub DESTROY { 591sub DESTROY {
587 my ($self) = @_; 592 my ($self) = @_;
588 593
594 return if CFClient::in_destruct;
595
589 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
590 597
591 eval { $self->destroy }; 598 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
593} 600}
… …
983 $self->add ($child) if $child; 990 $self->add ($child) if $child;
984 991
985 $self 992 $self
986} 993}
987 994
995#TODO# update range on size_allocate depending on child
996
988sub add { 997sub add {
989 my ($self, $widget) = @_; 998 my ($self, $widget) = @_;
990 999
991 $self->{vp}->add ($self->{child} = $widget); 1000 $self->{vp}->add ($self->{child} = $widget);
992} 1001}
993 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
994sub update { 1017sub update {
995 my ($self) = @_; 1018 my ($self) = @_;
996 1019
997 $self->SUPER::update; 1020 $self->SUPER::update;
998 1021
999 # todo: overwrite size_allocate of child 1022 $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} 1023}
1003 1024
1004sub invoke_size_allocate { 1025sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
1006 1027
1007 my $child = $self->{vp}->child; 1028 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009 1029
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1030 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1031}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1032
1016############################################################################# 1033#############################################################################
1017 1034
1018package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1019 1036
… …
1075 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1095 border => 0.6,
1079 can_events => 1, 1096 can_events => 1,
1080 min_w => 16, 1097 min_w => 64,
1081 min_h => 16, 1098 min_h => 32,
1082 %arg, 1099 %arg,
1083 ); 1100 );
1084 1101
1085 $self->{title_widget} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1103 align => 0,
… …
1090 if exists $self->{title}; 1107 if exists $self->{title};
1091 1108
1092 if ($self->{has_close_button}) { 1109 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1110 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1111 new CFClient::UI::ImageButton
1095 image => 'x1_close.png', 1112 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1113 on_activate => sub { $self->emit ("delete") };
1097 1114
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1115 $self->CFClient::UI::Container::add ($self->{close_button});
1099 } 1116 }
1100 1117
1101 $self 1118 $self
… …
1147 $self->child->configure ($border, $border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
1148 1165
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1167 if $self->{close_button};
1151 1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1176
1152 1 1177 1
1153} 1178}
1154 1179
1155sub invoke_button_down { 1180sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
… …
1437 1462
1438sub invoke_size_allocate { 1463sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1464 my ($self, $w, $h) = @_;
1440 1465
1441 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1443 1468
1444 my @req; 1469 my @req;
1445 1470
1446 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1448 } else { 1473 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1451 1476
1452 if ($req > $space) { 1477 if ($req > $space) {
1453 # ah well, not enough space 1478 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1455 } else { 1480 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1482
1458 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1459 1484
1460 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1486 for 0 .. $#children;
1462 } 1487 }
1463 } 1488 }
1464 1489
1465 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1466 1491
1467 my $pos = 0; 1492 my $pos = 0;
1468 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1470 $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));
1471 1496
1472 $pos += $alloc; 1497 $pos += $alloc;
1473 } 1498 }
1474 1499
1475 1 1500 1
… …
1578 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1579 1604
1580 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1582 1607
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1585 1609
1586 delete $self->{size_req}; 1610 delete $self->{size_req};
1587 $self->realloc; 1611 $self->realloc;
1588 $self->update; 1612 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1596 1620
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1622
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1601 1624
1602 delete $self->{size_req}; 1625 delete $self->{size_req};
1603 $self->realloc; 1626 $self->realloc;
1604 $self->update; 1627 $self->update;
… …
1616 1639
1617 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1618 1641
1619 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1620 $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);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1646
1623 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1624 1648
1625 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
… …
1630 }; 1654 };
1631 1655
1632 @{ $self->{size_req} } 1656 @{ $self->{size_req} }
1633} 1657}
1634 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1635sub invoke_size_allocate { 1663sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1637 1665
1638 delete $self->{ox}; 1666 delete $self->{ox};
1639 1667
… …
1645 1673
1646sub set_fontsize { 1674sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1648 1676
1649 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1650 delete $self->{texture}; 1679 delete $self->{texture};
1651 1680
1652 $self->realloc; 1681 $self->realloc;
1653} 1682}
1654 1683
1655sub reconfigure { 1684sub reconfigure {
1656 my ($self) = @_; 1685 my ($self) = @_;
1657 1686
1658 delete $self->{size_req}; 1687 delete $self->{size_req};
1688 delete $self->{texture};
1659 1689
1660 $self->SUPER::reconfigure; 1690 $self->SUPER::reconfigure;
1661} 1691}
1662 1692
1663sub _draw { 1693sub _draw {
1664 my ($self) = @_; 1694 my ($self) = @_;
1665 1695
1666 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1667 1697
1668 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 1705
1676 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1677 }; 1707 };
1678 1708
1679 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1683 1713
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 1717 };
1688 1718
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 1721
1694 if ($tex->{format} == GL_ALPHA) { 1722 $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} 1723}
1705 1724
1706############################################################################# 1725#############################################################################
1707 1726
1708package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1819 1838
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 1840
1822 # byte-index to char-index 1841 # byte-index to char-index
1823 my $text = $self->{text}; 1842 my $text = $self->{text};
1824 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1826 1845
1827 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1828 $self->update; 1847 $self->update;
1829 1848
1830 1 1849 1
… …
2050 my ($self) = @_; 2069 my ($self) = @_;
2051 2070
2052 (6) x 2 2071 (6) x 2
2053} 2072}
2054 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
2055sub invoke_button_down { 2082sub invoke_button_down {
2056 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
2057 2084
2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2060 $self->{state} = !$self->{state}; 2087 $self->toggle;
2061 $self->emit (changed => $self->{state});
2062 } else { 2088 } else {
2063 return 0 2089 return 0
2064 } 2090 }
2065 2091
2066 1 2092 1
… …
2091package CFClient::UI::Image; 2117package CFClient::UI::Image;
2092 2118
2093our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
2094 2120
2095use CFClient::OpenGL; 2121use CFClient::OpenGL;
2096use Carp qw/confess/;
2097 2122
2098our %loaded_images; 2123our %texture_cache;
2099 2124
2100sub new { 2125sub new {
2101 my $class = shift; 2126 my $class = shift;
2102 2127
2103 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2104 2132
2105 $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";
2106 2135
2107 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2108 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;
2109 2138
2110 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2111 2140
2112 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2113
2114 $self->{aspect} = $tex->{w} / $tex->{h};
2115 2142
2116 $self 2143 $self
2117} 2144}
2118 2145
2119sub size_request { 2146sub size_request {
2120 my ($self) = @_; 2147 my ($self) = @_;
2121 2148
2122 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
2123} 2150}
2124 2151
2125sub _draw { 2152sub _draw {
2126 my ($self) = @_; 2153 my ($self) = @_;
2127 2154
… …
2236 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2237 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2238 2265
2239 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2240 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);
2241 2271
2242 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
… …
2264 2294
2265 if ($t3) { 2295 if ($t3) {
2266 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2267 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2268 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272 glEnd; 2302 glEnd;
2273 } 2303 }
2274 2304
2275 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2410 2440
2411 $self->SUPER::invoke_button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2412 2442
2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2414 2444
2415 $self->mouse_motion ($ev, $x, $y) 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2416} 2446}
2417 2447
2418sub invoke_mouse_motion { 2448sub invoke_mouse_motion {
2419 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2420 2450
… …
2544 can_events => 0, 2574 can_events => 0,
2545 indent => 0, 2575 indent => 0,
2546 #font => default_font 2576 #font => default_font
2547 @_, 2577 @_,
2548 2578
2549 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2550 par => [], 2580 par => [],
2551 height => 0, 2581 height => 0,
2552 children => [ 2582 children => [
2553 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2554 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2565 2595
2566 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2567 $self->reflow; 2597 $self->reflow;
2568} 2598}
2569 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
2570sub invoke_size_allocate { 2609sub invoke_size_allocate {
2571 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2572 2611
2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2614
2573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577 2619
2578 $self->reflow; 2620 $self->reflow;
2579 2621
2622 local $self->{children} = [$empty, $slider];
2580 $self->SUPER::invoke_size_allocate ($w, $h) 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2581} 2624}
2582 2625
2583sub text_size { 2626sub get_layout {
2584 my ($self, $text, $indent) = @_; 2627 my ($self, $para) = @_;
2585 2628
2586 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2587 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591 $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}}
2592 2642 );
2643
2593 $layout->size 2644 $layout
2594} 2645}
2595 2646
2596sub reflow { 2647sub reflow {
2597 my ($self) = @_; 2648 my ($self) = @_;
2598 2649
… …
2607 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2608} 2659}
2609 2660
2610sub clear { 2661sub clear {
2611 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2612 2666
2613 $self->{par} = []; 2667 $self->{par} = [];
2614 $self->{height} = 0; 2668 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616} 2670}
2617 2671
2618sub add_paragraph { 2672sub add_paragraph {
2619 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2620 2674
2621 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2622 my ($w, $h) = $self->text_size ($line); 2676
2623 $self->{height} += $h; 2677 $para = {
2624 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,
2625 } 2684 };
2626 2685
2627 $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;
2628} 2698}
2629 2699
2630sub update { 2700sub update {
2631 my ($self) = @_; 2701 my ($self) = @_;
2632 2702
… …
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641 2711
2642 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2643 my $height = 0; 2713 my $height = 0;
2644 2714
2645 my $layout = $self->{layout};
2646
2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2651 $layout->set_width ($W - $_->[3]); 2717 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; 2718 my ($w, $h) = $layout->size;
2655 $_->[0] = $w + $_->[3]; 2719
2656 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2657 } 2723 }
2658 2724
2659 $height += $_->[1]; 2725 $height += $para->{h};
2660 } 2726 }
2661 2727
2662 $self->{height} = $height; 2728 $self->{height} = $height;
2663 2729
2664 $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]);
2665 2731
2666 delete $self->{texture}; 2732 delete $self->{texture};
2733 }
2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2667 } 2737 }
2668 2738
2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2670 glClearColor 0, 0, 0, 0; 2740 glClearColor 0, 0, 0, 0;
2671 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
… …
2675 my $y0 = $top; 2745 my $y0 = $top;
2676 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2677 2747
2678 my $y = 0; 2748 my $y = 0;
2679 2749
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}}) { 2750 for my $para (@{$self->{par}}) {
2689 my $h = $par->[1]; 2751 my $h = $para->{h};
2690 2752
2691 if ($y0 < $y + $h && $y < $y1) { 2753 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 2754
2697 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2698 2756
2699 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2700 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 }
2701 } 2771 }
2702 2772
2703 $y += $h; 2773 $y += $h;
2704 } 2774 }
2705
2706 glDisable GL_BLEND;
2707 }; 2775 };
2708 }); 2776 });
2777}
2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2709} 2786}
2710 2787
2711sub _draw { 2788sub _draw {
2712 my ($self) = @_; 2789 my ($self) = @_;
2713 2790
… …
2716 glColor 0, 0, 0, 1; 2793 glColor 0, 0, 0, 1;
2717 $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});
2718 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2719 2796
2720 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2721
2722} 2798}
2723 2799
2724############################################################################# 2800#############################################################################
2725 2801
2726package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2999 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
3000 my ($widget, $cb, $tooltip) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
3001 3077
3002 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
3003 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 {
3004 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
3005 can_hover => 1, 3095 can_hover => 1,
3006 can_events => 1, 3096 can_events => 1,
3007 markup => $widget, 3097 markup => $widget,
3008 tooltip => $tooltip 3098 tooltip => $tooltip;
3099 }
3009 } 3100 }
3010 3101
3011 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
3012 3103
3013 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
3080 3171
3081 $self->SUPER::add (@widgets); 3172 $self->SUPER::add (@widgets);
3082 3173
3083 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} }; 3175 if @{ $self->{children} };
3176}
3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3085} 3182}
3086 3183
3087sub set_current_page { 3184sub set_current_page {
3088 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
3089 3186
… …
3155 tooltip => $tooltip, 3252 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) }, 3253 on_activate => sub { $self->set_current_page ($widget) },
3157 ); 3254 );
3158 3255
3159 $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
3160} 3263}
3161 3264
3162sub set_current_page { 3265sub set_current_page {
3163 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3164 3267
… …
3342 count => 1, 3445 count => 1,
3343 %arg, 3446 %arg,
3344 }; 3447 };
3345 } 3448 }
3346 3449
3450 $ROOT->on_refresh (reorder => sub {
3347 $self->reorder; 3451 $self->reorder;
3452 });
3348} 3453}
3349 3454
3350sub reconfigure { 3455sub reconfigure {
3351 my ($self) = @_; 3456 my ($self) = @_;
3352 3457
… …
3367 3472
3368############################################################################# 3473#############################################################################
3369 3474
3370package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3371 3476
3372our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3373 3478
3374sub new { 3479sub new {
3375 my $class = shift; 3480 my $class = shift;
3376 3481
3377 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3379 @_, 3484 @_,
3380 ); 3485 );
3381 3486
3382 $self 3487 $self
3383} 3488}
3384 3489
3385sub set_items { 3490sub set_items {
3386 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3387 3492
3388 $self->{child}->clear; 3493 $self->clear;
3389 return unless $items; 3494 return unless $items;
3390 3495
3391 my @items = sort { 3496 my @items = sort {
3392 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3394 } @$items; 3499 } values %$items;
3395 3500
3396 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3397 3502
3398 my $row = 0; 3503 my $row = 0;
3399 for my $item (@items) { 3504 for my $item (@items) {
3400 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3401 3506
3402 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3405 3510
3406 $row++; 3511 $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 } 3512 }
3606} 3513}
3607 3514
3608############################################################################# 3515#############################################################################
3609 3516
… …
3663 } elsif ($ev->{button} == 2) { 3570 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}"); 3571 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) { 3572 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu 3573 (new CFClient::UI::Menu
3667 items => [ 3574 items => [
3668 ["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}"]) }],
3669 ["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}"]) }],
3670 ], 3577 ],
3671 )->popup ($ev); 3578 )->popup ($ev);
3672 } else { 3579 } else {
3673 return 0; 3580 return 0;
… …
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920 3827
3921 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3922 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3923 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
3924 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3925 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3926 3839
3927 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}) {
3928 $widget->{old_w} = $widget->{w}; 3841 $widget->{old_w} = $widget->{w};

Diff Legend

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