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.219 by root, Sun May 21 00:34:59 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) = @_;
… …
136 $rem += $_ - $i; 131 $rem += $_ - $i;
137 $_ = $i; 132 $_ = $i;
138 } 133 }
139} 134}
140 135
136sub full_refresh {
137 # make a copy, otherwise for complains about freed values.
138 my @widgets = values %WIDGET;
139
140 $_->update
141 for @widgets;
142}
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
141# call when resolution changes etc. 152# call when resolution changes etc.
142sub rescale_widgets { 153sub rescale_widgets {
143 my ($sx, $sy) = @_; 154 my ($sx, $sy) = @_;
144 155
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 156 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 157 if ($widget->{is_toplevel}) {
150 $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};
151 $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};
152 $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};
153 $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};
154 $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};
155 $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};
156 $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};
157 $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};
158 } 166 }
159
160 $widget->reconfigure;
161 } 167 }
168
169 reconfigure_widgets;
162} 170}
163 171
164############################################################################# 172#############################################################################
165 173
166package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
198 %$self = (); 206 %$self = ();
199} 207}
200 208
201sub show { 209sub show {
202 my ($self) = @_; 210 my ($self) = @_;
203
204 return if $self->{parent}; 211 return if $self->{parent};
205 212
206 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
207} 214}
208 215
209sub hide { 216sub show_centered {
210 my ($self) = @_; 217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
229sub set_invisible {
230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{root};
235 delete $self->{visible};
211 236
212 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
213 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;
214 250
215 $self->{parent}->remove ($self) 251 $self->{parent}->remove ($self)
216 if $self->{parent}; 252 if $self->{parent};
217} 253}
218 254
… …
288} 324}
289 325
290sub set_tooltip { 326sub set_tooltip {
291 my ($self, $tooltip) = @_; 327 my ($self, $tooltip) = @_;
292 328
329 $tooltip =~ s/^\s+//;
330 $tooltip =~ s/\s+$//;
331
332 return if $self->{tooltip} eq $tooltip;
333
293 $self->{tooltip} = $tooltip; 334 $self->{tooltip} = $tooltip;
294 335
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 337 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 338 CFClient::UI::check_tooltip;
… …
318 return if $FOCUS == $self; 359 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 360 return unless $self->{can_focus};
320 361
321 my $focus = $FOCUS; $FOCUS = $self; 362 my $focus = $FOCUS; $FOCUS = $self;
322 363
323 $self->emit (focus_in => $focus); 364 $self->_emit (focus_in => $focus);
324 365
325 $focus->update if $focus; 366 $focus->update if $focus;
326 $FOCUS->update; 367 $FOCUS->update;
327} 368}
328 369
… …
331 372
332 return unless $FOCUS == $self; 373 return unless $FOCUS == $self;
333 374
334 my $focus = $FOCUS; undef $FOCUS; 375 my $focus = $FOCUS; undef $FOCUS;
335 376
336 $self->emit (focus_out => $focus); 377 $self->_emit (focus_out => $focus);
337 378
338 $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;
339} 383}
340 384
341sub mouse_motion { } 385sub mouse_motion { }
342sub button_up { } 386sub button_up { }
343sub key_down { } 387sub key_down { }
344sub key_up { } 388sub key_up { }
345 389
346sub button_down { 390sub button_down {
347 my ($self, $ev, $x, $y) = @_; 391 my ($self, $ev, $x, $y) = @_;
348 392
349 $self->focus_in; 393 $self->focus_in;
… …
383 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix; 428 glPushMatrix;
385 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 432 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
392 glEnd; 436 glEnd;
393 glPopMatrix; 437 glPopMatrix;
394 #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;
395 } 439 }
396} 440}
… …
416sub set_parent { 460sub set_parent {
417 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
418 462
419 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
420 464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
421 # TODO: req_w _does_change after ->reconfigure 468 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 469 $self->check_size
423 unless exists $self->{req_w}; 470 unless exists $self->{req_w};
471
472 $self->show;
424} 473}
425 474
426sub check_size { 475sub check_size {
427 my ($self, $forced) = @_; 476 my ($self, $forced) = @_;
428 477
… …
441 my ($self, $signal, $cb) = @_; 490 my ($self, $signal, $cb) = @_;
442 491
443 push @{ $self->{signal_cb}{$signal} }, $cb; 492 push @{ $self->{signal_cb}{$signal} }, $cb;
444} 493}
445 494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
446sub emit { 501sub emit {
447 my ($self, $signal, @args) = @_; 502 my ($self, $signal, @args) = @_;
448 503
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
450} 506}
451 507
452sub DESTROY { 508sub DESTROY {
453 my ($self) = @_; 509 my ($self) = @_;
454 510
… …
567 delete $child->{parent}; 623 delete $child->{parent};
568 $child->hide; 624 $child->hide;
569 625
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 627
572 $self->check_size; 628 $self->check_size (1);
573 $self->update; 629 $self->update;
574} 630}
575 631
576sub clear { 632sub clear {
577 my ($self) = @_; 633 my ($self) = @_;
… …
717 773
718package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
719 775
720our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
721 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
722sub size_request { 788sub size_request {
723 my ($self) = @_; 789 my ($self) = @_;
724 790
725 @$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)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 792
728 @$self{qw(child_w child_h)} 793 @$self{qw(child_w child_h)}
729} 794}
730 795
731sub size_allocate { 796sub size_allocate {
732 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
733 798
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
802 $self->child->configure (0, 0, $w, $h);
734 $self->update; 803 $self->update;
735} 804}
736 805
737sub set_offset { 806sub set_offset {
738 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
… …
792 861
793 my $slider = new CFClient::UI::Slider 862 my $slider = new CFClient::UI::Slider
794 vertical => 1, 863 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 864 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 865 connect_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 866 $self->{vp}->set_offset (0, $_[1]);
798 }, 867 },
799 ; 868 ;
800 869
801 $self = $class->SUPER::new ( 870 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort expand => 1), 871 vp => (new CFClient::UI::ViewPort expand => 1),
… …
807 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 877 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
810 879
811 $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]);
812} 900}
813 901
814#TODO# update range on size_allocate depending on child 902#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 903# update viewport offset on scroll
816 904
… …
870 my $class = shift; 958 my $class = shift;
871 959
872 # TODO: user_x, user_y, overwrite moveto? 960 # TODO: user_x, user_y, overwrite moveto?
873 961
874 my $self = $class->SUPER::new ( 962 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 963 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 964 border_bg => [1, 1, 1, 1],
877 border => 0.6, 965 border => 0.6,
878 toplevel => 1, 966 is_toplevel => 1,
879 can_events => 1, 967 can_events => 1,
880 @_ 968 @_
881 ); 969 );
882 970
883 $self->{title} &&= new CFClient::UI::Label 971 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 972 align => 0,
… …
1024sub new { 1112sub new {
1025 my $class = shift; 1113 my $class = shift;
1026 1114
1027 $class->SUPER::new ( 1115 $class->SUPER::new (
1028 col_expand => [], 1116 col_expand => [],
1029 @_ 1117 @_,
1030 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1123}
1032 1124
1033sub add { 1125sub add {
1034 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
1035 1127
1036 $child->set_parent ($self); 1128 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
1038 1130
1039 $child->check_size; 1131 $self->check_size (1);
1040} 1132}
1041 1133
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# 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?
1047sub clear { 1135sub clear {
1048 my ($self) = @_; 1136 my ($self) = @_;
1049 1137
1050 my @children = $self->children; 1138 my @children = $self->children;
1051 delete $self->{children}; 1139 delete $self->{children};
… …
1053 for (@children) { 1141 for (@children) {
1054 delete $_->{parent}; 1142 delete $_->{parent};
1055 $_->hide; 1143 $_->hide;
1056 } 1144 }
1057 1145
1146 $self->check_size (1);
1058 $self->update; 1147 $self->update;
1059} 1148}
1060 1149
1061sub get_wh { 1150sub get_wh {
1062 my ($self) = @_; 1151 my ($self) = @_;
… …
1094sub size_allocate { 1183sub size_allocate {
1095 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1096 1185
1097 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1098 1187
1099 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1101 1190
1102 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
… …
1466 active_fg => [0, 0, 0], 1555 active_fg => [0, 0, 0],
1467 can_hover => 1, 1556 can_hover => 1,
1468 can_focus => 1, 1557 can_focus => 1,
1469 valign => 0, 1558 valign => 0,
1470 can_events => 1, 1559 can_events => 1,
1560 #text => ...
1471 @_ 1561 @_
1472 ) 1562 )
1473} 1563}
1474 1564
1475sub _set_text { 1565sub _set_text {
… …
1485 $self->{text} = $text; 1575 $self->{text} = $text;
1486 1576
1487 $text =~ s/./*/g if $self->{hidden}; 1577 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1578 $self->{layout}->set_text ("$text ");
1489 1579
1490 $self->emit (changed => $self->{text}); 1580 $self->_emit (changed => $self->{text});
1491} 1581}
1492 1582
1493sub set_text { 1583sub set_text {
1494 my ($self, $text) = @_; 1584 my ($self, $text) = @_;
1495 1585
… …
1507 my ($self) = @_; 1597 my ($self) = @_;
1508 1598
1509 my ($w, $h) = $self->SUPER::size_request; 1599 my ($w, $h) = $self->SUPER::size_request;
1510 1600
1511 ($w + 1, $h) # add 1 for cursor 1601 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1602}
1519 1603
1520sub key_down { 1604sub key_down {
1521 my ($self, $ev) = @_; 1605 my ($self, $ev) = @_;
1522 1606
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1621 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1622 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1623 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1625 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1626 $self->_emit ('escape');
1543 } elsif ($uni) { 1627 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1628 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1629 }
1546 1630
1547 $self->_set_text ($text); 1631 $self->_set_text ($text);
… …
1634 if ($sym == 13) { 1718 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1719 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1720 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1721 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1722 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1723 $self->_emit (activate => $txt);
1640 $self->update; 1724 $self->update;
1641 1725
1642 } elsif ($sym == CFClient::SDLK_UP) { 1726 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1727 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1728 $self->{history_saveback} = $self->get_text;
… …
1692 can_events => 1, 1776 can_events => 1,
1693 @_ 1777 @_
1694 ) 1778 )
1695} 1779}
1696 1780
1781sub activate { }
1782
1697sub button_up { 1783sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1784 my ($self, $ev, $x, $y) = @_;
1699 1785
1786 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1787 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1788 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1789}
1705 1790
1706sub _draw { 1791sub _draw {
1707 my ($self) = @_; 1792 my ($self) = @_;
1708 1793
… …
1760 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1761 1846
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764 $self->{state} = !$self->{state}; 1849 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1850 $self->_emit (changed => $self->{state});
1766 } 1851 }
1767} 1852}
1768 1853
1769sub _draw { 1854sub _draw {
1770 my ($self) = @_; 1855 my ($self) = @_;
… …
2045 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2131 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2132 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2133 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2134 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2135 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2136 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2137 req_h => $::WIDTH / 80,
2053 vertical => 0, 2138 vertical => 0,
2054 can_hover => 1, 2139 can_hover => 1,
2055 inner_pad => 0.02, 2140 inner_pad => 0.02,
… …
2060 $self->update; 2145 $self->update;
2061 2146
2062 $self 2147 $self
2063} 2148}
2064 2149
2150sub set_range {
2151 my ($self, $range) = @_;
2152
2153 ($range, $self->{range}) = ($self->{range}, $range);
2154
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2157}
2158
2065sub set_value { 2159sub set_value {
2066 my ($self, $value) = @_; 2160 my ($self, $value) = @_;
2067 2161
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2162 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2163
2070 $hi = $lo + 1 if $hi <= $lo; 2164 $hi = $lo + 1 if $hi <= $lo;
2071 2165
2166 $page = $hi - $lo if $page > $hi - $lo;
2167
2072 $value = $lo if $value < $lo; 2168 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2169 $value = $hi - $page if $value > $hi - $page;
2074 2170
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2171 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2172 if $unit;
2077 2173
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2175
2082 if ($value != $old_value) { 2176 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2177 $self->_emit (changed => $value);
2084 $self->update; 2178 $self->update;
2085 } 2179 }
2086} 2180}
2087 2181
2088sub size_request { 2182sub size_request {
… …
2096 2190
2097sub button_down { 2191sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2192 my ($self, $ev, $x, $y) = @_;
2099 2193
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2198 $self->mouse_motion ($ev, $x, $y);
2102} 2199}
2103 2200
2104sub mouse_motion { 2201sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2204 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2205 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2206
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2207 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2208
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2210
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2212 }
2116} 2213}
2117 2214
2118sub update { 2215sub update {
2119 my ($self) = @_; 2216 my ($self) = @_;
2120 2217
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2219 $self->set_value ($self->{range}[0]);
2123 2220
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2221 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100;
2125 2223
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2224 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2225
2128 $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;
2129 2228
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2229 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2230 $value = $value * $self->{scale} + $self->{offset};
2132 2231
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2232 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2233 $self->{knob_w} = $knob_w;
2140 }); 2234 });
2141 2235
2142 $self->SUPER::update; 2236 $self->SUPER::update;
2143} 2237}
2144 2238
… …
2168 # draw handle 2262 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2263 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2264
2171 glDisable GL_TEXTURE_2D; 2265 glDisable GL_TEXTURE_2D;
2172} 2266}
2267
2268#############################################################################
2269
2270package CFClient::UI::ValSlider;
2271
2272our @ISA = CFClient::UI::HBox::;
2273
2274sub new {
2275 my ($class, %arg) = @_;
2276
2277 my $range = delete $arg{range};
2278
2279 my $self = $class->SUPER::new (
2280 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2281 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2282 to_value => sub { shift },
2283 from_value => sub { shift },
2284 %arg,
2285 );
2286
2287 $self->{slider}->connect (changed => sub {
2288 my ($self, $value) = @_;
2289 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2290 $self->{parent}->emit (changed => $value);
2291 });
2292
2293# $self->{entry}->connect (changed => sub {
2294# my ($self, $value) = @_;
2295# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2296# $self->{parent}->emit (changed => $value);
2297# });
2298
2299 $self->add ($self->{slider}, $self->{entry});
2300
2301 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2302
2303 $self
2304}
2305
2306sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) }
2173 2308
2174############################################################################# 2309#############################################################################
2175 2310
2176package CFClient::UI::TextView; 2311package CFClient::UI::TextView;
2177 2312
… …
2207 2342
2208 $self->{fontsize} = $fontsize; 2343 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2344 $self->reflow;
2210} 2345}
2211 2346
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2347sub size_allocate {
2232 my ($self, $w, $h) = @_; 2348 my ($self, $w, $h) = @_;
2233 2349
2234 $self->SUPER::size_allocate ($w, $h); 2350 $self->SUPER::size_allocate ($w, $h);
2235 2351
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2354 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2355
2240 $self->reflow; 2356 $self->reflow;
2241} 2357}
2242 2358
2359sub text_size {
2360 my ($self, $text, $indent) = @_;
2361
2362 my $layout = $self->{layout};
2363
2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2365 $layout->set_width ($self->{children}[0]{w} - $indent);
2366 $layout->set_markup ($text);
2367
2368 $layout->size
2369}
2370
2371sub reflow {
2372 my ($self) = @_;
2373
2374 $self->{need_reflow}++;
2375 $self->update;
2376}
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
2385sub clear {
2386 my ($self) = @_;
2387
2388 $self->{par} = [];
2389 $self->{height} = 0;
2390 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2391}
2392
2243sub add_paragraph { 2393sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2394 my ($self, $color, $text, $indent) = @_;
2245 2395
2246 #TODO: intelligently "reformat" paragraph 2396 for my $line (split /\n/, $text) {
2247 2397 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2398 $self->{height} += $h;
2399 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2400 }
2251 2401
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $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]);
2255 $self->{children}[1]->update;
2256} 2403}
2257 2404
2258sub update { 2405sub update {
2259 my ($self) = @_; 2406 my ($self) = @_;
2260 2407
… …
2263 return unless $self->{h} > 0; 2410 return unless $self->{h} > 0;
2264 2411
2265 delete $self->{texture}; 2412 delete $self->{texture};
2266 2413
2267 $ROOT->on_post_alloc ($self, sub { 2414 $ROOT->on_post_alloc ($self, sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416
2268 if (delete $self->{need_reflow}) { 2417 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2418 my $height = 0;
2270 2419
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2420 my $layout = $self->{layout};
2421
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423
2272 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 }
2273 2435
2274 $self->{height} = $height; 2436 $self->{height} = $height;
2275 2437
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2438 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2439
2278 delete $self->{texture}; 2440 delete $self->{texture};
2279 } 2441 }
2280 2442
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2444 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2445 glClear GL_COLOR_BUFFER_BIT;
2284 2446
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2447 my $top = int $self->{children}[1]{range}[0];
2289 2448
2290 my $y0 = $top; 2449 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2450 my $y1 = $top + $H;
2292 2451
2293 my $y = 0; 2452 my $y = 0;
2294 2453
2295 my $layout = $self->{layout}; 2454 my $layout = $self->{layout};
2296 2455
2297 $layout->set_font ($self->{font}) if $self->{font}; 2456 $layout->set_font ($self->{font}) if $self->{font};
2298 2457
2458 glEnable GL_BLEND;
2459 #TODO# not correct in windows where rgba is forced off
2460 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2461
2299 for my $par (@{$self->{par}}) { 2462 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2463 my $h = $par->[1];
2301 2464
2302 if ($y0 < $y + $h && $y < $y1) { 2465 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2466 $layout->set_foreground (@{ $par->[2] });
2467 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2468 $layout->set_markup ($par->[4]);
2305 2469
2306 my ($W, $H) = $layout->size; 2470 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2471
2472 glRasterPos $par->[3], $y - $y0;
2473 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2474 }
2309 2475
2310 $y += $h; 2476 $y += $h;
2311 } 2477 }
2312 2478
2313 glDisable GL_TEXTURE_2D; 2479 glDisable GL_BLEND;
2314 }; 2480 };
2315 }); 2481 });
2316} 2482}
2317 2483
2318sub _draw { 2484sub _draw {
… …
2398 2564
2399 # TODO: use animation 2565 # TODO: use animation
2400 if ($self->{state} = !$self->{state}) { 2566 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other}); 2567 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h})); 2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open"); 2569 $self->_emit ("open");
2404 } else { 2570 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other}); 2571 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close"); 2572 $self->_emit ("close");
2407 } 2573 }
2408 2574
2409 $self->emit (changed => $self->{state}); 2575 $self->_emit (changed => $self->{state});
2410} 2576}
2411 2577
2412############################################################################# 2578#############################################################################
2413 2579
2414package CFClient::UI::Tooltip; 2580package CFClient::UI::Tooltip;
… …
2490 2656
2491sub new { 2657sub new {
2492 my $class = shift; 2658 my $class = shift;
2493 2659
2494 my $self = $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2495 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2496 @_, 2663 @_,
2497 ); 2664 );
2498 2665
2499 if ($self->{anim} && $self->{animspeed}) { 2666 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self); 2667 Scalar::Util::weaken (my $widget = $self);
… …
2515 2682
2516sub size_request { 2683sub size_request {
2517 (32, 8) 2684 (32, 8)
2518} 2685}
2519 2686
2687sub update {
2688 my ($self) = @_;
2689
2690 return unless $self->{visible};
2691
2692 $self->SUPER::update;
2693}
2694
2520sub _draw { 2695sub _draw {
2521 my ($self) = @_; 2696 my ($self) = @_;
2522 2697
2523 return unless $::CONN;#d# manage and cache textures differently 2698 return unless $::CONN;
2524 2699
2525 my $face; 2700 my $face;
2526 2701
2527 if ($self->{frame}) { 2702 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}]; 2703 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2551 $self->SUPER::DESTROY; 2726 $self->SUPER::DESTROY;
2552} 2727}
2553 2728
2554############################################################################# 2729#############################################################################
2555 2730
2556package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2557 2732
2558our @ISA = CFClient::UI::HBox::; 2733our @ISA = CFClient::UI::ScrolledWindow::;
2559
2560sub _item_to_desc {
2561 my ($item) = @_;
2562
2563 my $desc =
2564 $item->{nrof} < 2
2565 ? $item->{name}
2566 : "$item->{nrof} × $item->{name_pl}";
2567
2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2569 and $desc .= " (open)";
2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2571 and $desc .= " (applied)";
2572 $item->{flags} & Crossfire::Protocol::F_UNPAID
2573 and $desc .= " (unpaid)";
2574 $item->{flags} & Crossfire::Protocol::F_MAGIC
2575 and $desc .= " (magic)";
2576 $item->{flags} & Crossfire::Protocol::F_CURSED
2577 and $desc .= " (cursed)";
2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2579 and $desc .= " (damned)";
2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2581 and $desc .= " *";
2582
2583 $desc
2584}
2585 2734
2586sub new { 2735sub new {
2587 my $class = shift; 2736 my $class = shift;
2588 2737
2589 my %args = @_;
2590
2591 my $item = delete $args{item};
2592
2593 my $desc = _item_to_desc ($item);
2594
2595 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
2596 can_hover => 1, 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2597 can_events => 1,
2598 tooltip => ((CFClient::UI::Label::escape $desc)
2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2600 connect_button_down => sub {
2601 my ($self, $ev, $x, $y) = @_;
2602
2603 # todo: maybe put examine on 1? but should just be a tooltip :(
2604 if ($ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag};
2606
2607 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT;
2609 }
2610
2611 $::CONN->send ("move $targ $item->{tag} 0");
2612 } elsif ($ev->{button} == 2) {
2613 $::CONN->send ("apply $item->{tag}");
2614 } elsif ($ev->{button} == 3) {
2615 my @menu_items = (
2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 (
2620 $item->{flags} & Crossfire::Protocol::F_LOCKED
2621 ? (
2622 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2623 )
2624 : (
2625 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2626 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2627 )
2628 ),
2629 );
2630
2631 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2632 }
2633
2634 1
2635 },
2636 %args
2637 );
2638
2639
2640 $self->add (new CFClient::UI::Face
2641 can_events => 0,
2642 face => $item->{face},
2643 anim => $item->{anim},
2644 animspeed => $item->{animspeed},
2645 );
2646
2647 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2648
2649 $self->{item} = $item;
2650
2651 $self->update_item;
2652
2653 $self
2654}
2655
2656sub update_item {
2657 my ($self) = @_;
2658
2659 my $desc = _item_to_desc ($self->{item});
2660
2661 $self->{name_lbl}->set_text ($desc);
2662}
2663
2664#############################################################################
2665
2666package CFClient::UI::Inventory;
2667
2668our @ISA = CFClient::UI::ScrolledWindow::;
2669
2670sub new {
2671 my $class = shift;
2672
2673 my $self = $class->SUPER::new (
2674 scrolled => (new CFClient::UI::VBox),
2675 @_, 2740 @_,
2676 ); 2741 );
2677 2742
2678 $self 2743 $self
2679} 2744}
… …
2689 or ($a->{name} cmp $b->{name}) 2754 or ($a->{name} cmp $b->{name})
2690 } @$items; 2755 } @$items;
2691 2756
2692 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2693 2758
2759 my $row = 0;
2694 for my $item (@items) { 2760 for my $item (@items) {
2695 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2761 CFClient::Item::update_widgets $item;
2696 $item->update_item ();
2697 }
2698 2762
2699 $self->{scrolled}->add (@items); 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2700 2766
2701# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2702} 2769}
2703 2770
2704sub size_request { 2771sub size_request {
2705 my ($self) = @_; 2772 my ($self) = @_;
2706 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2746 2813
2747# 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)
2748sub popup { 2815sub popup {
2749 my ($self, $ev) = @_; 2816 my ($self, $ev) = @_;
2750 2817
2751 $self->emit ("popdown"); 2818 $self->_emit ("popdown");
2752 2819
2753 # maybe save $GRAB? must be careful about events... 2820 # maybe save $GRAB? must be careful about events...
2754 $GRAB = $self; 2821 $GRAB = $self;
2755 $self->{button} = $ev->{button}; 2822 $self->{button} = $ev->{button};
2756 2823
… …
2771 2838
2772 if ($ev->{button} == $self->{button}) { 2839 if ($ev->{button} == $self->{button}) {
2773 undef $GRAB; 2840 undef $GRAB;
2774 $self->hide; 2841 $self->hide;
2775 2842
2776 $self->emit ("popdown"); 2843 $self->_emit ("popdown");
2777 $self->{hover}[1]->() if $self->{hover}; 2844 $self->{hover}[1]->() if $self->{hover};
2778 } 2845 }
2779} 2846}
2780 2847
2781############################################################################# 2848#############################################################################
… …
2843sub add { 2910sub add {
2844 my ($self, $text, %arg) = @_; 2911 my ($self, $text, %arg) = @_;
2845 2912
2846 $text =~ s/^\s+//; 2913 $text =~ s/^\s+//;
2847 $text =~ s/\s+$//; 2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
2848 2917
2849 my $timeout = time + ((delete $arg{timeout}) || 60); 2918 my $timeout = time + ((delete $arg{timeout}) || 60);
2850 2919
2851 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2852 2921
… …
2896 2965
2897sub new { 2966sub new {
2898 my $class = shift; 2967 my $class = shift;
2899 2968
2900 $class->SUPER::new ( 2969 $class->SUPER::new (
2970 visible => 1,
2901 @_, 2971 @_,
2902 ) 2972 )
2903} 2973}
2904 2974
2905sub configure { 2975sub configure {
… …
2923} 2993}
2924 2994
2925sub size_allocate { 2995sub size_allocate {
2926 my ($self, $w, $h) = @_; 2996 my ($self, $w, $h) = @_;
2927 2997
2928 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2929 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2930
2931 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2932 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2933
2934 for my $child ($self->children) { 2998 for my $child ($self->children) {
2935 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)};
2936 3000
2937 $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
2938 if exists $child->{req_x}; 3002 if exists $child->{req_x};
… …
2967} 3031}
2968 3032
2969sub add { 3033sub add {
2970 my ($self, @children) = @_; 3034 my ($self, @children) = @_;
2971 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
2972 for my $child (@children) { 3042 for my $child (@children) {
2973 $child->{toplevel} = 1; 3043 $child->{is_toplevel} = 1;
2974 3044
2975 # integerise window positions 3045 # integerise window positions
2976 $child->{x} = int $child->{x}; 3046 $child->{x} = int $child->{x};
2977 $child->{y} = int $child->{y}; 3047 $child->{y} = int $child->{y};
2978 } 3048 }
2979 3049
2980 $self->SUPER::add (@children); 3050 $self->SUPER::add (@children);
3051}
3052
3053sub remove {
3054 my ($self, @children) = @_;
3055
3056 $self->SUPER::remove (@children);
3057
3058 while (@children) {
3059 my $w = pop @children;
3060 push @children, $w->children;
3061 $w->set_invisible;
3062 }
2981} 3063}
2982 3064
2983sub on_refresh { 3065sub on_refresh {
2984 my ($self, $id, $cb) = @_; 3066 my ($self, $id, $cb) = @_;
2985 3067
… …
3038 $w = 0 if $w < 0; 3120 $w = 0 if $w < 0;
3039 $h = 0 if $h < 0; 3121 $h = 0 if $h < 0;
3040 3122
3041 $widget->{w} = $w; 3123 $widget->{w} = $w;
3042 $widget->{h} = $h; 3124 $widget->{h} = $h;
3043 $widget->size_allocate ($w, $h);
3044 $widget->emit (size_allocate => $w, $h); 3125 $widget->emit (size_allocate => $w, $h);
3045 } 3126 }
3046 } 3127 }
3047 3128
3048 while ($self->{post_alloc_hook}) { 3129 while ($self->{post_alloc_hook}) {

Diff Legend

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