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.324 by root, Wed Jul 12 17:20:04 2006 UTC

… …
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338} 338}
339 339
340sub baseline_shift {
341 0
342}
343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
343 if ($self->{aspect}) { 347 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 348 my ($ow, $oh) = ($w, $h);
… …
419 my ($self) = @_; 423 my ($self) = @_;
420 424
421 return if $FOCUS == $self; 425 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
423 427
424 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
425 429
426 $focus->update if $focus; 430 $self->update;
427 $FOCUS->update;
428 431
429 0 432 0
430} 433}
431 434
432sub invoke_focus_out { 435sub invoke_focus_out {
433 my ($self) = @_; 436 my ($self) = @_;
434 437
435 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
436 439
437 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
438 441
439 $focus->update if $focus; #? 442 $self->update;
440 443
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 445 unless $FOCUS;
443 446
444 0 447 0
445} 448}
446 449
447sub grab_focus { 450sub grab_focus {
448 my ($self) = @_; 451 my ($self) = @_;
449 452
453 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 454 $self->emit ("focus_in");
451} 455}
452 456
453sub invoke_mouse_motion { 1 } 457sub invoke_mouse_motion { 1 }
454sub invoke_button_up { 1 } 458sub invoke_button_up { 1 }
… …
535 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
536 540
537 # update screen rectangle 541 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 544
543 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 548
… …
585} 587}
586 588
587sub DESTROY { 589sub DESTROY {
588 my ($self) = @_; 590 my ($self) = @_;
589 591
592 return if CFClient::in_destruct;
593
590 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
591 595
592 eval { $self->destroy }; 596 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 598}
… …
984 $self->add ($child) if $child; 988 $self->add ($child) if $child;
985 989
986 $self 990 $self
987} 991}
988 992
993#TODO# update range on size_allocate depending on child
994
989sub add { 995sub add {
990 my ($self, $widget) = @_; 996 my ($self, $widget) = @_;
991 997
992 $self->{vp}->add ($self->{child} = $widget); 998 $self->{vp}->add ($self->{child} = $widget);
993} 999}
994 1000
1001sub update_slider {
1002 my ($self) = @_;
1003
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005}
1006
995sub update { 1007sub update {
996 my ($self) = @_; 1008 my ($self) = @_;
997 1009
998 $self->SUPER::update; 1010 $self->SUPER::update;
999 1011
1000 # todo: overwrite size_allocate of child 1012 $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} 1013}
1004 1014
1005sub invoke_size_allocate { 1015sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1016 my ($self, $w, $h) = @_;
1007 1017
1008 my $child = $self->{vp}->child; 1018 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1019
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1020 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1021}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1022
1017############################################################################# 1023#############################################################################
1018 1024
1019package CFClient::UI::Frame; 1025package CFClient::UI::Frame;
1020 1026
… …
1092 1098
1093 if ($self->{has_close_button}) { 1099 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1100 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1101 new CFClient::UI::ImageButton
1096 path => 'x1_close.png', 1102 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1103 on_activate => sub { $self->emit ("delete") };
1098 1104
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1105 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1106 }
1101 1107
1102 $self 1108 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1154 $self->child->configure ($border, $border, $w, $h);
1149 1155
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1157 if $self->{close_button};
1152 1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1166
1153 1 1167 1
1154} 1168}
1155 1169
1156sub invoke_button_down { 1170sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
… …
1579 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1580 1594
1581 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1583 1597
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1586 1599
1587 delete $self->{size_req}; 1600 delete $self->{size_req};
1588 $self->realloc; 1601 $self->realloc;
1589 $self->update; 1602 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1597 1610
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1612
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1602 1614
1603 delete $self->{size_req}; 1615 delete $self->{size_req};
1604 $self->realloc; 1616 $self->realloc;
1605 $self->update; 1617 $self->update;
… …
1617 1629
1618 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1619 1631
1620 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1634 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1636
1624 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1625 1638
1626 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
… …
1631 }; 1644 };
1632 1645
1633 @{ $self->{size_req} } 1646 @{ $self->{size_req} }
1634} 1647}
1635 1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1636sub invoke_size_allocate { 1653sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1638 1655
1639 delete $self->{ox}; 1656 delete $self->{ox};
1640 1657
… …
1646 1663
1647sub set_fontsize { 1664sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1649 1666
1650 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1651 delete $self->{texture}; 1669 delete $self->{texture};
1652 1670
1653 $self->realloc; 1671 $self->realloc;
1654} 1672}
1655 1673
1656sub reconfigure { 1674sub reconfigure {
1657 my ($self) = @_; 1675 my ($self) = @_;
1658 1676
1659 delete $self->{size_req}; 1677 delete $self->{size_req};
1678 delete $self->{texture};
1660 1679
1661 $self->SUPER::reconfigure; 1680 $self->SUPER::reconfigure;
1662} 1681}
1663 1682
1664sub _draw { 1683sub _draw {
1665 my ($self) = @_; 1684 my ($self) = @_;
1666 1685
1667 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1668 1687
1669 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1695
1677 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1678 }; 1697 };
1679 1698
1680 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1684 1703
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1707 };
1689 1708
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1711
1695 if ($tex->{format} == GL_ALPHA) { 1712 $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} 1713}
1706 1714
1707############################################################################# 1715#############################################################################
1708 1716
1709package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
2051 my ($self) = @_; 2059 my ($self) = @_;
2052 2060
2053 (6) x 2 2061 (6) x 2
2054} 2062}
2055 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2056sub invoke_button_down { 2072sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
2058 2074
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2077 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2078 } else {
2064 return 0 2079 return 0
2065 } 2080 }
2066 2081
2067 1 2082 1
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2255
2241 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2257 my $h2 = $self->{h} * (1 - $ycut2);
2258 my $h3 = $self->{h};
2259
2260 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2261
2244 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
… …
2266 2284
2267 if ($t3) { 2285 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2292 glEnd;
2275 } 2293 }
2276 2294
2277 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2546 can_events => 0, 2564 can_events => 0,
2547 indent => 0, 2565 indent => 0,
2548 #font => default_font 2566 #font => default_font
2549 @_, 2567 @_,
2550 2568
2551 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2552 par => [], 2570 par => [],
2553 height => 0, 2571 height => 0,
2554 children => [ 2572 children => [
2555 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2567 2585
2568 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2569 $self->reflow; 2587 $self->reflow;
2570} 2588}
2571 2589
2572sub visible_children { 2590sub size_request {
2573 my ($self) = @_; 2591 my ($self) = @_;
2574 2592
2575 @{$self->{children}}[0,1] 2593 my ($empty, $slider) = @{ $self->{children} };
2594
2595 local $self->{children} = [$empty, $slider];
2596 $self->SUPER::size_request
2576} 2597}
2577 2598
2578sub invoke_size_allocate { 2599sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2580 2601
2581 my (undef, undef, @other) = @{ $self->{children} }; 2602 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 2604
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 2609
2589 $self->reflow; 2610 $self->reflow;
2590 2611
2612 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2592} 2614}
2593 2615
2594sub get_layout { 2616sub get_layout {
2595 my ($self, $para) = @_; 2617 my ($self, $para) = @_;
2596 2618
2597 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2598 2620
2599 $layout->set_font ($self->{font}) if $self->{font}; 2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 2626 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 2627
2628 $layout->set_shapes (
2629 map
2630 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2631 @{$para->{widget}}
2632 );
2605 2633
2606 $layout 2634 $layout
2607} 2635}
2608 2636
2609sub reflow { 2637sub reflow {
… …
2677 for my $para (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para); 2707 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2681 2709
2682 $para->{w} = $w + $para->{indent}; 2710 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h; 2711 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped; 2712 $para->{wrapped} = $layout->has_wrapped;
2685 } 2713 }
2686 2714
2687 $height += $para->{h}; 2715 $height += $para->{h};
2688 } 2716 }
… …
2707 my $y0 = $top; 2735 my $y0 = $top;
2708 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2709 2737
2710 my $y = 0; 2738 my $y = 0;
2711 2739
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}}) { 2740 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 2741 my $h = $para->{h};
2718 2742
2719 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2720 2744
2721 my $layout = $self->get_layout ($para); 2745 my $layout = $self->get_layout ($para);
2722 2746
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 2748
2728 if (my @w = @{ $para->{widget} }) { 2749 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 2750 my @s = $layout->get_shapes;
2730 2751
2731 for (@w) { 2752 for (@w) {
… …
2739 } 2760 }
2740 } 2761 }
2741 2762
2742 $y += $h; 2763 $y += $h;
2743 } 2764 }
2744
2745 glDisable GL_BLEND;
2746 }; 2765 };
2747 }); 2766 });
2748} 2767}
2749 2768
2750sub reconfigure { 2769sub reconfigure {
… …
3046 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
3048 3067
3049 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
3050 if (!ref $widget) { 3069 if (!ref $widget) {
3070 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2;
3072
3073 $widget = new CFClient::UI::HBox
3074 can_hover => 1,
3075 can_events => 1,
3076 tooltip => $tooltip,
3077 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1),
3080 ],
3081 ;
3082
3083 } else {
3051 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
3052 can_hover => 1, 3085 can_hover => 1,
3053 can_events => 1, 3086 can_events => 1,
3054 markup => $widget, 3087 markup => $widget,
3055 tooltip => $tooltip 3088 tooltip => $tooltip;
3089 }
3056 } 3090 }
3057 3091
3058 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
3059 3093
3060 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
3127 3161
3128 $self->SUPER::add (@widgets); 3162 $self->SUPER::add (@widgets);
3129 3163
3130 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3165 if @{ $self->{children} };
3166}
3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3132} 3172}
3133 3173
3134sub set_current_page { 3174sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
3136 3176
… …
3202 tooltip => $tooltip, 3242 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3243 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3244 );
3205 3245
3206 $self->{multiplexer}->add ($widget); 3246 $self->{multiplexer}->add ($widget);
3247}
3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3207} 3253}
3208 3254
3209sub set_current_page { 3255sub set_current_page {
3210 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3211 3257
… …
3389 count => 1, 3435 count => 1,
3390 %arg, 3436 %arg,
3391 }; 3437 };
3392 } 3438 }
3393 3439
3440 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3441 $self->reorder;
3442 });
3395} 3443}
3396 3444
3397sub reconfigure { 3445sub reconfigure {
3398 my ($self) = @_; 3446 my ($self) = @_;
3399 3447
… …
3414 3462
3415############################################################################# 3463#############################################################################
3416 3464
3417package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3418 3466
3419our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3420 3468
3421sub new { 3469sub new {
3422 my $class = shift; 3470 my $class = shift;
3423 3471
3424 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3426 @_, 3474 @_,
3427 ); 3475 );
3428 3476
3429 $self 3477 $self
3430} 3478}
3431 3479
3432sub set_items { 3480sub set_items {
3433 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3434 3482
3435 $self->{child}->clear; 3483 $self->clear;
3436 return unless $items; 3484 return unless $items;
3437 3485
3438 my @items = sort { 3486 my @items = sort {
3439 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3441 } @$items; 3489 } values %$items;
3442 3490
3443 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3444 3492
3445 my $row = 0; 3493 my $row = 0;
3446 for my $item (@items) { 3494 for my $item (@items) {
3447 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3448 3496
3449 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3452 3500
3453 $row++; 3501 $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 } 3502 }
3663} 3503}
3664 3504
3665############################################################################# 3505#############################################################################
3666 3506
… …
3720 } elsif ($ev->{button} == 2) { 3560 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}"); 3561 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) { 3562 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu 3563 (new CFClient::UI::Menu
3724 items => [ 3564 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3565 ["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}"]) }], 3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ], 3567 ],
3728 )->popup ($ev); 3568 )->popup ($ev);
3729 } else { 3569 } else {
3730 return 0; 3570 return 0;

Diff Legend

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