… | |
… | |
50 | delete $TOOLTIP->{owner}; |
50 | delete $TOOLTIP->{owner}; |
51 | } |
51 | } |
52 | |
52 | |
53 | # class methods for events |
53 | # class methods for events |
54 | sub feed_sdl_key_down_event { |
54 | sub feed_sdl_key_down_event { |
55 | $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) |
55 | $FOCUS->emit (key_down => $_[0]) |
56 | if $FOCUS; |
56 | if $FOCUS; |
57 | } |
57 | } |
58 | |
58 | |
59 | sub feed_sdl_key_up_event { |
59 | sub feed_sdl_key_up_event { |
60 | $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) |
60 | $FOCUS->emit (key_up => $_[0]) |
61 | if $FOCUS; |
61 | if $FOCUS; |
62 | } |
62 | } |
63 | |
63 | |
64 | sub feed_sdl_button_down_event { |
64 | sub feed_sdl_button_down_event { |
65 | my ($ev) = @_; |
65 | my ($ev) = @_; |
… | |
… | |
74 | check_tooltip; |
74 | check_tooltip; |
75 | } |
75 | } |
76 | |
76 | |
77 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
77 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
78 | |
78 | |
79 | if ($GRAB) { |
79 | $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) |
80 | ($x, $y) = $GRAB->coord2local ($x, $y); |
80 | if $GRAB; |
81 | $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); |
|
|
82 | } |
|
|
83 | } |
81 | } |
84 | |
82 | |
85 | sub feed_sdl_button_up_event { |
83 | sub feed_sdl_button_up_event { |
86 | my ($ev) = @_; |
84 | my ($ev) = @_; |
87 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
85 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
88 | |
86 | |
89 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
87 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
90 | |
88 | |
91 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
89 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
92 | |
90 | |
93 | if ($GRAB) { |
91 | $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) |
94 | ($x, $y) = $GRAB->coord2local ($x, $y); |
92 | if $GRAB; |
95 | $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y); |
|
|
96 | } |
|
|
97 | |
93 | |
98 | if (!$BUTTON_STATE) { |
94 | if (!$BUTTON_STATE) { |
99 | my $grab = $GRAB; undef $GRAB; |
95 | my $grab = $GRAB; undef $GRAB; |
100 | $grab->update if $grab; |
96 | $grab->update if $grab; |
101 | $GRAB->update if $GRAB; |
97 | $GRAB->update if $GRAB; |
… | |
… | |
117 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
113 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
118 | |
114 | |
119 | check_tooltip; |
115 | check_tooltip; |
120 | } |
116 | } |
121 | |
117 | |
122 | if ($HOVER) { |
|
|
123 | ($x, $y) = $HOVER->coord2local ($x, $y); |
|
|
124 | $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); |
118 | $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) |
125 | } |
119 | if $HOVER; |
126 | } |
120 | } |
127 | |
121 | |
128 | # convert position array to integers |
122 | # convert position array to integers |
129 | sub harmonize { |
123 | sub harmonize { |
130 | my ($vals) = @_; |
124 | my ($vals) = @_; |
… | |
… | |
136 | $rem += $_ - $i; |
130 | $rem += $_ - $i; |
137 | $_ = $i; |
131 | $_ = $i; |
138 | } |
132 | } |
139 | } |
133 | } |
140 | |
134 | |
|
|
135 | sub full_refresh { |
|
|
136 | # make a copy, otherwise for complains about freed values. |
|
|
137 | my @widgets = values %WIDGET; |
|
|
138 | |
|
|
139 | $_->update |
|
|
140 | for @widgets; |
|
|
141 | } |
|
|
142 | |
|
|
143 | sub reconfigure_widgets { |
|
|
144 | # make a copy, otherwise C<for> complains about freed values. |
|
|
145 | my @widgets = values %WIDGET; |
|
|
146 | |
|
|
147 | $_->reconfigure |
|
|
148 | for @widgets; |
|
|
149 | } |
|
|
150 | |
141 | # call when resolution changes etc. |
151 | # call when resolution changes etc. |
142 | sub rescale_widgets { |
152 | sub rescale_widgets { |
143 | my ($sx, $sy) = @_; |
153 | my ($sx, $sy) = @_; |
144 | |
154 | |
145 | # make a copy, otherwise for complains about freed values. |
|
|
146 | my @widgets = values %WIDGET; |
155 | for my $widget (values %WIDGET) { |
147 | |
|
|
148 | for my $widget (@widgets) { |
|
|
149 | if ($widget->{toplevel}) { |
156 | if ($widget->{is_toplevel}) { |
150 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
157 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
151 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
158 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
152 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
159 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
153 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
160 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
154 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
161 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
155 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
162 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
156 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
163 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
157 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
164 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
158 | } |
165 | } |
159 | |
|
|
160 | $widget->reconfigure; |
|
|
161 | } |
166 | } |
|
|
167 | |
|
|
168 | reconfigure_widgets; |
162 | } |
169 | } |
163 | |
170 | |
164 | ############################################################################# |
171 | ############################################################################# |
165 | |
172 | |
166 | package CFClient::UI::Base; |
173 | package CFClient::UI::Base; |
… | |
… | |
198 | %$self = (); |
205 | %$self = (); |
199 | } |
206 | } |
200 | |
207 | |
201 | sub show { |
208 | sub show { |
202 | my ($self) = @_; |
209 | my ($self) = @_; |
203 | |
|
|
204 | return if $self->{parent}; |
210 | return if $self->{parent}; |
205 | |
211 | |
206 | $CFClient::UI::ROOT->add ($self); |
212 | $CFClient::UI::ROOT->add ($self); |
207 | } |
213 | } |
208 | |
214 | |
209 | sub hide { |
215 | sub show_centered { |
210 | my ($self) = @_; |
216 | my ($self) = @_; |
|
|
217 | return if $self->{parent}; |
|
|
218 | |
|
|
219 | $self->show; |
|
|
220 | |
|
|
221 | $CFClient::UI::ROOT->on_post_alloc ( |
|
|
222 | "centered $self" => sub { |
|
|
223 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
|
|
224 | }, |
|
|
225 | ); |
|
|
226 | } |
|
|
227 | |
|
|
228 | sub set_invisible { |
|
|
229 | my ($self) = @_; |
|
|
230 | |
|
|
231 | # broken show/hide model |
|
|
232 | |
|
|
233 | delete $self->{visible}; |
211 | |
234 | |
212 | undef $GRAB if $GRAB == $self; |
235 | undef $GRAB if $GRAB == $self; |
213 | undef $HOVER if $HOVER == $self; |
236 | undef $HOVER if $HOVER == $self; |
|
|
237 | |
|
|
238 | CFClient::UI::check_tooltip |
|
|
239 | if $CFClient::UI::TOOLTIP->{owner} == $self; |
|
|
240 | |
|
|
241 | $self->focus_out; |
|
|
242 | } |
|
|
243 | |
|
|
244 | sub hide { |
|
|
245 | my ($self) = @_; |
|
|
246 | |
|
|
247 | $self->set_invisible; |
214 | |
248 | |
215 | $self->{parent}->remove ($self) |
249 | $self->{parent}->remove ($self) |
216 | if $self->{parent}; |
250 | if $self->{parent}; |
217 | } |
251 | } |
218 | |
252 | |
… | |
… | |
288 | } |
322 | } |
289 | |
323 | |
290 | sub set_tooltip { |
324 | sub set_tooltip { |
291 | my ($self, $tooltip) = @_; |
325 | my ($self, $tooltip) = @_; |
292 | |
326 | |
|
|
327 | $tooltip =~ s/^\s+//; |
|
|
328 | $tooltip =~ s/\s+$//; |
|
|
329 | |
|
|
330 | return if $self->{tooltip} eq $tooltip; |
|
|
331 | |
293 | $self->{tooltip} = $tooltip; |
332 | $self->{tooltip} = $tooltip; |
294 | |
333 | |
295 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
334 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
296 | delete $CFClient::UI::TOOLTIP->{owner}; |
335 | delete $CFClient::UI::TOOLTIP->{owner}; |
297 | CFClient::UI::check_tooltip; |
336 | CFClient::UI::check_tooltip; |
… | |
… | |
318 | return if $FOCUS == $self; |
357 | return if $FOCUS == $self; |
319 | return unless $self->{can_focus}; |
358 | return unless $self->{can_focus}; |
320 | |
359 | |
321 | my $focus = $FOCUS; $FOCUS = $self; |
360 | my $focus = $FOCUS; $FOCUS = $self; |
322 | |
361 | |
323 | $self->emit (focus_in => $focus); |
362 | $self->_emit (focus_in => $focus); |
324 | |
363 | |
325 | $focus->update if $focus; |
364 | $focus->update if $focus; |
326 | $FOCUS->update; |
365 | $FOCUS->update; |
327 | } |
366 | } |
328 | |
367 | |
… | |
… | |
331 | |
370 | |
332 | return unless $FOCUS == $self; |
371 | return unless $FOCUS == $self; |
333 | |
372 | |
334 | my $focus = $FOCUS; undef $FOCUS; |
373 | my $focus = $FOCUS; undef $FOCUS; |
335 | |
374 | |
336 | $self->emit (focus_out => $focus); |
375 | $self->_emit (focus_out => $focus); |
337 | |
376 | |
338 | $focus->update if $focus; #? |
377 | $focus->update if $focus; #? |
|
|
378 | |
|
|
379 | $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus |
|
|
380 | unless $FOCUS; |
339 | } |
381 | } |
340 | |
382 | |
341 | sub mouse_motion { } |
383 | sub mouse_motion { } |
342 | sub button_up { } |
384 | sub button_up { } |
343 | sub key_down { } |
385 | sub key_down { } |
344 | sub key_up { } |
386 | sub key_up { } |
345 | |
387 | |
346 | sub button_down { |
388 | sub button_down { |
347 | my ($self, $ev, $x, $y) = @_; |
389 | my ($self, $ev, $x, $y) = @_; |
348 | |
390 | |
349 | $self->focus_in; |
391 | $self->focus_in; |
… | |
… | |
383 | if ($ENV{PCLIENT_DEBUG}) { |
425 | if ($ENV{PCLIENT_DEBUG}) { |
384 | glPushMatrix; |
426 | glPushMatrix; |
385 | glColor 1, 1, 0, 1; |
427 | glColor 1, 1, 0, 1; |
386 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
428 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
387 | glBegin GL_LINE_LOOP; |
429 | glBegin GL_LINE_LOOP; |
388 | glVertex 0 , 0; |
430 | glVertex 0 , 0; |
389 | glVertex $self->{w}, 0; |
431 | glVertex $self->{w} - 1, 0; |
390 | glVertex $self->{w}, $self->{h}; |
432 | glVertex $self->{w} - 1, $self->{h} - 1; |
391 | glVertex 0 , $self->{h}; |
433 | glVertex 0 , $self->{h} - 1; |
392 | glEnd; |
434 | glEnd; |
393 | glPopMatrix; |
435 | glPopMatrix; |
394 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
436 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
395 | } |
437 | } |
396 | } |
438 | } |
… | |
… | |
416 | sub set_parent { |
458 | sub set_parent { |
417 | my ($self, $parent) = @_; |
459 | my ($self, $parent) = @_; |
418 | |
460 | |
419 | Scalar::Util::weaken ($self->{parent} = $parent); |
461 | Scalar::Util::weaken ($self->{parent} = $parent); |
420 | |
462 | |
|
|
463 | $self->{root} = $parent->{root}; |
|
|
464 | $self->{visible} = $parent->{visible}; |
|
|
465 | |
421 | # TODO: req_w _does_change after ->reconfigure |
466 | # TODO: req_w _does_change after ->reconfigure |
422 | $self->check_size |
467 | $self->check_size |
423 | unless exists $self->{req_w}; |
468 | unless exists $self->{req_w}; |
|
|
469 | |
|
|
470 | $self->show; |
424 | } |
471 | } |
425 | |
472 | |
426 | sub check_size { |
473 | sub check_size { |
427 | my ($self, $forced) = @_; |
474 | my ($self, $forced) = @_; |
428 | |
475 | |
… | |
… | |
441 | my ($self, $signal, $cb) = @_; |
488 | my ($self, $signal, $cb) = @_; |
442 | |
489 | |
443 | push @{ $self->{signal_cb}{$signal} }, $cb; |
490 | push @{ $self->{signal_cb}{$signal} }, $cb; |
444 | } |
491 | } |
445 | |
492 | |
|
|
493 | sub _emit { |
|
|
494 | my ($self, $signal, @args) = @_; |
|
|
495 | |
|
|
496 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
|
|
497 | } |
|
|
498 | |
446 | sub emit { |
499 | sub emit { |
447 | my ($self, $signal, @args) = @_; |
500 | my ($self, $signal, @args) = @_; |
448 | |
501 | |
449 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
502 | $self->_emit ($signal, @args) |
|
|
503 | || $self->$signal (@args); |
450 | } |
504 | } |
451 | |
505 | |
452 | sub DESTROY { |
506 | sub DESTROY { |
453 | my ($self) = @_; |
507 | my ($self) = @_; |
454 | |
508 | |
… | |
… | |
567 | delete $child->{parent}; |
621 | delete $child->{parent}; |
568 | $child->hide; |
622 | $child->hide; |
569 | |
623 | |
570 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
624 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
571 | |
625 | |
572 | $self->check_size; |
626 | $self->check_size (1); |
573 | $self->update; |
627 | $self->update; |
574 | } |
628 | } |
575 | |
629 | |
576 | sub clear { |
630 | sub clear { |
577 | my ($self) = @_; |
631 | my ($self) = @_; |
… | |
… | |
691 | $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { |
745 | $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { |
692 | glClearColor 0, 0, 0, 0; |
746 | glClearColor 0, 0, 0, 0; |
693 | glClear GL_COLOR_BUFFER_BIT; |
747 | glClear GL_COLOR_BUFFER_BIT; |
694 | |
748 | |
695 | $self->_render; |
749 | $self->_render; |
696 | # glColorMask 1, 1, 1, 0; |
|
|
697 | # glEnable GL_BLEND; |
|
|
698 | # glBlendFunc GL_SRC_ALPHA, GL_ZERO; |
|
|
699 | # glRasterPos 0, 0; |
|
|
700 | # glCopyPixels 0, 0, $self->{w}, $self->{h}; |
|
|
701 | # glDisable GL_BLEND; |
|
|
702 | # glColorMask 1, 1, 1, 1; |
|
|
703 | }; |
750 | }; |
704 | } |
751 | } |
705 | |
752 | |
706 | sub _draw { |
753 | sub _draw { |
707 | my ($self) = @_; |
754 | my ($self) = @_; |
… | |
… | |
711 | my $tex = $self->{texture} |
758 | my $tex = $self->{texture} |
712 | or return; |
759 | or return; |
713 | |
760 | |
714 | glEnable GL_TEXTURE_2D; |
761 | glEnable GL_TEXTURE_2D; |
715 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
762 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
716 | glColor 0, 0, 0, 1; |
763 | glColor 1, 1, 1, 1; |
717 | |
764 | |
718 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
765 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
719 | |
766 | |
720 | glDisable GL_TEXTURE_2D; |
767 | glDisable GL_TEXTURE_2D; |
721 | } |
768 | } |
… | |
… | |
724 | |
771 | |
725 | package CFClient::UI::ViewPort; |
772 | package CFClient::UI::ViewPort; |
726 | |
773 | |
727 | our @ISA = CFClient::UI::Window::; |
774 | our @ISA = CFClient::UI::Window::; |
728 | |
775 | |
|
|
776 | sub new { |
|
|
777 | my $class = shift; |
|
|
778 | |
|
|
779 | $class->SUPER::new ( |
|
|
780 | scroll_x => 0, |
|
|
781 | scroll_y => 1, |
|
|
782 | @_, |
|
|
783 | ) |
|
|
784 | } |
|
|
785 | |
729 | sub size_request { |
786 | sub size_request { |
730 | my ($self) = @_; |
787 | my ($self) = @_; |
731 | |
788 | |
732 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
789 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
733 | $self->child->configure (0, 0, @$self{qw(child_w child_h)}); |
|
|
734 | |
790 | |
735 | @$self{qw(child_w child_h)} |
791 | @$self{qw(child_w child_h)} |
736 | } |
792 | } |
737 | |
793 | |
738 | sub size_allocate { |
794 | sub size_allocate { |
739 | my ($self, $w, $h) = @_; |
795 | my ($self, $w, $h) = @_; |
740 | |
796 | |
|
|
797 | $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; |
|
|
798 | $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; |
|
|
799 | |
|
|
800 | $self->child->configure (0, 0, $w, $h); |
741 | $self->update; |
801 | $self->update; |
742 | } |
802 | } |
743 | |
803 | |
744 | sub set_offset { |
804 | sub set_offset { |
745 | my ($self, $x, $y) = @_; |
805 | my ($self, $x, $y) = @_; |
… | |
… | |
799 | |
859 | |
800 | my $slider = new CFClient::UI::Slider |
860 | my $slider = new CFClient::UI::Slider |
801 | vertical => 1, |
861 | vertical => 1, |
802 | range => [0, 0, 1, 0.01], # HACK fix |
862 | range => [0, 0, 1, 0.01], # HACK fix |
803 | connect_changed => sub { |
863 | connect_changed => sub { |
804 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
864 | $self->{vp}->set_offset (0, $_[1]); |
805 | }, |
865 | }, |
806 | ; |
866 | ; |
807 | |
867 | |
808 | $self = $class->SUPER::new ( |
868 | $self = $class->SUPER::new ( |
809 | vp => (new CFClient::UI::ViewPort), |
869 | vp => (new CFClient::UI::ViewPort expand => 1), |
810 | slider => $slider, |
870 | slider => $slider, |
811 | @_, |
871 | @_, |
812 | ); |
872 | ); |
813 | |
873 | |
814 | $self->{vp}->add ($self->{scrolled}); |
874 | $self->{vp}->add ($self->{scrolled}); |
815 | $self->add ($self->{vp}); |
875 | $self->add ($self->{vp}); |
816 | $self->add ($self->{slider}); |
876 | $self->add ($self->{slider}); |
817 | |
877 | |
818 | $self |
878 | $self |
|
|
879 | } |
|
|
880 | |
|
|
881 | sub update { |
|
|
882 | my ($self) = @_; |
|
|
883 | |
|
|
884 | $self->SUPER::update; |
|
|
885 | |
|
|
886 | # todo: overwrite size_allocate of child |
|
|
887 | my $child = $self->{vp}->child; |
|
|
888 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
|
|
889 | } |
|
|
890 | |
|
|
891 | sub size_allocate { |
|
|
892 | my ($self, $w, $h) = @_; |
|
|
893 | |
|
|
894 | $self->SUPER::size_allocate ($w, $h); |
|
|
895 | |
|
|
896 | my $child = $self->{vp}->child; |
|
|
897 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
819 | } |
898 | } |
820 | |
899 | |
821 | #TODO# update range on size_allocate depending on child |
900 | #TODO# update range on size_allocate depending on child |
822 | # update viewport offset on scroll |
901 | # update viewport offset on scroll |
823 | |
902 | |
… | |
… | |
877 | my $class = shift; |
956 | my $class = shift; |
878 | |
957 | |
879 | # TODO: user_x, user_y, overwrite moveto? |
958 | # TODO: user_x, user_y, overwrite moveto? |
880 | |
959 | |
881 | my $self = $class->SUPER::new ( |
960 | my $self = $class->SUPER::new ( |
882 | bg => [1, 1, 1, 1], |
961 | bg => [1, 1, 1, 1], |
883 | border_bg => [1, 1, 1, 1], |
962 | border_bg => [1, 1, 1, 1], |
884 | border => 0.6, |
963 | border => 0.6, |
885 | toplevel => 1, |
964 | is_toplevel => 1, |
886 | can_events => 1, |
965 | can_events => 1, |
887 | @_ |
966 | @_ |
888 | ); |
967 | ); |
889 | |
968 | |
890 | $self->{title} &&= new CFClient::UI::Label |
969 | $self->{title} &&= new CFClient::UI::Label |
891 | align => 0, |
970 | align => 0, |
… | |
… | |
1031 | sub new { |
1110 | sub new { |
1032 | my $class = shift; |
1111 | my $class = shift; |
1033 | |
1112 | |
1034 | $class->SUPER::new ( |
1113 | $class->SUPER::new ( |
1035 | col_expand => [], |
1114 | col_expand => [], |
1036 | @_ |
1115 | @_, |
1037 | ) |
1116 | ) |
|
|
1117 | } |
|
|
1118 | |
|
|
1119 | sub children { |
|
|
1120 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1038 | } |
1121 | } |
1039 | |
1122 | |
1040 | sub add { |
1123 | sub add { |
1041 | my ($self, $x, $y, $child) = @_; |
1124 | my ($self, $x, $y, $child) = @_; |
1042 | |
1125 | |
1043 | $child->set_parent ($self); |
1126 | $child->set_parent ($self); |
1044 | $self->{children}[$y][$x] = $child; |
1127 | $self->{children}[$y][$x] = $child; |
1045 | |
1128 | |
1046 | $child->check_size; |
1129 | $self->check_size (1); |
1047 | } |
1130 | } |
1048 | |
1131 | |
1049 | sub children { |
|
|
1050 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
1051 | } |
|
|
1052 | |
|
|
1053 | # TODO: move to container class maybe? send childs a signal on removal? |
1132 | # TODO: move to container class maybe? send children a signal on removal? |
1054 | sub clear { |
1133 | sub clear { |
1055 | my ($self) = @_; |
1134 | my ($self) = @_; |
1056 | |
1135 | |
1057 | my @children = $self->children; |
1136 | my @children = $self->children; |
1058 | delete $self->{children}; |
1137 | delete $self->{children}; |
… | |
… | |
1060 | for (@children) { |
1139 | for (@children) { |
1061 | delete $_->{parent}; |
1140 | delete $_->{parent}; |
1062 | $_->hide; |
1141 | $_->hide; |
1063 | } |
1142 | } |
1064 | |
1143 | |
|
|
1144 | $self->check_size (1); |
1065 | $self->update; |
1145 | $self->update; |
1066 | } |
1146 | } |
1067 | |
1147 | |
1068 | sub get_wh { |
1148 | sub get_wh { |
1069 | my ($self) = @_; |
1149 | my ($self) = @_; |
… | |
… | |
1101 | sub size_allocate { |
1181 | sub size_allocate { |
1102 | my ($self, $w, $h) = @_; |
1182 | my ($self, $w, $h) = @_; |
1103 | |
1183 | |
1104 | my ($ws, $hs) = $self->get_wh; |
1184 | my ($ws, $hs) = $self->get_wh; |
1105 | |
1185 | |
1106 | my $req_w = sum @$ws; |
1186 | my $req_w = (sum @$ws) || 1; |
1107 | my $req_h = sum @$hs; |
1187 | my $req_h = (sum @$hs) || 1; |
1108 | |
1188 | |
1109 | # TODO: nicer code && do row_expand |
1189 | # TODO: nicer code && do row_expand |
1110 | my @col_expand = @{$self->{col_expand}}; |
1190 | my @col_expand = @{$self->{col_expand}}; |
1111 | @col_expand = (1) x @$ws unless @col_expand; |
1191 | @col_expand = (1) x @$ws unless @col_expand; |
1112 | my $col_expand = (sum @col_expand) || 1; |
1192 | my $col_expand = (sum @col_expand) || 1; |
… | |
… | |
1473 | active_fg => [0, 0, 0], |
1553 | active_fg => [0, 0, 0], |
1474 | can_hover => 1, |
1554 | can_hover => 1, |
1475 | can_focus => 1, |
1555 | can_focus => 1, |
1476 | valign => 0, |
1556 | valign => 0, |
1477 | can_events => 1, |
1557 | can_events => 1, |
|
|
1558 | #text => ... |
1478 | @_ |
1559 | @_ |
1479 | ) |
1560 | ) |
1480 | } |
1561 | } |
1481 | |
1562 | |
1482 | sub _set_text { |
1563 | sub _set_text { |
… | |
… | |
1492 | $self->{text} = $text; |
1573 | $self->{text} = $text; |
1493 | |
1574 | |
1494 | $text =~ s/./*/g if $self->{hidden}; |
1575 | $text =~ s/./*/g if $self->{hidden}; |
1495 | $self->{layout}->set_text ("$text "); |
1576 | $self->{layout}->set_text ("$text "); |
1496 | |
1577 | |
1497 | $self->emit (changed => $self->{text}); |
1578 | $self->_emit (changed => $self->{text}); |
1498 | } |
1579 | } |
1499 | |
1580 | |
1500 | sub set_text { |
1581 | sub set_text { |
1501 | my ($self, $text) = @_; |
1582 | my ($self, $text) = @_; |
1502 | |
1583 | |
… | |
… | |
1514 | my ($self) = @_; |
1595 | my ($self) = @_; |
1515 | |
1596 | |
1516 | my ($w, $h) = $self->SUPER::size_request; |
1597 | my ($w, $h) = $self->SUPER::size_request; |
1517 | |
1598 | |
1518 | ($w + 1, $h) # add 1 for cursor |
1599 | ($w + 1, $h) # add 1 for cursor |
1519 | } |
|
|
1520 | |
|
|
1521 | sub size_allocate { |
|
|
1522 | my ($self, $w, $h) = @_; |
|
|
1523 | |
|
|
1524 | $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text |
|
|
1525 | } |
1600 | } |
1526 | |
1601 | |
1527 | sub key_down { |
1602 | sub key_down { |
1528 | my ($self, $ev) = @_; |
1603 | my ($self, $ev) = @_; |
1529 | |
1604 | |
… | |
… | |
1544 | } elsif ($sym == CFClient::SDLK_HOME) { |
1619 | } elsif ($sym == CFClient::SDLK_HOME) { |
1545 | $self->{cursor} = 0; |
1620 | $self->{cursor} = 0; |
1546 | } elsif ($sym == CFClient::SDLK_END) { |
1621 | } elsif ($sym == CFClient::SDLK_END) { |
1547 | $self->{cursor} = length $text; |
1622 | $self->{cursor} = length $text; |
1548 | } elsif ($uni == 27) { |
1623 | } elsif ($uni == 27) { |
1549 | $self->emit ('escape'); |
1624 | $self->_emit ('escape'); |
1550 | } elsif ($uni) { |
1625 | } elsif ($uni) { |
1551 | substr $text, $self->{cursor}++, 0, chr $uni; |
1626 | substr $text, $self->{cursor}++, 0, chr $uni; |
1552 | } |
1627 | } |
1553 | |
1628 | |
1554 | $self->_set_text ($text); |
1629 | $self->_set_text ($text); |
… | |
… | |
1641 | if ($sym == 13) { |
1716 | if ($sym == 13) { |
1642 | unshift @{$self->{history}}, |
1717 | unshift @{$self->{history}}, |
1643 | my $txt = $self->get_text; |
1718 | my $txt = $self->get_text; |
1644 | $self->{history_pointer} = -1; |
1719 | $self->{history_pointer} = -1; |
1645 | $self->{history_saveback} = ''; |
1720 | $self->{history_saveback} = ''; |
1646 | $self->emit (activate => $txt); |
1721 | $self->_emit (activate => $txt); |
1647 | $self->update; |
1722 | $self->update; |
1648 | |
1723 | |
1649 | } elsif ($sym == CFClient::SDLK_UP) { |
1724 | } elsif ($sym == CFClient::SDLK_UP) { |
1650 | if ($self->{history_pointer} < 0) { |
1725 | if ($self->{history_pointer} < 0) { |
1651 | $self->{history_saveback} = $self->get_text; |
1726 | $self->{history_saveback} = $self->get_text; |
… | |
… | |
1699 | can_events => 1, |
1774 | can_events => 1, |
1700 | @_ |
1775 | @_ |
1701 | ) |
1776 | ) |
1702 | } |
1777 | } |
1703 | |
1778 | |
|
|
1779 | sub activate { } |
|
|
1780 | |
1704 | sub button_up { |
1781 | sub button_up { |
1705 | my ($self, $ev, $x, $y) = @_; |
1782 | my ($self, $ev, $x, $y) = @_; |
1706 | |
1783 | |
|
|
1784 | $self->emit ("activate") |
1707 | if ($x >= 0 && $x < $self->{w} |
1785 | if $x >= 0 && $x < $self->{w} |
1708 | && $y >= 0 && $y < $self->{h}) { |
1786 | && $y >= 0 && $y < $self->{h}; |
1709 | $self->emit ("activate"); |
|
|
1710 | } |
|
|
1711 | } |
1787 | } |
1712 | |
1788 | |
1713 | sub _draw { |
1789 | sub _draw { |
1714 | my ($self) = @_; |
1790 | my ($self) = @_; |
1715 | |
1791 | |
… | |
… | |
1767 | my ($self, $ev, $x, $y) = @_; |
1843 | my ($self, $ev, $x, $y) = @_; |
1768 | |
1844 | |
1769 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1845 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1770 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1846 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1771 | $self->{state} = !$self->{state}; |
1847 | $self->{state} = !$self->{state}; |
1772 | $self->emit (changed => $self->{state}); |
1848 | $self->_emit (changed => $self->{state}); |
1773 | } |
1849 | } |
1774 | } |
1850 | } |
1775 | |
1851 | |
1776 | sub _draw { |
1852 | sub _draw { |
1777 | my ($self) = @_; |
1853 | my ($self) = @_; |
… | |
… | |
2052 | my $self = $class->SUPER::new ( |
2128 | my $self = $class->SUPER::new ( |
2053 | fg => [1, 1, 1], |
2129 | fg => [1, 1, 1], |
2054 | active_fg => [0, 0, 0], |
2130 | active_fg => [0, 0, 0], |
2055 | bg => [0, 0, 0, 0.2], |
2131 | bg => [0, 0, 0, 0.2], |
2056 | active_bg => [1, 1, 1, 0.5], |
2132 | active_bg => [1, 1, 1, 0.5], |
2057 | range => [0, 0, 100, 10], |
2133 | range => [0, 0, 100, 10, 0], |
2058 | req_w => $::WIDTH / 80, |
2134 | req_w => $::WIDTH / 80, |
2059 | req_h => $::WIDTH / 80, |
2135 | req_h => $::WIDTH / 80, |
2060 | vertical => 0, |
2136 | vertical => 0, |
2061 | can_hover => 1, |
2137 | can_hover => 1, |
2062 | inner_pad => .05, |
2138 | inner_pad => 0.02, |
2063 | @_ |
2139 | @_ |
2064 | ); |
2140 | ); |
2065 | |
2141 | |
2066 | $self->set_value ($self->{range}[0]); |
2142 | $self->set_value ($self->{range}[0]); |
2067 | $self->update; |
2143 | $self->update; |
2068 | |
2144 | |
2069 | $self |
2145 | $self |
2070 | } |
2146 | } |
2071 | |
2147 | |
|
|
2148 | sub set_range { |
|
|
2149 | my ($self, $range) = @_; |
|
|
2150 | |
|
|
2151 | ($range, $self->{range}) = ($self->{range}, $range); |
|
|
2152 | |
|
|
2153 | $self->update |
|
|
2154 | if "@$range" ne "@{$self->{range}}"; |
|
|
2155 | } |
|
|
2156 | |
2072 | sub set_value { |
2157 | sub set_value { |
2073 | my ($self, $value) = @_; |
2158 | my ($self, $value) = @_; |
2074 | |
2159 | |
2075 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2160 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2076 | |
2161 | |
2077 | $hi = $lo + 1 if $hi <= $lo; |
2162 | $hi = $lo + 1 if $hi <= $lo; |
2078 | |
2163 | |
|
|
2164 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2165 | |
2079 | $value = $lo if $value < $lo; |
2166 | $value = $lo if $value < $lo; |
2080 | $value = $hi if $value > $hi; |
2167 | $value = $hi - $page if $value > $hi - $page; |
2081 | |
2168 | |
2082 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2169 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2083 | if $unit; |
2170 | if $unit; |
2084 | |
2171 | |
2085 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2086 | |
|
|
2087 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2172 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2088 | |
2173 | |
2089 | if ($value != $old_value) { |
2174 | if ($value != $old_value) { |
2090 | $self->emit (changed => $value); |
2175 | $self->_emit (changed => $value); |
2091 | $self->update; |
2176 | $self->update; |
2092 | } |
2177 | } |
2093 | } |
2178 | } |
2094 | |
2179 | |
2095 | sub size_request { |
2180 | sub size_request { |
… | |
… | |
2103 | |
2188 | |
2104 | sub button_down { |
2189 | sub button_down { |
2105 | my ($self, $ev, $x, $y) = @_; |
2190 | my ($self, $ev, $x, $y) = @_; |
2106 | |
2191 | |
2107 | $self->SUPER::button_down ($ev, $x, $y); |
2192 | $self->SUPER::button_down ($ev, $x, $y); |
|
|
2193 | |
|
|
2194 | $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; |
|
|
2195 | |
2108 | $self->mouse_motion ($ev, $x, $y); |
2196 | $self->mouse_motion ($ev, $x, $y); |
2109 | } |
2197 | } |
2110 | |
2198 | |
2111 | sub mouse_motion { |
2199 | sub mouse_motion { |
2112 | my ($self, $ev, $x, $y) = @_; |
2200 | my ($self, $ev, $x, $y) = @_; |
… | |
… | |
2114 | if ($GRAB == $self) { |
2202 | if ($GRAB == $self) { |
2115 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2203 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2116 | |
2204 | |
2117 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2205 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2118 | |
2206 | |
2119 | $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; |
2207 | $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); |
2120 | |
2208 | |
2121 | $self->set_value ($x * ($hi - $lo) + $lo); |
2209 | $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); |
2122 | } |
2210 | } |
2123 | } |
2211 | } |
2124 | |
2212 | |
2125 | sub update { |
2213 | sub update { |
2126 | my ($self) = @_; |
2214 | my ($self) = @_; |
2127 | |
2215 | |
2128 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2216 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2129 | $self->set_value ($self->{range}[0]); |
2217 | $self->set_value ($self->{range}[0]); |
2130 | |
2218 | |
2131 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
2219 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
|
|
2220 | my $range = ($hi - $page - $lo) || 1e-100; |
2132 | |
2221 | |
2133 | my $inner_w = 1 - 2 * $self->{inner_pad}; |
2222 | my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; |
2134 | |
2223 | |
2135 | $self->{scale} = ($inner_w / ($hi - $lo)) || 1; |
2224 | $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; |
|
|
2225 | $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; |
2136 | |
2226 | |
2137 | $page = $self->{scale} * $page || 10 / ($self->{w} || 1); |
2227 | $value = ($value - $lo) / $range; |
2138 | $value = $self->{scale} * ($value - $lo); |
2228 | $value = $value * $self->{scale} + $self->{offset}; |
2139 | |
2229 | |
2140 | $value = $self->{inner_pad} + ($value - $page * 0.5); |
|
|
2141 | |
|
|
2142 | $value = 0 if $value < 0; |
|
|
2143 | $page = 1 - $value if $value + $page > 1; |
|
|
2144 | |
|
|
2145 | $self->{knob_x} = $value; |
2230 | $self->{knob_x} = $value - $knob_w * 0.5; |
2146 | $self->{knob_w} = $page; |
2231 | $self->{knob_w} = $knob_w; |
2147 | }); |
2232 | }); |
2148 | |
2233 | |
2149 | $self->SUPER::update; |
2234 | $self->SUPER::update; |
2150 | } |
2235 | } |
2151 | |
2236 | |
… | |
… | |
2157 | glScale $self->{w}, $self->{h}; |
2242 | glScale $self->{w}, $self->{h}; |
2158 | |
2243 | |
2159 | if ($self->{vertical}) { |
2244 | if ($self->{vertical}) { |
2160 | # draw a vertical slider like a rotated horizontal slider |
2245 | # draw a vertical slider like a rotated horizontal slider |
2161 | |
2246 | |
|
|
2247 | glTranslate 1, 0, 0; |
2162 | glRotate 90, 0, 0, 1; |
2248 | glRotate 90, 0, 0, 1; |
2163 | glTranslate 0, 1, 0; |
|
|
2164 | } |
2249 | } |
2165 | |
2250 | |
2166 | my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; |
2251 | my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; |
2167 | my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; |
2252 | my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; |
2168 | |
2253 | |
… | |
… | |
2175 | # draw handle |
2260 | # draw handle |
2176 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2261 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2177 | |
2262 | |
2178 | glDisable GL_TEXTURE_2D; |
2263 | glDisable GL_TEXTURE_2D; |
2179 | } |
2264 | } |
|
|
2265 | |
|
|
2266 | ############################################################################# |
|
|
2267 | |
|
|
2268 | package CFClient::UI::ValSlider; |
|
|
2269 | |
|
|
2270 | our @ISA = CFClient::UI::HBox::; |
|
|
2271 | |
|
|
2272 | sub new { |
|
|
2273 | my ($class, %arg) = @_; |
|
|
2274 | |
|
|
2275 | my $range = delete $arg{range}; |
|
|
2276 | |
|
|
2277 | my $self = $class->SUPER::new ( |
|
|
2278 | slider => (new CFClient::UI::Slider expand => 1, range => $range), |
|
|
2279 | entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), |
|
|
2280 | to_value => sub { shift }, |
|
|
2281 | from_value => sub { shift }, |
|
|
2282 | %arg, |
|
|
2283 | ); |
|
|
2284 | |
|
|
2285 | $self->{slider}->connect (changed => sub { |
|
|
2286 | my ($self, $value) = @_; |
|
|
2287 | $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value)); |
|
|
2288 | $self->{parent}->emit (changed => $value); |
|
|
2289 | }); |
|
|
2290 | |
|
|
2291 | # $self->{entry}->connect (changed => sub { |
|
|
2292 | # my ($self, $value) = @_; |
|
|
2293 | # $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value)); |
|
|
2294 | # $self->{parent}->emit (changed => $value); |
|
|
2295 | # }); |
|
|
2296 | |
|
|
2297 | $self->add ($self->{slider}, $self->{entry}); |
|
|
2298 | |
|
|
2299 | $self->{slider}->emit (changed => $self->{slider}{range}[0]); |
|
|
2300 | |
|
|
2301 | $self |
|
|
2302 | } |
|
|
2303 | |
|
|
2304 | sub set_range { shift->{slider}->set_range (@_) } |
|
|
2305 | sub set_value { shift->{slider}->set_value (@_) } |
2180 | |
2306 | |
2181 | ############################################################################# |
2307 | ############################################################################# |
2182 | |
2308 | |
2183 | package CFClient::UI::TextView; |
2309 | package CFClient::UI::TextView; |
2184 | |
2310 | |
… | |
… | |
2214 | |
2340 | |
2215 | $self->{fontsize} = $fontsize; |
2341 | $self->{fontsize} = $fontsize; |
2216 | $self->reflow; |
2342 | $self->reflow; |
2217 | } |
2343 | } |
2218 | |
2344 | |
2219 | sub text_height { |
|
|
2220 | my ($self, $text) = @_; |
|
|
2221 | |
|
|
2222 | my $layout = $self->{layout}; |
|
|
2223 | |
|
|
2224 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2225 | $layout->set_width ($self->{children}[0]{w}); |
|
|
2226 | $layout->set_markup ($text); |
|
|
2227 | |
|
|
2228 | ($layout->size)[1] |
|
|
2229 | } |
|
|
2230 | |
|
|
2231 | sub reflow { |
|
|
2232 | my ($self) = @_; |
|
|
2233 | |
|
|
2234 | $self->{need_reflow}++; |
|
|
2235 | $self->update; |
|
|
2236 | } |
|
|
2237 | |
|
|
2238 | sub size_allocate { |
2345 | sub size_allocate { |
2239 | my ($self, $w, $h) = @_; |
2346 | my ($self, $w, $h) = @_; |
2240 | |
2347 | |
2241 | $self->SUPER::size_allocate ($w, $h); |
2348 | $self->SUPER::size_allocate ($w, $h); |
2242 | |
2349 | |
… | |
… | |
2245 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2352 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2246 | |
2353 | |
2247 | $self->reflow; |
2354 | $self->reflow; |
2248 | } |
2355 | } |
2249 | |
2356 | |
|
|
2357 | sub text_size { |
|
|
2358 | my ($self, $text, $indent) = @_; |
|
|
2359 | |
|
|
2360 | my $layout = $self->{layout}; |
|
|
2361 | |
|
|
2362 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2363 | $layout->set_width ($self->{children}[0]{w} - $indent); |
|
|
2364 | $layout->set_markup ($text); |
|
|
2365 | |
|
|
2366 | $layout->size |
|
|
2367 | } |
|
|
2368 | |
|
|
2369 | sub reflow { |
|
|
2370 | my ($self) = @_; |
|
|
2371 | |
|
|
2372 | $self->{need_reflow}++; |
|
|
2373 | $self->update; |
|
|
2374 | } |
|
|
2375 | |
|
|
2376 | sub set_offset { |
|
|
2377 | my ($self, $offset) = @_; |
|
|
2378 | |
|
|
2379 | # todo: base offset on lines or so, not on pixels |
|
|
2380 | $self->{children}[1]->set_value ($offset); |
|
|
2381 | } |
|
|
2382 | |
|
|
2383 | sub clear { |
|
|
2384 | my ($self) = @_; |
|
|
2385 | |
|
|
2386 | $self->{par} = []; |
|
|
2387 | $self->{height} = 0; |
|
|
2388 | $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); |
|
|
2389 | } |
|
|
2390 | |
2250 | sub add_paragraph { |
2391 | sub add_paragraph { |
2251 | my ($self, $color, $text) = @_; |
2392 | my ($self, $color, $text, $indent) = @_; |
2252 | |
2393 | |
2253 | #TODO: intelligently "reformat" paragraph |
2394 | for my $line (split /\n/, $text) { |
2254 | |
2395 | my ($w, $h) = $self->text_size ($line); |
2255 | my $height = $self->text_height ($text); |
|
|
2256 | |
|
|
2257 | $self->{height} += $height; |
2396 | $self->{height} += $h; |
|
|
2397 | push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; |
|
|
2398 | } |
2258 | |
2399 | |
2259 | push @{$self->{par}}, [$height, $color, $text]; |
|
|
2260 | |
|
|
2261 | $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; |
2400 | $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); |
2262 | $self->{children}[1]->update; |
|
|
2263 | } |
2401 | } |
2264 | |
2402 | |
2265 | sub update { |
2403 | sub update { |
2266 | my ($self) = @_; |
2404 | my ($self) = @_; |
2267 | |
2405 | |
… | |
… | |
2270 | return unless $self->{h} > 0; |
2408 | return unless $self->{h} > 0; |
2271 | |
2409 | |
2272 | delete $self->{texture}; |
2410 | delete $self->{texture}; |
2273 | |
2411 | |
2274 | $ROOT->on_post_alloc ($self, sub { |
2412 | $ROOT->on_post_alloc ($self, sub { |
|
|
2413 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
|
|
2414 | |
2275 | if (delete $self->{need_reflow}) { |
2415 | if (delete $self->{need_reflow}) { |
2276 | my $height = 0; |
2416 | my $height = 0; |
2277 | |
2417 | |
2278 | $height += $_->[0] = $self->text_height ($_->[2]) |
2418 | my $layout = $self->{layout}; |
|
|
2419 | |
|
|
2420 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2421 | |
2279 | for @{$self->{par}}; |
2422 | for (@{$self->{par}}) { |
|
|
2423 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
|
|
2424 | $layout->set_width ($W - $_->[3]); |
|
|
2425 | $layout->set_markup ($_->[4]); |
|
|
2426 | my ($w, $h) = $layout->size; |
|
|
2427 | $_->[0] = $w + $_->[3]; |
|
|
2428 | $_->[1] = $h; |
|
|
2429 | } |
|
|
2430 | |
|
|
2431 | $height += $_->[1]; |
|
|
2432 | } |
2280 | |
2433 | |
2281 | $self->{height} = $height; |
2434 | $self->{height} = $height; |
2282 | |
2435 | |
2283 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
2436 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
2284 | |
2437 | |
2285 | delete $self->{texture}; |
2438 | delete $self->{texture}; |
2286 | } |
2439 | } |
2287 | |
2440 | |
2288 | $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { |
2441 | $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { |
2289 | glClearColor 0, 0, 0, 0; |
2442 | glClearColor 0.5, 0.5, 0.5, 0; |
2290 | glClear GL_COLOR_BUFFER_BIT; |
2443 | glClear GL_COLOR_BUFFER_BIT; |
2291 | |
2444 | |
2292 | glEnable GL_TEXTURE_2D; |
|
|
2293 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
|
|
2294 | |
|
|
2295 | my $top = int $self->{children}[1]{range}[0]; |
2445 | my $top = int $self->{children}[1]{range}[0]; |
2296 | |
2446 | |
2297 | my $y0 = $top; |
2447 | my $y0 = $top; |
2298 | my $y1 = $top + $self->{h}; |
2448 | my $y1 = $top + $H; |
2299 | |
2449 | |
2300 | my $y = 0; |
2450 | my $y = 0; |
2301 | |
2451 | |
2302 | my $layout = $self->{layout}; |
2452 | my $layout = $self->{layout}; |
2303 | |
2453 | |
2304 | $layout->set_font ($self->{font}) if $self->{font}; |
2454 | $layout->set_font ($self->{font}) if $self->{font}; |
2305 | |
2455 | |
|
|
2456 | glEnable GL_BLEND; |
|
|
2457 | #TODO# not correct in windows where rgba is forced off |
|
|
2458 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
|
|
2459 | |
2306 | for my $par (@{$self->{par}}) { |
2460 | for my $par (@{$self->{par}}) { |
2307 | my $h = $par->[0]; |
2461 | my $h = $par->[1]; |
2308 | |
2462 | |
2309 | if ($y0 < $y + $h && $y < $y1) { |
2463 | if ($y0 < $y + $h && $y < $y1) { |
2310 | $layout->set_foreground (@{ $par->[1] }); |
2464 | $layout->set_foreground (@{ $par->[2] }); |
|
|
2465 | $layout->set_width ($W - $par->[3]); |
2311 | $layout->set_markup ($par->[2]); |
2466 | $layout->set_markup ($par->[4]); |
2312 | |
2467 | |
2313 | my ($W, $H) = $layout->size; |
2468 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2314 | CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); |
2469 | |
|
|
2470 | glRasterPos $par->[3], $y - $y0; |
|
|
2471 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2315 | } |
2472 | } |
2316 | |
2473 | |
2317 | $y += $h; |
2474 | $y += $h; |
2318 | } |
2475 | } |
2319 | |
2476 | |
2320 | glDisable GL_TEXTURE_2D; |
2477 | glDisable GL_BLEND; |
2321 | }; |
2478 | }; |
2322 | }); |
2479 | }); |
2323 | } |
2480 | } |
2324 | |
2481 | |
2325 | sub _draw { |
2482 | sub _draw { |
2326 | my ($self) = @_; |
2483 | my ($self) = @_; |
2327 | |
2484 | |
2328 | glEnable GL_TEXTURE_2D; |
2485 | glEnable GL_TEXTURE_2D; |
2329 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2486 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2330 | glColor 1, 1, 1, 1; |
2487 | glColor 1, 1, 1, 1; |
2331 | $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2488 | $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2332 | glDisable GL_TEXTURE_2D; |
2489 | glDisable GL_TEXTURE_2D; |
2333 | |
2490 | |
2334 | $self->{children}[1]->draw; |
2491 | $self->{children}[1]->draw; |
2335 | |
2492 | |
2336 | } |
2493 | } |
… | |
… | |
2405 | |
2562 | |
2406 | # TODO: use animation |
2563 | # TODO: use animation |
2407 | if ($self->{state} = !$self->{state}) { |
2564 | if ($self->{state} = !$self->{state}) { |
2408 | $CFClient::UI::ROOT->add ($self->{other}); |
2565 | $CFClient::UI::ROOT->add ($self->{other}); |
2409 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2566 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2410 | $self->emit ("open"); |
2567 | $self->_emit ("open"); |
2411 | } else { |
2568 | } else { |
2412 | $CFClient::UI::ROOT->remove ($self->{other}); |
2569 | $CFClient::UI::ROOT->remove ($self->{other}); |
2413 | $self->emit ("close"); |
2570 | $self->_emit ("close"); |
2414 | } |
2571 | } |
2415 | |
2572 | |
2416 | $self->emit (changed => $self->{state}); |
2573 | $self->_emit (changed => $self->{state}); |
2417 | } |
2574 | } |
2418 | |
2575 | |
2419 | ############################################################################# |
2576 | ############################################################################# |
2420 | |
2577 | |
2421 | package CFClient::UI::Tooltip; |
2578 | package CFClient::UI::Tooltip; |
… | |
… | |
2496 | use CFClient::OpenGL; |
2653 | use CFClient::OpenGL; |
2497 | |
2654 | |
2498 | sub new { |
2655 | sub new { |
2499 | my $class = shift; |
2656 | my $class = shift; |
2500 | |
2657 | |
2501 | $class->SUPER::new ( |
2658 | my $self = $class->SUPER::new ( |
2502 | aspect => 1, |
2659 | aspect => 1, |
|
|
2660 | can_events => 0, |
2503 | @_, |
2661 | @_, |
2504 | ) |
2662 | ); |
|
|
2663 | |
|
|
2664 | if ($self->{anim} && $self->{animspeed}) { |
|
|
2665 | Scalar::Util::weaken (my $widget = $self); |
|
|
2666 | |
|
|
2667 | $self->{timer} = Event->timer ( |
|
|
2668 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
2669 | hard => 1, |
|
|
2670 | interval => $self->{animspeed}, |
|
|
2671 | cb => sub { |
|
|
2672 | ++$widget->{frame}; |
|
|
2673 | $widget->update; |
|
|
2674 | }, |
|
|
2675 | ); |
|
|
2676 | } |
|
|
2677 | |
|
|
2678 | $self |
2505 | } |
2679 | } |
2506 | |
2680 | |
2507 | sub size_request { |
2681 | sub size_request { |
2508 | (32, 8) |
2682 | (32, 8) |
2509 | } |
2683 | } |
2510 | |
2684 | |
|
|
2685 | sub update { |
|
|
2686 | my ($self) = @_; |
|
|
2687 | |
|
|
2688 | return unless $self->{visible}; |
|
|
2689 | |
|
|
2690 | $self->SUPER::update; |
|
|
2691 | } |
|
|
2692 | |
2511 | sub _draw { |
2693 | sub _draw { |
2512 | my ($self) = @_; |
2694 | my ($self) = @_; |
2513 | |
2695 | |
2514 | return unless $::CONN;#d# manage and cache textures differently |
2696 | return unless $::CONN; |
|
|
2697 | |
|
|
2698 | my $face; |
|
|
2699 | |
|
|
2700 | if ($self->{frame}) { |
|
|
2701 | my $anim = $::CONN->{anim}[$self->{anim}]; |
|
|
2702 | |
|
|
2703 | $face = $anim->[ $self->{frame} % @$anim ] |
|
|
2704 | if $anim && @$anim; |
|
|
2705 | } |
|
|
2706 | |
2515 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; |
2707 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
2516 | |
2708 | |
2517 | # TODO animation |
|
|
2518 | if ($tex) { |
2709 | if ($tex) { |
2519 | glEnable GL_TEXTURE_2D; |
2710 | glEnable GL_TEXTURE_2D; |
2520 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2711 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2521 | glColor 1, 1, 1, 1; |
2712 | glColor 1, 1, 1, 1; |
2522 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2713 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2523 | glDisable GL_TEXTURE_2D; |
2714 | glDisable GL_TEXTURE_2D; |
2524 | } |
2715 | } |
2525 | } |
2716 | } |
2526 | |
2717 | |
|
|
2718 | sub DESTROY { |
|
|
2719 | my ($self) = @_; |
|
|
2720 | |
|
|
2721 | $self->{timer}->cancel |
|
|
2722 | if $self->{timer}; |
|
|
2723 | |
|
|
2724 | $self->SUPER::DESTROY; |
|
|
2725 | } |
|
|
2726 | |
2527 | ############################################################################# |
2727 | ############################################################################# |
2528 | |
2728 | |
2529 | package CFClient::UI::InventoryItem; |
2729 | package CFClient::UI::Inventory; |
2530 | |
2730 | |
2531 | our @ISA = CFClient::UI::HBox::; |
2731 | our @ISA = CFClient::UI::ScrolledWindow::; |
2532 | |
|
|
2533 | sub _item_to_desc { |
|
|
2534 | my ($item) = @_; |
|
|
2535 | |
|
|
2536 | my $desc = |
|
|
2537 | $item->{nrof} < 2 |
|
|
2538 | ? $item->{name} |
|
|
2539 | : "$item->{nrof} $item->{name_pl}"; |
|
|
2540 | |
|
|
2541 | $item->{flags} & Crossfire::Protocol::F_OPEN |
|
|
2542 | and $desc .= " (open)"; |
|
|
2543 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
|
|
2544 | and $desc .= " (applied)"; |
|
|
2545 | $item->{flags} & Crossfire::Protocol::F_UNPAID |
|
|
2546 | and $desc .= " (unpaid)"; |
|
|
2547 | $item->{flags} & Crossfire::Protocol::F_MAGIC |
|
|
2548 | and $desc .= " (magic)"; |
|
|
2549 | $item->{flags} & Crossfire::Protocol::F_CURSED |
|
|
2550 | and $desc .= " (cursed)"; |
|
|
2551 | $item->{flags} & Crossfire::Protocol::F_DAMNED |
|
|
2552 | and $desc .= " (damned)"; |
|
|
2553 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2554 | and $desc .= " *"; |
|
|
2555 | |
|
|
2556 | $desc |
|
|
2557 | } |
|
|
2558 | |
2732 | |
2559 | sub new { |
2733 | sub new { |
2560 | my $class = shift; |
2734 | my $class = shift; |
2561 | |
2735 | |
2562 | my %args = @_; |
|
|
2563 | |
|
|
2564 | my $item = delete $args{item}; |
|
|
2565 | |
|
|
2566 | my $desc = _item_to_desc ($item); |
|
|
2567 | |
|
|
2568 | my $self = $class->SUPER::new ( |
2736 | my $self = $class->SUPER::new ( |
2569 | can_hover => 1, |
2737 | scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), |
2570 | can_events => 1, |
|
|
2571 | tooltip => ((CFClient::UI::Label::escape $desc) |
|
|
2572 | . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), |
|
|
2573 | connect_button_down => sub { |
|
|
2574 | my ($self, $ev, $x, $y) = @_; |
|
|
2575 | |
|
|
2576 | # todo: maybe put examine on 1? but should just be a tooltip :( |
|
|
2577 | if ($ev->{button} == 1) { |
|
|
2578 | my $targ = $::CONN->{player}{tag}; |
|
|
2579 | |
|
|
2580 | if ($item->{container} == $::CONN->{player}{tag}) { |
|
|
2581 | $targ = $main::OPENCONT; |
|
|
2582 | } |
|
|
2583 | |
|
|
2584 | $::CONN->send ("move $targ $item->{tag} 0"); |
|
|
2585 | } elsif ($ev->{button} == 2) { |
|
|
2586 | $::CONN->send ("apply $item->{tag}"); |
|
|
2587 | } elsif ($ev->{button} == 3) { |
|
|
2588 | my @menu_items = ( |
|
|
2589 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
|
|
2590 | ["mark", sub { $::CONN->send ("mark $item->{tag}") }], |
|
|
2591 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
|
|
2592 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
|
|
2593 | [ |
|
|
2594 | $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", |
|
|
2595 | sub { $::CONN->send ("lock $item->{tag}") }, |
|
|
2596 | ], |
|
|
2597 | ); |
|
|
2598 | |
|
|
2599 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
|
|
2600 | } |
|
|
2601 | |
|
|
2602 | 1 |
|
|
2603 | }, |
|
|
2604 | %args |
|
|
2605 | ); |
|
|
2606 | |
|
|
2607 | |
|
|
2608 | $self->add (new CFClient::UI::Face |
|
|
2609 | can_events => 0, |
|
|
2610 | face => $item->{face}, |
|
|
2611 | anim => $item->{anim}, |
|
|
2612 | animspeed => $item->{animspeed}, |
|
|
2613 | ); |
|
|
2614 | |
|
|
2615 | $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0); |
|
|
2616 | |
|
|
2617 | $self->{item} = $item; |
|
|
2618 | |
|
|
2619 | $self->update_item; |
|
|
2620 | |
|
|
2621 | $self |
|
|
2622 | } |
|
|
2623 | |
|
|
2624 | sub update_item { |
|
|
2625 | my ($self) = @_; |
|
|
2626 | |
|
|
2627 | my $desc = _item_to_desc ($self->{item}); |
|
|
2628 | |
|
|
2629 | $self->{name_lbl}->set_text ($desc); |
|
|
2630 | } |
|
|
2631 | |
|
|
2632 | ############################################################################# |
|
|
2633 | |
|
|
2634 | package CFClient::UI::Inventory; |
|
|
2635 | |
|
|
2636 | our @ISA = CFClient::UI::ScrolledWindow::; |
|
|
2637 | |
|
|
2638 | sub new { |
|
|
2639 | my $class = shift; |
|
|
2640 | |
|
|
2641 | my $self = $class->SUPER::new ( |
|
|
2642 | scrolled => (new CFClient::UI::VBox), |
|
|
2643 | @_, |
2738 | @_, |
2644 | ); |
2739 | ); |
2645 | |
2740 | |
2646 | $self |
2741 | $self |
2647 | } |
2742 | } |
… | |
… | |
2657 | or ($a->{name} cmp $b->{name}) |
2752 | or ($a->{name} cmp $b->{name}) |
2658 | } @$items; |
2753 | } @$items; |
2659 | |
2754 | |
2660 | $self->{real_items} = \@items; |
2755 | $self->{real_items} = \@items; |
2661 | |
2756 | |
|
|
2757 | my $row = 0; |
2662 | for my $item (@items) { |
2758 | for my $item (@items) { |
2663 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2759 | CFClient::Item::update_widgets $item; |
2664 | $item->update_item (); |
|
|
2665 | } |
|
|
2666 | |
2760 | |
2667 | $self->{scrolled}->add (@items); |
2761 | $self->{scrolled}->add (0, $row, $item->{face_widget}); |
|
|
2762 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
|
|
2763 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2668 | |
2764 | |
2669 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2765 | $row++; |
|
|
2766 | } |
2670 | } |
2767 | } |
2671 | |
2768 | |
2672 | sub size_request { |
2769 | sub size_request { |
2673 | my ($self) = @_; |
2770 | my ($self) = @_; |
2674 | ($self->{req_w}, $self->{req_h}); |
2771 | ($self->{req_w}, $self->{req_h}); |
… | |
… | |
2714 | |
2811 | |
2715 | # popup given the event (must be a mouse button down event currently) |
2812 | # popup given the event (must be a mouse button down event currently) |
2716 | sub popup { |
2813 | sub popup { |
2717 | my ($self, $ev) = @_; |
2814 | my ($self, $ev) = @_; |
2718 | |
2815 | |
2719 | $self->emit ("popdown"); |
2816 | $self->_emit ("popdown"); |
2720 | |
2817 | |
2721 | # maybe save $GRAB? must be careful about events... |
2818 | # maybe save $GRAB? must be careful about events... |
2722 | $GRAB = $self; |
2819 | $GRAB = $self; |
2723 | $self->{button} = $ev->{button}; |
2820 | $self->{button} = $ev->{button}; |
2724 | |
2821 | |
… | |
… | |
2739 | |
2836 | |
2740 | if ($ev->{button} == $self->{button}) { |
2837 | if ($ev->{button} == $self->{button}) { |
2741 | undef $GRAB; |
2838 | undef $GRAB; |
2742 | $self->hide; |
2839 | $self->hide; |
2743 | |
2840 | |
2744 | $self->emit ("popdown"); |
2841 | $self->_emit ("popdown"); |
2745 | $self->{hover}[1]->() if $self->{hover}; |
2842 | $self->{hover}[1]->() if $self->{hover}; |
2746 | } |
2843 | } |
2747 | } |
2844 | } |
2748 | |
2845 | |
2749 | ############################################################################# |
2846 | ############################################################################# |
… | |
… | |
2811 | sub add { |
2908 | sub add { |
2812 | my ($self, $text, %arg) = @_; |
2909 | my ($self, $text, %arg) = @_; |
2813 | |
2910 | |
2814 | $text =~ s/^\s+//; |
2911 | $text =~ s/^\s+//; |
2815 | $text =~ s/\s+$//; |
2912 | $text =~ s/\s+$//; |
|
|
2913 | |
|
|
2914 | return unless $text; |
2816 | |
2915 | |
2817 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2916 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2818 | |
2917 | |
2819 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2918 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2820 | |
2919 | |
… | |
… | |
2891 | } |
2990 | } |
2892 | |
2991 | |
2893 | sub size_allocate { |
2992 | sub size_allocate { |
2894 | my ($self, $w, $h) = @_; |
2993 | my ($self, $w, $h) = @_; |
2895 | |
2994 | |
2896 | my $old_w = $self->{old_w}; $self->{old_w} = $w; |
|
|
2897 | my $old_h = $self->{old_h}; $self->{old_h} = $h; |
|
|
2898 | |
|
|
2899 | CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h |
|
|
2900 | if $old_w && $old_h && ($old_w != $w || $old_h != $h); |
|
|
2901 | |
|
|
2902 | for my $child ($self->children) { |
2995 | for my $child ($self->children) { |
2903 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
2996 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
2904 | |
2997 | |
2905 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
2998 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
2906 | if exists $child->{req_x}; |
2999 | if exists $child->{req_x}; |
… | |
… | |
2935 | } |
3028 | } |
2936 | |
3029 | |
2937 | sub add { |
3030 | sub add { |
2938 | my ($self, @children) = @_; |
3031 | my ($self, @children) = @_; |
2939 | |
3032 | |
|
|
3033 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3034 | push @widgets, $w->children; |
|
|
3035 | $w->{root} = $self; |
|
|
3036 | $w->{visible} = 1; |
|
|
3037 | } |
|
|
3038 | |
2940 | for my $child (@children) { |
3039 | for my $child (@children) { |
2941 | $child->{toplevel} = 1; |
3040 | $child->{is_toplevel} = 1; |
2942 | |
3041 | |
2943 | # integerise window positions |
3042 | # integerise window positions |
2944 | $child->{x} = int $child->{x}; |
3043 | $child->{x} = int $child->{x}; |
2945 | $child->{y} = int $child->{y}; |
3044 | $child->{y} = int $child->{y}; |
2946 | } |
3045 | } |
2947 | |
3046 | |
2948 | $self->SUPER::add (@children); |
3047 | $self->SUPER::add (@children); |
|
|
3048 | } |
|
|
3049 | |
|
|
3050 | sub remove { |
|
|
3051 | my ($self, @children) = @_; |
|
|
3052 | |
|
|
3053 | $self->SUPER::remove (@children); |
|
|
3054 | |
|
|
3055 | while (@children) { |
|
|
3056 | my $w = pop @children; |
|
|
3057 | push @children, $w->children; |
|
|
3058 | $w->set_invisible; |
|
|
3059 | } |
2949 | } |
3060 | } |
2950 | |
3061 | |
2951 | sub on_refresh { |
3062 | sub on_refresh { |
2952 | my ($self, $id, $cb) = @_; |
3063 | my ($self, $id, $cb) = @_; |
2953 | |
3064 | |
… | |
… | |
3006 | $w = 0 if $w < 0; |
3117 | $w = 0 if $w < 0; |
3007 | $h = 0 if $h < 0; |
3118 | $h = 0 if $h < 0; |
3008 | |
3119 | |
3009 | $widget->{w} = $w; |
3120 | $widget->{w} = $w; |
3010 | $widget->{h} = $h; |
3121 | $widget->{h} = $h; |
3011 | $widget->size_allocate ($w, $h); |
|
|
3012 | $widget->emit (size_allocate => $w, $h); |
3122 | $widget->emit (size_allocate => $w, $h); |
3013 | } |
3123 | } |
3014 | } |
3124 | } |
3015 | |
3125 | |
3016 | while ($self->{post_alloc_hook}) { |
3126 | while ($self->{post_alloc_hook}) { |
… | |
… | |
3022 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3132 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3023 | glClear GL_COLOR_BUFFER_BIT; |
3133 | glClear GL_COLOR_BUFFER_BIT; |
3024 | |
3134 | |
3025 | glMatrixMode GL_PROJECTION; |
3135 | glMatrixMode GL_PROJECTION; |
3026 | glLoadIdentity; |
3136 | glLoadIdentity; |
3027 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; |
3137 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; |
3028 | glMatrixMode GL_MODELVIEW; |
3138 | glMatrixMode GL_MODELVIEW; |
3029 | glLoadIdentity; |
3139 | glLoadIdentity; |
3030 | |
3140 | |
3031 | $self->_draw; |
3141 | $self->_draw; |
3032 | } |
3142 | } |