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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.249 by root, Sun May 28 01:40:02 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}) {
… …
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
157 $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};
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 } 183 }
166 } 184 }
167 185
168 reconfigure_widgets; 186 reconfigure_widgets;
169} 187}
… …
186 can_events => 1, 204 can_events => 1,
187 @_ 205 @_
188 }, $class; 206 }, $class;
189 207
190 for (keys %$self) { 208 for (keys %$self) {
191 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
193 } 211 }
194 } 212 }
195 213
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
198 $self 223 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
199} 234}
200 235
201sub destroy { 236sub destroy {
202 my ($self) = @_; 237 my ($self) = @_;
203 238
… …
205 %$self = (); 240 %$self = ();
206} 241}
207 242
208sub show { 243sub show {
209 my ($self) = @_; 244 my ($self) = @_;
245
210 return if $self->{parent}; 246 return if $self->{parent};
211 247
212 $CFClient::UI::ROOT->add ($self); 248 $CFClient::UI::ROOT->add ($self);
213} 249}
214 250
215sub show_centered { 251sub center {
216 my ($self) = @_; 252 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 253
221 $CFClient::UI::ROOT->on_post_alloc ( 254 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 255 "center_$self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
224 }, 257 },
225 ); 258 );
259
260 $self->update;
261}
262
263sub set_visible {
264 my ($self) = @_;
265
266 return if $self->{visible};
267
268 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1;
270
271 $self->emit (visibility_change => 1);
226} 272}
227 273
228sub set_invisible { 274sub set_invisible {
229 my ($self) = @_; 275 my ($self) = @_;
230 276
277 return unless $self->{visible};
278
231 # broken show/hide model 279 # broken show/hide model
232 280
281 delete $self->{root};
233 delete $self->{visible}; 282 delete $self->{visible};
234 283
235 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 285 undef $HOVER if $HOVER == $self;
237 286
238 CFClient::UI::check_tooltip 287 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 288 if $CFClient::UI::TOOLTIP->{owner} == $self;
240 289
241 $self->focus_out; 290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
242} 293}
243 294
244sub hide { 295sub hide {
245 my ($self) = @_; 296 my ($self) = @_;
246 297
… …
261} 312}
262 313
263sub set_size { 314sub set_size {
264 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
265 316
266 $self->{user_w} = $w; 317 $self->{def_w} = $w;
267 $self->{user_h} = $h; 318 $self->{def_h} = $h;
268 319
269 $self->check_size; 320 $self->check_size;
270} 321}
271 322
272sub size_request { 323sub size_request {
… …
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 372 delete $self->{max_h}; $self->{max_h} = $h if $h;
322} 373}
323 374
324sub set_tooltip { 375sub set_tooltip {
325 my ($self, $tooltip) = @_; 376 my ($self, $tooltip) = @_;
377
378 $tooltip =~ s/^\s+//;
379 $tooltip =~ s/\s+$//;
380
381 return if $self->{tooltip} eq $tooltip;
326 382
327 $self->{tooltip} = $tooltip; 383 $self->{tooltip} = $tooltip;
328 384
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 385 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 386 delete $CFClient::UI::TOOLTIP->{owner};
… …
420 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix; 477 glPushMatrix;
422 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 481 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
427 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
428 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
429 glEnd; 485 glEnd;
430 glPopMatrix; 486 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 488 }
433} 489}
… …
453sub set_parent { 509sub set_parent {
454 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
455 511
456 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
457 513
458 # TODO: req_w _does_change after ->reconfigure 514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
459 $self->check_size 516 $self->check_size;
460 unless exists $self->{req_w};
461
462 $self->show;
463} 517}
464 518
465sub check_size { 519sub check_size {
466 my ($self, $forced) = @_; 520 my ($self, $forced) = @_;
467 521
… …
491sub emit { 545sub emit {
492 my ($self, $signal, @args) = @_; 546 my ($self, $signal, @args) = @_;
493 547
494 $self->_emit ($signal, @args) 548 $self->_emit ($signal, @args)
495 || $self->$signal (@args); 549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
496} 554}
497 555
498sub DESTROY { 556sub DESTROY {
499 my ($self) = @_; 557 my ($self) = @_;
500 558
… …
613 delete $child->{parent}; 671 delete $child->{parent};
614 $child->hide; 672 $child->hide;
615 673
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 675
618 $self->check_size; 676 $self->check_size (1);
619 $self->update; 677 $self->update;
620} 678}
621 679
622sub clear { 680sub clear {
623 my ($self) = @_; 681 my ($self) = @_;
… …
763 821
764package CFClient::UI::ViewPort; 822package CFClient::UI::ViewPort;
765 823
766our @ISA = CFClient::UI::Window::; 824our @ISA = CFClient::UI::Window::;
767 825
826sub new {
827 my $class = shift;
828
829 $class->SUPER::new (
830 scroll_x => 0,
831 scroll_y => 1,
832 @_,
833 )
834}
835
768sub size_request { 836sub size_request {
769 my ($self) = @_; 837 my ($self) = @_;
770 838
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
772 840
773 @$self{qw(child_w child_h)} 841 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y};
843
844 ($w, $h)
774} 845}
775 846
776sub size_allocate { 847sub size_allocate {
777 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
778 849
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
780# $w = $self->{w}; 851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
852
781 $self->child->configure (0, 0, $cw, $ch); 853 $self->child->configure (0, 0, $w, $h);
782 $self->update; 854 $self->update;
783} 855}
784 856
785sub set_offset { 857sub set_offset {
786 my ($self, $x, $y) = @_; 858 my ($self, $x, $y) = @_;
… …
837 my $class = shift; 909 my $class = shift;
838 910
839 my $self; 911 my $self;
840 912
841 my $slider = new CFClient::UI::Slider 913 my $slider = new CFClient::UI::Slider
842 vertical => 1, 914 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 915 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 916 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 917 $self->{vp}->set_offset (0, $_[1]);
846 }, 918 },
847 ; 919 ;
848 920
849 $self = $class->SUPER::new ( 921 $self = $class->SUPER::new (
… …
855 $self->{vp}->add ($self->{scrolled}); 927 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp}); 928 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 929 $self->add ($self->{slider});
858 930
859 $self 931 $self
932}
933
934sub update {
935 my ($self) = @_;
936
937 $self->SUPER::update;
938
939 # todo: overwrite size_allocate of child
940 my $child = $self->{vp}->child;
941 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 942}
861 943
862sub size_allocate { 944sub size_allocate {
863 my ($self, $w, $h) = @_; 945 my ($self, $w, $h) = @_;
864 946
… …
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1007
926sub new { 1008sub new {
927 my $class = shift; 1009 my $class = shift;
928
929 # TODO: user_x, user_y, overwrite moveto?
930 1010
931 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1014 border => 0.6,
… …
994 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
995 1075
996 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
998 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
1002 $self->check_size; 1084 $self->check_size;
1003 }; 1085 };
1004 1086
1005 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1009 $self->{motion} = sub { 1091 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1011 1093
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1095
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098
1099 $self->move ($self->{user_x}, $self->{user_y});
1015 $self->update; 1100 $self->update;
1016 }; 1101 };
1017 } 1102 }
1018} 1103}
1019 1104
… …
1081sub new { 1166sub new {
1082 my $class = shift; 1167 my $class = shift;
1083 1168
1084 $class->SUPER::new ( 1169 $class->SUPER::new (
1085 col_expand => [], 1170 col_expand => [],
1086 @_ 1171 @_,
1087 ) 1172 )
1173}
1174
1175sub children {
1176 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1177}
1089 1178
1090sub add { 1179sub add {
1091 my ($self, $x, $y, $child) = @_; 1180 my ($self, $x, $y, $child) = @_;
1092 1181
1093 $child->set_parent ($self); 1182 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1183 $self->{children}[$y][$x] = $child;
1095 1184
1096 $child->check_size; 1185 $self->check_size (1);
1097} 1186}
1098 1187
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1188# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1189sub clear {
1105 my ($self) = @_; 1190 my ($self) = @_;
1106 1191
1107 my @children = $self->children; 1192 my @children = $self->children;
1108 delete $self->{children}; 1193 delete $self->{children};
… …
1110 for (@children) { 1195 for (@children) {
1111 delete $_->{parent}; 1196 delete $_->{parent};
1112 $_->hide; 1197 $_->hide;
1113 } 1198 }
1114 1199
1200 $self->check_size (1);
1115 $self->update; 1201 $self->update;
1116} 1202}
1117 1203
1118sub get_wh { 1204sub get_wh {
1119 my ($self) = @_; 1205 my ($self) = @_;
… …
1151sub size_allocate { 1237sub size_allocate {
1152 my ($self, $w, $h) = @_; 1238 my ($self, $w, $h) = @_;
1153 1239
1154 my ($ws, $hs) = $self->get_wh; 1240 my ($ws, $hs) = $self->get_wh;
1155 1241
1156 my $req_w = sum @$ws; 1242 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1243 my $req_h = (sum @$hs) || 1;
1158 1244
1159 # TODO: nicer code && do row_expand 1245 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1246 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1247 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1248 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1302 }
1217} 1303}
1218 1304
1219############################################################################# 1305#############################################################################
1220 1306
1221package CFClient::UI::HBox; 1307package CFClient::UI::Box;
1222
1223# TODO: wrap into common Box base class
1224 1308
1225our @ISA = CFClient::UI::Container::; 1309our @ISA = CFClient::UI::Container::;
1226 1310
1227sub size_request { 1311sub size_request {
1228 my ($self) = @_; 1312 my ($self) = @_;
1229 1313
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1314 $self->{vertical}
1231 1315 ? (
1232 ( 1316 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1233 (List::Util::sum map $_->[0], @alloc), 1317 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234 (List::Util::max map $_->[1], @alloc), 1318 )
1235 ) 1319 : (
1320 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 )
1236} 1323}
1237 1324
1238sub size_allocate { 1325sub size_allocate {
1239 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1240 1327
1241 ($h, $w) = ($w, $h); 1328 my $space = $self->{vertical} ? $h : $w;
1242
1243 my $children = $self->{children}; 1329 my $children = $self->{children};
1244 1330
1245 my @h = map $_->{req_w}, @$children; 1331 my @req;
1246 1332
1247 my $req_h = List::Util::sum @h; 1333 if ($self->{homogeneous}) {
1248 1334 @req = ($space / (@$children || 1)) x @$children;
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } else { 1335 } else {
1336 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1337 my $req = List::Util::sum @req;
1338
1339 if ($req > $space) {
1340 # ah well, not enough space
1341 $_ *= $space / $req for @req;
1342 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children; 1343 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254 $exp ||= 1;
1255 1344
1345 $space = ($space - $req) / $expand; # remaining space to give away
1346
1347 $req[$_] += $space * $children->[$_]{expand}
1256 for (0 .. $#$children) { 1348 for 0 .. $#$children;
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 } 1349 }
1263 } 1350 }
1264 1351
1265 CFClient::UI::harmonize \@h; 1352 CFClient::UI::harmonize \@req;
1266 1353
1267 my $y = 0; 1354 my $pos = 0;
1268 for (0 .. $#$children) { 1355 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_]; 1356 my $alloc = $req[$_];
1271 $child->configure ($y, 0, $h, $w); 1357 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272 1358
1273 $y += $h; 1359 $pos += $alloc;
1274 } 1360 }
1275 1361
1276 1 1362 1
1277} 1363}
1278 1364
1279############################################################################# 1365#############################################################################
1280 1366
1367package CFClient::UI::HBox;
1368
1369our @ISA = CFClient::UI::Box::;
1370
1371sub new {
1372 my $class = shift;
1373
1374 $class->SUPER::new (
1375 vertical => 0,
1376 @_,
1377 )
1378}
1379
1380#############################################################################
1381
1281package CFClient::UI::VBox; 1382package CFClient::UI::VBox;
1282 1383
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
1286 1385
1287sub size_request { 1386sub new {
1288 my ($self) = @_; 1387 my $class = shift;
1289 1388
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
1291 1390 vertical => 1,
1292 ( 1391 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1392 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1393}
1336 1394
1337############################################################################# 1395#############################################################################
1338 1396
1339package CFClient::UI::Label; 1397package CFClient::UI::Label;
… …
2116} 2174}
2117 2175
2118sub set_range { 2176sub set_range {
2119 my ($self, $range) = @_; 2177 my ($self, $range) = @_;
2120 2178
2121 $self->{range} = $range; 2179 ($range, $self->{range}) = ($self->{range}, $range);
2122 2180
2123 $self->update; 2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2124} 2183}
2125 2184
2126sub set_value { 2185sub set_value {
2127 my ($self, $value) = @_; 2186 my ($self, $value) = @_;
2128 2187
… …
2511 2570
2512sub new { 2571sub new {
2513 my $class = shift; 2572 my $class = shift;
2514 2573
2515 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2516 state => 0, 2575 state => 0,
2517 connect_activate => \&toggle_flopper, 2576 on_activate => \&toggle_flopper,
2518 @_ 2577 @_
2519 ); 2578 );
2520 2579
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2580 $self
2527} 2581}
2528 2582
2529sub toggle_flopper { 2583sub toggle_flopper {
2530 my ($self) = @_; 2584 my ($self) = @_;
2531 2585
2532 # TODO: use animation 2586 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2587}
2544 2588
2545############################################################################# 2589#############################################################################
2546 2590
2547package CFClient::UI::Tooltip; 2591package CFClient::UI::Tooltip;
… …
2623 2667
2624sub new { 2668sub new {
2625 my $class = shift; 2669 my $class = shift;
2626 2670
2627 my $self = $class->SUPER::new ( 2671 my $self = $class->SUPER::new (
2628 aspect => 1, 2672 aspect => 1,
2673 can_events => 0,
2629 @_, 2674 @_,
2630 ); 2675 );
2631 2676
2632 if ($self->{anim} && $self->{animspeed}) { 2677 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2678 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2737 $self->SUPER::DESTROY;
2693} 2738}
2694 2739
2695############################################################################# 2740#############################################################################
2696 2741
2697package CFClient::UI::InventoryItem; 2742package CFClient::UI::Inventory;
2698 2743
2699our @ISA = CFClient::UI::HBox::; 2744our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726 2745
2727sub new { 2746sub new {
2728 my $class = shift; 2747 my $class = shift;
2729 2748
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new ( 2749 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table), 2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2818 @_, 2751 @_,
2819 ); 2752 );
2820 2753
2821 $self 2754 $self
2822} 2755}
… …
2832 or ($a->{name} cmp $b->{name}) 2765 or ($a->{name} cmp $b->{name})
2833 } @$items; 2766 } @$items;
2834 2767
2835 $self->{real_items} = \@items; 2768 $self->{real_items} = \@items;
2836 2769
2770 my $row = 0;
2837 for my $item (@items) { 2771 for my $item (@items) {
2838 $item->{item} = $item; 2772 CFClient::Item::update_widgets $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842 2773
2843 my $i = 0; 2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2844 for (@items) { 2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2845 $self->{scrolled}->add (0, $i, $_); 2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849 2777
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2778 $row++;
2851} 2779 }
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856} 2780}
2857 2781
2858############################################################################# 2782#############################################################################
2859 2783
2860package CFClient::UI::Menu; 2784package CFClient::UI::Menu;
… …
2992sub add { 2916sub add {
2993 my ($self, $text, %arg) = @_; 2917 my ($self, $text, %arg) = @_;
2994 2918
2995 $text =~ s/^\s+//; 2919 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 2920 $text =~ s/\s+$//;
2921
2922 return unless $text;
2997 2923
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 2924 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 2925
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2926 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 2927
… …
3045 2971
3046sub new { 2972sub new {
3047 my $class = shift; 2973 my $class = shift;
3048 2974
3049 $class->SUPER::new ( 2975 $class->SUPER::new (
2976 visible => 1,
3050 @_, 2977 @_,
3051 ) 2978 )
3052} 2979}
3053 2980
3054sub configure { 2981sub configure {
… …
3081 if exists $child->{req_x}; 3008 if exists $child->{req_x};
3082 3009
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3084 if exists $child->{req_y}; 3011 if exists $child->{req_y};
3085 3012
3013 delete @$child{qw(req_x req_y)};
3014
3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088 3017
3089 $child->configure ($X, $Y, $W, $H); 3018 $child->configure ($X, $Y, $W, $H);
3090 } 3019 }
… …
3109 $::WANT_REFRESH++; 3038 $::WANT_REFRESH++;
3110} 3039}
3111 3040
3112sub add { 3041sub add {
3113 my ($self, @children) = @_; 3042 my ($self, @children) = @_;
3114
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120 3043
3121 for my $child (@children) { 3044 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3045 $child->{is_toplevel} = 1;
3123 3046
3124 # integerise window positions 3047 # integerise window positions
3125 $child->{x} = int $child->{x}; 3048 $child->{x} = int $child->{x};
3126 $child->{y} = int $child->{y}; 3049 $child->{y} = int $child->{y};
3127 } 3050 }
3128 3051
3129 $self->SUPER::add (@children); 3052 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3130} 3059}
3131 3060
3132sub remove { 3061sub remove {
3133 my ($self, @children) = @_; 3062 my ($self, @children) = @_;
3134 3063
… …
3160 $_->() 3089 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3090 for values %{delete $self->{refresh_hook}};
3162 } 3091 }
3163 3092
3164 if ($self->{check_size}) { 3093 if ($self->{check_size}) {
3165 my @queue = ([], []); 3094 my @queue;
3166 3095
3167 for (;;) { 3096 for (;;) {
3168 if ($self->{check_size}) { 3097 if ($self->{check_size}) {
3169 # heuristic: check containers last 3098 #TODO use array-of-depth approach
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3099
3100 @queue = sort { $a->{visible} <=> $b->{visible} }
3171 for values %{delete $self->{check_size}} 3101 @queue, values %{delete $self->{check_size}};
3172 } 3102 }
3173 3103
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3104 my $widget = pop @queue || last;
3175 3105
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3177 ? @$widget{qw(user_w user_h)} 3109 ? @$widget{qw(def_w def_h)}
3178 : $widget->size_request; 3110 : $widget->size_request;
3179 3111
3180 if (delete $widget->{force_alloc} 3112 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
… …
3191 } 3123 }
3192 } 3124 }
3193 } 3125 }
3194 3126
3195 while ($self->{size_alloc}) { 3127 while ($self->{size_alloc}) {
3128 for (
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} }
3196 for (values %{delete $self->{size_alloc}}) { 3130 values %{delete $self->{size_alloc}}
3131 ) {
3197 my ($widget, $w, $h) = @$_; 3132 my ($widget, $w, $h) = @$_;
3198 3133
3199 $w = 0 if $w < 0; 3134 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3135 $h = 0 if $h < 0;
3201 3136

Diff Legend

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