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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC

… …
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338} 338}
339 339
340sub baseline_shift {
341 0
342}
343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
343 if ($self->{aspect}) { 347 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 348 my ($ow, $oh) = ($w, $h);
… …
419 my ($self) = @_; 423 my ($self) = @_;
420 424
421 return if $FOCUS == $self; 425 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
423 427
424 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
425 429
426 $focus->update if $focus; 430 $self->update;
427 $FOCUS->update;
428 431
429 0 432 0
430} 433}
431 434
432sub invoke_focus_out { 435sub invoke_focus_out {
433 my ($self) = @_; 436 my ($self) = @_;
434 437
435 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
436 439
437 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
438 441
439 $focus->update if $focus; #? 442 $self->update;
440 443
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 445 unless $FOCUS;
443 446
444 0 447 0
445} 448}
446 449
447sub grab_focus { 450sub grab_focus {
448 my ($self) = @_; 451 my ($self) = @_;
449 452
453 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 454 $self->emit ("focus_in");
451} 455}
452 456
453sub invoke_mouse_motion { 1 } 457sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 458sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 459sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 460sub invoke_key_up { 0 }
457 461
458sub invoke_button_down { 462sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
460 464
461 $self->grab_focus; 465 $self->grab_focus;
462 466
463 1 467 0
464} 468}
465 469
466sub connect { 470sub connect {
467 my ($self, $signal, $cb) = @_; 471 my ($self, $signal, $cb) = @_;
468 472
469 push @{ $self->{signal_cb}{$signal} }, $cb; 473 push @{ $self->{signal_cb}{$signal} }, $cb;
470} 474}
471 475
472sub emit { 476sub emit {
473 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
478
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
474 480
475 #d##TODO# stop propagating at first true, do not use sum 481 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
… …
535 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
536 542
537 # update screen rectangle 543 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 546
543 # skip widgets that are entirely outside the drawing area 547 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 550
… …
585} 589}
586 590
587sub DESTROY { 591sub DESTROY {
588 my ($self) = @_; 592 my ($self) = @_;
589 593
594 return if CFClient::in_destruct;
595
590 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
591 597
592 eval { $self->destroy }; 598 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 600}
… …
984 $self->add ($child) if $child; 990 $self->add ($child) if $child;
985 991
986 $self 992 $self
987} 993}
988 994
995#TODO# update range on size_allocate depending on child
996
989sub add { 997sub add {
990 my ($self, $widget) = @_; 998 my ($self, $widget) = @_;
991 999
992 $self->{vp}->add ($self->{child} = $widget); 1000 $self->{vp}->add ($self->{child} = $widget);
993} 1001}
994 1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
995sub update { 1017sub update {
996 my ($self) = @_; 1018 my ($self) = @_;
997 1019
998 $self->SUPER::update; 1020 $self->SUPER::update;
999 1021
1000 # todo: overwrite size_allocate of child 1022 $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} 1023}
1004 1024
1005sub invoke_size_allocate { 1025sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
1007 1027
1008 my $child = $self->{vp}->child; 1028 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1029
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1030 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1031}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1032
1017############################################################################# 1033#############################################################################
1018 1034
1019package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1020 1036
… …
1076 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1095 border => 0.6,
1080 can_events => 1, 1096 can_events => 1,
1081 min_w => 16, 1097 min_w => 64,
1082 min_h => 16, 1098 min_h => 32,
1083 %arg, 1099 %arg,
1084 ); 1100 );
1085 1101
1086 $self->{title_widget} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1103 align => 0,
… …
1092 1108
1093 if ($self->{has_close_button}) { 1109 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1110 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1111 new CFClient::UI::ImageButton
1096 path => 'x1_close.png', 1112 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1113 on_activate => sub { $self->emit ("delete") };
1098 1114
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1115 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1116 }
1101 1117
1102 $self 1118 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
1149 1165
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1167 if $self->{close_button};
1152 1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1176
1153 1 1177 1
1154} 1178}
1155 1179
1156sub invoke_button_down { 1180sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
… …
1579 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1580 1604
1581 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1583 1607
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1586 1609
1587 delete $self->{size_req}; 1610 delete $self->{size_req};
1588 $self->realloc; 1611 $self->realloc;
1589 $self->update; 1612 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1597 1620
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1622
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1602 1624
1603 delete $self->{size_req}; 1625 delete $self->{size_req};
1604 $self->realloc; 1626 $self->realloc;
1605 $self->update; 1627 $self->update;
… …
1617 1639
1618 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1619 1641
1620 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1646
1624 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1625 1648
1626 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
… …
1631 }; 1654 };
1632 1655
1633 @{ $self->{size_req} } 1656 @{ $self->{size_req} }
1634} 1657}
1635 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1636sub invoke_size_allocate { 1663sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1638 1665
1639 delete $self->{ox}; 1666 delete $self->{ox};
1640 1667
… …
1646 1673
1647sub set_fontsize { 1674sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1649 1676
1650 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1651 delete $self->{texture}; 1679 delete $self->{texture};
1652 1680
1653 $self->realloc; 1681 $self->realloc;
1654} 1682}
1655 1683
1656sub reconfigure { 1684sub reconfigure {
1657 my ($self) = @_; 1685 my ($self) = @_;
1658 1686
1659 delete $self->{size_req}; 1687 delete $self->{size_req};
1688 delete $self->{texture};
1660 1689
1661 $self->SUPER::reconfigure; 1690 $self->SUPER::reconfigure;
1662} 1691}
1663 1692
1664sub _draw { 1693sub _draw {
1665 my ($self) = @_; 1694 my ($self) = @_;
1666 1695
1667 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1668 1697
1669 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1705
1677 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1678 }; 1707 };
1679 1708
1680 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1684 1713
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1717 };
1689 1718
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1721
1695 if ($tex->{format} == GL_ALPHA) { 1722 $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} 1723}
1706 1724
1707############################################################################# 1725#############################################################################
1708 1726
1709package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1820 1838
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1840
1823 # byte-index to char-index 1841 # byte-index to char-index
1824 my $text = $self->{text}; 1842 my $text = $self->{text};
1825 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1827 1845
1828 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1829 $self->update; 1847 $self->update;
1830 1848
1831 1 1849 1
… …
2051 my ($self) = @_; 2069 my ($self) = @_;
2052 2070
2053 (6) x 2 2071 (6) x 2
2054} 2072}
2055 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
2056sub invoke_button_down { 2082sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
2058 2084
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2087 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2088 } else {
2064 return 0 2089 return 0
2065 } 2090 }
2066 2091
2067 1 2092 1
… …
2103 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
2104 can_events => 0, 2129 can_events => 0,
2105 @_, 2130 @_,
2106 ); 2131 );
2107 2132
2108 $self->{path} 2133 $self->{path} || $self->{tex}
2109 or Carp::croak "required attribute 'path' not set"; 2134 or Carp::croak "'path' or 'tex' attributes required";
2110 2135
2111 $self->{tex} = $texture_cache{$self->{path}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2138
2114 Scalar::Util::weaken $texture_cache{$self->{path}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2140
2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2265
2241 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2271
2244 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
… …
2266 2294
2267 if ($t3) { 2295 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2302 glEnd;
2275 } 2303 }
2276 2304
2277 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2546 can_events => 0, 2574 can_events => 0,
2547 indent => 0, 2575 indent => 0,
2548 #font => default_font 2576 #font => default_font
2549 @_, 2577 @_,
2550 2578
2551 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2552 par => [], 2580 par => [],
2553 height => 0, 2581 height => 0,
2554 children => [ 2582 children => [
2555 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2567 2595
2568 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2569 $self->reflow; 2597 $self->reflow;
2570} 2598}
2571 2599
2572sub visible_children { 2600sub size_request {
2573 my ($self) = @_; 2601 my ($self) = @_;
2574 2602
2575 @{$self->{children}}[0,1] 2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2576} 2607}
2577 2608
2578sub invoke_size_allocate { 2609sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2580 2611
2581 my (undef, undef, @other) = @{ $self->{children} }; 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 2614
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 2619
2589 $self->reflow; 2620 $self->reflow;
2590 2621
2622 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2592} 2624}
2593 2625
2594sub get_layout { 2626sub get_layout {
2595 my ($self, $para) = @_; 2627 my ($self, $para) = @_;
2596 2628
2597 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2598 2630
2599 $layout->set_font ($self->{font}) if $self->{font}; 2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 2636 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 2637
2638 $layout->set_shapes (
2639 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}}
2642 );
2605 2643
2606 $layout 2644 $layout
2607} 2645}
2608 2646
2609sub reflow { 2647sub reflow {
… …
2677 for my $para (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para); 2717 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2681 2719
2682 $para->{w} = $w + $para->{indent}; 2720 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h; 2721 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped; 2722 $para->{wrapped} = $layout->has_wrapped;
2685 } 2723 }
2686 2724
2687 $height += $para->{h}; 2725 $height += $para->{h};
2688 } 2726 }
… …
2707 my $y0 = $top; 2745 my $y0 = $top;
2708 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2709 2747
2710 my $y = 0; 2748 my $y = 0;
2711 2749
2712 glEnable GL_BLEND;
2713 #TODO# not correct in windows where rgba is forced off
2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716 for my $para (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 2751 my $h = $para->{h};
2718 2752
2719 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2720 2754
2721 my $layout = $self->get_layout ($para); 2755 my $layout = $self->get_layout ($para);
2722 2756
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 2758
2728 if (my @w = @{ $para->{widget} }) { 2759 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 2760 my @s = $layout->get_shapes;
2730 2761
2731 for (@w) { 2762 for (@w) {
… …
2739 } 2770 }
2740 } 2771 }
2741 2772
2742 $y += $h; 2773 $y += $h;
2743 } 2774 }
2744
2745 glDisable GL_BLEND;
2746 }; 2775 };
2747 }); 2776 });
2748} 2777}
2749 2778
2750sub reconfigure { 2779sub reconfigure {
… …
3046 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
3048 3077
3049 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
3050 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
3051 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
3052 can_hover => 1, 3095 can_hover => 1,
3053 can_events => 1, 3096 can_events => 1,
3054 markup => $widget, 3097 markup => $widget,
3055 tooltip => $tooltip 3098 tooltip => $tooltip;
3099 }
3056 } 3100 }
3057 3101
3058 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
3059 3103
3060 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
3127 3171
3128 $self->SUPER::add (@widgets); 3172 $self->SUPER::add (@widgets);
3129 3173
3130 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3175 if @{ $self->{children} };
3176}
3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3132} 3182}
3133 3183
3134sub set_current_page { 3184sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
3136 3186
… …
3202 tooltip => $tooltip, 3252 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3253 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3254 );
3205 3255
3206 $self->{multiplexer}->add ($widget); 3256 $self->{multiplexer}->add ($widget);
3257}
3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3207} 3263}
3208 3264
3209sub set_current_page { 3265sub set_current_page {
3210 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3211 3267
… …
3389 count => 1, 3445 count => 1,
3390 %arg, 3446 %arg,
3391 }; 3447 };
3392 } 3448 }
3393 3449
3450 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3451 $self->reorder;
3452 });
3395} 3453}
3396 3454
3397sub reconfigure { 3455sub reconfigure {
3398 my ($self) = @_; 3456 my ($self) = @_;
3399 3457
… …
3414 3472
3415############################################################################# 3473#############################################################################
3416 3474
3417package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3418 3476
3419our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3420 3478
3421sub new { 3479sub new {
3422 my $class = shift; 3480 my $class = shift;
3423 3481
3424 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3426 @_, 3484 @_,
3427 ); 3485 );
3428 3486
3429 $self 3487 $self
3430} 3488}
3431 3489
3432sub set_items { 3490sub set_items {
3433 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3434 3492
3435 $self->{child}->clear; 3493 $self->clear;
3436 return unless $items; 3494 return unless $items;
3437 3495
3438 my @items = sort { 3496 my @items = sort {
3439 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3441 } @$items; 3499 } values %$items;
3442 3500
3443 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3444 3502
3445 my $row = 0; 3503 my $row = 0;
3446 for my $item (@items) { 3504 for my $item (@items) {
3447 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3448 3506
3449 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3452 3510
3453 $row++; 3511 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 } 3512 }
3663} 3513}
3664 3514
3665############################################################################# 3515#############################################################################
3666 3516
… …
3720 } elsif ($ev->{button} == 2) { 3570 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}"); 3571 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) { 3572 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu 3573 (new CFClient::UI::Menu
3724 items => [ 3574 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ], 3577 ],
3728 )->popup ($ev); 3578 )->popup ($ev);
3729 } else { 3579 } else {
3730 return 0; 3580 return 0;
… …
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 3827
3978 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3980 3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836
3981 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3982 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3983 3839
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w}; 3841 $widget->{old_w} = $widget->{w};

Diff Legend

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