… | |
… | |
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 | for my $widget (values %WIDGET) { |
155 | for my $widget (values %WIDGET) { |
146 | if ($widget->{toplevel}) { |
156 | if ($widget->{is_toplevel}) { |
147 | $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}; |
148 | $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}; |
149 | $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}; |
150 | $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}; |
151 | $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}; |
152 | $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}; |
153 | $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}; |
154 | $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}; |
155 | } |
165 | } |
156 | |
|
|
157 | $widget->reconfigure; |
|
|
158 | } |
166 | } |
|
|
167 | |
|
|
168 | reconfigure_widgets; |
159 | } |
169 | } |
160 | |
170 | |
161 | ############################################################################# |
171 | ############################################################################# |
162 | |
172 | |
163 | package CFClient::UI::Base; |
173 | package CFClient::UI::Base; |
… | |
… | |
195 | %$self = (); |
205 | %$self = (); |
196 | } |
206 | } |
197 | |
207 | |
198 | sub show { |
208 | sub show { |
199 | my ($self) = @_; |
209 | my ($self) = @_; |
200 | |
|
|
201 | return if $self->{parent}; |
210 | return if $self->{parent}; |
202 | |
211 | |
203 | $CFClient::UI::ROOT->add ($self); |
212 | $CFClient::UI::ROOT->add ($self); |
204 | } |
213 | } |
205 | |
214 | |
206 | sub hide { |
215 | sub show_centered { |
207 | 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}; |
208 | |
234 | |
209 | undef $GRAB if $GRAB == $self; |
235 | undef $GRAB if $GRAB == $self; |
210 | 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; |
211 | |
248 | |
212 | $self->{parent}->remove ($self) |
249 | $self->{parent}->remove ($self) |
213 | if $self->{parent}; |
250 | if $self->{parent}; |
214 | } |
251 | } |
215 | |
252 | |
… | |
… | |
285 | } |
322 | } |
286 | |
323 | |
287 | sub set_tooltip { |
324 | sub set_tooltip { |
288 | my ($self, $tooltip) = @_; |
325 | my ($self, $tooltip) = @_; |
289 | |
326 | |
|
|
327 | $tooltip =~ s/^\s+//; |
|
|
328 | $tooltip =~ s/\s+$//; |
|
|
329 | |
|
|
330 | return if $self->{tooltip} eq $tooltip; |
|
|
331 | |
290 | $self->{tooltip} = $tooltip; |
332 | $self->{tooltip} = $tooltip; |
291 | |
333 | |
292 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
334 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
293 | delete $CFClient::UI::TOOLTIP->{owner}; |
335 | delete $CFClient::UI::TOOLTIP->{owner}; |
294 | CFClient::UI::check_tooltip; |
336 | CFClient::UI::check_tooltip; |
… | |
… | |
315 | return if $FOCUS == $self; |
357 | return if $FOCUS == $self; |
316 | return unless $self->{can_focus}; |
358 | return unless $self->{can_focus}; |
317 | |
359 | |
318 | my $focus = $FOCUS; $FOCUS = $self; |
360 | my $focus = $FOCUS; $FOCUS = $self; |
319 | |
361 | |
320 | $self->emit (focus_in => $focus); |
362 | $self->_emit (focus_in => $focus); |
321 | |
363 | |
322 | $focus->update if $focus; |
364 | $focus->update if $focus; |
323 | $FOCUS->update; |
365 | $FOCUS->update; |
324 | } |
366 | } |
325 | |
367 | |
… | |
… | |
328 | |
370 | |
329 | return unless $FOCUS == $self; |
371 | return unless $FOCUS == $self; |
330 | |
372 | |
331 | my $focus = $FOCUS; undef $FOCUS; |
373 | my $focus = $FOCUS; undef $FOCUS; |
332 | |
374 | |
333 | $self->emit (focus_out => $focus); |
375 | $self->_emit (focus_out => $focus); |
334 | |
376 | |
335 | $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; |
336 | } |
381 | } |
337 | |
382 | |
338 | sub mouse_motion { } |
383 | sub mouse_motion { } |
339 | sub button_up { } |
384 | sub button_up { } |
340 | sub key_down { } |
385 | sub key_down { } |
341 | sub key_up { } |
386 | sub key_up { } |
342 | |
387 | |
343 | sub button_down { |
388 | sub button_down { |
344 | my ($self, $ev, $x, $y) = @_; |
389 | my ($self, $ev, $x, $y) = @_; |
345 | |
390 | |
346 | $self->focus_in; |
391 | $self->focus_in; |
… | |
… | |
380 | if ($ENV{PCLIENT_DEBUG}) { |
425 | if ($ENV{PCLIENT_DEBUG}) { |
381 | glPushMatrix; |
426 | glPushMatrix; |
382 | glColor 1, 1, 0, 1; |
427 | glColor 1, 1, 0, 1; |
383 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
428 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
384 | glBegin GL_LINE_LOOP; |
429 | glBegin GL_LINE_LOOP; |
385 | glVertex 0 , 0; |
430 | glVertex 0 , 0; |
386 | glVertex $self->{w}, 0; |
431 | glVertex $self->{w} - 1, 0; |
387 | glVertex $self->{w}, $self->{h}; |
432 | glVertex $self->{w} - 1, $self->{h} - 1; |
388 | glVertex 0 , $self->{h}; |
433 | glVertex 0 , $self->{h} - 1; |
389 | glEnd; |
434 | glEnd; |
390 | glPopMatrix; |
435 | glPopMatrix; |
391 | #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; |
392 | } |
437 | } |
393 | } |
438 | } |
… | |
… | |
416 | Scalar::Util::weaken ($self->{parent} = $parent); |
461 | Scalar::Util::weaken ($self->{parent} = $parent); |
417 | |
462 | |
418 | # TODO: req_w _does_change after ->reconfigure |
463 | # TODO: req_w _does_change after ->reconfigure |
419 | $self->check_size |
464 | $self->check_size |
420 | unless exists $self->{req_w}; |
465 | unless exists $self->{req_w}; |
|
|
466 | |
|
|
467 | $self->show; |
421 | } |
468 | } |
422 | |
469 | |
423 | sub check_size { |
470 | sub check_size { |
424 | my ($self, $forced) = @_; |
471 | my ($self, $forced) = @_; |
425 | |
472 | |
… | |
… | |
438 | my ($self, $signal, $cb) = @_; |
485 | my ($self, $signal, $cb) = @_; |
439 | |
486 | |
440 | push @{ $self->{signal_cb}{$signal} }, $cb; |
487 | push @{ $self->{signal_cb}{$signal} }, $cb; |
441 | } |
488 | } |
442 | |
489 | |
|
|
490 | sub _emit { |
|
|
491 | my ($self, $signal, @args) = @_; |
|
|
492 | |
|
|
493 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
|
|
494 | } |
|
|
495 | |
443 | sub emit { |
496 | sub emit { |
444 | my ($self, $signal, @args) = @_; |
497 | my ($self, $signal, @args) = @_; |
445 | |
498 | |
446 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
499 | $self->_emit ($signal, @args) |
|
|
500 | || $self->$signal (@args); |
447 | } |
501 | } |
448 | |
502 | |
449 | sub DESTROY { |
503 | sub DESTROY { |
450 | my ($self) = @_; |
504 | my ($self) = @_; |
451 | |
505 | |
… | |
… | |
688 | $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { |
742 | $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { |
689 | glClearColor 0, 0, 0, 0; |
743 | glClearColor 0, 0, 0, 0; |
690 | glClear GL_COLOR_BUFFER_BIT; |
744 | glClear GL_COLOR_BUFFER_BIT; |
691 | |
745 | |
692 | $self->_render; |
746 | $self->_render; |
693 | # glColorMask 1, 1, 1, 0; |
|
|
694 | # glEnable GL_BLEND; |
|
|
695 | # glBlendFunc GL_SRC_ALPHA, GL_ZERO; |
|
|
696 | # glRasterPos 0, 0; |
|
|
697 | # glCopyPixels 0, 0, $self->{w}, $self->{h}; |
|
|
698 | # glDisable GL_BLEND; |
|
|
699 | # glColorMask 1, 1, 1, 1; |
|
|
700 | }; |
747 | }; |
701 | } |
748 | } |
702 | |
749 | |
703 | sub _draw { |
750 | sub _draw { |
704 | my ($self) = @_; |
751 | my ($self) = @_; |
… | |
… | |
708 | my $tex = $self->{texture} |
755 | my $tex = $self->{texture} |
709 | or return; |
756 | or return; |
710 | |
757 | |
711 | glEnable GL_TEXTURE_2D; |
758 | glEnable GL_TEXTURE_2D; |
712 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
759 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
713 | glColor 0, 0, 0, 1; |
760 | glColor 1, 1, 1, 1; |
714 | |
761 | |
715 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
762 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
716 | |
763 | |
717 | glDisable GL_TEXTURE_2D; |
764 | glDisable GL_TEXTURE_2D; |
718 | } |
765 | } |
… | |
… | |
721 | |
768 | |
722 | package CFClient::UI::ViewPort; |
769 | package CFClient::UI::ViewPort; |
723 | |
770 | |
724 | our @ISA = CFClient::UI::Window::; |
771 | our @ISA = CFClient::UI::Window::; |
725 | |
772 | |
|
|
773 | sub new { |
|
|
774 | my $class = shift; |
|
|
775 | |
|
|
776 | $class->SUPER::new ( |
|
|
777 | scroll_x => 0, |
|
|
778 | scroll_y => 1, |
|
|
779 | @_, |
|
|
780 | ) |
|
|
781 | } |
|
|
782 | |
726 | sub size_request { |
783 | sub size_request { |
727 | my ($self) = @_; |
784 | my ($self) = @_; |
728 | |
785 | |
729 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
786 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
730 | $self->child->configure (0, 0, @$self{qw(child_w child_h)}); |
|
|
731 | |
787 | |
732 | @$self{qw(child_w child_h)} |
788 | @$self{qw(child_w child_h)} |
733 | } |
789 | } |
734 | |
790 | |
735 | sub size_allocate { |
791 | sub size_allocate { |
736 | my ($self, $w, $h) = @_; |
792 | my ($self, $w, $h) = @_; |
737 | |
793 | |
|
|
794 | $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; |
|
|
795 | $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; |
|
|
796 | |
|
|
797 | $self->child->configure (0, 0, $w, $h); |
738 | $self->update; |
798 | $self->update; |
739 | } |
799 | } |
740 | |
800 | |
741 | sub set_offset { |
801 | sub set_offset { |
742 | my ($self, $x, $y) = @_; |
802 | my ($self, $x, $y) = @_; |
… | |
… | |
796 | |
856 | |
797 | my $slider = new CFClient::UI::Slider |
857 | my $slider = new CFClient::UI::Slider |
798 | vertical => 1, |
858 | vertical => 1, |
799 | range => [0, 0, 1, 0.01], # HACK fix |
859 | range => [0, 0, 1, 0.01], # HACK fix |
800 | connect_changed => sub { |
860 | connect_changed => sub { |
801 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
861 | $self->{vp}->set_offset (0, $_[1]); |
802 | }, |
862 | }, |
803 | ; |
863 | ; |
804 | |
864 | |
805 | $self = $class->SUPER::new ( |
865 | $self = $class->SUPER::new ( |
806 | vp => (new CFClient::UI::ViewPort), |
866 | vp => (new CFClient::UI::ViewPort expand => 1), |
807 | slider => $slider, |
867 | slider => $slider, |
808 | @_, |
868 | @_, |
809 | ); |
869 | ); |
810 | |
870 | |
811 | $self->{vp}->add ($self->{scrolled}); |
871 | $self->{vp}->add ($self->{scrolled}); |
812 | $self->add ($self->{vp}); |
872 | $self->add ($self->{vp}); |
813 | $self->add ($self->{slider}); |
873 | $self->add ($self->{slider}); |
814 | |
874 | |
815 | $self |
875 | $self |
|
|
876 | } |
|
|
877 | |
|
|
878 | sub size_allocate { |
|
|
879 | my ($self, $w, $h) = @_; |
|
|
880 | |
|
|
881 | $self->SUPER::size_allocate ($w, $h); |
|
|
882 | |
|
|
883 | my $child = $self->{vp}->child; |
|
|
884 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
816 | } |
885 | } |
817 | |
886 | |
818 | #TODO# update range on size_allocate depending on child |
887 | #TODO# update range on size_allocate depending on child |
819 | # update viewport offset on scroll |
888 | # update viewport offset on scroll |
820 | |
889 | |
… | |
… | |
874 | my $class = shift; |
943 | my $class = shift; |
875 | |
944 | |
876 | # TODO: user_x, user_y, overwrite moveto? |
945 | # TODO: user_x, user_y, overwrite moveto? |
877 | |
946 | |
878 | my $self = $class->SUPER::new ( |
947 | my $self = $class->SUPER::new ( |
879 | bg => [1, 1, 1, 1], |
948 | bg => [1, 1, 1, 1], |
880 | border_bg => [1, 1, 1, 1], |
949 | border_bg => [1, 1, 1, 1], |
881 | border => 0.6, |
950 | border => 0.6, |
882 | toplevel => 1, |
951 | is_toplevel => 1, |
883 | can_events => 1, |
952 | can_events => 1, |
884 | @_ |
953 | @_ |
885 | ); |
954 | ); |
886 | |
955 | |
887 | $self->{title} &&= new CFClient::UI::Label |
956 | $self->{title} &&= new CFClient::UI::Label |
888 | align => 0, |
957 | align => 0, |
… | |
… | |
1028 | sub new { |
1097 | sub new { |
1029 | my $class = shift; |
1098 | my $class = shift; |
1030 | |
1099 | |
1031 | $class->SUPER::new ( |
1100 | $class->SUPER::new ( |
1032 | col_expand => [], |
1101 | col_expand => [], |
1033 | @_ |
1102 | @_, |
1034 | ) |
1103 | ) |
1035 | } |
1104 | } |
1036 | |
1105 | |
1037 | sub add { |
1106 | sub add { |
1038 | my ($self, $x, $y, $child) = @_; |
1107 | my ($self, $x, $y, $child) = @_; |
… | |
… | |
1297 | #bg => none |
1366 | #bg => none |
1298 | #active_bg => none |
1367 | #active_bg => none |
1299 | #font => default_font |
1368 | #font => default_font |
1300 | #text => initial text |
1369 | #text => initial text |
1301 | #markup => initial narkup |
1370 | #markup => initial narkup |
|
|
1371 | #max_w => maximum pixel width |
|
|
1372 | ellipsise => 3, # end |
1302 | layout => (new CFClient::Layout), |
1373 | layout => (new CFClient::Layout), |
1303 | fontsize => 1, |
1374 | fontsize => 1, |
1304 | align => -1, |
1375 | align => -1, |
1305 | valign => -1, |
1376 | valign => -1, |
1306 | padding => 2, |
1377 | padding => 2, |
… | |
… | |
1371 | sub size_request { |
1442 | sub size_request { |
1372 | my ($self) = @_; |
1443 | my ($self) = @_; |
1373 | |
1444 | |
1374 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1445 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1375 | $self->{layout}->set_width ($self->{max_w} || -1); |
1446 | $self->{layout}->set_width ($self->{max_w} || -1); |
|
|
1447 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
|
|
1448 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1376 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1449 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1377 | |
1450 | |
1378 | my ($w, $h) = $self->{layout}->size; |
1451 | my ($w, $h) = $self->{layout}->size; |
1379 | |
1452 | |
1380 | if (exists $self->{template}) { |
1453 | if (exists $self->{template}) { |
… | |
… | |
1416 | |
1489 | |
1417 | my $tex = $self->{texture} ||= do { |
1490 | my $tex = $self->{texture} ||= do { |
1418 | $self->{layout}->set_foreground (@{$self->{fg}}); |
1491 | $self->{layout}->set_foreground (@{$self->{fg}}); |
1419 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1492 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1420 | $self->{layout}->set_width ($self->{w}); |
1493 | $self->{layout}->set_width ($self->{w}); |
|
|
1494 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
|
|
1495 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1421 | $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); |
1496 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1422 | |
1497 | |
1423 | my $tex = new_from_layout CFClient::Texture $self->{layout}; |
1498 | my $tex = new_from_layout CFClient::Texture $self->{layout}; |
1424 | |
1499 | |
1425 | $self->{ox} = int ($self->{align} < 0 ? $self->{padding} |
1500 | $self->{ox} = int ($self->{align} < 0 ? $self->{padding} |
1426 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
1501 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
… | |
… | |
1464 | active_fg => [0, 0, 0], |
1539 | active_fg => [0, 0, 0], |
1465 | can_hover => 1, |
1540 | can_hover => 1, |
1466 | can_focus => 1, |
1541 | can_focus => 1, |
1467 | valign => 0, |
1542 | valign => 0, |
1468 | can_events => 1, |
1543 | can_events => 1, |
|
|
1544 | #text => ... |
1469 | @_ |
1545 | @_ |
1470 | ) |
1546 | ) |
1471 | } |
1547 | } |
1472 | |
1548 | |
1473 | sub _set_text { |
1549 | sub _set_text { |
… | |
… | |
1483 | $self->{text} = $text; |
1559 | $self->{text} = $text; |
1484 | |
1560 | |
1485 | $text =~ s/./*/g if $self->{hidden}; |
1561 | $text =~ s/./*/g if $self->{hidden}; |
1486 | $self->{layout}->set_text ("$text "); |
1562 | $self->{layout}->set_text ("$text "); |
1487 | |
1563 | |
1488 | $self->emit (changed => $self->{text}); |
1564 | $self->_emit (changed => $self->{text}); |
1489 | } |
1565 | } |
1490 | |
1566 | |
1491 | sub set_text { |
1567 | sub set_text { |
1492 | my ($self, $text) = @_; |
1568 | my ($self, $text) = @_; |
1493 | |
1569 | |
… | |
… | |
1505 | my ($self) = @_; |
1581 | my ($self) = @_; |
1506 | |
1582 | |
1507 | my ($w, $h) = $self->SUPER::size_request; |
1583 | my ($w, $h) = $self->SUPER::size_request; |
1508 | |
1584 | |
1509 | ($w + 1, $h) # add 1 for cursor |
1585 | ($w + 1, $h) # add 1 for cursor |
1510 | } |
|
|
1511 | |
|
|
1512 | sub size_allocate { |
|
|
1513 | my ($self, $w, $h) = @_; |
|
|
1514 | |
|
|
1515 | $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text |
|
|
1516 | } |
1586 | } |
1517 | |
1587 | |
1518 | sub key_down { |
1588 | sub key_down { |
1519 | my ($self, $ev) = @_; |
1589 | my ($self, $ev) = @_; |
1520 | |
1590 | |
… | |
… | |
1535 | } elsif ($sym == CFClient::SDLK_HOME) { |
1605 | } elsif ($sym == CFClient::SDLK_HOME) { |
1536 | $self->{cursor} = 0; |
1606 | $self->{cursor} = 0; |
1537 | } elsif ($sym == CFClient::SDLK_END) { |
1607 | } elsif ($sym == CFClient::SDLK_END) { |
1538 | $self->{cursor} = length $text; |
1608 | $self->{cursor} = length $text; |
1539 | } elsif ($uni == 27) { |
1609 | } elsif ($uni == 27) { |
1540 | $self->emit ('escape'); |
1610 | $self->_emit ('escape'); |
1541 | } elsif ($uni) { |
1611 | } elsif ($uni) { |
1542 | substr $text, $self->{cursor}++, 0, chr $uni; |
1612 | substr $text, $self->{cursor}++, 0, chr $uni; |
1543 | } |
1613 | } |
1544 | |
1614 | |
1545 | $self->_set_text ($text); |
1615 | $self->_set_text ($text); |
… | |
… | |
1632 | if ($sym == 13) { |
1702 | if ($sym == 13) { |
1633 | unshift @{$self->{history}}, |
1703 | unshift @{$self->{history}}, |
1634 | my $txt = $self->get_text; |
1704 | my $txt = $self->get_text; |
1635 | $self->{history_pointer} = -1; |
1705 | $self->{history_pointer} = -1; |
1636 | $self->{history_saveback} = ''; |
1706 | $self->{history_saveback} = ''; |
1637 | $self->emit (activate => $txt); |
1707 | $self->_emit (activate => $txt); |
1638 | $self->update; |
1708 | $self->update; |
1639 | |
1709 | |
1640 | } elsif ($sym == CFClient::SDLK_UP) { |
1710 | } elsif ($sym == CFClient::SDLK_UP) { |
1641 | if ($self->{history_pointer} < 0) { |
1711 | if ($self->{history_pointer} < 0) { |
1642 | $self->{history_saveback} = $self->get_text; |
1712 | $self->{history_saveback} = $self->get_text; |
… | |
… | |
1690 | can_events => 1, |
1760 | can_events => 1, |
1691 | @_ |
1761 | @_ |
1692 | ) |
1762 | ) |
1693 | } |
1763 | } |
1694 | |
1764 | |
|
|
1765 | sub activate { } |
|
|
1766 | |
1695 | sub button_up { |
1767 | sub button_up { |
1696 | my ($self, $ev, $x, $y) = @_; |
1768 | my ($self, $ev, $x, $y) = @_; |
1697 | |
1769 | |
|
|
1770 | $self->emit ("activate") |
1698 | if ($x >= 0 && $x < $self->{w} |
1771 | if $x >= 0 && $x < $self->{w} |
1699 | && $y >= 0 && $y < $self->{h}) { |
1772 | && $y >= 0 && $y < $self->{h}; |
1700 | $self->emit ("activate"); |
|
|
1701 | } |
|
|
1702 | } |
1773 | } |
1703 | |
1774 | |
1704 | sub _draw { |
1775 | sub _draw { |
1705 | my ($self) = @_; |
1776 | my ($self) = @_; |
1706 | |
1777 | |
… | |
… | |
1758 | my ($self, $ev, $x, $y) = @_; |
1829 | my ($self, $ev, $x, $y) = @_; |
1759 | |
1830 | |
1760 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1831 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1761 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1832 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1762 | $self->{state} = !$self->{state}; |
1833 | $self->{state} = !$self->{state}; |
1763 | $self->emit (changed => $self->{state}); |
1834 | $self->_emit (changed => $self->{state}); |
1764 | } |
1835 | } |
1765 | } |
1836 | } |
1766 | |
1837 | |
1767 | sub _draw { |
1838 | sub _draw { |
1768 | my ($self) = @_; |
1839 | my ($self) = @_; |
… | |
… | |
2043 | my $self = $class->SUPER::new ( |
2114 | my $self = $class->SUPER::new ( |
2044 | fg => [1, 1, 1], |
2115 | fg => [1, 1, 1], |
2045 | active_fg => [0, 0, 0], |
2116 | active_fg => [0, 0, 0], |
2046 | bg => [0, 0, 0, 0.2], |
2117 | bg => [0, 0, 0, 0.2], |
2047 | active_bg => [1, 1, 1, 0.5], |
2118 | active_bg => [1, 1, 1, 0.5], |
2048 | range => [0, 0, 100, 10], |
2119 | range => [0, 0, 100, 10, 0], |
2049 | req_w => $::WIDTH / 80, |
2120 | req_w => $::WIDTH / 80, |
2050 | req_h => $::WIDTH / 80, |
2121 | req_h => $::WIDTH / 80, |
2051 | vertical => 0, |
2122 | vertical => 0, |
2052 | can_hover => 1, |
2123 | can_hover => 1, |
2053 | inner_pad => .05, |
2124 | inner_pad => 0.02, |
2054 | @_ |
2125 | @_ |
2055 | ); |
2126 | ); |
2056 | |
2127 | |
2057 | $self->set_value ($self->{range}[0]); |
2128 | $self->set_value ($self->{range}[0]); |
2058 | $self->update; |
2129 | $self->update; |
2059 | |
2130 | |
2060 | $self |
2131 | $self |
2061 | } |
2132 | } |
2062 | |
2133 | |
|
|
2134 | sub set_range { |
|
|
2135 | my ($self, $range) = @_; |
|
|
2136 | |
|
|
2137 | $self->{range} = $range; |
|
|
2138 | |
|
|
2139 | $self->update; |
|
|
2140 | } |
|
|
2141 | |
2063 | sub set_value { |
2142 | sub set_value { |
2064 | my ($self, $value) = @_; |
2143 | my ($self, $value) = @_; |
2065 | |
2144 | |
2066 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2145 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2067 | |
2146 | |
2068 | $hi = $lo + 1 if $hi <= $lo; |
2147 | $hi = $lo + 1 if $hi <= $lo; |
2069 | |
2148 | |
|
|
2149 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2150 | |
2070 | $value = $lo if $value < $lo; |
2151 | $value = $lo if $value < $lo; |
2071 | $value = $hi if $value > $hi; |
2152 | $value = $hi - $page if $value > $hi - $page; |
2072 | |
2153 | |
2073 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2154 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2074 | if $unit; |
2155 | if $unit; |
2075 | |
2156 | |
2076 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2077 | |
|
|
2078 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2157 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2079 | |
2158 | |
2080 | if ($value != $old_value) { |
2159 | if ($value != $old_value) { |
2081 | $self->emit (changed => $value); |
2160 | $self->_emit (changed => $value); |
2082 | $self->update; |
2161 | $self->update; |
2083 | } |
2162 | } |
2084 | } |
2163 | } |
2085 | |
2164 | |
2086 | sub size_request { |
2165 | sub size_request { |
… | |
… | |
2094 | |
2173 | |
2095 | sub button_down { |
2174 | sub button_down { |
2096 | my ($self, $ev, $x, $y) = @_; |
2175 | my ($self, $ev, $x, $y) = @_; |
2097 | |
2176 | |
2098 | $self->SUPER::button_down ($ev, $x, $y); |
2177 | $self->SUPER::button_down ($ev, $x, $y); |
|
|
2178 | |
|
|
2179 | $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; |
|
|
2180 | |
2099 | $self->mouse_motion ($ev, $x, $y); |
2181 | $self->mouse_motion ($ev, $x, $y); |
2100 | } |
2182 | } |
2101 | |
2183 | |
2102 | sub mouse_motion { |
2184 | sub mouse_motion { |
2103 | my ($self, $ev, $x, $y) = @_; |
2185 | my ($self, $ev, $x, $y) = @_; |
… | |
… | |
2105 | if ($GRAB == $self) { |
2187 | if ($GRAB == $self) { |
2106 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2188 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2107 | |
2189 | |
2108 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2190 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2109 | |
2191 | |
2110 | $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; |
2192 | $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); |
2111 | |
2193 | |
2112 | $self->set_value ($x * ($hi - $lo) + $lo); |
2194 | $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); |
2113 | } |
2195 | } |
2114 | } |
2196 | } |
2115 | |
2197 | |
2116 | sub update { |
2198 | sub update { |
2117 | my ($self) = @_; |
2199 | my ($self) = @_; |
2118 | |
2200 | |
2119 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2201 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2120 | $self->set_value ($self->{range}[0]); |
2202 | $self->set_value ($self->{range}[0]); |
2121 | |
2203 | |
2122 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
2204 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
|
|
2205 | my $range = ($hi - $page - $lo) || 1e-100; |
2123 | |
2206 | |
2124 | my $inner_w = 1 - 2 * $self->{inner_pad}; |
2207 | my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; |
2125 | |
2208 | |
2126 | $self->{scale} = ($inner_w / ($hi - $lo)) || 1; |
2209 | $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; |
|
|
2210 | $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; |
2127 | |
2211 | |
2128 | $page = $self->{scale} * $page || 10 / ($self->{w} || 1); |
2212 | $value = ($value - $lo) / $range; |
2129 | $value = $self->{scale} * ($value - $lo); |
2213 | $value = $value * $self->{scale} + $self->{offset}; |
2130 | |
2214 | |
2131 | $value = $self->{inner_pad} + ($value - $page * 0.5); |
|
|
2132 | |
|
|
2133 | $value = 0 if $value < 0; |
|
|
2134 | $page = 1 - $value if $value + $page > 1; |
|
|
2135 | |
|
|
2136 | $self->{knob_x} = $value; |
2215 | $self->{knob_x} = $value - $knob_w * 0.5; |
2137 | $self->{knob_w} = $page; |
2216 | $self->{knob_w} = $knob_w; |
2138 | }); |
2217 | }); |
2139 | |
2218 | |
2140 | $self->SUPER::update; |
2219 | $self->SUPER::update; |
2141 | } |
2220 | } |
2142 | |
2221 | |
… | |
… | |
2148 | glScale $self->{w}, $self->{h}; |
2227 | glScale $self->{w}, $self->{h}; |
2149 | |
2228 | |
2150 | if ($self->{vertical}) { |
2229 | if ($self->{vertical}) { |
2151 | # draw a vertical slider like a rotated horizontal slider |
2230 | # draw a vertical slider like a rotated horizontal slider |
2152 | |
2231 | |
|
|
2232 | glTranslate 1, 0, 0; |
2153 | glRotate 90, 0, 0, 1; |
2233 | glRotate 90, 0, 0, 1; |
2154 | glTranslate 0, 1, 0; |
|
|
2155 | } |
2234 | } |
2156 | |
2235 | |
2157 | my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; |
2236 | my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; |
2158 | my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; |
2237 | my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; |
2159 | |
2238 | |
… | |
… | |
2166 | # draw handle |
2245 | # draw handle |
2167 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2246 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2168 | |
2247 | |
2169 | glDisable GL_TEXTURE_2D; |
2248 | glDisable GL_TEXTURE_2D; |
2170 | } |
2249 | } |
|
|
2250 | |
|
|
2251 | ############################################################################# |
|
|
2252 | |
|
|
2253 | package CFClient::UI::ValSlider; |
|
|
2254 | |
|
|
2255 | our @ISA = CFClient::UI::HBox::; |
|
|
2256 | |
|
|
2257 | sub new { |
|
|
2258 | my ($class, %arg) = @_; |
|
|
2259 | |
|
|
2260 | my $range = delete $arg{range}; |
|
|
2261 | |
|
|
2262 | my $self = $class->SUPER::new ( |
|
|
2263 | slider => (new CFClient::UI::Slider expand => 1, range => $range), |
|
|
2264 | entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), |
|
|
2265 | to_value => sub { shift }, |
|
|
2266 | from_value => sub { shift }, |
|
|
2267 | %arg, |
|
|
2268 | ); |
|
|
2269 | |
|
|
2270 | $self->{slider}->connect (changed => sub { |
|
|
2271 | my ($self, $value) = @_; |
|
|
2272 | $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value)); |
|
|
2273 | $self->{parent}->emit (changed => $value); |
|
|
2274 | }); |
|
|
2275 | |
|
|
2276 | # $self->{entry}->connect (changed => sub { |
|
|
2277 | # my ($self, $value) = @_; |
|
|
2278 | # $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value)); |
|
|
2279 | # $self->{parent}->emit (changed => $value); |
|
|
2280 | # }); |
|
|
2281 | |
|
|
2282 | $self->add ($self->{slider}, $self->{entry}); |
|
|
2283 | |
|
|
2284 | $self->{slider}->emit (changed => $self->{slider}{range}[0]); |
|
|
2285 | |
|
|
2286 | $self |
|
|
2287 | } |
|
|
2288 | |
|
|
2289 | sub set_range { shift->{slider}->set_range (@_) } |
|
|
2290 | sub set_value { shift->{slider}->set_value (@_) } |
2171 | |
2291 | |
2172 | ############################################################################# |
2292 | ############################################################################# |
2173 | |
2293 | |
2174 | package CFClient::UI::TextView; |
2294 | package CFClient::UI::TextView; |
2175 | |
2295 | |
… | |
… | |
2205 | |
2325 | |
2206 | $self->{fontsize} = $fontsize; |
2326 | $self->{fontsize} = $fontsize; |
2207 | $self->reflow; |
2327 | $self->reflow; |
2208 | } |
2328 | } |
2209 | |
2329 | |
2210 | sub text_height { |
|
|
2211 | my ($self, $text) = @_; |
|
|
2212 | |
|
|
2213 | my $layout = $self->{layout}; |
|
|
2214 | |
|
|
2215 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2216 | $layout->set_width ($self->{children}[0]{w}); |
|
|
2217 | $layout->set_markup ($text); |
|
|
2218 | |
|
|
2219 | ($layout->size)[1] |
|
|
2220 | } |
|
|
2221 | |
|
|
2222 | sub reflow { |
|
|
2223 | my ($self) = @_; |
|
|
2224 | |
|
|
2225 | $self->{need_reflow}++; |
|
|
2226 | $self->update; |
|
|
2227 | } |
|
|
2228 | |
|
|
2229 | sub size_allocate { |
2330 | sub size_allocate { |
2230 | my ($self, $w, $h) = @_; |
2331 | my ($self, $w, $h) = @_; |
2231 | |
2332 | |
2232 | $self->SUPER::size_allocate ($w, $h); |
2333 | $self->SUPER::size_allocate ($w, $h); |
2233 | |
2334 | |
… | |
… | |
2236 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2337 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2237 | |
2338 | |
2238 | $self->reflow; |
2339 | $self->reflow; |
2239 | } |
2340 | } |
2240 | |
2341 | |
|
|
2342 | sub text_size { |
|
|
2343 | my ($self, $text, $indent) = @_; |
|
|
2344 | |
|
|
2345 | my $layout = $self->{layout}; |
|
|
2346 | |
|
|
2347 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2348 | $layout->set_width ($self->{children}[0]{w} - $indent); |
|
|
2349 | $layout->set_markup ($text); |
|
|
2350 | |
|
|
2351 | $layout->size |
|
|
2352 | } |
|
|
2353 | |
|
|
2354 | sub reflow { |
|
|
2355 | my ($self) = @_; |
|
|
2356 | |
|
|
2357 | $self->{need_reflow}++; |
|
|
2358 | $self->update; |
|
|
2359 | } |
|
|
2360 | |
|
|
2361 | sub set_offset { |
|
|
2362 | my ($self, $offset) = @_; |
|
|
2363 | |
|
|
2364 | # todo: base offset on lines or so, not on pixels |
|
|
2365 | $self->{children}[1]->set_value ($offset); |
|
|
2366 | } |
|
|
2367 | |
|
|
2368 | sub clear { |
|
|
2369 | my ($self) = @_; |
|
|
2370 | |
|
|
2371 | $self->{par} = []; |
|
|
2372 | $self->{height} = 0; |
|
|
2373 | $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); |
|
|
2374 | } |
|
|
2375 | |
2241 | sub add_paragraph { |
2376 | sub add_paragraph { |
2242 | my ($self, $color, $text) = @_; |
2377 | my ($self, $color, $text, $indent) = @_; |
2243 | |
2378 | |
2244 | #TODO: intelligently "reformat" paragraph |
2379 | for my $line (split /\n/, $text) { |
2245 | |
2380 | my ($w, $h) = $self->text_size ($line); |
2246 | my $height = $self->text_height ($text); |
|
|
2247 | |
|
|
2248 | $self->{height} += $height; |
2381 | $self->{height} += $h; |
|
|
2382 | push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; |
|
|
2383 | } |
2249 | |
2384 | |
2250 | push @{$self->{par}}, [$height, $color, $text]; |
|
|
2251 | |
|
|
2252 | $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; |
2385 | $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); |
2253 | $self->{children}[1]->update; |
|
|
2254 | } |
2386 | } |
2255 | |
2387 | |
2256 | sub update { |
2388 | sub update { |
2257 | my ($self) = @_; |
2389 | my ($self) = @_; |
2258 | |
2390 | |
… | |
… | |
2261 | return unless $self->{h} > 0; |
2393 | return unless $self->{h} > 0; |
2262 | |
2394 | |
2263 | delete $self->{texture}; |
2395 | delete $self->{texture}; |
2264 | |
2396 | |
2265 | $ROOT->on_post_alloc ($self, sub { |
2397 | $ROOT->on_post_alloc ($self, sub { |
|
|
2398 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
|
|
2399 | |
2266 | if (delete $self->{need_reflow}) { |
2400 | if (delete $self->{need_reflow}) { |
2267 | my $height = 0; |
2401 | my $height = 0; |
2268 | |
2402 | |
2269 | $height += $_->[0] = $self->text_height ($_->[2]) |
2403 | my $layout = $self->{layout}; |
|
|
2404 | |
|
|
2405 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2406 | |
2270 | for @{$self->{par}}; |
2407 | for (@{$self->{par}}) { |
|
|
2408 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
|
|
2409 | $layout->set_width ($W - $_->[3]); |
|
|
2410 | $layout->set_markup ($_->[4]); |
|
|
2411 | my ($w, $h) = $layout->size; |
|
|
2412 | $_->[0] = $w + $_->[3]; |
|
|
2413 | $_->[1] = $h; |
|
|
2414 | } |
|
|
2415 | |
|
|
2416 | $height += $_->[1]; |
|
|
2417 | } |
2271 | |
2418 | |
2272 | $self->{height} = $height; |
2419 | $self->{height} = $height; |
2273 | |
2420 | |
2274 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
2421 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
2275 | |
2422 | |
2276 | delete $self->{texture}; |
2423 | delete $self->{texture}; |
2277 | } |
2424 | } |
2278 | |
2425 | |
2279 | $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { |
2426 | $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { |
2280 | glClearColor 0, 0, 0, 0; |
2427 | glClearColor 0.5, 0.5, 0.5, 0; |
2281 | glClear GL_COLOR_BUFFER_BIT; |
2428 | glClear GL_COLOR_BUFFER_BIT; |
2282 | |
2429 | |
2283 | glEnable GL_TEXTURE_2D; |
|
|
2284 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
|
|
2285 | |
|
|
2286 | my $top = int $self->{children}[1]{range}[0]; |
2430 | my $top = int $self->{children}[1]{range}[0]; |
2287 | |
2431 | |
2288 | my $y0 = $top; |
2432 | my $y0 = $top; |
2289 | my $y1 = $top + $self->{h}; |
2433 | my $y1 = $top + $H; |
2290 | |
2434 | |
2291 | my $y = 0; |
2435 | my $y = 0; |
2292 | |
2436 | |
2293 | my $layout = $self->{layout}; |
2437 | my $layout = $self->{layout}; |
2294 | |
2438 | |
2295 | $layout->set_font ($self->{font}) if $self->{font}; |
2439 | $layout->set_font ($self->{font}) if $self->{font}; |
2296 | |
2440 | |
|
|
2441 | glEnable GL_BLEND; |
|
|
2442 | #TODO# not correct in windows where rgba is forced off |
|
|
2443 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
|
|
2444 | |
2297 | for my $par (@{$self->{par}}) { |
2445 | for my $par (@{$self->{par}}) { |
2298 | my $h = $par->[0]; |
2446 | my $h = $par->[1]; |
2299 | |
2447 | |
2300 | if ($y0 < $y + $h && $y < $y1) { |
2448 | if ($y0 < $y + $h && $y < $y1) { |
2301 | $layout->set_foreground (@{ $par->[1] }); |
2449 | $layout->set_foreground (@{ $par->[2] }); |
|
|
2450 | $layout->set_width ($W - $par->[3]); |
2302 | $layout->set_markup ($par->[2]); |
2451 | $layout->set_markup ($par->[4]); |
2303 | |
2452 | |
2304 | my ($W, $H) = $layout->size; |
2453 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2305 | CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); |
2454 | |
|
|
2455 | glRasterPos $par->[3], $y - $y0; |
|
|
2456 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2306 | } |
2457 | } |
2307 | |
2458 | |
2308 | $y += $h; |
2459 | $y += $h; |
2309 | } |
2460 | } |
2310 | |
2461 | |
2311 | glDisable GL_TEXTURE_2D; |
2462 | glDisable GL_BLEND; |
2312 | }; |
2463 | }; |
2313 | }); |
2464 | }); |
2314 | } |
2465 | } |
2315 | |
2466 | |
2316 | sub _draw { |
2467 | sub _draw { |
2317 | my ($self) = @_; |
2468 | my ($self) = @_; |
2318 | |
2469 | |
2319 | glEnable GL_TEXTURE_2D; |
2470 | glEnable GL_TEXTURE_2D; |
2320 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2471 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2321 | glColor 1, 1, 1, 1; |
2472 | glColor 1, 1, 1, 1; |
2322 | $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2473 | $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2323 | glDisable GL_TEXTURE_2D; |
2474 | glDisable GL_TEXTURE_2D; |
2324 | |
2475 | |
2325 | $self->{children}[1]->draw; |
2476 | $self->{children}[1]->draw; |
2326 | |
2477 | |
2327 | } |
2478 | } |
… | |
… | |
2396 | |
2547 | |
2397 | # TODO: use animation |
2548 | # TODO: use animation |
2398 | if ($self->{state} = !$self->{state}) { |
2549 | if ($self->{state} = !$self->{state}) { |
2399 | $CFClient::UI::ROOT->add ($self->{other}); |
2550 | $CFClient::UI::ROOT->add ($self->{other}); |
2400 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2551 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2401 | $self->emit ("open"); |
2552 | $self->_emit ("open"); |
2402 | } else { |
2553 | } else { |
2403 | $CFClient::UI::ROOT->remove ($self->{other}); |
2554 | $CFClient::UI::ROOT->remove ($self->{other}); |
2404 | $self->emit ("close"); |
2555 | $self->_emit ("close"); |
2405 | } |
2556 | } |
2406 | |
2557 | |
2407 | $self->emit (changed => $self->{state}); |
2558 | $self->_emit (changed => $self->{state}); |
2408 | } |
2559 | } |
2409 | |
2560 | |
2410 | ############################################################################# |
2561 | ############################################################################# |
2411 | |
2562 | |
2412 | package CFClient::UI::Tooltip; |
2563 | package CFClient::UI::Tooltip; |
… | |
… | |
2426 | |
2577 | |
2427 | sub set_tooltip_from { |
2578 | sub set_tooltip_from { |
2428 | my ($self, $widget) = @_; |
2579 | my ($self, $widget) = @_; |
2429 | |
2580 | |
2430 | $self->add (new CFClient::UI::Label |
2581 | $self->add (new CFClient::UI::Label |
2431 | markup => $widget->{tooltip}, |
2582 | markup => $widget->{tooltip}, |
2432 | max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, |
2583 | max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, |
2433 | fontsize => 0.8, |
2584 | fontsize => 0.8, |
2434 | fg => [0, 0, 0, 1], |
2585 | fg => [0, 0, 0, 1], |
|
|
2586 | ellipsise => 0, |
2435 | font => ($widget->{tooltip_font} || $::FONT_PROP), |
2587 | font => ($widget->{tooltip_font} || $::FONT_PROP), |
2436 | ); |
2588 | ); |
2437 | } |
2589 | } |
2438 | |
2590 | |
2439 | sub size_request { |
2591 | sub size_request { |
2440 | my ($self) = @_; |
2592 | my ($self) = @_; |
… | |
… | |
2486 | use CFClient::OpenGL; |
2638 | use CFClient::OpenGL; |
2487 | |
2639 | |
2488 | sub new { |
2640 | sub new { |
2489 | my $class = shift; |
2641 | my $class = shift; |
2490 | |
2642 | |
2491 | $class->SUPER::new ( |
2643 | my $self = $class->SUPER::new ( |
2492 | aspect => 1, |
2644 | aspect => 1, |
|
|
2645 | can_events => 0, |
2493 | @_, |
2646 | @_, |
2494 | ) |
2647 | ); |
|
|
2648 | |
|
|
2649 | if ($self->{anim} && $self->{animspeed}) { |
|
|
2650 | Scalar::Util::weaken (my $widget = $self); |
|
|
2651 | |
|
|
2652 | $self->{timer} = Event->timer ( |
|
|
2653 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
2654 | hard => 1, |
|
|
2655 | interval => $self->{animspeed}, |
|
|
2656 | cb => sub { |
|
|
2657 | ++$widget->{frame}; |
|
|
2658 | $widget->update; |
|
|
2659 | }, |
|
|
2660 | ); |
|
|
2661 | } |
|
|
2662 | |
|
|
2663 | $self |
2495 | } |
2664 | } |
2496 | |
2665 | |
2497 | sub size_request { |
2666 | sub size_request { |
2498 | (32, 8) |
2667 | (32, 8) |
2499 | } |
2668 | } |
2500 | |
2669 | |
|
|
2670 | sub update { |
|
|
2671 | my ($self) = @_; |
|
|
2672 | |
|
|
2673 | return unless $self->{visible}; |
|
|
2674 | |
|
|
2675 | $self->SUPER::update; |
|
|
2676 | } |
|
|
2677 | |
2501 | sub _draw { |
2678 | sub _draw { |
2502 | my ($self) = @_; |
2679 | my ($self) = @_; |
2503 | |
2680 | |
2504 | return unless $::CONN;#d# manage and cache textures differently |
2681 | return unless $::CONN; |
|
|
2682 | |
|
|
2683 | my $face; |
|
|
2684 | |
|
|
2685 | if ($self->{frame}) { |
|
|
2686 | my $anim = $::CONN->{anim}[$self->{anim}]; |
|
|
2687 | |
|
|
2688 | $face = $anim->[ $self->{frame} % @$anim ] |
|
|
2689 | if $anim && @$anim; |
|
|
2690 | } |
|
|
2691 | |
2505 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; |
2692 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
2506 | |
2693 | |
2507 | # TODO animation |
|
|
2508 | if ($tex) { |
2694 | if ($tex) { |
2509 | glEnable GL_TEXTURE_2D; |
2695 | glEnable GL_TEXTURE_2D; |
2510 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2696 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2511 | glColor 1, 1, 1, 1; |
2697 | glColor 1, 1, 1, 1; |
2512 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2698 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2513 | glDisable GL_TEXTURE_2D; |
2699 | glDisable GL_TEXTURE_2D; |
2514 | } |
2700 | } |
2515 | } |
2701 | } |
2516 | |
2702 | |
|
|
2703 | sub DESTROY { |
|
|
2704 | my ($self) = @_; |
|
|
2705 | |
|
|
2706 | $self->{timer}->cancel |
|
|
2707 | if $self->{timer}; |
|
|
2708 | |
|
|
2709 | $self->SUPER::DESTROY; |
|
|
2710 | } |
|
|
2711 | |
2517 | ############################################################################# |
2712 | ############################################################################# |
2518 | |
2713 | |
2519 | package CFClient::UI::InventoryItem; |
2714 | package CFClient::UI::InventoryItem; |
2520 | |
2715 | |
2521 | our @ISA = CFClient::UI::HBox::; |
2716 | our @ISA = CFClient::UI::HBox::; |
… | |
… | |
2525 | |
2720 | |
2526 | my %args = @_; |
2721 | my %args = @_; |
2527 | |
2722 | |
2528 | my $item = delete $args{item}; |
2723 | my $item = delete $args{item}; |
2529 | |
2724 | |
2530 | my $desc = $item->{nrof} < 2 |
2725 | my $desc = CFClient::Item::desc_string $item; |
2531 | ? $item->{name} |
|
|
2532 | : "$item->{nrof} $item->{name_pl}"; |
|
|
2533 | |
|
|
2534 | $item->{flags} & Crossfire::Protocol::F_OPEN |
|
|
2535 | and $desc .= " (open)"; |
|
|
2536 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
|
|
2537 | and $desc .= " (applied)"; |
|
|
2538 | $item->{flags} & Crossfire::Protocol::F_UNPAID |
|
|
2539 | and $desc .= " (unpaid)"; |
|
|
2540 | $item->{flags} & Crossfire::Protocol::F_MAGIC |
|
|
2541 | and $desc .= " (magic)"; |
|
|
2542 | $item->{flags} & Crossfire::Protocol::F_CURSED |
|
|
2543 | and $desc .= " (cursed)"; |
|
|
2544 | $item->{flags} & Crossfire::Protocol::F_DAMNED |
|
|
2545 | and $desc .= " (damned)"; |
|
|
2546 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2547 | and $desc .= " *"; |
|
|
2548 | |
2726 | |
2549 | my $self = $class->SUPER::new ( |
2727 | my $self = $class->SUPER::new ( |
2550 | can_hover => 1, |
2728 | can_hover => 1, |
2551 | can_events => 1, |
2729 | can_events => 1, |
2552 | tooltip => ((CFClient::UI::Label::escape $desc) |
2730 | tooltip => ((CFClient::UI::Label::escape $desc) |
2553 | . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), |
2731 | . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"), |
2554 | connect_button_down => sub { |
2732 | connect_button_down => sub { |
2555 | my ($self, $ev, $x, $y) = @_; |
2733 | my ($self, $ev, $x, $y) = @_; |
2556 | |
2734 | |
2557 | # todo: maybe put examine on 1? but should just be a tooltip :( |
2735 | # todo: maybe put examine on 1? but should just be a tooltip :( |
2558 | if ($ev->{button} == 1) { |
2736 | if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { |
2559 | my $targ = $::CONN->{player}{tag}; |
2737 | my $targ = $::CONN->{player}{tag}; |
2560 | |
2738 | |
2561 | if ($item->{container} == $::CONN->{player}{tag}) { |
2739 | if ($item->{container} == $::CONN->{player}{tag}) { |
2562 | $targ = $main::OPENCONT; |
2740 | $targ = $main::OPENCONT; |
2563 | } |
2741 | } |
2564 | |
2742 | |
2565 | $::CONN->send ("move $targ $item->{tag} 0"); |
2743 | $::CONN->send ("move $targ $item->{tag} 0"); |
|
|
2744 | } elsif ($ev->{button} == 1) { |
|
|
2745 | $::CONN->send ("examine $item->{tag}"); |
2566 | } elsif ($ev->{button} == 2) { |
2746 | } elsif ($ev->{button} == 2) { |
2567 | $::CONN->send ("apply $item->{tag}"); |
2747 | $::CONN->send ("apply $item->{tag}"); |
2568 | } elsif ($ev->{button} == 3) { |
2748 | } elsif ($ev->{button} == 3) { |
2569 | my @menu_items = ( |
2749 | my @menu_items = ( |
2570 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
2750 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
2571 | ["mark", sub { $::CONN->send ("mark $item->{tag}") }], |
2751 | ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], |
2572 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
2752 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
|
|
2753 | ( |
|
|
2754 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2755 | ? ( |
|
|
2756 | ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }], |
|
|
2757 | ) |
|
|
2758 | : ( |
|
|
2759 | ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }], |
2573 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
2760 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
2574 | [ |
2761 | ) |
2575 | $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", |
|
|
2576 | sub { $::CONN->send ("lock $item->{tag}") }, |
|
|
2577 | ], |
2762 | ), |
2578 | ); |
2763 | ); |
2579 | |
2764 | |
2580 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
2765 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
2581 | } |
2766 | } |
2582 | |
2767 | |
2583 | 1 |
2768 | 1 |
2584 | }, |
2769 | }, |
2585 | %args |
2770 | %args |
2586 | ); |
2771 | ); |
|
|
2772 | |
2587 | |
2773 | |
2588 | $self->add (new CFClient::UI::Face |
2774 | $self->add (new CFClient::UI::Face |
2589 | can_events => 0, |
2775 | can_events => 0, |
2590 | face => $item->{face}, |
2776 | face => $item->{face}, |
2591 | anim => $item->{anim}, |
2777 | anim => $item->{anim}, |
2592 | animspeed => $item->{animspeed}, |
2778 | animspeed => $item->{animspeed}, |
2593 | ); |
2779 | ); |
2594 | |
2780 | |
2595 | $self->add (new CFClient::UI::Label |
2781 | $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0); |
2596 | can_events => 0, |
2782 | |
2597 | text => $desc, |
2783 | $self->{item} = $item; |
2598 | ); |
2784 | |
|
|
2785 | $self->update_item; |
2599 | |
2786 | |
2600 | $self |
2787 | $self |
|
|
2788 | } |
|
|
2789 | |
|
|
2790 | sub update_item { |
|
|
2791 | my ($self) = @_; |
|
|
2792 | |
|
|
2793 | my $desc = CFClient::Item::desc_string ($self->{item}); |
|
|
2794 | |
|
|
2795 | $self->{name_lbl}->set_text ($desc); |
2601 | } |
2796 | } |
2602 | |
2797 | |
2603 | ############################################################################# |
2798 | ############################################################################# |
2604 | |
2799 | |
2605 | package CFClient::UI::Inventory; |
2800 | package CFClient::UI::Inventory; |
… | |
… | |
2608 | |
2803 | |
2609 | sub new { |
2804 | sub new { |
2610 | my $class = shift; |
2805 | my $class = shift; |
2611 | |
2806 | |
2612 | my $self = $class->SUPER::new ( |
2807 | my $self = $class->SUPER::new ( |
2613 | scrolled => (new CFClient::UI::VBox), |
2808 | scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), |
2614 | @_, |
2809 | @_, |
2615 | ); |
2810 | ); |
2616 | |
2811 | |
2617 | $self |
2812 | $self |
2618 | } |
2813 | } |
… | |
… | |
2628 | or ($a->{name} cmp $b->{name}) |
2823 | or ($a->{name} cmp $b->{name}) |
2629 | } @$items; |
2824 | } @$items; |
2630 | |
2825 | |
2631 | $self->{real_items} = \@items; |
2826 | $self->{real_items} = \@items; |
2632 | |
2827 | |
|
|
2828 | my $row = 0; |
2633 | for my $item (@items) { |
2829 | for my $item (@items) { |
2634 | my $desc = $item->{nrof} < 2 |
2830 | CFClient::Item::update_widgets $item; |
2635 | ? $item->{name} |
|
|
2636 | : "$item->{nrof} $item->{name_pl}"; |
|
|
2637 | |
2831 | |
2638 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2832 | $self->{scrolled}->add (0, $row, $item->{face_widget}); |
2639 | } |
2833 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
|
|
2834 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2640 | |
2835 | |
2641 | $self->{scrolled}->add (@items); |
2836 | $row++; |
|
|
2837 | } |
2642 | |
2838 | |
2643 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2839 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2644 | } |
2840 | } |
2645 | |
2841 | |
2646 | sub size_request { |
2842 | sub size_request { |
… | |
… | |
2688 | |
2884 | |
2689 | # popup given the event (must be a mouse button down event currently) |
2885 | # popup given the event (must be a mouse button down event currently) |
2690 | sub popup { |
2886 | sub popup { |
2691 | my ($self, $ev) = @_; |
2887 | my ($self, $ev) = @_; |
2692 | |
2888 | |
2693 | $self->emit ("popdown"); |
2889 | $self->_emit ("popdown"); |
2694 | |
2890 | |
2695 | # maybe save $GRAB? must be careful about events... |
2891 | # maybe save $GRAB? must be careful about events... |
2696 | $GRAB = $self; |
2892 | $GRAB = $self; |
2697 | $self->{button} = $ev->{button}; |
2893 | $self->{button} = $ev->{button}; |
2698 | |
2894 | |
… | |
… | |
2713 | |
2909 | |
2714 | if ($ev->{button} == $self->{button}) { |
2910 | if ($ev->{button} == $self->{button}) { |
2715 | undef $GRAB; |
2911 | undef $GRAB; |
2716 | $self->hide; |
2912 | $self->hide; |
2717 | |
2913 | |
2718 | $self->emit ("popdown"); |
2914 | $self->_emit ("popdown"); |
2719 | $self->{hover}[1]->() if $self->{hover}; |
2915 | $self->{hover}[1]->() if $self->{hover}; |
2720 | } |
2916 | } |
2721 | } |
2917 | } |
2722 | |
2918 | |
2723 | ############################################################################# |
2919 | ############################################################################# |
… | |
… | |
2758 | # TODO: doesn't handle markup well (read as: at all) |
2954 | # TODO: doesn't handle markup well (read as: at all) |
2759 | my $short = $item->{count} > 1 |
2955 | my $short = $item->{count} > 1 |
2760 | ? "<b>$item->{count} ×</b> $item->{text}" |
2956 | ? "<b>$item->{count} ×</b> $item->{text}" |
2761 | : $item->{text}; |
2957 | : $item->{text}; |
2762 | |
2958 | |
2763 | my $fontsize = $item->{fontsize} || $self->{fontsize}; |
|
|
2764 | |
|
|
2765 | for ($short) { |
2959 | for ($short) { |
2766 | s/^\s+//; |
2960 | s/^\s+//; |
2767 | s/\s+/ /g; |
2961 | s/\s+/ /g; |
2768 | my $len = int 40 / $fontsize; |
|
|
2769 | substr $_, $len, length, "…" if $len < length; |
|
|
2770 | } |
2962 | } |
2771 | |
2963 | |
2772 | new CFClient::UI::Label |
2964 | new CFClient::UI::Label |
2773 | markup => $short, |
2965 | markup => $short, |
2774 | tooltip => $item->{tooltip}, |
2966 | tooltip => $item->{tooltip}, |
2775 | tooltip_font => $::FONT_PROP, |
2967 | tooltip_font => $::FONT_PROP, |
2776 | tooltip_width => 0.67, |
2968 | tooltip_width => 0.67, |
2777 | fontsize => $fontsize, |
2969 | fontsize => $item->{fontsize} || $self->{fontsize}, |
|
|
2970 | max_w => $::WIDTH * 0.44, |
2778 | fg => $item->{fg}, |
2971 | fg => $item->{fg}, |
2779 | can_events => 1, |
2972 | can_events => 1, |
2780 | can_hover => 1 |
2973 | can_hover => 1 |
2781 | }; |
2974 | }; |
2782 | } |
2975 | } |
… | |
… | |
2788 | sub add { |
2981 | sub add { |
2789 | my ($self, $text, %arg) = @_; |
2982 | my ($self, $text, %arg) = @_; |
2790 | |
2983 | |
2791 | $text =~ s/^\s+//; |
2984 | $text =~ s/^\s+//; |
2792 | $text =~ s/\s+$//; |
2985 | $text =~ s/\s+$//; |
|
|
2986 | |
|
|
2987 | return unless $text; |
2793 | |
2988 | |
2794 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2989 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2795 | |
2990 | |
2796 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2991 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2797 | |
2992 | |
… | |
… | |
2819 | } |
3014 | } |
2820 | |
3015 | |
2821 | $self->reorder; |
3016 | $self->reorder; |
2822 | } |
3017 | } |
2823 | |
3018 | |
|
|
3019 | sub reconfigure { |
|
|
3020 | my ($self) = @_; |
|
|
3021 | |
|
|
3022 | delete $_->{label} |
|
|
3023 | for values %{ $self->{item} || {} }; |
|
|
3024 | |
|
|
3025 | $self->reorder; |
|
|
3026 | $self->SUPER::reconfigure; |
|
|
3027 | } |
|
|
3028 | |
2824 | ############################################################################# |
3029 | ############################################################################# |
2825 | |
3030 | |
2826 | package CFClient::UI::Root; |
3031 | package CFClient::UI::Root; |
2827 | |
3032 | |
2828 | our @ISA = CFClient::UI::Container::; |
3033 | our @ISA = CFClient::UI::Container::; |
… | |
… | |
2858 | } |
3063 | } |
2859 | |
3064 | |
2860 | sub size_allocate { |
3065 | sub size_allocate { |
2861 | my ($self, $w, $h) = @_; |
3066 | my ($self, $w, $h) = @_; |
2862 | |
3067 | |
2863 | my $old_w = $self->{old_w}; $self->{old_w} = $w; |
|
|
2864 | my $old_h = $self->{old_h}; $self->{old_h} = $h; |
|
|
2865 | |
|
|
2866 | CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h |
|
|
2867 | if $old_w && $old_h && ($old_w != $w || $old_h != $h); |
|
|
2868 | |
|
|
2869 | for my $child ($self->children) { |
3068 | for my $child ($self->children) { |
2870 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3069 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
2871 | |
3070 | |
2872 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3071 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
2873 | if exists $child->{req_x}; |
3072 | if exists $child->{req_x}; |
… | |
… | |
2902 | } |
3101 | } |
2903 | |
3102 | |
2904 | sub add { |
3103 | sub add { |
2905 | my ($self, @children) = @_; |
3104 | my ($self, @children) = @_; |
2906 | |
3105 | |
|
|
3106 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3107 | push @widgets, $w->children; |
|
|
3108 | $w->{root} = $self; |
|
|
3109 | $w->{visible} = 1; |
|
|
3110 | } |
|
|
3111 | |
2907 | for my $child (@children) { |
3112 | for my $child (@children) { |
2908 | $child->{toplevel} = 1; |
3113 | $child->{is_toplevel} = 1; |
2909 | |
3114 | |
2910 | # integerise window positions |
3115 | # integerise window positions |
2911 | $child->{x} = int $child->{x}; |
3116 | $child->{x} = int $child->{x}; |
2912 | $child->{y} = int $child->{y}; |
3117 | $child->{y} = int $child->{y}; |
2913 | } |
3118 | } |
2914 | |
3119 | |
2915 | $self->SUPER::add (@children); |
3120 | $self->SUPER::add (@children); |
|
|
3121 | } |
|
|
3122 | |
|
|
3123 | sub remove { |
|
|
3124 | my ($self, @children) = @_; |
|
|
3125 | |
|
|
3126 | $self->SUPER::remove (@children); |
|
|
3127 | |
|
|
3128 | while (@children) { |
|
|
3129 | my $w = pop @children; |
|
|
3130 | push @children, $w->children; |
|
|
3131 | $w->set_invisible; |
|
|
3132 | } |
2916 | } |
3133 | } |
2917 | |
3134 | |
2918 | sub on_refresh { |
3135 | sub on_refresh { |
2919 | my ($self, $id, $cb) = @_; |
3136 | my ($self, $id, $cb) = @_; |
2920 | |
3137 | |
… | |
… | |
2973 | $w = 0 if $w < 0; |
3190 | $w = 0 if $w < 0; |
2974 | $h = 0 if $h < 0; |
3191 | $h = 0 if $h < 0; |
2975 | |
3192 | |
2976 | $widget->{w} = $w; |
3193 | $widget->{w} = $w; |
2977 | $widget->{h} = $h; |
3194 | $widget->{h} = $h; |
2978 | $widget->size_allocate ($w, $h); |
|
|
2979 | $widget->emit (size_allocate => $w, $h); |
3195 | $widget->emit (size_allocate => $w, $h); |
2980 | } |
3196 | } |
2981 | } |
3197 | } |
2982 | |
3198 | |
2983 | while ($self->{post_alloc_hook}) { |
3199 | while ($self->{post_alloc_hook}) { |
… | |
… | |
2989 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3205 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
2990 | glClear GL_COLOR_BUFFER_BIT; |
3206 | glClear GL_COLOR_BUFFER_BIT; |
2991 | |
3207 | |
2992 | glMatrixMode GL_PROJECTION; |
3208 | glMatrixMode GL_PROJECTION; |
2993 | glLoadIdentity; |
3209 | glLoadIdentity; |
2994 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; |
3210 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; |
2995 | glMatrixMode GL_MODELVIEW; |
3211 | glMatrixMode GL_MODELVIEW; |
2996 | glLoadIdentity; |
3212 | glLoadIdentity; |
2997 | |
3213 | |
2998 | $self->_draw; |
3214 | $self->_draw; |
2999 | } |
3215 | } |
… | |
… | |
3001 | ############################################################################# |
3217 | ############################################################################# |
3002 | |
3218 | |
3003 | package CFClient::UI; |
3219 | package CFClient::UI; |
3004 | |
3220 | |
3005 | $ROOT = new CFClient::UI::Root; |
3221 | $ROOT = new CFClient::UI::Root; |
3006 | $TOOLTIP = new CFClient::UI::Tooltip; |
3222 | $TOOLTIP = new CFClient::UI::Tooltip z => 900; |
3007 | |
3223 | |
3008 | 1 |
3224 | 1 |
3009 | |
3225 | |