ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.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 }
… …
535 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
536 540
537 # update screen rectangle 541 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 544
543 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 548
… …
984 $self->add ($child) if $child; 986 $self->add ($child) if $child;
985 987
986 $self 988 $self
987} 989}
988 990
991#TODO# update range on size_allocate depending on child
992
989sub add { 993sub add {
990 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
991 995
992 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
993} 997}
994 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
995sub update { 1005sub update {
996 my ($self) = @_; 1006 my ($self) = @_;
997 1007
998 $self->SUPER::update; 1008 $self->SUPER::update;
999 1009
1000 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1011}
1004 1012
1005sub invoke_size_allocate { 1013sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1007 1015
1008 my $child = $self->{vp}->child; 1016 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1017
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1019}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1020
1017############################################################################# 1021#############################################################################
1018 1022
1019package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1020 1024
… …
1091 if exists $self->{title}; 1095 if exists $self->{title};
1092 1096
1093 if ($self->{has_close_button}) { 1097 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1098 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1096 image => 'x1_close.png', 1100 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->emit ("delete") };
1098 1102
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1104 }
1101 1105
1102 $self 1106 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1149 1153
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1155 if $self->{close_button};
1152 1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1153 1 1165 1
1154} 1166}
1155 1167
1156sub invoke_button_down { 1168sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
… …
1438 1450
1439sub invoke_size_allocate { 1451sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1441 1453
1442 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1444 1456
1445 my @req; 1457 my @req;
1446 1458
1447 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1449 } else { 1461 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1452 1464
1453 if ($req > $space) { 1465 if ($req > $space) {
1454 # ah well, not enough space 1466 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1456 } else { 1468 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1470
1459 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1460 1472
1461 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1474 for 0 .. $#children;
1463 } 1475 }
1464 } 1476 }
1465 1477
1466 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1467 1479
1468 my $pos = 0; 1480 my $pos = 0;
1469 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1471 $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));
1472 1484
1473 $pos += $alloc; 1485 $pos += $alloc;
1474 } 1486 }
1475 1487
1476 1 1488 1
… …
1579 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1580 1592
1581 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1583 1595
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1586 1597
1587 delete $self->{size_req}; 1598 delete $self->{size_req};
1588 $self->realloc; 1599 $self->realloc;
1589 $self->update; 1600 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1597 1608
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1610
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1602 1612
1603 delete $self->{size_req}; 1613 delete $self->{size_req};
1604 $self->realloc; 1614 $self->realloc;
1605 $self->update; 1615 $self->update;
… …
1617 1627
1618 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1619 1629
1620 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1621 $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);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1634
1624 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1625 1636
1626 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
… …
1631 }; 1642 };
1632 1643
1633 @{ $self->{size_req} } 1644 @{ $self->{size_req} }
1634} 1645}
1635 1646
1647sub baseline_shift {
1648 $_[0]{layout}->descent
1649}
1650
1636sub invoke_size_allocate { 1651sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1638 1653
1639 delete $self->{ox}; 1654 delete $self->{ox};
1640 1655
… …
1646 1661
1647sub set_fontsize { 1662sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1649 1664
1650 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1651 delete $self->{texture}; 1667 delete $self->{texture};
1652 1668
1653 $self->realloc; 1669 $self->realloc;
1654} 1670}
1655 1671
1656sub reconfigure { 1672sub reconfigure {
1657 my ($self) = @_; 1673 my ($self) = @_;
1658 1674
1659 delete $self->{size_req}; 1675 delete $self->{size_req};
1676 delete $self->{texture};
1660 1677
1661 $self->SUPER::reconfigure; 1678 $self->SUPER::reconfigure;
1662} 1679}
1663 1680
1664sub _draw { 1681sub _draw {
1665 my ($self) = @_; 1682 my ($self) = @_;
1666 1683
1667 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1668 1685
1669 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1693
1677 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1678 }; 1695 };
1679 1696
1680 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1684 1701
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1705 };
1689 1706
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1709
1695 if ($tex->{format} == GL_ALPHA) { 1710 $self->{layout}->render ($self->{ox}, $self->{oy});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1711}
1706 1712
1707############################################################################# 1713#############################################################################
1708 1714
1709package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
2051 my ($self) = @_; 2057 my ($self) = @_;
2052 2058
2053 (6) x 2 2059 (6) x 2
2054} 2060}
2055 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
2056sub invoke_button_down { 2070sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
2058 2072
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2075 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2076 } else {
2064 return 0 2077 return 0
2065 } 2078 }
2066 2079
2067 1 2080 1
… …
2092package CFClient::UI::Image; 2105package CFClient::UI::Image;
2093 2106
2094our @ISA = CFClient::UI::Base::; 2107our @ISA = CFClient::UI::Base::;
2095 2108
2096use CFClient::OpenGL; 2109use CFClient::OpenGL;
2097use Carp qw/confess/;
2098 2110
2099our %loaded_images; 2111our %texture_cache;
2100 2112
2101sub new { 2113sub new {
2102 my $class = shift; 2114 my $class = shift;
2103 2115
2104 my $self = $class->SUPER::new (can_events => 0, @_); 2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
2105 2120
2106 $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";
2107 2123
2108 $loaded_images{$self->{image}} ||= 2124 $self->{tex} = $texture_cache{$self->{path}} ||=
2109 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;
2110 2126
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2127 Scalar::Util::weaken $texture_cache{$self->{path}};
2112 2128
2113 Scalar::Util::weaken $loaded_images{$self->{image}}; 2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116 2130
2117 $self 2131 $self
2118} 2132}
2119 2133
2120sub size_request { 2134sub size_request {
2121 my ($self) = @_; 2135 my ($self) = @_;
2122 2136
2123 ($self->{tex}->{w}, $self->{tex}->{h}) 2137 ($self->{tex}{w}, $self->{tex}{h})
2124} 2138}
2125 2139
2126sub _draw { 2140sub _draw {
2127 my ($self) = @_; 2141 my ($self) = @_;
2128 2142
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2253
2240 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2241 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);
2242 2259
2243 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
… …
2265 2282
2266 if ($t3) { 2283 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2290 glEnd;
2274 } 2291 }
2275 2292
2276 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
… …
2545 can_events => 0, 2562 can_events => 0,
2546 indent => 0, 2563 indent => 0,
2547 #font => default_font 2564 #font => default_font
2548 @_, 2565 @_,
2549 2566
2550 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2551 par => [], 2568 par => [],
2552 height => 0, 2569 height => 0,
2553 children => [ 2570 children => [
2554 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2566 2583
2567 $self->{fontsize} = $fontsize; 2584 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2585 $self->reflow;
2569} 2586}
2570 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
2571sub invoke_size_allocate { 2597sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 2598 my ($self, $w, $h) = @_;
2573 2599
2600 my ($empty, $slider, @other) = @{ $self->{children} };
2601 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2602
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2603 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2604 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 2605 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2606 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 2607
2579 $self->reflow; 2608 $self->reflow;
2580 2609
2610 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 2611 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 2612}
2583 2613
2584sub text_size { 2614sub get_layout {
2585 my ($self, $text, $indent) = @_; 2615 my ($self, $para) = @_;
2586 2616
2587 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2588 2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2621 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 2622 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $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}}
2593 2630 );
2631
2594 $layout->size 2632 $layout
2595} 2633}
2596 2634
2597sub reflow { 2635sub reflow {
2598 my ($self) = @_; 2636 my ($self) = @_;
2599 2637
… …
2608 $self->{children}[1]->set_value ($offset); 2646 $self->{children}[1]->set_value ($offset);
2609} 2647}
2610 2648
2611sub clear { 2649sub clear {
2612 my ($self) = @_; 2650 my ($self) = @_;
2651
2652 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other;
2613 2654
2614 $self->{par} = []; 2655 $self->{par} = [];
2615 $self->{height} = 0; 2656 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 2658}
2618 2659
2619sub add_paragraph { 2660sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 2661 my ($self, $color, $para, $indent) = @_;
2621 2662
2622 for my $line (split /\n/, $text) { 2663 my ($text, @w) = ref $para ? @$para : $para;
2623 my ($w, $h) = $self->text_size ($line); 2664
2624 $self->{height} += $h; 2665 $para = {
2625 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,
2626 } 2672 };
2627 2673
2628 $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;
2629} 2686}
2630 2687
2631sub update { 2688sub update {
2632 my ($self) = @_; 2689 my ($self) = @_;
2633 2690
… …
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 2699
2643 if (delete $self->{need_reflow}) { 2700 if (delete $self->{need_reflow}) {
2644 my $height = 0; 2701 my $height = 0;
2645 2702
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) { 2703 for my $para (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2652 $layout->set_width ($W - $_->[3]); 2705 my $layout = $self->get_layout ($para);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size; 2706 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3]; 2707
2657 $_->[1] = $h; 2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2658 } 2711 }
2659 2712
2660 $height += $_->[1]; 2713 $height += $para->{h};
2661 } 2714 }
2662 2715
2663 $self->{height} = $height; 2716 $self->{height} = $height;
2664 2717
2665 $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]);
2666 2719
2667 delete $self->{texture}; 2720 delete $self->{texture};
2721 }
2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2668 } 2725 }
2669 2726
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 2728 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 2729 glClear GL_COLOR_BUFFER_BIT;
… …
2676 my $y0 = $top; 2733 my $y0 = $top;
2677 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2678 2735
2679 my $y = 0; 2736 my $y = 0;
2680 2737
2681 my $layout = $self->{layout};
2682
2683 $layout->set_font ($self->{font}) if $self->{font};
2684
2685 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off
2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689 for my $par (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 2739 my $h = $para->{h};
2691 2740
2692 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] });
2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696 $layout->set_markup ($par->[4]);
2697 2742
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2743 my $layout = $self->get_layout ($para);
2699 2744
2700 glRasterPos $par->[3], $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2701 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 }
2702 } 2759 }
2703 2760
2704 $y += $h; 2761 $y += $h;
2705 } 2762 }
2706
2707 glDisable GL_BLEND;
2708 }; 2763 };
2709 }); 2764 });
2765}
2766
2767sub reconfigure {
2768 my ($self) = @_;
2769
2770 $self->SUPER::reconfigure;
2771
2772 $_->{w} = 1e10 for @{ $self->{par} };
2773 $self->reflow;
2710} 2774}
2711 2775
2712sub _draw { 2776sub _draw {
2713 my ($self) = @_; 2777 my ($self) = @_;
2714 2778
… …
2717 glColor 0, 0, 0, 1; 2781 glColor 0, 0, 0, 1;
2718 $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});
2719 glDisable GL_TEXTURE_2D; 2783 glDisable GL_TEXTURE_2D;
2720 2784
2721 $self->{children}[1]->draw; 2785 $self->{children}[1]->draw;
2722
2723} 2786}
2724 2787
2725############################################################################# 2788#############################################################################
2726 2789
2727package CFClient::UI::Animator; 2790package CFClient::UI::Animator;
… …
3000 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
3002 3065
3003 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
3004 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 {
3005 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
3006 can_hover => 1, 3083 can_hover => 1,
3007 can_events => 1, 3084 can_events => 1,
3008 markup => $widget, 3085 markup => $widget,
3009 tooltip => $tooltip 3086 tooltip => $tooltip;
3087 }
3010 } 3088 }
3011 3089
3012 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
3013 3091
3014 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
3081 3159
3082 $self->SUPER::add (@widgets); 3160 $self->SUPER::add (@widgets);
3083 3161
3084 $self->{current} = $self->{children}[0] 3162 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3163 if @{ $self->{children} };
3164}
3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3086} 3170}
3087 3171
3088sub set_current_page { 3172sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3173 my ($self, $page_or_widget) = @_;
3090 3174
… …
3156 tooltip => $tooltip, 3240 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3241 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3242 );
3159 3243
3160 $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
3161} 3251}
3162 3252
3163sub set_current_page { 3253sub set_current_page {
3164 my ($self, $page) = @_; 3254 my ($self, $page) = @_;
3165 3255
… …
3343 count => 1, 3433 count => 1,
3344 %arg, 3434 %arg,
3345 }; 3435 };
3346 } 3436 }
3347 3437
3438 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3439 $self->reorder;
3440 });
3349} 3441}
3350 3442
3351sub reconfigure { 3443sub reconfigure {
3352 my ($self) = @_; 3444 my ($self) = @_;
3353 3445
… …
3368 3460
3369############################################################################# 3461#############################################################################
3370 3462
3371package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3372 3464
3373our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3374 3466
3375sub new { 3467sub new {
3376 my $class = shift; 3468 my $class = shift;
3377 3469
3378 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3380 @_, 3472 @_,
3381 ); 3473 );
3382 3474
3383 $self 3475 $self
3384} 3476}
3385 3477
3386sub set_items { 3478sub set_items {
3387 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3388 3480
3389 $self->{child}->clear; 3481 $self->clear;
3390 return unless $items; 3482 return unless $items;
3391 3483
3392 my @items = sort { 3484 my @items = sort {
3393 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
3395 } @$items; 3487 } values %$items;
3396 3488
3397 $self->{real_items} = \@items; 3489 $self->{real_items} = \@items;
3398 3490
3399 my $row = 0; 3491 my $row = 0;
3400 for my $item (@items) { 3492 for my $item (@items) {
3401 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3402 3494
3403 $self->{child}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3406 3498
3407 $row++; 3499 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 } 3500 }
3607} 3501}
3608 3502
3609############################################################################# 3503#############################################################################
3610 3504
… …
3664 } elsif ($ev->{button} == 2) { 3558 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}"); 3559 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) { 3560 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu 3561 (new CFClient::UI::Menu
3668 items => [ 3562 items => [
3669 ["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}"]) }],
3670 ["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}"]) }],
3671 ], 3565 ],
3672 )->popup ($ev); 3566 )->popup ($ev);
3673 } else { 3567 } else {
3674 return 0; 3568 return 0;

Diff Legend

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