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.320 by root, Tue Jul 4 23:23:32 2006 UTC

… …
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338} 338}
339 339
340sub baseline_shift {
341 0
342}
343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
343 if ($self->{aspect}) { 347 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 348 my ($ow, $oh) = ($w, $h);
… …
419 my ($self) = @_; 423 my ($self) = @_;
420 424
421 return if $FOCUS == $self; 425 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
423 427
424 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
425 429
426 $focus->update if $focus; 430 $self->update;
427 $FOCUS->update;
428 431
429 0 432 0
430} 433}
431 434
432sub invoke_focus_out { 435sub invoke_focus_out {
433 my ($self) = @_; 436 my ($self) = @_;
434 437
435 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
436 439
437 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
438 441
439 $focus->update if $focus; #? 442 $self->update;
440 443
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 445 unless $FOCUS;
443 446
444 0 447 0
445} 448}
446 449
447sub grab_focus { 450sub grab_focus {
448 my ($self) = @_; 451 my ($self) = @_;
449 452
453 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 454 $self->emit ("focus_in");
451} 455}
452 456
453sub invoke_mouse_motion { 1 } 457sub invoke_mouse_motion { 1 }
454sub invoke_button_up { 1 } 458sub invoke_button_up { 1 }
… …
535 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
536 540
537 # update screen rectangle 541 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 544
543 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 548
… …
984 $self->add ($child) if $child; 986 $self->add ($child) if $child;
985 987
986 $self 988 $self
987} 989}
988 990
991#TODO# update range on size_allocate depending on child
992
989sub add { 993sub add {
990 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
991 995
992 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
993} 997}
994 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
995sub update { 1005sub update {
996 my ($self) = @_; 1006 my ($self) = @_;
997 1007
998 $self->SUPER::update; 1008 $self->SUPER::update;
999 1009
1000 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1011}
1004 1012
1005sub invoke_size_allocate { 1013sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1007 1015
1008 my $child = $self->{vp}->child; 1016 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1017
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1019}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1020
1017############################################################################# 1021#############################################################################
1018 1022
1019package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1020 1024
… …
1092 1096
1093 if ($self->{has_close_button}) { 1097 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1098 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1096 path => 'x1_close.png', 1100 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->emit ("delete") };
1098 1102
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1104 }
1101 1105
1102 $self 1106 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1149 1153
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1155 if $self->{close_button};
1152 1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1153 1 1165 1
1154} 1166}
1155 1167
1156sub invoke_button_down { 1168sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
… …
1524 #font => default_font 1536 #font => default_font
1525 #text => initial text 1537 #text => initial text
1526 #markup => initial narkup 1538 #markup => initial narkup
1527 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1528 ellipsise => 3, # end 1540 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1530 fontsize => 1, 1542 fontsize => 1,
1531 align => -1, 1543 align => -1,
1532 valign => -1, 1544 valign => -1,
1533 padding_x => 2, 1545 padding_x => 2,
1534 padding_y => 2, 1546 padding_y => 2,
1535 can_events => 0, 1547 can_events => 0,
1536 %arg 1548 %arg
1537 ); 1549 );
1538 1550
1539 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1541 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1554 $self->{template} = $layout;
1543 } 1555 }
1544 1556
1545 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
1579 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1580 1592
1581 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1583 1595
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1586 1597
1587 delete $self->{size_req}; 1598 delete $self->{size_req};
1588 $self->realloc; 1599 $self->realloc;
1589 $self->update; 1600 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1597 1608
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1610
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1602 1612
1603 delete $self->{size_req}; 1613 delete $self->{size_req};
1604 $self->realloc; 1614 $self->realloc;
1605 $self->update; 1615 $self->update;
… …
1631 }; 1641 };
1632 1642
1633 @{ $self->{size_req} } 1643 @{ $self->{size_req} }
1634} 1644}
1635 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1636sub invoke_size_allocate { 1650sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1638 1652
1639 delete $self->{ox}; 1653 delete $self->{ox};
1640 1654
… …
1646 1660
1647sub set_fontsize { 1661sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1649 1663
1650 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1651 delete $self->{texture}; 1666 delete $self->{texture};
1652 1667
1653 $self->realloc; 1668 $self->realloc;
1654} 1669}
1655 1670
1656sub reconfigure { 1671sub reconfigure {
1657 my ($self) = @_; 1672 my ($self) = @_;
1658 1673
1659 delete $self->{size_req}; 1674 delete $self->{size_req};
1675 delete $self->{texture};
1660 1676
1661 $self->SUPER::reconfigure; 1677 $self->SUPER::reconfigure;
1662} 1678}
1663 1679
1664sub _draw { 1680sub _draw {
1665 my ($self) = @_; 1681 my ($self) = @_;
1666 1682
1667 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1668 1684
1669 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1692
1677 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1678 }; 1694 };
1679 1695
1680 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1684 1700
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1704 };
1689 1705
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1708
1695 if ($tex->{format} == GL_ALPHA) { 1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1710}
1706 1711
1707############################################################################# 1712#############################################################################
1708 1713
1709package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
2051 my ($self) = @_; 2056 my ($self) = @_;
2052 2057
2053 (6) x 2 2058 (6) x 2
2054} 2059}
2055 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
2056sub invoke_button_down { 2069sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
2058 2071
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2074 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2075 } else {
2064 return 0 2076 return 0
2065 } 2077 }
2066 2078
2067 1 2079 1
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2252
2241 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2258
2244 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2266 2281
2267 if ($t3) { 2282 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2289 glEnd;
2275 } 2290 }
2276 2291
2277 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2546 can_events => 0, 2561 can_events => 0,
2547 indent => 0, 2562 indent => 0,
2548 #font => default_font 2563 #font => default_font
2549 @_, 2564 @_,
2550 2565
2551 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2552 par => [], 2567 par => [],
2553 height => 0, 2568 height => 0,
2554 children => [ 2569 children => [
2555 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2567 2582
2568 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2569 $self->reflow; 2584 $self->reflow;
2570} 2585}
2571 2586
2572sub visible_children { 2587sub size_request {
2573 my ($self) = @_; 2588 my ($self) = @_;
2574 2589
2575 @{$self->{children}}[0,1] 2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2576} 2594}
2577 2595
2578sub invoke_size_allocate { 2596sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2580 2598
2581 my (undef, undef, @other) = @{ $self->{children} }; 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 2601
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 2606
2589 $self->reflow; 2607 $self->reflow;
2590 2608
2609 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2592} 2611}
2593 2612
2594sub get_layout { 2613sub get_layout {
2595 my ($self, $para) = @_; 2614 my ($self, $para) = @_;
2596 2615
2597 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2598 2617
2599 $layout->set_font ($self->{font}) if $self->{font}; 2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 2623 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2629 );
2605 2630
2606 $layout 2631 $layout
2607} 2632}
2608 2633
2609sub reflow { 2634sub reflow {
… …
2677 for my $para (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para); 2704 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2681 2706
2682 $para->{w} = $w + $para->{indent}; 2707 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h; 2708 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped; 2709 $para->{wrapped} = $layout->has_wrapped;
2685 } 2710 }
2686 2711
2687 $height += $para->{h}; 2712 $height += $para->{h};
2688 } 2713 }
… …
2707 my $y0 = $top; 2732 my $y0 = $top;
2708 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2709 2734
2710 my $y = 0; 2735 my $y = 0;
2711 2736
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}}) { 2737 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 2738 my $h = $para->{h};
2718 2739
2719 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2720 2741
2721 my $layout = $self->get_layout ($para); 2742 my $layout = $self->get_layout ($para);
2722 2743
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 2745
2728 if (my @w = @{ $para->{widget} }) { 2746 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 2747 my @s = $layout->get_shapes;
2730 2748
2731 for (@w) { 2749 for (@w) {
… …
2739 } 2757 }
2740 } 2758 }
2741 2759
2742 $y += $h; 2760 $y += $h;
2743 } 2761 }
2744
2745 glDisable GL_BLEND;
2746 }; 2762 };
2747 }); 2763 });
2748} 2764}
2749 2765
2750sub reconfigure { 2766sub reconfigure {
… …
3129 3145
3130 $self->{current} = $self->{children}[0] 3146 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3147 if @{ $self->{children} };
3132} 3148}
3133 3149
3150sub get_current_page {
3151 my ($self) = @_;
3152
3153 $self->{current}
3154}
3155
3134sub set_current_page { 3156sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3157 my ($self, $page_or_widget) = @_;
3136 3158
3137 my $widget = ref $page_or_widget 3159 my $widget = ref $page_or_widget
3138 ? $page_or_widget 3160 ? $page_or_widget
… …
3202 tooltip => $tooltip, 3224 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3225 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3226 );
3205 3227
3206 $self->{multiplexer}->add ($widget); 3228 $self->{multiplexer}->add ($widget);
3229}
3230
3231sub get_current_page {
3232 my ($self) = @_;
3233
3234 $self->{multiplexer}->get_current_page
3207} 3235}
3208 3236
3209sub set_current_page { 3237sub set_current_page {
3210 my ($self, $page) = @_; 3238 my ($self, $page) = @_;
3211 3239
… …
3389 count => 1, 3417 count => 1,
3390 %arg, 3418 %arg,
3391 }; 3419 };
3392 } 3420 }
3393 3421
3422 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3423 $self->reorder;
3424 });
3395} 3425}
3396 3426
3397sub reconfigure { 3427sub reconfigure {
3398 my ($self) = @_; 3428 my ($self) = @_;
3399 3429
… …
3414 3444
3415############################################################################# 3445#############################################################################
3416 3446
3417package CFClient::UI::Inventory; 3447package CFClient::UI::Inventory;
3418 3448
3419our @ISA = CFClient::UI::ScrolledWindow::; 3449our @ISA = CFClient::UI::Table::;
3420 3450
3421sub new { 3451sub new {
3422 my $class = shift; 3452 my $class = shift;
3423 3453
3424 my $self = $class->SUPER::new ( 3454 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3455 col_expand => [0, 1, 0],
3426 @_, 3456 @_,
3427 ); 3457 );
3428 3458
3429 $self 3459 $self
3430} 3460}
3431 3461
3432sub set_items { 3462sub set_items {
3433 my ($self, $items) = @_; 3463 my ($self, $items) = @_;
3434 3464
3435 $self->{child}->clear; 3465 $self->clear;
3436 return unless $items; 3466 return unless $items;
3437 3467
3438 my @items = sort { 3468 my @items = sort {
3439 ($a->{type} <=> $b->{type}) 3469 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name}) 3470 or ($a->{name} cmp $b->{name})
3441 } @$items; 3471 } values %$items;
3442 3472
3443 $self->{real_items} = \@items; 3473 $self->{real_items} = \@items;
3444 3474
3445 my $row = 0; 3475 my $row = 0;
3446 for my $item (@items) { 3476 for my $item (@items) {
3447 CFClient::Item::update_widgets $item; 3477 CFClient::Item::update_widgets $item;
3448 3478
3449 $self->{child}->add (0, $row, $item->{face_widget}); 3479 $self->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget}); 3480 $self->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget}); 3481 $self->add (2, $row, $item->{weight_widget});
3452 3482
3453 $row++; 3483 $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 } 3484 }
3663} 3485}
3664 3486
3665############################################################################# 3487#############################################################################
3666 3488
… …
3720 } elsif ($ev->{button} == 2) { 3542 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}"); 3543 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) { 3544 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu 3545 (new CFClient::UI::Menu
3724 items => [ 3546 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3547 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3548 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ], 3549 ],
3728 )->popup ($ev); 3550 )->popup ($ev);
3729 } else { 3551 } else {
3730 return 0; 3552 return 0;
… …
4015 ($draw_x, $draw_y, $draw_w, $draw_h) = 3837 ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h}); 3838 (0, 0, $self->{w}, $self->{h});
4017 } 3839 }
4018 3840
4019 $self->_draw; 3841 $self->_draw;
3842
3843 #TODO#d# display texture cache
3844 {
3845 glEnable GL_TEXTURE_2D;
3846 glBindTexture GL_TEXTURE_2D, 41;
3847 glColor 1, 1, 1, 1;
3848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
3849 glEnable GL_BLEND;
3850 glBlendFunc GL_SRC_ALPHA, GL_ZERO;
3851 glBegin GL_QUADS;
3852 glTexCoord 0,1; glVertex 0,0;
3853 glTexCoord 1,1; glVertex 255,0;
3854 glTexCoord 1,0; glVertex 255,255;
3855 glTexCoord 0,0; glVertex 0,255;
3856 glEnd;
3857 glDisable GL_BLEND;
3858 glDisable GL_TEXTURE_2D;
3859 }
3860
4020} 3861}
4021 3862
4022############################################################################# 3863#############################################################################
4023 3864
4024package CFClient::UI; 3865package CFClient::UI;

Diff Legend

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