… | |
… | |
47 | my $tip = $widget->{tooltip}; |
47 | my $tip = $widget->{tooltip}; |
48 | |
48 | |
49 | $tip = $tip->($widget) if CODE:: eq ref $tip; |
49 | $tip = $tip->($widget) if CODE:: eq ref $tip; |
50 | |
50 | |
51 | $TOOLTIP->set_tooltip_from ($widget); |
51 | $TOOLTIP->set_tooltip_from ($widget); |
52 | $TOOLTIP->show; |
|
|
53 | |
52 | |
54 | my ($x, $y) = $widget->coord2global ($widget->{w}, 0); |
53 | my ($x, $y) = $widget->coord2global ($widget->{w}, 0); |
55 | |
54 | |
56 | ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) |
55 | ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) |
57 | if $x + $TOOLTIP->{w} > $::WIDTH; |
56 | if $x + $TOOLTIP->{w} > $::WIDTH; |
58 | |
57 | |
59 | $TOOLTIP->move ($x, $y); |
58 | $TOOLTIP->move ($x, $y); |
60 | $TOOLTIP->check_size; |
|
|
61 | $TOOLTIP->update; |
59 | $TOOLTIP->show; |
62 | } |
60 | } |
63 | |
61 | |
64 | return; |
62 | return; |
65 | } |
63 | } |
66 | } |
64 | } |
… | |
… | |
175 | for my $widget (values %WIDGET) { |
173 | for my $widget (values %WIDGET) { |
176 | if ($widget->{is_toplevel}) { |
174 | if ($widget->{is_toplevel}) { |
177 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
175 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
178 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
176 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
179 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
177 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
180 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
|
|
181 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
178 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
182 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
179 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
183 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
180 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
184 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
|
|
185 | } |
181 | } |
186 | } |
182 | } |
187 | |
183 | |
188 | reconfigure_widgets; |
184 | reconfigure_widgets; |
189 | } |
185 | } |
… | |
… | |
206 | can_events => 1, |
202 | can_events => 1, |
207 | @_ |
203 | @_ |
208 | }, $class; |
204 | }, $class; |
209 | |
205 | |
210 | for (keys %$self) { |
206 | for (keys %$self) { |
211 | if (/^connect_(.*)$/) { |
207 | if (/^on_(.*)$/) { |
212 | $self->connect ($1 => delete $self->{$_}); |
208 | $self->connect ($1 => delete $self->{$_}); |
213 | } |
209 | } |
214 | } |
210 | } |
215 | |
211 | |
216 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
212 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
217 | |
213 | |
218 | if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { |
214 | if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { |
219 | $self->{user_x} = $layout->{x} * $::WIDTH; |
215 | $self->{req_x} = $layout->{x} * $::WIDTH; |
220 | $self->{user_y} = $layout->{y} * $::HEIGHT; |
216 | $self->{req_y} = $layout->{y} * $::HEIGHT; |
221 | $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; |
217 | $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; |
222 | $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; |
218 | $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; |
223 | } |
219 | } |
224 | |
220 | |
225 | $self |
221 | $self |
226 | } |
222 | } |
227 | |
223 | |
… | |
… | |
232 | %$self = (); |
228 | %$self = (); |
233 | } |
229 | } |
234 | |
230 | |
235 | sub show { |
231 | sub show { |
236 | my ($self) = @_; |
232 | my ($self) = @_; |
|
|
233 | |
237 | return if $self->{parent}; |
234 | return if $self->{parent}; |
238 | |
235 | |
239 | $CFClient::UI::ROOT->add ($self); |
236 | $CFClient::UI::ROOT->add ($self); |
240 | } |
237 | } |
241 | |
238 | |
242 | sub show_centered { |
239 | sub center { |
243 | my ($self) = @_; |
240 | my ($self) = @_; |
244 | return if $self->{parent}; |
|
|
245 | |
|
|
246 | $self->show; |
|
|
247 | |
241 | |
248 | $CFClient::UI::ROOT->on_post_alloc ( |
242 | $CFClient::UI::ROOT->on_post_alloc ( |
249 | "centered $self" => sub { |
243 | "center_$self" => sub { |
250 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
244 | $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5); |
251 | }, |
245 | }, |
252 | ); |
246 | ); |
|
|
247 | |
|
|
248 | $self->update; |
|
|
249 | } |
|
|
250 | |
|
|
251 | sub set_visible { |
|
|
252 | my ($self) = @_; |
|
|
253 | |
|
|
254 | return if $self->{visible}; |
|
|
255 | |
|
|
256 | $self->{root} = $self->{parent}{root}; |
|
|
257 | $self->{visible} = $self->{parent}{visible} + 1; |
|
|
258 | |
|
|
259 | $self->emit (visibility_change => 1); |
|
|
260 | |
|
|
261 | $self->realloc if !exists $self->{req_w}; |
|
|
262 | |
|
|
263 | $_->set_visible for $self->children; |
253 | } |
264 | } |
254 | |
265 | |
255 | sub set_invisible { |
266 | sub set_invisible { |
256 | my ($self) = @_; |
267 | my ($self) = @_; |
257 | |
268 | |
258 | # broken show/hide model |
269 | return unless $self->{visible}; |
|
|
270 | |
|
|
271 | $_->set_invisible for $self->children; |
259 | |
272 | |
260 | delete $self->{root}; |
273 | delete $self->{root}; |
261 | delete $self->{visible}; |
274 | delete $self->{visible}; |
262 | |
275 | |
263 | undef $GRAB if $GRAB == $self; |
276 | undef $GRAB if $GRAB == $self; |
264 | undef $HOVER if $HOVER == $self; |
277 | undef $HOVER if $HOVER == $self; |
265 | |
278 | |
266 | CFClient::UI::check_tooltip |
279 | CFClient::UI::check_tooltip |
267 | if $CFClient::UI::TOOLTIP->{owner} == $self; |
280 | if $TOOLTIP->{owner} == $self; |
268 | |
281 | |
269 | $self->focus_out; |
282 | $self->focus_out; |
|
|
283 | |
|
|
284 | $self->emit (visibility_change => 0); |
|
|
285 | } |
|
|
286 | |
|
|
287 | sub set_visibility { |
|
|
288 | my ($self, $visible) = @_; |
|
|
289 | |
|
|
290 | return if $self->{visible} == $visible; |
|
|
291 | |
|
|
292 | $visible ? $self->hide |
|
|
293 | : $self->show; |
|
|
294 | } |
|
|
295 | |
|
|
296 | sub toggle_visibility { |
|
|
297 | my ($self) = @_; |
|
|
298 | |
|
|
299 | $self->{visible} |
|
|
300 | ? $self->hide |
|
|
301 | : $self->show; |
270 | } |
302 | } |
271 | |
303 | |
272 | sub hide { |
304 | sub hide { |
273 | my ($self) = @_; |
305 | my ($self) = @_; |
274 | |
306 | |
… | |
… | |
289 | } |
321 | } |
290 | |
322 | |
291 | sub set_size { |
323 | sub set_size { |
292 | my ($self, $w, $h) = @_; |
324 | my ($self, $w, $h) = @_; |
293 | |
325 | |
294 | $self->{user_w} = $w; |
326 | $self->{def_w} = $w; |
295 | $self->{user_h} = $h; |
327 | $self->{def_h} = $h; |
296 | |
328 | |
297 | $self->check_size; |
329 | $self->realloc; |
298 | } |
330 | } |
299 | |
331 | |
300 | sub size_request { |
332 | sub size_request { |
301 | require Carp; |
333 | require Carp; |
302 | Carp::confess "size_request is abstract"; |
334 | Carp::confess "size_request is abstract"; |
… | |
… | |
322 | $self->{y} = $y; |
354 | $self->{y} = $y; |
323 | $self->update; |
355 | $self->update; |
324 | } |
356 | } |
325 | |
357 | |
326 | if ($self->{w} != $w || $self->{h} != $h) { |
358 | if ($self->{w} != $w || $self->{h} != $h) { |
|
|
359 | return unless $self->{visible}; |
|
|
360 | |
327 | $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; |
361 | $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; |
328 | } |
362 | } |
329 | } |
363 | } |
330 | |
364 | |
331 | sub size_allocate { |
365 | sub size_allocate { |
332 | # nothing to be done |
366 | # nothing to be done |
333 | } |
|
|
334 | |
|
|
335 | sub reconfigure { |
|
|
336 | my ($self) = @_; |
|
|
337 | |
|
|
338 | $self->check_size (1); |
|
|
339 | $self->update; |
|
|
340 | } |
367 | } |
341 | |
368 | |
342 | sub children { |
369 | sub children { |
343 | } |
370 | } |
344 | |
371 | |
… | |
… | |
422 | sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } |
449 | sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } |
423 | sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } |
450 | sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } |
424 | sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } |
451 | sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } |
425 | sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } |
452 | sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } |
426 | sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } |
453 | sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } |
|
|
454 | |
|
|
455 | sub find_widget { |
|
|
456 | my ($self, $x, $y) = @_; |
|
|
457 | |
|
|
458 | return () unless $self->{can_events}; |
|
|
459 | |
|
|
460 | return $self |
|
|
461 | if $x >= $self->{x} && $x < $self->{x} + $self->{w} |
|
|
462 | && $y >= $self->{y} && $y < $self->{y} + $self->{h}; |
|
|
463 | |
|
|
464 | () |
|
|
465 | } |
|
|
466 | |
|
|
467 | sub set_parent { |
|
|
468 | my ($self, $parent) = @_; |
|
|
469 | |
|
|
470 | Scalar::Util::weaken ($self->{parent} = $parent); |
|
|
471 | |
|
|
472 | $self->set_visible if $parent->{visible}; |
|
|
473 | } |
|
|
474 | |
|
|
475 | sub connect { |
|
|
476 | my ($self, $signal, $cb) = @_; |
|
|
477 | |
|
|
478 | push @{ $self->{signal_cb}{$signal} }, $cb; |
|
|
479 | } |
|
|
480 | |
|
|
481 | sub _emit { |
|
|
482 | my ($self, $signal, @args) = @_; |
|
|
483 | |
|
|
484 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
|
|
485 | } |
|
|
486 | |
|
|
487 | sub emit { |
|
|
488 | my ($self, $signal, @args) = @_; |
|
|
489 | |
|
|
490 | $self->_emit ($signal, @args) |
|
|
491 | || $self->$signal (@args); |
|
|
492 | } |
|
|
493 | |
|
|
494 | sub visibility_change { |
|
|
495 | #my ($self, $visible) = @_; |
|
|
496 | } |
|
|
497 | |
|
|
498 | sub realloc { |
|
|
499 | my ($self) = @_; |
|
|
500 | |
|
|
501 | if ($self->{visible}) { |
|
|
502 | return if $self->{root}{realloc}{$self}; |
|
|
503 | |
|
|
504 | $self->{root}{realloc}{$self} = $self; |
|
|
505 | $self->{root}->update; |
|
|
506 | } else { |
|
|
507 | delete $self->{req_w}; |
|
|
508 | } |
|
|
509 | } |
|
|
510 | |
|
|
511 | sub update { |
|
|
512 | my ($self) = @_; |
|
|
513 | |
|
|
514 | $self->{parent}->update |
|
|
515 | if $self->{parent}; |
|
|
516 | } |
427 | |
517 | |
428 | sub draw { |
518 | sub draw { |
429 | my ($self) = @_; |
519 | my ($self) = @_; |
430 | |
520 | |
431 | return unless $self->{h} && $self->{w}; |
521 | return unless $self->{h} && $self->{w}; |
… | |
… | |
469 | my ($self) = @_; |
559 | my ($self) = @_; |
470 | |
560 | |
471 | warn "no draw defined for $self\n"; |
561 | warn "no draw defined for $self\n"; |
472 | } |
562 | } |
473 | |
563 | |
474 | sub find_widget { |
|
|
475 | my ($self, $x, $y) = @_; |
|
|
476 | |
|
|
477 | return () unless $self->{can_events}; |
|
|
478 | |
|
|
479 | return $self |
|
|
480 | if $x >= $self->{x} && $x < $self->{x} + $self->{w} |
|
|
481 | && $y >= $self->{y} && $y < $self->{y} + $self->{h}; |
|
|
482 | |
|
|
483 | () |
|
|
484 | } |
|
|
485 | |
|
|
486 | sub set_parent { |
|
|
487 | my ($self, $parent) = @_; |
|
|
488 | |
|
|
489 | Scalar::Util::weaken ($self->{parent} = $parent); |
|
|
490 | |
|
|
491 | $self->{root} = $parent->{root}; |
|
|
492 | $self->{visible} = $parent->{visible} + 1; |
|
|
493 | |
|
|
494 | # TODO: req_w _does_change after ->reconfigure |
|
|
495 | $self->check_size |
|
|
496 | unless exists $self->{req_w}; |
|
|
497 | |
|
|
498 | $self->show; |
|
|
499 | } |
|
|
500 | |
|
|
501 | sub check_size { |
|
|
502 | my ($self, $forced) = @_; |
|
|
503 | |
|
|
504 | $self->{force_alloc} = 1 if $forced; |
|
|
505 | $CFClient::UI::ROOT->{check_size}{$self} = $self; |
|
|
506 | } |
|
|
507 | |
|
|
508 | sub update { |
|
|
509 | my ($self) = @_; |
|
|
510 | |
|
|
511 | $self->{parent}->update |
|
|
512 | if $self->{parent}; |
|
|
513 | } |
|
|
514 | |
|
|
515 | sub connect { |
|
|
516 | my ($self, $signal, $cb) = @_; |
|
|
517 | |
|
|
518 | push @{ $self->{signal_cb}{$signal} }, $cb; |
|
|
519 | } |
|
|
520 | |
|
|
521 | sub _emit { |
|
|
522 | my ($self, $signal, @args) = @_; |
|
|
523 | |
|
|
524 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
|
|
525 | } |
|
|
526 | |
|
|
527 | sub emit { |
|
|
528 | my ($self, $signal, @args) = @_; |
|
|
529 | |
|
|
530 | $self->_emit ($signal, @args) |
|
|
531 | || $self->$signal (@args); |
|
|
532 | } |
|
|
533 | |
|
|
534 | sub DESTROY { |
564 | sub DESTROY { |
535 | my ($self) = @_; |
565 | my ($self) = @_; |
536 | |
566 | |
537 | delete $WIDGET{$self+0}; |
567 | delete $WIDGET{$self+0}; |
538 | #$self->deactivate; |
568 | #$self->deactivate; |
… | |
… | |
633 | $self->{children} = [ |
663 | $self->{children} = [ |
634 | sort { $a->{z} <=> $b->{z} } |
664 | sort { $a->{z} <=> $b->{z} } |
635 | @{$self->{children}}, @widgets |
665 | @{$self->{children}}, @widgets |
636 | ]; |
666 | ]; |
637 | |
667 | |
638 | $self->check_size (1); |
668 | $self->realloc; |
639 | $self->update; |
|
|
640 | } |
669 | } |
641 | |
670 | |
642 | sub children { |
671 | sub children { |
643 | @{ $_[0]{children} } |
672 | @{ $_[0]{children} } |
644 | } |
673 | } |
… | |
… | |
649 | delete $child->{parent}; |
678 | delete $child->{parent}; |
650 | $child->hide; |
679 | $child->hide; |
651 | |
680 | |
652 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
681 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
653 | |
682 | |
654 | $self->check_size (1); |
683 | $self->realloc; |
655 | $self->update; |
|
|
656 | } |
684 | } |
657 | |
685 | |
658 | sub clear { |
686 | sub clear { |
659 | my ($self) = @_; |
687 | my ($self) = @_; |
660 | |
688 | |
… | |
… | |
664 | for (@$children) { |
692 | for (@$children) { |
665 | delete $_->{parent}; |
693 | delete $_->{parent}; |
666 | $_->hide; |
694 | $_->hide; |
667 | } |
695 | } |
668 | |
696 | |
669 | $self->check_size; |
697 | $self->realloc; |
670 | $self->update; |
|
|
671 | } |
698 | } |
672 | |
699 | |
673 | sub find_widget { |
700 | sub find_widget { |
674 | my ($self, $x, $y) = @_; |
701 | my ($self, $x, $y) = @_; |
675 | |
702 | |
… | |
… | |
728 | sub size_request { |
755 | sub size_request { |
729 | $_[0]{children}[0]->size_request |
756 | $_[0]{children}[0]->size_request |
730 | } |
757 | } |
731 | |
758 | |
732 | sub size_allocate { |
759 | sub size_allocate { |
733 | my ($self, $w, $h) = @_; |
760 | my ($self, $w, $h, $changed) = @_; |
734 | |
761 | |
735 | $self->{children}[0]->configure (0, 0, $w, $h); |
762 | $self->{children}[0]->configure (0, 0, $w, $h); |
736 | } |
763 | } |
737 | |
764 | |
738 | ############################################################################# |
765 | ############################################################################# |
… | |
… | |
755 | $ROOT->on_post_alloc ($self => sub { $self->render_child }); |
782 | $ROOT->on_post_alloc ($self => sub { $self->render_child }); |
756 | $self->SUPER::update; |
783 | $self->SUPER::update; |
757 | } |
784 | } |
758 | |
785 | |
759 | sub size_allocate { |
786 | sub size_allocate { |
760 | my ($self, $w, $h) = @_; |
787 | my ($self, $w, $h, $changed) = @_; |
761 | |
788 | |
762 | $self->SUPER::size_allocate ($w, $h); |
789 | $self->SUPER::size_allocate ($w, $h, $changed); |
763 | $self->update; |
790 | $self->update |
|
|
791 | if $changed; |
764 | } |
792 | } |
765 | |
793 | |
766 | sub _render { |
794 | sub _render { |
767 | $_[0]{children}[0]->draw; |
795 | $_[0]{children}[0]->draw; |
768 | } |
796 | } |
… | |
… | |
812 | } |
840 | } |
813 | |
841 | |
814 | sub size_request { |
842 | sub size_request { |
815 | my ($self) = @_; |
843 | my ($self) = @_; |
816 | |
844 | |
817 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
845 | my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
818 | |
846 | |
819 | @$self{qw(child_w child_h)} |
847 | $w = 10 if $self->{scroll_x}; |
|
|
848 | $h = 10 if $self->{scroll_y}; |
|
|
849 | |
|
|
850 | ($w, $h) |
820 | } |
851 | } |
821 | |
852 | |
822 | sub size_allocate { |
853 | sub size_allocate { |
823 | my ($self, $w, $h) = @_; |
854 | my ($self, $w, $h, $changed) = @_; |
824 | |
855 | |
825 | $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; |
856 | $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; |
826 | $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; |
857 | $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; |
827 | |
858 | |
828 | $self->child->configure (0, 0, $w, $h); |
859 | $self->child->configure (0, 0, $w, $h); |
… | |
… | |
884 | my $class = shift; |
915 | my $class = shift; |
885 | |
916 | |
886 | my $self; |
917 | my $self; |
887 | |
918 | |
888 | my $slider = new CFClient::UI::Slider |
919 | my $slider = new CFClient::UI::Slider |
889 | vertical => 1, |
920 | vertical => 1, |
890 | range => [0, 0, 1, 0.01], # HACK fix |
921 | range => [0, 0, 1, 0.01], # HACK fix |
891 | connect_changed => sub { |
922 | on_changed => sub { |
892 | $self->{vp}->set_offset (0, $_[1]); |
923 | $self->{vp}->set_offset (0, $_[1]); |
893 | }, |
924 | }, |
894 | ; |
925 | ; |
895 | |
926 | |
896 | $self = $class->SUPER::new ( |
927 | $self = $class->SUPER::new ( |
… | |
… | |
915 | my $child = $self->{vp}->child; |
946 | my $child = $self->{vp}->child; |
916 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
947 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
917 | } |
948 | } |
918 | |
949 | |
919 | sub size_allocate { |
950 | sub size_allocate { |
920 | my ($self, $w, $h) = @_; |
951 | my ($self, $w, $h, $changed) = @_; |
921 | |
952 | |
922 | $self->SUPER::size_allocate ($w, $h); |
953 | $self->SUPER::size_allocate ($w, $h, $changed); |
923 | |
954 | |
924 | my $child = $self->{vp}->child; |
955 | my $child = $self->{vp}->child; |
925 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
956 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
926 | } |
957 | } |
927 | |
958 | |
… | |
… | |
980 | map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } |
1011 | map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } |
981 | qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1012 | qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
982 | |
1013 | |
983 | sub new { |
1014 | sub new { |
984 | my $class = shift; |
1015 | my $class = shift; |
985 | |
|
|
986 | # TODO: user_x, user_y, overwrite moveto? |
|
|
987 | |
1016 | |
988 | my $self = $class->SUPER::new ( |
1017 | my $self = $class->SUPER::new ( |
989 | bg => [1, 1, 1, 1], |
1018 | bg => [1, 1, 1, 1], |
990 | border_bg => [1, 1, 1, 1], |
1019 | border_bg => [1, 1, 1, 1], |
991 | border => 0.6, |
1020 | border => 0.6, |
… | |
… | |
1017 | $h + $self->border * 2, |
1046 | $h + $self->border * 2, |
1018 | ) |
1047 | ) |
1019 | } |
1048 | } |
1020 | |
1049 | |
1021 | sub size_allocate { |
1050 | sub size_allocate { |
1022 | my ($self, $w, $h) = @_; |
1051 | my ($self, $w, $h, $changed) = @_; |
|
|
1052 | |
|
|
1053 | return unless $changed; |
1023 | |
1054 | |
1024 | $h -= List::Util::max 0, $self->border * 2; |
1055 | $h -= List::Util::max 0, $self->border * 2; |
1025 | $w -= List::Util::max 0, $self->border * 2; |
1056 | $w -= List::Util::max 0, $self->border * 2; |
1026 | |
1057 | |
1027 | $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) |
1058 | $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) |
… | |
… | |
1051 | my ($ev, $x, $y) = @_; |
1082 | my ($ev, $x, $y) = @_; |
1052 | |
1083 | |
1053 | my $dx = $ev->{x} - $ox; |
1084 | my $dx = $ev->{x} - $ox; |
1054 | my $dy = $ev->{y} - $oy; |
1085 | my $dy = $ev->{y} - $oy; |
1055 | |
1086 | |
|
|
1087 | $self->{user_x} = $wx + $dx * $mx; |
|
|
1088 | $self->{user_y} = $wy + $dy * $my; |
1056 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
1089 | $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); |
1057 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
1090 | $self->{def_h} = $bh + $dy * ($my ? -1 : 1); |
1058 | $self->move ($wx + $dx * $mx, $wy + $dy * $my); |
1091 | $self->move ($self->{user_x}, $self->{user_y}); |
1059 | $self->check_size; |
1092 | $self->realloc; |
1060 | }; |
1093 | }; |
1061 | |
1094 | |
1062 | } elsif ($lr ^ $td) { |
1095 | } elsif ($lr ^ $td) { |
1063 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
1096 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
1064 | my ($bx, $by) = ($self->{x}, $self->{y}); |
1097 | my ($bx, $by) = ($self->{x}, $self->{y}); |
… | |
… | |
1066 | $self->{motion} = sub { |
1099 | $self->{motion} = sub { |
1067 | my ($ev, $x, $y) = @_; |
1100 | my ($ev, $x, $y) = @_; |
1068 | |
1101 | |
1069 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1102 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1070 | |
1103 | |
1071 | $self->move ($bx + $x - $ox, $by + $y - $oy); |
1104 | $self->{user_x} = $bx + $x - $ox; |
|
|
1105 | $self->{user_y} = $by + $y - $oy; |
|
|
1106 | |
|
|
1107 | $self->move ($self->{user_x}, $self->{user_y}); |
1072 | $self->update; |
1108 | $self->realloc; |
1073 | }; |
1109 | }; |
1074 | } |
1110 | } |
1075 | } |
1111 | } |
1076 | |
1112 | |
1077 | sub button_up { |
1113 | sub button_up { |
… | |
… | |
1152 | my ($self, $x, $y, $child) = @_; |
1188 | my ($self, $x, $y, $child) = @_; |
1153 | |
1189 | |
1154 | $child->set_parent ($self); |
1190 | $child->set_parent ($self); |
1155 | $self->{children}[$y][$x] = $child; |
1191 | $self->{children}[$y][$x] = $child; |
1156 | |
1192 | |
1157 | $self->check_size (1); |
1193 | $self->realloc; |
1158 | } |
1194 | } |
1159 | |
1195 | |
1160 | # TODO: move to container class maybe? send children a signal on removal? |
1196 | # TODO: move to container class maybe? send children a signal on removal? |
1161 | sub clear { |
1197 | sub clear { |
1162 | my ($self) = @_; |
1198 | my ($self) = @_; |
… | |
… | |
1167 | for (@children) { |
1203 | for (@children) { |
1168 | delete $_->{parent}; |
1204 | delete $_->{parent}; |
1169 | $_->hide; |
1205 | $_->hide; |
1170 | } |
1206 | } |
1171 | |
1207 | |
1172 | $self->check_size (1); |
1208 | $self->realloc; |
1173 | $self->update; |
|
|
1174 | } |
1209 | } |
1175 | |
1210 | |
1176 | sub get_wh { |
1211 | sub get_wh { |
1177 | my ($self) = @_; |
1212 | my ($self) = @_; |
1178 | |
1213 | |
… | |
… | |
1205 | (sum @$hs), |
1240 | (sum @$hs), |
1206 | ) |
1241 | ) |
1207 | } |
1242 | } |
1208 | |
1243 | |
1209 | sub size_allocate { |
1244 | sub size_allocate { |
1210 | my ($self, $w, $h) = @_; |
1245 | my ($self, $w, $h, $changed) = @_; |
1211 | |
1246 | |
1212 | my ($ws, $hs) = $self->get_wh; |
1247 | my ($ws, $hs) = $self->get_wh; |
1213 | |
1248 | |
1214 | my $req_w = (sum @$ws) || 1; |
1249 | my $req_w = (sum @$ws) || 1; |
1215 | my $req_h = (sum @$hs) || 1; |
1250 | my $req_h = (sum @$hs) || 1; |
… | |
… | |
1274 | } |
1309 | } |
1275 | } |
1310 | } |
1276 | |
1311 | |
1277 | ############################################################################# |
1312 | ############################################################################# |
1278 | |
1313 | |
|
|
1314 | package CFClient::UI::Box; |
|
|
1315 | |
|
|
1316 | our @ISA = CFClient::UI::Container::; |
|
|
1317 | |
|
|
1318 | sub size_request { |
|
|
1319 | my ($self) = @_; |
|
|
1320 | |
|
|
1321 | $self->{vertical} |
|
|
1322 | ? ( |
|
|
1323 | (List::Util::max map $_->{req_w}, @{$self->{children}}), |
|
|
1324 | (List::Util::sum map $_->{req_h}, @{$self->{children}}), |
|
|
1325 | ) |
|
|
1326 | : ( |
|
|
1327 | (List::Util::sum map $_->{req_w}, @{$self->{children}}), |
|
|
1328 | (List::Util::max map $_->{req_h}, @{$self->{children}}), |
|
|
1329 | ) |
|
|
1330 | } |
|
|
1331 | |
|
|
1332 | sub size_allocate { |
|
|
1333 | my ($self, $w, $h, $changed) = @_; |
|
|
1334 | |
|
|
1335 | my $space = $self->{vertical} ? $h : $w; |
|
|
1336 | my $children = $self->{children}; |
|
|
1337 | |
|
|
1338 | my @req; |
|
|
1339 | |
|
|
1340 | if ($self->{homogeneous}) { |
|
|
1341 | @req = ($space / (@$children || 1)) x @$children; |
|
|
1342 | } else { |
|
|
1343 | @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; |
|
|
1344 | my $req = List::Util::sum @req; |
|
|
1345 | |
|
|
1346 | if ($req > $space) { |
|
|
1347 | # ah well, not enough space |
|
|
1348 | $_ *= $space / $req for @req; |
|
|
1349 | } else { |
|
|
1350 | my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; |
|
|
1351 | |
|
|
1352 | $space = ($space - $req) / $expand; # remaining space to give away |
|
|
1353 | |
|
|
1354 | $req[$_] += $space * $children->[$_]{expand} |
|
|
1355 | for 0 .. $#$children; |
|
|
1356 | } |
|
|
1357 | } |
|
|
1358 | |
|
|
1359 | CFClient::UI::harmonize \@req; |
|
|
1360 | |
|
|
1361 | my $pos = 0; |
|
|
1362 | for (0 .. $#$children) { |
|
|
1363 | my $alloc = $req[$_]; |
|
|
1364 | $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); |
|
|
1365 | |
|
|
1366 | $pos += $alloc; |
|
|
1367 | } |
|
|
1368 | |
|
|
1369 | 1 |
|
|
1370 | } |
|
|
1371 | |
|
|
1372 | ############################################################################# |
|
|
1373 | |
1279 | package CFClient::UI::HBox; |
1374 | package CFClient::UI::HBox; |
1280 | |
1375 | |
1281 | # TODO: wrap into common Box base class |
|
|
1282 | |
|
|
1283 | our @ISA = CFClient::UI::Container::; |
1376 | our @ISA = CFClient::UI::Box::; |
1284 | |
1377 | |
1285 | sub size_request { |
1378 | sub new { |
1286 | my ($self) = @_; |
1379 | my $class = shift; |
1287 | |
1380 | |
1288 | my @alloc = map [$_->size_request], @{$self->{children}}; |
1381 | $class->SUPER::new ( |
1289 | |
1382 | vertical => 0, |
1290 | ( |
1383 | @_, |
1291 | (List::Util::sum map $_->[0], @alloc), |
|
|
1292 | (List::Util::max map $_->[1], @alloc), |
|
|
1293 | ) |
1384 | ) |
1294 | } |
1385 | } |
1295 | |
1386 | |
1296 | sub size_allocate { |
|
|
1297 | my ($self, $w, $h) = @_; |
|
|
1298 | |
|
|
1299 | ($h, $w) = ($w, $h); |
|
|
1300 | |
|
|
1301 | my $children = $self->{children}; |
|
|
1302 | |
|
|
1303 | my @h = map $_->{req_w}, @$children; |
|
|
1304 | |
|
|
1305 | my $req_h = List::Util::sum @h; |
|
|
1306 | |
|
|
1307 | if ($req_h > $h) { |
|
|
1308 | # ah well, not enough space |
|
|
1309 | $_ *= $h / $req_h for @h; |
|
|
1310 | } else { |
|
|
1311 | my $exp = List::Util::sum map $_->{expand}, @$children; |
|
|
1312 | $exp ||= 1; |
|
|
1313 | |
|
|
1314 | for (0 .. $#$children) { |
|
|
1315 | my $child = $children->[$_]; |
|
|
1316 | |
|
|
1317 | my $alloc_h = $h[$_]; |
|
|
1318 | $alloc_h += ($h - $req_h) * $child->{expand} / $exp; |
|
|
1319 | $h[$_] = $alloc_h; |
|
|
1320 | } |
|
|
1321 | } |
|
|
1322 | |
|
|
1323 | CFClient::UI::harmonize \@h; |
|
|
1324 | |
|
|
1325 | my $y = 0; |
|
|
1326 | for (0 .. $#$children) { |
|
|
1327 | my $child = $children->[$_]; |
|
|
1328 | my $h = $h[$_]; |
|
|
1329 | $child->configure ($y, 0, $h, $w); |
|
|
1330 | |
|
|
1331 | $y += $h; |
|
|
1332 | } |
|
|
1333 | |
|
|
1334 | 1 |
|
|
1335 | } |
|
|
1336 | |
|
|
1337 | ############################################################################# |
1387 | ############################################################################# |
1338 | |
1388 | |
1339 | package CFClient::UI::VBox; |
1389 | package CFClient::UI::VBox; |
1340 | |
1390 | |
1341 | # TODO: wrap into common Box base class |
|
|
1342 | |
|
|
1343 | our @ISA = CFClient::UI::Container::; |
1391 | our @ISA = CFClient::UI::Box::; |
1344 | |
1392 | |
1345 | sub size_request { |
1393 | sub new { |
1346 | my ($self) = @_; |
1394 | my $class = shift; |
1347 | |
1395 | |
1348 | my @alloc = map [$_->size_request], @{$self->{children}}; |
1396 | $class->SUPER::new ( |
1349 | |
1397 | vertical => 1, |
1350 | ( |
1398 | @_, |
1351 | (List::Util::max map $_->[0], @alloc), |
|
|
1352 | (List::Util::sum map $_->[1], @alloc), |
|
|
1353 | ) |
1399 | ) |
1354 | } |
|
|
1355 | |
|
|
1356 | sub size_allocate { |
|
|
1357 | my ($self, $w, $h) = @_; |
|
|
1358 | |
|
|
1359 | Carp::confess "negative size" if $w < 0 || $h < 0;#d# |
|
|
1360 | |
|
|
1361 | my $children = $self->{children}; |
|
|
1362 | |
|
|
1363 | my @h = map $_->{req_h}, @$children; |
|
|
1364 | |
|
|
1365 | my $req_h = List::Util::sum @h; |
|
|
1366 | |
|
|
1367 | if ($req_h > $h) { |
|
|
1368 | # ah well, not enough space |
|
|
1369 | $_ *= $h / $req_h for @h; |
|
|
1370 | } else { |
|
|
1371 | my $exp = List::Util::sum map $_->{expand}, @$children; |
|
|
1372 | $exp ||= 1; |
|
|
1373 | |
|
|
1374 | for (0 .. $#$children) { |
|
|
1375 | my $child = $children->[$_]; |
|
|
1376 | |
|
|
1377 | $h[$_] += ($h - $req_h) * $child->{expand} / $exp; |
|
|
1378 | } |
|
|
1379 | } |
|
|
1380 | |
|
|
1381 | CFClient::UI::harmonize \@h; |
|
|
1382 | |
|
|
1383 | my $y = 0; |
|
|
1384 | for (0 .. $#$children) { |
|
|
1385 | my $child = $children->[$_]; |
|
|
1386 | my $h = $h[$_]; |
|
|
1387 | $child->configure (0, $y, $w, $h); |
|
|
1388 | |
|
|
1389 | $y += $h; |
|
|
1390 | } |
|
|
1391 | |
|
|
1392 | 1 |
|
|
1393 | } |
1400 | } |
1394 | |
1401 | |
1395 | ############################################################################# |
1402 | ############################################################################# |
1396 | |
1403 | |
1397 | package CFClient::UI::Label; |
1404 | package CFClient::UI::Label; |
… | |
… | |
1460 | $self->{text} = "T$text"; |
1467 | $self->{text} = "T$text"; |
1461 | |
1468 | |
1462 | $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; |
1469 | $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; |
1463 | $self->{layout}->set_text ($text); |
1470 | $self->{layout}->set_text ($text); |
1464 | |
1471 | |
|
|
1472 | $self->realloc; |
1465 | $self->update; |
1473 | $self->update; |
1466 | $self->check_size; |
|
|
1467 | } |
1474 | } |
1468 | |
1475 | |
1469 | sub set_markup { |
1476 | sub set_markup { |
1470 | my ($self, $markup) = @_; |
1477 | my ($self, $markup) = @_; |
1471 | |
1478 | |
… | |
… | |
1475 | my $rgba = $markup =~ /span.*(?:foreground|background)/; |
1482 | my $rgba = $markup =~ /span.*(?:foreground|background)/; |
1476 | |
1483 | |
1477 | $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; |
1484 | $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; |
1478 | $self->{layout}->set_markup ($markup); |
1485 | $self->{layout}->set_markup ($markup); |
1479 | |
1486 | |
|
|
1487 | $self->realloc; |
1480 | $self->update; |
1488 | $self->update; |
1481 | $self->check_size; |
|
|
1482 | } |
1489 | } |
1483 | |
1490 | |
1484 | sub size_request { |
1491 | sub size_request { |
1485 | my ($self) = @_; |
1492 | my ($self) = @_; |
1486 | |
1493 | |
… | |
… | |
1507 | $h + $self->{padding} * 2, |
1514 | $h + $self->{padding} * 2, |
1508 | ) |
1515 | ) |
1509 | } |
1516 | } |
1510 | |
1517 | |
1511 | sub size_allocate { |
1518 | sub size_allocate { |
1512 | my ($self, $w, $h) = @_; |
1519 | my ($self, $w, $h, $changed) = @_; |
1513 | |
1520 | |
1514 | delete $self->{texture}; |
1521 | delete $self->{texture} |
|
|
1522 | if $changed; |
1515 | } |
1523 | } |
1516 | |
1524 | |
1517 | sub set_fontsize { |
1525 | sub set_fontsize { |
1518 | my ($self, $fontsize) = @_; |
1526 | my ($self, $fontsize) = @_; |
1519 | |
1527 | |
1520 | $self->{fontsize} = $fontsize; |
1528 | $self->{fontsize} = $fontsize; |
1521 | delete $self->{texture}; |
1529 | delete $self->{texture}; |
1522 | |
1530 | |
1523 | $self->update; |
1531 | $self->realloc; |
1524 | $self->check_size; |
|
|
1525 | } |
1532 | } |
1526 | |
1533 | |
1527 | sub _draw { |
1534 | sub _draw { |
1528 | my ($self) = @_; |
1535 | my ($self) = @_; |
1529 | |
1536 | |
… | |
… | |
1609 | sub set_text { |
1616 | sub set_text { |
1610 | my ($self, $text) = @_; |
1617 | my ($self, $text) = @_; |
1611 | |
1618 | |
1612 | $self->{cursor} = length $text; |
1619 | $self->{cursor} = length $text; |
1613 | $self->_set_text ($text); |
1620 | $self->_set_text ($text); |
1614 | $self->update; |
1621 | |
1615 | $self->check_size; |
1622 | $self->realloc; |
1616 | } |
1623 | } |
1617 | |
1624 | |
1618 | sub get_text { |
1625 | sub get_text { |
1619 | $_[0]{text} |
1626 | $_[0]{text} |
1620 | } |
1627 | } |
… | |
… | |
1653 | } elsif ($uni) { |
1660 | } elsif ($uni) { |
1654 | substr $text, $self->{cursor}++, 0, chr $uni; |
1661 | substr $text, $self->{cursor}++, 0, chr $uni; |
1655 | } |
1662 | } |
1656 | |
1663 | |
1657 | $self->_set_text ($text); |
1664 | $self->_set_text ($text); |
1658 | $self->update; |
1665 | |
1659 | $self->check_size; |
1666 | $self->realloc; |
1660 | } |
1667 | } |
1661 | |
1668 | |
1662 | sub focus_in { |
1669 | sub focus_in { |
1663 | my ($self) = @_; |
1670 | my ($self) = @_; |
1664 | |
1671 | |
… | |
… | |
2171 | $self->update; |
2178 | $self->update; |
2172 | |
2179 | |
2173 | $self |
2180 | $self |
2174 | } |
2181 | } |
2175 | |
2182 | |
|
|
2183 | sub changed { } |
|
|
2184 | |
2176 | sub set_range { |
2185 | sub set_range { |
2177 | my ($self, $range) = @_; |
2186 | my ($self, $range) = @_; |
2178 | |
2187 | |
2179 | ($range, $self->{range}) = ($self->{range}, $range); |
2188 | ($range, $self->{range}) = ($self->{range}, $range); |
2180 | |
2189 | |
… | |
… | |
2369 | $self->{fontsize} = $fontsize; |
2378 | $self->{fontsize} = $fontsize; |
2370 | $self->reflow; |
2379 | $self->reflow; |
2371 | } |
2380 | } |
2372 | |
2381 | |
2373 | sub size_allocate { |
2382 | sub size_allocate { |
2374 | my ($self, $w, $h) = @_; |
2383 | my ($self, $w, $h, $changed) = @_; |
2375 | |
2384 | |
2376 | $self->SUPER::size_allocate ($w, $h); |
2385 | $self->SUPER::size_allocate ($w, $h, $changed); |
|
|
2386 | |
|
|
2387 | return unless $changed; |
2377 | |
2388 | |
2378 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
2389 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
2379 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
2390 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
2380 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2391 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2381 | |
2392 | |
… | |
… | |
2570 | |
2581 | |
2571 | sub new { |
2582 | sub new { |
2572 | my $class = shift; |
2583 | my $class = shift; |
2573 | |
2584 | |
2574 | my $self = $class->SUPER::new ( |
2585 | my $self = $class->SUPER::new ( |
2575 | state => 0, |
2586 | state => 0, |
2576 | connect_activate => \&toggle_flopper, |
2587 | on_activate => \&toggle_flopper, |
2577 | @_ |
2588 | @_ |
2578 | ); |
2589 | ); |
2579 | |
2590 | |
2580 | if ($self->{state}) { |
|
|
2581 | $self->{state} = 0; |
|
|
2582 | $self->toggle_flopper; |
|
|
2583 | } |
|
|
2584 | |
|
|
2585 | $self |
2591 | $self |
2586 | } |
2592 | } |
2587 | |
2593 | |
2588 | sub toggle_flopper { |
2594 | sub toggle_flopper { |
2589 | my ($self) = @_; |
2595 | my ($self) = @_; |
2590 | |
2596 | |
2591 | # TODO: use animation |
2597 | $self->{other}->toggle_visibility; |
2592 | if ($self->{state} = !$self->{state}) { |
|
|
2593 | $CFClient::UI::ROOT->add ($self->{other}); |
|
|
2594 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
|
|
2595 | $self->_emit ("open"); |
|
|
2596 | } else { |
|
|
2597 | $CFClient::UI::ROOT->remove ($self->{other}); |
|
|
2598 | $self->_emit ("close"); |
|
|
2599 | } |
|
|
2600 | |
|
|
2601 | $self->_emit (changed => $self->{state}); |
|
|
2602 | } |
2598 | } |
2603 | |
2599 | |
2604 | ############################################################################# |
2600 | ############################################################################# |
2605 | |
2601 | |
2606 | package CFClient::UI::Tooltip; |
2602 | package CFClient::UI::Tooltip; |
… | |
… | |
2638 | |
2634 | |
2639 | ($w + 4, $h + 4) |
2635 | ($w + 4, $h + 4) |
2640 | } |
2636 | } |
2641 | |
2637 | |
2642 | sub size_allocate { |
2638 | sub size_allocate { |
2643 | my ($self, $w, $h) = @_; |
2639 | my ($self, $w, $h, $changed) = @_; |
2644 | |
2640 | |
|
|
2641 | return unless $changed; |
|
|
2642 | |
2645 | $self->SUPER::size_allocate ($w - 4, $h - 4); |
2643 | $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); |
2646 | } |
2644 | } |
2647 | |
2645 | |
2648 | sub _draw { |
2646 | sub _draw { |
2649 | my ($self) = @_; |
2647 | my ($self) = @_; |
2650 | |
2648 | |
… | |
… | |
2667 | glVertex $w, $h; |
2665 | glVertex $w, $h; |
2668 | glVertex $w, 0; |
2666 | glVertex $w, 0; |
2669 | glEnd; |
2667 | glEnd; |
2670 | |
2668 | |
2671 | glTranslate 2 - 0.375, 2 - 0.375; |
2669 | glTranslate 2 - 0.375, 2 - 0.375; |
|
|
2670 | |
2672 | $self->SUPER::_draw; |
2671 | $self->SUPER::_draw; |
2673 | } |
2672 | } |
2674 | |
2673 | |
2675 | ############################################################################# |
2674 | ############################################################################# |
2676 | |
2675 | |
… | |
… | |
2790 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2789 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2791 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2790 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2792 | |
2791 | |
2793 | $row++; |
2792 | $row++; |
2794 | } |
2793 | } |
2795 | } |
|
|
2796 | |
|
|
2797 | sub size_request { |
|
|
2798 | my ($self) = @_; |
|
|
2799 | ($self->{req_w}, $self->{req_h}); |
|
|
2800 | } |
2794 | } |
2801 | |
2795 | |
2802 | ############################################################################# |
2796 | ############################################################################# |
2803 | |
2797 | |
2804 | package CFClient::UI::Menu; |
2798 | package CFClient::UI::Menu; |
… | |
… | |
2990 | use CFClient::OpenGL; |
2984 | use CFClient::OpenGL; |
2991 | |
2985 | |
2992 | sub new { |
2986 | sub new { |
2993 | my $class = shift; |
2987 | my $class = shift; |
2994 | |
2988 | |
2995 | $class->SUPER::new ( |
2989 | my $self = $class->SUPER::new ( |
2996 | visible => 1, |
2990 | visible => 1, |
2997 | @_, |
2991 | @_, |
2998 | ) |
2992 | ); |
|
|
2993 | |
|
|
2994 | Scalar::Util::weaken ($self->{root} = $self); |
|
|
2995 | |
|
|
2996 | $self |
2999 | } |
2997 | } |
3000 | |
2998 | |
3001 | sub configure { |
2999 | sub configure { |
3002 | my ($self, $x, $y, $w, $h) = @_; |
3000 | my ($self, $x, $y, $w, $h) = @_; |
3003 | |
3001 | |
3004 | $self->{w} = $w; |
3002 | $self->{w} = $w; |
3005 | $self->{h} = $h; |
3003 | $self->{h} = $h; |
3006 | } |
3004 | } |
3007 | |
3005 | |
3008 | sub check_size { |
3006 | sub reconfigure { |
3009 | my ($self) = @_; |
3007 | my ($self) = @_; |
3010 | |
3008 | |
|
|
3009 | $self->SUPER::reconfigure; |
|
|
3010 | |
3011 | $self->size_allocate ($self->{w}, $self->{h}) |
3011 | $self->size_allocate ($self->{w}, $self->{h}, 1) |
3012 | if $self->{w}; |
3012 | if $self->{w}; |
3013 | } |
3013 | } |
3014 | |
3014 | |
3015 | sub size_request { |
3015 | sub size_request { |
3016 | my ($self) = @_; |
3016 | my ($self) = @_; |
3017 | |
3017 | |
3018 | ($self->{w}, $self->{h}) |
3018 | ($self->{w}, $self->{h}) |
3019 | } |
3019 | } |
3020 | |
3020 | |
3021 | sub size_allocate { |
3021 | sub size_allocate { |
3022 | my ($self, $w, $h) = @_; |
3022 | my ($self, $w, $h, $changed) = @_; |
3023 | |
3023 | |
3024 | for my $child ($self->children) { |
3024 | for my $child ($self->children) { |
3025 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3025 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3026 | |
3026 | |
3027 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3027 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3028 | if exists $child->{req_x}; |
3028 | if exists $child->{req_x}; |
3029 | |
3029 | |
3030 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
3030 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
3031 | if exists $child->{req_y}; |
3031 | if exists $child->{req_y}; |
3032 | |
3032 | |
|
|
3033 | #delete @$child{qw(req_x req_y)};#d# def_x, def_y |
|
|
3034 | |
3033 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
3035 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
3034 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
3036 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
3035 | |
3037 | |
3036 | $child->configure ($X, $Y, $W, $H); |
3038 | $child->configure ($X, $Y, $W, $H); |
3037 | } |
3039 | } |
… | |
… | |
3050 | } |
3052 | } |
3051 | |
3053 | |
3052 | sub update { |
3054 | sub update { |
3053 | my ($self) = @_; |
3055 | my ($self) = @_; |
3054 | |
3056 | |
3055 | $self->check_size; |
|
|
3056 | $::WANT_REFRESH++; |
3057 | $::WANT_REFRESH++; |
3057 | } |
3058 | } |
3058 | |
3059 | |
3059 | sub add { |
3060 | sub add { |
3060 | my ($self, @children) = @_; |
3061 | my ($self, @children) = @_; |
3061 | |
|
|
3062 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3063 | push @widgets, $w->children; |
|
|
3064 | $w->{root} = $self; |
|
|
3065 | $w->{visible} = $self->{visible} + 1; |
|
|
3066 | } |
|
|
3067 | |
3062 | |
3068 | for my $child (@children) { |
3063 | for my $child (@children) { |
3069 | $child->{is_toplevel} = 1; |
3064 | $child->{is_toplevel} = 1; |
3070 | |
3065 | |
3071 | # integerise window positions |
3066 | # integerise window positions |
… | |
… | |
3106 | while ($self->{refresh_hook}) { |
3101 | while ($self->{refresh_hook}) { |
3107 | $_->() |
3102 | $_->() |
3108 | for values %{delete $self->{refresh_hook}}; |
3103 | for values %{delete $self->{refresh_hook}}; |
3109 | } |
3104 | } |
3110 | |
3105 | |
3111 | if ($self->{check_size}) { |
3106 | if ($self->{realloc}) { |
3112 | my @queue = ([], []); |
3107 | my @queue; |
3113 | |
3108 | |
3114 | for (;;) { |
3109 | while () { |
3115 | if ($self->{check_size}) { |
3110 | if ($self->{realloc}) { |
3116 | # heuristic: check containers last |
3111 | #TODO use array-of-depth approach |
3117 | push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ |
3112 | |
3118 | for values %{delete $self->{check_size}} |
3113 | @queue = sort { $a->{visible} <=> $b->{visible} } |
|
|
3114 | @queue, values %{delete $self->{realloc}}; |
3119 | } |
3115 | } |
3120 | |
3116 | |
3121 | my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; |
3117 | my $widget = pop @queue || last; |
3122 | |
3118 | |
|
|
3119 | $widget->{visible} or last; # do not resize invisible widgets |
|
|
3120 | |
3123 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
3121 | my ($w, $h) = $widget->{def_w} && $widget->{def_h} |
3124 | ? @$widget{qw(user_w user_h)} |
3122 | ? @$widget{qw(def_w def_h)} |
3125 | : $widget->size_request; |
3123 | : $widget->size_request; |
3126 | |
3124 | |
3127 | if (delete $widget->{force_alloc} |
|
|
3128 | or $w != $widget->{req_w} or $h != $widget->{req_h}) { |
|
|
3129 | Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# |
3125 | Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# |
3130 | |
3126 | |
3131 | $widget->{req_w} = $w; |
3127 | $widget->{req_w} = $w; |
3132 | $widget->{req_h} = $h; |
3128 | $widget->{req_h} = $h; |
3133 | |
3129 | |
3134 | $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; |
3130 | $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; |
3135 | |
3131 | |
3136 | $widget->{parent}->check_size |
3132 | push @queue, $widget->{parent} |
3137 | if $widget->{parent}; |
3133 | if $widget->{parent}; |
3138 | } |
|
|
3139 | } |
3134 | } |
3140 | } |
3135 | } |
3141 | |
3136 | |
3142 | while ($self->{size_alloc}) { |
3137 | while (my $size_alloc = delete $self->{size_alloc}) { |
3143 | for (values %{delete $self->{size_alloc}}) { |
3138 | my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, |
3144 | my ($widget, $w, $h) = @$_; |
3139 | values %$size_alloc; |
|
|
3140 | |
|
|
3141 | while () { |
|
|
3142 | my ($widget, $w, $h) = @{ pop @queue or last }; |
3145 | |
3143 | |
3146 | $w = 0 if $w < 0; |
3144 | $w = 0 if $w < 0; |
3147 | $h = 0 if $h < 0; |
3145 | $h = 0 if $h < 0; |
3148 | |
3146 | |
|
|
3147 | my $changed = $widget->{w} != $w || $widget->{h} != $h; |
|
|
3148 | |
3149 | $widget->{w} = $w; |
3149 | $widget->{w} = $w; |
3150 | $widget->{h} = $h; |
3150 | $widget->{h} = $h; |
|
|
3151 | |
3151 | $widget->emit (size_allocate => $w, $h); |
3152 | $widget->emit (size_allocate => $w, $h, $changed); |
3152 | } |
3153 | } |
3153 | } |
3154 | } |
3154 | |
3155 | |
3155 | while ($self->{post_alloc_hook}) { |
3156 | while ($self->{post_alloc_hook}) { |
3156 | $_->() |
3157 | $_->() |