ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.223 by elmex, Tue May 23 18:10:51 2006 UTC vs.
Revision 1.236 by root, Thu May 25 16:54:29 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub 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
59sub feed_sdl_key_up_event { 59sub 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
64sub feed_sdl_button_down_event { 64sub 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
85sub feed_sdl_button_up_event { 83sub 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
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
144 138
145 $_->update 139 $_->update
146 for @widgets; 140 for @widgets;
147} 141}
148 142
143sub 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.
150sub rescale_widgets { 152sub 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
174package CFClient::UI::Base; 173package 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
229sub hide { 228sub 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
244sub 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
310sub set_tooltip { 324sub 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
361sub mouse_motion { } 383sub mouse_motion { }
362sub button_up { } 384sub button_up { }
363sub key_down { } 385sub key_down { }
364sub key_up { } 386sub key_up { }
365 387
366sub button_down { 388sub 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
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
468sub emit { 496sub 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
474sub DESTROY { 503sub DESTROY {
475 my ($self) = @_; 504 my ($self) = @_;
476 505
… …
589 delete $child->{parent}; 618 delete $child->{parent};
590 $child->hide; 619 $child->hide;
591 620
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 622
594 $self->check_size; 623 $self->check_size (1);
595 $self->update; 624 $self->update;
596} 625}
597 626
598sub clear { 627sub clear {
599 my ($self) = @_; 628 my ($self) = @_;
… …
739 768
740package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
741 770
742our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
743 772
773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
744sub size_request { 783sub 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 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 787
750 @$self{qw(child_w child_h)} 788 @$self{qw(child_w child_h)}
751} 789}
752 790
753sub size_allocate { 791sub size_allocate {
754 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
755 793
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796
797 $self->child->configure (0, 0, $w, $h);
756 $self->update; 798 $self->update;
757} 799}
758 800
759sub set_offset { 801sub set_offset {
760 my ($self, $x, $y) = @_; 802 my ($self, $x, $y) = @_;
… …
814 856
815 my $slider = new CFClient::UI::Slider 857 my $slider = new CFClient::UI::Slider
816 vertical => 1, 858 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 859 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 860 connect_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 861 $self->{vp}->set_offset (0, $_[1]);
820 }, 862 },
821 ; 863 ;
822 864
823 $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 866 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 871 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 872 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 873 $self->add ($self->{slider});
832 874
833 $self 875 $self
876}
877
878sub 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]);
834} 885}
835 886
836#TODO# update range on size_allocate depending on child 887#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 888# update viewport offset on scroll
838 889
… …
892 my $class = shift; 943 my $class = shift;
893 944
894 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
895 946
896 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
899 border => 0.6, 950 border => 0.6,
900 toplevel => 1, 951 is_toplevel => 1,
901 can_events => 1, 952 can_events => 1,
902 @_ 953 @_
903 ); 954 );
904 955
905 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
906 align => 0, 957 align => 0,
… …
1046sub new { 1097sub new {
1047 my $class = shift; 1098 my $class = shift;
1048 1099
1049 $class->SUPER::new ( 1100 $class->SUPER::new (
1050 col_expand => [], 1101 col_expand => [],
1051 @_ 1102 @_,
1052 ) 1103 )
1104}
1105
1106sub children {
1107 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1108}
1054 1109
1055sub add { 1110sub add {
1056 my ($self, $x, $y, $child) = @_; 1111 my ($self, $x, $y, $child) = @_;
1057 1112
1058 $child->set_parent ($self); 1113 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1114 $self->{children}[$y][$x] = $child;
1060 1115
1061 $child->check_size; 1116 $self->check_size (1);
1062} 1117}
1063 1118
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1119# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1120sub clear {
1070 my ($self) = @_; 1121 my ($self) = @_;
1071 1122
1072 my @children = $self->children; 1123 my @children = $self->children;
1073 delete $self->{children}; 1124 delete $self->{children};
… …
1075 for (@children) { 1126 for (@children) {
1076 delete $_->{parent}; 1127 delete $_->{parent};
1077 $_->hide; 1128 $_->hide;
1078 } 1129 }
1079 1130
1131 $self->check_size (1);
1080 $self->update; 1132 $self->update;
1081} 1133}
1082 1134
1083sub get_wh { 1135sub get_wh {
1084 my ($self) = @_; 1136 my ($self) = @_;
… …
1488 active_fg => [0, 0, 0], 1540 active_fg => [0, 0, 0],
1489 can_hover => 1, 1541 can_hover => 1,
1490 can_focus => 1, 1542 can_focus => 1,
1491 valign => 0, 1543 valign => 0,
1492 can_events => 1, 1544 can_events => 1,
1545 #text => ...
1493 @_ 1546 @_
1494 ) 1547 )
1495} 1548}
1496 1549
1497sub _set_text { 1550sub _set_text {
… …
1507 $self->{text} = $text; 1560 $self->{text} = $text;
1508 1561
1509 $text =~ s/./*/g if $self->{hidden}; 1562 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1563 $self->{layout}->set_text ("$text ");
1511 1564
1512 $self->emit (changed => $self->{text}); 1565 $self->_emit (changed => $self->{text});
1513} 1566}
1514 1567
1515sub set_text { 1568sub set_text {
1516 my ($self, $text) = @_; 1569 my ($self, $text) = @_;
1517 1570
… …
1529 my ($self) = @_; 1582 my ($self) = @_;
1530 1583
1531 my ($w, $h) = $self->SUPER::size_request; 1584 my ($w, $h) = $self->SUPER::size_request;
1532 1585
1533 ($w + 1, $h) # add 1 for cursor 1586 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1587}
1541 1588
1542sub key_down { 1589sub key_down {
1543 my ($self, $ev) = @_; 1590 my ($self, $ev) = @_;
1544 1591
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1606 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1607 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1608 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1609 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1610 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1611 $self->_emit ('escape');
1565 } elsif ($uni) { 1612 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1613 substr $text, $self->{cursor}++, 0, chr $uni;
1567 } 1614 }
1568 1615
1569 $self->_set_text ($text); 1616 $self->_set_text ($text);
… …
1656 if ($sym == 13) { 1703 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1704 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1705 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1706 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1707 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1708 $self->_emit (activate => $txt);
1662 $self->update; 1709 $self->update;
1663 1710
1664 } elsif ($sym == CFClient::SDLK_UP) { 1711 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1712 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1713 $self->{history_saveback} = $self->get_text;
… …
1714 can_events => 1, 1761 can_events => 1,
1715 @_ 1762 @_
1716 ) 1763 )
1717} 1764}
1718 1765
1766sub activate { }
1767
1719sub button_up { 1768sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1769 my ($self, $ev, $x, $y) = @_;
1721 1770
1771 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1772 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1773 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate");
1725 }
1726} 1774}
1727 1775
1728sub _draw { 1776sub _draw {
1729 my ($self) = @_; 1777 my ($self) = @_;
1730 1778
… …
1782 my ($self, $ev, $x, $y) = @_; 1830 my ($self, $ev, $x, $y) = @_;
1783 1831
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1832 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1833 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1786 $self->{state} = !$self->{state}; 1834 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1835 $self->_emit (changed => $self->{state});
1788 } 1836 }
1789} 1837}
1790 1838
1791sub _draw { 1839sub _draw {
1792 my ($self) = @_; 1840 my ($self) = @_;
… …
2067 my $self = $class->SUPER::new ( 2115 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2116 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2117 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2118 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2119 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2120 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2121 req_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2122 req_h => $::WIDTH / 80,
2075 vertical => 0, 2123 vertical => 0,
2076 can_hover => 1, 2124 can_hover => 1,
2077 inner_pad => 0.02, 2125 inner_pad => 0.02,
… …
2082 $self->update; 2130 $self->update;
2083 2131
2084 $self 2132 $self
2085} 2133}
2086 2134
2135sub set_range {
2136 my ($self, $range) = @_;
2137
2138 $self->{range} = $range;
2139
2140 $self->update;
2141}
2142
2087sub set_value { 2143sub set_value {
2088 my ($self, $value) = @_; 2144 my ($self, $value) = @_;
2089 2145
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2146 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2147
2092 $hi = $lo + 1 if $hi <= $lo; 2148 $hi = $lo + 1 if $hi <= $lo;
2093 2149
2150 $page = $hi - $lo if $page > $hi - $lo;
2151
2094 $value = $lo if $value < $lo; 2152 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2153 $value = $hi - $page if $value > $hi - $page;
2096 2154
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2155 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2156 if $unit;
2099 2157
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2158 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2159
2104 if ($value != $old_value) { 2160 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2161 $self->_emit (changed => $value);
2106 $self->update; 2162 $self->update;
2107 } 2163 }
2108} 2164}
2109 2165
2110sub size_request { 2166sub size_request {
… …
2118 2174
2119sub button_down { 2175sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2176 my ($self, $ev, $x, $y) = @_;
2121 2177
2122 $self->SUPER::button_down ($ev, $x, $y); 2178 $self->SUPER::button_down ($ev, $x, $y);
2179
2180 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2181
2123 $self->mouse_motion ($ev, $x, $y); 2182 $self->mouse_motion ($ev, $x, $y);
2124} 2183}
2125 2184
2126sub mouse_motion { 2185sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2186 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2188 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2189 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2190
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2191 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2192
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2193 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2194
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2195 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2196 }
2138} 2197}
2139 2198
2140sub update { 2199sub update {
2141 my ($self) = @_; 2200 my ($self) = @_;
2142 2201
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2202 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2203 $self->set_value ($self->{range}[0]);
2145 2204
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2205 my ($value, $lo, $hi, $page) = @{$self->{range}};
2206 my $range = ($hi - $page - $lo) || 1e-100;
2147 2207
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2208 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2209
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2210 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2211 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2212
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2213 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2214 $value = $value * $self->{scale} + $self->{offset};
2154 2215
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2216 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2217 $self->{knob_w} = $knob_w;
2162 }); 2218 });
2163 2219
2164 $self->SUPER::update; 2220 $self->SUPER::update;
2165} 2221}
2166 2222
… …
2190 # draw handle 2246 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2247 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2248
2193 glDisable GL_TEXTURE_2D; 2249 glDisable GL_TEXTURE_2D;
2194} 2250}
2251
2252#############################################################################
2253
2254package CFClient::UI::ValSlider;
2255
2256our @ISA = CFClient::UI::HBox::;
2257
2258sub new {
2259 my ($class, %arg) = @_;
2260
2261 my $range = delete $arg{range};
2262
2263 my $self = $class->SUPER::new (
2264 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2265 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2266 to_value => sub { shift },
2267 from_value => sub { shift },
2268 %arg,
2269 );
2270
2271 $self->{slider}->connect (changed => sub {
2272 my ($self, $value) = @_;
2273 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2274 $self->{parent}->emit (changed => $value);
2275 });
2276
2277# $self->{entry}->connect (changed => sub {
2278# my ($self, $value) = @_;
2279# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2280# $self->{parent}->emit (changed => $value);
2281# });
2282
2283 $self->add ($self->{slider}, $self->{entry});
2284
2285 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2286
2287 $self
2288}
2289
2290sub set_range { shift->{slider}->set_range (@_) }
2291sub set_value { shift->{slider}->set_value (@_) }
2195 2292
2196############################################################################# 2293#############################################################################
2197 2294
2198package CFClient::UI::TextView; 2295package CFClient::UI::TextView;
2199 2296
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2338 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2339
2243 $self->reflow; 2340 $self->reflow;
2244} 2341}
2245 2342
2246sub text_height { 2343sub text_size {
2247 my ($self, $text, $indent) = @_; 2344 my ($self, $text, $indent) = @_;
2248 2345
2249 my $layout = $self->{layout}; 2346 my $layout = $self->{layout};
2250 2347
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2348 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2349 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2350 $layout->set_markup ($text);
2254 2351
2255 ($layout->size)[1] 2352 $layout->size
2256} 2353}
2257 2354
2258sub reflow { 2355sub reflow {
2259 my ($self) = @_; 2356 my ($self) = @_;
2260 2357
2261 $self->{need_reflow}++; 2358 $self->{need_reflow}++;
2262 $self->update; 2359 $self->update;
2263} 2360}
2264 2361
2362sub set_offset {
2363 my ($self, $offset) = @_;
2364
2365 # todo: base offset on lines or so, not on pixels
2366 $self->{children}[1]->set_value ($offset);
2367}
2368
2369sub clear {
2370 my ($self) = @_;
2371
2372 $self->{par} = [];
2373 $self->{height} = 0;
2374 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2375}
2376
2265sub add_paragraph { 2377sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2378 my ($self, $color, $text, $indent) = @_;
2267 2379
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2380 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2381 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2382 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2383 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2384 }
2275 2385
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2386 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2387}
2279 2388
2280sub update { 2389sub update {
2281 my ($self) = @_; 2390 my ($self) = @_;
2282 2391
… …
2285 return unless $self->{h} > 0; 2394 return unless $self->{h} > 0;
2286 2395
2287 delete $self->{texture}; 2396 delete $self->{texture};
2288 2397
2289 $ROOT->on_post_alloc ($self, sub { 2398 $ROOT->on_post_alloc ($self, sub {
2399 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2400
2290 if (delete $self->{need_reflow}) { 2401 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2402 my $height = 0;
2292 2403
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407
2294 for @{$self->{par}}; 2408 for (@{$self->{par}}) {
2409 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2410 $layout->set_width ($W - $_->[3]);
2411 $layout->set_markup ($_->[4]);
2412 my ($w, $h) = $layout->size;
2413 $_->[0] = $w + $_->[3];
2414 $_->[1] = $h;
2415 }
2416
2417 $height += $_->[1];
2418 }
2295 2419
2296 $self->{height} = $height; 2420 $self->{height} = $height;
2297 2421
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2422 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2423
2301 delete $self->{texture}; 2424 delete $self->{texture};
2302 } 2425 }
2303 2426
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2427 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2428 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2429 glClear GL_COLOR_BUFFER_BIT;
2307 2430
2308 my $top = int $self->{children}[1]{range}[0]; 2431 my $top = int $self->{children}[1]{range}[0];
2309 2432
2310 my $y0 = $top; 2433 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2434 my $y1 = $top + $H;
2312 2435
2313 my $y = 0; 2436 my $y = 0;
2314 2437
2315 my $layout = $self->{layout}; 2438 my $layout = $self->{layout};
2316 2439
2317 $layout->set_font ($self->{font}) if $self->{font}; 2440 $layout->set_font ($self->{font}) if $self->{font};
2318 2441
2319 glEnable GL_BLEND; 2442 glEnable GL_BLEND;
2443 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2444 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2445
2322 for my $par (@{$self->{par}}) { 2446 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2447 my $h = $par->[1];
2324 2448
2325 if ($y0 < $y + $h && $y < $y1) { 2449 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2450 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2451 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2452 $layout->set_markup ($par->[4]);
2329 2453
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2454 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2455
2332 glRasterPos $par->[2], $y - $y0; 2456 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2457 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2458 }
2335 2459
2336 $y += $h; 2460 $y += $h;
2337 } 2461 }
… …
2424 2548
2425 # TODO: use animation 2549 # TODO: use animation
2426 if ($self->{state} = !$self->{state}) { 2550 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other}); 2551 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h})); 2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open"); 2553 $self->_emit ("open");
2430 } else { 2554 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other}); 2555 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close"); 2556 $self->_emit ("close");
2433 } 2557 }
2434 2558
2435 $self->emit (changed => $self->{state}); 2559 $self->_emit (changed => $self->{state});
2436} 2560}
2437 2561
2438############################################################################# 2562#############################################################################
2439 2563
2440package CFClient::UI::Tooltip; 2564package CFClient::UI::Tooltip;
… …
2516 2640
2517sub new { 2641sub new {
2518 my $class = shift; 2642 my $class = shift;
2519 2643
2520 my $self = $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2521 aspect => 1, 2645 aspect => 1,
2646 can_events => 0,
2522 @_, 2647 @_,
2523 ); 2648 );
2524 2649
2525 if ($self->{anim} && $self->{animspeed}) { 2650 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2651 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2677}
2553 2678
2554sub _draw { 2679sub _draw {
2555 my ($self) = @_; 2680 my ($self) = @_;
2556 2681
2557 return unless $::CONN;#d# manage and cache textures differently 2682 return unless $::CONN;
2558 2683
2559 my $face; 2684 my $face;
2560 2685
2561 if ($self->{frame}) { 2686 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2687 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2585 $self->SUPER::DESTROY; 2710 $self->SUPER::DESTROY;
2586} 2711}
2587 2712
2588############################################################################# 2713#############################################################################
2589 2714
2590package CFClient::UI::InventoryItem; 2715package CFClient::UI::Inventory;
2591 2716
2592our @ISA = CFClient::UI::HBox::; 2717our @ISA = CFClient::UI::ScrolledWindow::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619 2718
2620sub new { 2719sub new {
2621 my $class = shift; 2720 my $class = shift;
2622 2721
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2630 can_hover => 1, 2723 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if ($ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 2) {
2647 $::CONN->send ("apply $item->{tag}");
2648 } elsif ($ev->{button} == 3) {
2649 my @menu_items = (
2650 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2651 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2652 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2653 (
2654 $item->{flags} & Crossfire::Protocol::F_LOCKED
2655 ? (
2656 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2657 )
2658 : (
2659 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2660 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2661 )
2662 ),
2663 );
2664
2665 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2666 }
2667
2668 1
2669 },
2670 %args
2671 );
2672
2673
2674 $self->add (new CFClient::UI::Face
2675 can_events => 0,
2676 face => $item->{face},
2677 anim => $item->{anim},
2678 animspeed => $item->{animspeed},
2679 );
2680
2681 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2682
2683 $self->{item} = $item;
2684
2685 $self->update_item;
2686
2687 $self
2688}
2689
2690sub update_item {
2691 my ($self) = @_;
2692
2693 my $desc = _item_to_desc ($self->{item});
2694
2695 $self->{name_lbl}->set_text ($desc);
2696}
2697
2698#############################################################################
2699
2700package CFClient::UI::Inventory;
2701
2702our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub new {
2705 my $class = shift;
2706
2707 my $self = $class->SUPER::new (
2708 scrolled => (new CFClient::UI::VBox),
2709 @_, 2724 @_,
2710 ); 2725 );
2711 2726
2712 $self 2727 $self
2713} 2728}
… …
2723 or ($a->{name} cmp $b->{name}) 2738 or ($a->{name} cmp $b->{name})
2724 } @$items; 2739 } @$items;
2725 2740
2726 $self->{real_items} = \@items; 2741 $self->{real_items} = \@items;
2727 2742
2743 my $row = 0;
2728 for my $item (@items) { 2744 for my $item (@items) {
2729 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2745 CFClient::Item::update_widgets $item;
2730 $item->update_item ();
2731 }
2732 2746
2733 $self->{scrolled}->add (@items); 2747 $self->{scrolled}->add (0, $row, $item->{face_widget});
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750
2751 $row++;
2752 }
2734 2753
2735# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2736} 2755}
2737 2756
2738sub size_request { 2757sub size_request {
… …
2780 2799
2781# popup given the event (must be a mouse button down event currently) 2800# popup given the event (must be a mouse button down event currently)
2782sub popup { 2801sub popup {
2783 my ($self, $ev) = @_; 2802 my ($self, $ev) = @_;
2784 2803
2785 $self->emit ("popdown"); 2804 $self->_emit ("popdown");
2786 2805
2787 # maybe save $GRAB? must be careful about events... 2806 # maybe save $GRAB? must be careful about events...
2788 $GRAB = $self; 2807 $GRAB = $self;
2789 $self->{button} = $ev->{button}; 2808 $self->{button} = $ev->{button};
2790 2809
… …
2805 2824
2806 if ($ev->{button} == $self->{button}) { 2825 if ($ev->{button} == $self->{button}) {
2807 undef $GRAB; 2826 undef $GRAB;
2808 $self->hide; 2827 $self->hide;
2809 2828
2810 $self->emit ("popdown"); 2829 $self->_emit ("popdown");
2811 $self->{hover}[1]->() if $self->{hover}; 2830 $self->{hover}[1]->() if $self->{hover};
2812 } 2831 }
2813} 2832}
2814 2833
2815############################################################################# 2834#############################################################################
… …
2877sub add { 2896sub add {
2878 my ($self, $text, %arg) = @_; 2897 my ($self, $text, %arg) = @_;
2879 2898
2880 $text =~ s/^\s+//; 2899 $text =~ s/^\s+//;
2881 $text =~ s/\s+$//; 2900 $text =~ s/\s+$//;
2901
2902 return unless $text;
2882 2903
2883 my $timeout = time + ((delete $arg{timeout}) || 60); 2904 my $timeout = time + ((delete $arg{timeout}) || 60);
2884 2905
2885 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2906 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2886 2907
… …
2957} 2978}
2958 2979
2959sub size_allocate { 2980sub size_allocate {
2960 my ($self, $w, $h) = @_; 2981 my ($self, $w, $h) = @_;
2961 2982
2962 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2963 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2964
2965 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2966 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2967
2968 for my $child ($self->children) { 2983 for my $child ($self->children) {
2969 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2984 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2970 2985
2971 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2986 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2972 if exists $child->{req_x}; 2987 if exists $child->{req_x};
… …
3001} 3016}
3002 3017
3003sub add { 3018sub add {
3004 my ($self, @children) = @_; 3019 my ($self, @children) = @_;
3005 3020
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026
3006 for my $child (@children) { 3027 for my $child (@children) {
3007 $child->{toplevel} = 1; 3028 $child->{is_toplevel} = 1;
3008 3029
3009 # integerise window positions 3030 # integerise window positions
3010 $child->{x} = int $child->{x}; 3031 $child->{x} = int $child->{x};
3011 $child->{y} = int $child->{y}; 3032 $child->{y} = int $child->{y};
3012 } 3033 }
3013 3034
3014 $self->SUPER::add (@children); 3035 $self->SUPER::add (@children);
3036}
3037
3038sub remove {
3039 my ($self, @children) = @_;
3040
3041 $self->SUPER::remove (@children);
3015 3042
3016 while (@children) { 3043 while (@children) {
3017 my $w = pop @children; 3044 my $w = pop @children;
3018 push @children, $w->children; 3045 push @children, $w->children;
3019 $w->{visible} = 1; 3046 $w->set_invisible;
3020 }
3021}
3022
3023sub remove {
3024 my ($self, @children) = @_;
3025
3026 $self->SUPER::remove (@children);
3027
3028 while (@children) {
3029 my $w = pop @children;
3030 push @children, $w->children;
3031 delete $w->{visible};
3032 } 3047 }
3033} 3048}
3034 3049
3035sub on_refresh { 3050sub on_refresh {
3036 my ($self, $id, $cb) = @_; 3051 my ($self, $id, $cb) = @_;
… …
3090 $w = 0 if $w < 0; 3105 $w = 0 if $w < 0;
3091 $h = 0 if $h < 0; 3106 $h = 0 if $h < 0;
3092 3107
3093 $widget->{w} = $w; 3108 $widget->{w} = $w;
3094 $widget->{h} = $h; 3109 $widget->{h} = $h;
3095 $widget->size_allocate ($w, $h);
3096 $widget->emit (size_allocate => $w, $h); 3110 $widget->emit (size_allocate => $w, $h);
3097 } 3111 }
3098 } 3112 }
3099 3113
3100 while ($self->{post_alloc_hook}) { 3114 while ($self->{post_alloc_hook}) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines