… | |
… | |
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}; |
|
|
162 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
180 | $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}; |
181 | $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}; |
182 | $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}; |
|
|
166 | } |
183 | } |
167 | |
|
|
168 | $widget->reconfigure; |
|
|
169 | } |
184 | } |
|
|
185 | |
|
|
186 | reconfigure_widgets; |
170 | } |
187 | } |
171 | |
188 | |
172 | ############################################################################# |
189 | ############################################################################# |
173 | |
190 | |
174 | package CFClient::UI::Base; |
191 | package CFClient::UI::Base; |
… | |
… | |
187 | can_events => 1, |
204 | can_events => 1, |
188 | @_ |
205 | @_ |
189 | }, $class; |
206 | }, $class; |
190 | |
207 | |
191 | for (keys %$self) { |
208 | for (keys %$self) { |
192 | if (/^connect_(.*)$/) { |
209 | if (/^on_(.*)$/) { |
193 | $self->connect ($1 => delete $self->{$_}); |
210 | $self->connect ($1 => delete $self->{$_}); |
194 | } |
211 | } |
195 | } |
212 | } |
196 | |
213 | |
197 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
214 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
198 | |
215 | |
|
|
216 | if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { |
|
|
217 | $self->{req_x} = $layout->{x} * $::WIDTH; |
|
|
218 | $self->{req_y} = $layout->{y} * $::HEIGHT; |
|
|
219 | $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; |
|
|
220 | $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; |
|
|
221 | } |
|
|
222 | |
199 | $self |
223 | $self |
|
|
224 | } |
|
|
225 | |
|
|
226 | sub toggle_visibility { |
|
|
227 | my ($self) = @_; |
|
|
228 | |
|
|
229 | if ($self->{visible}) { |
|
|
230 | $self->hide; |
|
|
231 | } else { |
|
|
232 | $self->show; |
|
|
233 | } |
200 | } |
234 | } |
201 | |
235 | |
202 | sub destroy { |
236 | sub destroy { |
203 | my ($self) = @_; |
237 | my ($self) = @_; |
204 | |
238 | |
… | |
… | |
224 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
258 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
225 | }, |
259 | }, |
226 | ); |
260 | ); |
227 | } |
261 | } |
228 | |
262 | |
229 | sub hide { |
263 | sub set_visible { |
230 | my ($self) = @_; |
264 | my ($self) = @_; |
|
|
265 | |
|
|
266 | return if $self->{visible}; |
|
|
267 | |
|
|
268 | $self->{root} = $self->{parent}{root}; |
|
|
269 | $self->{visible} = $self->{parent}{visible} + 1; |
|
|
270 | |
|
|
271 | $self->emit (visibility_change => 1) |
|
|
272 | } |
|
|
273 | |
|
|
274 | sub set_invisible { |
|
|
275 | my ($self) = @_; |
|
|
276 | |
|
|
277 | return unless $self->{visible}; |
|
|
278 | |
|
|
279 | # broken show/hide model |
|
|
280 | |
|
|
281 | delete $self->{root}; |
|
|
282 | delete $self->{visible}; |
231 | |
283 | |
232 | undef $GRAB if $GRAB == $self; |
284 | undef $GRAB if $GRAB == $self; |
233 | undef $HOVER if $HOVER == $self; |
285 | undef $HOVER if $HOVER == $self; |
|
|
286 | |
|
|
287 | CFClient::UI::check_tooltip |
|
|
288 | if $CFClient::UI::TOOLTIP->{owner} == $self; |
|
|
289 | |
|
|
290 | $self->focus_out; |
|
|
291 | |
|
|
292 | $self->emit (visibility_change => 0); |
|
|
293 | } |
|
|
294 | |
|
|
295 | sub hide { |
|
|
296 | my ($self) = @_; |
|
|
297 | |
|
|
298 | $self->set_invisible; |
234 | |
299 | |
235 | $self->{parent}->remove ($self) |
300 | $self->{parent}->remove ($self) |
236 | if $self->{parent}; |
301 | if $self->{parent}; |
237 | } |
302 | } |
238 | |
303 | |
… | |
… | |
247 | } |
312 | } |
248 | |
313 | |
249 | sub set_size { |
314 | sub set_size { |
250 | my ($self, $w, $h) = @_; |
315 | my ($self, $w, $h) = @_; |
251 | |
316 | |
252 | $self->{user_w} = $w; |
317 | $self->{def_w} = $w; |
253 | $self->{user_h} = $h; |
318 | $self->{def_h} = $h; |
254 | |
319 | |
255 | $self->check_size; |
320 | $self->check_size; |
256 | } |
321 | } |
257 | |
322 | |
258 | sub size_request { |
323 | sub size_request { |
… | |
… | |
308 | } |
373 | } |
309 | |
374 | |
310 | sub set_tooltip { |
375 | sub set_tooltip { |
311 | my ($self, $tooltip) = @_; |
376 | my ($self, $tooltip) = @_; |
312 | |
377 | |
|
|
378 | $tooltip =~ s/^\s+//; |
|
|
379 | $tooltip =~ s/\s+$//; |
|
|
380 | |
|
|
381 | return if $self->{tooltip} eq $tooltip; |
|
|
382 | |
313 | $self->{tooltip} = $tooltip; |
383 | $self->{tooltip} = $tooltip; |
314 | |
384 | |
315 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
385 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
316 | delete $CFClient::UI::TOOLTIP->{owner}; |
386 | delete $CFClient::UI::TOOLTIP->{owner}; |
317 | CFClient::UI::check_tooltip; |
387 | CFClient::UI::check_tooltip; |
… | |
… | |
338 | return if $FOCUS == $self; |
408 | return if $FOCUS == $self; |
339 | return unless $self->{can_focus}; |
409 | return unless $self->{can_focus}; |
340 | |
410 | |
341 | my $focus = $FOCUS; $FOCUS = $self; |
411 | my $focus = $FOCUS; $FOCUS = $self; |
342 | |
412 | |
343 | $self->emit (focus_in => $focus); |
413 | $self->_emit (focus_in => $focus); |
344 | |
414 | |
345 | $focus->update if $focus; |
415 | $focus->update if $focus; |
346 | $FOCUS->update; |
416 | $FOCUS->update; |
347 | } |
417 | } |
348 | |
418 | |
… | |
… | |
351 | |
421 | |
352 | return unless $FOCUS == $self; |
422 | return unless $FOCUS == $self; |
353 | |
423 | |
354 | my $focus = $FOCUS; undef $FOCUS; |
424 | my $focus = $FOCUS; undef $FOCUS; |
355 | |
425 | |
356 | $self->emit (focus_out => $focus); |
426 | $self->_emit (focus_out => $focus); |
357 | |
427 | |
358 | $focus->update if $focus; #? |
428 | $focus->update if $focus; #? |
|
|
429 | |
|
|
430 | $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus |
|
|
431 | unless $FOCUS; |
359 | } |
432 | } |
360 | |
433 | |
361 | sub mouse_motion { } |
434 | sub mouse_motion { } |
362 | sub button_up { } |
435 | sub button_up { } |
363 | sub key_down { } |
436 | sub key_down { } |
364 | sub key_up { } |
437 | sub key_up { } |
365 | |
438 | |
366 | sub button_down { |
439 | sub button_down { |
367 | my ($self, $ev, $x, $y) = @_; |
440 | my ($self, $ev, $x, $y) = @_; |
368 | |
441 | |
369 | $self->focus_in; |
442 | $self->focus_in; |
… | |
… | |
403 | if ($ENV{PCLIENT_DEBUG}) { |
476 | if ($ENV{PCLIENT_DEBUG}) { |
404 | glPushMatrix; |
477 | glPushMatrix; |
405 | glColor 1, 1, 0, 1; |
478 | glColor 1, 1, 0, 1; |
406 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
479 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
407 | glBegin GL_LINE_LOOP; |
480 | glBegin GL_LINE_LOOP; |
408 | glVertex 0 , 0; |
481 | glVertex 0 , 0; |
409 | glVertex $self->{w}, 0; |
482 | glVertex $self->{w} - 1, 0; |
410 | glVertex $self->{w}, $self->{h}; |
483 | glVertex $self->{w} - 1, $self->{h} - 1; |
411 | glVertex 0 , $self->{h}; |
484 | glVertex 0 , $self->{h} - 1; |
412 | glEnd; |
485 | glEnd; |
413 | glPopMatrix; |
486 | glPopMatrix; |
414 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
487 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
415 | } |
488 | } |
416 | } |
489 | } |
… | |
… | |
436 | sub set_parent { |
509 | sub set_parent { |
437 | my ($self, $parent) = @_; |
510 | my ($self, $parent) = @_; |
438 | |
511 | |
439 | Scalar::Util::weaken ($self->{parent} = $parent); |
512 | Scalar::Util::weaken ($self->{parent} = $parent); |
440 | |
513 | |
441 | # TODO: req_w _does_change after ->reconfigure |
514 | $self->set_visible; |
|
|
515 | |
442 | $self->check_size |
516 | $self->check_size; |
443 | unless exists $self->{req_w}; |
|
|
444 | |
|
|
445 | $self->show; |
517 | $self->show; |
446 | } |
518 | } |
447 | |
519 | |
448 | sub check_size { |
520 | sub check_size { |
449 | my ($self, $forced) = @_; |
521 | my ($self, $forced) = @_; |
… | |
… | |
463 | my ($self, $signal, $cb) = @_; |
535 | my ($self, $signal, $cb) = @_; |
464 | |
536 | |
465 | push @{ $self->{signal_cb}{$signal} }, $cb; |
537 | push @{ $self->{signal_cb}{$signal} }, $cb; |
466 | } |
538 | } |
467 | |
539 | |
|
|
540 | sub _emit { |
|
|
541 | my ($self, $signal, @args) = @_; |
|
|
542 | |
|
|
543 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
|
|
544 | } |
|
|
545 | |
468 | sub emit { |
546 | sub emit { |
469 | my ($self, $signal, @args) = @_; |
547 | my ($self, $signal, @args) = @_; |
470 | |
548 | |
471 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
549 | $self->_emit ($signal, @args) |
|
|
550 | || $self->$signal (@args); |
|
|
551 | } |
|
|
552 | |
|
|
553 | sub visibility_change { |
|
|
554 | #my ($self, $visible) = @_; |
472 | } |
555 | } |
473 | |
556 | |
474 | sub DESTROY { |
557 | sub DESTROY { |
475 | my ($self) = @_; |
558 | my ($self) = @_; |
476 | |
559 | |
… | |
… | |
589 | delete $child->{parent}; |
672 | delete $child->{parent}; |
590 | $child->hide; |
673 | $child->hide; |
591 | |
674 | |
592 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
675 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
593 | |
676 | |
594 | $self->check_size; |
677 | $self->check_size (1); |
595 | $self->update; |
678 | $self->update; |
596 | } |
679 | } |
597 | |
680 | |
598 | sub clear { |
681 | sub clear { |
599 | my ($self) = @_; |
682 | my ($self) = @_; |
… | |
… | |
739 | |
822 | |
740 | package CFClient::UI::ViewPort; |
823 | package CFClient::UI::ViewPort; |
741 | |
824 | |
742 | our @ISA = CFClient::UI::Window::; |
825 | our @ISA = CFClient::UI::Window::; |
743 | |
826 | |
|
|
827 | sub new { |
|
|
828 | my $class = shift; |
|
|
829 | |
|
|
830 | $class->SUPER::new ( |
|
|
831 | scroll_x => 0, |
|
|
832 | scroll_y => 1, |
|
|
833 | @_, |
|
|
834 | ) |
|
|
835 | } |
|
|
836 | |
744 | sub size_request { |
837 | sub size_request { |
745 | my ($self) = @_; |
838 | my ($self) = @_; |
746 | |
839 | |
747 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
840 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
748 | |
841 | |
… | |
… | |
750 | } |
843 | } |
751 | |
844 | |
752 | sub size_allocate { |
845 | sub size_allocate { |
753 | my ($self, $w, $h) = @_; |
846 | my ($self, $w, $h) = @_; |
754 | |
847 | |
755 | my ($cw, $ch) = @$self{qw(child_w child_h)}; |
848 | $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; |
756 | # $w = $self->{w}; |
849 | $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; |
|
|
850 | |
757 | $self->child->configure (0, 0, $cw, $ch); |
851 | $self->child->configure (0, 0, $w, $h); |
758 | $self->update; |
852 | $self->update; |
759 | } |
853 | } |
760 | |
854 | |
761 | sub set_offset { |
855 | sub set_offset { |
762 | my ($self, $x, $y) = @_; |
856 | my ($self, $x, $y) = @_; |
… | |
… | |
813 | my $class = shift; |
907 | my $class = shift; |
814 | |
908 | |
815 | my $self; |
909 | my $self; |
816 | |
910 | |
817 | my $slider = new CFClient::UI::Slider |
911 | my $slider = new CFClient::UI::Slider |
818 | vertical => 1, |
912 | vertical => 1, |
819 | range => [0, 0, 1, 0.01], # HACK fix |
913 | range => [0, 0, 1, 0.01], # HACK fix |
820 | connect_changed => sub { |
914 | on_changed => sub { |
821 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
915 | $self->{vp}->set_offset (0, $_[1]); |
822 | }, |
916 | }, |
823 | ; |
917 | ; |
824 | |
918 | |
825 | $self = $class->SUPER::new ( |
919 | $self = $class->SUPER::new ( |
826 | vp => (new CFClient::UI::ViewPort expand => 1), |
920 | vp => (new CFClient::UI::ViewPort expand => 1), |
… | |
… | |
831 | $self->{vp}->add ($self->{scrolled}); |
925 | $self->{vp}->add ($self->{scrolled}); |
832 | $self->add ($self->{vp}); |
926 | $self->add ($self->{vp}); |
833 | $self->add ($self->{slider}); |
927 | $self->add ($self->{slider}); |
834 | |
928 | |
835 | $self |
929 | $self |
|
|
930 | } |
|
|
931 | |
|
|
932 | sub update { |
|
|
933 | my ($self) = @_; |
|
|
934 | |
|
|
935 | $self->SUPER::update; |
|
|
936 | |
|
|
937 | # todo: overwrite size_allocate of child |
|
|
938 | my $child = $self->{vp}->child; |
|
|
939 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
|
|
940 | } |
|
|
941 | |
|
|
942 | sub size_allocate { |
|
|
943 | my ($self, $w, $h) = @_; |
|
|
944 | |
|
|
945 | $self->SUPER::size_allocate ($w, $h); |
|
|
946 | |
|
|
947 | my $child = $self->{vp}->child; |
|
|
948 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
836 | } |
949 | } |
837 | |
950 | |
838 | #TODO# update range on size_allocate depending on child |
951 | #TODO# update range on size_allocate depending on child |
839 | # update viewport offset on scroll |
952 | # update viewport offset on scroll |
840 | |
953 | |
… | |
… | |
891 | qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1004 | qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
892 | |
1005 | |
893 | sub new { |
1006 | sub new { |
894 | my $class = shift; |
1007 | my $class = shift; |
895 | |
1008 | |
896 | # TODO: user_x, user_y, overwrite moveto? |
|
|
897 | |
|
|
898 | my $self = $class->SUPER::new ( |
1009 | my $self = $class->SUPER::new ( |
899 | bg => [1, 1, 1, 1], |
1010 | bg => [1, 1, 1, 1], |
900 | border_bg => [1, 1, 1, 1], |
1011 | border_bg => [1, 1, 1, 1], |
901 | border => 0.6, |
1012 | border => 0.6, |
902 | toplevel => 1, |
1013 | is_toplevel => 1, |
903 | can_events => 1, |
1014 | can_events => 1, |
904 | @_ |
1015 | @_ |
905 | ); |
1016 | ); |
906 | |
1017 | |
907 | $self->{title} &&= new CFClient::UI::Label |
1018 | $self->{title} &&= new CFClient::UI::Label |
908 | align => 0, |
1019 | align => 0, |
… | |
… | |
961 | my ($ev, $x, $y) = @_; |
1072 | my ($ev, $x, $y) = @_; |
962 | |
1073 | |
963 | my $dx = $ev->{x} - $ox; |
1074 | my $dx = $ev->{x} - $ox; |
964 | my $dy = $ev->{y} - $oy; |
1075 | my $dy = $ev->{y} - $oy; |
965 | |
1076 | |
|
|
1077 | $self->{user_x} = $wx + $dx * $mx; |
|
|
1078 | $self->{user_y} = $wy + $dy * $my; |
966 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
1079 | $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); |
967 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
1080 | $self->{def_h} = $bh + $dy * ($my ? -1 : 1); |
968 | $self->move ($wx + $dx * $mx, $wy + $dy * $my); |
1081 | $self->move ($self->{user_x}, $self->{user_y}); |
969 | $self->check_size; |
1082 | $self->check_size; |
970 | }; |
1083 | }; |
971 | |
1084 | |
972 | } elsif ($lr ^ $td) { |
1085 | } elsif ($lr ^ $td) { |
973 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
1086 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
… | |
… | |
976 | $self->{motion} = sub { |
1089 | $self->{motion} = sub { |
977 | my ($ev, $x, $y) = @_; |
1090 | my ($ev, $x, $y) = @_; |
978 | |
1091 | |
979 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1092 | ($x, $y) = ($ev->{x}, $ev->{y}); |
980 | |
1093 | |
981 | $self->move ($bx + $x - $ox, $by + $y - $oy); |
1094 | $self->{user_x} = $bx + $x - $ox; |
|
|
1095 | $self->{user_y} = $by + $y - $oy; |
|
|
1096 | |
|
|
1097 | $self->move ($self->{user_x}, $self->{user_y}); |
982 | $self->update; |
1098 | $self->update; |
983 | }; |
1099 | }; |
984 | } |
1100 | } |
985 | } |
1101 | } |
986 | |
1102 | |
… | |
… | |
1048 | sub new { |
1164 | sub new { |
1049 | my $class = shift; |
1165 | my $class = shift; |
1050 | |
1166 | |
1051 | $class->SUPER::new ( |
1167 | $class->SUPER::new ( |
1052 | col_expand => [], |
1168 | col_expand => [], |
1053 | @_ |
1169 | @_, |
1054 | ) |
1170 | ) |
|
|
1171 | } |
|
|
1172 | |
|
|
1173 | sub children { |
|
|
1174 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1055 | } |
1175 | } |
1056 | |
1176 | |
1057 | sub add { |
1177 | sub add { |
1058 | my ($self, $x, $y, $child) = @_; |
1178 | my ($self, $x, $y, $child) = @_; |
1059 | |
1179 | |
1060 | $child->set_parent ($self); |
1180 | $child->set_parent ($self); |
1061 | $self->{children}[$y][$x] = $child; |
1181 | $self->{children}[$y][$x] = $child; |
1062 | |
1182 | |
1063 | $child->check_size; |
1183 | $self->check_size (1); |
1064 | } |
1184 | } |
1065 | |
1185 | |
1066 | sub children { |
|
|
1067 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
1068 | } |
|
|
1069 | |
|
|
1070 | # TODO: move to container class maybe? send childs a signal on removal? |
1186 | # TODO: move to container class maybe? send children a signal on removal? |
1071 | sub clear { |
1187 | sub clear { |
1072 | my ($self) = @_; |
1188 | my ($self) = @_; |
1073 | |
1189 | |
1074 | my @children = $self->children; |
1190 | my @children = $self->children; |
1075 | delete $self->{children}; |
1191 | delete $self->{children}; |
… | |
… | |
1077 | for (@children) { |
1193 | for (@children) { |
1078 | delete $_->{parent}; |
1194 | delete $_->{parent}; |
1079 | $_->hide; |
1195 | $_->hide; |
1080 | } |
1196 | } |
1081 | |
1197 | |
|
|
1198 | $self->check_size (1); |
1082 | $self->update; |
1199 | $self->update; |
1083 | } |
1200 | } |
1084 | |
1201 | |
1085 | sub get_wh { |
1202 | sub get_wh { |
1086 | my ($self) = @_; |
1203 | my ($self) = @_; |
… | |
… | |
1118 | sub size_allocate { |
1235 | sub size_allocate { |
1119 | my ($self, $w, $h) = @_; |
1236 | my ($self, $w, $h) = @_; |
1120 | |
1237 | |
1121 | my ($ws, $hs) = $self->get_wh; |
1238 | my ($ws, $hs) = $self->get_wh; |
1122 | |
1239 | |
1123 | my $req_w = sum @$ws; |
1240 | my $req_w = (sum @$ws) || 1; |
1124 | my $req_h = sum @$hs; |
1241 | my $req_h = (sum @$hs) || 1; |
1125 | |
1242 | |
1126 | # TODO: nicer code && do row_expand |
1243 | # TODO: nicer code && do row_expand |
1127 | my @col_expand = @{$self->{col_expand}}; |
1244 | my @col_expand = @{$self->{col_expand}}; |
1128 | @col_expand = (1) x @$ws unless @col_expand; |
1245 | @col_expand = (1) x @$ws unless @col_expand; |
1129 | my $col_expand = (sum @col_expand) || 1; |
1246 | my $col_expand = (sum @col_expand) || 1; |
… | |
… | |
1183 | } |
1300 | } |
1184 | } |
1301 | } |
1185 | |
1302 | |
1186 | ############################################################################# |
1303 | ############################################################################# |
1187 | |
1304 | |
1188 | package CFClient::UI::HBox; |
1305 | package CFClient::UI::Box; |
1189 | |
|
|
1190 | # TODO: wrap into common Box base class |
|
|
1191 | |
1306 | |
1192 | our @ISA = CFClient::UI::Container::; |
1307 | our @ISA = CFClient::UI::Container::; |
1193 | |
1308 | |
1194 | sub size_request { |
1309 | sub size_request { |
1195 | my ($self) = @_; |
1310 | my ($self) = @_; |
1196 | |
1311 | |
1197 | my @alloc = map [$_->size_request], @{$self->{children}}; |
1312 | $self->{vertical} |
1198 | |
1313 | ? ( |
1199 | ( |
1314 | (List::Util::max map $_->{req_w}, @{$self->{children}}), |
1200 | (List::Util::sum map $_->[0], @alloc), |
1315 | (List::Util::sum map $_->{req_h}, @{$self->{children}}), |
1201 | (List::Util::max map $_->[1], @alloc), |
1316 | ) |
1202 | ) |
1317 | : ( |
|
|
1318 | (List::Util::sum map $_->{req_w}, @{$self->{children}}), |
|
|
1319 | (List::Util::max map $_->{req_h}, @{$self->{children}}), |
|
|
1320 | ) |
1203 | } |
1321 | } |
1204 | |
1322 | |
1205 | sub size_allocate { |
1323 | sub size_allocate { |
1206 | my ($self, $w, $h) = @_; |
1324 | my ($self, $w, $h) = @_; |
1207 | |
1325 | |
1208 | ($h, $w) = ($w, $h); |
1326 | my $space = $self->{vertical} ? $h : $w; |
1209 | |
|
|
1210 | my $children = $self->{children}; |
1327 | my $children = $self->{children}; |
1211 | |
1328 | |
1212 | my @h = map $_->{req_w}, @$children; |
1329 | my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; |
1213 | |
|
|
1214 | my $req_h = List::Util::sum @h; |
1330 | my $req = List::Util::sum @req; |
1215 | |
1331 | |
1216 | if ($req_h > $h) { |
1332 | if ($req > $space) { |
1217 | # ah well, not enough space |
1333 | # ah well, not enough space |
1218 | $_ *= $h / $req_h for @h; |
1334 | $_ *= $space / $req for @req; |
1219 | } else { |
1335 | } else { |
1220 | my $exp = List::Util::sum map $_->{expand}, @$children; |
1336 | my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; |
1221 | $exp ||= 1; |
|
|
1222 | |
1337 | |
|
|
1338 | $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand |
1223 | for (0 .. $#$children) { |
1339 | for 0 .. $#$children; |
1224 | my $child = $children->[$_]; |
|
|
1225 | |
|
|
1226 | my $alloc_h = $h[$_]; |
|
|
1227 | $alloc_h += ($h - $req_h) * $child->{expand} / $exp; |
|
|
1228 | $h[$_] = $alloc_h; |
|
|
1229 | } |
|
|
1230 | } |
1340 | } |
1231 | |
1341 | |
1232 | CFClient::UI::harmonize \@h; |
1342 | CFClient::UI::harmonize \@req; |
1233 | |
1343 | |
1234 | my $y = 0; |
1344 | my $pos = 0; |
1235 | for (0 .. $#$children) { |
1345 | for (0 .. $#$children) { |
1236 | my $child = $children->[$_]; |
|
|
1237 | my $h = $h[$_]; |
1346 | my $alloc = $req[$_]; |
1238 | $child->configure ($y, 0, $h, $w); |
1347 | $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); |
1239 | |
1348 | |
1240 | $y += $h; |
1349 | $pos += $alloc; |
1241 | } |
1350 | } |
1242 | |
1351 | |
1243 | 1 |
1352 | 1 |
1244 | } |
1353 | } |
1245 | |
1354 | |
1246 | ############################################################################# |
1355 | ############################################################################# |
1247 | |
1356 | |
|
|
1357 | package CFClient::UI::HBox; |
|
|
1358 | |
|
|
1359 | our @ISA = CFClient::UI::Box::; |
|
|
1360 | |
|
|
1361 | sub new { |
|
|
1362 | my $class = shift; |
|
|
1363 | |
|
|
1364 | $class->SUPER::new ( |
|
|
1365 | vertical => 0, |
|
|
1366 | @_, |
|
|
1367 | ) |
|
|
1368 | } |
|
|
1369 | |
|
|
1370 | ############################################################################# |
|
|
1371 | |
1248 | package CFClient::UI::VBox; |
1372 | package CFClient::UI::VBox; |
1249 | |
1373 | |
1250 | # TODO: wrap into common Box base class |
|
|
1251 | |
|
|
1252 | our @ISA = CFClient::UI::Container::; |
1374 | our @ISA = CFClient::UI::Box::; |
1253 | |
1375 | |
1254 | sub size_request { |
1376 | sub new { |
1255 | my ($self) = @_; |
1377 | my $class = shift; |
1256 | |
1378 | |
1257 | my @alloc = map [$_->size_request], @{$self->{children}}; |
1379 | $class->SUPER::new ( |
1258 | |
1380 | vertical => 1, |
1259 | ( |
1381 | @_, |
1260 | (List::Util::max map $_->[0], @alloc), |
|
|
1261 | (List::Util::sum map $_->[1], @alloc), |
|
|
1262 | ) |
1382 | ) |
1263 | } |
|
|
1264 | |
|
|
1265 | sub size_allocate { |
|
|
1266 | my ($self, $w, $h) = @_; |
|
|
1267 | |
|
|
1268 | Carp::confess "negative size" if $w < 0 || $h < 0;#d# |
|
|
1269 | |
|
|
1270 | my $children = $self->{children}; |
|
|
1271 | |
|
|
1272 | my @h = map $_->{req_h}, @$children; |
|
|
1273 | |
|
|
1274 | my $req_h = List::Util::sum @h; |
|
|
1275 | |
|
|
1276 | if ($req_h > $h) { |
|
|
1277 | # ah well, not enough space |
|
|
1278 | $_ *= $h / $req_h for @h; |
|
|
1279 | } else { |
|
|
1280 | my $exp = List::Util::sum map $_->{expand}, @$children; |
|
|
1281 | $exp ||= 1; |
|
|
1282 | |
|
|
1283 | for (0 .. $#$children) { |
|
|
1284 | my $child = $children->[$_]; |
|
|
1285 | |
|
|
1286 | $h[$_] += ($h - $req_h) * $child->{expand} / $exp; |
|
|
1287 | } |
|
|
1288 | } |
|
|
1289 | |
|
|
1290 | CFClient::UI::harmonize \@h; |
|
|
1291 | |
|
|
1292 | my $y = 0; |
|
|
1293 | for (0 .. $#$children) { |
|
|
1294 | my $child = $children->[$_]; |
|
|
1295 | my $h = $h[$_]; |
|
|
1296 | $child->configure (0, $y, $w, $h); |
|
|
1297 | |
|
|
1298 | $y += $h; |
|
|
1299 | } |
|
|
1300 | |
|
|
1301 | 1 |
|
|
1302 | } |
1383 | } |
1303 | |
1384 | |
1304 | ############################################################################# |
1385 | ############################################################################# |
1305 | |
1386 | |
1306 | package CFClient::UI::Label; |
1387 | package CFClient::UI::Label; |
… | |
… | |
1510 | $self->{text} = $text; |
1591 | $self->{text} = $text; |
1511 | |
1592 | |
1512 | $text =~ s/./*/g if $self->{hidden}; |
1593 | $text =~ s/./*/g if $self->{hidden}; |
1513 | $self->{layout}->set_text ("$text "); |
1594 | $self->{layout}->set_text ("$text "); |
1514 | |
1595 | |
1515 | $self->emit (changed => $self->{text}); |
1596 | $self->_emit (changed => $self->{text}); |
1516 | } |
1597 | } |
1517 | |
1598 | |
1518 | sub set_text { |
1599 | sub set_text { |
1519 | my ($self, $text) = @_; |
1600 | my ($self, $text) = @_; |
1520 | |
1601 | |
… | |
… | |
1532 | my ($self) = @_; |
1613 | my ($self) = @_; |
1533 | |
1614 | |
1534 | my ($w, $h) = $self->SUPER::size_request; |
1615 | my ($w, $h) = $self->SUPER::size_request; |
1535 | |
1616 | |
1536 | ($w + 1, $h) # add 1 for cursor |
1617 | ($w + 1, $h) # add 1 for cursor |
1537 | } |
|
|
1538 | |
|
|
1539 | sub size_allocate { |
|
|
1540 | my ($self, $w, $h) = @_; |
|
|
1541 | |
|
|
1542 | $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text |
|
|
1543 | } |
1618 | } |
1544 | |
1619 | |
1545 | sub key_down { |
1620 | sub key_down { |
1546 | my ($self, $ev) = @_; |
1621 | my ($self, $ev) = @_; |
1547 | |
1622 | |
… | |
… | |
1562 | } elsif ($sym == CFClient::SDLK_HOME) { |
1637 | } elsif ($sym == CFClient::SDLK_HOME) { |
1563 | $self->{cursor} = 0; |
1638 | $self->{cursor} = 0; |
1564 | } elsif ($sym == CFClient::SDLK_END) { |
1639 | } elsif ($sym == CFClient::SDLK_END) { |
1565 | $self->{cursor} = length $text; |
1640 | $self->{cursor} = length $text; |
1566 | } elsif ($uni == 27) { |
1641 | } elsif ($uni == 27) { |
1567 | $self->emit ('escape'); |
1642 | $self->_emit ('escape'); |
1568 | } elsif ($uni) { |
1643 | } elsif ($uni) { |
1569 | substr $text, $self->{cursor}++, 0, chr $uni; |
1644 | substr $text, $self->{cursor}++, 0, chr $uni; |
1570 | } |
1645 | } |
1571 | |
1646 | |
1572 | $self->_set_text ($text); |
1647 | $self->_set_text ($text); |
… | |
… | |
1659 | if ($sym == 13) { |
1734 | if ($sym == 13) { |
1660 | unshift @{$self->{history}}, |
1735 | unshift @{$self->{history}}, |
1661 | my $txt = $self->get_text; |
1736 | my $txt = $self->get_text; |
1662 | $self->{history_pointer} = -1; |
1737 | $self->{history_pointer} = -1; |
1663 | $self->{history_saveback} = ''; |
1738 | $self->{history_saveback} = ''; |
1664 | $self->emit (activate => $txt); |
1739 | $self->_emit (activate => $txt); |
1665 | $self->update; |
1740 | $self->update; |
1666 | |
1741 | |
1667 | } elsif ($sym == CFClient::SDLK_UP) { |
1742 | } elsif ($sym == CFClient::SDLK_UP) { |
1668 | if ($self->{history_pointer} < 0) { |
1743 | if ($self->{history_pointer} < 0) { |
1669 | $self->{history_saveback} = $self->get_text; |
1744 | $self->{history_saveback} = $self->get_text; |
… | |
… | |
1717 | can_events => 1, |
1792 | can_events => 1, |
1718 | @_ |
1793 | @_ |
1719 | ) |
1794 | ) |
1720 | } |
1795 | } |
1721 | |
1796 | |
|
|
1797 | sub activate { } |
|
|
1798 | |
1722 | sub button_up { |
1799 | sub button_up { |
1723 | my ($self, $ev, $x, $y) = @_; |
1800 | my ($self, $ev, $x, $y) = @_; |
1724 | |
1801 | |
|
|
1802 | $self->emit ("activate") |
1725 | if ($x >= 0 && $x < $self->{w} |
1803 | if $x >= 0 && $x < $self->{w} |
1726 | && $y >= 0 && $y < $self->{h}) { |
1804 | && $y >= 0 && $y < $self->{h}; |
1727 | $self->emit ("activate"); |
|
|
1728 | } |
|
|
1729 | } |
1805 | } |
1730 | |
1806 | |
1731 | sub _draw { |
1807 | sub _draw { |
1732 | my ($self) = @_; |
1808 | my ($self) = @_; |
1733 | |
1809 | |
… | |
… | |
1785 | my ($self, $ev, $x, $y) = @_; |
1861 | my ($self, $ev, $x, $y) = @_; |
1786 | |
1862 | |
1787 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1863 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1788 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1864 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1789 | $self->{state} = !$self->{state}; |
1865 | $self->{state} = !$self->{state}; |
1790 | $self->emit (changed => $self->{state}); |
1866 | $self->_emit (changed => $self->{state}); |
1791 | } |
1867 | } |
1792 | } |
1868 | } |
1793 | |
1869 | |
1794 | sub _draw { |
1870 | sub _draw { |
1795 | my ($self) = @_; |
1871 | my ($self) = @_; |
… | |
… | |
2070 | my $self = $class->SUPER::new ( |
2146 | my $self = $class->SUPER::new ( |
2071 | fg => [1, 1, 1], |
2147 | fg => [1, 1, 1], |
2072 | active_fg => [0, 0, 0], |
2148 | active_fg => [0, 0, 0], |
2073 | bg => [0, 0, 0, 0.2], |
2149 | bg => [0, 0, 0, 0.2], |
2074 | active_bg => [1, 1, 1, 0.5], |
2150 | active_bg => [1, 1, 1, 0.5], |
2075 | range => [0, 0, 100, 10], |
2151 | range => [0, 0, 100, 10, 0], |
2076 | req_w => $::WIDTH / 80, |
2152 | req_w => $::WIDTH / 80, |
2077 | req_h => $::WIDTH / 80, |
2153 | req_h => $::WIDTH / 80, |
2078 | vertical => 0, |
2154 | vertical => 0, |
2079 | can_hover => 1, |
2155 | can_hover => 1, |
2080 | inner_pad => 0.02, |
2156 | inner_pad => 0.02, |
… | |
… | |
2088 | } |
2164 | } |
2089 | |
2165 | |
2090 | sub set_range { |
2166 | sub set_range { |
2091 | my ($self, $range) = @_; |
2167 | my ($self, $range) = @_; |
2092 | |
2168 | |
2093 | $self->{range} = $range; |
2169 | ($range, $self->{range}) = ($self->{range}, $range); |
2094 | |
2170 | |
2095 | $self->update; |
2171 | $self->update |
|
|
2172 | if "@$range" ne "@{$self->{range}}"; |
2096 | } |
2173 | } |
2097 | |
2174 | |
2098 | sub set_value { |
2175 | sub set_value { |
2099 | my ($self, $value) = @_; |
2176 | my ($self, $value) = @_; |
2100 | |
2177 | |
2101 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2178 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2102 | |
2179 | |
2103 | $hi = $lo + 1 if $hi <= $lo; |
2180 | $hi = $lo + 1 if $hi <= $lo; |
2104 | |
2181 | |
|
|
2182 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2183 | |
2105 | $value = $lo if $value < $lo; |
2184 | $value = $lo if $value < $lo; |
2106 | $value = $hi if $value > $hi; |
2185 | $value = $hi - $page if $value > $hi - $page; |
2107 | |
2186 | |
2108 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2187 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2109 | if $unit; |
2188 | if $unit; |
2110 | |
2189 | |
2111 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2112 | |
|
|
2113 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2190 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2114 | |
2191 | |
2115 | if ($value != $old_value) { |
2192 | if ($value != $old_value) { |
2116 | $self->emit (changed => $value); |
2193 | $self->_emit (changed => $value); |
2117 | $self->update; |
2194 | $self->update; |
2118 | } |
2195 | } |
2119 | } |
2196 | } |
2120 | |
2197 | |
2121 | sub size_request { |
2198 | sub size_request { |
… | |
… | |
2129 | |
2206 | |
2130 | sub button_down { |
2207 | sub button_down { |
2131 | my ($self, $ev, $x, $y) = @_; |
2208 | my ($self, $ev, $x, $y) = @_; |
2132 | |
2209 | |
2133 | $self->SUPER::button_down ($ev, $x, $y); |
2210 | $self->SUPER::button_down ($ev, $x, $y); |
|
|
2211 | |
|
|
2212 | $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; |
|
|
2213 | |
2134 | $self->mouse_motion ($ev, $x, $y); |
2214 | $self->mouse_motion ($ev, $x, $y); |
2135 | } |
2215 | } |
2136 | |
2216 | |
2137 | sub mouse_motion { |
2217 | sub mouse_motion { |
2138 | my ($self, $ev, $x, $y) = @_; |
2218 | my ($self, $ev, $x, $y) = @_; |
… | |
… | |
2140 | if ($GRAB == $self) { |
2220 | if ($GRAB == $self) { |
2141 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2221 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2142 | |
2222 | |
2143 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2223 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2144 | |
2224 | |
2145 | $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; |
2225 | $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); |
2146 | |
2226 | |
2147 | $self->set_value ($x * ($hi - $lo) + $lo); |
2227 | $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); |
2148 | } |
2228 | } |
2149 | } |
2229 | } |
2150 | |
2230 | |
2151 | sub update { |
2231 | sub update { |
2152 | my ($self) = @_; |
2232 | my ($self) = @_; |
2153 | |
2233 | |
2154 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2234 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2155 | $self->set_value ($self->{range}[0]); |
2235 | $self->set_value ($self->{range}[0]); |
2156 | |
2236 | |
2157 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
2237 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
|
|
2238 | my $range = ($hi - $page - $lo) || 1e-100; |
2158 | |
2239 | |
2159 | my $inner_w = 1 - 2 * $self->{inner_pad}; |
2240 | my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; |
2160 | |
2241 | |
2161 | $self->{scale} = ($inner_w / ($hi - $lo)) || 1; |
2242 | $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; |
|
|
2243 | $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; |
2162 | |
2244 | |
2163 | $page = $self->{scale} * $page || 10 / ($self->{w} || 1); |
2245 | $value = ($value - $lo) / $range; |
2164 | $value = $self->{scale} * ($value - $lo); |
2246 | $value = $value * $self->{scale} + $self->{offset}; |
2165 | |
2247 | |
2166 | $value = $self->{inner_pad} + ($value - $page * 0.5); |
|
|
2167 | |
|
|
2168 | $value = 0 if $value < 0; |
|
|
2169 | $page = 1 - $value if $value + $page > 1; |
|
|
2170 | |
|
|
2171 | $self->{knob_x} = $value; |
2248 | $self->{knob_x} = $value - $knob_w * 0.5; |
2172 | $self->{knob_w} = $page; |
2249 | $self->{knob_w} = $knob_w; |
2173 | }); |
2250 | }); |
2174 | |
2251 | |
2175 | $self->SUPER::update; |
2252 | $self->SUPER::update; |
2176 | } |
2253 | } |
2177 | |
2254 | |
… | |
… | |
2293 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2370 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2294 | |
2371 | |
2295 | $self->reflow; |
2372 | $self->reflow; |
2296 | } |
2373 | } |
2297 | |
2374 | |
2298 | sub text_height { |
2375 | sub text_size { |
2299 | my ($self, $text, $indent) = @_; |
2376 | my ($self, $text, $indent) = @_; |
2300 | |
2377 | |
2301 | my $layout = $self->{layout}; |
2378 | my $layout = $self->{layout}; |
2302 | |
2379 | |
2303 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2380 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2304 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2381 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2305 | $layout->set_markup ($text); |
2382 | $layout->set_markup ($text); |
2306 | |
2383 | |
2307 | ($layout->size)[1] |
2384 | $layout->size |
2308 | } |
2385 | } |
2309 | |
2386 | |
2310 | sub reflow { |
2387 | sub reflow { |
2311 | my ($self) = @_; |
2388 | my ($self) = @_; |
2312 | |
2389 | |
2313 | $self->{need_reflow}++; |
2390 | $self->{need_reflow}++; |
2314 | $self->update; |
2391 | $self->update; |
2315 | } |
2392 | } |
2316 | |
2393 | |
|
|
2394 | sub set_offset { |
|
|
2395 | my ($self, $offset) = @_; |
|
|
2396 | |
|
|
2397 | # todo: base offset on lines or so, not on pixels |
|
|
2398 | $self->{children}[1]->set_value ($offset); |
|
|
2399 | } |
|
|
2400 | |
|
|
2401 | sub clear { |
|
|
2402 | my ($self) = @_; |
|
|
2403 | |
|
|
2404 | $self->{par} = []; |
|
|
2405 | $self->{height} = 0; |
|
|
2406 | $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); |
|
|
2407 | } |
|
|
2408 | |
2317 | sub add_paragraph { |
2409 | sub add_paragraph { |
2318 | my ($self, $color, $text, $indent) = @_; |
2410 | my ($self, $color, $text, $indent) = @_; |
2319 | |
2411 | |
2320 | #TODO: intelligently "reformat" paragraph |
|
|
2321 | |
|
|
2322 | for my $line (split /\n/, $text) { |
2412 | for my $line (split /\n/, $text) { |
2323 | my $height = $self->text_height ($line); |
2413 | my ($w, $h) = $self->text_size ($line); |
2324 | $self->{height} += $height; |
2414 | $self->{height} += $h; |
2325 | push @{$self->{par}}, [$height, $color, $indent, $line]; |
2415 | push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; |
2326 | } |
2416 | } |
2327 | |
2417 | |
2328 | $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; |
2418 | $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); |
2329 | $self->{children}[1]->update; |
|
|
2330 | } |
2419 | } |
2331 | |
2420 | |
2332 | sub update { |
2421 | sub update { |
2333 | my ($self) = @_; |
2422 | my ($self) = @_; |
2334 | |
2423 | |
… | |
… | |
2337 | return unless $self->{h} > 0; |
2426 | return unless $self->{h} > 0; |
2338 | |
2427 | |
2339 | delete $self->{texture}; |
2428 | delete $self->{texture}; |
2340 | |
2429 | |
2341 | $ROOT->on_post_alloc ($self, sub { |
2430 | $ROOT->on_post_alloc ($self, sub { |
|
|
2431 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
|
|
2432 | |
2342 | if (delete $self->{need_reflow}) { |
2433 | if (delete $self->{need_reflow}) { |
2343 | my $height = 0; |
2434 | my $height = 0; |
2344 | |
2435 | |
2345 | $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) |
2436 | my $layout = $self->{layout}; |
|
|
2437 | |
|
|
2438 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2439 | |
2346 | for @{$self->{par}}; |
2440 | for (@{$self->{par}}) { |
|
|
2441 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
|
|
2442 | $layout->set_width ($W - $_->[3]); |
|
|
2443 | $layout->set_markup ($_->[4]); |
|
|
2444 | my ($w, $h) = $layout->size; |
|
|
2445 | $_->[0] = $w + $_->[3]; |
|
|
2446 | $_->[1] = $h; |
|
|
2447 | } |
|
|
2448 | |
|
|
2449 | $height += $_->[1]; |
|
|
2450 | } |
2347 | |
2451 | |
2348 | $self->{height} = $height; |
2452 | $self->{height} = $height; |
2349 | |
2453 | |
2350 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
2454 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
2351 | $self->{children}[1]->update; |
|
|
2352 | |
2455 | |
2353 | delete $self->{texture}; |
2456 | delete $self->{texture}; |
2354 | } |
2457 | } |
2355 | |
2458 | |
2356 | $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { |
2459 | $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { |
2357 | glClearColor 0.5, 0.5, 0.5, 0; |
2460 | glClearColor 0.5, 0.5, 0.5, 0; |
2358 | glClear GL_COLOR_BUFFER_BIT; |
2461 | glClear GL_COLOR_BUFFER_BIT; |
2359 | |
2462 | |
2360 | my $top = int $self->{children}[1]{range}[0]; |
2463 | my $top = int $self->{children}[1]{range}[0]; |
2361 | |
2464 | |
2362 | my $y0 = $top; |
2465 | my $y0 = $top; |
2363 | my $y1 = $top + $self->{h}; |
2466 | my $y1 = $top + $H; |
2364 | |
2467 | |
2365 | my $y = 0; |
2468 | my $y = 0; |
2366 | |
2469 | |
2367 | my $layout = $self->{layout}; |
2470 | my $layout = $self->{layout}; |
2368 | |
2471 | |
2369 | $layout->set_font ($self->{font}) if $self->{font}; |
2472 | $layout->set_font ($self->{font}) if $self->{font}; |
2370 | |
2473 | |
2371 | glEnable GL_BLEND; |
2474 | glEnable GL_BLEND; |
|
|
2475 | #TODO# not correct in windows where rgba is forced off |
2372 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
2476 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
2373 | |
2477 | |
2374 | for my $par (@{$self->{par}}) { |
2478 | for my $par (@{$self->{par}}) { |
2375 | my $h = $par->[0]; |
2479 | my $h = $par->[1]; |
2376 | |
2480 | |
2377 | if ($y0 < $y + $h && $y < $y1) { |
2481 | if ($y0 < $y + $h && $y < $y1) { |
2378 | $layout->set_foreground (@{ $par->[1] }); |
2482 | $layout->set_foreground (@{ $par->[2] }); |
2379 | $layout->set_width ($self->{w} - $par->[2]); |
2483 | $layout->set_width ($W - $par->[3]); |
2380 | $layout->set_markup ($par->[3]); |
2484 | $layout->set_markup ($par->[4]); |
2381 | |
2485 | |
2382 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2486 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2383 | |
2487 | |
2384 | glRasterPos $par->[2], $y - $y0; |
2488 | glRasterPos $par->[3], $y - $y0; |
2385 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2489 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2386 | } |
2490 | } |
2387 | |
2491 | |
2388 | $y += $h; |
2492 | $y += $h; |
2389 | } |
2493 | } |
… | |
… | |
2456 | |
2560 | |
2457 | sub new { |
2561 | sub new { |
2458 | my $class = shift; |
2562 | my $class = shift; |
2459 | |
2563 | |
2460 | my $self = $class->SUPER::new ( |
2564 | my $self = $class->SUPER::new ( |
2461 | state => 0, |
2565 | state => 0, |
2462 | connect_activate => \&toggle_flopper, |
2566 | on_activate => \&toggle_flopper, |
2463 | @_ |
2567 | @_ |
2464 | ); |
2568 | ); |
2465 | |
2569 | |
2466 | if ($self->{state}) { |
|
|
2467 | $self->{state} = 0; |
|
|
2468 | $self->toggle_flopper; |
|
|
2469 | } |
|
|
2470 | |
|
|
2471 | $self |
2570 | $self |
2472 | } |
2571 | } |
2473 | |
2572 | |
2474 | sub toggle_flopper { |
2573 | sub toggle_flopper { |
2475 | my ($self) = @_; |
2574 | my ($self) = @_; |
2476 | |
2575 | |
2477 | # TODO: use animation |
2576 | $self->{other}->toggle_visibility; |
2478 | if ($self->{state} = !$self->{state}) { |
|
|
2479 | $CFClient::UI::ROOT->add ($self->{other}); |
|
|
2480 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
|
|
2481 | $self->emit ("open"); |
|
|
2482 | } else { |
|
|
2483 | $CFClient::UI::ROOT->remove ($self->{other}); |
|
|
2484 | $self->emit ("close"); |
|
|
2485 | } |
|
|
2486 | |
|
|
2487 | $self->emit (changed => $self->{state}); |
|
|
2488 | } |
2577 | } |
2489 | |
2578 | |
2490 | ############################################################################# |
2579 | ############################################################################# |
2491 | |
2580 | |
2492 | package CFClient::UI::Tooltip; |
2581 | package CFClient::UI::Tooltip; |
… | |
… | |
2568 | |
2657 | |
2569 | sub new { |
2658 | sub new { |
2570 | my $class = shift; |
2659 | my $class = shift; |
2571 | |
2660 | |
2572 | my $self = $class->SUPER::new ( |
2661 | my $self = $class->SUPER::new ( |
2573 | aspect => 1, |
2662 | aspect => 1, |
|
|
2663 | can_events => 0, |
2574 | @_, |
2664 | @_, |
2575 | ); |
2665 | ); |
2576 | |
2666 | |
2577 | if ($self->{anim} && $self->{animspeed}) { |
2667 | if ($self->{anim} && $self->{animspeed}) { |
2578 | Scalar::Util::weaken (my $widget = $self); |
2668 | Scalar::Util::weaken (my $widget = $self); |
… | |
… | |
2604 | } |
2694 | } |
2605 | |
2695 | |
2606 | sub _draw { |
2696 | sub _draw { |
2607 | my ($self) = @_; |
2697 | my ($self) = @_; |
2608 | |
2698 | |
2609 | return unless $::CONN;#d# manage and cache textures differently |
2699 | return unless $::CONN; |
2610 | |
2700 | |
2611 | my $face; |
2701 | my $face; |
2612 | |
2702 | |
2613 | if ($self->{frame}) { |
2703 | if ($self->{frame}) { |
2614 | my $anim = $::CONN->{anim}[$self->{anim}]; |
2704 | my $anim = $::CONN->{anim}[$self->{anim}]; |
… | |
… | |
2637 | $self->SUPER::DESTROY; |
2727 | $self->SUPER::DESTROY; |
2638 | } |
2728 | } |
2639 | |
2729 | |
2640 | ############################################################################# |
2730 | ############################################################################# |
2641 | |
2731 | |
2642 | package CFClient::UI::InventoryItem; |
2732 | package CFClient::UI::Inventory; |
2643 | |
2733 | |
2644 | our @ISA = CFClient::UI::HBox::; |
2734 | our @ISA = CFClient::UI::ScrolledWindow::; |
2645 | |
|
|
2646 | sub _item_to_desc { |
|
|
2647 | my ($item) = @_; |
|
|
2648 | |
|
|
2649 | my $desc = |
|
|
2650 | $item->{nrof} < 2 |
|
|
2651 | ? $item->{name} |
|
|
2652 | : "$item->{nrof} × $item->{name_pl}"; |
|
|
2653 | |
|
|
2654 | $item->{flags} & Crossfire::Protocol::F_OPEN |
|
|
2655 | and $desc .= " (open)"; |
|
|
2656 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
|
|
2657 | and $desc .= " (applied)"; |
|
|
2658 | $item->{flags} & Crossfire::Protocol::F_UNPAID |
|
|
2659 | and $desc .= " (unpaid)"; |
|
|
2660 | $item->{flags} & Crossfire::Protocol::F_MAGIC |
|
|
2661 | and $desc .= " (magic)"; |
|
|
2662 | $item->{flags} & Crossfire::Protocol::F_CURSED |
|
|
2663 | and $desc .= " (cursed)"; |
|
|
2664 | $item->{flags} & Crossfire::Protocol::F_DAMNED |
|
|
2665 | and $desc .= " (damned)"; |
|
|
2666 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2667 | and $desc .= " *"; |
|
|
2668 | |
|
|
2669 | $desc |
|
|
2670 | } |
|
|
2671 | |
2735 | |
2672 | sub new { |
2736 | sub new { |
2673 | my $class = shift; |
2737 | my $class = shift; |
2674 | |
2738 | |
2675 | my %args = @_; |
|
|
2676 | |
|
|
2677 | my $item = delete $args{item}; |
|
|
2678 | |
|
|
2679 | my $desc = _item_to_desc ($item); |
|
|
2680 | |
|
|
2681 | my $self = $class->SUPER::new ( |
2739 | my $self = $class->SUPER::new ( |
2682 | can_hover => 1, |
|
|
2683 | can_events => 1, |
|
|
2684 | tooltip => ((CFClient::UI::Label::escape $desc) |
|
|
2685 | . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"), |
|
|
2686 | connect_button_down => sub { |
|
|
2687 | my ($self, $ev, $x, $y) = @_; |
|
|
2688 | |
|
|
2689 | # todo: maybe put examine on 1? but should just be a tooltip :( |
|
|
2690 | if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { |
|
|
2691 | my $targ = $::CONN->{player}{tag}; |
|
|
2692 | |
|
|
2693 | if ($item->{container} == $::CONN->{player}{tag}) { |
|
|
2694 | $targ = $main::OPENCONT; |
|
|
2695 | } |
|
|
2696 | |
|
|
2697 | $::CONN->send ("move $targ $item->{tag} 0"); |
|
|
2698 | } elsif ($ev->{button} == 1) { |
|
|
2699 | $::CONN->send ("examine $item->{tag}"); |
|
|
2700 | } elsif ($ev->{button} == 2) { |
|
|
2701 | $::CONN->send ("apply $item->{tag}"); |
|
|
2702 | } elsif ($ev->{button} == 3) { |
|
|
2703 | my @menu_items = ( |
|
|
2704 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
|
|
2705 | ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], |
|
|
2706 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
|
|
2707 | ( |
|
|
2708 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2709 | ? ( |
|
|
2710 | ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }], |
|
|
2711 | ) |
|
|
2712 | : ( |
|
|
2713 | ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }], |
|
|
2714 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
|
|
2715 | ) |
|
|
2716 | ), |
|
|
2717 | ); |
|
|
2718 | |
|
|
2719 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
|
|
2720 | } |
|
|
2721 | |
|
|
2722 | 1 |
|
|
2723 | }, |
|
|
2724 | %args |
|
|
2725 | ); |
|
|
2726 | |
|
|
2727 | |
|
|
2728 | $self->add (new CFClient::UI::Face |
|
|
2729 | can_events => 0, |
|
|
2730 | face => $item->{face}, |
|
|
2731 | anim => $item->{anim}, |
|
|
2732 | animspeed => $item->{animspeed}, |
|
|
2733 | ); |
|
|
2734 | |
|
|
2735 | $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0); |
|
|
2736 | |
|
|
2737 | $self->{item} = $item; |
|
|
2738 | |
|
|
2739 | $self->update_item; |
|
|
2740 | |
|
|
2741 | $self |
|
|
2742 | } |
|
|
2743 | |
|
|
2744 | sub update_item { |
|
|
2745 | my ($self) = @_; |
|
|
2746 | |
|
|
2747 | my $desc = _item_to_desc ($self->{item}); |
|
|
2748 | |
|
|
2749 | $self->{name_lbl}->set_text ($desc); |
|
|
2750 | } |
|
|
2751 | |
|
|
2752 | ############################################################################# |
|
|
2753 | |
|
|
2754 | package CFClient::UI::Inventory; |
|
|
2755 | |
|
|
2756 | our @ISA = CFClient::UI::ScrolledWindow::; |
|
|
2757 | |
|
|
2758 | sub new { |
|
|
2759 | my $class = shift; |
|
|
2760 | |
|
|
2761 | my $self = $class->SUPER::new ( |
|
|
2762 | scrolled => (new CFClient::UI::Table), |
2740 | scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), |
2763 | @_, |
2741 | @_, |
2764 | ); |
2742 | ); |
2765 | |
2743 | |
2766 | $self |
2744 | $self |
2767 | } |
2745 | } |
… | |
… | |
2777 | or ($a->{name} cmp $b->{name}) |
2755 | or ($a->{name} cmp $b->{name}) |
2778 | } @$items; |
2756 | } @$items; |
2779 | |
2757 | |
2780 | $self->{real_items} = \@items; |
2758 | $self->{real_items} = \@items; |
2781 | |
2759 | |
|
|
2760 | my $row = 0; |
2782 | for my $item (@items) { |
2761 | for my $item (@items) { |
2783 | $item->{item} = $item; |
2762 | CFClient::Item::update_widgets $item; |
2784 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
|
|
2785 | $item->update_item (); |
|
|
2786 | } |
|
|
2787 | |
2763 | |
2788 | my $i = 0; |
2764 | $self->{scrolled}->add (0, $row, $item->{face_widget}); |
2789 | for (@items) { |
2765 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2790 | $self->{scrolled}->add (0, $i, $_); |
2766 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2791 | my $nrof = $_->{item}->{nrof} || 1; |
|
|
2792 | $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); |
|
|
2793 | } |
|
|
2794 | |
2767 | |
2795 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2768 | $row++; |
2796 | } |
2769 | } |
2797 | |
|
|
2798 | sub size_request { |
|
|
2799 | my ($self) = @_; |
|
|
2800 | ($self->{req_w}, $self->{req_h}); |
|
|
2801 | } |
2770 | } |
2802 | |
2771 | |
2803 | ############################################################################# |
2772 | ############################################################################# |
2804 | |
2773 | |
2805 | package CFClient::UI::Menu; |
2774 | package CFClient::UI::Menu; |
… | |
… | |
2840 | |
2809 | |
2841 | # popup given the event (must be a mouse button down event currently) |
2810 | # popup given the event (must be a mouse button down event currently) |
2842 | sub popup { |
2811 | sub popup { |
2843 | my ($self, $ev) = @_; |
2812 | my ($self, $ev) = @_; |
2844 | |
2813 | |
2845 | $self->emit ("popdown"); |
2814 | $self->_emit ("popdown"); |
2846 | |
2815 | |
2847 | # maybe save $GRAB? must be careful about events... |
2816 | # maybe save $GRAB? must be careful about events... |
2848 | $GRAB = $self; |
2817 | $GRAB = $self; |
2849 | $self->{button} = $ev->{button}; |
2818 | $self->{button} = $ev->{button}; |
2850 | |
2819 | |
… | |
… | |
2865 | |
2834 | |
2866 | if ($ev->{button} == $self->{button}) { |
2835 | if ($ev->{button} == $self->{button}) { |
2867 | undef $GRAB; |
2836 | undef $GRAB; |
2868 | $self->hide; |
2837 | $self->hide; |
2869 | |
2838 | |
2870 | $self->emit ("popdown"); |
2839 | $self->_emit ("popdown"); |
2871 | $self->{hover}[1]->() if $self->{hover}; |
2840 | $self->{hover}[1]->() if $self->{hover}; |
2872 | } |
2841 | } |
2873 | } |
2842 | } |
2874 | |
2843 | |
2875 | ############################################################################# |
2844 | ############################################################################# |
… | |
… | |
2937 | sub add { |
2906 | sub add { |
2938 | my ($self, $text, %arg) = @_; |
2907 | my ($self, $text, %arg) = @_; |
2939 | |
2908 | |
2940 | $text =~ s/^\s+//; |
2909 | $text =~ s/^\s+//; |
2941 | $text =~ s/\s+$//; |
2910 | $text =~ s/\s+$//; |
|
|
2911 | |
|
|
2912 | return unless $text; |
2942 | |
2913 | |
2943 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2914 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2944 | |
2915 | |
2945 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2916 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2946 | |
2917 | |
… | |
… | |
2990 | |
2961 | |
2991 | sub new { |
2962 | sub new { |
2992 | my $class = shift; |
2963 | my $class = shift; |
2993 | |
2964 | |
2994 | $class->SUPER::new ( |
2965 | $class->SUPER::new ( |
|
|
2966 | visible => 1, |
2995 | @_, |
2967 | @_, |
2996 | ) |
2968 | ) |
2997 | } |
2969 | } |
2998 | |
2970 | |
2999 | sub configure { |
2971 | sub configure { |
… | |
… | |
3017 | } |
2989 | } |
3018 | |
2990 | |
3019 | sub size_allocate { |
2991 | sub size_allocate { |
3020 | my ($self, $w, $h) = @_; |
2992 | my ($self, $w, $h) = @_; |
3021 | |
2993 | |
3022 | my $old_w = $self->{old_w}; $self->{old_w} = $w; |
|
|
3023 | my $old_h = $self->{old_h}; $self->{old_h} = $h; |
|
|
3024 | |
|
|
3025 | CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h |
|
|
3026 | if $old_w && $old_h && ($old_w != $w || $old_h != $h); |
|
|
3027 | |
|
|
3028 | for my $child ($self->children) { |
2994 | for my $child ($self->children) { |
3029 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
2995 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3030 | |
2996 | |
3031 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
2997 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3032 | if exists $child->{req_x}; |
2998 | if exists $child->{req_x}; |
3033 | |
2999 | |
3034 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
3000 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
3035 | if exists $child->{req_y}; |
3001 | if exists $child->{req_y}; |
3036 | |
3002 | |
|
|
3003 | delete @$child{qw(req_x req_y)}; |
|
|
3004 | |
3037 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
3005 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
3038 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
3006 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
3039 | |
3007 | |
3040 | $child->configure ($X, $Y, $W, $H); |
3008 | $child->configure ($X, $Y, $W, $H); |
3041 | } |
3009 | } |
… | |
… | |
3062 | |
3030 | |
3063 | sub add { |
3031 | sub add { |
3064 | my ($self, @children) = @_; |
3032 | my ($self, @children) = @_; |
3065 | |
3033 | |
3066 | for my $child (@children) { |
3034 | for my $child (@children) { |
3067 | $child->{toplevel} = 1; |
3035 | $child->{is_toplevel} = 1; |
3068 | |
3036 | |
3069 | # integerise window positions |
3037 | # integerise window positions |
3070 | $child->{x} = int $child->{x}; |
3038 | $child->{x} = int $child->{x}; |
3071 | $child->{y} = int $child->{y}; |
3039 | $child->{y} = int $child->{y}; |
3072 | } |
3040 | } |
3073 | |
3041 | |
3074 | $self->SUPER::add (@children); |
3042 | $self->SUPER::add (@children); |
3075 | |
3043 | |
|
|
3044 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3045 | push @widgets, $w->children; |
|
|
3046 | $w->set_visible; |
|
|
3047 | } |
|
|
3048 | |
|
|
3049 | } |
|
|
3050 | |
|
|
3051 | sub remove { |
|
|
3052 | my ($self, @children) = @_; |
|
|
3053 | |
|
|
3054 | $self->SUPER::remove (@children); |
|
|
3055 | |
3076 | while (@children) { |
3056 | while (@children) { |
3077 | my $w = pop @children; |
3057 | my $w = pop @children; |
3078 | push @children, $w->children; |
3058 | push @children, $w->children; |
3079 | $w->{visible} = 1; |
3059 | $w->set_invisible; |
3080 | } |
|
|
3081 | } |
|
|
3082 | |
|
|
3083 | sub remove { |
|
|
3084 | my ($self, @children) = @_; |
|
|
3085 | |
|
|
3086 | $self->SUPER::remove (@children); |
|
|
3087 | |
|
|
3088 | while (@children) { |
|
|
3089 | my $w = pop @children; |
|
|
3090 | push @children, $w->children; |
|
|
3091 | delete $w->{visible}; |
|
|
3092 | } |
3060 | } |
3093 | } |
3061 | } |
3094 | |
3062 | |
3095 | sub on_refresh { |
3063 | sub on_refresh { |
3096 | my ($self, $id, $cb) = @_; |
3064 | my ($self, $id, $cb) = @_; |
… | |
… | |
3111 | $_->() |
3079 | $_->() |
3112 | for values %{delete $self->{refresh_hook}}; |
3080 | for values %{delete $self->{refresh_hook}}; |
3113 | } |
3081 | } |
3114 | |
3082 | |
3115 | if ($self->{check_size}) { |
3083 | if ($self->{check_size}) { |
3116 | my @queue = ([], []); |
3084 | my @queue; |
3117 | |
3085 | |
3118 | for (;;) { |
3086 | for (;;) { |
3119 | if ($self->{check_size}) { |
3087 | if ($self->{check_size}) { |
3120 | # heuristic: check containers last |
3088 | #TODO use array-of-depth approach |
3121 | push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ |
3089 | |
|
|
3090 | @queue = sort { $a->{visible} <=> $b->{visible} } |
3122 | for values %{delete $self->{check_size}} |
3091 | @queue, values %{delete $self->{check_size}}; |
3123 | } |
3092 | } |
3124 | |
3093 | |
3125 | my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; |
3094 | my $widget = pop @queue || last; |
3126 | |
3095 | |
|
|
3096 | defined $widget->{visible} or last; # do not resize invisible widgets |
|
|
3097 | |
3127 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
3098 | my ($w, $h) = $widget->{def_w} && $widget->{def_h} |
3128 | ? @$widget{qw(user_w user_h)} |
3099 | ? @$widget{qw(def_w def_h)} |
3129 | : $widget->size_request; |
3100 | : $widget->size_request; |
3130 | |
3101 | |
3131 | if (delete $widget->{force_alloc} |
3102 | if (delete $widget->{force_alloc} |
3132 | or $w != $widget->{req_w} or $h != $widget->{req_h}) { |
3103 | or $w != $widget->{req_w} or $h != $widget->{req_h}) { |
3133 | Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# |
3104 | Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# |
… | |
… | |
3150 | $w = 0 if $w < 0; |
3121 | $w = 0 if $w < 0; |
3151 | $h = 0 if $h < 0; |
3122 | $h = 0 if $h < 0; |
3152 | |
3123 | |
3153 | $widget->{w} = $w; |
3124 | $widget->{w} = $w; |
3154 | $widget->{h} = $h; |
3125 | $widget->{h} = $h; |
3155 | $widget->size_allocate ($w, $h); |
|
|
3156 | $widget->emit (size_allocate => $w, $h); |
3126 | $widget->emit (size_allocate => $w, $h); |
3157 | } |
3127 | } |
3158 | } |
3128 | } |
3159 | |
3129 | |
3160 | while ($self->{post_alloc_hook}) { |
3130 | while ($self->{post_alloc_hook}) { |