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.323 by root, Wed Jul 5 03:01:01 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
… …
983 $self->add ($child) if $child; 986 $self->add ($child) if $child;
984 987
985 $self 988 $self
986} 989}
987 990
991#TODO# update range on size_allocate depending on child
992
988sub add { 993sub add {
989 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
990 995
991 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
992} 997}
993 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
994sub update { 1005sub update {
995 my ($self) = @_; 1006 my ($self) = @_;
996 1007
997 $self->SUPER::update; 1008 $self->SUPER::update;
998 1009
999 # todo: overwrite size_allocate of child 1010 $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} 1011}
1003 1012
1004sub invoke_size_allocate { 1013sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1006 1015
1007 my $child = $self->{vp}->child; 1016 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009 1017
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1019}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1020
1016############################################################################# 1021#############################################################################
1017 1022
1018package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1019 1024
… …
1090 if exists $self->{title}; 1095 if exists $self->{title};
1091 1096
1092 if ($self->{has_close_button}) { 1097 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1098 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1095 image => 'x1_close.png', 1100 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->emit ("delete") };
1097 1102
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1099 } 1104 }
1100 1105
1101 $self 1106 $self
… …
1147 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1148 1153
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1155 if $self->{close_button};
1151 1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1152 1 1165 1
1153} 1166}
1154 1167
1155sub invoke_button_down { 1168sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
… …
1437 1450
1438sub invoke_size_allocate { 1451sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1440 1453
1441 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1443 1456
1444 my @req; 1457 my @req;
1445 1458
1446 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1448 } else { 1461 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1451 1464
1452 if ($req > $space) { 1465 if ($req > $space) {
1453 # ah well, not enough space 1466 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1455 } else { 1468 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1470
1458 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1459 1472
1460 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1474 for 0 .. $#children;
1462 } 1475 }
1463 } 1476 }
1464 1477
1465 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1466 1479
1467 my $pos = 0; 1480 my $pos = 0;
1468 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1484
1472 $pos += $alloc; 1485 $pos += $alloc;
1473 } 1486 }
1474 1487
1475 1 1488 1
… …
1578 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1579 1592
1580 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1582 1595
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1585 1597
1586 delete $self->{size_req}; 1598 delete $self->{size_req};
1587 $self->realloc; 1599 $self->realloc;
1588 $self->update; 1600 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1596 1608
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1610
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1601 1612
1602 delete $self->{size_req}; 1613 delete $self->{size_req};
1603 $self->realloc; 1614 $self->realloc;
1604 $self->update; 1615 $self->update;
… …
1616 1627
1617 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1618 1629
1619 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1620 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1634
1623 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1624 1636
1625 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
… …
1630 }; 1642 };
1631 1643
1632 @{ $self->{size_req} } 1644 @{ $self->{size_req} }
1633} 1645}
1634 1646
1647sub baseline_shift {
1648 $_[0]{layout}->descent
1649}
1650
1635sub invoke_size_allocate { 1651sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1637 1653
1638 delete $self->{ox}; 1654 delete $self->{ox};
1639 1655
… …
1645 1661
1646sub set_fontsize { 1662sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1648 1664
1649 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1650 delete $self->{texture}; 1667 delete $self->{texture};
1651 1668
1652 $self->realloc; 1669 $self->realloc;
1653} 1670}
1654 1671
1655sub reconfigure { 1672sub reconfigure {
1656 my ($self) = @_; 1673 my ($self) = @_;
1657 1674
1658 delete $self->{size_req}; 1675 delete $self->{size_req};
1676 delete $self->{texture};
1659 1677
1660 $self->SUPER::reconfigure; 1678 $self->SUPER::reconfigure;
1661} 1679}
1662 1680
1663sub _draw { 1681sub _draw {
1664 my ($self) = @_; 1682 my ($self) = @_;
1665 1683
1666 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1667 1685
1668 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 1693
1676 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1677 }; 1695 };
1678 1696
1679 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1683 1701
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 1705 };
1688 1706
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 1709
1694 if ($tex->{format} == GL_ALPHA) { 1710 $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} 1711}
1705 1712
1706############################################################################# 1713#############################################################################
1707 1714
1708package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
1891 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1892 1899
1893 if ($sym == 13) { 1900 if ($sym == 13) {
1894 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1896 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1897 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1898 $self->emit (activate => $txt); 1906 $self->emit (activate => $txt);
1899 $self->update; 1907 $self->update;
1900 1908
… …
2049 my ($self) = @_; 2057 my ($self) = @_;
2050 2058
2051 (6) x 2 2059 (6) x 2
2052} 2060}
2053 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
2054sub invoke_button_down { 2070sub invoke_button_down {
2055 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
2056 2072
2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059 $self->{state} = !$self->{state}; 2075 $self->toggle;
2060 $self->emit (changed => $self->{state});
2061 } else { 2076 } else {
2062 return 0 2077 return 0
2063 } 2078 }
2064 2079
2065 1 2080 1
… …
2090package CFClient::UI::Image; 2105package CFClient::UI::Image;
2091 2106
2092our @ISA = CFClient::UI::Base::; 2107our @ISA = CFClient::UI::Base::;
2093 2108
2094use CFClient::OpenGL; 2109use CFClient::OpenGL;
2095use Carp qw/confess/;
2096 2110
2097our %loaded_images; 2111our %texture_cache;
2098 2112
2099sub new { 2113sub new {
2100 my $class = shift; 2114 my $class = shift;
2101 2115
2102 my $self = $class->SUPER::new (can_events => 0, @_); 2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
2103 2120
2104 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2121 $self->{path}
2122 or Carp::croak "required attribute 'path' not set";
2105 2123
2106 $loaded_images{$self->{image}} ||= 2124 $self->{tex} = $texture_cache{$self->{path}} ||=
2107 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2108 2126
2109 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2127 Scalar::Util::weaken $texture_cache{$self->{path}};
2110 2128
2111 Scalar::Util::weaken $loaded_images{$self->{image}}; 2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2112
2113 $self->{aspect} = $tex->{w} / $tex->{h};
2114 2130
2115 $self 2131 $self
2116} 2132}
2117 2133
2118sub size_request { 2134sub size_request {
2119 my ($self) = @_; 2135 my ($self) = @_;
2120 2136
2121 ($self->{tex}->{w}, $self->{tex}->{h}) 2137 ($self->{tex}{w}, $self->{tex}{h})
2122} 2138}
2123 2139
2124sub _draw { 2140sub _draw {
2125 my ($self) = @_; 2141 my ($self) = @_;
2126 2142
… …
2235 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2236 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2237 2253
2238 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2239 my $h2 = $self->{h} * (1 - $ycut2); 2255 my $h2 = $self->{h} * (1 - $ycut2);
2256 my $h3 = $self->{h};
2257
2258 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240 2259
2241 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
… …
2263 2282
2264 if ($t3) { 2283 if ($t3) {
2265 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2266 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2267 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271 glEnd; 2290 glEnd;
2272 } 2291 }
2273 2292
2274 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
… …
2409 2428
2410 $self->SUPER::invoke_button_down ($ev, $x, $y); 2429 $self->SUPER::invoke_button_down ($ev, $x, $y);
2411 2430
2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2431 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413 2432
2414 $self->mouse_motion ($ev, $x, $y) 2433 $self->invoke_mouse_motion ($ev, $x, $y)
2415} 2434}
2416 2435
2417sub invoke_mouse_motion { 2436sub invoke_mouse_motion {
2418 my ($self, $ev, $x, $y) = @_; 2437 my ($self, $ev, $x, $y) = @_;
2419 2438
… …
2543 can_events => 0, 2562 can_events => 0,
2544 indent => 0, 2563 indent => 0,
2545 #font => default_font 2564 #font => default_font
2546 @_, 2565 @_,
2547 2566
2548 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2549 par => [], 2568 par => [],
2550 height => 0, 2569 height => 0,
2551 children => [ 2570 children => [
2552 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2553 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2564 2583
2565 $self->{fontsize} = $fontsize; 2584 $self->{fontsize} = $fontsize;
2566 $self->reflow; 2585 $self->reflow;
2567} 2586}
2568 2587
2588sub size_request {
2589 my ($self) = @_;
2590
2591 my ($empty, $slider) = @{ $self->{children} };
2592
2593 local $self->{children} = [$empty, $slider];
2594 $self->SUPER::size_request
2595}
2596
2569sub invoke_size_allocate { 2597sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2598 my ($self, $w, $h) = @_;
2571 2599
2600 my ($empty, $slider, @other) = @{ $self->{children} };
2601 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2602
2572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2603 $self->{layout}->set_font ($self->{font}) if $self->{font};
2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2604 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574 $self->{layout}->set_width ($self->{children}[0]{w}); 2605 $self->{layout}->set_width ($empty->{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2606 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576 2607
2577 $self->reflow; 2608 $self->reflow;
2578 2609
2610 local $self->{children} = [$empty, $slider];
2579 $self->SUPER::invoke_size_allocate ($w, $h) 2611 $self->SUPER::invoke_size_allocate ($w, $h)
2580} 2612}
2581 2613
2582sub text_size { 2614sub get_layout {
2583 my ($self, $text, $indent) = @_; 2615 my ($self, $para) = @_;
2584 2616
2585 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2586 2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620 $layout->set_foreground (@{$para->{fg}});
2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2621 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588 $layout->set_width ($self->{children}[0]{w} - $indent); 2622 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($text); 2624 $layout->set_markup ($para->{markup});
2625
2626 $layout->set_shapes (
2627 map
2628 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2629 @{$para->{widget}}
2591 2630 );
2631
2592 $layout->size 2632 $layout
2593} 2633}
2594 2634
2595sub reflow { 2635sub reflow {
2596 my ($self) = @_; 2636 my ($self) = @_;
2597 2637
… …
2606 $self->{children}[1]->set_value ($offset); 2646 $self->{children}[1]->set_value ($offset);
2607} 2647}
2608 2648
2609sub clear { 2649sub clear {
2610 my ($self) = @_; 2650 my ($self) = @_;
2651
2652 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other;
2611 2654
2612 $self->{par} = []; 2655 $self->{par} = [];
2613 $self->{height} = 0; 2656 $self->{height} = 0;
2614 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615} 2658}
2616 2659
2617sub add_paragraph { 2660sub add_paragraph {
2618 my ($self, $color, $text, $indent) = @_; 2661 my ($self, $color, $para, $indent) = @_;
2619 2662
2620 for my $line (split /\n/, $text) { 2663 my ($text, @w) = ref $para ? @$para : $para;
2621 my ($w, $h) = $self->text_size ($line); 2664
2622 $self->{height} += $h; 2665 $para = {
2623 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2666 w => 1e10,
2667 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2624 } 2672 };
2625 2673
2626 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2674 $self->add (@w) if @w;
2675 push @{$self->{par}}, $para;
2676
2677 $self->{need_reflow}++;
2678 $self->update;
2679}
2680
2681sub scroll_to_bottom {
2682 my ($self) = @_;
2683
2684 $self->{scroll_to_bottom} = 1;
2685 $self->update;
2627} 2686}
2628 2687
2629sub update { 2688sub update {
2630 my ($self) = @_; 2689 my ($self) = @_;
2631 2690
… …
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640 2699
2641 if (delete $self->{need_reflow}) { 2700 if (delete $self->{need_reflow}) {
2642 my $height = 0; 2701 my $height = 0;
2643 2702
2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648 for (@{$self->{par}}) { 2703 for my $para (@{$self->{par}}) {
2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2650 $layout->set_width ($W - $_->[3]); 2705 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; 2706 my ($w, $h) = $layout->size;
2654 $_->[0] = $w + $_->[3]; 2707
2655 $_->[1] = $h; 2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2656 } 2711 }
2657 2712
2658 $height += $_->[1]; 2713 $height += $para->{h};
2659 } 2714 }
2660 2715
2661 $self->{height} = $height; 2716 $self->{height} = $height;
2662 2717
2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2718 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2664 2719
2665 delete $self->{texture}; 2720 delete $self->{texture};
2721 }
2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2666 } 2725 }
2667 2726
2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2669 glClearColor 0, 0, 0, 0; 2728 glClearColor 0, 0, 0, 0;
2670 glClear GL_COLOR_BUFFER_BIT; 2729 glClear GL_COLOR_BUFFER_BIT;
… …
2674 my $y0 = $top; 2733 my $y0 = $top;
2675 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2676 2735
2677 my $y = 0; 2736 my $y = 0;
2678 2737
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}}) { 2738 for my $para (@{$self->{par}}) {
2688 my $h = $par->[1]; 2739 my $h = $para->{h};
2689 2740
2690 if ($y0 < $y + $h && $y < $y1) { 2741 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 2742
2696 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2743 my $layout = $self->get_layout ($para);
2697 2744
2698 glRasterPos $par->[3], $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2699 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 }
2700 } 2759 }
2701 2760
2702 $y += $h; 2761 $y += $h;
2703 } 2762 }
2704
2705 glDisable GL_BLEND;
2706 }; 2763 };
2707 }); 2764 });
2765}
2766
2767sub reconfigure {
2768 my ($self) = @_;
2769
2770 $self->SUPER::reconfigure;
2771
2772 $_->{w} = 1e10 for @{ $self->{par} };
2773 $self->reflow;
2708} 2774}
2709 2775
2710sub _draw { 2776sub _draw {
2711 my ($self) = @_; 2777 my ($self) = @_;
2712 2778
… …
2715 glColor 0, 0, 0, 1; 2781 glColor 0, 0, 0, 1;
2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2782 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717 glDisable GL_TEXTURE_2D; 2783 glDisable GL_TEXTURE_2D;
2718 2784
2719 $self->{children}[1]->draw; 2785 $self->{children}[1]->draw;
2720
2721} 2786}
2722 2787
2723############################################################################# 2788#############################################################################
2724 2789
2725package CFClient::UI::Animator; 2790package CFClient::UI::Animator;
… …
2998 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
2999 my ($widget, $cb, $tooltip) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
3000 3065
3001 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
3002 if (!ref $widget) { 3067 if (!ref $widget) {
3068 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2;
3070
3071 $widget = new CFClient::UI::HBox
3072 can_hover => 1,
3073 can_events => 1,
3074 tooltip => $tooltip,
3075 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1),
3078 ],
3079 ;
3080
3081 } else {
3003 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
3004 can_hover => 1, 3083 can_hover => 1,
3005 can_events => 1, 3084 can_events => 1,
3006 markup => $widget, 3085 markup => $widget,
3007 tooltip => $tooltip 3086 tooltip => $tooltip;
3087 }
3008 } 3088 }
3009 3089
3010 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
3011 3091
3012 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
3079 3159
3080 $self->SUPER::add (@widgets); 3160 $self->SUPER::add (@widgets);
3081 3161
3082 $self->{current} = $self->{children}[0] 3162 $self->{current} = $self->{children}[0]
3083 if @{ $self->{children} }; 3163 if @{ $self->{children} };
3164}
3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3084} 3170}
3085 3171
3086sub set_current_page { 3172sub set_current_page {
3087 my ($self, $page_or_widget) = @_; 3173 my ($self, $page_or_widget) = @_;
3088 3174
… …
3154 tooltip => $tooltip, 3240 tooltip => $tooltip,
3155 on_activate => sub { $self->set_current_page ($widget) }, 3241 on_activate => sub { $self->set_current_page ($widget) },
3156 ); 3242 );
3157 3243
3158 $self->{multiplexer}->add ($widget); 3244 $self->{multiplexer}->add ($widget);
3245}
3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3159} 3251}
3160 3252
3161sub set_current_page { 3253sub set_current_page {
3162 my ($self, $page) = @_; 3254 my ($self, $page) = @_;
3163 3255
… …
3341 count => 1, 3433 count => 1,
3342 %arg, 3434 %arg,
3343 }; 3435 };
3344 } 3436 }
3345 3437
3438 $ROOT->on_refresh (reorder => sub {
3346 $self->reorder; 3439 $self->reorder;
3440 });
3347} 3441}
3348 3442
3349sub reconfigure { 3443sub reconfigure {
3350 my ($self) = @_; 3444 my ($self) = @_;
3351 3445
… …
3366 3460
3367############################################################################# 3461#############################################################################
3368 3462
3369package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3370 3464
3371our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3372 3466
3373sub new { 3467sub new {
3374 my $class = shift; 3468 my $class = shift;
3375 3469
3376 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3378 @_, 3472 @_,
3379 ); 3473 );
3380 3474
3381 $self 3475 $self
3382} 3476}
3383 3477
3384sub set_items { 3478sub set_items {
3385 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3386 3480
3387 $self->{child}->clear; 3481 $self->clear;
3388 return unless $items; 3482 return unless $items;
3389 3483
3390 my @items = sort { 3484 my @items = sort {
3391 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3392 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
3393 } @$items; 3487 } values %$items;
3394 3488
3395 $self->{real_items} = \@items; 3489 $self->{real_items} = \@items;
3396 3490
3397 my $row = 0; 3491 my $row = 0;
3398 for my $item (@items) { 3492 for my $item (@items) {
3399 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3400 3494
3401 $self->{child}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3402 $self->{child}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3403 $self->{child}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3404 3498
3405 $row++; 3499 $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 } 3500 }
3605} 3501}
3606 3502
3607############################################################################# 3503#############################################################################
3608 3504
… …
3662 } elsif ($ev->{button} == 2) { 3558 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}"); 3559 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) { 3560 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu 3561 (new CFClient::UI::Menu
3666 items => [ 3562 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3563 ["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}"]) }], 3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ], 3565 ],
3670 )->popup ($ev); 3566 )->popup ($ev);
3671 } else { 3567 } else {
3672 return 0; 3568 return 0;

Diff Legend

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