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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 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
… …
1091 if exists $self->{title}; 1095 if exists $self->{title};
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 image => '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) = @_;
… …
1438 1450
1439sub invoke_size_allocate { 1451sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1441 1453
1442 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1444 1456
1445 my @req; 1457 my @req;
1446 1458
1447 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1449 } else { 1461 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1452 1464
1453 if ($req > $space) { 1465 if ($req > $space) {
1454 # ah well, not enough space 1466 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1456 } else { 1468 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1470
1459 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1460 1472
1461 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1474 for 0 .. $#children;
1463 } 1475 }
1464 } 1476 }
1465 1477
1466 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1467 1479
1468 my $pos = 0; 1480 my $pos = 0;
1469 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1484
1473 $pos += $alloc; 1485 $pos += $alloc;
1474 } 1486 }
1475 1487
1476 1 1488 1
… …
1631 }; 1643 };
1632 1644
1633 @{ $self->{size_req} } 1645 @{ $self->{size_req} }
1634} 1646}
1635 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1636sub invoke_size_allocate { 1652sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1638 1654
1639 delete $self->{ox}; 1655 delete $self->{ox};
1640 1656
… …
1646 1662
1647sub set_fontsize { 1663sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1649 1665
1650 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1651 delete $self->{texture}; 1668 delete $self->{texture};
1652 1669
1653 $self->realloc; 1670 $self->realloc;
1654} 1671}
1655 1672
… …
2051 my ($self) = @_; 2068 my ($self) = @_;
2052 2069
2053 (6) x 2 2070 (6) x 2
2054} 2071}
2055 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
2056sub invoke_button_down { 2081sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
2058 2083
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2086 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2087 } else {
2064 return 0 2088 return 0
2065 } 2089 }
2066 2090
2067 1 2091 1
… …
2092package CFClient::UI::Image; 2116package CFClient::UI::Image;
2093 2117
2094our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
2095 2119
2096use CFClient::OpenGL; 2120use CFClient::OpenGL;
2097use Carp qw/confess/;
2098 2121
2099our %loaded_images; 2122our %texture_cache;
2100 2123
2101sub new { 2124sub new {
2102 my $class = shift; 2125 my $class = shift;
2103 2126
2104 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
2105 2131
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
2107 2134
2108 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2110 2137
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
2112 2139
2113 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116 2141
2117 $self 2142 $self
2118} 2143}
2119 2144
2120sub size_request { 2145sub size_request {
2121 my ($self) = @_; 2146 my ($self) = @_;
2122 2147
2123 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
2124} 2149}
2125 2150
2126sub _draw { 2151sub _draw {
2127 my ($self) = @_; 2152 my ($self) = @_;
2128 2153
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2264
2240 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2270
2243 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
… …
2265 2293
2266 if ($t3) { 2294 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2301 glEnd;
2274 } 2302 }
2275 2303
2276 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
… …
2566 2594
2567 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2596 $self->reflow;
2569} 2597}
2570 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2571sub invoke_size_allocate { 2608sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 2609 my ($self, $w, $h) = @_;
2573 2610
2611 my ($empty, $slider, @other) = @{ $self->{children} };
2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2613
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 2618
2579 $self->reflow; 2619 $self->reflow;
2580 2620
2621 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 2623}
2583 2624
2584sub text_size { 2625sub get_layout {
2585 my ($self, $text, $indent) = @_; 2626 my ($self, $para) = @_;
2586 2627
2587 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2588 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2593 2641 );
2642
2594 $layout->size 2643 $layout
2595} 2644}
2596 2645
2597sub reflow { 2646sub reflow {
2598 my ($self) = @_; 2647 my ($self) = @_;
2599 2648
… …
2608 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2609} 2658}
2610 2659
2611sub clear { 2660sub clear {
2612 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2613 2665
2614 $self->{par} = []; 2666 $self->{par} = [];
2615 $self->{height} = 0; 2667 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 2669}
2618 2670
2619sub add_paragraph { 2671sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2621 2673
2622 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2623 my ($w, $h) = $self->text_size ($line); 2675
2624 $self->{height} += $h; 2676 $para = {
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2626 } 2683 };
2627 2684
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2629} 2697}
2630 2698
2631sub update { 2699sub update {
2632 my ($self) = @_; 2700 my ($self) = @_;
2633 2701
… …
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 2710
2643 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2644 my $height = 0; 2712 my $height = 0;
2645 2713
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2652 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3]; 2718
2657 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2658 } 2722 }
2659 2723
2660 $height += $_->[1]; 2724 $height += $para->{h};
2661 } 2725 }
2662 2726
2663 $self->{height} = $height; 2727 $self->{height} = $height;
2664 2728
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2666 2730
2667 delete $self->{texture}; 2731 delete $self->{texture};
2732 }
2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2668 } 2736 }
2669 2737
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 2739 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
… …
2676 my $y0 = $top; 2744 my $y0 = $top;
2677 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2678 2746
2679 my $y = 0; 2747 my $y = 0;
2680 2748
2681 my $layout = $self->{layout};
2682
2683 $layout->set_font ($self->{font}) if $self->{font};
2684
2685 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688 2752
2689 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 2754 my $h = $para->{h};
2691 2755
2692 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] }); 2757
2694 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696 $layout->set_markup ($par->[4]);
2697 2759
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2699 2761
2700 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2702 } 2780 }
2703 2781
2704 $y += $h; 2782 $y += $h;
2705 } 2783 }
2706 2784
2707 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2708 }; 2786 };
2709 }); 2787 });
2788}
2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2710} 2797}
2711 2798
2712sub _draw { 2799sub _draw {
2713 my ($self) = @_; 2800 my ($self) = @_;
2714 2801
… …
2717 glColor 0, 0, 0, 1; 2804 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2720 2807
2721 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2722
2723} 2809}
2724 2810
2725############################################################################# 2811#############################################################################
2726 2812
2727package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
… …
3083 3169
3084 $self->{current} = $self->{children}[0] 3170 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3171 if @{ $self->{children} };
3086} 3172}
3087 3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
3088sub set_current_page { 3180sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3181 my ($self, $page_or_widget) = @_;
3090 3182
3091 my $widget = ref $page_or_widget 3183 my $widget = ref $page_or_widget
3092 ? $page_or_widget 3184 ? $page_or_widget
… …
3156 tooltip => $tooltip, 3248 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3249 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3250 );
3159 3251
3160 $self->{multiplexer}->add ($widget); 3252 $self->{multiplexer}->add ($widget);
3253}
3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3161} 3259}
3162 3260
3163sub set_current_page { 3261sub set_current_page {
3164 my ($self, $page) = @_; 3262 my ($self, $page) = @_;
3165 3263
… …
3343 count => 1, 3441 count => 1,
3344 %arg, 3442 %arg,
3345 }; 3443 };
3346 } 3444 }
3347 3445
3446 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3447 $self->reorder;
3448 });
3349} 3449}
3350 3450
3351sub reconfigure { 3451sub reconfigure {
3352 my ($self) = @_; 3452 my ($self) = @_;
3353 3453
… …
3368 3468
3369############################################################################# 3469#############################################################################
3370 3470
3371package CFClient::UI::Inventory; 3471package CFClient::UI::Inventory;
3372 3472
3373our @ISA = CFClient::UI::ScrolledWindow::; 3473our @ISA = CFClient::UI::Table::;
3374 3474
3375sub new { 3475sub new {
3376 my $class = shift; 3476 my $class = shift;
3377 3477
3378 my $self = $class->SUPER::new ( 3478 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3479 col_expand => [0, 1, 0],
3380 @_, 3480 @_,
3381 ); 3481 );
3382 3482
3383 $self 3483 $self
3384} 3484}
3385 3485
3386sub set_items { 3486sub set_items {
3387 my ($self, $items) = @_; 3487 my ($self, $items) = @_;
3388 3488
3389 $self->{child}->clear; 3489 $self->clear;
3390 return unless $items; 3490 return unless $items;
3391 3491
3392 my @items = sort { 3492 my @items = sort {
3393 ($a->{type} <=> $b->{type}) 3493 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name}) 3494 or ($a->{name} cmp $b->{name})
3395 } @$items; 3495 } values %$items;
3396 3496
3397 $self->{real_items} = \@items; 3497 $self->{real_items} = \@items;
3398 3498
3399 my $row = 0; 3499 my $row = 0;
3400 for my $item (@items) { 3500 for my $item (@items) {
3401 CFClient::Item::update_widgets $item; 3501 CFClient::Item::update_widgets $item;
3402 3502
3403 $self->{child}->add (0, $row, $item->{face_widget}); 3503 $self->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget}); 3504 $self->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget}); 3505 $self->add (2, $row, $item->{weight_widget});
3406 3506
3407 $row++; 3507 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 } 3508 }
3607} 3509}
3608 3510
3609############################################################################# 3511#############################################################################
3610 3512
… …
3664 } elsif ($ev->{button} == 2) { 3566 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}"); 3567 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) { 3568 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu 3569 (new CFClient::UI::Menu
3668 items => [ 3570 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ], 3573 ],
3672 )->popup ($ev); 3574 )->popup ($ev);
3673 } else { 3575 } else {
3674 return 0; 3576 return 0;

Diff Legend

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