… | |
… | |
5 | |
5 | |
6 | use Scalar::Util (); |
6 | use Scalar::Util (); |
7 | use List::Util (); |
7 | use List::Util (); |
8 | |
8 | |
9 | use CFClient; |
9 | use CFClient; |
|
|
10 | use CFClient::Texture; |
10 | |
11 | |
11 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
12 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
12 | |
13 | |
|
|
14 | our $LAYOUT; |
13 | our $ROOT; |
15 | our $ROOT; |
14 | our $TOOLTIP; |
16 | our $TOOLTIP; |
15 | our $BUTTON_STATE; |
17 | our $BUTTON_STATE; |
16 | |
18 | |
17 | our %WIDGET; # all widgets, weak-referenced |
19 | our %WIDGET; # all widgets, weak-referenced |
|
|
20 | |
|
|
21 | sub get_layout { |
|
|
22 | for (grep { $_->{name} } values %WIDGET) { |
|
|
23 | $LAYOUT->{$_->{name}} = { |
|
|
24 | x => $_->{x} / $::WIDTH, |
|
|
25 | y => $_->{y} / $::HEIGHT, |
|
|
26 | w => $_->{w} / $::WIDTH, |
|
|
27 | h => $_->{h} / $::HEIGHT |
|
|
28 | }; |
|
|
29 | } |
|
|
30 | |
|
|
31 | return $LAYOUT; |
|
|
32 | } |
|
|
33 | |
|
|
34 | sub set_layout { |
|
|
35 | my ($layout) = @_; |
|
|
36 | $LAYOUT = $layout; |
|
|
37 | } |
18 | |
38 | |
19 | sub check_tooltip { |
39 | sub check_tooltip { |
20 | if (!$GRAB) { |
40 | if (!$GRAB) { |
21 | for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { |
41 | for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { |
22 | if (length $widget->{tooltip}) { |
42 | if (length $widget->{tooltip}) { |
… | |
… | |
50 | delete $TOOLTIP->{owner}; |
70 | delete $TOOLTIP->{owner}; |
51 | } |
71 | } |
52 | |
72 | |
53 | # class methods for events |
73 | # class methods for events |
54 | sub feed_sdl_key_down_event { |
74 | sub feed_sdl_key_down_event { |
55 | $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) |
75 | $FOCUS->emit (key_down => $_[0]) |
56 | if $FOCUS; |
76 | if $FOCUS; |
57 | } |
77 | } |
58 | |
78 | |
59 | sub feed_sdl_key_up_event { |
79 | sub feed_sdl_key_up_event { |
60 | $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) |
80 | $FOCUS->emit (key_up => $_[0]) |
61 | if $FOCUS; |
81 | if $FOCUS; |
62 | } |
82 | } |
63 | |
83 | |
64 | sub feed_sdl_button_down_event { |
84 | sub feed_sdl_button_down_event { |
65 | my ($ev) = @_; |
85 | my ($ev) = @_; |
… | |
… | |
74 | check_tooltip; |
94 | check_tooltip; |
75 | } |
95 | } |
76 | |
96 | |
77 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
97 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
78 | |
98 | |
79 | if ($GRAB) { |
99 | $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) |
80 | ($x, $y) = $GRAB->coord2local ($x, $y); |
100 | if $GRAB; |
81 | $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); |
|
|
82 | } |
|
|
83 | } |
101 | } |
84 | |
102 | |
85 | sub feed_sdl_button_up_event { |
103 | sub feed_sdl_button_up_event { |
86 | my ($ev) = @_; |
104 | my ($ev) = @_; |
87 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
105 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
88 | |
106 | |
89 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
107 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
90 | |
108 | |
91 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
109 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
92 | |
110 | |
93 | if ($GRAB) { |
111 | $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) |
94 | ($x, $y) = $GRAB->coord2local ($x, $y); |
112 | if $GRAB; |
95 | $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y); |
|
|
96 | } |
|
|
97 | |
113 | |
98 | if (!$BUTTON_STATE) { |
114 | if (!$BUTTON_STATE) { |
99 | my $grab = $GRAB; undef $GRAB; |
115 | my $grab = $GRAB; undef $GRAB; |
100 | $grab->update if $grab; |
116 | $grab->update if $grab; |
101 | $GRAB->update if $GRAB; |
117 | $GRAB->update if $GRAB; |
… | |
… | |
117 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
133 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
118 | |
134 | |
119 | check_tooltip; |
135 | check_tooltip; |
120 | } |
136 | } |
121 | |
137 | |
122 | if ($HOVER) { |
|
|
123 | ($x, $y) = $HOVER->coord2local ($x, $y); |
|
|
124 | $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); |
138 | $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) |
125 | } |
139 | if $HOVER; |
126 | } |
140 | } |
127 | |
141 | |
128 | # convert position array to integers |
142 | # convert position array to integers |
129 | sub harmonize { |
143 | sub harmonize { |
130 | my ($vals) = @_; |
144 | my ($vals) = @_; |
… | |
… | |
144 | |
158 | |
145 | $_->update |
159 | $_->update |
146 | for @widgets; |
160 | for @widgets; |
147 | } |
161 | } |
148 | |
162 | |
|
|
163 | sub reconfigure_widgets { |
|
|
164 | # make a copy, otherwise C<for> complains about freed values. |
|
|
165 | my @widgets = values %WIDGET; |
|
|
166 | |
|
|
167 | $_->reconfigure |
|
|
168 | for @widgets; |
|
|
169 | } |
|
|
170 | |
149 | # call when resolution changes etc. |
171 | # call when resolution changes etc. |
150 | sub rescale_widgets { |
172 | sub rescale_widgets { |
151 | my ($sx, $sy) = @_; |
173 | my ($sx, $sy) = @_; |
152 | |
174 | |
153 | # make a copy, otherwise for complains about freed values. |
|
|
154 | my @widgets = values %WIDGET; |
175 | for my $widget (values %WIDGET) { |
155 | |
|
|
156 | for my $widget (@widgets) { |
|
|
157 | if ($widget->{toplevel}) { |
176 | if ($widget->{is_toplevel}) { |
158 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
177 | $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}; |
178 | $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}; |
179 | $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}; |
180 | $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}; |
181 | $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}; |
182 | $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}; |
183 | $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}; |
184 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
166 | } |
185 | } |
167 | |
|
|
168 | $widget->reconfigure; |
|
|
169 | } |
186 | } |
|
|
187 | |
|
|
188 | reconfigure_widgets; |
170 | } |
189 | } |
171 | |
190 | |
172 | ############################################################################# |
191 | ############################################################################# |
173 | |
192 | |
174 | package CFClient::UI::Base; |
193 | package CFClient::UI::Base; |
… | |
… | |
187 | can_events => 1, |
206 | can_events => 1, |
188 | @_ |
207 | @_ |
189 | }, $class; |
208 | }, $class; |
190 | |
209 | |
191 | for (keys %$self) { |
210 | for (keys %$self) { |
192 | if (/^connect_(.*)$/) { |
211 | if (/^on_(.*)$/) { |
193 | $self->connect ($1 => delete $self->{$_}); |
212 | $self->connect ($1 => delete $self->{$_}); |
194 | } |
213 | } |
195 | } |
214 | } |
196 | |
215 | |
197 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
216 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
198 | |
217 | |
|
|
218 | if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { |
|
|
219 | $self->{user_x} = $layout->{x} * $::WIDTH; |
|
|
220 | $self->{user_y} = $layout->{y} * $::HEIGHT; |
|
|
221 | $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; |
|
|
222 | $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; |
|
|
223 | } |
|
|
224 | |
199 | $self |
225 | $self |
|
|
226 | } |
|
|
227 | |
|
|
228 | sub toggle_visibility { |
|
|
229 | my ($self) = @_; |
|
|
230 | |
|
|
231 | if ($self->{visible}) { |
|
|
232 | $self->hide; |
|
|
233 | } else { |
|
|
234 | $self->show; |
|
|
235 | } |
200 | } |
236 | } |
201 | |
237 | |
202 | sub destroy { |
238 | sub destroy { |
203 | my ($self) = @_; |
239 | my ($self) = @_; |
204 | |
240 | |
… | |
… | |
206 | %$self = (); |
242 | %$self = (); |
207 | } |
243 | } |
208 | |
244 | |
209 | sub show { |
245 | sub show { |
210 | my ($self) = @_; |
246 | my ($self) = @_; |
211 | |
|
|
212 | for (my @w = $self; @w; ) { |
|
|
213 | my $w = pop @w; |
|
|
214 | push @w, $w->children; |
|
|
215 | $w->{visible} = 1; |
|
|
216 | } |
|
|
217 | |
|
|
218 | return if $self->{parent}; |
247 | return if $self->{parent}; |
219 | |
248 | |
220 | $CFClient::UI::ROOT->add ($self); |
249 | $CFClient::UI::ROOT->add ($self); |
221 | } |
250 | } |
222 | |
251 | |
223 | sub hide { |
252 | sub show_centered { |
224 | my ($self) = @_; |
253 | my ($self) = @_; |
|
|
254 | return if $self->{parent}; |
225 | |
255 | |
226 | for (my @w = $self; @w; ) { |
256 | $self->show; |
227 | my $w = pop @w; |
257 | |
228 | push @w, $w->children; |
258 | $CFClient::UI::ROOT->on_post_alloc ( |
229 | $w->{visible} = 1; |
259 | "centered $self" => sub { |
230 | } |
260 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
|
|
261 | }, |
|
|
262 | ); |
|
|
263 | } |
|
|
264 | |
|
|
265 | sub set_invisible { |
|
|
266 | my ($self) = @_; |
|
|
267 | |
|
|
268 | return unless $self->{visible}; |
|
|
269 | |
|
|
270 | # broken show/hide model |
|
|
271 | |
|
|
272 | delete $self->{root}; |
|
|
273 | delete $self->{visible}; |
231 | |
274 | |
232 | undef $GRAB if $GRAB == $self; |
275 | undef $GRAB if $GRAB == $self; |
233 | undef $HOVER if $HOVER == $self; |
276 | undef $HOVER if $HOVER == $self; |
|
|
277 | |
|
|
278 | CFClient::UI::check_tooltip |
|
|
279 | if $CFClient::UI::TOOLTIP->{owner} == $self; |
|
|
280 | |
|
|
281 | $self->focus_out; |
|
|
282 | |
|
|
283 | $self->emit (visibility_change => 0); |
|
|
284 | } |
|
|
285 | |
|
|
286 | sub hide { |
|
|
287 | my ($self) = @_; |
|
|
288 | |
|
|
289 | $self->set_invisible; |
234 | |
290 | |
235 | $self->{parent}->remove ($self) |
291 | $self->{parent}->remove ($self) |
236 | if $self->{parent}; |
292 | if $self->{parent}; |
237 | } |
293 | } |
238 | |
294 | |
… | |
… | |
308 | } |
364 | } |
309 | |
365 | |
310 | sub set_tooltip { |
366 | sub set_tooltip { |
311 | my ($self, $tooltip) = @_; |
367 | my ($self, $tooltip) = @_; |
312 | |
368 | |
|
|
369 | $tooltip =~ s/^\s+//; |
|
|
370 | $tooltip =~ s/\s+$//; |
|
|
371 | |
|
|
372 | return if $self->{tooltip} eq $tooltip; |
|
|
373 | |
313 | $self->{tooltip} = $tooltip; |
374 | $self->{tooltip} = $tooltip; |
314 | |
375 | |
315 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
376 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
316 | delete $CFClient::UI::TOOLTIP->{owner}; |
377 | delete $CFClient::UI::TOOLTIP->{owner}; |
317 | CFClient::UI::check_tooltip; |
378 | CFClient::UI::check_tooltip; |
… | |
… | |
338 | return if $FOCUS == $self; |
399 | return if $FOCUS == $self; |
339 | return unless $self->{can_focus}; |
400 | return unless $self->{can_focus}; |
340 | |
401 | |
341 | my $focus = $FOCUS; $FOCUS = $self; |
402 | my $focus = $FOCUS; $FOCUS = $self; |
342 | |
403 | |
343 | $self->emit (focus_in => $focus); |
404 | $self->_emit (focus_in => $focus); |
344 | |
405 | |
345 | $focus->update if $focus; |
406 | $focus->update if $focus; |
346 | $FOCUS->update; |
407 | $FOCUS->update; |
347 | } |
408 | } |
348 | |
409 | |
… | |
… | |
351 | |
412 | |
352 | return unless $FOCUS == $self; |
413 | return unless $FOCUS == $self; |
353 | |
414 | |
354 | my $focus = $FOCUS; undef $FOCUS; |
415 | my $focus = $FOCUS; undef $FOCUS; |
355 | |
416 | |
356 | $self->emit (focus_out => $focus); |
417 | $self->_emit (focus_out => $focus); |
357 | |
418 | |
358 | $focus->update if $focus; #? |
419 | $focus->update if $focus; #? |
|
|
420 | |
|
|
421 | $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus |
|
|
422 | unless $FOCUS; |
359 | } |
423 | } |
360 | |
424 | |
361 | sub mouse_motion { } |
425 | sub mouse_motion { } |
362 | sub button_up { } |
426 | sub button_up { } |
363 | sub key_down { } |
427 | sub key_down { } |
364 | sub key_up { } |
428 | sub key_up { } |
365 | |
429 | |
366 | sub button_down { |
430 | sub button_down { |
367 | my ($self, $ev, $x, $y) = @_; |
431 | my ($self, $ev, $x, $y) = @_; |
368 | |
432 | |
369 | $self->focus_in; |
433 | $self->focus_in; |
… | |
… | |
403 | if ($ENV{PCLIENT_DEBUG}) { |
467 | if ($ENV{PCLIENT_DEBUG}) { |
404 | glPushMatrix; |
468 | glPushMatrix; |
405 | glColor 1, 1, 0, 1; |
469 | glColor 1, 1, 0, 1; |
406 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
470 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
407 | glBegin GL_LINE_LOOP; |
471 | glBegin GL_LINE_LOOP; |
408 | glVertex 0 , 0; |
472 | glVertex 0 , 0; |
409 | glVertex $self->{w}, 0; |
473 | glVertex $self->{w} - 1, 0; |
410 | glVertex $self->{w}, $self->{h}; |
474 | glVertex $self->{w} - 1, $self->{h} - 1; |
411 | glVertex 0 , $self->{h}; |
475 | glVertex 0 , $self->{h} - 1; |
412 | glEnd; |
476 | glEnd; |
413 | glPopMatrix; |
477 | glPopMatrix; |
414 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
478 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
415 | } |
479 | } |
416 | } |
480 | } |
… | |
… | |
436 | sub set_parent { |
500 | sub set_parent { |
437 | my ($self, $parent) = @_; |
501 | my ($self, $parent) = @_; |
438 | |
502 | |
439 | Scalar::Util::weaken ($self->{parent} = $parent); |
503 | Scalar::Util::weaken ($self->{parent} = $parent); |
440 | |
504 | |
|
|
505 | if ($parent->{visible} || 1) { |
|
|
506 | $self->{root} = $parent->{root}; |
|
|
507 | $self->{visible} = $parent->{visible} + 1; |
|
|
508 | |
|
|
509 | $self->emit (visibility_change => 1) |
|
|
510 | unless $self->{parent}{visible}; |
|
|
511 | } |
|
|
512 | |
441 | # TODO: req_w _does_change after ->reconfigure |
513 | # TODO: req_w _does_change after ->reconfigure |
442 | $self->check_size |
514 | $self->check_size |
443 | unless exists $self->{req_w}; |
515 | unless exists $self->{req_w}; |
444 | |
516 | |
445 | $self->show; |
517 | $self->show; |
… | |
… | |
463 | my ($self, $signal, $cb) = @_; |
535 | my ($self, $signal, $cb) = @_; |
464 | |
536 | |
465 | push @{ $self->{signal_cb}{$signal} }, $cb; |
537 | push @{ $self->{signal_cb}{$signal} }, $cb; |
466 | } |
538 | } |
467 | |
539 | |
|
|
540 | sub _emit { |
|
|
541 | my ($self, $signal, @args) = @_; |
|
|
542 | |
|
|
543 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
|
|
544 | } |
|
|
545 | |
468 | sub emit { |
546 | sub emit { |
469 | my ($self, $signal, @args) = @_; |
547 | my ($self, $signal, @args) = @_; |
470 | |
548 | |
471 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
549 | $self->_emit ($signal, @args) |
|
|
550 | || $self->$signal (@args); |
|
|
551 | } |
|
|
552 | |
|
|
553 | sub visibility_change { |
|
|
554 | #my ($self, $visible) = @_; |
472 | } |
555 | } |
473 | |
556 | |
474 | sub DESTROY { |
557 | sub DESTROY { |
475 | my ($self) = @_; |
558 | my ($self) = @_; |
476 | |
559 | |
… | |
… | |
589 | delete $child->{parent}; |
672 | delete $child->{parent}; |
590 | $child->hide; |
673 | $child->hide; |
591 | |
674 | |
592 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
675 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
593 | |
676 | |
594 | $self->check_size; |
677 | $self->check_size (1); |
595 | $self->update; |
678 | $self->update; |
596 | } |
679 | } |
597 | |
680 | |
598 | sub clear { |
681 | sub clear { |
599 | my ($self) = @_; |
682 | my ($self) = @_; |
… | |
… | |
739 | |
822 | |
740 | package CFClient::UI::ViewPort; |
823 | package CFClient::UI::ViewPort; |
741 | |
824 | |
742 | our @ISA = CFClient::UI::Window::; |
825 | our @ISA = CFClient::UI::Window::; |
743 | |
826 | |
|
|
827 | sub new { |
|
|
828 | my $class = shift; |
|
|
829 | |
|
|
830 | $class->SUPER::new ( |
|
|
831 | scroll_x => 0, |
|
|
832 | scroll_y => 1, |
|
|
833 | @_, |
|
|
834 | ) |
|
|
835 | } |
|
|
836 | |
744 | sub size_request { |
837 | sub size_request { |
745 | my ($self) = @_; |
838 | my ($self) = @_; |
746 | |
839 | |
747 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
840 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
748 | $self->child->configure (0, 0, @$self{qw(child_w child_h)}); |
|
|
749 | |
841 | |
750 | @$self{qw(child_w child_h)} |
842 | @$self{qw(child_w child_h)} |
751 | } |
843 | } |
752 | |
844 | |
753 | sub size_allocate { |
845 | sub size_allocate { |
754 | my ($self, $w, $h) = @_; |
846 | my ($self, $w, $h) = @_; |
755 | |
847 | |
|
|
848 | $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; |
|
|
849 | $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; |
|
|
850 | |
|
|
851 | $self->child->configure (0, 0, $w, $h); |
756 | $self->update; |
852 | $self->update; |
757 | } |
853 | } |
758 | |
854 | |
759 | sub set_offset { |
855 | sub set_offset { |
760 | my ($self, $x, $y) = @_; |
856 | my ($self, $x, $y) = @_; |
… | |
… | |
811 | my $class = shift; |
907 | my $class = shift; |
812 | |
908 | |
813 | my $self; |
909 | my $self; |
814 | |
910 | |
815 | my $slider = new CFClient::UI::Slider |
911 | my $slider = new CFClient::UI::Slider |
816 | vertical => 1, |
912 | vertical => 1, |
817 | range => [0, 0, 1, 0.01], # HACK fix |
913 | range => [0, 0, 1, 0.01], # HACK fix |
818 | connect_changed => sub { |
914 | on_changed => sub { |
819 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
915 | $self->{vp}->set_offset (0, $_[1]); |
820 | }, |
916 | }, |
821 | ; |
917 | ; |
822 | |
918 | |
823 | $self = $class->SUPER::new ( |
919 | $self = $class->SUPER::new ( |
824 | vp => (new CFClient::UI::ViewPort expand => 1), |
920 | vp => (new CFClient::UI::ViewPort expand => 1), |
… | |
… | |
829 | $self->{vp}->add ($self->{scrolled}); |
925 | $self->{vp}->add ($self->{scrolled}); |
830 | $self->add ($self->{vp}); |
926 | $self->add ($self->{vp}); |
831 | $self->add ($self->{slider}); |
927 | $self->add ($self->{slider}); |
832 | |
928 | |
833 | $self |
929 | $self |
|
|
930 | } |
|
|
931 | |
|
|
932 | sub update { |
|
|
933 | my ($self) = @_; |
|
|
934 | |
|
|
935 | $self->SUPER::update; |
|
|
936 | |
|
|
937 | # todo: overwrite size_allocate of child |
|
|
938 | my $child = $self->{vp}->child; |
|
|
939 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
|
|
940 | } |
|
|
941 | |
|
|
942 | sub size_allocate { |
|
|
943 | my ($self, $w, $h) = @_; |
|
|
944 | |
|
|
945 | $self->SUPER::size_allocate ($w, $h); |
|
|
946 | |
|
|
947 | my $child = $self->{vp}->child; |
|
|
948 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
834 | } |
949 | } |
835 | |
950 | |
836 | #TODO# update range on size_allocate depending on child |
951 | #TODO# update range on size_allocate depending on child |
837 | # update viewport offset on scroll |
952 | # update viewport offset on scroll |
838 | |
953 | |
… | |
… | |
892 | my $class = shift; |
1007 | my $class = shift; |
893 | |
1008 | |
894 | # TODO: user_x, user_y, overwrite moveto? |
1009 | # TODO: user_x, user_y, overwrite moveto? |
895 | |
1010 | |
896 | my $self = $class->SUPER::new ( |
1011 | my $self = $class->SUPER::new ( |
897 | bg => [1, 1, 1, 1], |
1012 | bg => [1, 1, 1, 1], |
898 | border_bg => [1, 1, 1, 1], |
1013 | border_bg => [1, 1, 1, 1], |
899 | border => 0.6, |
1014 | border => 0.6, |
900 | toplevel => 1, |
1015 | is_toplevel => 1, |
901 | can_events => 1, |
1016 | can_events => 1, |
902 | @_ |
1017 | @_ |
903 | ); |
1018 | ); |
904 | |
1019 | |
905 | $self->{title} &&= new CFClient::UI::Label |
1020 | $self->{title} &&= new CFClient::UI::Label |
906 | align => 0, |
1021 | align => 0, |
… | |
… | |
959 | my ($ev, $x, $y) = @_; |
1074 | my ($ev, $x, $y) = @_; |
960 | |
1075 | |
961 | my $dx = $ev->{x} - $ox; |
1076 | my $dx = $ev->{x} - $ox; |
962 | my $dy = $ev->{y} - $oy; |
1077 | my $dy = $ev->{y} - $oy; |
963 | |
1078 | |
|
|
1079 | $self->{user_x} = $wx + $dx * $mx; |
|
|
1080 | $self->{user_y} = $wy + $dy * $my; |
964 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
1081 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
965 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
1082 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
966 | $self->move ($wx + $dx * $mx, $wy + $dy * $my); |
1083 | $self->move ($self->{user_x}, $self->{user_y}); |
967 | $self->check_size; |
1084 | $self->check_size; |
968 | }; |
1085 | }; |
969 | |
1086 | |
970 | } elsif ($lr ^ $td) { |
1087 | } elsif ($lr ^ $td) { |
971 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
1088 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
… | |
… | |
974 | $self->{motion} = sub { |
1091 | $self->{motion} = sub { |
975 | my ($ev, $x, $y) = @_; |
1092 | my ($ev, $x, $y) = @_; |
976 | |
1093 | |
977 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1094 | ($x, $y) = ($ev->{x}, $ev->{y}); |
978 | |
1095 | |
979 | $self->move ($bx + $x - $ox, $by + $y - $oy); |
1096 | $self->{user_x} = $bx + $x - $ox; |
|
|
1097 | $self->{user_y} = $by + $y - $oy; |
|
|
1098 | $self->move ($self->{user_x}, $self->{user_y}); |
980 | $self->update; |
1099 | $self->update; |
981 | }; |
1100 | }; |
982 | } |
1101 | } |
983 | } |
1102 | } |
984 | |
1103 | |
… | |
… | |
1046 | sub new { |
1165 | sub new { |
1047 | my $class = shift; |
1166 | my $class = shift; |
1048 | |
1167 | |
1049 | $class->SUPER::new ( |
1168 | $class->SUPER::new ( |
1050 | col_expand => [], |
1169 | col_expand => [], |
1051 | @_ |
1170 | @_, |
1052 | ) |
1171 | ) |
|
|
1172 | } |
|
|
1173 | |
|
|
1174 | sub children { |
|
|
1175 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1053 | } |
1176 | } |
1054 | |
1177 | |
1055 | sub add { |
1178 | sub add { |
1056 | my ($self, $x, $y, $child) = @_; |
1179 | my ($self, $x, $y, $child) = @_; |
1057 | |
1180 | |
1058 | $child->set_parent ($self); |
1181 | $child->set_parent ($self); |
1059 | $self->{children}[$y][$x] = $child; |
1182 | $self->{children}[$y][$x] = $child; |
1060 | |
1183 | |
1061 | $child->check_size; |
1184 | $self->check_size (1); |
1062 | } |
1185 | } |
1063 | |
1186 | |
1064 | sub children { |
|
|
1065 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
1066 | } |
|
|
1067 | |
|
|
1068 | # TODO: move to container class maybe? send childs a signal on removal? |
1187 | # TODO: move to container class maybe? send children a signal on removal? |
1069 | sub clear { |
1188 | sub clear { |
1070 | my ($self) = @_; |
1189 | my ($self) = @_; |
1071 | |
1190 | |
1072 | my @children = $self->children; |
1191 | my @children = $self->children; |
1073 | delete $self->{children}; |
1192 | delete $self->{children}; |
… | |
… | |
1075 | for (@children) { |
1194 | for (@children) { |
1076 | delete $_->{parent}; |
1195 | delete $_->{parent}; |
1077 | $_->hide; |
1196 | $_->hide; |
1078 | } |
1197 | } |
1079 | |
1198 | |
|
|
1199 | $self->check_size (1); |
1080 | $self->update; |
1200 | $self->update; |
1081 | } |
1201 | } |
1082 | |
1202 | |
1083 | sub get_wh { |
1203 | sub get_wh { |
1084 | my ($self) = @_; |
1204 | my ($self) = @_; |
… | |
… | |
1116 | sub size_allocate { |
1236 | sub size_allocate { |
1117 | my ($self, $w, $h) = @_; |
1237 | my ($self, $w, $h) = @_; |
1118 | |
1238 | |
1119 | my ($ws, $hs) = $self->get_wh; |
1239 | my ($ws, $hs) = $self->get_wh; |
1120 | |
1240 | |
1121 | my $req_w = sum @$ws; |
1241 | my $req_w = (sum @$ws) || 1; |
1122 | my $req_h = sum @$hs; |
1242 | my $req_h = (sum @$hs) || 1; |
1123 | |
1243 | |
1124 | # TODO: nicer code && do row_expand |
1244 | # TODO: nicer code && do row_expand |
1125 | my @col_expand = @{$self->{col_expand}}; |
1245 | my @col_expand = @{$self->{col_expand}}; |
1126 | @col_expand = (1) x @$ws unless @col_expand; |
1246 | @col_expand = (1) x @$ws unless @col_expand; |
1127 | my $col_expand = (sum @col_expand) || 1; |
1247 | my $col_expand = (sum @col_expand) || 1; |
… | |
… | |
1488 | active_fg => [0, 0, 0], |
1608 | active_fg => [0, 0, 0], |
1489 | can_hover => 1, |
1609 | can_hover => 1, |
1490 | can_focus => 1, |
1610 | can_focus => 1, |
1491 | valign => 0, |
1611 | valign => 0, |
1492 | can_events => 1, |
1612 | can_events => 1, |
|
|
1613 | #text => ... |
1493 | @_ |
1614 | @_ |
1494 | ) |
1615 | ) |
1495 | } |
1616 | } |
1496 | |
1617 | |
1497 | sub _set_text { |
1618 | sub _set_text { |
… | |
… | |
1507 | $self->{text} = $text; |
1628 | $self->{text} = $text; |
1508 | |
1629 | |
1509 | $text =~ s/./*/g if $self->{hidden}; |
1630 | $text =~ s/./*/g if $self->{hidden}; |
1510 | $self->{layout}->set_text ("$text "); |
1631 | $self->{layout}->set_text ("$text "); |
1511 | |
1632 | |
1512 | $self->emit (changed => $self->{text}); |
1633 | $self->_emit (changed => $self->{text}); |
1513 | } |
1634 | } |
1514 | |
1635 | |
1515 | sub set_text { |
1636 | sub set_text { |
1516 | my ($self, $text) = @_; |
1637 | my ($self, $text) = @_; |
1517 | |
1638 | |
… | |
… | |
1529 | my ($self) = @_; |
1650 | my ($self) = @_; |
1530 | |
1651 | |
1531 | my ($w, $h) = $self->SUPER::size_request; |
1652 | my ($w, $h) = $self->SUPER::size_request; |
1532 | |
1653 | |
1533 | ($w + 1, $h) # add 1 for cursor |
1654 | ($w + 1, $h) # add 1 for cursor |
1534 | } |
|
|
1535 | |
|
|
1536 | sub size_allocate { |
|
|
1537 | my ($self, $w, $h) = @_; |
|
|
1538 | |
|
|
1539 | $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text |
|
|
1540 | } |
1655 | } |
1541 | |
1656 | |
1542 | sub key_down { |
1657 | sub key_down { |
1543 | my ($self, $ev) = @_; |
1658 | my ($self, $ev) = @_; |
1544 | |
1659 | |
… | |
… | |
1559 | } elsif ($sym == CFClient::SDLK_HOME) { |
1674 | } elsif ($sym == CFClient::SDLK_HOME) { |
1560 | $self->{cursor} = 0; |
1675 | $self->{cursor} = 0; |
1561 | } elsif ($sym == CFClient::SDLK_END) { |
1676 | } elsif ($sym == CFClient::SDLK_END) { |
1562 | $self->{cursor} = length $text; |
1677 | $self->{cursor} = length $text; |
1563 | } elsif ($uni == 27) { |
1678 | } elsif ($uni == 27) { |
1564 | $self->emit ('escape'); |
1679 | $self->_emit ('escape'); |
1565 | } elsif ($uni) { |
1680 | } elsif ($uni) { |
1566 | substr $text, $self->{cursor}++, 0, chr $uni; |
1681 | substr $text, $self->{cursor}++, 0, chr $uni; |
1567 | } |
1682 | } |
1568 | |
1683 | |
1569 | $self->_set_text ($text); |
1684 | $self->_set_text ($text); |
… | |
… | |
1656 | if ($sym == 13) { |
1771 | if ($sym == 13) { |
1657 | unshift @{$self->{history}}, |
1772 | unshift @{$self->{history}}, |
1658 | my $txt = $self->get_text; |
1773 | my $txt = $self->get_text; |
1659 | $self->{history_pointer} = -1; |
1774 | $self->{history_pointer} = -1; |
1660 | $self->{history_saveback} = ''; |
1775 | $self->{history_saveback} = ''; |
1661 | $self->emit (activate => $txt); |
1776 | $self->_emit (activate => $txt); |
1662 | $self->update; |
1777 | $self->update; |
1663 | |
1778 | |
1664 | } elsif ($sym == CFClient::SDLK_UP) { |
1779 | } elsif ($sym == CFClient::SDLK_UP) { |
1665 | if ($self->{history_pointer} < 0) { |
1780 | if ($self->{history_pointer} < 0) { |
1666 | $self->{history_saveback} = $self->get_text; |
1781 | $self->{history_saveback} = $self->get_text; |
… | |
… | |
1714 | can_events => 1, |
1829 | can_events => 1, |
1715 | @_ |
1830 | @_ |
1716 | ) |
1831 | ) |
1717 | } |
1832 | } |
1718 | |
1833 | |
|
|
1834 | sub activate { } |
|
|
1835 | |
1719 | sub button_up { |
1836 | sub button_up { |
1720 | my ($self, $ev, $x, $y) = @_; |
1837 | my ($self, $ev, $x, $y) = @_; |
1721 | |
1838 | |
|
|
1839 | $self->emit ("activate") |
1722 | if ($x >= 0 && $x < $self->{w} |
1840 | if $x >= 0 && $x < $self->{w} |
1723 | && $y >= 0 && $y < $self->{h}) { |
1841 | && $y >= 0 && $y < $self->{h}; |
1724 | $self->emit ("activate"); |
|
|
1725 | } |
|
|
1726 | } |
1842 | } |
1727 | |
1843 | |
1728 | sub _draw { |
1844 | sub _draw { |
1729 | my ($self) = @_; |
1845 | my ($self) = @_; |
1730 | |
1846 | |
… | |
… | |
1782 | my ($self, $ev, $x, $y) = @_; |
1898 | my ($self, $ev, $x, $y) = @_; |
1783 | |
1899 | |
1784 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1900 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1785 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1901 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1786 | $self->{state} = !$self->{state}; |
1902 | $self->{state} = !$self->{state}; |
1787 | $self->emit (changed => $self->{state}); |
1903 | $self->_emit (changed => $self->{state}); |
1788 | } |
1904 | } |
1789 | } |
1905 | } |
1790 | |
1906 | |
1791 | sub _draw { |
1907 | sub _draw { |
1792 | my ($self) = @_; |
1908 | my ($self) = @_; |
… | |
… | |
2067 | my $self = $class->SUPER::new ( |
2183 | my $self = $class->SUPER::new ( |
2068 | fg => [1, 1, 1], |
2184 | fg => [1, 1, 1], |
2069 | active_fg => [0, 0, 0], |
2185 | active_fg => [0, 0, 0], |
2070 | bg => [0, 0, 0, 0.2], |
2186 | bg => [0, 0, 0, 0.2], |
2071 | active_bg => [1, 1, 1, 0.5], |
2187 | active_bg => [1, 1, 1, 0.5], |
2072 | range => [0, 0, 100, 10], |
2188 | range => [0, 0, 100, 10, 0], |
2073 | req_w => $::WIDTH / 80, |
2189 | req_w => $::WIDTH / 80, |
2074 | req_h => $::WIDTH / 80, |
2190 | req_h => $::WIDTH / 80, |
2075 | vertical => 0, |
2191 | vertical => 0, |
2076 | can_hover => 1, |
2192 | can_hover => 1, |
2077 | inner_pad => 0.02, |
2193 | inner_pad => 0.02, |
… | |
… | |
2082 | $self->update; |
2198 | $self->update; |
2083 | |
2199 | |
2084 | $self |
2200 | $self |
2085 | } |
2201 | } |
2086 | |
2202 | |
|
|
2203 | sub set_range { |
|
|
2204 | my ($self, $range) = @_; |
|
|
2205 | |
|
|
2206 | ($range, $self->{range}) = ($self->{range}, $range); |
|
|
2207 | |
|
|
2208 | $self->update |
|
|
2209 | if "@$range" ne "@{$self->{range}}"; |
|
|
2210 | } |
|
|
2211 | |
2087 | sub set_value { |
2212 | sub set_value { |
2088 | my ($self, $value) = @_; |
2213 | my ($self, $value) = @_; |
2089 | |
2214 | |
2090 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2215 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2091 | |
2216 | |
2092 | $hi = $lo + 1 if $hi <= $lo; |
2217 | $hi = $lo + 1 if $hi <= $lo; |
2093 | |
2218 | |
|
|
2219 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2220 | |
2094 | $value = $lo if $value < $lo; |
2221 | $value = $lo if $value < $lo; |
2095 | $value = $hi if $value > $hi; |
2222 | $value = $hi - $page if $value > $hi - $page; |
2096 | |
2223 | |
2097 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2224 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2098 | if $unit; |
2225 | if $unit; |
2099 | |
2226 | |
2100 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2101 | |
|
|
2102 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2227 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2103 | |
2228 | |
2104 | if ($value != $old_value) { |
2229 | if ($value != $old_value) { |
2105 | $self->emit (changed => $value); |
2230 | $self->_emit (changed => $value); |
2106 | $self->update; |
2231 | $self->update; |
2107 | } |
2232 | } |
2108 | } |
2233 | } |
2109 | |
2234 | |
2110 | sub size_request { |
2235 | sub size_request { |
… | |
… | |
2118 | |
2243 | |
2119 | sub button_down { |
2244 | sub button_down { |
2120 | my ($self, $ev, $x, $y) = @_; |
2245 | my ($self, $ev, $x, $y) = @_; |
2121 | |
2246 | |
2122 | $self->SUPER::button_down ($ev, $x, $y); |
2247 | $self->SUPER::button_down ($ev, $x, $y); |
|
|
2248 | |
|
|
2249 | $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; |
|
|
2250 | |
2123 | $self->mouse_motion ($ev, $x, $y); |
2251 | $self->mouse_motion ($ev, $x, $y); |
2124 | } |
2252 | } |
2125 | |
2253 | |
2126 | sub mouse_motion { |
2254 | sub mouse_motion { |
2127 | my ($self, $ev, $x, $y) = @_; |
2255 | my ($self, $ev, $x, $y) = @_; |
… | |
… | |
2129 | if ($GRAB == $self) { |
2257 | if ($GRAB == $self) { |
2130 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2258 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2131 | |
2259 | |
2132 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2260 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2133 | |
2261 | |
2134 | $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; |
2262 | $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); |
2135 | |
2263 | |
2136 | $self->set_value ($x * ($hi - $lo) + $lo); |
2264 | $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); |
2137 | } |
2265 | } |
2138 | } |
2266 | } |
2139 | |
2267 | |
2140 | sub update { |
2268 | sub update { |
2141 | my ($self) = @_; |
2269 | my ($self) = @_; |
2142 | |
2270 | |
2143 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2271 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2144 | $self->set_value ($self->{range}[0]); |
2272 | $self->set_value ($self->{range}[0]); |
2145 | |
2273 | |
2146 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
2274 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
|
|
2275 | my $range = ($hi - $page - $lo) || 1e-100; |
2147 | |
2276 | |
2148 | my $inner_w = 1 - 2 * $self->{inner_pad}; |
2277 | my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; |
2149 | |
2278 | |
2150 | $self->{scale} = ($inner_w / ($hi - $lo)) || 1; |
2279 | $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; |
|
|
2280 | $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; |
2151 | |
2281 | |
2152 | $page = $self->{scale} * $page || 10 / ($self->{w} || 1); |
2282 | $value = ($value - $lo) / $range; |
2153 | $value = $self->{scale} * ($value - $lo); |
2283 | $value = $value * $self->{scale} + $self->{offset}; |
2154 | |
2284 | |
2155 | $value = $self->{inner_pad} + ($value - $page * 0.5); |
|
|
2156 | |
|
|
2157 | $value = 0 if $value < 0; |
|
|
2158 | $page = 1 - $value if $value + $page > 1; |
|
|
2159 | |
|
|
2160 | $self->{knob_x} = $value; |
2285 | $self->{knob_x} = $value - $knob_w * 0.5; |
2161 | $self->{knob_w} = $page; |
2286 | $self->{knob_w} = $knob_w; |
2162 | }); |
2287 | }); |
2163 | |
2288 | |
2164 | $self->SUPER::update; |
2289 | $self->SUPER::update; |
2165 | } |
2290 | } |
2166 | |
2291 | |
… | |
… | |
2190 | # draw handle |
2315 | # draw handle |
2191 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2316 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2192 | |
2317 | |
2193 | glDisable GL_TEXTURE_2D; |
2318 | glDisable GL_TEXTURE_2D; |
2194 | } |
2319 | } |
|
|
2320 | |
|
|
2321 | ############################################################################# |
|
|
2322 | |
|
|
2323 | package CFClient::UI::ValSlider; |
|
|
2324 | |
|
|
2325 | our @ISA = CFClient::UI::HBox::; |
|
|
2326 | |
|
|
2327 | sub new { |
|
|
2328 | my ($class, %arg) = @_; |
|
|
2329 | |
|
|
2330 | my $range = delete $arg{range}; |
|
|
2331 | |
|
|
2332 | my $self = $class->SUPER::new ( |
|
|
2333 | slider => (new CFClient::UI::Slider expand => 1, range => $range), |
|
|
2334 | entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), |
|
|
2335 | to_value => sub { shift }, |
|
|
2336 | from_value => sub { shift }, |
|
|
2337 | %arg, |
|
|
2338 | ); |
|
|
2339 | |
|
|
2340 | $self->{slider}->connect (changed => sub { |
|
|
2341 | my ($self, $value) = @_; |
|
|
2342 | $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value)); |
|
|
2343 | $self->{parent}->emit (changed => $value); |
|
|
2344 | }); |
|
|
2345 | |
|
|
2346 | # $self->{entry}->connect (changed => sub { |
|
|
2347 | # my ($self, $value) = @_; |
|
|
2348 | # $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value)); |
|
|
2349 | # $self->{parent}->emit (changed => $value); |
|
|
2350 | # }); |
|
|
2351 | |
|
|
2352 | $self->add ($self->{slider}, $self->{entry}); |
|
|
2353 | |
|
|
2354 | $self->{slider}->emit (changed => $self->{slider}{range}[0]); |
|
|
2355 | |
|
|
2356 | $self |
|
|
2357 | } |
|
|
2358 | |
|
|
2359 | sub set_range { shift->{slider}->set_range (@_) } |
|
|
2360 | sub set_value { shift->{slider}->set_value (@_) } |
2195 | |
2361 | |
2196 | ############################################################################# |
2362 | ############################################################################# |
2197 | |
2363 | |
2198 | package CFClient::UI::TextView; |
2364 | package CFClient::UI::TextView; |
2199 | |
2365 | |
… | |
… | |
2241 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2407 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2242 | |
2408 | |
2243 | $self->reflow; |
2409 | $self->reflow; |
2244 | } |
2410 | } |
2245 | |
2411 | |
2246 | sub text_height { |
2412 | sub text_size { |
2247 | my ($self, $text, $indent) = @_; |
2413 | my ($self, $text, $indent) = @_; |
2248 | |
2414 | |
2249 | my $layout = $self->{layout}; |
2415 | my $layout = $self->{layout}; |
2250 | |
2416 | |
2251 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2417 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2252 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2418 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2253 | $layout->set_markup ($text); |
2419 | $layout->set_markup ($text); |
2254 | |
2420 | |
2255 | ($layout->size)[1] |
2421 | $layout->size |
2256 | } |
2422 | } |
2257 | |
2423 | |
2258 | sub reflow { |
2424 | sub reflow { |
2259 | my ($self) = @_; |
2425 | my ($self) = @_; |
2260 | |
2426 | |
2261 | $self->{need_reflow}++; |
2427 | $self->{need_reflow}++; |
2262 | $self->update; |
2428 | $self->update; |
2263 | } |
2429 | } |
2264 | |
2430 | |
|
|
2431 | sub set_offset { |
|
|
2432 | my ($self, $offset) = @_; |
|
|
2433 | |
|
|
2434 | # todo: base offset on lines or so, not on pixels |
|
|
2435 | $self->{children}[1]->set_value ($offset); |
|
|
2436 | } |
|
|
2437 | |
|
|
2438 | sub clear { |
|
|
2439 | my ($self) = @_; |
|
|
2440 | |
|
|
2441 | $self->{par} = []; |
|
|
2442 | $self->{height} = 0; |
|
|
2443 | $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); |
|
|
2444 | } |
|
|
2445 | |
2265 | sub add_paragraph { |
2446 | sub add_paragraph { |
2266 | my ($self, $color, $text, $indent) = @_; |
2447 | my ($self, $color, $text, $indent) = @_; |
2267 | |
2448 | |
2268 | #TODO: intelligently "reformat" paragraph |
|
|
2269 | |
|
|
2270 | for my $line (split /\n/, $text) { |
2449 | for my $line (split /\n/, $text) { |
2271 | my $height = $self->text_height ($line); |
2450 | my ($w, $h) = $self->text_size ($line); |
2272 | $self->{height} += $height; |
2451 | $self->{height} += $h; |
2273 | push @{$self->{par}}, [$height, $color, $indent, $line]; |
2452 | push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; |
2274 | } |
2453 | } |
2275 | |
2454 | |
2276 | $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; |
2455 | $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); |
2277 | $self->{children}[1]->update; |
|
|
2278 | } |
2456 | } |
2279 | |
2457 | |
2280 | sub update { |
2458 | sub update { |
2281 | my ($self) = @_; |
2459 | my ($self) = @_; |
2282 | |
2460 | |
… | |
… | |
2285 | return unless $self->{h} > 0; |
2463 | return unless $self->{h} > 0; |
2286 | |
2464 | |
2287 | delete $self->{texture}; |
2465 | delete $self->{texture}; |
2288 | |
2466 | |
2289 | $ROOT->on_post_alloc ($self, sub { |
2467 | $ROOT->on_post_alloc ($self, sub { |
|
|
2468 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
|
|
2469 | |
2290 | if (delete $self->{need_reflow}) { |
2470 | if (delete $self->{need_reflow}) { |
2291 | my $height = 0; |
2471 | my $height = 0; |
2292 | |
2472 | |
2293 | $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) |
2473 | my $layout = $self->{layout}; |
|
|
2474 | |
|
|
2475 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2476 | |
2294 | for @{$self->{par}}; |
2477 | for (@{$self->{par}}) { |
|
|
2478 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
|
|
2479 | $layout->set_width ($W - $_->[3]); |
|
|
2480 | $layout->set_markup ($_->[4]); |
|
|
2481 | my ($w, $h) = $layout->size; |
|
|
2482 | $_->[0] = $w + $_->[3]; |
|
|
2483 | $_->[1] = $h; |
|
|
2484 | } |
|
|
2485 | |
|
|
2486 | $height += $_->[1]; |
|
|
2487 | } |
2295 | |
2488 | |
2296 | $self->{height} = $height; |
2489 | $self->{height} = $height; |
2297 | |
2490 | |
2298 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
2491 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
2299 | $self->{children}[1]->update; |
|
|
2300 | |
2492 | |
2301 | delete $self->{texture}; |
2493 | delete $self->{texture}; |
2302 | } |
2494 | } |
2303 | |
2495 | |
2304 | $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { |
2496 | $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { |
2305 | glClearColor 0.5, 0.5, 0.5, 0; |
2497 | glClearColor 0.5, 0.5, 0.5, 0; |
2306 | glClear GL_COLOR_BUFFER_BIT; |
2498 | glClear GL_COLOR_BUFFER_BIT; |
2307 | |
2499 | |
2308 | my $top = int $self->{children}[1]{range}[0]; |
2500 | my $top = int $self->{children}[1]{range}[0]; |
2309 | |
2501 | |
2310 | my $y0 = $top; |
2502 | my $y0 = $top; |
2311 | my $y1 = $top + $self->{h}; |
2503 | my $y1 = $top + $H; |
2312 | |
2504 | |
2313 | my $y = 0; |
2505 | my $y = 0; |
2314 | |
2506 | |
2315 | my $layout = $self->{layout}; |
2507 | my $layout = $self->{layout}; |
2316 | |
2508 | |
2317 | $layout->set_font ($self->{font}) if $self->{font}; |
2509 | $layout->set_font ($self->{font}) if $self->{font}; |
2318 | |
2510 | |
2319 | glEnable GL_BLEND; |
2511 | glEnable GL_BLEND; |
|
|
2512 | #TODO# not correct in windows where rgba is forced off |
2320 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
2513 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
2321 | |
2514 | |
2322 | for my $par (@{$self->{par}}) { |
2515 | for my $par (@{$self->{par}}) { |
2323 | my $h = $par->[0]; |
2516 | my $h = $par->[1]; |
2324 | |
2517 | |
2325 | if ($y0 < $y + $h && $y < $y1) { |
2518 | if ($y0 < $y + $h && $y < $y1) { |
2326 | $layout->set_foreground (@{ $par->[1] }); |
2519 | $layout->set_foreground (@{ $par->[2] }); |
2327 | $layout->set_width ($self->{w} - $par->[2]); |
2520 | $layout->set_width ($W - $par->[3]); |
2328 | $layout->set_markup ($par->[3]); |
2521 | $layout->set_markup ($par->[4]); |
2329 | |
2522 | |
2330 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2523 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2331 | |
2524 | |
2332 | glRasterPos $par->[2], $y - $y0; |
2525 | glRasterPos $par->[3], $y - $y0; |
2333 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2526 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2334 | } |
2527 | } |
2335 | |
2528 | |
2336 | $y += $h; |
2529 | $y += $h; |
2337 | } |
2530 | } |
… | |
… | |
2404 | |
2597 | |
2405 | sub new { |
2598 | sub new { |
2406 | my $class = shift; |
2599 | my $class = shift; |
2407 | |
2600 | |
2408 | my $self = $class->SUPER::new ( |
2601 | my $self = $class->SUPER::new ( |
2409 | state => 0, |
2602 | state => 0, |
2410 | connect_activate => \&toggle_flopper, |
2603 | on_activate => \&toggle_flopper, |
2411 | @_ |
2604 | @_ |
2412 | ); |
2605 | ); |
2413 | |
2606 | |
2414 | if ($self->{state}) { |
|
|
2415 | $self->{state} = 0; |
|
|
2416 | $self->toggle_flopper; |
|
|
2417 | } |
|
|
2418 | |
|
|
2419 | $self |
2607 | $self |
2420 | } |
2608 | } |
2421 | |
2609 | |
2422 | sub toggle_flopper { |
2610 | sub toggle_flopper { |
2423 | my ($self) = @_; |
2611 | my ($self) = @_; |
2424 | |
2612 | |
2425 | # TODO: use animation |
2613 | $self->{other}->toggle_visibility; |
2426 | if ($self->{state} = !$self->{state}) { |
|
|
2427 | $CFClient::UI::ROOT->add ($self->{other}); |
|
|
2428 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
|
|
2429 | $self->emit ("open"); |
|
|
2430 | } else { |
|
|
2431 | $CFClient::UI::ROOT->remove ($self->{other}); |
|
|
2432 | $self->emit ("close"); |
|
|
2433 | } |
|
|
2434 | |
|
|
2435 | $self->emit (changed => $self->{state}); |
|
|
2436 | } |
2614 | } |
2437 | |
2615 | |
2438 | ############################################################################# |
2616 | ############################################################################# |
2439 | |
2617 | |
2440 | package CFClient::UI::Tooltip; |
2618 | package CFClient::UI::Tooltip; |
… | |
… | |
2516 | |
2694 | |
2517 | sub new { |
2695 | sub new { |
2518 | my $class = shift; |
2696 | my $class = shift; |
2519 | |
2697 | |
2520 | my $self = $class->SUPER::new ( |
2698 | my $self = $class->SUPER::new ( |
2521 | aspect => 1, |
2699 | aspect => 1, |
|
|
2700 | can_events => 0, |
2522 | @_, |
2701 | @_, |
2523 | ); |
2702 | ); |
2524 | |
2703 | |
2525 | if ($self->{anim} && $self->{animspeed}) { |
2704 | if ($self->{anim} && $self->{animspeed}) { |
2526 | Scalar::Util::weaken (my $widget = $self); |
2705 | Scalar::Util::weaken (my $widget = $self); |
… | |
… | |
2541 | |
2720 | |
2542 | sub size_request { |
2721 | sub size_request { |
2543 | (32, 8) |
2722 | (32, 8) |
2544 | } |
2723 | } |
2545 | |
2724 | |
|
|
2725 | sub update { |
|
|
2726 | my ($self) = @_; |
|
|
2727 | |
|
|
2728 | return unless $self->{visible}; |
|
|
2729 | |
|
|
2730 | $self->SUPER::update; |
|
|
2731 | } |
|
|
2732 | |
2546 | sub _draw { |
2733 | sub _draw { |
2547 | my ($self) = @_; |
2734 | my ($self) = @_; |
2548 | |
2735 | |
2549 | return unless $::CONN;#d# manage and cache textures differently |
2736 | return unless $::CONN; |
2550 | |
2737 | |
2551 | my $face; |
2738 | my $face; |
2552 | |
2739 | |
2553 | if ($self->{frame}) { |
2740 | if ($self->{frame}) { |
2554 | my $anim = $::CONN->{anim}[$self->{anim}]; |
2741 | my $anim = $::CONN->{anim}[$self->{anim}]; |
… | |
… | |
2577 | $self->SUPER::DESTROY; |
2764 | $self->SUPER::DESTROY; |
2578 | } |
2765 | } |
2579 | |
2766 | |
2580 | ############################################################################# |
2767 | ############################################################################# |
2581 | |
2768 | |
2582 | package CFClient::UI::InventoryItem; |
2769 | package CFClient::UI::Inventory; |
2583 | |
2770 | |
2584 | our @ISA = CFClient::UI::HBox::; |
2771 | our @ISA = CFClient::UI::ScrolledWindow::; |
2585 | |
|
|
2586 | sub _item_to_desc { |
|
|
2587 | my ($item) = @_; |
|
|
2588 | |
|
|
2589 | my $desc = |
|
|
2590 | $item->{nrof} < 2 |
|
|
2591 | ? $item->{name} |
|
|
2592 | : "$item->{nrof} × $item->{name_pl}"; |
|
|
2593 | |
|
|
2594 | $item->{flags} & Crossfire::Protocol::F_OPEN |
|
|
2595 | and $desc .= " (open)"; |
|
|
2596 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
|
|
2597 | and $desc .= " (applied)"; |
|
|
2598 | $item->{flags} & Crossfire::Protocol::F_UNPAID |
|
|
2599 | and $desc .= " (unpaid)"; |
|
|
2600 | $item->{flags} & Crossfire::Protocol::F_MAGIC |
|
|
2601 | and $desc .= " (magic)"; |
|
|
2602 | $item->{flags} & Crossfire::Protocol::F_CURSED |
|
|
2603 | and $desc .= " (cursed)"; |
|
|
2604 | $item->{flags} & Crossfire::Protocol::F_DAMNED |
|
|
2605 | and $desc .= " (damned)"; |
|
|
2606 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2607 | and $desc .= " *"; |
|
|
2608 | |
|
|
2609 | $desc |
|
|
2610 | } |
|
|
2611 | |
2772 | |
2612 | sub new { |
2773 | sub new { |
2613 | my $class = shift; |
2774 | my $class = shift; |
2614 | |
2775 | |
2615 | my %args = @_; |
|
|
2616 | |
|
|
2617 | my $item = delete $args{item}; |
|
|
2618 | |
|
|
2619 | my $desc = _item_to_desc ($item); |
|
|
2620 | |
|
|
2621 | my $self = $class->SUPER::new ( |
2776 | my $self = $class->SUPER::new ( |
2622 | can_hover => 1, |
2777 | scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), |
2623 | can_events => 1, |
|
|
2624 | tooltip => ((CFClient::UI::Label::escape $desc) |
|
|
2625 | . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), |
|
|
2626 | connect_button_down => sub { |
|
|
2627 | my ($self, $ev, $x, $y) = @_; |
|
|
2628 | |
|
|
2629 | # todo: maybe put examine on 1? but should just be a tooltip :( |
|
|
2630 | if ($ev->{button} == 1) { |
|
|
2631 | my $targ = $::CONN->{player}{tag}; |
|
|
2632 | |
|
|
2633 | if ($item->{container} == $::CONN->{player}{tag}) { |
|
|
2634 | $targ = $main::OPENCONT; |
|
|
2635 | } |
|
|
2636 | |
|
|
2637 | $::CONN->send ("move $targ $item->{tag} 0"); |
|
|
2638 | } elsif ($ev->{button} == 2) { |
|
|
2639 | $::CONN->send ("apply $item->{tag}"); |
|
|
2640 | } elsif ($ev->{button} == 3) { |
|
|
2641 | my @menu_items = ( |
|
|
2642 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
|
|
2643 | ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], |
|
|
2644 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
|
|
2645 | ( |
|
|
2646 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2647 | ? ( |
|
|
2648 | ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }], |
|
|
2649 | ) |
|
|
2650 | : ( |
|
|
2651 | ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }], |
|
|
2652 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
|
|
2653 | ) |
|
|
2654 | ), |
|
|
2655 | ); |
|
|
2656 | |
|
|
2657 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
|
|
2658 | } |
|
|
2659 | |
|
|
2660 | 1 |
|
|
2661 | }, |
|
|
2662 | %args |
|
|
2663 | ); |
|
|
2664 | |
|
|
2665 | |
|
|
2666 | $self->add (new CFClient::UI::Face |
|
|
2667 | can_events => 0, |
|
|
2668 | face => $item->{face}, |
|
|
2669 | anim => $item->{anim}, |
|
|
2670 | animspeed => $item->{animspeed}, |
|
|
2671 | ); |
|
|
2672 | |
|
|
2673 | $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0); |
|
|
2674 | |
|
|
2675 | $self->{item} = $item; |
|
|
2676 | |
|
|
2677 | $self->update_item; |
|
|
2678 | |
|
|
2679 | $self |
|
|
2680 | } |
|
|
2681 | |
|
|
2682 | sub update_item { |
|
|
2683 | my ($self) = @_; |
|
|
2684 | |
|
|
2685 | my $desc = _item_to_desc ($self->{item}); |
|
|
2686 | |
|
|
2687 | $self->{name_lbl}->set_text ($desc); |
|
|
2688 | } |
|
|
2689 | |
|
|
2690 | ############################################################################# |
|
|
2691 | |
|
|
2692 | package CFClient::UI::Inventory; |
|
|
2693 | |
|
|
2694 | our @ISA = CFClient::UI::ScrolledWindow::; |
|
|
2695 | |
|
|
2696 | sub new { |
|
|
2697 | my $class = shift; |
|
|
2698 | |
|
|
2699 | my $self = $class->SUPER::new ( |
|
|
2700 | scrolled => (new CFClient::UI::VBox), |
|
|
2701 | @_, |
2778 | @_, |
2702 | ); |
2779 | ); |
2703 | |
2780 | |
2704 | $self |
2781 | $self |
2705 | } |
2782 | } |
… | |
… | |
2715 | or ($a->{name} cmp $b->{name}) |
2792 | or ($a->{name} cmp $b->{name}) |
2716 | } @$items; |
2793 | } @$items; |
2717 | |
2794 | |
2718 | $self->{real_items} = \@items; |
2795 | $self->{real_items} = \@items; |
2719 | |
2796 | |
|
|
2797 | my $row = 0; |
2720 | for my $item (@items) { |
2798 | for my $item (@items) { |
2721 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2799 | CFClient::Item::update_widgets $item; |
2722 | $item->update_item (); |
|
|
2723 | } |
|
|
2724 | |
2800 | |
2725 | $self->{scrolled}->add (@items); |
2801 | $self->{scrolled}->add (0, $row, $item->{face_widget}); |
|
|
2802 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
|
|
2803 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2726 | |
2804 | |
2727 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2805 | $row++; |
|
|
2806 | } |
2728 | } |
2807 | } |
2729 | |
2808 | |
2730 | sub size_request { |
2809 | sub size_request { |
2731 | my ($self) = @_; |
2810 | my ($self) = @_; |
2732 | ($self->{req_w}, $self->{req_h}); |
2811 | ($self->{req_w}, $self->{req_h}); |
… | |
… | |
2772 | |
2851 | |
2773 | # popup given the event (must be a mouse button down event currently) |
2852 | # popup given the event (must be a mouse button down event currently) |
2774 | sub popup { |
2853 | sub popup { |
2775 | my ($self, $ev) = @_; |
2854 | my ($self, $ev) = @_; |
2776 | |
2855 | |
2777 | $self->emit ("popdown"); |
2856 | $self->_emit ("popdown"); |
2778 | |
2857 | |
2779 | # maybe save $GRAB? must be careful about events... |
2858 | # maybe save $GRAB? must be careful about events... |
2780 | $GRAB = $self; |
2859 | $GRAB = $self; |
2781 | $self->{button} = $ev->{button}; |
2860 | $self->{button} = $ev->{button}; |
2782 | |
2861 | |
… | |
… | |
2797 | |
2876 | |
2798 | if ($ev->{button} == $self->{button}) { |
2877 | if ($ev->{button} == $self->{button}) { |
2799 | undef $GRAB; |
2878 | undef $GRAB; |
2800 | $self->hide; |
2879 | $self->hide; |
2801 | |
2880 | |
2802 | $self->emit ("popdown"); |
2881 | $self->_emit ("popdown"); |
2803 | $self->{hover}[1]->() if $self->{hover}; |
2882 | $self->{hover}[1]->() if $self->{hover}; |
2804 | } |
2883 | } |
2805 | } |
2884 | } |
2806 | |
2885 | |
2807 | ############################################################################# |
2886 | ############################################################################# |
… | |
… | |
2869 | sub add { |
2948 | sub add { |
2870 | my ($self, $text, %arg) = @_; |
2949 | my ($self, $text, %arg) = @_; |
2871 | |
2950 | |
2872 | $text =~ s/^\s+//; |
2951 | $text =~ s/^\s+//; |
2873 | $text =~ s/\s+$//; |
2952 | $text =~ s/\s+$//; |
|
|
2953 | |
|
|
2954 | return unless $text; |
2874 | |
2955 | |
2875 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2956 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2876 | |
2957 | |
2877 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2958 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2878 | |
2959 | |
… | |
… | |
2922 | |
3003 | |
2923 | sub new { |
3004 | sub new { |
2924 | my $class = shift; |
3005 | my $class = shift; |
2925 | |
3006 | |
2926 | $class->SUPER::new ( |
3007 | $class->SUPER::new ( |
|
|
3008 | visible => 1, |
2927 | @_, |
3009 | @_, |
2928 | ) |
3010 | ) |
2929 | } |
3011 | } |
2930 | |
3012 | |
2931 | sub configure { |
3013 | sub configure { |
… | |
… | |
2949 | } |
3031 | } |
2950 | |
3032 | |
2951 | sub size_allocate { |
3033 | sub size_allocate { |
2952 | my ($self, $w, $h) = @_; |
3034 | my ($self, $w, $h) = @_; |
2953 | |
3035 | |
2954 | my $old_w = $self->{old_w}; $self->{old_w} = $w; |
|
|
2955 | my $old_h = $self->{old_h}; $self->{old_h} = $h; |
|
|
2956 | |
|
|
2957 | CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h |
|
|
2958 | if $old_w && $old_h && ($old_w != $w || $old_h != $h); |
|
|
2959 | |
|
|
2960 | for my $child ($self->children) { |
3036 | for my $child ($self->children) { |
2961 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3037 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
2962 | |
3038 | |
2963 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3039 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
2964 | if exists $child->{req_x}; |
3040 | if exists $child->{req_x}; |
2965 | |
3041 | |
2966 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
3042 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
2967 | if exists $child->{req_y}; |
3043 | if exists $child->{req_y}; |
2968 | |
3044 | |
|
|
3045 | $X = $self->{user_x} if exists $self->{user_x}; |
|
|
3046 | $Y = $self->{user_y} if exists $self->{user_y}; |
|
|
3047 | |
2969 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
3048 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
2970 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
3049 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
2971 | |
3050 | |
2972 | $child->configure ($X, $Y, $W, $H); |
3051 | $child->configure ($X, $Y, $W, $H); |
2973 | } |
3052 | } |
… | |
… | |
2993 | } |
3072 | } |
2994 | |
3073 | |
2995 | sub add { |
3074 | sub add { |
2996 | my ($self, @children) = @_; |
3075 | my ($self, @children) = @_; |
2997 | |
3076 | |
|
|
3077 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3078 | push @widgets, $w->children; |
|
|
3079 | $w->{root} = $self; |
|
|
3080 | $w->{visible} = $self->{visible} + 1; |
|
|
3081 | } |
|
|
3082 | |
2998 | for my $child (@children) { |
3083 | for my $child (@children) { |
2999 | $child->{toplevel} = 1; |
3084 | $child->{is_toplevel} = 1; |
3000 | |
3085 | |
3001 | # integerise window positions |
3086 | # integerise window positions |
3002 | $child->{x} = int $child->{x}; |
3087 | $child->{x} = int $child->{x}; |
3003 | $child->{y} = int $child->{y}; |
3088 | $child->{y} = int $child->{y}; |
3004 | } |
3089 | } |
3005 | |
3090 | |
3006 | $self->SUPER::add (@children); |
3091 | $self->SUPER::add (@children); |
3007 | } |
3092 | } |
3008 | |
3093 | |
|
|
3094 | sub remove { |
|
|
3095 | my ($self, @children) = @_; |
|
|
3096 | |
|
|
3097 | $self->SUPER::remove (@children); |
|
|
3098 | |
|
|
3099 | while (@children) { |
|
|
3100 | my $w = pop @children; |
|
|
3101 | push @children, $w->children; |
|
|
3102 | $w->set_invisible; |
|
|
3103 | } |
|
|
3104 | } |
|
|
3105 | |
3009 | sub on_refresh { |
3106 | sub on_refresh { |
3010 | my ($self, $id, $cb) = @_; |
3107 | my ($self, $id, $cb) = @_; |
3011 | |
3108 | |
3012 | $self->{refresh_hook}{$id} = $cb; |
3109 | $self->{refresh_hook}{$id} = $cb; |
3013 | } |
3110 | } |
… | |
… | |
3025 | $_->() |
3122 | $_->() |
3026 | for values %{delete $self->{refresh_hook}}; |
3123 | for values %{delete $self->{refresh_hook}}; |
3027 | } |
3124 | } |
3028 | |
3125 | |
3029 | if ($self->{check_size}) { |
3126 | if ($self->{check_size}) { |
3030 | my @queue = ([], []); |
3127 | my @queue; |
3031 | |
3128 | |
3032 | for (;;) { |
3129 | for (;;) { |
3033 | if ($self->{check_size}) { |
3130 | if ($self->{check_size}) { |
3034 | # heuristic: check containers last |
3131 | #TODO use array-of-depth approach |
3035 | push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ |
3132 | |
|
|
3133 | @queue = sort { $a->{visible} <=> $b->{visible} } |
3036 | for values %{delete $self->{check_size}} |
3134 | @queue, values %{delete $self->{check_size}}; |
3037 | } |
3135 | } |
3038 | |
3136 | |
3039 | my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; |
3137 | my $widget = pop @queue || last; |
|
|
3138 | |
|
|
3139 | defined $widget->{visible} or last; # do not resize invisible widgets |
3040 | |
3140 | |
3041 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
3141 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
3042 | ? @$widget{qw(user_w user_h)} |
3142 | ? @$widget{qw(user_w user_h)} |
3043 | : $widget->size_request; |
3143 | : $widget->size_request; |
3044 | |
3144 | |
… | |
… | |
3064 | $w = 0 if $w < 0; |
3164 | $w = 0 if $w < 0; |
3065 | $h = 0 if $h < 0; |
3165 | $h = 0 if $h < 0; |
3066 | |
3166 | |
3067 | $widget->{w} = $w; |
3167 | $widget->{w} = $w; |
3068 | $widget->{h} = $h; |
3168 | $widget->{h} = $h; |
3069 | $widget->size_allocate ($w, $h); |
|
|
3070 | $widget->emit (size_allocate => $w, $h); |
3169 | $widget->emit (size_allocate => $w, $h); |
3071 | } |
3170 | } |
3072 | } |
3171 | } |
3073 | |
3172 | |
3074 | while ($self->{post_alloc_hook}) { |
3173 | while ($self->{post_alloc_hook}) { |