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.226 by root, Tue May 23 23:14:46 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
13our $ROOT; 14our $ROOT;
14our $TOOLTIP; 15our $TOOLTIP;
… …
50 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
51} 52}
52 53
53# class methods for events 54# class methods for events
54sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 57 if $FOCUS;
57} 58}
58 59
59sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 62 if $FOCUS;
62} 63}
63 64
64sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
65 my ($ev) = @_; 66 my ($ev) = @_;
… …
74 check_tooltip; 75 check_tooltip;
75 } 76 }
76 77
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 79
79 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 82}
84 83
85sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
86 my ($ev) = @_; 85 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
88 87
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 89
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 91
93 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 94
98 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 97 $grab->update if $grab;
101 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 115
119 check_tooltip; 116 check_tooltip;
120 } 117 }
121 118
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 120 if $HOVER;
126} 121}
127 122
128# convert position array to integers 123# convert position array to integers
129sub harmonize { 124sub harmonize {
130 my ($vals) = @_; 125 my ($vals) = @_;
… …
144 139
145 $_->update 140 $_->update
146 for @widgets; 141 for @widgets;
147} 142}
148 143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
149# call when resolution changes etc. 152# call when resolution changes etc.
150sub rescale_widgets { 153sub rescale_widgets {
151 my ($sx, $sy) = @_; 154 my ($sx, $sy) = @_;
152 155
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 156 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 158 $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}; 159 $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}; 160 $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}; 161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 162 $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}; 163 $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}; 164 $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}; 165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 166 }
167
168 $widget->reconfigure;
169 } 167 }
168
169 reconfigure_widgets;
170} 170}
171 171
172############################################################################# 172#############################################################################
173 173
174package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 225 },
226 ); 226 );
227} 227}
228 228
229sub hide { 229sub set_invisible {
230 my ($self) = @_; 230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{root};
235 delete $self->{visible};
231 236
232 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
239
240 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self;
242
243 $self->focus_out;
244}
245
246sub hide {
247 my ($self) = @_;
248
249 $self->set_invisible;
234 250
235 $self->{parent}->remove ($self) 251 $self->{parent}->remove ($self)
236 if $self->{parent}; 252 if $self->{parent};
237} 253}
238 254
… …
308} 324}
309 325
310sub set_tooltip { 326sub set_tooltip {
311 my ($self, $tooltip) = @_; 327 my ($self, $tooltip) = @_;
312 328
329 $tooltip =~ s/^\s+//;
330 $tooltip =~ s/\s+$//;
331
332 return if $self->{tooltip} eq $tooltip;
333
313 $self->{tooltip} = $tooltip; 334 $self->{tooltip} = $tooltip;
314 335
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 337 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 338 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 359 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 360 return unless $self->{can_focus};
340 361
341 my $focus = $FOCUS; $FOCUS = $self; 362 my $focus = $FOCUS; $FOCUS = $self;
342 363
343 $self->emit (focus_in => $focus); 364 $self->_emit (focus_in => $focus);
344 365
345 $focus->update if $focus; 366 $focus->update if $focus;
346 $FOCUS->update; 367 $FOCUS->update;
347} 368}
348 369
… …
351 372
352 return unless $FOCUS == $self; 373 return unless $FOCUS == $self;
353 374
354 my $focus = $FOCUS; undef $FOCUS; 375 my $focus = $FOCUS; undef $FOCUS;
355 376
356 $self->emit (focus_out => $focus); 377 $self->_emit (focus_out => $focus);
357 378
358 $focus->update if $focus; #? 379 $focus->update if $focus; #?
380
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS;
359} 383}
360 384
361sub mouse_motion { } 385sub mouse_motion { }
362sub button_up { } 386sub button_up { }
363sub key_down { } 387sub key_down { }
364sub key_up { } 388sub key_up { }
365 389
366sub button_down { 390sub button_down {
367 my ($self, $ev, $x, $y) = @_; 391 my ($self, $ev, $x, $y) = @_;
368 392
369 $self->focus_in; 393 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 428 glPushMatrix;
405 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 432 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
412 glEnd; 436 glEnd;
413 glPopMatrix; 437 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 439 }
416} 440}
… …
436sub set_parent { 460sub set_parent {
437 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
438 462
439 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
440 464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
441 # TODO: req_w _does_change after ->reconfigure 468 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 469 $self->check_size
443 unless exists $self->{req_w}; 470 unless exists $self->{req_w};
444 471
445 $self->show; 472 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 490 my ($self, $signal, $cb) = @_;
464 491
465 push @{ $self->{signal_cb}{$signal} }, $cb; 492 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 493}
467 494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
468sub emit { 501sub emit {
469 my ($self, $signal, @args) = @_; 502 my ($self, $signal, @args) = @_;
470 503
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
472} 506}
473 507
474sub DESTROY { 508sub DESTROY {
475 my ($self) = @_; 509 my ($self) = @_;
476 510
… …
589 delete $child->{parent}; 623 delete $child->{parent};
590 $child->hide; 624 $child->hide;
591 625
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 627
594 $self->check_size; 628 $self->check_size (1);
595 $self->update; 629 $self->update;
596} 630}
597 631
598sub clear { 632sub clear {
599 my ($self) = @_; 633 my ($self) = @_;
… …
739 773
740package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
741 775
742our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
743 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
744sub size_request { 788sub size_request {
745 my ($self) = @_; 789 my ($self) = @_;
746 790
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 792
… …
750} 794}
751 795
752sub size_allocate { 796sub size_allocate {
753 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
754 798
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
757 $self->child->configure (0, 0, $cw, $ch); 802 $self->child->configure (0, 0, $w, $h);
758 $self->update; 803 $self->update;
759} 804}
760 805
761sub set_offset { 806sub set_offset {
762 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
… …
816 861
817 my $slider = new CFClient::UI::Slider 862 my $slider = new CFClient::UI::Slider
818 vertical => 1, 863 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 864 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 865 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 866 $self->{vp}->set_offset (0, $_[1]);
822 }, 867 },
823 ; 868 ;
824 869
825 $self = $class->SUPER::new ( 870 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 871 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 877 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
834 879
835 $self 880 $self
881}
882
883sub update {
884 my ($self) = @_;
885
886 $self->SUPER::update;
887
888 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
891}
892
893sub size_allocate {
894 my ($self, $w, $h) = @_;
895
896 $self->SUPER::size_allocate ($w, $h);
897
898 my $child = $self->{vp}->child;
899 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 900}
837 901
838#TODO# update range on size_allocate depending on child 902#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 903# update viewport offset on scroll
840 904
… …
894 my $class = shift; 958 my $class = shift;
895 959
896 # TODO: user_x, user_y, overwrite moveto? 960 # TODO: user_x, user_y, overwrite moveto?
897 961
898 my $self = $class->SUPER::new ( 962 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 963 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 964 border_bg => [1, 1, 1, 1],
901 border => 0.6, 965 border => 0.6,
902 toplevel => 1, 966 is_toplevel => 1,
903 can_events => 1, 967 can_events => 1,
904 @_ 968 @_
905 ); 969 );
906 970
907 $self->{title} &&= new CFClient::UI::Label 971 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 972 align => 0,
… …
1048sub new { 1112sub new {
1049 my $class = shift; 1113 my $class = shift;
1050 1114
1051 $class->SUPER::new ( 1115 $class->SUPER::new (
1052 col_expand => [], 1116 col_expand => [],
1053 @_ 1117 @_,
1054 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1123}
1056 1124
1057sub add { 1125sub add {
1058 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
1059 1127
1060 $child->set_parent ($self); 1128 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
1062 1130
1063 $child->check_size; 1131 $self->check_size (1);
1064} 1132}
1065 1133
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1134# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1135sub clear {
1072 my ($self) = @_; 1136 my ($self) = @_;
1073 1137
1074 my @children = $self->children; 1138 my @children = $self->children;
1075 delete $self->{children}; 1139 delete $self->{children};
… …
1077 for (@children) { 1141 for (@children) {
1078 delete $_->{parent}; 1142 delete $_->{parent};
1079 $_->hide; 1143 $_->hide;
1080 } 1144 }
1081 1145
1146 $self->check_size (1);
1082 $self->update; 1147 $self->update;
1083} 1148}
1084 1149
1085sub get_wh { 1150sub get_wh {
1086 my ($self) = @_; 1151 my ($self) = @_;
… …
1118sub size_allocate { 1183sub size_allocate {
1119 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1120 1185
1121 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1122 1187
1123 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1125 1190
1126 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
… …
1510 $self->{text} = $text; 1575 $self->{text} = $text;
1511 1576
1512 $text =~ s/./*/g if $self->{hidden}; 1577 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1578 $self->{layout}->set_text ("$text ");
1514 1579
1515 $self->emit (changed => $self->{text}); 1580 $self->_emit (changed => $self->{text});
1516} 1581}
1517 1582
1518sub set_text { 1583sub set_text {
1519 my ($self, $text) = @_; 1584 my ($self, $text) = @_;
1520 1585
… …
1532 my ($self) = @_; 1597 my ($self) = @_;
1533 1598
1534 my ($w, $h) = $self->SUPER::size_request; 1599 my ($w, $h) = $self->SUPER::size_request;
1535 1600
1536 ($w + 1, $h) # add 1 for cursor 1601 ($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} 1602}
1544 1603
1545sub key_down { 1604sub key_down {
1546 my ($self, $ev) = @_; 1605 my ($self, $ev) = @_;
1547 1606
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1621 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1622 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1623 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1625 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1626 $self->_emit ('escape');
1568 } elsif ($uni) { 1627 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1628 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1629 }
1571 1630
1572 $self->_set_text ($text); 1631 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1718 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1719 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1720 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1721 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1722 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1723 $self->_emit (activate => $txt);
1665 $self->update; 1724 $self->update;
1666 1725
1667 } elsif ($sym == CFClient::SDLK_UP) { 1726 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1727 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1728 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1776 can_events => 1,
1718 @_ 1777 @_
1719 ) 1778 )
1720} 1779}
1721 1780
1781sub activate { }
1782
1722sub button_up { 1783sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1784 my ($self, $ev, $x, $y) = @_;
1724 1785
1786 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1787 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1788 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1789}
1730 1790
1731sub _draw { 1791sub _draw {
1732 my ($self) = @_; 1792 my ($self) = @_;
1733 1793
… …
1785 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1786 1846
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1849 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1850 $self->_emit (changed => $self->{state});
1791 } 1851 }
1792} 1852}
1793 1853
1794sub _draw { 1854sub _draw {
1795 my ($self) = @_; 1855 my ($self) = @_;
… …
2070 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2131 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2132 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2133 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2134 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2135 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2136 req_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2137 req_h => $::WIDTH / 80,
2078 vertical => 0, 2138 vertical => 0,
2079 can_hover => 1, 2139 can_hover => 1,
2080 inner_pad => 0.02, 2140 inner_pad => 0.02,
… …
2088} 2148}
2089 2149
2090sub set_range { 2150sub set_range {
2091 my ($self, $range) = @_; 2151 my ($self, $range) = @_;
2092 2152
2093 $self->{range} = $range; 2153 ($range, $self->{range}) = ($self->{range}, $range);
2094 2154
2095 $self->update; 2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2096} 2157}
2097 2158
2098sub set_value { 2159sub set_value {
2099 my ($self, $value) = @_; 2160 my ($self, $value) = @_;
2100 2161
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2162 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2163
2103 $hi = $lo + 1 if $hi <= $lo; 2164 $hi = $lo + 1 if $hi <= $lo;
2104 2165
2166 $page = $hi - $lo if $page > $hi - $lo;
2167
2105 $value = $lo if $value < $lo; 2168 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2169 $value = $hi - $page if $value > $hi - $page;
2107 2170
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2171 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2172 if $unit;
2110 2173
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2175
2115 if ($value != $old_value) { 2176 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2177 $self->_emit (changed => $value);
2117 $self->update; 2178 $self->update;
2118 } 2179 }
2119} 2180}
2120 2181
2121sub size_request { 2182sub size_request {
… …
2129 2190
2130sub button_down { 2191sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2192 my ($self, $ev, $x, $y) = @_;
2132 2193
2133 $self->SUPER::button_down ($ev, $x, $y); 2194 $self->SUPER::button_down ($ev, $x, $y);
2195
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197
2134 $self->mouse_motion ($ev, $x, $y); 2198 $self->mouse_motion ($ev, $x, $y);
2135} 2199}
2136 2200
2137sub mouse_motion { 2201sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
… …
2140 if ($GRAB == $self) { 2204 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2205 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2206
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2207 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2208
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2210
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2148 } 2212 }
2149} 2213}
2150 2214
2151sub update { 2215sub update {
2152 my ($self) = @_; 2216 my ($self) = @_;
2153 2217
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]); 2219 $self->set_value ($self->{range}[0]);
2156 2220
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2221 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100;
2158 2223
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2224 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2225
2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2226 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2227 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2162 2228
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2229 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2230 $value = $value * $self->{scale} + $self->{offset};
2165 2231
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; 2232 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2233 $self->{knob_w} = $knob_w;
2173 }); 2234 });
2174 2235
2175 $self->SUPER::update; 2236 $self->SUPER::update;
2176} 2237}
2177 2238
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2354 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2355
2295 $self->reflow; 2356 $self->reflow;
2296} 2357}
2297 2358
2298sub text_height { 2359sub text_size {
2299 my ($self, $text, $indent) = @_; 2360 my ($self, $text, $indent) = @_;
2300 2361
2301 my $layout = $self->{layout}; 2362 my $layout = $self->{layout};
2302 2363
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2365 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2366 $layout->set_markup ($text);
2306 2367
2307 ($layout->size)[1] 2368 $layout->size
2308} 2369}
2309 2370
2310sub reflow { 2371sub reflow {
2311 my ($self) = @_; 2372 my ($self) = @_;
2312 2373
2313 $self->{need_reflow}++; 2374 $self->{need_reflow}++;
2314 $self->update; 2375 $self->update;
2315} 2376}
2316 2377
2378sub set_offset {
2379 my ($self, $offset) = @_;
2380
2381 # todo: base offset on lines or so, not on pixels
2382 $self->{children}[1]->set_value ($offset);
2383}
2384
2317sub clear { 2385sub clear {
2318 my ($self) = @_; 2386 my ($self) = @_;
2319 2387
2320 $self->{par} = []; 2388 $self->{par} = [];
2321 $self->{height} = 0; 2389 $self->{height} = 0;
2322 2390 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2323 $self->reflow;
2324} 2391}
2325 2392
2326sub add_paragraph { 2393sub add_paragraph {
2327 my ($self, $color, $text, $indent) = @_; 2394 my ($self, $color, $text, $indent) = @_;
2328 2395
2329 for my $line (split /\n/, $text) { 2396 for my $line (split /\n/, $text) {
2330 my $height = $self->text_height ($line); 2397 my ($w, $h) = $self->text_size ($line);
2331 $self->{height} += $height; 2398 $self->{height} += $h;
2332 push @{$self->{par}}, [$height, $color, $indent, $line]; 2399 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2333 } 2400 }
2334 2401
2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2402 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2336 $self->{children}[1]->update;
2337} 2403}
2338 2404
2339sub update { 2405sub update {
2340 my ($self) = @_; 2406 my ($self) = @_;
2341 2407
… …
2344 return unless $self->{h} > 0; 2410 return unless $self->{h} > 0;
2345 2411
2346 delete $self->{texture}; 2412 delete $self->{texture};
2347 2413
2348 $ROOT->on_post_alloc ($self, sub { 2414 $ROOT->on_post_alloc ($self, sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416
2349 if (delete $self->{need_reflow}) { 2417 if (delete $self->{need_reflow}) {
2350 my $height = 0; 2418 my $height = 0;
2351 2419
2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2420 my $layout = $self->{layout};
2421
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423
2353 for @{$self->{par}}; 2424 for (@{$self->{par}}) {
2425 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2426 $layout->set_width ($W - $_->[3]);
2427 $layout->set_markup ($_->[4]);
2428 my ($w, $h) = $layout->size;
2429 $_->[0] = $w + $_->[3];
2430 $_->[1] = $h;
2431 }
2432
2433 $height += $_->[1];
2434 }
2354 2435
2355 $self->{height} = $height; 2436 $self->{height} = $height;
2356 2437
2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2438 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2358 $self->{children}[1]->update;
2359 2439
2360 delete $self->{texture}; 2440 delete $self->{texture};
2361 } 2441 }
2362 2442
2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2364 glClearColor 0.5, 0.5, 0.5, 0; 2444 glClearColor 0.5, 0.5, 0.5, 0;
2365 glClear GL_COLOR_BUFFER_BIT; 2445 glClear GL_COLOR_BUFFER_BIT;
2366 2446
2367 my $top = int $self->{children}[1]{range}[0]; 2447 my $top = int $self->{children}[1]{range}[0];
2368 2448
2369 my $y0 = $top; 2449 my $y0 = $top;
2370 my $y1 = $top + $self->{h}; 2450 my $y1 = $top + $H;
2371 2451
2372 my $y = 0; 2452 my $y = 0;
2373 2453
2374 my $layout = $self->{layout}; 2454 my $layout = $self->{layout};
2375 2455
2376 $layout->set_font ($self->{font}) if $self->{font}; 2456 $layout->set_font ($self->{font}) if $self->{font};
2377 2457
2378 glEnable GL_BLEND; 2458 glEnable GL_BLEND;
2459 #TODO# not correct in windows where rgba is forced off
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2460 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380 2461
2381 for my $par (@{$self->{par}}) { 2462 for my $par (@{$self->{par}}) {
2382 my $h = $par->[0]; 2463 my $h = $par->[1];
2383 2464
2384 if ($y0 < $y + $h && $y < $y1) { 2465 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] }); 2466 $layout->set_foreground (@{ $par->[2] });
2386 $layout->set_width ($self->{w} - $par->[2]); 2467 $layout->set_width ($W - $par->[3]);
2387 $layout->set_markup ($par->[3]); 2468 $layout->set_markup ($par->[4]);
2388 2469
2389 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2470 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2390 2471
2391 glRasterPos $par->[2], $y - $y0; 2472 glRasterPos $par->[3], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2473 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2393 } 2474 }
2394 2475
2395 $y += $h; 2476 $y += $h;
2396 } 2477 }
… …
2483 2564
2484 # TODO: use animation 2565 # TODO: use animation
2485 if ($self->{state} = !$self->{state}) { 2566 if ($self->{state} = !$self->{state}) {
2486 $CFClient::UI::ROOT->add ($self->{other}); 2567 $CFClient::UI::ROOT->add ($self->{other});
2487 $self->{other}->move ($self->coord2global (0, $self->{h})); 2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2488 $self->emit ("open"); 2569 $self->_emit ("open");
2489 } else { 2570 } else {
2490 $CFClient::UI::ROOT->remove ($self->{other}); 2571 $CFClient::UI::ROOT->remove ($self->{other});
2491 $self->emit ("close"); 2572 $self->_emit ("close");
2492 } 2573 }
2493 2574
2494 $self->emit (changed => $self->{state}); 2575 $self->_emit (changed => $self->{state});
2495} 2576}
2496 2577
2497############################################################################# 2578#############################################################################
2498 2579
2499package CFClient::UI::Tooltip; 2580package CFClient::UI::Tooltip;
… …
2575 2656
2576sub new { 2657sub new {
2577 my $class = shift; 2658 my $class = shift;
2578 2659
2579 my $self = $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2580 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2581 @_, 2663 @_,
2582 ); 2664 );
2583 2665
2584 if ($self->{anim} && $self->{animspeed}) { 2666 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self); 2667 Scalar::Util::weaken (my $widget = $self);
… …
2611} 2693}
2612 2694
2613sub _draw { 2695sub _draw {
2614 my ($self) = @_; 2696 my ($self) = @_;
2615 2697
2616 return unless $::CONN;#d# manage and cache textures differently 2698 return unless $::CONN;
2617 2699
2618 my $face; 2700 my $face;
2619 2701
2620 if ($self->{frame}) { 2702 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}]; 2703 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2644 $self->SUPER::DESTROY; 2726 $self->SUPER::DESTROY;
2645} 2727}
2646 2728
2647############################################################################# 2729#############################################################################
2648 2730
2649package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2650 2732
2651our @ISA = CFClient::UI::HBox::; 2733our @ISA = CFClient::UI::ScrolledWindow::;
2652
2653sub _item_to_desc {
2654 my ($item) = @_;
2655
2656 my $desc =
2657 $item->{nrof} < 2
2658 ? $item->{name}
2659 : "$item->{nrof} × $item->{name_pl}";
2660
2661 $item->{flags} & Crossfire::Protocol::F_OPEN
2662 and $desc .= " (open)";
2663 $item->{flags} & Crossfire::Protocol::F_APPLIED
2664 and $desc .= " (applied)";
2665 $item->{flags} & Crossfire::Protocol::F_UNPAID
2666 and $desc .= " (unpaid)";
2667 $item->{flags} & Crossfire::Protocol::F_MAGIC
2668 and $desc .= " (magic)";
2669 $item->{flags} & Crossfire::Protocol::F_CURSED
2670 and $desc .= " (cursed)";
2671 $item->{flags} & Crossfire::Protocol::F_DAMNED
2672 and $desc .= " (damned)";
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED
2674 and $desc .= " *";
2675
2676 $desc
2677}
2678 2734
2679sub new { 2735sub new {
2680 my $class = shift; 2736 my $class = shift;
2681 2737
2682 my %args = @_;
2683
2684 my $item = delete $args{item};
2685
2686 my $desc = _item_to_desc ($item);
2687
2688 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
2689 can_hover => 1,
2690 can_events => 1,
2691 tooltip => ((CFClient::UI::Label::escape $desc)
2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2693 connect_button_down => sub {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2698 my $targ = $::CONN->{player}{tag};
2699
2700 if ($item->{container} == $::CONN->{player}{tag}) {
2701 $targ = $main::OPENCONT;
2702 }
2703
2704 $::CONN->send ("move $targ $item->{tag} 0");
2705 } elsif ($ev->{button} == 1) {
2706 $::CONN->send ("examine $item->{tag}");
2707 } elsif ($ev->{button} == 2) {
2708 $::CONN->send ("apply $item->{tag}");
2709 } elsif ($ev->{button} == 3) {
2710 my @menu_items = (
2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2712 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2713 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714 (
2715 $item->{flags} & Crossfire::Protocol::F_LOCKED
2716 ? (
2717 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718 )
2719 : (
2720 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2721 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2722 )
2723 ),
2724 );
2725
2726 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2727 }
2728
2729 1
2730 },
2731 %args
2732 );
2733
2734
2735 $self->add (new CFClient::UI::Face
2736 can_events => 0,
2737 face => $item->{face},
2738 anim => $item->{anim},
2739 animspeed => $item->{animspeed},
2740 );
2741
2742 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2743
2744 $self->{item} = $item;
2745
2746 $self->update_item;
2747
2748 $self
2749}
2750
2751sub update_item {
2752 my ($self) = @_;
2753
2754 my $desc = _item_to_desc ($self->{item});
2755
2756 $self->{name_lbl}->set_text ($desc);
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table), 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_, 2740 @_,
2771 ); 2741 );
2772 2742
2773 $self 2743 $self
2774} 2744}
… …
2784 or ($a->{name} cmp $b->{name}) 2754 or ($a->{name} cmp $b->{name})
2785 } @$items; 2755 } @$items;
2786 2756
2787 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2788 2758
2759 my $row = 0;
2789 for my $item (@items) { 2760 for my $item (@items) {
2790 $item->{item} = $item; 2761 CFClient::Item::update_widgets $item;
2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792 $item->update_item ();
2793 }
2794 2762
2795 my $i = 0; 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2796 for (@items) { 2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2797 $self->{scrolled}->add (0, $i, $_); 2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2798 my $nrof = $_->{item}->{nrof} || 1;
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800 }
2801 2766
2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2803} 2769}
2804 2770
2805sub size_request { 2771sub size_request {
2806 my ($self) = @_; 2772 my ($self) = @_;
2807 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2847 2813
2848# popup given the event (must be a mouse button down event currently) 2814# popup given the event (must be a mouse button down event currently)
2849sub popup { 2815sub popup {
2850 my ($self, $ev) = @_; 2816 my ($self, $ev) = @_;
2851 2817
2852 $self->emit ("popdown"); 2818 $self->_emit ("popdown");
2853 2819
2854 # maybe save $GRAB? must be careful about events... 2820 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 2821 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 2822 $self->{button} = $ev->{button};
2857 2823
… …
2872 2838
2873 if ($ev->{button} == $self->{button}) { 2839 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 2840 undef $GRAB;
2875 $self->hide; 2841 $self->hide;
2876 2842
2877 $self->emit ("popdown"); 2843 $self->_emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 2844 $self->{hover}[1]->() if $self->{hover};
2879 } 2845 }
2880} 2846}
2881 2847
2882############################################################################# 2848#############################################################################
… …
2944sub add { 2910sub add {
2945 my ($self, $text, %arg) = @_; 2911 my ($self, $text, %arg) = @_;
2946 2912
2947 $text =~ s/^\s+//; 2913 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
2949 2917
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 2918 my $timeout = time + ((delete $arg{timeout}) || 60);
2951 2919
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 2921
… …
2997 2965
2998sub new { 2966sub new {
2999 my $class = shift; 2967 my $class = shift;
3000 2968
3001 $class->SUPER::new ( 2969 $class->SUPER::new (
2970 visible => 1,
3002 @_, 2971 @_,
3003 ) 2972 )
3004} 2973}
3005 2974
3006sub configure { 2975sub configure {
… …
3024} 2993}
3025 2994
3026sub size_allocate { 2995sub size_allocate {
3027 my ($self, $w, $h) = @_; 2996 my ($self, $w, $h) = @_;
3028 2997
3029 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3030 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3031
3032 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3033 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3034
3035 for my $child ($self->children) { 2998 for my $child ($self->children) {
3036 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3037 3000
3038 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3039 if exists $child->{req_x}; 3002 if exists $child->{req_x};
… …
3068} 3031}
3069 3032
3070sub add { 3033sub add {
3071 my ($self, @children) = @_; 3034 my ($self, @children) = @_;
3072 3035
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3073 for my $child (@children) { 3042 for my $child (@children) {
3074 $child->{toplevel} = 1; 3043 $child->{is_toplevel} = 1;
3075 3044
3076 # integerise window positions 3045 # integerise window positions
3077 $child->{x} = int $child->{x}; 3046 $child->{x} = int $child->{x};
3078 $child->{y} = int $child->{y}; 3047 $child->{y} = int $child->{y};
3079 } 3048 }
3080 3049
3081 $self->SUPER::add (@children); 3050 $self->SUPER::add (@children);
3051}
3052
3053sub remove {
3054 my ($self, @children) = @_;
3055
3056 $self->SUPER::remove (@children);
3082 3057
3083 while (@children) { 3058 while (@children) {
3084 my $w = pop @children; 3059 my $w = pop @children;
3085 push @children, $w->children; 3060 push @children, $w->children;
3086 $w->{visible} = 1; 3061 $w->set_invisible;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 } 3062 }
3100} 3063}
3101 3064
3102sub on_refresh { 3065sub on_refresh {
3103 my ($self, $id, $cb) = @_; 3066 my ($self, $id, $cb) = @_;
… …
3157 $w = 0 if $w < 0; 3120 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3121 $h = 0 if $h < 0;
3159 3122
3160 $widget->{w} = $w; 3123 $widget->{w} = $w;
3161 $widget->{h} = $h; 3124 $widget->{h} = $h;
3162 $widget->size_allocate ($w, $h);
3163 $widget->emit (size_allocate => $w, $h); 3125 $widget->emit (size_allocate => $w, $h);
3164 } 3126 }
3165 } 3127 }
3166 3128
3167 while ($self->{post_alloc_hook}) { 3129 while ($self->{post_alloc_hook}) {

Diff Legend

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