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.307 by root, Sun Jun 18 19:13:20 2006 UTC vs.
Revision 1.318 by elmex, Sun Jul 2 19:32:55 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 }
… …
470} 474}
471 475
472sub emit { 476sub emit {
473 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
474 478
479 #d##TODO# stop propagating at first true, do not use sum
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure 481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478} 483}
479 484
480sub find_widget { 485sub find_widget {
481 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
482 487
… …
534 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
535 540
536 # update screen rectangle 541 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 544
542 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 548
… …
983 $self->add ($child) if $child; 986 $self->add ($child) if $child;
984 987
985 $self 988 $self
986} 989}
987 990
991#TODO# update range on size_allocate depending on child
992
988sub add { 993sub add {
989 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
990 995
991 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
992} 997}
993 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
994sub update { 1005sub update {
995 my ($self) = @_; 1006 my ($self) = @_;
996 1007
997 $self->SUPER::update; 1008 $self->SUPER::update;
998 1009
999 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1011}
1003 1012
1004sub invoke_size_allocate { 1013sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1006 1015
1007 my $child = $self->{vp}->child; 1016 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009 1017
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1019}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1020
1016############################################################################# 1021#############################################################################
1017 1022
1018package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1019 1024
… …
1090 if exists $self->{title}; 1095 if exists $self->{title};
1091 1096
1092 if ($self->{has_close_button}) { 1097 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1098 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1095 image => 'x1_close.png', 1100 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->emit ("delete") };
1097 1102
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1099 } 1104 }
1100 1105
1101 $self 1106 $self
… …
1147 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1148 1153
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1155 if $self->{close_button};
1151 1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1152 1 1165 1
1153} 1166}
1154 1167
1155sub invoke_button_down { 1168sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
… …
1437 1450
1438sub invoke_size_allocate { 1451sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1440 1453
1441 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1443 1456
1444 my @req; 1457 my @req;
1445 1458
1446 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1448 } else { 1461 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1451 1464
1452 if ($req > $space) { 1465 if ($req > $space) {
1453 # ah well, not enough space 1466 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1455 } else { 1468 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1470
1458 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1459 1472
1460 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1474 for 0 .. $#children;
1462 } 1475 }
1463 } 1476 }
1464 1477
1465 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1466 1479
1467 my $pos = 0; 1480 my $pos = 0;
1468 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1470 $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));
1471 1484
1472 $pos += $alloc; 1485 $pos += $alloc;
1473 } 1486 }
1474 1487
1475 1 1488 1
… …
1630 }; 1643 };
1631 1644
1632 @{ $self->{size_req} } 1645 @{ $self->{size_req} }
1633} 1646}
1634 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1635sub invoke_size_allocate { 1652sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1637 1654
1638 delete $self->{ox}; 1655 delete $self->{ox};
1639 1656
… …
1645 1662
1646sub set_fontsize { 1663sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1648 1665
1649 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1650 delete $self->{texture}; 1668 delete $self->{texture};
1651 1669
1652 $self->realloc; 1670 $self->realloc;
1653} 1671}
1654 1672
… …
2091package CFClient::UI::Image; 2109package CFClient::UI::Image;
2092 2110
2093our @ISA = CFClient::UI::Base::; 2111our @ISA = CFClient::UI::Base::;
2094 2112
2095use CFClient::OpenGL; 2113use CFClient::OpenGL;
2096use Carp qw/confess/;
2097 2114
2098our %loaded_images; 2115our %texture_cache;
2099 2116
2100sub new { 2117sub new {
2101 my $class = shift; 2118 my $class = shift;
2102 2119
2103 my $self = $class->SUPER::new (can_events => 0, @_); 2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
2104 2124
2105 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2125 $self->{path}
2126 or Carp::croak "required attribute 'path' not set";
2106 2127
2107 $loaded_images{$self->{image}} ||= 2128 $self->{tex} = $texture_cache{$self->{path}} ||=
2108 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2109 2130
2110 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2131 Scalar::Util::weaken $texture_cache{$self->{path}};
2111 2132
2112 Scalar::Util::weaken $loaded_images{$self->{image}}; 2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2113
2114 $self->{aspect} = $tex->{w} / $tex->{h};
2115 2134
2116 $self 2135 $self
2117} 2136}
2118 2137
2119sub size_request { 2138sub size_request {
2120 my ($self) = @_; 2139 my ($self) = @_;
2121 2140
2122 ($self->{tex}->{w}, $self->{tex}->{h}) 2141 ($self->{tex}{w}, $self->{tex}{h})
2123} 2142}
2124 2143
2125sub _draw { 2144sub _draw {
2126 my ($self) = @_; 2145 my ($self) = @_;
2127 2146
… …
2236 my $ycut1 = max 0, min 1, $ycut; 2255 my $ycut1 = max 0, min 1, $ycut;
2237 my $ycut2 = max 0, min 1, $ycut - 1; 2256 my $ycut2 = max 0, min 1, $ycut - 1;
2238 2257
2239 my $h1 = $self->{h} * (1 - $ycut1); 2258 my $h1 = $self->{h} * (1 - $ycut1);
2240 my $h2 = $self->{h} * (1 - $ycut2); 2259 my $h2 = $self->{h} * (1 - $ycut2);
2260 my $h3 = $self->{h};
2261
2262 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2241 2263
2242 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2265 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2266 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245 glEnable GL_TEXTURE_2D; 2267 glEnable GL_TEXTURE_2D;
… …
2264 2286
2265 if ($t3) { 2287 if ($t3) {
2266 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2288 glBindTexture GL_TEXTURE_2D, $t3->{name};
2267 glBegin GL_QUADS; 2289 glBegin GL_QUADS;
2268 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2290 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2291 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2292 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2293 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272 glEnd; 2294 glEnd;
2273 } 2295 }
2274 2296
2275 glDisable GL_BLEND; 2297 glDisable GL_BLEND;
… …
2565 2587
2566 $self->{fontsize} = $fontsize; 2588 $self->{fontsize} = $fontsize;
2567 $self->reflow; 2589 $self->reflow;
2568} 2590}
2569 2591
2592sub size_request {
2593 my ($self) = @_;
2594
2595 my ($empty, $slider) = @{ $self->{children} };
2596
2597 local $self->{children} = [$empty, $slider];
2598 $self->SUPER::size_request
2599}
2600
2570sub invoke_size_allocate { 2601sub invoke_size_allocate {
2571 my ($self, $w, $h) = @_; 2602 my ($self, $w, $h) = @_;
2572 2603
2604 my ($empty, $slider, @other) = @{ $self->{children} };
2605 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2606
2573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2607 $self->{layout}->set_font ($self->{font}) if $self->{font};
2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2608 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575 $self->{layout}->set_width ($self->{children}[0]{w}); 2609 $self->{layout}->set_width ($empty->{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2610 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577 2611
2578 $self->reflow; 2612 $self->reflow;
2579 2613
2614 local $self->{children} = [$empty, $slider];
2580 $self->SUPER::invoke_size_allocate ($w, $h) 2615 $self->SUPER::invoke_size_allocate ($w, $h)
2581} 2616}
2582 2617
2583sub text_size { 2618sub get_layout {
2584 my ($self, $text, $indent) = @_; 2619 my ($self, $para) = @_;
2585 2620
2586 my $layout = $self->{layout}; 2621 my $layout = $self->{layout};
2587 2622
2623 $layout->set_font ($self->{font}) if $self->{font};
2624 $layout->set_foreground (@{$para->{fg}});
2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2625 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589 $layout->set_width ($self->{children}[0]{w} - $indent); 2626 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2627 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591 $layout->set_markup ($text); 2628 $layout->set_markup ($para->{markup});
2629
2630 $layout->set_shapes (
2631 map
2632 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2633 @{$para->{widget}}
2592 2634 );
2635
2593 $layout->size 2636 $layout
2594} 2637}
2595 2638
2596sub reflow { 2639sub reflow {
2597 my ($self) = @_; 2640 my ($self) = @_;
2598 2641
… …
2607 $self->{children}[1]->set_value ($offset); 2650 $self->{children}[1]->set_value ($offset);
2608} 2651}
2609 2652
2610sub clear { 2653sub clear {
2611 my ($self) = @_; 2654 my ($self) = @_;
2655
2656 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other;
2612 2658
2613 $self->{par} = []; 2659 $self->{par} = [];
2614 $self->{height} = 0; 2660 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616} 2662}
2617 2663
2618sub add_paragraph { 2664sub add_paragraph {
2619 my ($self, $color, $text, $indent) = @_; 2665 my ($self, $color, $para, $indent) = @_;
2620 2666
2621 for my $line (split /\n/, $text) { 2667 my ($text, @w) = ref $para ? @$para : $para;
2622 my ($w, $h) = $self->text_size ($line); 2668
2623 $self->{height} += $h; 2669 $para = {
2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2670 w => 1e10,
2671 wrapped => 1,
2672 fg => $color,
2673 indent => $indent,
2674 markup => $text,
2675 widget => \@w,
2625 } 2676 };
2626 2677
2627 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2678 $self->add (@w) if @w;
2679 push @{$self->{par}}, $para;
2680
2681 $self->{need_reflow}++;
2682 $self->update;
2683}
2684
2685sub scroll_to_bottom {
2686 my ($self) = @_;
2687
2688 $self->{scroll_to_bottom} = 1;
2689 $self->update;
2628} 2690}
2629 2691
2630sub update { 2692sub update {
2631 my ($self) = @_; 2693 my ($self) = @_;
2632 2694
… …
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641 2703
2642 if (delete $self->{need_reflow}) { 2704 if (delete $self->{need_reflow}) {
2643 my $height = 0; 2705 my $height = 0;
2644 2706
2645 my $layout = $self->{layout};
2646
2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649 for (@{$self->{par}}) { 2707 for my $para (@{$self->{par}}) {
2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2651 $layout->set_width ($W - $_->[3]); 2709 my $layout = $self->get_layout ($para);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653 $layout->set_markup ($_->[4]);
2654 my ($w, $h) = $layout->size; 2710 my ($w, $h) = $layout->size;
2655 $_->[0] = $w + $_->[3]; 2711
2656 $_->[1] = $h; 2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2657 } 2715 }
2658 2716
2659 $height += $_->[1]; 2717 $height += $para->{h};
2660 } 2718 }
2661 2719
2662 $self->{height} = $height; 2720 $self->{height} = $height;
2663 2721
2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2722 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2665 2723
2666 delete $self->{texture}; 2724 delete $self->{texture};
2725 }
2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2667 } 2729 }
2668 2730
2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2670 glClearColor 0, 0, 0, 0; 2732 glClearColor 0, 0, 0, 0;
2671 glClear GL_COLOR_BUFFER_BIT; 2733 glClear GL_COLOR_BUFFER_BIT;
… …
2675 my $y0 = $top; 2737 my $y0 = $top;
2676 my $y1 = $top + $H; 2738 my $y1 = $top + $H;
2677 2739
2678 my $y = 0; 2740 my $y = 0;
2679 2741
2680 my $layout = $self->{layout};
2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683
2684 glEnable GL_BLEND; 2742 glEnable GL_BLEND;
2685 #TODO# not correct in windows where rgba is forced off 2743 #TODO# not correct in windows where rgba is forced off
2686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687 2745
2688 for my $par (@{$self->{par}}) { 2746 for my $para (@{$self->{par}}) {
2689 my $h = $par->[1]; 2747 my $h = $para->{h};
2690 2748
2691 if ($y0 < $y + $h && $y < $y1) { 2749 if ($y0 < $y + $h && $y < $y1) {
2692 $layout->set_foreground (@{ $par->[2] }); 2750
2693 $layout->set_width ($W - $par->[3]); 2751 my $layout = $self->get_layout ($para);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2695 $layout->set_markup ($par->[4]);
2696 2752
2697 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2698 2754
2699 glRasterPos $par->[3], $y - $y0; 2755 glRasterPos $para->{indent}, $y - $y0;
2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757
2758 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes;
2760
2761 glDisable GL_BLEND;
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 }
2701 } 2773 }
2702 2774
2703 $y += $h; 2775 $y += $h;
2704 } 2776 }
2705 2777
2706 glDisable GL_BLEND; 2778 glDisable GL_BLEND;
2707 }; 2779 };
2708 }); 2780 });
2781}
2782
2783sub reconfigure {
2784 my ($self) = @_;
2785
2786 $self->SUPER::reconfigure;
2787
2788 $_->{w} = 1e10 for @{ $self->{par} };
2789 $self->reflow;
2709} 2790}
2710 2791
2711sub _draw { 2792sub _draw {
2712 my ($self) = @_; 2793 my ($self) = @_;
2713 2794
… …
2716 glColor 0, 0, 0, 1; 2797 glColor 0, 0, 0, 1;
2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2798 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718 glDisable GL_TEXTURE_2D; 2799 glDisable GL_TEXTURE_2D;
2719 2800
2720 $self->{children}[1]->draw; 2801 $self->{children}[1]->draw;
2721
2722} 2802}
2723 2803
2724############################################################################# 2804#############################################################################
2725 2805
2726package CFClient::UI::Animator; 2806package CFClient::UI::Animator;
… …
3342 count => 1, 3422 count => 1,
3343 %arg, 3423 %arg,
3344 }; 3424 };
3345 } 3425 }
3346 3426
3427 $ROOT->on_refresh (reorder => sub {
3347 $self->reorder; 3428 $self->reorder;
3429 });
3348} 3430}
3349 3431
3350sub reconfigure { 3432sub reconfigure {
3351 my ($self) = @_; 3433 my ($self) = @_;
3352 3434
… …
3367 3449
3368############################################################################# 3450#############################################################################
3369 3451
3370package CFClient::UI::Inventory; 3452package CFClient::UI::Inventory;
3371 3453
3372our @ISA = CFClient::UI::ScrolledWindow::; 3454our @ISA = CFClient::UI::Table::;
3373 3455
3374sub new { 3456sub new {
3375 my $class = shift; 3457 my $class = shift;
3376 3458
3377 my $self = $class->SUPER::new ( 3459 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3460 col_expand => [0, 1, 0],
3379 @_, 3461 @_,
3380 ); 3462 );
3381 3463
3382 $self 3464 $self
3383} 3465}
3384 3466
3385sub set_items { 3467sub set_items {
3386 my ($self, $items) = @_; 3468 my ($self, $items) = @_;
3387 3469
3388 $self->{child}->clear; 3470 $self->clear;
3389 return unless $items; 3471 return unless $items;
3390 3472
3391 my @items = sort { 3473 my @items = sort {
3392 ($a->{type} <=> $b->{type}) 3474 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name}) 3475 or ($a->{name} cmp $b->{name})
3394 } @$items; 3476 } values %$items;
3395 3477
3396 $self->{real_items} = \@items; 3478 $self->{real_items} = \@items;
3397 3479
3398 my $row = 0; 3480 my $row = 0;
3399 for my $item (@items) { 3481 for my $item (@items) {
3400 CFClient::Item::update_widgets $item; 3482 CFClient::Item::update_widgets $item;
3401 3483
3402 $self->{child}->add (0, $row, $item->{face_widget}); 3484 $self->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget}); 3485 $self->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget}); 3486 $self->add (2, $row, $item->{weight_widget});
3405 3487
3406 $row++; 3488 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 } 3489 }
3606} 3490}
3607 3491
3608############################################################################# 3492#############################################################################
3609 3493
… …
3663 } elsif ($ev->{button} == 2) { 3547 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}"); 3548 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) { 3549 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu 3550 (new CFClient::UI::Menu
3667 items => [ 3551 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3552 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3553 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ], 3554 ],
3671 )->popup ($ev); 3555 )->popup ($ev);
3672 } else { 3556 } else {
3673 return 0; 3557 return 0;

Diff Legend

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