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.226 by root, Tue May 23 23:14:46 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
144 138
145 $_->update 139 $_->update
146 for @widgets; 140 for @widgets;
147} 141}
148 142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
149# call when resolution changes etc. 151# call when resolution changes etc.
150sub rescale_widgets { 152sub rescale_widgets {
151 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
152 154
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 155 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 165 }
167
168 $widget->reconfigure;
169 } 166 }
167
168 reconfigure_widgets;
170} 169}
171 170
172############################################################################# 171#############################################################################
173 172
174package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 224 },
226 ); 225 );
227} 226}
228 227
229sub hide { 228sub set_invisible {
230 my ($self) = @_; 229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
231 234
232 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
234 248
235 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
236 if $self->{parent}; 250 if $self->{parent};
237} 251}
238 252
… …
338 return if $FOCUS == $self; 352 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
340 354
341 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
342 356
343 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
344 358
345 $focus->update if $focus; 359 $focus->update if $focus;
346 $FOCUS->update; 360 $FOCUS->update;
347} 361}
348 362
… …
351 365
352 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
353 367
354 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
355 369
356 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
357 371
358 $focus->update if $focus; #? 372 $focus->update if $focus; #?
373
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS;
359} 376}
360 377
361sub mouse_motion { } 378sub mouse_motion { }
362sub button_up { } 379sub button_up { }
363sub key_down { } 380sub key_down { }
364sub key_up { } 381sub key_up { }
365 382
366sub button_down { 383sub button_down {
367 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
368 385
369 $self->focus_in; 386 $self->focus_in;
… …
463 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
464 481
465 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 483}
467 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
468sub emit { 491sub emit {
469 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
470 493
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
472} 496}
473 497
474sub DESTROY { 498sub DESTROY {
475 my ($self) = @_; 499 my ($self) = @_;
476 500
… …
816 840
817 my $slider = new CFClient::UI::Slider 841 my $slider = new CFClient::UI::Slider
818 vertical => 1, 842 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 843 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 844 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 845 $self->{vp}->set_offset (0, $_[1]);
822 }, 846 },
823 ; 847 ;
824 848
825 $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 850 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 855 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 856 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 857 $self->add ($self->{slider});
834 858
835 $self 859 $self
860}
861
862sub size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->SUPER::size_allocate ($w, $h);
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 869}
837 870
838#TODO# update range on size_allocate depending on child 871#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 872# update viewport offset on scroll
840 873
… …
894 my $class = shift; 927 my $class = shift;
895 928
896 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
897 930
898 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
901 border => 0.6, 934 border => 0.6,
902 toplevel => 1, 935 is_toplevel => 1,
903 can_events => 1, 936 can_events => 1,
904 @_ 937 @_
905 ); 938 );
906 939
907 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 941 align => 0,
… …
1510 $self->{text} = $text; 1543 $self->{text} = $text;
1511 1544
1512 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1514 1547
1515 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1516} 1549}
1517 1550
1518sub set_text { 1551sub set_text {
1519 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1520 1553
… …
1532 my ($self) = @_; 1565 my ($self) = @_;
1533 1566
1534 my ($w, $h) = $self->SUPER::size_request; 1567 my ($w, $h) = $self->SUPER::size_request;
1535 1568
1536 ($w + 1, $h) # add 1 for cursor 1569 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1570}
1544 1571
1545sub key_down { 1572sub key_down {
1546 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1547 1574
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1593 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1594 $self->_emit ('escape');
1568 } elsif ($uni) { 1595 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1597 }
1571 1598
1572 $self->_set_text ($text); 1599 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1686 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1665 $self->update; 1692 $self->update;
1666 1693
1667 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1744 can_events => 1,
1718 @_ 1745 @_
1719 ) 1746 )
1720} 1747}
1721 1748
1749sub activate { }
1750
1722sub button_up { 1751sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1724 1753
1754 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1757}
1730 1758
1731sub _draw { 1759sub _draw {
1732 my ($self) = @_; 1760 my ($self) = @_;
1733 1761
… …
1785 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1786 1814
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1791 } 1819 }
1792} 1820}
1793 1821
1794sub _draw { 1822sub _draw {
1795 my ($self) = @_; 1823 my ($self) = @_;
… …
2070 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2102 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2104 req_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2105 req_h => $::WIDTH / 80,
2078 vertical => 0, 2106 vertical => 0,
2079 can_hover => 1, 2107 can_hover => 1,
2080 inner_pad => 0.02, 2108 inner_pad => 0.02,
… …
2100 2128
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2130
2103 $hi = $lo + 1 if $hi <= $lo; 2131 $hi = $lo + 1 if $hi <= $lo;
2104 2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2105 $value = $lo if $value < $lo; 2135 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2136 $value = $hi - $page if $value > $hi - $page;
2107 2137
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2139 if $unit;
2110 2140
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2142
2115 if ($value != $old_value) { 2143 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2144 $self->_emit (changed => $value);
2117 $self->update; 2145 $self->update;
2118 } 2146 }
2119} 2147}
2120 2148
2121sub size_request { 2149sub size_request {
… …
2129 2157
2130sub button_down { 2158sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
2132 2160
2133 $self->SUPER::button_down ($ev, $x, $y); 2161 $self->SUPER::button_down ($ev, $x, $y);
2162
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164
2134 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
2135} 2166}
2136 2167
2137sub mouse_motion { 2168sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
… …
2140 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2173
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2175
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2177
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2148 } 2179 }
2149} 2180}
2150 2181
2151sub update { 2182sub update {
2152 my ($self) = @_; 2183 my ($self) = @_;
2153 2184
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]); 2186 $self->set_value ($self->{range}[0]);
2156 2187
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
2158 2190
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2192
2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2193 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2162 2195
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2196 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2197 $value = $value * $self->{scale} + $self->{offset};
2165 2198
2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value; 2199 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2200 $self->{knob_w} = $knob_w;
2173 }); 2201 });
2174 2202
2175 $self->SUPER::update; 2203 $self->SUPER::update;
2176} 2204}
2177 2205
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2322
2295 $self->reflow; 2323 $self->reflow;
2296} 2324}
2297 2325
2298sub text_height { 2326sub text_size {
2299 my ($self, $text, $indent) = @_; 2327 my ($self, $text, $indent) = @_;
2300 2328
2301 my $layout = $self->{layout}; 2329 my $layout = $self->{layout};
2302 2330
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2332 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2333 $layout->set_markup ($text);
2306 2334
2307 ($layout->size)[1] 2335 $layout->size
2308} 2336}
2309 2337
2310sub reflow { 2338sub reflow {
2311 my ($self) = @_; 2339 my ($self) = @_;
2312 2340
2313 $self->{need_reflow}++; 2341 $self->{need_reflow}++;
2314 $self->update; 2342 $self->update;
2315} 2343}
2316 2344
2345sub set_offset {
2346 my ($self, $offset) = @_;
2347
2348 # todo: base offset on lines or so, not on pixels
2349 $self->{children}[1]->set_value ($offset);
2350}
2351
2317sub clear { 2352sub clear {
2318 my ($self) = @_; 2353 my ($self) = @_;
2319 2354
2320 $self->{par} = []; 2355 $self->{par} = [];
2321 $self->{height} = 0; 2356 $self->{height} = 0;
2322 2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2323 $self->reflow;
2324} 2358}
2325 2359
2326sub add_paragraph { 2360sub add_paragraph {
2327 my ($self, $color, $text, $indent) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2328 2362
2329 for my $line (split /\n/, $text) { 2363 for my $line (split /\n/, $text) {
2330 my $height = $self->text_height ($line); 2364 my ($w, $h) = $self->text_size ($line);
2331 $self->{height} += $height; 2365 $self->{height} += $h;
2332 push @{$self->{par}}, [$height, $color, $indent, $line]; 2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2333 } 2367 }
2334 2368
2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2336 $self->{children}[1]->update;
2337} 2370}
2338 2371
2339sub update { 2372sub update {
2340 my ($self) = @_; 2373 my ($self) = @_;
2341 2374
… …
2344 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2345 2378
2346 delete $self->{texture}; 2379 delete $self->{texture};
2347 2380
2348 $ROOT->on_post_alloc ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2349 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2350 my $height = 0; 2385 my $height = 0;
2351 2386
2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2353 for @{$self->{par}}; 2391 for (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2393 $layout->set_width ($W - $_->[3]);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3];
2397 $_->[1] = $h;
2398 }
2399
2400 $height += $_->[1];
2401 }
2354 2402
2355 $self->{height} = $height; 2403 $self->{height} = $height;
2356 2404
2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2358 $self->{children}[1]->update;
2359 2406
2360 delete $self->{texture}; 2407 delete $self->{texture};
2361 } 2408 }
2362 2409
2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2364 glClearColor 0.5, 0.5, 0.5, 0; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2365 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2366 2413
2367 my $top = int $self->{children}[1]{range}[0]; 2414 my $top = int $self->{children}[1]{range}[0];
2368 2415
2369 my $y0 = $top; 2416 my $y0 = $top;
2370 my $y1 = $top + $self->{h}; 2417 my $y1 = $top + $H;
2371 2418
2372 my $y = 0; 2419 my $y = 0;
2373 2420
2374 my $layout = $self->{layout}; 2421 my $layout = $self->{layout};
2375 2422
2376 $layout->set_font ($self->{font}) if $self->{font}; 2423 $layout->set_font ($self->{font}) if $self->{font};
2377 2424
2378 glEnable GL_BLEND; 2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380 2428
2381 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2382 my $h = $par->[0]; 2430 my $h = $par->[1];
2383 2431
2384 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] }); 2433 $layout->set_foreground (@{ $par->[2] });
2386 $layout->set_width ($self->{w} - $par->[2]); 2434 $layout->set_width ($W - $par->[3]);
2387 $layout->set_markup ($par->[3]); 2435 $layout->set_markup ($par->[4]);
2388 2436
2389 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2390 2438
2391 glRasterPos $par->[2], $y - $y0; 2439 glRasterPos $par->[3], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2393 } 2441 }
2394 2442
2395 $y += $h; 2443 $y += $h;
2396 } 2444 }
… …
2483 2531
2484 # TODO: use animation 2532 # TODO: use animation
2485 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2486 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2487 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2488 $self->emit ("open"); 2536 $self->_emit ("open");
2489 } else { 2537 } else {
2490 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2491 $self->emit ("close"); 2539 $self->_emit ("close");
2492 } 2540 }
2493 2541
2494 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2495} 2543}
2496 2544
2497############################################################################# 2545#############################################################################
2498 2546
2499package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2611} 2659}
2612 2660
2613sub _draw { 2661sub _draw {
2614 my ($self) = @_; 2662 my ($self) = @_;
2615 2663
2616 return unless $::CONN;#d# manage and cache textures differently 2664 return unless $::CONN;
2617 2665
2618 my $face; 2666 my $face;
2619 2667
2620 if ($self->{frame}) { 2668 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}]; 2669 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2847 2895
2848# popup given the event (must be a mouse button down event currently) 2896# popup given the event (must be a mouse button down event currently)
2849sub popup { 2897sub popup {
2850 my ($self, $ev) = @_; 2898 my ($self, $ev) = @_;
2851 2899
2852 $self->emit ("popdown"); 2900 $self->_emit ("popdown");
2853 2901
2854 # maybe save $GRAB? must be careful about events... 2902 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 2903 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 2904 $self->{button} = $ev->{button};
2857 2905
… …
2872 2920
2873 if ($ev->{button} == $self->{button}) { 2921 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 2922 undef $GRAB;
2875 $self->hide; 2923 $self->hide;
2876 2924
2877 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 2926 $self->{hover}[1]->() if $self->{hover};
2879 } 2927 }
2880} 2928}
2881 2929
2882############################################################################# 2930#############################################################################
… …
3024} 3072}
3025 3073
3026sub size_allocate { 3074sub size_allocate {
3027 my ($self, $w, $h) = @_; 3075 my ($self, $w, $h) = @_;
3028 3076
3029 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3030 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3031
3032 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3033 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3034
3035 for my $child ($self->children) { 3077 for my $child ($self->children) {
3036 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3037 3079
3038 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3039 if exists $child->{req_x}; 3081 if exists $child->{req_x};
… …
3068} 3110}
3069 3111
3070sub add { 3112sub add {
3071 my ($self, @children) = @_; 3113 my ($self, @children) = @_;
3072 3114
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3073 for my $child (@children) { 3121 for my $child (@children) {
3074 $child->{toplevel} = 1; 3122 $child->{is_toplevel} = 1;
3075 3123
3076 # integerise window positions 3124 # integerise window positions
3077 $child->{x} = int $child->{x}; 3125 $child->{x} = int $child->{x};
3078 $child->{y} = int $child->{y}; 3126 $child->{y} = int $child->{y};
3079 } 3127 }
3080 3128
3081 $self->SUPER::add (@children); 3129 $self->SUPER::add (@children);
3130}
3131
3132sub remove {
3133 my ($self, @children) = @_;
3134
3135 $self->SUPER::remove (@children);
3082 3136
3083 while (@children) { 3137 while (@children) {
3084 my $w = pop @children; 3138 my $w = pop @children;
3085 push @children, $w->children; 3139 push @children, $w->children;
3086 $w->{visible} = 1; 3140 $w->set_invisible;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 } 3141 }
3100} 3142}
3101 3143
3102sub on_refresh { 3144sub on_refresh {
3103 my ($self, $id, $cb) = @_; 3145 my ($self, $id, $cb) = @_;
… …
3157 $w = 0 if $w < 0; 3199 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3200 $h = 0 if $h < 0;
3159 3201
3160 $widget->{w} = $w; 3202 $widget->{w} = $w;
3161 $widget->{h} = $h; 3203 $widget->{h} = $h;
3162 $widget->size_allocate ($w, $h);
3163 $widget->emit (size_allocate => $w, $h); 3204 $widget->emit (size_allocate => $w, $h);
3164 } 3205 }
3165 } 3206 }
3166 3207
3167 while ($self->{post_alloc_hook}) { 3208 while ($self->{post_alloc_hook}) {

Diff Legend

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