… | |
… | |
5 | |
5 | |
6 | use Scalar::Util (); |
6 | use Scalar::Util (); |
7 | use List::Util (); |
7 | use List::Util (); |
8 | |
8 | |
9 | use CFClient; |
9 | use CFClient; |
|
|
10 | use CFClient::Texture; |
10 | |
11 | |
11 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
12 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
12 | |
13 | |
|
|
14 | our $LAYOUT; |
13 | our $ROOT; |
15 | our $ROOT; |
14 | our $TOOLTIP; |
16 | our $TOOLTIP; |
15 | our $BUTTON_STATE; |
17 | our $BUTTON_STATE; |
16 | |
18 | |
17 | our %WIDGET; # all widgets, weak-referenced |
19 | our %WIDGET; # all widgets, weak-referenced |
|
|
20 | |
|
|
21 | sub get_layout { |
|
|
22 | for (grep { $_->{name} } values %WIDGET) { |
|
|
23 | $LAYOUT->{$_->{name}} = { |
|
|
24 | x => $_->{x} / $::WIDTH, |
|
|
25 | y => $_->{y} / $::HEIGHT, |
|
|
26 | w => $_->{w} / $::WIDTH, |
|
|
27 | h => $_->{h} / $::HEIGHT |
|
|
28 | }; |
|
|
29 | } |
|
|
30 | |
|
|
31 | return $LAYOUT; |
|
|
32 | } |
|
|
33 | |
|
|
34 | sub set_layout { |
|
|
35 | my ($layout) = @_; |
|
|
36 | $LAYOUT = $layout; |
|
|
37 | } |
18 | |
38 | |
19 | sub check_tooltip { |
39 | sub check_tooltip { |
20 | if (!$GRAB) { |
40 | if (!$GRAB) { |
21 | for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { |
41 | for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { |
22 | if (length $widget->{tooltip}) { |
42 | if (length $widget->{tooltip}) { |
… | |
… | |
50 | delete $TOOLTIP->{owner}; |
70 | delete $TOOLTIP->{owner}; |
51 | } |
71 | } |
52 | |
72 | |
53 | # class methods for events |
73 | # class methods for events |
54 | sub feed_sdl_key_down_event { |
74 | sub feed_sdl_key_down_event { |
55 | $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) |
75 | $FOCUS->emit (key_down => $_[0]) |
56 | if $FOCUS; |
76 | if $FOCUS; |
57 | } |
77 | } |
58 | |
78 | |
59 | sub feed_sdl_key_up_event { |
79 | sub feed_sdl_key_up_event { |
60 | $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) |
80 | $FOCUS->emit (key_up => $_[0]) |
61 | if $FOCUS; |
81 | if $FOCUS; |
62 | } |
82 | } |
63 | |
83 | |
64 | sub feed_sdl_button_down_event { |
84 | sub feed_sdl_button_down_event { |
65 | my ($ev) = @_; |
85 | my ($ev) = @_; |
… | |
… | |
74 | check_tooltip; |
94 | check_tooltip; |
75 | } |
95 | } |
76 | |
96 | |
77 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
97 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
78 | |
98 | |
79 | if ($GRAB) { |
99 | $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) |
80 | ($x, $y) = $GRAB->coord2local ($x, $y); |
100 | if $GRAB; |
81 | $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); |
|
|
82 | } |
|
|
83 | } |
101 | } |
84 | |
102 | |
85 | sub feed_sdl_button_up_event { |
103 | sub feed_sdl_button_up_event { |
86 | my ($ev) = @_; |
104 | my ($ev) = @_; |
87 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
105 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
88 | |
106 | |
89 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
107 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
90 | |
108 | |
91 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
109 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
92 | |
110 | |
93 | if ($GRAB) { |
111 | $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) |
94 | ($x, $y) = $GRAB->coord2local ($x, $y); |
112 | if $GRAB; |
95 | $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y); |
|
|
96 | } |
|
|
97 | |
113 | |
98 | if (!$BUTTON_STATE) { |
114 | if (!$BUTTON_STATE) { |
99 | my $grab = $GRAB; undef $GRAB; |
115 | my $grab = $GRAB; undef $GRAB; |
100 | $grab->update if $grab; |
116 | $grab->update if $grab; |
101 | $GRAB->update if $GRAB; |
117 | $GRAB->update if $GRAB; |
… | |
… | |
117 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
133 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
118 | |
134 | |
119 | check_tooltip; |
135 | check_tooltip; |
120 | } |
136 | } |
121 | |
137 | |
122 | if ($HOVER) { |
|
|
123 | ($x, $y) = $HOVER->coord2local ($x, $y); |
|
|
124 | $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); |
138 | $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) |
125 | } |
139 | if $HOVER; |
126 | } |
140 | } |
127 | |
141 | |
128 | # convert position array to integers |
142 | # convert position array to integers |
129 | sub harmonize { |
143 | sub harmonize { |
130 | my ($vals) = @_; |
144 | my ($vals) = @_; |
… | |
… | |
144 | |
158 | |
145 | $_->update |
159 | $_->update |
146 | for @widgets; |
160 | for @widgets; |
147 | } |
161 | } |
148 | |
162 | |
|
|
163 | sub reconfigure_widgets { |
|
|
164 | # make a copy, otherwise C<for> complains about freed values. |
|
|
165 | my @widgets = values %WIDGET; |
|
|
166 | |
|
|
167 | $_->reconfigure |
|
|
168 | for @widgets; |
|
|
169 | } |
|
|
170 | |
149 | # call when resolution changes etc. |
171 | # call when resolution changes etc. |
150 | sub rescale_widgets { |
172 | sub rescale_widgets { |
151 | my ($sx, $sy) = @_; |
173 | my ($sx, $sy) = @_; |
152 | |
174 | |
153 | # make a copy, otherwise for complains about freed values. |
|
|
154 | my @widgets = values %WIDGET; |
175 | for my $widget (values %WIDGET) { |
155 | |
|
|
156 | for my $widget (@widgets) { |
|
|
157 | if ($widget->{toplevel}) { |
176 | if ($widget->{is_toplevel}) { |
158 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
177 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
159 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
178 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
160 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
179 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
161 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
180 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
162 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
181 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
163 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
182 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
164 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
183 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
165 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
184 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
166 | } |
185 | } |
167 | |
|
|
168 | $widget->reconfigure; |
|
|
169 | } |
186 | } |
|
|
187 | |
|
|
188 | reconfigure_widgets; |
170 | } |
189 | } |
171 | |
190 | |
172 | ############################################################################# |
191 | ############################################################################# |
173 | |
192 | |
174 | package CFClient::UI::Base; |
193 | package CFClient::UI::Base; |
… | |
… | |
187 | can_events => 1, |
206 | can_events => 1, |
188 | @_ |
207 | @_ |
189 | }, $class; |
208 | }, $class; |
190 | |
209 | |
191 | for (keys %$self) { |
210 | for (keys %$self) { |
192 | if (/^connect_(.*)$/) { |
211 | if (/^on_(.*)$/) { |
193 | $self->connect ($1 => delete $self->{$_}); |
212 | $self->connect ($1 => delete $self->{$_}); |
194 | } |
213 | } |
195 | } |
214 | } |
196 | |
215 | |
197 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
216 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
|
|
217 | |
|
|
218 | if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { |
|
|
219 | $self->{user_x} = $layout->{x} * $::WIDTH; |
|
|
220 | $self->{user_y} = $layout->{y} * $::HEIGHT; |
|
|
221 | $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; |
|
|
222 | $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; |
|
|
223 | } |
198 | |
224 | |
199 | $self |
225 | $self |
200 | } |
226 | } |
201 | |
227 | |
202 | sub destroy { |
228 | sub destroy { |
… | |
… | |
224 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
250 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
225 | }, |
251 | }, |
226 | ); |
252 | ); |
227 | } |
253 | } |
228 | |
254 | |
229 | sub hide { |
255 | sub set_invisible { |
230 | my ($self) = @_; |
256 | my ($self) = @_; |
|
|
257 | |
|
|
258 | # broken show/hide model |
|
|
259 | |
|
|
260 | delete $self->{root}; |
|
|
261 | delete $self->{visible}; |
231 | |
262 | |
232 | undef $GRAB if $GRAB == $self; |
263 | undef $GRAB if $GRAB == $self; |
233 | undef $HOVER if $HOVER == $self; |
264 | undef $HOVER if $HOVER == $self; |
|
|
265 | |
|
|
266 | CFClient::UI::check_tooltip |
|
|
267 | if $CFClient::UI::TOOLTIP->{owner} == $self; |
|
|
268 | |
|
|
269 | $self->focus_out; |
|
|
270 | } |
|
|
271 | |
|
|
272 | sub hide { |
|
|
273 | my ($self) = @_; |
|
|
274 | |
|
|
275 | $self->set_invisible; |
234 | |
276 | |
235 | $self->{parent}->remove ($self) |
277 | $self->{parent}->remove ($self) |
236 | if $self->{parent}; |
278 | if $self->{parent}; |
237 | } |
279 | } |
238 | |
280 | |
… | |
… | |
308 | } |
350 | } |
309 | |
351 | |
310 | sub set_tooltip { |
352 | sub set_tooltip { |
311 | my ($self, $tooltip) = @_; |
353 | my ($self, $tooltip) = @_; |
312 | |
354 | |
|
|
355 | $tooltip =~ s/^\s+//; |
|
|
356 | $tooltip =~ s/\s+$//; |
|
|
357 | |
|
|
358 | return if $self->{tooltip} eq $tooltip; |
|
|
359 | |
313 | $self->{tooltip} = $tooltip; |
360 | $self->{tooltip} = $tooltip; |
314 | |
361 | |
315 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
362 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
316 | delete $CFClient::UI::TOOLTIP->{owner}; |
363 | delete $CFClient::UI::TOOLTIP->{owner}; |
317 | CFClient::UI::check_tooltip; |
364 | CFClient::UI::check_tooltip; |
… | |
… | |
338 | return if $FOCUS == $self; |
385 | return if $FOCUS == $self; |
339 | return unless $self->{can_focus}; |
386 | return unless $self->{can_focus}; |
340 | |
387 | |
341 | my $focus = $FOCUS; $FOCUS = $self; |
388 | my $focus = $FOCUS; $FOCUS = $self; |
342 | |
389 | |
343 | $self->emit (focus_in => $focus); |
390 | $self->_emit (focus_in => $focus); |
344 | |
391 | |
345 | $focus->update if $focus; |
392 | $focus->update if $focus; |
346 | $FOCUS->update; |
393 | $FOCUS->update; |
347 | } |
394 | } |
348 | |
395 | |
… | |
… | |
351 | |
398 | |
352 | return unless $FOCUS == $self; |
399 | return unless $FOCUS == $self; |
353 | |
400 | |
354 | my $focus = $FOCUS; undef $FOCUS; |
401 | my $focus = $FOCUS; undef $FOCUS; |
355 | |
402 | |
356 | $self->emit (focus_out => $focus); |
403 | $self->_emit (focus_out => $focus); |
357 | |
404 | |
358 | $focus->update if $focus; #? |
405 | $focus->update if $focus; #? |
|
|
406 | |
|
|
407 | $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus |
|
|
408 | unless $FOCUS; |
359 | } |
409 | } |
360 | |
410 | |
361 | sub mouse_motion { } |
411 | sub mouse_motion { } |
362 | sub button_up { } |
412 | sub button_up { } |
363 | sub key_down { } |
413 | sub key_down { } |
364 | sub key_up { } |
414 | sub key_up { } |
365 | |
415 | |
366 | sub button_down { |
416 | sub button_down { |
367 | my ($self, $ev, $x, $y) = @_; |
417 | my ($self, $ev, $x, $y) = @_; |
368 | |
418 | |
369 | $self->focus_in; |
419 | $self->focus_in; |
… | |
… | |
403 | if ($ENV{PCLIENT_DEBUG}) { |
453 | if ($ENV{PCLIENT_DEBUG}) { |
404 | glPushMatrix; |
454 | glPushMatrix; |
405 | glColor 1, 1, 0, 1; |
455 | glColor 1, 1, 0, 1; |
406 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
456 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
407 | glBegin GL_LINE_LOOP; |
457 | glBegin GL_LINE_LOOP; |
408 | glVertex 0 , 0; |
458 | glVertex 0 , 0; |
409 | glVertex $self->{w}, 0; |
459 | glVertex $self->{w} - 1, 0; |
410 | glVertex $self->{w}, $self->{h}; |
460 | glVertex $self->{w} - 1, $self->{h} - 1; |
411 | glVertex 0 , $self->{h}; |
461 | glVertex 0 , $self->{h} - 1; |
412 | glEnd; |
462 | glEnd; |
413 | glPopMatrix; |
463 | glPopMatrix; |
414 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
464 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
415 | } |
465 | } |
416 | } |
466 | } |
… | |
… | |
436 | sub set_parent { |
486 | sub set_parent { |
437 | my ($self, $parent) = @_; |
487 | my ($self, $parent) = @_; |
438 | |
488 | |
439 | Scalar::Util::weaken ($self->{parent} = $parent); |
489 | Scalar::Util::weaken ($self->{parent} = $parent); |
440 | |
490 | |
|
|
491 | $self->{root} = $parent->{root}; |
|
|
492 | $self->{visible} = $parent->{visible} + 1; |
|
|
493 | |
441 | # TODO: req_w _does_change after ->reconfigure |
494 | # TODO: req_w _does_change after ->reconfigure |
442 | $self->check_size |
495 | $self->check_size |
443 | unless exists $self->{req_w}; |
496 | unless exists $self->{req_w}; |
444 | |
497 | |
445 | $self->show; |
498 | $self->show; |
… | |
… | |
463 | my ($self, $signal, $cb) = @_; |
516 | my ($self, $signal, $cb) = @_; |
464 | |
517 | |
465 | push @{ $self->{signal_cb}{$signal} }, $cb; |
518 | push @{ $self->{signal_cb}{$signal} }, $cb; |
466 | } |
519 | } |
467 | |
520 | |
|
|
521 | sub _emit { |
|
|
522 | my ($self, $signal, @args) = @_; |
|
|
523 | |
|
|
524 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
|
|
525 | } |
|
|
526 | |
468 | sub emit { |
527 | sub emit { |
469 | my ($self, $signal, @args) = @_; |
528 | my ($self, $signal, @args) = @_; |
470 | |
529 | |
471 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
530 | $self->_emit ($signal, @args) |
|
|
531 | || $self->$signal (@args); |
472 | } |
532 | } |
473 | |
533 | |
474 | sub DESTROY { |
534 | sub DESTROY { |
475 | my ($self) = @_; |
535 | my ($self) = @_; |
476 | |
536 | |
… | |
… | |
589 | delete $child->{parent}; |
649 | delete $child->{parent}; |
590 | $child->hide; |
650 | $child->hide; |
591 | |
651 | |
592 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
652 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
593 | |
653 | |
594 | $self->check_size; |
654 | $self->check_size (1); |
595 | $self->update; |
655 | $self->update; |
596 | } |
656 | } |
597 | |
657 | |
598 | sub clear { |
658 | sub clear { |
599 | my ($self) = @_; |
659 | my ($self) = @_; |
… | |
… | |
739 | |
799 | |
740 | package CFClient::UI::ViewPort; |
800 | package CFClient::UI::ViewPort; |
741 | |
801 | |
742 | our @ISA = CFClient::UI::Window::; |
802 | our @ISA = CFClient::UI::Window::; |
743 | |
803 | |
|
|
804 | sub new { |
|
|
805 | my $class = shift; |
|
|
806 | |
|
|
807 | $class->SUPER::new ( |
|
|
808 | scroll_x => 0, |
|
|
809 | scroll_y => 1, |
|
|
810 | @_, |
|
|
811 | ) |
|
|
812 | } |
|
|
813 | |
744 | sub size_request { |
814 | sub size_request { |
745 | my ($self) = @_; |
815 | my ($self) = @_; |
746 | |
816 | |
747 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
817 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
748 | |
818 | |
… | |
… | |
750 | } |
820 | } |
751 | |
821 | |
752 | sub size_allocate { |
822 | sub size_allocate { |
753 | my ($self, $w, $h) = @_; |
823 | my ($self, $w, $h) = @_; |
754 | |
824 | |
755 | my ($cw, $ch) = @$self{qw(child_w child_h)}; |
825 | $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; |
756 | # $w = $self->{w}; |
826 | $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; |
|
|
827 | |
757 | $self->child->configure (0, 0, $cw, $ch); |
828 | $self->child->configure (0, 0, $w, $h); |
758 | $self->update; |
829 | $self->update; |
759 | } |
830 | } |
760 | |
831 | |
761 | sub set_offset { |
832 | sub set_offset { |
762 | my ($self, $x, $y) = @_; |
833 | my ($self, $x, $y) = @_; |
… | |
… | |
813 | my $class = shift; |
884 | my $class = shift; |
814 | |
885 | |
815 | my $self; |
886 | my $self; |
816 | |
887 | |
817 | my $slider = new CFClient::UI::Slider |
888 | my $slider = new CFClient::UI::Slider |
818 | vertical => 1, |
889 | vertical => 1, |
819 | range => [0, 0, 1, 0.01], # HACK fix |
890 | range => [0, 0, 1, 0.01], # HACK fix |
820 | connect_changed => sub { |
891 | on_changed => sub { |
821 | $self->{vp}->set_offset (0, $_[1]); |
892 | $self->{vp}->set_offset (0, $_[1]); |
822 | }, |
893 | }, |
823 | ; |
894 | ; |
824 | |
895 | |
825 | $self = $class->SUPER::new ( |
896 | $self = $class->SUPER::new ( |
… | |
… | |
831 | $self->{vp}->add ($self->{scrolled}); |
902 | $self->{vp}->add ($self->{scrolled}); |
832 | $self->add ($self->{vp}); |
903 | $self->add ($self->{vp}); |
833 | $self->add ($self->{slider}); |
904 | $self->add ($self->{slider}); |
834 | |
905 | |
835 | $self |
906 | $self |
|
|
907 | } |
|
|
908 | |
|
|
909 | sub update { |
|
|
910 | my ($self) = @_; |
|
|
911 | |
|
|
912 | $self->SUPER::update; |
|
|
913 | |
|
|
914 | # todo: overwrite size_allocate of child |
|
|
915 | my $child = $self->{vp}->child; |
|
|
916 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
836 | } |
917 | } |
837 | |
918 | |
838 | sub size_allocate { |
919 | sub size_allocate { |
839 | my ($self, $w, $h) = @_; |
920 | my ($self, $w, $h) = @_; |
840 | |
921 | |
… | |
… | |
903 | my $class = shift; |
984 | my $class = shift; |
904 | |
985 | |
905 | # TODO: user_x, user_y, overwrite moveto? |
986 | # TODO: user_x, user_y, overwrite moveto? |
906 | |
987 | |
907 | my $self = $class->SUPER::new ( |
988 | my $self = $class->SUPER::new ( |
908 | bg => [1, 1, 1, 1], |
989 | bg => [1, 1, 1, 1], |
909 | border_bg => [1, 1, 1, 1], |
990 | border_bg => [1, 1, 1, 1], |
910 | border => 0.6, |
991 | border => 0.6, |
911 | toplevel => 1, |
992 | is_toplevel => 1, |
912 | can_events => 1, |
993 | can_events => 1, |
913 | @_ |
994 | @_ |
914 | ); |
995 | ); |
915 | |
996 | |
916 | $self->{title} &&= new CFClient::UI::Label |
997 | $self->{title} &&= new CFClient::UI::Label |
917 | align => 0, |
998 | align => 0, |
… | |
… | |
970 | my ($ev, $x, $y) = @_; |
1051 | my ($ev, $x, $y) = @_; |
971 | |
1052 | |
972 | my $dx = $ev->{x} - $ox; |
1053 | my $dx = $ev->{x} - $ox; |
973 | my $dy = $ev->{y} - $oy; |
1054 | my $dy = $ev->{y} - $oy; |
974 | |
1055 | |
|
|
1056 | $self->{user_x} = $wx + $dx * $mx; |
|
|
1057 | $self->{user_y} = $wy + $dy * $my; |
975 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
1058 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
976 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
1059 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
977 | $self->move ($wx + $dx * $mx, $wy + $dy * $my); |
1060 | $self->move ($self->{user_x}, $self->{user_y}); |
978 | $self->check_size; |
1061 | $self->check_size; |
979 | }; |
1062 | }; |
980 | |
1063 | |
981 | } elsif ($lr ^ $td) { |
1064 | } elsif ($lr ^ $td) { |
982 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
1065 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
… | |
… | |
985 | $self->{motion} = sub { |
1068 | $self->{motion} = sub { |
986 | my ($ev, $x, $y) = @_; |
1069 | my ($ev, $x, $y) = @_; |
987 | |
1070 | |
988 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1071 | ($x, $y) = ($ev->{x}, $ev->{y}); |
989 | |
1072 | |
990 | $self->move ($bx + $x - $ox, $by + $y - $oy); |
1073 | $self->{user_x} = $bx + $x - $ox; |
|
|
1074 | $self->{user_y} = $by + $y - $oy; |
|
|
1075 | $self->move ($self->{user_x}, $self->{user_y}); |
991 | $self->update; |
1076 | $self->update; |
992 | }; |
1077 | }; |
993 | } |
1078 | } |
994 | } |
1079 | } |
995 | |
1080 | |
… | |
… | |
1057 | sub new { |
1142 | sub new { |
1058 | my $class = shift; |
1143 | my $class = shift; |
1059 | |
1144 | |
1060 | $class->SUPER::new ( |
1145 | $class->SUPER::new ( |
1061 | col_expand => [], |
1146 | col_expand => [], |
1062 | @_ |
1147 | @_, |
1063 | ) |
1148 | ) |
|
|
1149 | } |
|
|
1150 | |
|
|
1151 | sub children { |
|
|
1152 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1064 | } |
1153 | } |
1065 | |
1154 | |
1066 | sub add { |
1155 | sub add { |
1067 | my ($self, $x, $y, $child) = @_; |
1156 | my ($self, $x, $y, $child) = @_; |
1068 | |
1157 | |
1069 | $child->set_parent ($self); |
1158 | $child->set_parent ($self); |
1070 | $self->{children}[$y][$x] = $child; |
1159 | $self->{children}[$y][$x] = $child; |
1071 | |
1160 | |
1072 | $child->check_size; |
1161 | $self->check_size (1); |
1073 | } |
1162 | } |
1074 | |
1163 | |
1075 | sub children { |
|
|
1076 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
1077 | } |
|
|
1078 | |
|
|
1079 | # TODO: move to container class maybe? send childs a signal on removal? |
1164 | # TODO: move to container class maybe? send children a signal on removal? |
1080 | sub clear { |
1165 | sub clear { |
1081 | my ($self) = @_; |
1166 | my ($self) = @_; |
1082 | |
1167 | |
1083 | my @children = $self->children; |
1168 | my @children = $self->children; |
1084 | delete $self->{children}; |
1169 | delete $self->{children}; |
… | |
… | |
1086 | for (@children) { |
1171 | for (@children) { |
1087 | delete $_->{parent}; |
1172 | delete $_->{parent}; |
1088 | $_->hide; |
1173 | $_->hide; |
1089 | } |
1174 | } |
1090 | |
1175 | |
|
|
1176 | $self->check_size (1); |
1091 | $self->update; |
1177 | $self->update; |
1092 | } |
1178 | } |
1093 | |
1179 | |
1094 | sub get_wh { |
1180 | sub get_wh { |
1095 | my ($self) = @_; |
1181 | my ($self) = @_; |
… | |
… | |
1127 | sub size_allocate { |
1213 | sub size_allocate { |
1128 | my ($self, $w, $h) = @_; |
1214 | my ($self, $w, $h) = @_; |
1129 | |
1215 | |
1130 | my ($ws, $hs) = $self->get_wh; |
1216 | my ($ws, $hs) = $self->get_wh; |
1131 | |
1217 | |
1132 | my $req_w = sum @$ws; |
1218 | my $req_w = (sum @$ws) || 1; |
1133 | my $req_h = sum @$hs; |
1219 | my $req_h = (sum @$hs) || 1; |
1134 | |
1220 | |
1135 | # TODO: nicer code && do row_expand |
1221 | # TODO: nicer code && do row_expand |
1136 | my @col_expand = @{$self->{col_expand}}; |
1222 | my @col_expand = @{$self->{col_expand}}; |
1137 | @col_expand = (1) x @$ws unless @col_expand; |
1223 | @col_expand = (1) x @$ws unless @col_expand; |
1138 | my $col_expand = (sum @col_expand) || 1; |
1224 | my $col_expand = (sum @col_expand) || 1; |
… | |
… | |
1519 | $self->{text} = $text; |
1605 | $self->{text} = $text; |
1520 | |
1606 | |
1521 | $text =~ s/./*/g if $self->{hidden}; |
1607 | $text =~ s/./*/g if $self->{hidden}; |
1522 | $self->{layout}->set_text ("$text "); |
1608 | $self->{layout}->set_text ("$text "); |
1523 | |
1609 | |
1524 | $self->emit (changed => $self->{text}); |
1610 | $self->_emit (changed => $self->{text}); |
1525 | } |
1611 | } |
1526 | |
1612 | |
1527 | sub set_text { |
1613 | sub set_text { |
1528 | my ($self, $text) = @_; |
1614 | my ($self, $text) = @_; |
1529 | |
1615 | |
… | |
… | |
1541 | my ($self) = @_; |
1627 | my ($self) = @_; |
1542 | |
1628 | |
1543 | my ($w, $h) = $self->SUPER::size_request; |
1629 | my ($w, $h) = $self->SUPER::size_request; |
1544 | |
1630 | |
1545 | ($w + 1, $h) # add 1 for cursor |
1631 | ($w + 1, $h) # add 1 for cursor |
1546 | } |
|
|
1547 | |
|
|
1548 | sub size_allocate { |
|
|
1549 | my ($self, $w, $h) = @_; |
|
|
1550 | |
|
|
1551 | $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text |
|
|
1552 | } |
1632 | } |
1553 | |
1633 | |
1554 | sub key_down { |
1634 | sub key_down { |
1555 | my ($self, $ev) = @_; |
1635 | my ($self, $ev) = @_; |
1556 | |
1636 | |
… | |
… | |
1571 | } elsif ($sym == CFClient::SDLK_HOME) { |
1651 | } elsif ($sym == CFClient::SDLK_HOME) { |
1572 | $self->{cursor} = 0; |
1652 | $self->{cursor} = 0; |
1573 | } elsif ($sym == CFClient::SDLK_END) { |
1653 | } elsif ($sym == CFClient::SDLK_END) { |
1574 | $self->{cursor} = length $text; |
1654 | $self->{cursor} = length $text; |
1575 | } elsif ($uni == 27) { |
1655 | } elsif ($uni == 27) { |
1576 | $self->emit ('escape'); |
1656 | $self->_emit ('escape'); |
1577 | } elsif ($uni) { |
1657 | } elsif ($uni) { |
1578 | substr $text, $self->{cursor}++, 0, chr $uni; |
1658 | substr $text, $self->{cursor}++, 0, chr $uni; |
1579 | } |
1659 | } |
1580 | |
1660 | |
1581 | $self->_set_text ($text); |
1661 | $self->_set_text ($text); |
… | |
… | |
1668 | if ($sym == 13) { |
1748 | if ($sym == 13) { |
1669 | unshift @{$self->{history}}, |
1749 | unshift @{$self->{history}}, |
1670 | my $txt = $self->get_text; |
1750 | my $txt = $self->get_text; |
1671 | $self->{history_pointer} = -1; |
1751 | $self->{history_pointer} = -1; |
1672 | $self->{history_saveback} = ''; |
1752 | $self->{history_saveback} = ''; |
1673 | $self->emit (activate => $txt); |
1753 | $self->_emit (activate => $txt); |
1674 | $self->update; |
1754 | $self->update; |
1675 | |
1755 | |
1676 | } elsif ($sym == CFClient::SDLK_UP) { |
1756 | } elsif ($sym == CFClient::SDLK_UP) { |
1677 | if ($self->{history_pointer} < 0) { |
1757 | if ($self->{history_pointer} < 0) { |
1678 | $self->{history_saveback} = $self->get_text; |
1758 | $self->{history_saveback} = $self->get_text; |
… | |
… | |
1726 | can_events => 1, |
1806 | can_events => 1, |
1727 | @_ |
1807 | @_ |
1728 | ) |
1808 | ) |
1729 | } |
1809 | } |
1730 | |
1810 | |
|
|
1811 | sub activate { } |
|
|
1812 | |
1731 | sub button_up { |
1813 | sub button_up { |
1732 | my ($self, $ev, $x, $y) = @_; |
1814 | my ($self, $ev, $x, $y) = @_; |
1733 | |
1815 | |
|
|
1816 | $self->emit ("activate") |
1734 | if ($x >= 0 && $x < $self->{w} |
1817 | if $x >= 0 && $x < $self->{w} |
1735 | && $y >= 0 && $y < $self->{h}) { |
1818 | && $y >= 0 && $y < $self->{h}; |
1736 | $self->emit ("activate"); |
|
|
1737 | } |
|
|
1738 | } |
1819 | } |
1739 | |
1820 | |
1740 | sub _draw { |
1821 | sub _draw { |
1741 | my ($self) = @_; |
1822 | my ($self) = @_; |
1742 | |
1823 | |
… | |
… | |
1794 | my ($self, $ev, $x, $y) = @_; |
1875 | my ($self, $ev, $x, $y) = @_; |
1795 | |
1876 | |
1796 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1877 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1797 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1878 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1798 | $self->{state} = !$self->{state}; |
1879 | $self->{state} = !$self->{state}; |
1799 | $self->emit (changed => $self->{state}); |
1880 | $self->_emit (changed => $self->{state}); |
1800 | } |
1881 | } |
1801 | } |
1882 | } |
1802 | |
1883 | |
1803 | sub _draw { |
1884 | sub _draw { |
1804 | my ($self) = @_; |
1885 | my ($self) = @_; |
… | |
… | |
2097 | } |
2178 | } |
2098 | |
2179 | |
2099 | sub set_range { |
2180 | sub set_range { |
2100 | my ($self, $range) = @_; |
2181 | my ($self, $range) = @_; |
2101 | |
2182 | |
2102 | $self->{range} = $range; |
2183 | ($range, $self->{range}) = ($self->{range}, $range); |
2103 | |
2184 | |
2104 | $self->update; |
2185 | $self->update |
|
|
2186 | if "@$range" ne "@{$self->{range}}"; |
2105 | } |
2187 | } |
2106 | |
2188 | |
2107 | sub set_value { |
2189 | sub set_value { |
2108 | my ($self, $value) = @_; |
2190 | my ($self, $value) = @_; |
2109 | |
2191 | |
… | |
… | |
2120 | if $unit; |
2202 | if $unit; |
2121 | |
2203 | |
2122 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2204 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2123 | |
2205 | |
2124 | if ($value != $old_value) { |
2206 | if ($value != $old_value) { |
2125 | $self->emit (changed => $value); |
2207 | $self->_emit (changed => $value); |
2126 | $self->update; |
2208 | $self->update; |
2127 | } |
2209 | } |
2128 | } |
2210 | } |
2129 | |
2211 | |
2130 | sub size_request { |
2212 | sub size_request { |
… | |
… | |
2492 | |
2574 | |
2493 | sub new { |
2575 | sub new { |
2494 | my $class = shift; |
2576 | my $class = shift; |
2495 | |
2577 | |
2496 | my $self = $class->SUPER::new ( |
2578 | my $self = $class->SUPER::new ( |
2497 | state => 0, |
2579 | state => 0, |
2498 | connect_activate => \&toggle_flopper, |
2580 | on_activate => \&toggle_flopper, |
2499 | @_ |
2581 | @_ |
2500 | ); |
2582 | ); |
2501 | |
2583 | |
2502 | if ($self->{state}) { |
2584 | if ($self->{state}) { |
2503 | $self->{state} = 0; |
2585 | $self->{state} = 0; |
… | |
… | |
2512 | |
2594 | |
2513 | # TODO: use animation |
2595 | # TODO: use animation |
2514 | if ($self->{state} = !$self->{state}) { |
2596 | if ($self->{state} = !$self->{state}) { |
2515 | $CFClient::UI::ROOT->add ($self->{other}); |
2597 | $CFClient::UI::ROOT->add ($self->{other}); |
2516 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2598 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2517 | $self->emit ("open"); |
2599 | $self->_emit ("open"); |
2518 | } else { |
2600 | } else { |
2519 | $CFClient::UI::ROOT->remove ($self->{other}); |
2601 | $CFClient::UI::ROOT->remove ($self->{other}); |
2520 | $self->emit ("close"); |
2602 | $self->_emit ("close"); |
2521 | } |
2603 | } |
2522 | |
2604 | |
2523 | $self->emit (changed => $self->{state}); |
2605 | $self->_emit (changed => $self->{state}); |
2524 | } |
2606 | } |
2525 | |
2607 | |
2526 | ############################################################################# |
2608 | ############################################################################# |
2527 | |
2609 | |
2528 | package CFClient::UI::Tooltip; |
2610 | package CFClient::UI::Tooltip; |
… | |
… | |
2604 | |
2686 | |
2605 | sub new { |
2687 | sub new { |
2606 | my $class = shift; |
2688 | my $class = shift; |
2607 | |
2689 | |
2608 | my $self = $class->SUPER::new ( |
2690 | my $self = $class->SUPER::new ( |
2609 | aspect => 1, |
2691 | aspect => 1, |
|
|
2692 | can_events => 0, |
2610 | @_, |
2693 | @_, |
2611 | ); |
2694 | ); |
2612 | |
2695 | |
2613 | if ($self->{anim} && $self->{animspeed}) { |
2696 | if ($self->{anim} && $self->{animspeed}) { |
2614 | Scalar::Util::weaken (my $widget = $self); |
2697 | Scalar::Util::weaken (my $widget = $self); |
… | |
… | |
2673 | $self->SUPER::DESTROY; |
2756 | $self->SUPER::DESTROY; |
2674 | } |
2757 | } |
2675 | |
2758 | |
2676 | ############################################################################# |
2759 | ############################################################################# |
2677 | |
2760 | |
2678 | package CFClient::UI::InventoryItem; |
2761 | package CFClient::UI::Inventory; |
2679 | |
2762 | |
2680 | our @ISA = CFClient::UI::HBox::; |
2763 | our @ISA = CFClient::UI::ScrolledWindow::; |
2681 | |
|
|
2682 | sub _item_to_desc { |
|
|
2683 | my ($item) = @_; |
|
|
2684 | |
|
|
2685 | my $desc = |
|
|
2686 | $item->{nrof} < 2 |
|
|
2687 | ? $item->{name} |
|
|
2688 | : "$item->{nrof} × $item->{name_pl}"; |
|
|
2689 | |
|
|
2690 | $item->{flags} & Crossfire::Protocol::F_OPEN |
|
|
2691 | and $desc .= " (open)"; |
|
|
2692 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
|
|
2693 | and $desc .= " (applied)"; |
|
|
2694 | $item->{flags} & Crossfire::Protocol::F_UNPAID |
|
|
2695 | and $desc .= " (unpaid)"; |
|
|
2696 | $item->{flags} & Crossfire::Protocol::F_MAGIC |
|
|
2697 | and $desc .= " (magic)"; |
|
|
2698 | $item->{flags} & Crossfire::Protocol::F_CURSED |
|
|
2699 | and $desc .= " (cursed)"; |
|
|
2700 | $item->{flags} & Crossfire::Protocol::F_DAMNED |
|
|
2701 | and $desc .= " (damned)"; |
|
|
2702 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2703 | and $desc .= " *"; |
|
|
2704 | |
|
|
2705 | $desc |
|
|
2706 | } |
|
|
2707 | |
2764 | |
2708 | sub new { |
2765 | sub new { |
2709 | my $class = shift; |
2766 | my $class = shift; |
2710 | |
2767 | |
2711 | my %args = @_; |
|
|
2712 | |
|
|
2713 | my $item = delete $args{item}; |
|
|
2714 | |
|
|
2715 | my $desc = _item_to_desc ($item); |
|
|
2716 | |
|
|
2717 | my $self = $class->SUPER::new ( |
2768 | my $self = $class->SUPER::new ( |
2718 | can_hover => 1, |
|
|
2719 | can_events => 1, |
|
|
2720 | tooltip => ((CFClient::UI::Label::escape $desc) |
|
|
2721 | . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"), |
|
|
2722 | connect_button_down => sub { |
|
|
2723 | my ($self, $ev, $x, $y) = @_; |
|
|
2724 | |
|
|
2725 | # todo: maybe put examine on 1? but should just be a tooltip :( |
|
|
2726 | if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { |
|
|
2727 | my $targ = $::CONN->{player}{tag}; |
|
|
2728 | |
|
|
2729 | if ($item->{container} == $::CONN->{player}{tag}) { |
|
|
2730 | $targ = $main::OPENCONT; |
|
|
2731 | } |
|
|
2732 | |
|
|
2733 | $::CONN->send ("move $targ $item->{tag} 0"); |
|
|
2734 | } elsif ($ev->{button} == 1) { |
|
|
2735 | $::CONN->send ("examine $item->{tag}"); |
|
|
2736 | } elsif ($ev->{button} == 2) { |
|
|
2737 | $::CONN->send ("apply $item->{tag}"); |
|
|
2738 | } elsif ($ev->{button} == 3) { |
|
|
2739 | my @menu_items = ( |
|
|
2740 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
|
|
2741 | ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], |
|
|
2742 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
|
|
2743 | ( |
|
|
2744 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2745 | ? ( |
|
|
2746 | ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }], |
|
|
2747 | ) |
|
|
2748 | : ( |
|
|
2749 | ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }], |
|
|
2750 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
|
|
2751 | ) |
|
|
2752 | ), |
|
|
2753 | ); |
|
|
2754 | |
|
|
2755 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
|
|
2756 | } |
|
|
2757 | |
|
|
2758 | 1 |
|
|
2759 | }, |
|
|
2760 | %args |
|
|
2761 | ); |
|
|
2762 | |
|
|
2763 | |
|
|
2764 | $self->add (new CFClient::UI::Face |
|
|
2765 | can_events => 0, |
|
|
2766 | face => $item->{face}, |
|
|
2767 | anim => $item->{anim}, |
|
|
2768 | animspeed => $item->{animspeed}, |
|
|
2769 | ); |
|
|
2770 | |
|
|
2771 | $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0); |
|
|
2772 | |
|
|
2773 | $self->{item} = $item; |
|
|
2774 | |
|
|
2775 | $self->update_item; |
|
|
2776 | |
|
|
2777 | $self |
|
|
2778 | } |
|
|
2779 | |
|
|
2780 | sub update_item { |
|
|
2781 | my ($self) = @_; |
|
|
2782 | |
|
|
2783 | my $desc = _item_to_desc ($self->{item}); |
|
|
2784 | |
|
|
2785 | $self->{name_lbl}->set_text ($desc); |
|
|
2786 | } |
|
|
2787 | |
|
|
2788 | ############################################################################# |
|
|
2789 | |
|
|
2790 | package CFClient::UI::Inventory; |
|
|
2791 | |
|
|
2792 | our @ISA = CFClient::UI::ScrolledWindow::; |
|
|
2793 | |
|
|
2794 | sub new { |
|
|
2795 | my $class = shift; |
|
|
2796 | |
|
|
2797 | my $self = $class->SUPER::new ( |
|
|
2798 | scrolled => (new CFClient::UI::Table), |
2769 | scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), |
2799 | @_, |
2770 | @_, |
2800 | ); |
2771 | ); |
2801 | |
2772 | |
2802 | $self |
2773 | $self |
2803 | } |
2774 | } |
… | |
… | |
2813 | or ($a->{name} cmp $b->{name}) |
2784 | or ($a->{name} cmp $b->{name}) |
2814 | } @$items; |
2785 | } @$items; |
2815 | |
2786 | |
2816 | $self->{real_items} = \@items; |
2787 | $self->{real_items} = \@items; |
2817 | |
2788 | |
|
|
2789 | my $row = 0; |
2818 | for my $item (@items) { |
2790 | for my $item (@items) { |
2819 | $item->{item} = $item; |
2791 | CFClient::Item::update_widgets $item; |
2820 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
|
|
2821 | $item->update_item (); |
|
|
2822 | } |
|
|
2823 | |
2792 | |
2824 | my $i = 0; |
2793 | $self->{scrolled}->add (0, $row, $item->{face_widget}); |
2825 | for (@items) { |
2794 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2826 | $self->{scrolled}->add (0, $i, $_); |
2795 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2827 | my $nrof = $_->{item}->{nrof} || 1; |
|
|
2828 | $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); |
|
|
2829 | } |
|
|
2830 | |
2796 | |
2831 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2797 | $row++; |
|
|
2798 | } |
2832 | } |
2799 | } |
2833 | |
2800 | |
2834 | sub size_request { |
2801 | sub size_request { |
2835 | my ($self) = @_; |
2802 | my ($self) = @_; |
2836 | ($self->{req_w}, $self->{req_h}); |
2803 | ($self->{req_w}, $self->{req_h}); |
… | |
… | |
2876 | |
2843 | |
2877 | # popup given the event (must be a mouse button down event currently) |
2844 | # popup given the event (must be a mouse button down event currently) |
2878 | sub popup { |
2845 | sub popup { |
2879 | my ($self, $ev) = @_; |
2846 | my ($self, $ev) = @_; |
2880 | |
2847 | |
2881 | $self->emit ("popdown"); |
2848 | $self->_emit ("popdown"); |
2882 | |
2849 | |
2883 | # maybe save $GRAB? must be careful about events... |
2850 | # maybe save $GRAB? must be careful about events... |
2884 | $GRAB = $self; |
2851 | $GRAB = $self; |
2885 | $self->{button} = $ev->{button}; |
2852 | $self->{button} = $ev->{button}; |
2886 | |
2853 | |
… | |
… | |
2901 | |
2868 | |
2902 | if ($ev->{button} == $self->{button}) { |
2869 | if ($ev->{button} == $self->{button}) { |
2903 | undef $GRAB; |
2870 | undef $GRAB; |
2904 | $self->hide; |
2871 | $self->hide; |
2905 | |
2872 | |
2906 | $self->emit ("popdown"); |
2873 | $self->_emit ("popdown"); |
2907 | $self->{hover}[1]->() if $self->{hover}; |
2874 | $self->{hover}[1]->() if $self->{hover}; |
2908 | } |
2875 | } |
2909 | } |
2876 | } |
2910 | |
2877 | |
2911 | ############################################################################# |
2878 | ############################################################################# |
… | |
… | |
2973 | sub add { |
2940 | sub add { |
2974 | my ($self, $text, %arg) = @_; |
2941 | my ($self, $text, %arg) = @_; |
2975 | |
2942 | |
2976 | $text =~ s/^\s+//; |
2943 | $text =~ s/^\s+//; |
2977 | $text =~ s/\s+$//; |
2944 | $text =~ s/\s+$//; |
|
|
2945 | |
|
|
2946 | return unless $text; |
2978 | |
2947 | |
2979 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2948 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2980 | |
2949 | |
2981 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2950 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2982 | |
2951 | |
… | |
… | |
3026 | |
2995 | |
3027 | sub new { |
2996 | sub new { |
3028 | my $class = shift; |
2997 | my $class = shift; |
3029 | |
2998 | |
3030 | $class->SUPER::new ( |
2999 | $class->SUPER::new ( |
|
|
3000 | visible => 1, |
3031 | @_, |
3001 | @_, |
3032 | ) |
3002 | ) |
3033 | } |
3003 | } |
3034 | |
3004 | |
3035 | sub configure { |
3005 | sub configure { |
… | |
… | |
3053 | } |
3023 | } |
3054 | |
3024 | |
3055 | sub size_allocate { |
3025 | sub size_allocate { |
3056 | my ($self, $w, $h) = @_; |
3026 | my ($self, $w, $h) = @_; |
3057 | |
3027 | |
3058 | my $old_w = $self->{old_w}; $self->{old_w} = $w; |
|
|
3059 | my $old_h = $self->{old_h}; $self->{old_h} = $h; |
|
|
3060 | |
|
|
3061 | CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h |
|
|
3062 | if $old_w && $old_h && ($old_w != $w || $old_h != $h); |
|
|
3063 | |
|
|
3064 | for my $child ($self->children) { |
3028 | for my $child ($self->children) { |
3065 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3029 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3066 | |
3030 | |
3067 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3031 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3068 | if exists $child->{req_x}; |
3032 | if exists $child->{req_x}; |
… | |
… | |
3099 | sub add { |
3063 | sub add { |
3100 | my ($self, @children) = @_; |
3064 | my ($self, @children) = @_; |
3101 | |
3065 | |
3102 | for (my @widgets = @children; my $w = pop @widgets; ) { |
3066 | for (my @widgets = @children; my $w = pop @widgets; ) { |
3103 | push @widgets, $w->children; |
3067 | push @widgets, $w->children; |
3104 | $w->{root} = $self; |
3068 | $w->{root} = $self; |
3105 | $w->{visible} = 1; |
3069 | $w->{visible} = $self->{visible} + 1; |
3106 | } |
3070 | } |
3107 | |
3071 | |
3108 | for my $child (@children) { |
3072 | for my $child (@children) { |
3109 | $child->{toplevel} = 1; |
3073 | $child->{is_toplevel} = 1; |
3110 | |
3074 | |
3111 | # integerise window positions |
3075 | # integerise window positions |
3112 | $child->{x} = int $child->{x}; |
3076 | $child->{x} = int $child->{x}; |
3113 | $child->{y} = int $child->{y}; |
3077 | $child->{y} = int $child->{y}; |
3114 | } |
3078 | } |
… | |
… | |
3122 | $self->SUPER::remove (@children); |
3086 | $self->SUPER::remove (@children); |
3123 | |
3087 | |
3124 | while (@children) { |
3088 | while (@children) { |
3125 | my $w = pop @children; |
3089 | my $w = pop @children; |
3126 | push @children, $w->children; |
3090 | push @children, $w->children; |
3127 | delete $w->{visible}; |
3091 | $w->set_invisible; |
3128 | } |
3092 | } |
3129 | } |
3093 | } |
3130 | |
3094 | |
3131 | sub on_refresh { |
3095 | sub on_refresh { |
3132 | my ($self, $id, $cb) = @_; |
3096 | my ($self, $id, $cb) = @_; |
… | |
… | |
3147 | $_->() |
3111 | $_->() |
3148 | for values %{delete $self->{refresh_hook}}; |
3112 | for values %{delete $self->{refresh_hook}}; |
3149 | } |
3113 | } |
3150 | |
3114 | |
3151 | if ($self->{check_size}) { |
3115 | if ($self->{check_size}) { |
3152 | my @queue = ([], []); |
3116 | my @queue; |
3153 | |
3117 | |
3154 | for (;;) { |
3118 | for (;;) { |
3155 | if ($self->{check_size}) { |
3119 | if ($self->{check_size}) { |
3156 | # heuristic: check containers last |
3120 | #TODO use array-of-depth approach |
3157 | push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ |
3121 | |
|
|
3122 | @queue = sort { $a->{visible} <=> $b->{visible} } |
3158 | for values %{delete $self->{check_size}} |
3123 | @queue, values %{delete $self->{check_size}}; |
3159 | } |
3124 | } |
3160 | |
3125 | |
3161 | my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; |
3126 | my $widget = pop @queue || last; |
|
|
3127 | |
|
|
3128 | defined $widget->{visible} or last; # do not resize invisible widgets |
3162 | |
3129 | |
3163 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
3130 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
3164 | ? @$widget{qw(user_w user_h)} |
3131 | ? @$widget{qw(user_w user_h)} |
3165 | : $widget->size_request; |
3132 | : $widget->size_request; |
3166 | |
3133 | |
… | |
… | |
3186 | $w = 0 if $w < 0; |
3153 | $w = 0 if $w < 0; |
3187 | $h = 0 if $h < 0; |
3154 | $h = 0 if $h < 0; |
3188 | |
3155 | |
3189 | $widget->{w} = $w; |
3156 | $widget->{w} = $w; |
3190 | $widget->{h} = $h; |
3157 | $widget->{h} = $h; |
3191 | $widget->size_allocate ($w, $h); |
|
|
3192 | $widget->emit (size_allocate => $w, $h); |
3158 | $widget->emit (size_allocate => $w, $h); |
3193 | } |
3159 | } |
3194 | } |
3160 | } |
3195 | |
3161 | |
3196 | while ($self->{post_alloc_hook}) { |
3162 | while ($self->{post_alloc_hook}) { |