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.328 by root, Sat Jul 22 13:43:05 2006 UTC

… …
82} 82}
83 83
84sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
85 my ($ev) = @_; 85 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
87
88 warn "button down $ev->{button}\n";#d#
87 89
88 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
90 92
91 $GRAB = $widget; 93 $GRAB = $widget;
… …
335sub size_request { 337sub size_request {
336 require Carp; 338 require Carp;
337 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
338} 340}
339 341
342sub baseline_shift {
343 0
344}
345
340sub configure { 346sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
342 348
343 if ($self->{aspect}) { 349 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 350 my ($ow, $oh) = ($w, $h);
… …
419 my ($self) = @_; 425 my ($self) = @_;
420 426
421 return if $FOCUS == $self; 427 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
423 429
424 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
425 431
426 $focus->update if $focus; 432 $self->update;
427 $FOCUS->update;
428 433
429 0 434 0
430} 435}
431 436
432sub invoke_focus_out { 437sub invoke_focus_out {
433 my ($self) = @_; 438 my ($self) = @_;
434 439
435 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
436 441
437 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
438 443
439 $focus->update if $focus; #? 444 $self->update;
440 445
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 447 unless $FOCUS;
443 448
444 0 449 0
445} 450}
446 451
447sub grab_focus { 452sub grab_focus {
448 my ($self) = @_; 453 my ($self) = @_;
449 454
455 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 456 $self->emit ("focus_in");
451} 457}
452 458
453sub invoke_mouse_motion { 1 } 459sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 460sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 461sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 462sub invoke_key_up { 0 }
457 463
458sub invoke_button_down { 464sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
460 466
461 $self->grab_focus; 467 $self->grab_focus;
462 468
469 warn "button down $ev->{button} $x $y\n";#d#
470
463 1 471 0
464} 472}
465 473
466sub connect { 474sub connect {
467 my ($self, $signal, $cb) = @_; 475 my ($self, $signal, $cb) = @_;
468 476
… …
535 return unless $self->{h} && $self->{w}; 543 return unless $self->{h} && $self->{w};
536 544
537 # update screen rectangle 545 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 546 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 547 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 548
543 # skip widgets that are entirely outside the drawing area 549 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 552
… …
585} 591}
586 592
587sub DESTROY { 593sub DESTROY {
588 my ($self) = @_; 594 my ($self) = @_;
589 595
596 return if CFClient::in_destruct;
597
590 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
591 599
592 eval { $self->destroy }; 600 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 602}
… …
984 $self->add ($child) if $child; 992 $self->add ($child) if $child;
985 993
986 $self 994 $self
987} 995}
988 996
997#TODO# update range on size_allocate depending on child
998
989sub add { 999sub add {
990 my ($self, $widget) = @_; 1000 my ($self, $widget) = @_;
991 1001
992 $self->{vp}->add ($self->{child} = $widget); 1002 $self->{vp}->add ($self->{child} = $widget);
993} 1003}
994 1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
995sub update { 1019sub update {
996 my ($self) = @_; 1020 my ($self) = @_;
997 1021
998 $self->SUPER::update; 1022 $self->SUPER::update;
999 1023
1000 # todo: overwrite size_allocate of child 1024 $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} 1025}
1004 1026
1005sub invoke_size_allocate { 1027sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1028 my ($self, $w, $h) = @_;
1007 1029
1008 my $child = $self->{vp}->child; 1030 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1031
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1032 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1033}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1034
1017############################################################################# 1035#############################################################################
1018 1036
1019package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
1020 1038
… …
1076 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1097 border => 0.6,
1080 can_events => 1, 1098 can_events => 1,
1081 min_w => 16, 1099 min_w => 64,
1082 min_h => 16, 1100 min_h => 32,
1083 %arg, 1101 %arg,
1084 ); 1102 );
1085 1103
1086 $self->{title_widget} = new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1105 align => 0,
… …
1092 1110
1093 if ($self->{has_close_button}) { 1111 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1112 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1113 new CFClient::UI::ImageButton
1096 path => 'x1_close.png', 1114 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1115 on_activate => sub { $self->emit ("delete") };
1098 1116
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1117 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1118 }
1101 1119
1102 $self 1120 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
1149 1167
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1169 if $self->{close_button};
1152 1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1178
1153 1 1179 1
1154} 1180}
1155 1181
1156sub invoke_button_down { 1182sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
… …
1579 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1580 1606
1581 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1583 1609
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1586 1611
1587 delete $self->{size_req}; 1612 delete $self->{size_req};
1588 $self->realloc; 1613 $self->realloc;
1589 $self->update; 1614 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1597 1622
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1624
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1602 1626
1603 delete $self->{size_req}; 1627 delete $self->{size_req};
1604 $self->realloc; 1628 $self->realloc;
1605 $self->update; 1629 $self->update;
… …
1617 1641
1618 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1619 1643
1620 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1648
1624 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1625 1650
1626 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
… …
1631 }; 1656 };
1632 1657
1633 @{ $self->{size_req} } 1658 @{ $self->{size_req} }
1634} 1659}
1635 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1636sub invoke_size_allocate { 1665sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1638 1667
1639 delete $self->{ox}; 1668 delete $self->{ox};
1640 1669
… …
1646 1675
1647sub set_fontsize { 1676sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1649 1678
1650 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1651 delete $self->{texture}; 1681 delete $self->{texture};
1652 1682
1653 $self->realloc; 1683 $self->realloc;
1654} 1684}
1655 1685
1656sub reconfigure { 1686sub reconfigure {
1657 my ($self) = @_; 1687 my ($self) = @_;
1658 1688
1659 delete $self->{size_req}; 1689 delete $self->{size_req};
1690 delete $self->{texture};
1660 1691
1661 $self->SUPER::reconfigure; 1692 $self->SUPER::reconfigure;
1662} 1693}
1663 1694
1664sub _draw { 1695sub _draw {
1665 my ($self) = @_; 1696 my ($self) = @_;
1666 1697
1667 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1668 1699
1669 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1707
1677 new_from_layout CFClient::Texture $self->{layout} 1708 [$self->{layout}->size]
1678 }; 1709 };
1679 1710
1680 unless (exists $self->{ox}) { 1711 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1684 1715
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1719 };
1689 1720
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1723
1695 if ($tex->{format} == GL_ALPHA) { 1724 $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} 1725}
1706 1726
1707############################################################################# 1727#############################################################################
1708 1728
1709package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1820 1840
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1842
1823 # byte-index to char-index 1843 # byte-index to char-index
1824 my $text = $self->{text}; 1844 my $text = $self->{text};
1825 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1827 1847
1828 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1829 $self->update; 1849 $self->update;
1830 1850
1831 1 1851 1
… …
2051 my ($self) = @_; 2071 my ($self) = @_;
2052 2072
2053 (6) x 2 2073 (6) x 2
2054} 2074}
2055 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
2056sub invoke_button_down { 2084sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
2058 2086
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2089 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2090 } else {
2064 return 0 2091 return 0
2065 } 2092 }
2066 2093
2067 1 2094 1
… …
2103 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2104 can_events => 0, 2131 can_events => 0,
2105 @_, 2132 @_,
2106 ); 2133 );
2107 2134
2108 $self->{path} 2135 $self->{path} || $self->{tex}
2109 or Carp::croak "required attribute 'path' not set"; 2136 or Carp::croak "'path' or 'tex' attributes required";
2110 2137
2111 $self->{tex} = $texture_cache{$self->{path}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2140
2114 Scalar::Util::weaken $texture_cache{$self->{path}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2142
2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2267
2241 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2273
2244 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
… …
2266 2296
2267 if ($t3) { 2297 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2304 glEnd;
2275 } 2305 }
2276 2306
2277 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2546 can_events => 0, 2576 can_events => 0,
2547 indent => 0, 2577 indent => 0,
2548 #font => default_font 2578 #font => default_font
2549 @_, 2579 @_,
2550 2580
2551 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2552 par => [], 2582 par => [],
2553 height => 0, 2583 height => 0,
2554 children => [ 2584 children => [
2555 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2567 2597
2568 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2569 $self->reflow; 2599 $self->reflow;
2570} 2600}
2571 2601
2572sub visible_children { 2602sub size_request {
2573 my ($self) = @_; 2603 my ($self) = @_;
2574 2604
2575 @{$self->{children}}[0,1] 2605 my ($empty, $slider) = @{ $self->{children} };
2606
2607 local $self->{children} = [$empty, $slider];
2608 $self->SUPER::size_request
2576} 2609}
2577 2610
2578sub invoke_size_allocate { 2611sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 2612 my ($self, $w, $h) = @_;
2580 2613
2581 my (undef, undef, @other) = @{ $self->{children} }; 2614 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 2616
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 2619 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2620 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 2621
2589 $self->reflow; 2622 $self->reflow;
2590 2623
2624 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2592} 2626}
2593 2627
2594sub get_layout { 2628sub get_layout {
2595 my ($self, $para) = @_; 2629 my ($self, $para) = @_;
2596 2630
2597 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2598 2632
2599 $layout->set_font ($self->{font}) if $self->{font}; 2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 2636 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2637 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 2638 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 2639
2640 $layout->set_shapes (
2641 map
2642 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2643 @{$para->{widget}}
2644 );
2605 2645
2606 $layout 2646 $layout
2607} 2647}
2608 2648
2609sub reflow { 2649sub reflow {
… …
2677 for my $para (@{$self->{par}}) { 2717 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para); 2719 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size; 2720 my ($w, $h) = $layout->size;
2681 2721
2682 $para->{w} = $w + $para->{indent}; 2722 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h; 2723 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped; 2724 $para->{wrapped} = $layout->has_wrapped;
2685 } 2725 }
2686 2726
2687 $height += $para->{h}; 2727 $height += $para->{h};
2688 } 2728 }
… …
2707 my $y0 = $top; 2747 my $y0 = $top;
2708 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2709 2749
2710 my $y = 0; 2750 my $y = 0;
2711 2751
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}}) { 2752 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 2753 my $h = $para->{h};
2718 2754
2719 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2720 2756
2721 my $layout = $self->get_layout ($para); 2757 my $layout = $self->get_layout ($para);
2722 2758
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 2760
2728 if (my @w = @{ $para->{widget} }) { 2761 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 2762 my @s = $layout->get_shapes;
2730 2763
2731 for (@w) { 2764 for (@w) {
… …
2739 } 2772 }
2740 } 2773 }
2741 2774
2742 $y += $h; 2775 $y += $h;
2743 } 2776 }
2744
2745 glDisable GL_BLEND;
2746 }; 2777 };
2747 }); 2778 });
2748} 2779}
2749 2780
2750sub reconfigure { 2781sub reconfigure {
… …
3046 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
3048 3079
3049 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
3050 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
3051 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
3052 can_hover => 1, 3097 can_hover => 1,
3053 can_events => 1, 3098 can_events => 1,
3054 markup => $widget, 3099 markup => $widget,
3055 tooltip => $tooltip 3100 tooltip => $tooltip;
3101 }
3056 } 3102 }
3057 3103
3058 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
3059 3105
3060 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
3127 3173
3128 $self->SUPER::add (@widgets); 3174 $self->SUPER::add (@widgets);
3129 3175
3130 $self->{current} = $self->{children}[0] 3176 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3177 if @{ $self->{children} };
3178}
3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3132} 3184}
3133 3185
3134sub set_current_page { 3186sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3187 my ($self, $page_or_widget) = @_;
3136 3188
… …
3202 tooltip => $tooltip, 3254 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3255 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3256 );
3205 3257
3206 $self->{multiplexer}->add ($widget); 3258 $self->{multiplexer}->add ($widget);
3259}
3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3207} 3265}
3208 3266
3209sub set_current_page { 3267sub set_current_page {
3210 my ($self, $page) = @_; 3268 my ($self, $page) = @_;
3211 3269
… …
3389 count => 1, 3447 count => 1,
3390 %arg, 3448 %arg,
3391 }; 3449 };
3392 } 3450 }
3393 3451
3452 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3453 $self->reorder;
3454 });
3395} 3455}
3396 3456
3397sub reconfigure { 3457sub reconfigure {
3398 my ($self) = @_; 3458 my ($self) = @_;
3399 3459
… …
3414 3474
3415############################################################################# 3475#############################################################################
3416 3476
3417package CFClient::UI::Inventory; 3477package CFClient::UI::Inventory;
3418 3478
3419our @ISA = CFClient::UI::ScrolledWindow::; 3479our @ISA = CFClient::UI::Table::;
3420 3480
3421sub new { 3481sub new {
3422 my $class = shift; 3482 my $class = shift;
3423 3483
3424 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3485 col_expand => [0, 1, 0],
3426 @_, 3486 @_,
3427 ); 3487 );
3428 3488
3429 $self 3489 $self
3430} 3490}
3431 3491
3432sub set_items { 3492sub set_items {
3433 my ($self, $items) = @_; 3493 my ($self, $items) = @_;
3434 3494
3435 $self->{child}->clear; 3495 $self->clear;
3436 return unless $items; 3496 return unless $items;
3437 3497
3438 my @items = sort { 3498 my @items = sort {
3439 ($a->{type} <=> $b->{type}) 3499 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name}) 3500 or ($a->{name} cmp $b->{name})
3441 } @$items; 3501 } values %$items;
3442 3502
3443 $self->{real_items} = \@items; 3503 $self->{real_items} = \@items;
3444 3504
3445 my $row = 0; 3505 my $row = 0;
3446 for my $item (@items) { 3506 for my $item (@items) {
3447 CFClient::Item::update_widgets $item; 3507 CFClient::Item::update_widgets $item;
3448 3508
3449 $self->{child}->add (0, $row, $item->{face_widget}); 3509 $self->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget}); 3510 $self->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget}); 3511 $self->add (2, $row, $item->{weight_widget});
3452 3512
3453 $row++; 3513 $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 } 3514 }
3663} 3515}
3664 3516
3665############################################################################# 3517#############################################################################
3666 3518
… …
3720 } elsif ($ev->{button} == 2) { 3572 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}"); 3573 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) { 3574 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu 3575 (new CFClient::UI::Menu
3724 items => [ 3576 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3577 ["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}"]) }], 3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ], 3579 ],
3728 )->popup ($ev); 3580 )->popup ($ev);
3729 } else { 3581 } else {
3730 return 0; 3582 return 0;
… …
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 3829
3978 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3980 3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838
3981 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3982 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3983 3841
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w}; 3843 $widget->{old_w} = $widget->{w};

Diff Legend

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