… | |
… | |
50 | delete $TOOLTIP->{owner}; |
50 | delete $TOOLTIP->{owner}; |
51 | } |
51 | } |
52 | |
52 | |
53 | # class methods for events |
53 | # class methods for events |
54 | sub feed_sdl_key_down_event { |
54 | sub feed_sdl_key_down_event { |
55 | $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) |
55 | $FOCUS->emit (key_down => $_[0]) |
56 | if $FOCUS; |
56 | if $FOCUS; |
57 | } |
57 | } |
58 | |
58 | |
59 | sub feed_sdl_key_up_event { |
59 | sub feed_sdl_key_up_event { |
60 | $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) |
60 | $FOCUS->emit (key_up => $_[0]) |
61 | if $FOCUS; |
61 | if $FOCUS; |
62 | } |
62 | } |
63 | |
63 | |
64 | sub feed_sdl_button_down_event { |
64 | sub feed_sdl_button_down_event { |
65 | my ($ev) = @_; |
65 | my ($ev) = @_; |
… | |
… | |
74 | check_tooltip; |
74 | check_tooltip; |
75 | } |
75 | } |
76 | |
76 | |
77 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
77 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
78 | |
78 | |
79 | if ($GRAB) { |
79 | $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) |
80 | ($x, $y) = $GRAB->coord2local ($x, $y); |
80 | if $GRAB; |
81 | $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); |
|
|
82 | } |
|
|
83 | } |
81 | } |
84 | |
82 | |
85 | sub feed_sdl_button_up_event { |
83 | sub feed_sdl_button_up_event { |
86 | my ($ev) = @_; |
84 | my ($ev) = @_; |
87 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
85 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
88 | |
86 | |
89 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
87 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
90 | |
88 | |
91 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
89 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
92 | |
90 | |
93 | if ($GRAB) { |
91 | $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) |
94 | ($x, $y) = $GRAB->coord2local ($x, $y); |
92 | if $GRAB; |
95 | $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y); |
|
|
96 | } |
|
|
97 | |
93 | |
98 | if (!$BUTTON_STATE) { |
94 | if (!$BUTTON_STATE) { |
99 | my $grab = $GRAB; undef $GRAB; |
95 | my $grab = $GRAB; undef $GRAB; |
100 | $grab->update if $grab; |
96 | $grab->update if $grab; |
101 | $GRAB->update if $GRAB; |
97 | $GRAB->update if $GRAB; |
… | |
… | |
117 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
113 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
118 | |
114 | |
119 | check_tooltip; |
115 | check_tooltip; |
120 | } |
116 | } |
121 | |
117 | |
122 | if ($HOVER) { |
|
|
123 | ($x, $y) = $HOVER->coord2local ($x, $y); |
|
|
124 | $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); |
118 | $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) |
125 | } |
119 | if $HOVER; |
126 | } |
120 | } |
127 | |
121 | |
128 | # convert position array to integers |
122 | # convert position array to integers |
129 | sub harmonize { |
123 | sub harmonize { |
130 | my ($vals) = @_; |
124 | my ($vals) = @_; |
… | |
… | |
144 | |
138 | |
145 | $_->update |
139 | $_->update |
146 | for @widgets; |
140 | for @widgets; |
147 | } |
141 | } |
148 | |
142 | |
|
|
143 | sub reconfigure_widgets { |
|
|
144 | # make a copy, otherwise C<for> complains about freed values. |
|
|
145 | my @widgets = values %WIDGET; |
|
|
146 | |
|
|
147 | $_->reconfigure |
|
|
148 | for @widgets; |
|
|
149 | } |
|
|
150 | |
149 | # call when resolution changes etc. |
151 | # call when resolution changes etc. |
150 | sub rescale_widgets { |
152 | sub rescale_widgets { |
151 | my ($sx, $sy) = @_; |
153 | my ($sx, $sy) = @_; |
152 | |
154 | |
153 | # make a copy, otherwise for complains about freed values. |
|
|
154 | my @widgets = values %WIDGET; |
155 | for my $widget (values %WIDGET) { |
155 | |
|
|
156 | for my $widget (@widgets) { |
|
|
157 | if ($widget->{toplevel}) { |
156 | if ($widget->{is_toplevel}) { |
158 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
157 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
159 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
158 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
160 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
159 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
161 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
160 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
162 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
161 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
163 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
162 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
164 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
163 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
165 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
164 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
166 | } |
165 | } |
167 | |
|
|
168 | $widget->reconfigure; |
|
|
169 | } |
166 | } |
|
|
167 | |
|
|
168 | reconfigure_widgets; |
170 | } |
169 | } |
171 | |
170 | |
172 | ############################################################################# |
171 | ############################################################################# |
173 | |
172 | |
174 | package CFClient::UI::Base; |
173 | package CFClient::UI::Base; |
… | |
… | |
224 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
223 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
225 | }, |
224 | }, |
226 | ); |
225 | ); |
227 | } |
226 | } |
228 | |
227 | |
229 | sub hide { |
228 | sub set_invisible { |
230 | my ($self) = @_; |
229 | my ($self) = @_; |
|
|
230 | |
|
|
231 | # broken show/hide model |
|
|
232 | |
|
|
233 | delete $self->{visible}; |
231 | |
234 | |
232 | undef $GRAB if $GRAB == $self; |
235 | undef $GRAB if $GRAB == $self; |
233 | undef $HOVER if $HOVER == $self; |
236 | undef $HOVER if $HOVER == $self; |
|
|
237 | |
|
|
238 | CFClient::UI::check_tooltip |
|
|
239 | if $CFClient::UI::TOOLTIP->{owner} == $self; |
|
|
240 | |
|
|
241 | $self->focus_out; |
|
|
242 | } |
|
|
243 | |
|
|
244 | sub hide { |
|
|
245 | my ($self) = @_; |
|
|
246 | |
|
|
247 | $self->set_invisible; |
234 | |
248 | |
235 | $self->{parent}->remove ($self) |
249 | $self->{parent}->remove ($self) |
236 | if $self->{parent}; |
250 | if $self->{parent}; |
237 | } |
251 | } |
238 | |
252 | |
… | |
… | |
308 | } |
322 | } |
309 | |
323 | |
310 | sub set_tooltip { |
324 | sub set_tooltip { |
311 | my ($self, $tooltip) = @_; |
325 | my ($self, $tooltip) = @_; |
312 | |
326 | |
|
|
327 | $tooltip =~ s/^\s+//; |
|
|
328 | $tooltip =~ s/\s+$//; |
|
|
329 | |
|
|
330 | return if $self->{tooltip} eq $tooltip; |
|
|
331 | |
313 | $self->{tooltip} = $tooltip; |
332 | $self->{tooltip} = $tooltip; |
314 | |
333 | |
315 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
334 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
316 | delete $CFClient::UI::TOOLTIP->{owner}; |
335 | delete $CFClient::UI::TOOLTIP->{owner}; |
317 | CFClient::UI::check_tooltip; |
336 | CFClient::UI::check_tooltip; |
… | |
… | |
338 | return if $FOCUS == $self; |
357 | return if $FOCUS == $self; |
339 | return unless $self->{can_focus}; |
358 | return unless $self->{can_focus}; |
340 | |
359 | |
341 | my $focus = $FOCUS; $FOCUS = $self; |
360 | my $focus = $FOCUS; $FOCUS = $self; |
342 | |
361 | |
343 | $self->emit (focus_in => $focus); |
362 | $self->_emit (focus_in => $focus); |
344 | |
363 | |
345 | $focus->update if $focus; |
364 | $focus->update if $focus; |
346 | $FOCUS->update; |
365 | $FOCUS->update; |
347 | } |
366 | } |
348 | |
367 | |
… | |
… | |
351 | |
370 | |
352 | return unless $FOCUS == $self; |
371 | return unless $FOCUS == $self; |
353 | |
372 | |
354 | my $focus = $FOCUS; undef $FOCUS; |
373 | my $focus = $FOCUS; undef $FOCUS; |
355 | |
374 | |
356 | $self->emit (focus_out => $focus); |
375 | $self->_emit (focus_out => $focus); |
357 | |
376 | |
358 | $focus->update if $focus; #? |
377 | $focus->update if $focus; #? |
|
|
378 | |
|
|
379 | $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus |
|
|
380 | unless $FOCUS; |
359 | } |
381 | } |
360 | |
382 | |
361 | sub mouse_motion { } |
383 | sub mouse_motion { } |
362 | sub button_up { } |
384 | sub button_up { } |
363 | sub key_down { } |
385 | sub key_down { } |
364 | sub key_up { } |
386 | sub key_up { } |
365 | |
387 | |
366 | sub button_down { |
388 | sub button_down { |
367 | my ($self, $ev, $x, $y) = @_; |
389 | my ($self, $ev, $x, $y) = @_; |
368 | |
390 | |
369 | $self->focus_in; |
391 | $self->focus_in; |
… | |
… | |
403 | if ($ENV{PCLIENT_DEBUG}) { |
425 | if ($ENV{PCLIENT_DEBUG}) { |
404 | glPushMatrix; |
426 | glPushMatrix; |
405 | glColor 1, 1, 0, 1; |
427 | glColor 1, 1, 0, 1; |
406 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
428 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
407 | glBegin GL_LINE_LOOP; |
429 | glBegin GL_LINE_LOOP; |
408 | glVertex 0 , 0; |
430 | glVertex 0 , 0; |
409 | glVertex $self->{w}, 0; |
431 | glVertex $self->{w} - 1, 0; |
410 | glVertex $self->{w}, $self->{h}; |
432 | glVertex $self->{w} - 1, $self->{h} - 1; |
411 | glVertex 0 , $self->{h}; |
433 | glVertex 0 , $self->{h} - 1; |
412 | glEnd; |
434 | glEnd; |
413 | glPopMatrix; |
435 | glPopMatrix; |
414 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
436 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
415 | } |
437 | } |
416 | } |
438 | } |
… | |
… | |
463 | my ($self, $signal, $cb) = @_; |
485 | my ($self, $signal, $cb) = @_; |
464 | |
486 | |
465 | push @{ $self->{signal_cb}{$signal} }, $cb; |
487 | push @{ $self->{signal_cb}{$signal} }, $cb; |
466 | } |
488 | } |
467 | |
489 | |
|
|
490 | sub _emit { |
|
|
491 | my ($self, $signal, @args) = @_; |
|
|
492 | |
|
|
493 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
|
|
494 | } |
|
|
495 | |
468 | sub emit { |
496 | sub emit { |
469 | my ($self, $signal, @args) = @_; |
497 | my ($self, $signal, @args) = @_; |
470 | |
498 | |
471 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
499 | $self->_emit ($signal, @args) |
|
|
500 | || $self->$signal (@args); |
472 | } |
501 | } |
473 | |
502 | |
474 | sub DESTROY { |
503 | sub DESTROY { |
475 | my ($self) = @_; |
504 | my ($self) = @_; |
476 | |
505 | |
… | |
… | |
739 | |
768 | |
740 | package CFClient::UI::ViewPort; |
769 | package CFClient::UI::ViewPort; |
741 | |
770 | |
742 | our @ISA = CFClient::UI::Window::; |
771 | our @ISA = CFClient::UI::Window::; |
743 | |
772 | |
|
|
773 | sub new { |
|
|
774 | my $class = shift; |
|
|
775 | |
|
|
776 | $class->SUPER::new ( |
|
|
777 | scroll_x => 0, |
|
|
778 | scroll_y => 1, |
|
|
779 | @_, |
|
|
780 | ) |
|
|
781 | } |
|
|
782 | |
744 | sub size_request { |
783 | sub size_request { |
745 | my ($self) = @_; |
784 | my ($self) = @_; |
746 | |
785 | |
747 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
786 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
748 | |
787 | |
… | |
… | |
750 | } |
789 | } |
751 | |
790 | |
752 | sub size_allocate { |
791 | sub size_allocate { |
753 | my ($self, $w, $h) = @_; |
792 | my ($self, $w, $h) = @_; |
754 | |
793 | |
755 | my ($cw, $ch) = @$self{qw(child_w child_h)}; |
794 | $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; |
756 | # $w = $self->{w}; |
795 | $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; |
|
|
796 | |
757 | $self->child->configure (0, 0, $cw, $ch); |
797 | $self->child->configure (0, 0, $w, $h); |
758 | $self->update; |
798 | $self->update; |
759 | } |
799 | } |
760 | |
800 | |
761 | sub set_offset { |
801 | sub set_offset { |
762 | my ($self, $x, $y) = @_; |
802 | my ($self, $x, $y) = @_; |
… | |
… | |
816 | |
856 | |
817 | my $slider = new CFClient::UI::Slider |
857 | my $slider = new CFClient::UI::Slider |
818 | vertical => 1, |
858 | vertical => 1, |
819 | range => [0, 0, 1, 0.01], # HACK fix |
859 | range => [0, 0, 1, 0.01], # HACK fix |
820 | connect_changed => sub { |
860 | connect_changed => sub { |
821 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
861 | $self->{vp}->set_offset (0, $_[1]); |
822 | }, |
862 | }, |
823 | ; |
863 | ; |
824 | |
864 | |
825 | $self = $class->SUPER::new ( |
865 | $self = $class->SUPER::new ( |
826 | vp => (new CFClient::UI::ViewPort expand => 1), |
866 | vp => (new CFClient::UI::ViewPort expand => 1), |
… | |
… | |
831 | $self->{vp}->add ($self->{scrolled}); |
871 | $self->{vp}->add ($self->{scrolled}); |
832 | $self->add ($self->{vp}); |
872 | $self->add ($self->{vp}); |
833 | $self->add ($self->{slider}); |
873 | $self->add ($self->{slider}); |
834 | |
874 | |
835 | $self |
875 | $self |
|
|
876 | } |
|
|
877 | |
|
|
878 | sub size_allocate { |
|
|
879 | my ($self, $w, $h) = @_; |
|
|
880 | |
|
|
881 | $self->SUPER::size_allocate ($w, $h); |
|
|
882 | |
|
|
883 | my $child = $self->{vp}->child; |
|
|
884 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
836 | } |
885 | } |
837 | |
886 | |
838 | #TODO# update range on size_allocate depending on child |
887 | #TODO# update range on size_allocate depending on child |
839 | # update viewport offset on scroll |
888 | # update viewport offset on scroll |
840 | |
889 | |
… | |
… | |
894 | my $class = shift; |
943 | my $class = shift; |
895 | |
944 | |
896 | # TODO: user_x, user_y, overwrite moveto? |
945 | # TODO: user_x, user_y, overwrite moveto? |
897 | |
946 | |
898 | my $self = $class->SUPER::new ( |
947 | my $self = $class->SUPER::new ( |
899 | bg => [1, 1, 1, 1], |
948 | bg => [1, 1, 1, 1], |
900 | border_bg => [1, 1, 1, 1], |
949 | border_bg => [1, 1, 1, 1], |
901 | border => 0.6, |
950 | border => 0.6, |
902 | toplevel => 1, |
951 | is_toplevel => 1, |
903 | can_events => 1, |
952 | can_events => 1, |
904 | @_ |
953 | @_ |
905 | ); |
954 | ); |
906 | |
955 | |
907 | $self->{title} &&= new CFClient::UI::Label |
956 | $self->{title} &&= new CFClient::UI::Label |
908 | align => 0, |
957 | align => 0, |
… | |
… | |
1048 | sub new { |
1097 | sub new { |
1049 | my $class = shift; |
1098 | my $class = shift; |
1050 | |
1099 | |
1051 | $class->SUPER::new ( |
1100 | $class->SUPER::new ( |
1052 | col_expand => [], |
1101 | col_expand => [], |
1053 | @_ |
1102 | @_, |
1054 | ) |
1103 | ) |
1055 | } |
1104 | } |
1056 | |
1105 | |
1057 | sub add { |
1106 | sub add { |
1058 | my ($self, $x, $y, $child) = @_; |
1107 | my ($self, $x, $y, $child) = @_; |
… | |
… | |
1510 | $self->{text} = $text; |
1559 | $self->{text} = $text; |
1511 | |
1560 | |
1512 | $text =~ s/./*/g if $self->{hidden}; |
1561 | $text =~ s/./*/g if $self->{hidden}; |
1513 | $self->{layout}->set_text ("$text "); |
1562 | $self->{layout}->set_text ("$text "); |
1514 | |
1563 | |
1515 | $self->emit (changed => $self->{text}); |
1564 | $self->_emit (changed => $self->{text}); |
1516 | } |
1565 | } |
1517 | |
1566 | |
1518 | sub set_text { |
1567 | sub set_text { |
1519 | my ($self, $text) = @_; |
1568 | my ($self, $text) = @_; |
1520 | |
1569 | |
… | |
… | |
1532 | my ($self) = @_; |
1581 | my ($self) = @_; |
1533 | |
1582 | |
1534 | my ($w, $h) = $self->SUPER::size_request; |
1583 | my ($w, $h) = $self->SUPER::size_request; |
1535 | |
1584 | |
1536 | ($w + 1, $h) # add 1 for cursor |
1585 | ($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 | } |
1586 | } |
1544 | |
1587 | |
1545 | sub key_down { |
1588 | sub key_down { |
1546 | my ($self, $ev) = @_; |
1589 | my ($self, $ev) = @_; |
1547 | |
1590 | |
… | |
… | |
1562 | } elsif ($sym == CFClient::SDLK_HOME) { |
1605 | } elsif ($sym == CFClient::SDLK_HOME) { |
1563 | $self->{cursor} = 0; |
1606 | $self->{cursor} = 0; |
1564 | } elsif ($sym == CFClient::SDLK_END) { |
1607 | } elsif ($sym == CFClient::SDLK_END) { |
1565 | $self->{cursor} = length $text; |
1608 | $self->{cursor} = length $text; |
1566 | } elsif ($uni == 27) { |
1609 | } elsif ($uni == 27) { |
1567 | $self->emit ('escape'); |
1610 | $self->_emit ('escape'); |
1568 | } elsif ($uni) { |
1611 | } elsif ($uni) { |
1569 | substr $text, $self->{cursor}++, 0, chr $uni; |
1612 | substr $text, $self->{cursor}++, 0, chr $uni; |
1570 | } |
1613 | } |
1571 | |
1614 | |
1572 | $self->_set_text ($text); |
1615 | $self->_set_text ($text); |
… | |
… | |
1659 | if ($sym == 13) { |
1702 | if ($sym == 13) { |
1660 | unshift @{$self->{history}}, |
1703 | unshift @{$self->{history}}, |
1661 | my $txt = $self->get_text; |
1704 | my $txt = $self->get_text; |
1662 | $self->{history_pointer} = -1; |
1705 | $self->{history_pointer} = -1; |
1663 | $self->{history_saveback} = ''; |
1706 | $self->{history_saveback} = ''; |
1664 | $self->emit (activate => $txt); |
1707 | $self->_emit (activate => $txt); |
1665 | $self->update; |
1708 | $self->update; |
1666 | |
1709 | |
1667 | } elsif ($sym == CFClient::SDLK_UP) { |
1710 | } elsif ($sym == CFClient::SDLK_UP) { |
1668 | if ($self->{history_pointer} < 0) { |
1711 | if ($self->{history_pointer} < 0) { |
1669 | $self->{history_saveback} = $self->get_text; |
1712 | $self->{history_saveback} = $self->get_text; |
… | |
… | |
1717 | can_events => 1, |
1760 | can_events => 1, |
1718 | @_ |
1761 | @_ |
1719 | ) |
1762 | ) |
1720 | } |
1763 | } |
1721 | |
1764 | |
|
|
1765 | sub activate { } |
|
|
1766 | |
1722 | sub button_up { |
1767 | sub button_up { |
1723 | my ($self, $ev, $x, $y) = @_; |
1768 | my ($self, $ev, $x, $y) = @_; |
1724 | |
1769 | |
|
|
1770 | $self->emit ("activate") |
1725 | if ($x >= 0 && $x < $self->{w} |
1771 | if $x >= 0 && $x < $self->{w} |
1726 | && $y >= 0 && $y < $self->{h}) { |
1772 | && $y >= 0 && $y < $self->{h}; |
1727 | $self->emit ("activate"); |
|
|
1728 | } |
|
|
1729 | } |
1773 | } |
1730 | |
1774 | |
1731 | sub _draw { |
1775 | sub _draw { |
1732 | my ($self) = @_; |
1776 | my ($self) = @_; |
1733 | |
1777 | |
… | |
… | |
1785 | my ($self, $ev, $x, $y) = @_; |
1829 | my ($self, $ev, $x, $y) = @_; |
1786 | |
1830 | |
1787 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1831 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1788 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1832 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1789 | $self->{state} = !$self->{state}; |
1833 | $self->{state} = !$self->{state}; |
1790 | $self->emit (changed => $self->{state}); |
1834 | $self->_emit (changed => $self->{state}); |
1791 | } |
1835 | } |
1792 | } |
1836 | } |
1793 | |
1837 | |
1794 | sub _draw { |
1838 | sub _draw { |
1795 | my ($self) = @_; |
1839 | my ($self) = @_; |
… | |
… | |
2070 | my $self = $class->SUPER::new ( |
2114 | my $self = $class->SUPER::new ( |
2071 | fg => [1, 1, 1], |
2115 | fg => [1, 1, 1], |
2072 | active_fg => [0, 0, 0], |
2116 | active_fg => [0, 0, 0], |
2073 | bg => [0, 0, 0, 0.2], |
2117 | bg => [0, 0, 0, 0.2], |
2074 | active_bg => [1, 1, 1, 0.5], |
2118 | active_bg => [1, 1, 1, 0.5], |
2075 | range => [0, 0, 100, 10], |
2119 | range => [0, 0, 100, 10, 0], |
2076 | req_w => $::WIDTH / 80, |
2120 | req_w => $::WIDTH / 80, |
2077 | req_h => $::WIDTH / 80, |
2121 | req_h => $::WIDTH / 80, |
2078 | vertical => 0, |
2122 | vertical => 0, |
2079 | can_hover => 1, |
2123 | can_hover => 1, |
2080 | inner_pad => 0.02, |
2124 | inner_pad => 0.02, |
… | |
… | |
2100 | |
2144 | |
2101 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2145 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2102 | |
2146 | |
2103 | $hi = $lo + 1 if $hi <= $lo; |
2147 | $hi = $lo + 1 if $hi <= $lo; |
2104 | |
2148 | |
|
|
2149 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2150 | |
2105 | $value = $lo if $value < $lo; |
2151 | $value = $lo if $value < $lo; |
2106 | $value = $hi if $value > $hi; |
2152 | $value = $hi - $page if $value > $hi - $page; |
2107 | |
2153 | |
2108 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2154 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2109 | if $unit; |
2155 | if $unit; |
2110 | |
2156 | |
2111 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2112 | |
|
|
2113 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2157 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2114 | |
2158 | |
2115 | if ($value != $old_value) { |
2159 | if ($value != $old_value) { |
2116 | $self->emit (changed => $value); |
2160 | $self->_emit (changed => $value); |
2117 | $self->update; |
2161 | $self->update; |
2118 | } |
2162 | } |
2119 | } |
2163 | } |
2120 | |
2164 | |
2121 | sub size_request { |
2165 | sub size_request { |
… | |
… | |
2129 | |
2173 | |
2130 | sub button_down { |
2174 | sub button_down { |
2131 | my ($self, $ev, $x, $y) = @_; |
2175 | my ($self, $ev, $x, $y) = @_; |
2132 | |
2176 | |
2133 | $self->SUPER::button_down ($ev, $x, $y); |
2177 | $self->SUPER::button_down ($ev, $x, $y); |
|
|
2178 | |
|
|
2179 | $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; |
|
|
2180 | |
2134 | $self->mouse_motion ($ev, $x, $y); |
2181 | $self->mouse_motion ($ev, $x, $y); |
2135 | } |
2182 | } |
2136 | |
2183 | |
2137 | sub mouse_motion { |
2184 | sub mouse_motion { |
2138 | my ($self, $ev, $x, $y) = @_; |
2185 | my ($self, $ev, $x, $y) = @_; |
… | |
… | |
2140 | if ($GRAB == $self) { |
2187 | if ($GRAB == $self) { |
2141 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2188 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2142 | |
2189 | |
2143 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2190 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2144 | |
2191 | |
2145 | $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; |
2192 | $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); |
2146 | |
2193 | |
2147 | $self->set_value ($x * ($hi - $lo) + $lo); |
2194 | $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); |
2148 | } |
2195 | } |
2149 | } |
2196 | } |
2150 | |
2197 | |
2151 | sub update { |
2198 | sub update { |
2152 | my ($self) = @_; |
2199 | my ($self) = @_; |
2153 | |
2200 | |
2154 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2201 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2155 | $self->set_value ($self->{range}[0]); |
2202 | $self->set_value ($self->{range}[0]); |
2156 | |
2203 | |
2157 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
2204 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
|
|
2205 | my $range = ($hi - $page - $lo) || 1e-100; |
2158 | |
2206 | |
2159 | my $inner_w = 1 - 2 * $self->{inner_pad}; |
2207 | my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; |
2160 | |
2208 | |
2161 | $self->{scale} = ($inner_w / ($hi - $lo)) || 1; |
2209 | $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; |
|
|
2210 | $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; |
2162 | |
2211 | |
2163 | $page = $self->{scale} * $page || 10 / ($self->{w} || 1); |
2212 | $value = ($value - $lo) / $range; |
2164 | $value = $self->{scale} * ($value - $lo); |
2213 | $value = $value * $self->{scale} + $self->{offset}; |
2165 | |
2214 | |
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; |
2215 | $self->{knob_x} = $value - $knob_w * 0.5; |
2172 | $self->{knob_w} = $page; |
2216 | $self->{knob_w} = $knob_w; |
2173 | }); |
2217 | }); |
2174 | |
2218 | |
2175 | $self->SUPER::update; |
2219 | $self->SUPER::update; |
2176 | } |
2220 | } |
2177 | |
2221 | |
… | |
… | |
2293 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2337 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2294 | |
2338 | |
2295 | $self->reflow; |
2339 | $self->reflow; |
2296 | } |
2340 | } |
2297 | |
2341 | |
2298 | sub text_height { |
2342 | sub text_size { |
2299 | my ($self, $text, $indent) = @_; |
2343 | my ($self, $text, $indent) = @_; |
2300 | |
2344 | |
2301 | my $layout = $self->{layout}; |
2345 | my $layout = $self->{layout}; |
2302 | |
2346 | |
2303 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2347 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2304 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2348 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2305 | $layout->set_markup ($text); |
2349 | $layout->set_markup ($text); |
2306 | |
2350 | |
2307 | ($layout->size)[1] |
2351 | $layout->size |
2308 | } |
2352 | } |
2309 | |
2353 | |
2310 | sub reflow { |
2354 | sub reflow { |
2311 | my ($self) = @_; |
2355 | my ($self) = @_; |
2312 | |
2356 | |
2313 | $self->{need_reflow}++; |
2357 | $self->{need_reflow}++; |
2314 | $self->update; |
2358 | $self->update; |
2315 | } |
2359 | } |
2316 | |
2360 | |
|
|
2361 | sub set_offset { |
|
|
2362 | my ($self, $offset) = @_; |
|
|
2363 | |
|
|
2364 | # todo: base offset on lines or so, not on pixels |
|
|
2365 | $self->{children}[1]->set_value ($offset); |
|
|
2366 | } |
|
|
2367 | |
|
|
2368 | sub clear { |
|
|
2369 | my ($self) = @_; |
|
|
2370 | |
|
|
2371 | $self->{par} = []; |
|
|
2372 | $self->{height} = 0; |
|
|
2373 | $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); |
|
|
2374 | } |
|
|
2375 | |
2317 | sub add_paragraph { |
2376 | sub add_paragraph { |
2318 | my ($self, $color, $text, $indent) = @_; |
2377 | my ($self, $color, $text, $indent) = @_; |
2319 | |
2378 | |
2320 | #TODO: intelligently "reformat" paragraph |
|
|
2321 | |
|
|
2322 | for my $line (split /\n/, $text) { |
2379 | for my $line (split /\n/, $text) { |
2323 | my $height = $self->text_height ($line); |
2380 | my ($w, $h) = $self->text_size ($line); |
2324 | $self->{height} += $height; |
2381 | $self->{height} += $h; |
2325 | push @{$self->{par}}, [$height, $color, $indent, $line]; |
2382 | push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; |
2326 | } |
2383 | } |
2327 | |
2384 | |
2328 | $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; |
2385 | $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); |
2329 | $self->{children}[1]->update; |
|
|
2330 | } |
2386 | } |
2331 | |
2387 | |
2332 | sub update { |
2388 | sub update { |
2333 | my ($self) = @_; |
2389 | my ($self) = @_; |
2334 | |
2390 | |
… | |
… | |
2337 | return unless $self->{h} > 0; |
2393 | return unless $self->{h} > 0; |
2338 | |
2394 | |
2339 | delete $self->{texture}; |
2395 | delete $self->{texture}; |
2340 | |
2396 | |
2341 | $ROOT->on_post_alloc ($self, sub { |
2397 | $ROOT->on_post_alloc ($self, sub { |
|
|
2398 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
|
|
2399 | |
2342 | if (delete $self->{need_reflow}) { |
2400 | if (delete $self->{need_reflow}) { |
2343 | my $height = 0; |
2401 | my $height = 0; |
2344 | |
2402 | |
2345 | $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) |
2403 | my $layout = $self->{layout}; |
|
|
2404 | |
|
|
2405 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2406 | |
2346 | for @{$self->{par}}; |
2407 | for (@{$self->{par}}) { |
|
|
2408 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
|
|
2409 | $layout->set_width ($W - $_->[3]); |
|
|
2410 | $layout->set_markup ($_->[4]); |
|
|
2411 | my ($w, $h) = $layout->size; |
|
|
2412 | $_->[0] = $w + $_->[3]; |
|
|
2413 | $_->[1] = $h; |
|
|
2414 | } |
|
|
2415 | |
|
|
2416 | $height += $_->[1]; |
|
|
2417 | } |
2347 | |
2418 | |
2348 | $self->{height} = $height; |
2419 | $self->{height} = $height; |
2349 | |
2420 | |
2350 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
2421 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
2351 | $self->{children}[1]->update; |
|
|
2352 | |
2422 | |
2353 | delete $self->{texture}; |
2423 | delete $self->{texture}; |
2354 | } |
2424 | } |
2355 | |
2425 | |
2356 | $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { |
2426 | $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { |
2357 | glClearColor 0.5, 0.5, 0.5, 0; |
2427 | glClearColor 0.5, 0.5, 0.5, 0; |
2358 | glClear GL_COLOR_BUFFER_BIT; |
2428 | glClear GL_COLOR_BUFFER_BIT; |
2359 | |
2429 | |
2360 | my $top = int $self->{children}[1]{range}[0]; |
2430 | my $top = int $self->{children}[1]{range}[0]; |
2361 | |
2431 | |
2362 | my $y0 = $top; |
2432 | my $y0 = $top; |
2363 | my $y1 = $top + $self->{h}; |
2433 | my $y1 = $top + $H; |
2364 | |
2434 | |
2365 | my $y = 0; |
2435 | my $y = 0; |
2366 | |
2436 | |
2367 | my $layout = $self->{layout}; |
2437 | my $layout = $self->{layout}; |
2368 | |
2438 | |
2369 | $layout->set_font ($self->{font}) if $self->{font}; |
2439 | $layout->set_font ($self->{font}) if $self->{font}; |
2370 | |
2440 | |
2371 | glEnable GL_BLEND; |
2441 | glEnable GL_BLEND; |
|
|
2442 | #TODO# not correct in windows where rgba is forced off |
2372 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
2443 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
2373 | |
2444 | |
2374 | for my $par (@{$self->{par}}) { |
2445 | for my $par (@{$self->{par}}) { |
2375 | my $h = $par->[0]; |
2446 | my $h = $par->[1]; |
2376 | |
2447 | |
2377 | if ($y0 < $y + $h && $y < $y1) { |
2448 | if ($y0 < $y + $h && $y < $y1) { |
2378 | $layout->set_foreground (@{ $par->[1] }); |
2449 | $layout->set_foreground (@{ $par->[2] }); |
2379 | $layout->set_width ($self->{w} - $par->[2]); |
2450 | $layout->set_width ($W - $par->[3]); |
2380 | $layout->set_markup ($par->[3]); |
2451 | $layout->set_markup ($par->[4]); |
2381 | |
2452 | |
2382 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2453 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2383 | |
2454 | |
2384 | glRasterPos $par->[2], $y - $y0; |
2455 | glRasterPos $par->[3], $y - $y0; |
2385 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2456 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2386 | } |
2457 | } |
2387 | |
2458 | |
2388 | $y += $h; |
2459 | $y += $h; |
2389 | } |
2460 | } |
… | |
… | |
2476 | |
2547 | |
2477 | # TODO: use animation |
2548 | # TODO: use animation |
2478 | if ($self->{state} = !$self->{state}) { |
2549 | if ($self->{state} = !$self->{state}) { |
2479 | $CFClient::UI::ROOT->add ($self->{other}); |
2550 | $CFClient::UI::ROOT->add ($self->{other}); |
2480 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2551 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2481 | $self->emit ("open"); |
2552 | $self->_emit ("open"); |
2482 | } else { |
2553 | } else { |
2483 | $CFClient::UI::ROOT->remove ($self->{other}); |
2554 | $CFClient::UI::ROOT->remove ($self->{other}); |
2484 | $self->emit ("close"); |
2555 | $self->_emit ("close"); |
2485 | } |
2556 | } |
2486 | |
2557 | |
2487 | $self->emit (changed => $self->{state}); |
2558 | $self->_emit (changed => $self->{state}); |
2488 | } |
2559 | } |
2489 | |
2560 | |
2490 | ############################################################################# |
2561 | ############################################################################# |
2491 | |
2562 | |
2492 | package CFClient::UI::Tooltip; |
2563 | package CFClient::UI::Tooltip; |
… | |
… | |
2568 | |
2639 | |
2569 | sub new { |
2640 | sub new { |
2570 | my $class = shift; |
2641 | my $class = shift; |
2571 | |
2642 | |
2572 | my $self = $class->SUPER::new ( |
2643 | my $self = $class->SUPER::new ( |
2573 | aspect => 1, |
2644 | aspect => 1, |
|
|
2645 | can_events => 0, |
2574 | @_, |
2646 | @_, |
2575 | ); |
2647 | ); |
2576 | |
2648 | |
2577 | if ($self->{anim} && $self->{animspeed}) { |
2649 | if ($self->{anim} && $self->{animspeed}) { |
2578 | Scalar::Util::weaken (my $widget = $self); |
2650 | Scalar::Util::weaken (my $widget = $self); |
… | |
… | |
2604 | } |
2676 | } |
2605 | |
2677 | |
2606 | sub _draw { |
2678 | sub _draw { |
2607 | my ($self) = @_; |
2679 | my ($self) = @_; |
2608 | |
2680 | |
2609 | return unless $::CONN;#d# manage and cache textures differently |
2681 | return unless $::CONN; |
2610 | |
2682 | |
2611 | my $face; |
2683 | my $face; |
2612 | |
2684 | |
2613 | if ($self->{frame}) { |
2685 | if ($self->{frame}) { |
2614 | my $anim = $::CONN->{anim}[$self->{anim}]; |
2686 | my $anim = $::CONN->{anim}[$self->{anim}]; |
… | |
… | |
2641 | |
2713 | |
2642 | package CFClient::UI::InventoryItem; |
2714 | package CFClient::UI::InventoryItem; |
2643 | |
2715 | |
2644 | our @ISA = CFClient::UI::HBox::; |
2716 | our @ISA = CFClient::UI::HBox::; |
2645 | |
2717 | |
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 | |
|
|
2672 | sub new { |
2718 | sub new { |
2673 | my $class = shift; |
2719 | my $class = shift; |
2674 | |
2720 | |
2675 | my %args = @_; |
2721 | my %args = @_; |
2676 | |
2722 | |
2677 | my $item = delete $args{item}; |
2723 | my $item = delete $args{item}; |
2678 | |
2724 | |
2679 | my $desc = _item_to_desc ($item); |
2725 | my $desc = CFClient::Item::desc_string $item; |
2680 | |
2726 | |
2681 | my $self = $class->SUPER::new ( |
2727 | my $self = $class->SUPER::new ( |
2682 | can_hover => 1, |
2728 | can_hover => 1, |
2683 | can_events => 1, |
2729 | can_events => 1, |
2684 | tooltip => ((CFClient::UI::Label::escape $desc) |
2730 | tooltip => ((CFClient::UI::Label::escape $desc) |
… | |
… | |
2742 | } |
2788 | } |
2743 | |
2789 | |
2744 | sub update_item { |
2790 | sub update_item { |
2745 | my ($self) = @_; |
2791 | my ($self) = @_; |
2746 | |
2792 | |
2747 | my $desc = _item_to_desc ($self->{item}); |
2793 | my $desc = CFClient::Item::desc_string ($self->{item}); |
2748 | |
2794 | |
2749 | $self->{name_lbl}->set_text ($desc); |
2795 | $self->{name_lbl}->set_text ($desc); |
2750 | } |
2796 | } |
2751 | |
2797 | |
2752 | ############################################################################# |
2798 | ############################################################################# |
… | |
… | |
2757 | |
2803 | |
2758 | sub new { |
2804 | sub new { |
2759 | my $class = shift; |
2805 | my $class = shift; |
2760 | |
2806 | |
2761 | my $self = $class->SUPER::new ( |
2807 | my $self = $class->SUPER::new ( |
2762 | scrolled => (new CFClient::UI::Table), |
2808 | scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), |
2763 | @_, |
2809 | @_, |
2764 | ); |
2810 | ); |
2765 | |
2811 | |
2766 | $self |
2812 | $self |
2767 | } |
2813 | } |
… | |
… | |
2777 | or ($a->{name} cmp $b->{name}) |
2823 | or ($a->{name} cmp $b->{name}) |
2778 | } @$items; |
2824 | } @$items; |
2779 | |
2825 | |
2780 | $self->{real_items} = \@items; |
2826 | $self->{real_items} = \@items; |
2781 | |
2827 | |
|
|
2828 | my $row = 0; |
2782 | for my $item (@items) { |
2829 | for my $item (@items) { |
2783 | $item->{item} = $item; |
2830 | CFClient::Item::update_widgets $item; |
2784 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
|
|
2785 | $item->update_item (); |
|
|
2786 | } |
|
|
2787 | |
2831 | |
2788 | my $i = 0; |
2832 | $self->{scrolled}->add (0, $row, $item->{face_widget}); |
2789 | for (@items) { |
2833 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2790 | $self->{scrolled}->add (0, $i, $_); |
2834 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2791 | my $nrof = $_->{item}->{nrof} || 1; |
2835 | |
2792 | $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); |
2836 | $row++; |
2793 | } |
2837 | } |
2794 | |
2838 | |
2795 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2839 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2796 | } |
2840 | } |
2797 | |
2841 | |
… | |
… | |
2840 | |
2884 | |
2841 | # popup given the event (must be a mouse button down event currently) |
2885 | # popup given the event (must be a mouse button down event currently) |
2842 | sub popup { |
2886 | sub popup { |
2843 | my ($self, $ev) = @_; |
2887 | my ($self, $ev) = @_; |
2844 | |
2888 | |
2845 | $self->emit ("popdown"); |
2889 | $self->_emit ("popdown"); |
2846 | |
2890 | |
2847 | # maybe save $GRAB? must be careful about events... |
2891 | # maybe save $GRAB? must be careful about events... |
2848 | $GRAB = $self; |
2892 | $GRAB = $self; |
2849 | $self->{button} = $ev->{button}; |
2893 | $self->{button} = $ev->{button}; |
2850 | |
2894 | |
… | |
… | |
2865 | |
2909 | |
2866 | if ($ev->{button} == $self->{button}) { |
2910 | if ($ev->{button} == $self->{button}) { |
2867 | undef $GRAB; |
2911 | undef $GRAB; |
2868 | $self->hide; |
2912 | $self->hide; |
2869 | |
2913 | |
2870 | $self->emit ("popdown"); |
2914 | $self->_emit ("popdown"); |
2871 | $self->{hover}[1]->() if $self->{hover}; |
2915 | $self->{hover}[1]->() if $self->{hover}; |
2872 | } |
2916 | } |
2873 | } |
2917 | } |
2874 | |
2918 | |
2875 | ############################################################################# |
2919 | ############################################################################# |
… | |
… | |
2937 | sub add { |
2981 | sub add { |
2938 | my ($self, $text, %arg) = @_; |
2982 | my ($self, $text, %arg) = @_; |
2939 | |
2983 | |
2940 | $text =~ s/^\s+//; |
2984 | $text =~ s/^\s+//; |
2941 | $text =~ s/\s+$//; |
2985 | $text =~ s/\s+$//; |
|
|
2986 | |
|
|
2987 | return unless $text; |
2942 | |
2988 | |
2943 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2989 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2944 | |
2990 | |
2945 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2991 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2946 | |
2992 | |
… | |
… | |
3017 | } |
3063 | } |
3018 | |
3064 | |
3019 | sub size_allocate { |
3065 | sub size_allocate { |
3020 | my ($self, $w, $h) = @_; |
3066 | my ($self, $w, $h) = @_; |
3021 | |
3067 | |
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) { |
3068 | for my $child ($self->children) { |
3029 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3069 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3030 | |
3070 | |
3031 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3071 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3032 | if exists $child->{req_x}; |
3072 | if exists $child->{req_x}; |
… | |
… | |
3061 | } |
3101 | } |
3062 | |
3102 | |
3063 | sub add { |
3103 | sub add { |
3064 | my ($self, @children) = @_; |
3104 | my ($self, @children) = @_; |
3065 | |
3105 | |
|
|
3106 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3107 | push @widgets, $w->children; |
|
|
3108 | $w->{root} = $self; |
|
|
3109 | $w->{visible} = 1; |
|
|
3110 | } |
|
|
3111 | |
3066 | for my $child (@children) { |
3112 | for my $child (@children) { |
3067 | $child->{toplevel} = 1; |
3113 | $child->{is_toplevel} = 1; |
3068 | |
3114 | |
3069 | # integerise window positions |
3115 | # integerise window positions |
3070 | $child->{x} = int $child->{x}; |
3116 | $child->{x} = int $child->{x}; |
3071 | $child->{y} = int $child->{y}; |
3117 | $child->{y} = int $child->{y}; |
3072 | } |
3118 | } |
3073 | |
3119 | |
3074 | $self->SUPER::add (@children); |
3120 | $self->SUPER::add (@children); |
|
|
3121 | } |
|
|
3122 | |
|
|
3123 | sub remove { |
|
|
3124 | my ($self, @children) = @_; |
|
|
3125 | |
|
|
3126 | $self->SUPER::remove (@children); |
3075 | |
3127 | |
3076 | while (@children) { |
3128 | while (@children) { |
3077 | my $w = pop @children; |
3129 | my $w = pop @children; |
3078 | push @children, $w->children; |
3130 | push @children, $w->children; |
3079 | $w->{visible} = 1; |
3131 | $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 | } |
3132 | } |
3093 | } |
3133 | } |
3094 | |
3134 | |
3095 | sub on_refresh { |
3135 | sub on_refresh { |
3096 | my ($self, $id, $cb) = @_; |
3136 | my ($self, $id, $cb) = @_; |
… | |
… | |
3150 | $w = 0 if $w < 0; |
3190 | $w = 0 if $w < 0; |
3151 | $h = 0 if $h < 0; |
3191 | $h = 0 if $h < 0; |
3152 | |
3192 | |
3153 | $widget->{w} = $w; |
3193 | $widget->{w} = $w; |
3154 | $widget->{h} = $h; |
3194 | $widget->{h} = $h; |
3155 | $widget->size_allocate ($w, $h); |
|
|
3156 | $widget->emit (size_allocate => $w, $h); |
3195 | $widget->emit (size_allocate => $w, $h); |
3157 | } |
3196 | } |
3158 | } |
3197 | } |
3159 | |
3198 | |
3160 | while ($self->{post_alloc_hook}) { |
3199 | while ($self->{post_alloc_hook}) { |