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.225 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.239 by root, Thu May 25 22:29:57 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}
… …
436sub set_parent { 458sub set_parent {
437 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
438 460
439 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
440 462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
441 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 467 $self->check_size
443 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
444 469
445 $self->show; 470 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
464 489
465 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 491}
467 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
468sub emit { 499sub emit {
469 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
470 501
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
472} 504}
473 505
474sub DESTROY { 506sub DESTROY {
475 my ($self) = @_; 507 my ($self) = @_;
476 508
… …
589 delete $child->{parent}; 621 delete $child->{parent};
590 $child->hide; 622 $child->hide;
591 623
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 625
594 $self->check_size; 626 $self->check_size (1);
595 $self->update; 627 $self->update;
596} 628}
597 629
598sub clear { 630sub clear {
599 my ($self) = @_; 631 my ($self) = @_;
… …
739 771
740package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
741 773
742our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
743 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
744sub size_request { 786sub size_request {
745 my ($self) = @_; 787 my ($self) = @_;
746 788
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 790
… …
750} 792}
751 793
752sub size_allocate { 794sub size_allocate {
753 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
754 796
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
757 $self->child->configure (0, 0, $cw, $ch); 800 $self->child->configure (0, 0, $w, $h);
758 $self->update; 801 $self->update;
759} 802}
760 803
761sub set_offset { 804sub set_offset {
762 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
816 859
817 my $slider = new CFClient::UI::Slider 860 my $slider = new CFClient::UI::Slider
818 vertical => 1, 861 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 862 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 863 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 864 $self->{vp}->set_offset (0, $_[1]);
822 }, 865 },
823 ; 866 ;
824 867
825 $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 869 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 874 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 875 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 876 $self->add ($self->{slider});
834 877
835 $self 878 $self
879}
880
881sub update {
882 my ($self) = @_;
883
884 $self->SUPER::update;
885
886 # todo: overwrite size_allocate of child
887 my $child = $self->{vp}->child;
888 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
889}
890
891sub size_allocate {
892 my ($self, $w, $h) = @_;
893
894 $self->SUPER::size_allocate ($w, $h);
895
896 my $child = $self->{vp}->child;
897 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 898}
837 899
838#TODO# update range on size_allocate depending on child 900#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 901# update viewport offset on scroll
840 902
… …
894 my $class = shift; 956 my $class = shift;
895 957
896 # TODO: user_x, user_y, overwrite moveto? 958 # TODO: user_x, user_y, overwrite moveto?
897 959
898 my $self = $class->SUPER::new ( 960 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 961 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 962 border_bg => [1, 1, 1, 1],
901 border => 0.6, 963 border => 0.6,
902 toplevel => 1, 964 is_toplevel => 1,
903 can_events => 1, 965 can_events => 1,
904 @_ 966 @_
905 ); 967 );
906 968
907 $self->{title} &&= new CFClient::UI::Label 969 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 970 align => 0,
… …
1048sub new { 1110sub new {
1049 my $class = shift; 1111 my $class = shift;
1050 1112
1051 $class->SUPER::new ( 1113 $class->SUPER::new (
1052 col_expand => [], 1114 col_expand => [],
1053 @_ 1115 @_,
1054 ) 1116 )
1117}
1118
1119sub children {
1120 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1121}
1056 1122
1057sub add { 1123sub add {
1058 my ($self, $x, $y, $child) = @_; 1124 my ($self, $x, $y, $child) = @_;
1059 1125
1060 $child->set_parent ($self); 1126 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1127 $self->{children}[$y][$x] = $child;
1062 1128
1063 $child->check_size; 1129 $self->check_size (1);
1064} 1130}
1065 1131
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1132# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1133sub clear {
1072 my ($self) = @_; 1134 my ($self) = @_;
1073 1135
1074 my @children = $self->children; 1136 my @children = $self->children;
1075 delete $self->{children}; 1137 delete $self->{children};
… …
1077 for (@children) { 1139 for (@children) {
1078 delete $_->{parent}; 1140 delete $_->{parent};
1079 $_->hide; 1141 $_->hide;
1080 } 1142 }
1081 1143
1144 $self->check_size (1);
1082 $self->update; 1145 $self->update;
1083} 1146}
1084 1147
1085sub get_wh { 1148sub get_wh {
1086 my ($self) = @_; 1149 my ($self) = @_;
… …
1118sub size_allocate { 1181sub size_allocate {
1119 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1120 1183
1121 my ($ws, $hs) = $self->get_wh; 1184 my ($ws, $hs) = $self->get_wh;
1122 1185
1123 my $req_w = sum @$ws; 1186 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1187 my $req_h = (sum @$hs) || 1;
1125 1188
1126 # TODO: nicer code && do row_expand 1189 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1190 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1191 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1192 my $col_expand = (sum @col_expand) || 1;
… …
1510 $self->{text} = $text; 1573 $self->{text} = $text;
1511 1574
1512 $text =~ s/./*/g if $self->{hidden}; 1575 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1576 $self->{layout}->set_text ("$text ");
1514 1577
1515 $self->emit (changed => $self->{text}); 1578 $self->_emit (changed => $self->{text});
1516} 1579}
1517 1580
1518sub set_text { 1581sub set_text {
1519 my ($self, $text) = @_; 1582 my ($self, $text) = @_;
1520 1583
… …
1532 my ($self) = @_; 1595 my ($self) = @_;
1533 1596
1534 my ($w, $h) = $self->SUPER::size_request; 1597 my ($w, $h) = $self->SUPER::size_request;
1535 1598
1536 ($w + 1, $h) # add 1 for cursor 1599 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1600}
1544 1601
1545sub key_down { 1602sub key_down {
1546 my ($self, $ev) = @_; 1603 my ($self, $ev) = @_;
1547 1604
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1619 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1620 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1621 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1623 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1624 $self->_emit ('escape');
1568 } elsif ($uni) { 1625 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1626 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1627 }
1571 1628
1572 $self->_set_text ($text); 1629 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1716 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1717 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1718 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1719 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1720 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1721 $self->_emit (activate => $txt);
1665 $self->update; 1722 $self->update;
1666 1723
1667 } elsif ($sym == CFClient::SDLK_UP) { 1724 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1725 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1726 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1774 can_events => 1,
1718 @_ 1775 @_
1719 ) 1776 )
1720} 1777}
1721 1778
1779sub activate { }
1780
1722sub button_up { 1781sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1782 my ($self, $ev, $x, $y) = @_;
1724 1783
1784 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1785 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1786 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1787}
1730 1788
1731sub _draw { 1789sub _draw {
1732 my ($self) = @_; 1790 my ($self) = @_;
1733 1791
… …
1785 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1786 1844
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1847 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1848 $self->_emit (changed => $self->{state});
1791 } 1849 }
1792} 1850}
1793 1851
1794sub _draw { 1852sub _draw {
1795 my ($self) = @_; 1853 my ($self) = @_;
… …
2070 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2129 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2130 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2131 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2132 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2133 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2134 req_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2135 req_h => $::WIDTH / 80,
2078 vertical => 0, 2136 vertical => 0,
2079 can_hover => 1, 2137 can_hover => 1,
2080 inner_pad => 0.02, 2138 inner_pad => 0.02,
… …
2088} 2146}
2089 2147
2090sub set_range { 2148sub set_range {
2091 my ($self, $range) = @_; 2149 my ($self, $range) = @_;
2092 2150
2093 $self->{range} = $range; 2151 ($range, $self->{range}) = ($self->{range}, $range);
2094 2152
2095 $self->update; 2153 $self->update
2154 if "@$range" ne "@{$self->{range}}";
2096} 2155}
2097 2156
2098sub set_value { 2157sub set_value {
2099 my ($self, $value) = @_; 2158 my ($self, $value) = @_;
2100 2159
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2160 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2161
2103 $hi = $lo + 1 if $hi <= $lo; 2162 $hi = $lo + 1 if $hi <= $lo;
2104 2163
2164 $page = $hi - $lo if $page > $hi - $lo;
2165
2105 $value = $lo if $value < $lo; 2166 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2167 $value = $hi - $page if $value > $hi - $page;
2107 2168
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2169 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2170 if $unit;
2110 2171
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2172 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2173
2115 if ($value != $old_value) { 2174 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2175 $self->_emit (changed => $value);
2117 $self->update; 2176 $self->update;
2118 } 2177 }
2119} 2178}
2120 2179
2121sub size_request { 2180sub size_request {
… …
2129 2188
2130sub button_down { 2189sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2190 my ($self, $ev, $x, $y) = @_;
2132 2191
2133 $self->SUPER::button_down ($ev, $x, $y); 2192 $self->SUPER::button_down ($ev, $x, $y);
2193
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195
2134 $self->mouse_motion ($ev, $x, $y); 2196 $self->mouse_motion ($ev, $x, $y);
2135} 2197}
2136 2198
2137sub mouse_motion { 2199sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2200 my ($self, $ev, $x, $y) = @_;
… …
2140 if ($GRAB == $self) { 2202 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2203 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2204
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2205 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2206
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2208
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2148 } 2210 }
2149} 2211}
2150 2212
2151sub update { 2213sub update {
2152 my ($self) = @_; 2214 my ($self) = @_;
2153 2215
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]); 2217 $self->set_value ($self->{range}[0]);
2156 2218
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2219 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100;
2158 2221
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2222 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2223
2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2224 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2225 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2162 2226
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2227 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2228 $value = $value * $self->{scale} + $self->{offset};
2165 2229
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; 2230 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2231 $self->{knob_w} = $knob_w;
2173 }); 2232 });
2174 2233
2175 $self->SUPER::update; 2234 $self->SUPER::update;
2176} 2235}
2177 2236
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2352 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2353
2295 $self->reflow; 2354 $self->reflow;
2296} 2355}
2297 2356
2298sub text_height { 2357sub text_size {
2299 my ($self, $text, $indent) = @_; 2358 my ($self, $text, $indent) = @_;
2300 2359
2301 my $layout = $self->{layout}; 2360 my $layout = $self->{layout};
2302 2361
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2362 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2363 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2364 $layout->set_markup ($text);
2306 2365
2307 ($layout->size)[1] 2366 $layout->size
2308} 2367}
2309 2368
2310sub reflow { 2369sub reflow {
2311 my ($self) = @_; 2370 my ($self) = @_;
2312 2371
2313 $self->{need_reflow}++; 2372 $self->{need_reflow}++;
2314 $self->update; 2373 $self->update;
2315} 2374}
2316 2375
2376sub set_offset {
2377 my ($self, $offset) = @_;
2378
2379 # todo: base offset on lines or so, not on pixels
2380 $self->{children}[1]->set_value ($offset);
2381}
2382
2383sub clear {
2384 my ($self) = @_;
2385
2386 $self->{par} = [];
2387 $self->{height} = 0;
2388 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2389}
2390
2317sub add_paragraph { 2391sub add_paragraph {
2318 my ($self, $color, $text, $indent) = @_; 2392 my ($self, $color, $text, $indent) = @_;
2319 2393
2320 #TODO: intelligently "reformat" paragraph
2321
2322 for my $line (split /\n/, $text) { 2394 for my $line (split /\n/, $text) {
2323 my $height = $self->text_height ($line); 2395 my ($w, $h) = $self->text_size ($line);
2324 $self->{height} += $height; 2396 $self->{height} += $h;
2325 push @{$self->{par}}, [$height, $color, $indent, $line]; 2397 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2326 } 2398 }
2327 2399
2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2400 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2329 $self->{children}[1]->update;
2330} 2401}
2331 2402
2332sub update { 2403sub update {
2333 my ($self) = @_; 2404 my ($self) = @_;
2334 2405
… …
2337 return unless $self->{h} > 0; 2408 return unless $self->{h} > 0;
2338 2409
2339 delete $self->{texture}; 2410 delete $self->{texture};
2340 2411
2341 $ROOT->on_post_alloc ($self, sub { 2412 $ROOT->on_post_alloc ($self, sub {
2413 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2414
2342 if (delete $self->{need_reflow}) { 2415 if (delete $self->{need_reflow}) {
2343 my $height = 0; 2416 my $height = 0;
2344 2417
2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2418 my $layout = $self->{layout};
2419
2420 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2421
2346 for @{$self->{par}}; 2422 for (@{$self->{par}}) {
2423 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2424 $layout->set_width ($W - $_->[3]);
2425 $layout->set_markup ($_->[4]);
2426 my ($w, $h) = $layout->size;
2427 $_->[0] = $w + $_->[3];
2428 $_->[1] = $h;
2429 }
2430
2431 $height += $_->[1];
2432 }
2347 2433
2348 $self->{height} = $height; 2434 $self->{height} = $height;
2349 2435
2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2436 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2351 $self->{children}[1]->update;
2352 2437
2353 delete $self->{texture}; 2438 delete $self->{texture};
2354 } 2439 }
2355 2440
2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2357 glClearColor 0.5, 0.5, 0.5, 0; 2442 glClearColor 0.5, 0.5, 0.5, 0;
2358 glClear GL_COLOR_BUFFER_BIT; 2443 glClear GL_COLOR_BUFFER_BIT;
2359 2444
2360 my $top = int $self->{children}[1]{range}[0]; 2445 my $top = int $self->{children}[1]{range}[0];
2361 2446
2362 my $y0 = $top; 2447 my $y0 = $top;
2363 my $y1 = $top + $self->{h}; 2448 my $y1 = $top + $H;
2364 2449
2365 my $y = 0; 2450 my $y = 0;
2366 2451
2367 my $layout = $self->{layout}; 2452 my $layout = $self->{layout};
2368 2453
2369 $layout->set_font ($self->{font}) if $self->{font}; 2454 $layout->set_font ($self->{font}) if $self->{font};
2370 2455
2371 glEnable GL_BLEND; 2456 glEnable GL_BLEND;
2457 #TODO# not correct in windows where rgba is forced off
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2458 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373 2459
2374 for my $par (@{$self->{par}}) { 2460 for my $par (@{$self->{par}}) {
2375 my $h = $par->[0]; 2461 my $h = $par->[1];
2376 2462
2377 if ($y0 < $y + $h && $y < $y1) { 2463 if ($y0 < $y + $h && $y < $y1) {
2378 $layout->set_foreground (@{ $par->[1] }); 2464 $layout->set_foreground (@{ $par->[2] });
2379 $layout->set_width ($self->{w} - $par->[2]); 2465 $layout->set_width ($W - $par->[3]);
2380 $layout->set_markup ($par->[3]); 2466 $layout->set_markup ($par->[4]);
2381 2467
2382 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2468 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2383 2469
2384 glRasterPos $par->[2], $y - $y0; 2470 glRasterPos $par->[3], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2471 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2386 } 2472 }
2387 2473
2388 $y += $h; 2474 $y += $h;
2389 } 2475 }
… …
2476 2562
2477 # TODO: use animation 2563 # TODO: use animation
2478 if ($self->{state} = !$self->{state}) { 2564 if ($self->{state} = !$self->{state}) {
2479 $CFClient::UI::ROOT->add ($self->{other}); 2565 $CFClient::UI::ROOT->add ($self->{other});
2480 $self->{other}->move ($self->coord2global (0, $self->{h})); 2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2481 $self->emit ("open"); 2567 $self->_emit ("open");
2482 } else { 2568 } else {
2483 $CFClient::UI::ROOT->remove ($self->{other}); 2569 $CFClient::UI::ROOT->remove ($self->{other});
2484 $self->emit ("close"); 2570 $self->_emit ("close");
2485 } 2571 }
2486 2572
2487 $self->emit (changed => $self->{state}); 2573 $self->_emit (changed => $self->{state});
2488} 2574}
2489 2575
2490############################################################################# 2576#############################################################################
2491 2577
2492package CFClient::UI::Tooltip; 2578package CFClient::UI::Tooltip;
… …
2568 2654
2569sub new { 2655sub new {
2570 my $class = shift; 2656 my $class = shift;
2571 2657
2572 my $self = $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2573 aspect => 1, 2659 aspect => 1,
2660 can_events => 0,
2574 @_, 2661 @_,
2575 ); 2662 );
2576 2663
2577 if ($self->{anim} && $self->{animspeed}) { 2664 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self); 2665 Scalar::Util::weaken (my $widget = $self);
… …
2604} 2691}
2605 2692
2606sub _draw { 2693sub _draw {
2607 my ($self) = @_; 2694 my ($self) = @_;
2608 2695
2609 return unless $::CONN;#d# manage and cache textures differently 2696 return unless $::CONN;
2610 2697
2611 my $face; 2698 my $face;
2612 2699
2613 if ($self->{frame}) { 2700 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}]; 2701 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2637 $self->SUPER::DESTROY; 2724 $self->SUPER::DESTROY;
2638} 2725}
2639 2726
2640############################################################################# 2727#############################################################################
2641 2728
2642package CFClient::UI::InventoryItem; 2729package CFClient::UI::Inventory;
2643 2730
2644our @ISA = CFClient::UI::HBox::; 2731our @ISA = CFClient::UI::ScrolledWindow::;
2645
2646sub _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 2732
2672sub new { 2733sub new {
2673 my $class = shift; 2734 my $class = shift;
2674 2735
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 ( 2736 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
2744sub 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
2754package CFClient::UI::Inventory;
2755
2756our @ISA = CFClient::UI::ScrolledWindow::;
2757
2758sub new {
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table), 2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763 @_, 2738 @_,
2764 ); 2739 );
2765 2740
2766 $self 2741 $self
2767} 2742}
… …
2777 or ($a->{name} cmp $b->{name}) 2752 or ($a->{name} cmp $b->{name})
2778 } @$items; 2753 } @$items;
2779 2754
2780 $self->{real_items} = \@items; 2755 $self->{real_items} = \@items;
2781 2756
2757 my $row = 0;
2782 for my $item (@items) { 2758 for my $item (@items) {
2783 $item->{item} = $item; 2759 CFClient::Item::update_widgets $item;
2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2786 }
2787 2760
2788 my $i = 0; 2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2789 for (@items) { 2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2790 $self->{scrolled}->add (0, $i, $_); 2763 $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 2764
2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2765 $row++;
2766 }
2796} 2767}
2797 2768
2798sub size_request { 2769sub size_request {
2799 my ($self) = @_; 2770 my ($self) = @_;
2800 ($self->{req_w}, $self->{req_h}); 2771 ($self->{req_w}, $self->{req_h});
… …
2840 2811
2841# popup given the event (must be a mouse button down event currently) 2812# popup given the event (must be a mouse button down event currently)
2842sub popup { 2813sub popup {
2843 my ($self, $ev) = @_; 2814 my ($self, $ev) = @_;
2844 2815
2845 $self->emit ("popdown"); 2816 $self->_emit ("popdown");
2846 2817
2847 # maybe save $GRAB? must be careful about events... 2818 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self; 2819 $GRAB = $self;
2849 $self->{button} = $ev->{button}; 2820 $self->{button} = $ev->{button};
2850 2821
… …
2865 2836
2866 if ($ev->{button} == $self->{button}) { 2837 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB; 2838 undef $GRAB;
2868 $self->hide; 2839 $self->hide;
2869 2840
2870 $self->emit ("popdown"); 2841 $self->_emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 2842 $self->{hover}[1]->() if $self->{hover};
2872 } 2843 }
2873} 2844}
2874 2845
2875############################################################################# 2846#############################################################################
… …
2937sub add { 2908sub add {
2938 my ($self, $text, %arg) = @_; 2909 my ($self, $text, %arg) = @_;
2939 2910
2940 $text =~ s/^\s+//; 2911 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 2912 $text =~ s/\s+$//;
2913
2914 return unless $text;
2942 2915
2943 my $timeout = time + ((delete $arg{timeout}) || 60); 2916 my $timeout = time + ((delete $arg{timeout}) || 60);
2944 2917
2945 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2946 2919
… …
3017} 2990}
3018 2991
3019sub size_allocate { 2992sub size_allocate {
3020 my ($self, $w, $h) = @_; 2993 my ($self, $w, $h) = @_;
3021 2994
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) { 2995 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 2997
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x}; 2999 if exists $child->{req_x};
… …
3061} 3028}
3062 3029
3063sub add { 3030sub add {
3064 my ($self, @children) = @_; 3031 my ($self, @children) = @_;
3065 3032
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3066 for my $child (@children) { 3039 for my $child (@children) {
3067 $child->{toplevel} = 1; 3040 $child->{is_toplevel} = 1;
3068 3041
3069 # integerise window positions 3042 # integerise window positions
3070 $child->{x} = int $child->{x}; 3043 $child->{x} = int $child->{x};
3071 $child->{y} = int $child->{y}; 3044 $child->{y} = int $child->{y};
3072 } 3045 }
3073 3046
3074 $self->SUPER::add (@children); 3047 $self->SUPER::add (@children);
3048}
3049
3050sub remove {
3051 my ($self, @children) = @_;
3052
3053 $self->SUPER::remove (@children);
3075 3054
3076 while (@children) { 3055 while (@children) {
3077 my $w = pop @children; 3056 my $w = pop @children;
3078 push @children, $w->children; 3057 push @children, $w->children;
3079 $w->{visible} = 1; 3058 $w->set_invisible;
3080 }
3081}
3082
3083sub 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 } 3059 }
3093} 3060}
3094 3061
3095sub on_refresh { 3062sub on_refresh {
3096 my ($self, $id, $cb) = @_; 3063 my ($self, $id, $cb) = @_;
… …
3150 $w = 0 if $w < 0; 3117 $w = 0 if $w < 0;
3151 $h = 0 if $h < 0; 3118 $h = 0 if $h < 0;
3152 3119
3153 $widget->{w} = $w; 3120 $widget->{w} = $w;
3154 $widget->{h} = $h; 3121 $widget->{h} = $h;
3155 $widget->size_allocate ($w, $h);
3156 $widget->emit (size_allocate => $w, $h); 3122 $widget->emit (size_allocate => $w, $h);
3157 } 3123 }
3158 } 3124 }
3159 3125
3160 while ($self->{post_alloc_hook}) { 3126 while ($self->{post_alloc_hook}) {

Diff Legend

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