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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.306 by root, Sun Jun 18 17:39:36 2006 UTC vs.
Revision 1.322 by root, Wed Jul 5 01:53:24 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
… …
1523 #font => default_font 1536 #font => default_font
1524 #text => initial text 1537 #text => initial text
1525 #markup => initial narkup 1538 #markup => initial narkup
1526 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1527 ellipsise => 3, # end 1540 ellipsise => 3, # end
1528 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1529 fontsize => 1, 1542 fontsize => 1,
1530 align => -1, 1543 align => -1,
1531 valign => -1, 1544 valign => -1,
1532 padding_x => 2, 1545 padding_x => 2,
1533 padding_y => 2, 1546 padding_y => 2,
1534 can_events => 0, 1547 can_events => 0,
1535 %arg 1548 %arg
1536 ); 1549 );
1537 1550
1538 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1539 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1540 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1541 $self->{template} = $layout; 1554 $self->{template} = $layout;
1542 } 1555 }
1543 1556
1544 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
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;
… …
1630 }; 1641 };
1631 1642
1632 @{ $self->{size_req} } 1643 @{ $self->{size_req} }
1633} 1644}
1634 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1635sub invoke_size_allocate { 1650sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1637 1652
1638 delete $self->{ox}; 1653 delete $self->{ox};
1639 1654
… …
1645 1660
1646sub set_fontsize { 1661sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1648 1663
1649 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1650 delete $self->{texture}; 1666 delete $self->{texture};
1651 1667
1652 $self->realloc; 1668 $self->realloc;
1653} 1669}
1654 1670
1655sub reconfigure { 1671sub reconfigure {
1656 my ($self) = @_; 1672 my ($self) = @_;
1657 1673
1658 delete $self->{size_req}; 1674 delete $self->{size_req};
1675 delete $self->{texture};
1659 1676
1660 $self->SUPER::reconfigure; 1677 $self->SUPER::reconfigure;
1661} 1678}
1662 1679
1663sub _draw { 1680sub _draw {
1664 my ($self) = @_; 1681 my ($self) = @_;
1665 1682
1666 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1667 1684
1668 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 1692
1676 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1677 }; 1694 };
1678 1695
1679 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1683 1700
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 1704 };
1688 1705
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 1708
1694 if ($tex->{format} == GL_ALPHA) { 1709 $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} 1710}
1705 1711
1706############################################################################# 1712#############################################################################
1707 1713
1708package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
2050 my ($self) = @_; 2056 my ($self) = @_;
2051 2057
2052 (6) x 2 2058 (6) x 2
2053} 2059}
2054 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
2055sub invoke_button_down { 2069sub invoke_button_down {
2056 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
2057 2071
2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2060 $self->{state} = !$self->{state}; 2074 $self->toggle;
2061 $self->emit (changed => $self->{state});
2062 } else { 2075 } else {
2063 return 0 2076 return 0
2064 } 2077 }
2065 2078
2066 1 2079 1
… …
2091package CFClient::UI::Image; 2104package CFClient::UI::Image;
2092 2105
2093our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
2094 2107
2095use CFClient::OpenGL; 2108use CFClient::OpenGL;
2096use Carp qw/confess/;
2097 2109
2098our %loaded_images; 2110our %texture_cache;
2099 2111
2100sub new { 2112sub new {
2101 my $class = shift; 2113 my $class = shift;
2102 2114
2103 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
2104 2119
2105 $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";
2106 2122
2107 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
2108 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;
2109 2125
2110 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
2111 2127
2112 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2113
2114 $self->{aspect} = $tex->{w} / $tex->{h};
2115 2129
2116 $self 2130 $self
2117} 2131}
2118 2132
2119sub size_request { 2133sub size_request {
2120 my ($self) = @_; 2134 my ($self) = @_;
2121 2135
2122 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
2123} 2137}
2124 2138
2125sub _draw { 2139sub _draw {
2126 my ($self) = @_; 2140 my ($self) = @_;
2127 2141
… …
2236 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2237 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2238 2252
2239 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2240 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);
2241 2258
2242 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2264 2281
2265 if ($t3) { 2282 if ($t3) {
2266 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2267 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2268 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272 glEnd; 2289 glEnd;
2273 } 2290 }
2274 2291
2275 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2410 2427
2411 $self->SUPER::invoke_button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2412 2429
2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2414 2431
2415 $self->mouse_motion ($ev, $x, $y) 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2416} 2433}
2417 2434
2418sub invoke_mouse_motion { 2435sub invoke_mouse_motion {
2419 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2420 2437
… …
2544 can_events => 0, 2561 can_events => 0,
2545 indent => 0, 2562 indent => 0,
2546 #font => default_font 2563 #font => default_font
2547 @_, 2564 @_,
2548 2565
2549 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2550 par => [], 2567 par => [],
2551 height => 0, 2568 height => 0,
2552 children => [ 2569 children => [
2553 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2554 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2565 2582
2566 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2567 $self->reflow; 2584 $self->reflow;
2568} 2585}
2569 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
2570sub invoke_size_allocate { 2596sub invoke_size_allocate {
2571 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2572 2598
2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2601
2573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577 2606
2578 $self->reflow; 2607 $self->reflow;
2579 2608
2609 local $self->{children} = [$empty, $slider];
2580 $self->SUPER::invoke_size_allocate ($w, $h) 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2581} 2611}
2582 2612
2583sub text_size { 2613sub get_layout {
2584 my ($self, $text, $indent) = @_; 2614 my ($self, $para) = @_;
2585 2615
2586 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2587 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591 $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}}
2592 2629 );
2630
2593 $layout->size 2631 $layout
2594} 2632}
2595 2633
2596sub reflow { 2634sub reflow {
2597 my ($self) = @_; 2635 my ($self) = @_;
2598 2636
… …
2607 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2608} 2646}
2609 2647
2610sub clear { 2648sub clear {
2611 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2612 2653
2613 $self->{par} = []; 2654 $self->{par} = [];
2614 $self->{height} = 0; 2655 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616} 2657}
2617 2658
2618sub add_paragraph { 2659sub add_paragraph {
2619 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2620 2661
2621 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2622 my ($w, $h) = $self->text_size ($line); 2663
2623 $self->{height} += $h; 2664 $para = {
2624 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,
2625 } 2671 };
2626 2672
2627 $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;
2628} 2685}
2629 2686
2630sub update { 2687sub update {
2631 my ($self) = @_; 2688 my ($self) = @_;
2632 2689
… …
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641 2698
2642 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2643 my $height = 0; 2700 my $height = 0;
2644 2701
2645 my $layout = $self->{layout};
2646
2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2651 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653 $layout->set_markup ($_->[4]);
2654 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2655 $_->[0] = $w + $_->[3]; 2706
2656 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2657 } 2710 }
2658 2711
2659 $height += $_->[1]; 2712 $height += $para->{h};
2660 } 2713 }
2661 2714
2662 $self->{height} = $height; 2715 $self->{height} = $height;
2663 2716
2664 $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]);
2665 2718
2666 delete $self->{texture}; 2719 delete $self->{texture};
2720 }
2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2667 } 2724 }
2668 2725
2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2670 glClearColor 0, 0, 0, 0; 2727 glClearColor 0, 0, 0, 0;
2671 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
… …
2675 my $y0 = $top; 2732 my $y0 = $top;
2676 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2677 2734
2678 my $y = 0; 2735 my $y = 0;
2679 2736
2680 my $layout = $self->{layout};
2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683
2684 glEnable GL_BLEND;
2685 #TODO# not correct in windows where rgba is forced off
2686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687
2688 for my $par (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2689 my $h = $par->[1]; 2738 my $h = $para->{h};
2690 2739
2691 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2692 $layout->set_foreground (@{ $par->[2] });
2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2695 $layout->set_markup ($par->[4]);
2696 2741
2697 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2698 2743
2699 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2700 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 }
2701 } 2758 }
2702 2759
2703 $y += $h; 2760 $y += $h;
2704 } 2761 }
2705
2706 glDisable GL_BLEND;
2707 }; 2762 };
2708 }); 2763 });
2764}
2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2709} 2773}
2710 2774
2711sub _draw { 2775sub _draw {
2712 my ($self) = @_; 2776 my ($self) = @_;
2713 2777
… …
2716 glColor 0, 0, 0, 1; 2780 glColor 0, 0, 0, 1;
2717 $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});
2718 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2719 2783
2720 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2721
2722} 2785}
2723 2786
2724############################################################################# 2787#############################################################################
2725 2788
2726package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2999 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
3000 my ($widget, $cb, $tooltip) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
3001 3064
3002 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
3003 if (!ref $widget) { 3066 if (!ref $widget) {
3067 if ($widget =~ /\t/) {
3068 my ($left, $right) = split /\t/, $widget, 2;
3069
3070 $widget = new CFClient::UI::HBox
3071 can_hover => 1,
3072 can_events => 1,
3073 tooltip => $tooltip,
3074 children => [
3075 (new CFClient::UI::Label markup => $left, expand => 1),
3076 (new CFClient::UI::Label markup => $right, align => +1),
3077 ],
3078 ;
3079
3080 } else {
3004 $widget = new CFClient::UI::Label 3081 $widget = new CFClient::UI::Label
3005 can_hover => 1, 3082 can_hover => 1,
3006 can_events => 1, 3083 can_events => 1,
3007 markup => $widget, 3084 markup => $widget,
3008 tooltip => $tooltip 3085 tooltip => $tooltip;
3086 }
3009 } 3087 }
3010 3088
3011 $self->{item}{$widget} = $item; 3089 $self->{item}{$widget} = $item;
3012 3090
3013 $self->{vbox}->add ($widget); 3091 $self->{vbox}->add ($widget);
… …
3080 3158
3081 $self->SUPER::add (@widgets); 3159 $self->SUPER::add (@widgets);
3082 3160
3083 $self->{current} = $self->{children}[0] 3161 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} }; 3162 if @{ $self->{children} };
3163}
3164
3165sub get_current_page {
3166 my ($self) = @_;
3167
3168 $self->{current}
3085} 3169}
3086 3170
3087sub set_current_page { 3171sub set_current_page {
3088 my ($self, $page_or_widget) = @_; 3172 my ($self, $page_or_widget) = @_;
3089 3173
… …
3155 tooltip => $tooltip, 3239 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) }, 3240 on_activate => sub { $self->set_current_page ($widget) },
3157 ); 3241 );
3158 3242
3159 $self->{multiplexer}->add ($widget); 3243 $self->{multiplexer}->add ($widget);
3244}
3245
3246sub get_current_page {
3247 my ($self) = @_;
3248
3249 $self->{multiplexer}->get_current_page
3160} 3250}
3161 3251
3162sub set_current_page { 3252sub set_current_page {
3163 my ($self, $page) = @_; 3253 my ($self, $page) = @_;
3164 3254
… …
3342 count => 1, 3432 count => 1,
3343 %arg, 3433 %arg,
3344 }; 3434 };
3345 } 3435 }
3346 3436
3437 $ROOT->on_refresh (reorder => sub {
3347 $self->reorder; 3438 $self->reorder;
3439 });
3348} 3440}
3349 3441
3350sub reconfigure { 3442sub reconfigure {
3351 my ($self) = @_; 3443 my ($self) = @_;
3352 3444
… …
3367 3459
3368############################################################################# 3460#############################################################################
3369 3461
3370package CFClient::UI::Inventory; 3462package CFClient::UI::Inventory;
3371 3463
3372our @ISA = CFClient::UI::ScrolledWindow::; 3464our @ISA = CFClient::UI::Table::;
3373 3465
3374sub new { 3466sub new {
3375 my $class = shift; 3467 my $class = shift;
3376 3468
3377 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3470 col_expand => [0, 1, 0],
3379 @_, 3471 @_,
3380 ); 3472 );
3381 3473
3382 $self 3474 $self
3383} 3475}
3384 3476
3385sub set_items { 3477sub set_items {
3386 my ($self, $items) = @_; 3478 my ($self, $items) = @_;
3387 3479
3388 $self->{child}->clear; 3480 $self->clear;
3389 return unless $items; 3481 return unless $items;
3390 3482
3391 my @items = sort { 3483 my @items = sort {
3392 ($a->{type} <=> $b->{type}) 3484 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name}) 3485 or ($a->{name} cmp $b->{name})
3394 } @$items; 3486 } values %$items;
3395 3487
3396 $self->{real_items} = \@items; 3488 $self->{real_items} = \@items;
3397 3489
3398 my $row = 0; 3490 my $row = 0;
3399 for my $item (@items) { 3491 for my $item (@items) {
3400 CFClient::Item::update_widgets $item; 3492 CFClient::Item::update_widgets $item;
3401 3493
3402 $self->{child}->add (0, $row, $item->{face_widget}); 3494 $self->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget}); 3495 $self->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget}); 3496 $self->add (2, $row, $item->{weight_widget});
3405 3497
3406 $row++; 3498 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 } 3499 }
3606} 3500}
3607 3501
3608############################################################################# 3502#############################################################################
3609 3503
… …
3663 } elsif ($ev->{button} == 2) { 3557 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}"); 3558 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) { 3559 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu 3560 (new CFClient::UI::Menu
3667 items => [ 3561 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3562 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3563 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ], 3564 ],
3671 )->popup ($ev); 3565 )->popup ($ev);
3672 } else { 3566 } else {
3673 return 0; 3567 return 0;

Diff Legend

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