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.244 by root, Sat May 27 21:06:09 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
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $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}; 178 $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}; 179 $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}; 180 $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}; 181 $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}; 182 $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}; 183 $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}; 184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 185 }
167
168 $widget->reconfigure;
169 } 186 }
187
188 reconfigure_widgets;
170} 189}
171 190
172############################################################################# 191#############################################################################
173 192
174package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
187 can_events => 1, 206 can_events => 1,
188 @_ 207 @_
189 }, $class; 208 }, $class;
190 209
191 for (keys %$self) { 210 for (keys %$self) {
192 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
194 } 213 }
195 } 214 }
196 215
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
198 224
199 $self 225 $self
200} 226}
201 227
202sub destroy { 228sub destroy {
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 251 },
226 ); 252 );
227} 253}
228 254
229sub hide { 255sub set_invisible {
230 my ($self) = @_; 256 my ($self) = @_;
257
258 return unless $self->{visible};
259
260 # broken show/hide model
261
262 delete $self->{root};
263 delete $self->{visible};
231 264
232 undef $GRAB if $GRAB == $self; 265 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 266 undef $HOVER if $HOVER == $self;
267
268 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self;
270
271 $self->focus_out;
272
273 $self->emit (visibility_change => 0);
274}
275
276sub hide {
277 my ($self) = @_;
278
279 $self->set_invisible;
234 280
235 $self->{parent}->remove ($self) 281 $self->{parent}->remove ($self)
236 if $self->{parent}; 282 if $self->{parent};
237} 283}
238 284
… …
308} 354}
309 355
310sub set_tooltip { 356sub set_tooltip {
311 my ($self, $tooltip) = @_; 357 my ($self, $tooltip) = @_;
312 358
359 $tooltip =~ s/^\s+//;
360 $tooltip =~ s/\s+$//;
361
362 return if $self->{tooltip} eq $tooltip;
363
313 $self->{tooltip} = $tooltip; 364 $self->{tooltip} = $tooltip;
314 365
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 366 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 367 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 368 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 389 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 390 return unless $self->{can_focus};
340 391
341 my $focus = $FOCUS; $FOCUS = $self; 392 my $focus = $FOCUS; $FOCUS = $self;
342 393
343 $self->emit (focus_in => $focus); 394 $self->_emit (focus_in => $focus);
344 395
345 $focus->update if $focus; 396 $focus->update if $focus;
346 $FOCUS->update; 397 $FOCUS->update;
347} 398}
348 399
… …
351 402
352 return unless $FOCUS == $self; 403 return unless $FOCUS == $self;
353 404
354 my $focus = $FOCUS; undef $FOCUS; 405 my $focus = $FOCUS; undef $FOCUS;
355 406
356 $self->emit (focus_out => $focus); 407 $self->_emit (focus_out => $focus);
357 408
358 $focus->update if $focus; #? 409 $focus->update if $focus; #?
410
411 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
412 unless $FOCUS;
359} 413}
360 414
361sub mouse_motion { } 415sub mouse_motion { }
362sub button_up { } 416sub button_up { }
363sub key_down { } 417sub key_down { }
364sub key_up { } 418sub key_up { }
365 419
366sub button_down { 420sub button_down {
367 my ($self, $ev, $x, $y) = @_; 421 my ($self, $ev, $x, $y) = @_;
368 422
369 $self->focus_in; 423 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 457 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 458 glPushMatrix;
405 glColor 1, 1, 0, 1; 459 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 461 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 462 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 463 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 464 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 465 glVertex 0 , $self->{h} - 1;
412 glEnd; 466 glEnd;
413 glPopMatrix; 467 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 468 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 469 }
416} 470}
… …
436sub set_parent { 490sub set_parent {
437 my ($self, $parent) = @_; 491 my ($self, $parent) = @_;
438 492
439 Scalar::Util::weaken ($self->{parent} = $parent); 493 Scalar::Util::weaken ($self->{parent} = $parent);
440 494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
441 # TODO: req_w _does_change after ->reconfigure 503 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 504 $self->check_size
443 unless exists $self->{req_w}; 505 unless exists $self->{req_w};
444 506
445 $self->show; 507 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 525 my ($self, $signal, $cb) = @_;
464 526
465 push @{ $self->{signal_cb}{$signal} }, $cb; 527 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 528}
467 529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
468sub emit { 536sub emit {
469 my ($self, $signal, @args) = @_; 537 my ($self, $signal, @args) = @_;
470 538
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
472} 545}
473 546
474sub DESTROY { 547sub DESTROY {
475 my ($self) = @_; 548 my ($self) = @_;
476 549
… …
589 delete $child->{parent}; 662 delete $child->{parent};
590 $child->hide; 663 $child->hide;
591 664
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 666
594 $self->check_size; 667 $self->check_size (1);
595 $self->update; 668 $self->update;
596} 669}
597 670
598sub clear { 671sub clear {
599 my ($self) = @_; 672 my ($self) = @_;
… …
739 812
740package CFClient::UI::ViewPort; 813package CFClient::UI::ViewPort;
741 814
742our @ISA = CFClient::UI::Window::; 815our @ISA = CFClient::UI::Window::;
743 816
817sub new {
818 my $class = shift;
819
820 $class->SUPER::new (
821 scroll_x => 0,
822 scroll_y => 1,
823 @_,
824 )
825}
826
744sub size_request { 827sub size_request {
745 my ($self) = @_; 828 my ($self) = @_;
746 829
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 831
… …
750} 833}
751 834
752sub size_allocate { 835sub size_allocate {
753 my ($self, $w, $h) = @_; 836 my ($self, $w, $h) = @_;
754 837
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
840
757 $self->child->configure (0, 0, $cw, $ch); 841 $self->child->configure (0, 0, $w, $h);
758 $self->update; 842 $self->update;
759} 843}
760 844
761sub set_offset { 845sub set_offset {
762 my ($self, $x, $y) = @_; 846 my ($self, $x, $y) = @_;
… …
813 my $class = shift; 897 my $class = shift;
814 898
815 my $self; 899 my $self;
816 900
817 my $slider = new CFClient::UI::Slider 901 my $slider = new CFClient::UI::Slider
818 vertical => 1, 902 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 903 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 904 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 905 $self->{vp}->set_offset (0, $_[1]);
822 }, 906 },
823 ; 907 ;
824 908
825 $self = $class->SUPER::new ( 909 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 910 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 915 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 916 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 917 $self->add ($self->{slider});
834 918
835 $self 919 $self
920}
921
922sub update {
923 my ($self) = @_;
924
925 $self->SUPER::update;
926
927 # todo: overwrite size_allocate of child
928 my $child = $self->{vp}->child;
929 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
930}
931
932sub size_allocate {
933 my ($self, $w, $h) = @_;
934
935 $self->SUPER::size_allocate ($w, $h);
936
937 my $child = $self->{vp}->child;
938 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 939}
837 940
838#TODO# update range on size_allocate depending on child 941#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 942# update viewport offset on scroll
840 943
… …
894 my $class = shift; 997 my $class = shift;
895 998
896 # TODO: user_x, user_y, overwrite moveto? 999 # TODO: user_x, user_y, overwrite moveto?
897 1000
898 my $self = $class->SUPER::new ( 1001 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1002 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1003 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1004 border => 0.6,
902 toplevel => 1, 1005 is_toplevel => 1,
903 can_events => 1, 1006 can_events => 1,
904 @_ 1007 @_
905 ); 1008 );
906 1009
907 $self->{title} &&= new CFClient::UI::Label 1010 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 1011 align => 0,
… …
961 my ($ev, $x, $y) = @_; 1064 my ($ev, $x, $y) = @_;
962 1065
963 my $dx = $ev->{x} - $ox; 1066 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1067 my $dy = $ev->{y} - $oy;
965 1068
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1073 $self->move ($self->{user_x}, $self->{user_y});
969 $self->check_size; 1074 $self->check_size;
970 }; 1075 };
971 1076
972 } elsif ($lr ^ $td) { 1077 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1078 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
976 $self->{motion} = sub { 1081 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
978 1083
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1084 ($x, $y) = ($ev->{x}, $ev->{y});
980 1085
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1086 $self->{user_x} = $bx + $x - $ox;
1087 $self->{user_y} = $by + $y - $oy;
1088 $self->move ($self->{user_x}, $self->{user_y});
982 $self->update; 1089 $self->update;
983 }; 1090 };
984 } 1091 }
985} 1092}
986 1093
… …
1048sub new { 1155sub new {
1049 my $class = shift; 1156 my $class = shift;
1050 1157
1051 $class->SUPER::new ( 1158 $class->SUPER::new (
1052 col_expand => [], 1159 col_expand => [],
1053 @_ 1160 @_,
1054 ) 1161 )
1162}
1163
1164sub children {
1165 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1166}
1056 1167
1057sub add { 1168sub add {
1058 my ($self, $x, $y, $child) = @_; 1169 my ($self, $x, $y, $child) = @_;
1059 1170
1060 $child->set_parent ($self); 1171 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1172 $self->{children}[$y][$x] = $child;
1062 1173
1063 $child->check_size; 1174 $self->check_size (1);
1064} 1175}
1065 1176
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1177# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1178sub clear {
1072 my ($self) = @_; 1179 my ($self) = @_;
1073 1180
1074 my @children = $self->children; 1181 my @children = $self->children;
1075 delete $self->{children}; 1182 delete $self->{children};
… …
1077 for (@children) { 1184 for (@children) {
1078 delete $_->{parent}; 1185 delete $_->{parent};
1079 $_->hide; 1186 $_->hide;
1080 } 1187 }
1081 1188
1189 $self->check_size (1);
1082 $self->update; 1190 $self->update;
1083} 1191}
1084 1192
1085sub get_wh { 1193sub get_wh {
1086 my ($self) = @_; 1194 my ($self) = @_;
… …
1118sub size_allocate { 1226sub size_allocate {
1119 my ($self, $w, $h) = @_; 1227 my ($self, $w, $h) = @_;
1120 1228
1121 my ($ws, $hs) = $self->get_wh; 1229 my ($ws, $hs) = $self->get_wh;
1122 1230
1123 my $req_w = sum @$ws; 1231 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1232 my $req_h = (sum @$hs) || 1;
1125 1233
1126 # TODO: nicer code && do row_expand 1234 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1235 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1236 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1237 my $col_expand = (sum @col_expand) || 1;
… …
1510 $self->{text} = $text; 1618 $self->{text} = $text;
1511 1619
1512 $text =~ s/./*/g if $self->{hidden}; 1620 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1621 $self->{layout}->set_text ("$text ");
1514 1622
1515 $self->emit (changed => $self->{text}); 1623 $self->_emit (changed => $self->{text});
1516} 1624}
1517 1625
1518sub set_text { 1626sub set_text {
1519 my ($self, $text) = @_; 1627 my ($self, $text) = @_;
1520 1628
… …
1532 my ($self) = @_; 1640 my ($self) = @_;
1533 1641
1534 my ($w, $h) = $self->SUPER::size_request; 1642 my ($w, $h) = $self->SUPER::size_request;
1535 1643
1536 ($w + 1, $h) # add 1 for cursor 1644 ($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} 1645}
1544 1646
1545sub key_down { 1647sub key_down {
1546 my ($self, $ev) = @_; 1648 my ($self, $ev) = @_;
1547 1649
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1664 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1665 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1666 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1667 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1668 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1669 $self->_emit ('escape');
1568 } elsif ($uni) { 1670 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1671 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1672 }
1571 1673
1572 $self->_set_text ($text); 1674 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1761 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1762 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1763 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1764 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1765 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1766 $self->_emit (activate => $txt);
1665 $self->update; 1767 $self->update;
1666 1768
1667 } elsif ($sym == CFClient::SDLK_UP) { 1769 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1770 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1771 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1819 can_events => 1,
1718 @_ 1820 @_
1719 ) 1821 )
1720} 1822}
1721 1823
1824sub activate { }
1825
1722sub button_up { 1826sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1827 my ($self, $ev, $x, $y) = @_;
1724 1828
1829 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1830 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1831 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1832}
1730 1833
1731sub _draw { 1834sub _draw {
1732 my ($self) = @_; 1835 my ($self) = @_;
1733 1836
… …
1785 my ($self, $ev, $x, $y) = @_; 1888 my ($self, $ev, $x, $y) = @_;
1786 1889
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1892 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1893 $self->_emit (changed => $self->{state});
1791 } 1894 }
1792} 1895}
1793 1896
1794sub _draw { 1897sub _draw {
1795 my ($self) = @_; 1898 my ($self) = @_;
… …
2070 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2179 req_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2180 req_h => $::WIDTH / 80,
2078 vertical => 0, 2181 vertical => 0,
2079 can_hover => 1, 2182 can_hover => 1,
2080 inner_pad => 0.02, 2183 inner_pad => 0.02,
… …
2088} 2191}
2089 2192
2090sub set_range { 2193sub set_range {
2091 my ($self, $range) = @_; 2194 my ($self, $range) = @_;
2092 2195
2093 $self->{range} = $range; 2196 ($range, $self->{range}) = ($self->{range}, $range);
2094 2197
2095 $self->update; 2198 $self->update
2199 if "@$range" ne "@{$self->{range}}";
2096} 2200}
2097 2201
2098sub set_value { 2202sub set_value {
2099 my ($self, $value) = @_; 2203 my ($self, $value) = @_;
2100 2204
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2205 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2206
2103 $hi = $lo + 1 if $hi <= $lo; 2207 $hi = $lo + 1 if $hi <= $lo;
2104 2208
2209 $page = $hi - $lo if $page > $hi - $lo;
2210
2105 $value = $lo if $value < $lo; 2211 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2212 $value = $hi - $page if $value > $hi - $page;
2107 2213
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2214 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2215 if $unit;
2110 2216
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2217 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2218
2115 if ($value != $old_value) { 2219 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2220 $self->_emit (changed => $value);
2117 $self->update; 2221 $self->update;
2118 } 2222 }
2119} 2223}
2120 2224
2121sub size_request { 2225sub size_request {
… …
2129 2233
2130sub button_down { 2234sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2132 2236
2133 $self->SUPER::button_down ($ev, $x, $y); 2237 $self->SUPER::button_down ($ev, $x, $y);
2238
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240
2134 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2135} 2242}
2136 2243
2137sub mouse_motion { 2244sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
… …
2140 if ($GRAB == $self) { 2247 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2249
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2250 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2251
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2253
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2148 } 2255 }
2149} 2256}
2150 2257
2151sub update { 2258sub update {
2152 my ($self) = @_; 2259 my ($self) = @_;
2153 2260
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]); 2262 $self->set_value ($self->{range}[0]);
2156 2263
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2158 2266
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2268
2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2162 2271
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2272 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2273 $value = $value * $self->{scale} + $self->{offset};
2165 2274
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; 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2276 $self->{knob_w} = $knob_w;
2173 }); 2277 });
2174 2278
2175 $self->SUPER::update; 2279 $self->SUPER::update;
2176} 2280}
2177 2281
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2398
2295 $self->reflow; 2399 $self->reflow;
2296} 2400}
2297 2401
2298sub text_height { 2402sub text_size {
2299 my ($self, $text, $indent) = @_; 2403 my ($self, $text, $indent) = @_;
2300 2404
2301 my $layout = $self->{layout}; 2405 my $layout = $self->{layout};
2302 2406
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2408 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2409 $layout->set_markup ($text);
2306 2410
2307 ($layout->size)[1] 2411 $layout->size
2308} 2412}
2309 2413
2310sub reflow { 2414sub reflow {
2311 my ($self) = @_; 2415 my ($self) = @_;
2312 2416
2313 $self->{need_reflow}++; 2417 $self->{need_reflow}++;
2314 $self->update; 2418 $self->update;
2315} 2419}
2316 2420
2421sub set_offset {
2422 my ($self, $offset) = @_;
2423
2424 # todo: base offset on lines or so, not on pixels
2425 $self->{children}[1]->set_value ($offset);
2426}
2427
2317sub clear { 2428sub clear {
2318 my ($self) = @_; 2429 my ($self) = @_;
2319 2430
2320 $self->{par} = []; 2431 $self->{par} = [];
2321 $self->{height} = 0; 2432 $self->{height} = 0;
2322 2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2323 $self->reflow;
2324} 2434}
2325 2435
2326sub add_paragraph { 2436sub add_paragraph {
2327 my ($self, $color, $text, $indent) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2328 2438
2329 for my $line (split /\n/, $text) { 2439 for my $line (split /\n/, $text) {
2330 my $height = $self->text_height ($line); 2440 my ($w, $h) = $self->text_size ($line);
2331 $self->{height} += $height; 2441 $self->{height} += $h;
2332 push @{$self->{par}}, [$height, $color, $indent, $line]; 2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2333 } 2443 }
2334 2444
2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2336 $self->{children}[1]->update;
2337} 2446}
2338 2447
2339sub update { 2448sub update {
2340 my ($self) = @_; 2449 my ($self) = @_;
2341 2450
… …
2344 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2345 2454
2346 delete $self->{texture}; 2455 delete $self->{texture};
2347 2456
2348 $ROOT->on_post_alloc ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2349 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2350 my $height = 0; 2461 my $height = 0;
2351 2462
2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2353 for @{$self->{par}}; 2467 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]);
2470 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h;
2474 }
2475
2476 $height += $_->[1];
2477 }
2354 2478
2355 $self->{height} = $height; 2479 $self->{height} = $height;
2356 2480
2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2358 $self->{children}[1]->update;
2359 2482
2360 delete $self->{texture}; 2483 delete $self->{texture};
2361 } 2484 }
2362 2485
2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2364 glClearColor 0.5, 0.5, 0.5, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2365 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2366 2489
2367 my $top = int $self->{children}[1]{range}[0]; 2490 my $top = int $self->{children}[1]{range}[0];
2368 2491
2369 my $y0 = $top; 2492 my $y0 = $top;
2370 my $y1 = $top + $self->{h}; 2493 my $y1 = $top + $H;
2371 2494
2372 my $y = 0; 2495 my $y = 0;
2373 2496
2374 my $layout = $self->{layout}; 2497 my $layout = $self->{layout};
2375 2498
2376 $layout->set_font ($self->{font}) if $self->{font}; 2499 $layout->set_font ($self->{font}) if $self->{font};
2377 2500
2378 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380 2504
2381 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2382 my $h = $par->[0]; 2506 my $h = $par->[1];
2383 2507
2384 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] }); 2509 $layout->set_foreground (@{ $par->[2] });
2386 $layout->set_width ($self->{w} - $par->[2]); 2510 $layout->set_width ($W - $par->[3]);
2387 $layout->set_markup ($par->[3]); 2511 $layout->set_markup ($par->[4]);
2388 2512
2389 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2390 2514
2391 glRasterPos $par->[2], $y - $y0; 2515 glRasterPos $par->[3], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2393 } 2517 }
2394 2518
2395 $y += $h; 2519 $y += $h;
2396 } 2520 }
… …
2463 2587
2464sub new { 2588sub new {
2465 my $class = shift; 2589 my $class = shift;
2466 2590
2467 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2468 state => 0, 2592 state => 0,
2469 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2470 @_ 2594 @_
2471 ); 2595 );
2472 2596
2473 if ($self->{state}) { 2597 if ($self->{state}) {
2474 $self->{state} = 0; 2598 $self->{state} = 0;
… …
2483 2607
2484 # TODO: use animation 2608 # TODO: use animation
2485 if ($self->{state} = !$self->{state}) { 2609 if ($self->{state} = !$self->{state}) {
2486 $CFClient::UI::ROOT->add ($self->{other}); 2610 $CFClient::UI::ROOT->add ($self->{other});
2487 $self->{other}->move ($self->coord2global (0, $self->{h})); 2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2488 $self->emit ("open"); 2612 $self->_emit ("open");
2489 } else { 2613 } else {
2490 $CFClient::UI::ROOT->remove ($self->{other}); 2614 $CFClient::UI::ROOT->remove ($self->{other});
2491 $self->emit ("close"); 2615 $self->_emit ("close");
2492 } 2616 }
2493 2617
2494 $self->emit (changed => $self->{state}); 2618 $self->_emit (changed => $self->{state});
2495} 2619}
2496 2620
2497############################################################################# 2621#############################################################################
2498 2622
2499package CFClient::UI::Tooltip; 2623package CFClient::UI::Tooltip;
… …
2575 2699
2576sub new { 2700sub new {
2577 my $class = shift; 2701 my $class = shift;
2578 2702
2579 my $self = $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2580 aspect => 1, 2704 aspect => 1,
2705 can_events => 0,
2581 @_, 2706 @_,
2582 ); 2707 );
2583 2708
2584 if ($self->{anim} && $self->{animspeed}) { 2709 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self); 2710 Scalar::Util::weaken (my $widget = $self);
… …
2611} 2736}
2612 2737
2613sub _draw { 2738sub _draw {
2614 my ($self) = @_; 2739 my ($self) = @_;
2615 2740
2616 return unless $::CONN;#d# manage and cache textures differently 2741 return unless $::CONN;
2617 2742
2618 my $face; 2743 my $face;
2619 2744
2620 if ($self->{frame}) { 2745 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}]; 2746 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2644 $self->SUPER::DESTROY; 2769 $self->SUPER::DESTROY;
2645} 2770}
2646 2771
2647############################################################################# 2772#############################################################################
2648 2773
2649package CFClient::UI::InventoryItem; 2774package CFClient::UI::Inventory;
2650 2775
2651our @ISA = CFClient::UI::HBox::; 2776our @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 2777
2679sub new { 2778sub new {
2680 my $class = shift; 2779 my $class = shift;
2681 2780
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 ( 2781 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), 2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_, 2783 @_,
2771 ); 2784 );
2772 2785
2773 $self 2786 $self
2774} 2787}
… …
2784 or ($a->{name} cmp $b->{name}) 2797 or ($a->{name} cmp $b->{name})
2785 } @$items; 2798 } @$items;
2786 2799
2787 $self->{real_items} = \@items; 2800 $self->{real_items} = \@items;
2788 2801
2802 my $row = 0;
2789 for my $item (@items) { 2803 for my $item (@items) {
2790 $item->{item} = $item; 2804 CFClient::Item::update_widgets $item;
2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792 $item->update_item ();
2793 }
2794 2805
2795 my $i = 0; 2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2796 for (@items) { 2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2797 $self->{scrolled}->add (0, $i, $_); 2808 $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 2809
2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2810 $row++;
2811 }
2803} 2812}
2804 2813
2805sub size_request { 2814sub size_request {
2806 my ($self) = @_; 2815 my ($self) = @_;
2807 ($self->{req_w}, $self->{req_h}); 2816 ($self->{req_w}, $self->{req_h});
… …
2847 2856
2848# popup given the event (must be a mouse button down event currently) 2857# popup given the event (must be a mouse button down event currently)
2849sub popup { 2858sub popup {
2850 my ($self, $ev) = @_; 2859 my ($self, $ev) = @_;
2851 2860
2852 $self->emit ("popdown"); 2861 $self->_emit ("popdown");
2853 2862
2854 # maybe save $GRAB? must be careful about events... 2863 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 2864 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 2865 $self->{button} = $ev->{button};
2857 2866
… …
2872 2881
2873 if ($ev->{button} == $self->{button}) { 2882 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 2883 undef $GRAB;
2875 $self->hide; 2884 $self->hide;
2876 2885
2877 $self->emit ("popdown"); 2886 $self->_emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 2887 $self->{hover}[1]->() if $self->{hover};
2879 } 2888 }
2880} 2889}
2881 2890
2882############################################################################# 2891#############################################################################
… …
2944sub add { 2953sub add {
2945 my ($self, $text, %arg) = @_; 2954 my ($self, $text, %arg) = @_;
2946 2955
2947 $text =~ s/^\s+//; 2956 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 2957 $text =~ s/\s+$//;
2958
2959 return unless $text;
2949 2960
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 2961 my $timeout = time + ((delete $arg{timeout}) || 60);
2951 2962
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 2964
… …
2997 3008
2998sub new { 3009sub new {
2999 my $class = shift; 3010 my $class = shift;
3000 3011
3001 $class->SUPER::new ( 3012 $class->SUPER::new (
3013 visible => 1,
3002 @_, 3014 @_,
3003 ) 3015 )
3004} 3016}
3005 3017
3006sub configure { 3018sub configure {
… …
3024} 3036}
3025 3037
3026sub size_allocate { 3038sub size_allocate {
3027 my ($self, $w, $h) = @_; 3039 my ($self, $w, $h) = @_;
3028 3040
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) { 3041 for my $child ($self->children) {
3036 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3037 3043
3038 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3039 if exists $child->{req_x}; 3045 if exists $child->{req_x};
3040 3046
3041 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3042 if exists $child->{req_y}; 3048 if exists $child->{req_y};
3043 3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3044 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3045 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3046 3055
3047 $child->configure ($X, $Y, $W, $H); 3056 $child->configure ($X, $Y, $W, $H);
3048 } 3057 }
… …
3068} 3077}
3069 3078
3070sub add { 3079sub add {
3071 my ($self, @children) = @_; 3080 my ($self, @children) = @_;
3072 3081
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3073 for my $child (@children) { 3088 for my $child (@children) {
3074 $child->{toplevel} = 1; 3089 $child->{is_toplevel} = 1;
3075 3090
3076 # integerise window positions 3091 # integerise window positions
3077 $child->{x} = int $child->{x}; 3092 $child->{x} = int $child->{x};
3078 $child->{y} = int $child->{y}; 3093 $child->{y} = int $child->{y};
3079 } 3094 }
3080 3095
3081 $self->SUPER::add (@children); 3096 $self->SUPER::add (@children);
3097}
3098
3099sub remove {
3100 my ($self, @children) = @_;
3101
3102 $self->SUPER::remove (@children);
3082 3103
3083 while (@children) { 3104 while (@children) {
3084 my $w = pop @children; 3105 my $w = pop @children;
3085 push @children, $w->children; 3106 push @children, $w->children;
3086 $w->{visible} = 1; 3107 $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 } 3108 }
3100} 3109}
3101 3110
3102sub on_refresh { 3111sub on_refresh {
3103 my ($self, $id, $cb) = @_; 3112 my ($self, $id, $cb) = @_;
… …
3118 $_->() 3127 $_->()
3119 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
3120 } 3129 }
3121 3130
3122 if ($self->{check_size}) { 3131 if ($self->{check_size}) {
3123 my @queue = ([], []); 3132 my @queue;
3124 3133
3125 for (;;) { 3134 for (;;) {
3126 if ($self->{check_size}) { 3135 if ($self->{check_size}) {
3127 # heuristic: check containers last 3136 #TODO use array-of-depth approach
3128 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3137
3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3129 for values %{delete $self->{check_size}} 3139 @queue, values %{delete $self->{check_size}};
3130 } 3140 }
3131 3141
3132 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3142 my $widget = pop @queue || last;
3143
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3133 3145
3134 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3135 ? @$widget{qw(user_w user_h)} 3147 ? @$widget{qw(user_w user_h)}
3136 : $widget->size_request; 3148 : $widget->size_request;
3137 3149
… …
3157 $w = 0 if $w < 0; 3169 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3170 $h = 0 if $h < 0;
3159 3171
3160 $widget->{w} = $w; 3172 $widget->{w} = $w;
3161 $widget->{h} = $h; 3173 $widget->{h} = $h;
3162 $widget->size_allocate ($w, $h);
3163 $widget->emit (size_allocate => $w, $h); 3174 $widget->emit (size_allocate => $w, $h);
3164 } 3175 }
3165 } 3176 }
3166 3177
3167 while ($self->{post_alloc_hook}) { 3178 while ($self->{post_alloc_hook}) {

Diff Legend

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