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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.332 by root, Sun Jul 23 08:58:44 2006 UTC

… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
189 203
190 } 204 }
191 } 205 }
192 206
193 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
194} 216}
195 217
196############################################################################# 218#############################################################################
197 219
198package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
417 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
418 442
443 Carp::confess unless $self->{parent};#d#
444
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 446}
421 447
422sub invoke_focus_in { 448sub invoke_focus_in {
423 my ($self) = @_; 449 my ($self) = @_;
… …
452 478
453 $FOCUS->emit ("focus_out") if $FOCUS; 479 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 480 $self->emit ("focus_in");
455} 481}
456 482
457sub invoke_mouse_motion { 1 } 483sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 484sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 485sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
461 488
462sub invoke_button_down { 489sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
464 491
465 $self->grab_focus; 492 $self->grab_focus;
466 493
467 1 494 0
468} 495}
469 496
470sub connect { 497sub connect {
471 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
472 499
473 push @{ $self->{signal_cb}{$signal} }, $cb; 500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
474} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
475 514
476sub emit { 515sub emit {
477 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
478 517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
479 #d##TODO# stop propagating at first true, do not use sum 527 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 531}
484 532
485sub find_widget { 533sub find_widget {
486 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
487 535
… …
587} 635}
588 636
589sub DESTROY { 637sub DESTROY {
590 my ($self) = @_; 638 my ($self) = @_;
591 639
640 return if CFClient::in_destruct;
641
592 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
593 643
594 eval { $self->destroy }; 644 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 646}
… …
679 729
680 $self->add (@$children) 730 $self->add (@$children)
681 if $children; 731 if $children;
682 732
683 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
684} 742}
685 743
686sub add { 744sub add {
687 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
688 746
… …
975 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
976 }, 1034 },
977 ; 1035 ;
978 1036
979 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
981 slider => $slider, 1040 slider => $slider,
982 %arg, 1041 %arg,
983 ); 1042 );
984 1043
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
… …
992 1051
993sub add { 1052sub add {
994 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
995 1054
996 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
997} 1066}
998 1067
999sub update_slider { 1068sub update_slider {
1000 my ($self) = @_; 1069 my ($self) = @_;
1001 1070
… …
1080 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1152 border => 0.6,
1084 can_events => 1, 1153 can_events => 1,
1085 min_w => 16, 1154 min_w => 64,
1086 min_h => 16, 1155 min_h => 32,
1087 %arg, 1156 %arg,
1088 ); 1157 );
1089 1158
1090 $self->{title_widget} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1160 align => 0,
… …
1295sub children { 1364sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1366}
1298 1367
1299sub add { 1368sub add {
1300 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1301 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1373 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1304 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1379 $self->realloc;
1306} 1380}
1307 1381
1308sub remove { 1382sub remove {
1309 my ($self, $child) = @_; 1383 my ($self, $child) = @_;
… …
1591 my ($self, $text) = @_; 1665 my ($self, $text) = @_;
1592 1666
1593 return if $self->{text} eq "T$text"; 1667 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1668 $self->{text} = "T$text";
1595 1669
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1670 $self->{layout}->set_text ($text);
1598 1671
1599 delete $self->{size_req}; 1672 delete $self->{size_req};
1600 $self->realloc; 1673 $self->realloc;
1601 $self->update; 1674 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1680 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1681 $self->{text} = "M$markup";
1609 1682
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1683 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1684
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1685 $self->{layout}->set_markup ($markup);
1614 1686
1615 delete $self->{size_req}; 1687 delete $self->{size_req};
1616 $self->realloc; 1688 $self->realloc;
1617 $self->update; 1689 $self->update;
… …
1629 1701
1630 my ($w, $h) = $self->{layout}->size; 1702 my ($w, $h) = $self->{layout}->size;
1631 1703
1632 if (exists $self->{template}) { 1704 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 1705 $self->{template}->set_font ($self->{font}) if $self->{font};
1706 $self->{template}->set_width ($self->{max_w} || -1);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1707 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 1708
1636 my ($w2, $h2) = $self->{template}->size; 1709 my ($w2, $h2) = $self->{template}->size;
1637 1710
1638 $w = List::Util::max $w, $w2; 1711 $w = List::Util::max $w, $w2;
… …
1672 1745
1673sub reconfigure { 1746sub reconfigure {
1674 my ($self) = @_; 1747 my ($self) = @_;
1675 1748
1676 delete $self->{size_req}; 1749 delete $self->{size_req};
1750 delete $self->{texture};
1677 1751
1678 $self->SUPER::reconfigure; 1752 $self->SUPER::reconfigure;
1679} 1753}
1680 1754
1681sub _draw { 1755sub _draw {
1682 my ($self) = @_; 1756 my ($self) = @_;
1683 1757
1684 $self->SUPER::_draw; # draw background, if applicable 1758 $self->SUPER::_draw; # draw background, if applicable
1685 1759
1686 my $tex = $self->{texture} ||= do { 1760 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 1761 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1762 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 1763 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1764 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1765 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1766 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 1767
1694 new_from_layout CFClient::Texture $self->{layout} 1768 [$self->{layout}->size]
1695 }; 1769 };
1696 1770
1697 unless (exists $self->{ox}) { 1771 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1772 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1773 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 1774 : ($self->{w} - $size->[0]) * 0.5);
1701 1775
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1776 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1777 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 1778 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 1779 };
1706 1780
1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1781 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1782 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 1783
1712 if ($tex->{format} == GL_ALPHA) { 1784 $self->{layout}->render ($self->{ox}, $self->{oy});
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1720
1721 glDisable GL_TEXTURE_2D;
1722} 1785}
1723 1786
1724############################################################################# 1787#############################################################################
1725 1788
1726package CFClient::UI::EntryBase; 1789package CFClient::UI::EntryBase;
… …
1837 1900
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 1901 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 1902
1840 # byte-index to char-index 1903 # byte-index to char-index
1841 my $text = $self->{text}; 1904 my $text = $self->{text};
1842 utf8::encode $text; 1905 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 1906 $self->{cursor} = length $text;
1844 1907
1845 $self->_set_text ($self->{text}); 1908 $self->_set_text ($self->{text});
1846 $self->update; 1909 $self->update;
1847 1910
1848 1 1911 1
… …
2127 my $self = $class->SUPER::new ( 2190 my $self = $class->SUPER::new (
2128 can_events => 0, 2191 can_events => 0,
2129 @_, 2192 @_,
2130 ); 2193 );
2131 2194
2132 $self->{path} 2195 $self->{path} || $self->{tex}
2133 or Carp::croak "required attribute 'path' not set"; 2196 or Carp::croak "'path' or 'tex' attributes required";
2134 2197
2135 $self->{tex} = $texture_cache{$self->{path}} ||= 2198 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2199 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137 2200
2138 Scalar::Util::weaken $texture_cache{$self->{path}}; 2201 Scalar::Util::weaken $texture_cache{$self->{path}};
2139 2202
2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2203 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2460 } 2523 }
2461 2524
2462 1 2525 1
2463} 2526}
2464 2527
2528sub invoke_mouse_wheel {
2529 my ($self, $ev) = @_;
2530
2531 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532
2533 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2534
2535 ! ! $delta
2536}
2537
2465sub update { 2538sub update {
2466 my ($self) = @_; 2539 my ($self) = @_;
2467 2540
2468 delete $self->{knob_w}; 2541 delete $self->{knob_w};
2469 $self->SUPER::update; 2542 $self->SUPER::update;
… …
2568sub new { 2641sub new {
2569 my $class = shift; 2642 my $class = shift;
2570 2643
2571 my $self = $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2572 fontsize => 1, 2645 fontsize => 1,
2573 can_events => 0, 2646 can_events => 1,
2574 indent => 0, 2647 indent => 0,
2575 #font => default_font 2648 #font => default_font
2576 @_, 2649 @_,
2577 2650
2578 layout => (new CFClient::Layout 1), 2651 layout => (new CFClient::Layout),
2579 par => [], 2652 par => [],
2580 height => 0, 2653 height => 0,
2581 children => [ 2654 children => [
2582 (new CFClient::UI::Empty expand => 1), 2655 (new CFClient::UI::Empty expand => 1),
2583 (new CFClient::UI::Slider vertical => 1), 2656 (new CFClient::UI::Slider vertical => 1),
… …
2618 2691
2619 $self->reflow; 2692 $self->reflow;
2620 2693
2621 local $self->{children} = [$empty, $slider]; 2694 local $self->{children} = [$empty, $slider];
2622 $self->SUPER::invoke_size_allocate ($w, $h) 2695 $self->SUPER::invoke_size_allocate ($w, $h)
2696}
2697
2698sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_;
2700
2701 return 0 unless $ev->{dy}; # only vertical movements
2702
2703 $self->{children}[1]->emit (mouse_wheel => $ev);
2704
2705 1
2623} 2706}
2624 2707
2625sub get_layout { 2708sub get_layout {
2626 my ($self, $para) = @_; 2709 my ($self, $para) = @_;
2627 2710
… …
2744 my $y0 = $top; 2827 my $y0 = $top;
2745 my $y1 = $top + $H; 2828 my $y1 = $top + $H;
2746 2829
2747 my $y = 0; 2830 my $y = 0;
2748 2831
2749 glEnable GL_BLEND;
2750 #TODO# not correct in windows where rgba is forced off
2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753 for my $para (@{$self->{par}}) { 2832 for my $para (@{$self->{par}}) {
2754 my $h = $para->{h}; 2833 my $h = $para->{h};
2755 2834
2756 if ($y0 < $y + $h && $y < $y1) { 2835 if ($y0 < $y + $h && $y < $y1) {
2757 2836
2758 my $layout = $self->get_layout ($para); 2837 my $layout = $self->get_layout ($para);
2759 2838
2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762 glRasterPos $para->{indent}, $y - $y0; 2839 $layout->render ($para->{indent}, $y - $y0);
2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764 2840
2765 if (my @w = @{ $para->{widget} }) { 2841 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes; 2842 my @s = $layout->get_shapes;
2767 2843
2768 glDisable GL_BLEND;
2769 for (@w) { 2844 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, (); 2845 my ($dx, $dy) = splice @s, 0, 2, ();
2771 2846
2772 $_->{x} = $dx + $para->{indent}; 2847 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0; 2848 $_->{y} = $dy + $y - $y0;
2774 2849
2775 $_->draw; 2850 $_->draw;
2776 } 2851 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 } 2852 }
2780 } 2853 }
2781 2854
2782 $y += $h; 2855 $y += $h;
2783 } 2856 }
2784
2785 glDisable GL_BLEND;
2786 }; 2857 };
2787 }); 2858 });
2788} 2859}
2789 2860
2790sub reconfigure { 2861sub reconfigure {
… …
2937 3008
2938 $self->{root}->on_post_alloc ("move_$self" => sub { 3009 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner} 3010 my $widget = $self->{owner}
2940 or return; 3011 or return;
2941 3012
3013 if ($widget->{visible}) {
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3014 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943 3015
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3016 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w}; 3017 if $x + $self->{w} > $self->{root}{w};
2946 3018
2947 $self->move_abs ($x, $y); 3019 $self->move_abs ($x, $y);
3020 } else {
3021 $self->hide;
3022 }
2948 }); 3023 });
2949} 3024}
2950 3025
2951sub _draw { 3026sub _draw {
2952 my ($self) = @_; 3027 my ($self) = @_;
… …
3086 for my $item (@{ $self->{items} }) { 3161 for my $item (@{ $self->{items} }) {
3087 my ($widget, $cb, $tooltip) = @$item; 3162 my ($widget, $cb, $tooltip) = @$item;
3088 3163
3089 # handle various types of items, only text for now 3164 # handle various types of items, only text for now
3090 if (!ref $widget) { 3165 if (!ref $widget) {
3166 if ($widget =~ /\t/) {
3167 my ($left, $right) = split /\t/, $widget, 2;
3168
3169 $widget = new CFClient::UI::HBox
3170 can_hover => 1,
3171 can_events => 1,
3172 tooltip => $tooltip,
3173 children => [
3174 (new CFClient::UI::Label markup => $left, expand => 1),
3175 (new CFClient::UI::Label markup => $right, align => +1),
3176 ],
3177 ;
3178
3179 } else {
3091 $widget = new CFClient::UI::Label 3180 $widget = new CFClient::UI::Label
3092 can_hover => 1, 3181 can_hover => 1,
3093 can_events => 1, 3182 can_events => 1,
3094 markup => $widget, 3183 markup => $widget,
3095 tooltip => $tooltip 3184 tooltip => $tooltip;
3185 }
3096 } 3186 }
3097 3187
3098 $self->{item}{$widget} = $item; 3188 $self->{item}{$widget} = $item;
3099 3189
3100 $self->{vbox}->add ($widget); 3190 $self->{vbox}->add ($widget);
… …
3475sub new { 3565sub new {
3476 my $class = shift; 3566 my $class = shift;
3477 3567
3478 my $self = $class->SUPER::new ( 3568 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0], 3569 col_expand => [0, 1, 0],
3570 items => [],
3480 @_, 3571 @_,
3481 ); 3572 );
3482 3573
3574 $self->set_sort_order (undef);
3575
3483 $self 3576 $self
3577}
3578
3579sub update_items {
3580 my ($self) = @_;
3581
3582 $self->clear;
3583
3584 my @item = $self->{sort}->(@{ $self->{items} });
3585
3586 my @adds;
3587 my $row = 0;
3588 for my $item ($self->{sort}->(@{ $self->{items} })) {
3589 CFClient::Item::update_widgets $item;
3590
3591 push @adds, 0, $row, $item->{face_widget};
3592 push @adds, 1, $row, $item->{desc_widget};
3593 push @adds, 2, $row, $item->{weight_widget};
3594
3595 $row++;
3596 }
3597
3598 $self->add (@adds);
3599}
3600
3601sub set_sort_order {
3602 my ($self, $order) = @_;
3603
3604 $self->{sort} = $order ||= sub {
3605 sort {
3606 $a->{type} <=> $b->{type}
3607 or $a->{name} cmp $b->{name}
3608 } @_
3609 };
3610
3611 $self->update_items;
3484} 3612}
3485 3613
3486sub set_items { 3614sub set_items {
3487 my ($self, $items) = @_; 3615 my ($self, $items) = @_;
3488 3616
3489 $self->clear; 3617 $self->{items} = [$items ? values %$items : ()];
3490 return unless $items; 3618 $self->update_items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509} 3619}
3510 3620
3511############################################################################# 3621#############################################################################
3512 3622
3513package CFClient::UI::SpellList; 3623package CFClient::UI::SpellList;
… …
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3932 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823 3933
3824 $w = 0 if $w < 0; 3934 $w = 0 if $w < 0;
3825 $h = 0 if $h < 0; 3935 $h = 0 if $h < 0;
3826 3936
3937 $w = max $widget->{min_w}, $w;
3938 $h = max $widget->{min_h}, $h;
3939
3940 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942
3827 $w = int $w + 0.5; 3943 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 3944 $h = int $h + 0.5;
3829 3945
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3946 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w}; 3947 $widget->{old_w} = $widget->{w};

Diff Legend

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