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.320 by root, Tue Jul 4 23:23:32 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
… …
1524 #font => default_font 1536 #font => default_font
1525 #text => initial text 1537 #text => initial text
1526 #markup => initial narkup 1538 #markup => initial narkup
1527 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1528 ellipsise => 3, # end 1540 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1530 fontsize => 1, 1542 fontsize => 1,
1531 align => -1, 1543 align => -1,
1532 valign => -1, 1544 valign => -1,
1533 padding_x => 2, 1545 padding_x => 2,
1534 padding_y => 2, 1546 padding_y => 2,
1535 can_events => 0, 1547 can_events => 0,
1536 %arg 1548 %arg
1537 ); 1549 );
1538 1550
1539 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1541 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1554 $self->{template} = $layout;
1543 } 1555 }
1544 1556
1545 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
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;
… …
1631 }; 1641 };
1632 1642
1633 @{ $self->{size_req} } 1643 @{ $self->{size_req} }
1634} 1644}
1635 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1636sub invoke_size_allocate { 1650sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1638 1652
1639 delete $self->{ox}; 1653 delete $self->{ox};
1640 1654
… …
1646 1660
1647sub set_fontsize { 1661sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1649 1663
1650 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1651 delete $self->{texture}; 1666 delete $self->{texture};
1652 1667
1653 $self->realloc; 1668 $self->realloc;
1654} 1669}
1655 1670
1656sub reconfigure { 1671sub reconfigure {
1657 my ($self) = @_; 1672 my ($self) = @_;
1658 1673
1659 delete $self->{size_req}; 1674 delete $self->{size_req};
1675 delete $self->{texture};
1660 1676
1661 $self->SUPER::reconfigure; 1677 $self->SUPER::reconfigure;
1662} 1678}
1663 1679
1664sub _draw { 1680sub _draw {
1665 my ($self) = @_; 1681 my ($self) = @_;
1666 1682
1667 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1668 1684
1669 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1692
1677 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1678 }; 1694 };
1679 1695
1680 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1684 1700
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1704 };
1689 1705
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1708
1695 if ($tex->{format} == GL_ALPHA) { 1709 $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} 1710}
1706 1711
1707############################################################################# 1712#############################################################################
1708 1713
1709package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
2051 my ($self) = @_; 2056 my ($self) = @_;
2052 2057
2053 (6) x 2 2058 (6) x 2
2054} 2059}
2055 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
2056sub invoke_button_down { 2069sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
2058 2071
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2074 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2075 } else {
2064 return 0 2076 return 0
2065 } 2077 }
2066 2078
2067 1 2079 1
… …
2092package CFClient::UI::Image; 2104package CFClient::UI::Image;
2093 2105
2094our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
2095 2107
2096use CFClient::OpenGL; 2108use CFClient::OpenGL;
2097use Carp qw/confess/;
2098 2109
2099our %loaded_images; 2110our %texture_cache;
2100 2111
2101sub new { 2112sub new {
2102 my $class = shift; 2113 my $class = shift;
2103 2114
2104 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
2105 2119
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
2107 2122
2108 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2110 2125
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
2112 2127
2113 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116 2129
2117 $self 2130 $self
2118} 2131}
2119 2132
2120sub size_request { 2133sub size_request {
2121 my ($self) = @_; 2134 my ($self) = @_;
2122 2135
2123 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
2124} 2137}
2125 2138
2126sub _draw { 2139sub _draw {
2127 my ($self) = @_; 2140 my ($self) = @_;
2128 2141
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2252
2240 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2258
2243 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2265 2281
2266 if ($t3) { 2282 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2289 glEnd;
2274 } 2290 }
2275 2291
2276 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2545 can_events => 0, 2561 can_events => 0,
2546 indent => 0, 2562 indent => 0,
2547 #font => default_font 2563 #font => default_font
2548 @_, 2564 @_,
2549 2565
2550 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2551 par => [], 2567 par => [],
2552 height => 0, 2568 height => 0,
2553 children => [ 2569 children => [
2554 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2566 2582
2567 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2584 $self->reflow;
2569} 2585}
2570 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2571sub invoke_size_allocate { 2596sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2573 2598
2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2601
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 2606
2579 $self->reflow; 2607 $self->reflow;
2580 2608
2609 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 2611}
2583 2612
2584sub text_size { 2613sub get_layout {
2585 my ($self, $text, $indent) = @_; 2614 my ($self, $para) = @_;
2586 2615
2587 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2588 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2593 2629 );
2630
2594 $layout->size 2631 $layout
2595} 2632}
2596 2633
2597sub reflow { 2634sub reflow {
2598 my ($self) = @_; 2635 my ($self) = @_;
2599 2636
… …
2608 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2609} 2646}
2610 2647
2611sub clear { 2648sub clear {
2612 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2613 2653
2614 $self->{par} = []; 2654 $self->{par} = [];
2615 $self->{height} = 0; 2655 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 2657}
2618 2658
2619sub add_paragraph { 2659sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2621 2661
2622 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2623 my ($w, $h) = $self->text_size ($line); 2663
2624 $self->{height} += $h; 2664 $para = {
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2626 } 2671 };
2627 2672
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2629} 2685}
2630 2686
2631sub update { 2687sub update {
2632 my ($self) = @_; 2688 my ($self) = @_;
2633 2689
… …
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 2698
2643 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2644 my $height = 0; 2700 my $height = 0;
2645 2701
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2652 $layout->set_width ($W - $_->[3]); 2704 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; 2705 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3]; 2706
2657 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2658 } 2710 }
2659 2711
2660 $height += $_->[1]; 2712 $height += $para->{h};
2661 } 2713 }
2662 2714
2663 $self->{height} = $height; 2715 $self->{height} = $height;
2664 2716
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2666 2718
2667 delete $self->{texture}; 2719 delete $self->{texture};
2720 }
2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2668 } 2724 }
2669 2725
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 2727 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
… …
2676 my $y0 = $top; 2732 my $y0 = $top;
2677 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2678 2734
2679 my $y = 0; 2735 my $y = 0;
2680 2736
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}}) { 2737 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 2738 my $h = $para->{h};
2691 2739
2692 if ($y0 < $y + $h && $y < $y1) { 2740 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 2741
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2699 2743
2700 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2702 } 2758 }
2703 2759
2704 $y += $h; 2760 $y += $h;
2705 } 2761 }
2706
2707 glDisable GL_BLEND;
2708 }; 2762 };
2709 }); 2763 });
2764}
2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2710} 2773}
2711 2774
2712sub _draw { 2775sub _draw {
2713 my ($self) = @_; 2776 my ($self) = @_;
2714 2777
… …
2717 glColor 0, 0, 0, 1; 2780 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2720 2783
2721 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2722
2723} 2785}
2724 2786
2725############################################################################# 2787#############################################################################
2726 2788
2727package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
3083 3145
3084 $self->{current} = $self->{children}[0] 3146 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3147 if @{ $self->{children} };
3086} 3148}
3087 3149
3150sub get_current_page {
3151 my ($self) = @_;
3152
3153 $self->{current}
3154}
3155
3088sub set_current_page { 3156sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3157 my ($self, $page_or_widget) = @_;
3090 3158
3091 my $widget = ref $page_or_widget 3159 my $widget = ref $page_or_widget
3092 ? $page_or_widget 3160 ? $page_or_widget
… …
3156 tooltip => $tooltip, 3224 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3225 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3226 );
3159 3227
3160 $self->{multiplexer}->add ($widget); 3228 $self->{multiplexer}->add ($widget);
3229}
3230
3231sub get_current_page {
3232 my ($self) = @_;
3233
3234 $self->{multiplexer}->get_current_page
3161} 3235}
3162 3236
3163sub set_current_page { 3237sub set_current_page {
3164 my ($self, $page) = @_; 3238 my ($self, $page) = @_;
3165 3239
… …
3343 count => 1, 3417 count => 1,
3344 %arg, 3418 %arg,
3345 }; 3419 };
3346 } 3420 }
3347 3421
3422 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3423 $self->reorder;
3424 });
3349} 3425}
3350 3426
3351sub reconfigure { 3427sub reconfigure {
3352 my ($self) = @_; 3428 my ($self) = @_;
3353 3429
… …
3368 3444
3369############################################################################# 3445#############################################################################
3370 3446
3371package CFClient::UI::Inventory; 3447package CFClient::UI::Inventory;
3372 3448
3373our @ISA = CFClient::UI::ScrolledWindow::; 3449our @ISA = CFClient::UI::Table::;
3374 3450
3375sub new { 3451sub new {
3376 my $class = shift; 3452 my $class = shift;
3377 3453
3378 my $self = $class->SUPER::new ( 3454 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3455 col_expand => [0, 1, 0],
3380 @_, 3456 @_,
3381 ); 3457 );
3382 3458
3383 $self 3459 $self
3384} 3460}
3385 3461
3386sub set_items { 3462sub set_items {
3387 my ($self, $items) = @_; 3463 my ($self, $items) = @_;
3388 3464
3389 $self->{child}->clear; 3465 $self->clear;
3390 return unless $items; 3466 return unless $items;
3391 3467
3392 my @items = sort { 3468 my @items = sort {
3393 ($a->{type} <=> $b->{type}) 3469 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name}) 3470 or ($a->{name} cmp $b->{name})
3395 } @$items; 3471 } values %$items;
3396 3472
3397 $self->{real_items} = \@items; 3473 $self->{real_items} = \@items;
3398 3474
3399 my $row = 0; 3475 my $row = 0;
3400 for my $item (@items) { 3476 for my $item (@items) {
3401 CFClient::Item::update_widgets $item; 3477 CFClient::Item::update_widgets $item;
3402 3478
3403 $self->{child}->add (0, $row, $item->{face_widget}); 3479 $self->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget}); 3480 $self->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget}); 3481 $self->add (2, $row, $item->{weight_widget});
3406 3482
3407 $row++; 3483 $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 } 3484 }
3607} 3485}
3608 3486
3609############################################################################# 3487#############################################################################
3610 3488
… …
3664 } elsif ($ev->{button} == 2) { 3542 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}"); 3543 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) { 3544 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu 3545 (new CFClient::UI::Menu
3668 items => [ 3546 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3547 ["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}"]) }], 3548 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ], 3549 ],
3672 )->popup ($ev); 3550 )->popup ($ev);
3673 } else { 3551 } else {
3674 return 0; 3552 return 0;
… …
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 3837 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 3838 (0, 0, $self->{w}, $self->{h});
3961 } 3839 }
3962 3840
3963 $self->_draw; 3841 $self->_draw;
3842
3843 #TODO#d# display texture cache
3844 {
3845 glEnable GL_TEXTURE_2D;
3846 glBindTexture GL_TEXTURE_2D, 41;
3847 glColor 1, 1, 1, 1;
3848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
3849 glEnable GL_BLEND;
3850 glBlendFunc GL_SRC_ALPHA, GL_ZERO;
3851 glBegin GL_QUADS;
3852 glTexCoord 0,1; glVertex 0,0;
3853 glTexCoord 1,1; glVertex 255,0;
3854 glTexCoord 1,0; glVertex 255,255;
3855 glTexCoord 0,0; glVertex 0,255;
3856 glEnd;
3857 glDisable GL_BLEND;
3858 glDisable GL_TEXTURE_2D;
3859 }
3860
3964} 3861}
3965 3862
3966############################################################################# 3863#############################################################################
3967 3864
3968package CFClient::UI; 3865package CFClient::UI;

Diff Legend

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