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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.247 by root, Sun May 28 01:16:04 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
… …
210 return if $self->{parent}; 245 return if $self->{parent};
211 246
212 $CFClient::UI::ROOT->add ($self); 247 $CFClient::UI::ROOT->add ($self);
213} 248}
214 249
215sub show_centered { 250sub center {
216 my ($self) = @_; 251 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 252
221 $CFClient::UI::ROOT->on_post_alloc ( 253 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 254 "center_$self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 }, 256 },
225 ); 257 );
258
259 $self->update;
260}
261
262sub set_visible {
263 my ($self) = @_;
264
265 return if $self->{visible};
266
267 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1;
269
270 $self->emit (visibility_change => 1)
226} 271}
227 272
228sub set_invisible { 273sub set_invisible {
229 my ($self) = @_; 274 my ($self) = @_;
230 275
276 return unless $self->{visible};
277
231 # broken show/hide model 278 # broken show/hide model
232 279
280 delete $self->{root};
233 delete $self->{visible}; 281 delete $self->{visible};
234 282
235 undef $GRAB if $GRAB == $self; 283 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 284 undef $HOVER if $HOVER == $self;
237 285
238 CFClient::UI::check_tooltip 286 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 287 if $CFClient::UI::TOOLTIP->{owner} == $self;
240 288
241 $self->focus_out; 289 $self->focus_out;
290
291 $self->emit (visibility_change => 0);
242} 292}
243 293
244sub hide { 294sub hide {
245 my ($self) = @_; 295 my ($self) = @_;
246 296
… …
261} 311}
262 312
263sub set_size { 313sub set_size {
264 my ($self, $w, $h) = @_; 314 my ($self, $w, $h) = @_;
265 315
266 $self->{user_w} = $w; 316 $self->{def_w} = $w;
267 $self->{user_h} = $h; 317 $self->{def_h} = $h;
268 318
269 $self->check_size; 319 $self->check_size;
270} 320}
271 321
272sub size_request { 322sub size_request {
… …
458sub set_parent { 508sub set_parent {
459 my ($self, $parent) = @_; 509 my ($self, $parent) = @_;
460 510
461 Scalar::Util::weaken ($self->{parent} = $parent); 511 Scalar::Util::weaken ($self->{parent} = $parent);
462 512
463 # TODO: req_w _does_change after ->reconfigure 513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
464 $self->check_size 515 $self->check_size;
465 unless exists $self->{req_w};
466
467 $self->show;
468} 516}
469 517
470sub check_size { 518sub check_size {
471 my ($self, $forced) = @_; 519 my ($self, $forced) = @_;
472 520
… …
496sub emit { 544sub emit {
497 my ($self, $signal, @args) = @_; 545 my ($self, $signal, @args) = @_;
498 546
499 $self->_emit ($signal, @args) 547 $self->_emit ($signal, @args)
500 || $self->$signal (@args); 548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
501} 553}
502 554
503sub DESTROY { 555sub DESTROY {
504 my ($self) = @_; 556 my ($self) = @_;
505 557
… …
618 delete $child->{parent}; 670 delete $child->{parent};
619 $child->hide; 671 $child->hide;
620 672
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 674
623 $self->check_size; 675 $self->check_size (1);
624 $self->update; 676 $self->update;
625} 677}
626 678
627sub clear { 679sub clear {
628 my ($self) = @_; 680 my ($self) = @_;
… …
781} 833}
782 834
783sub size_request { 835sub size_request {
784 my ($self) = @_; 836 my ($self) = @_;
785 837
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
787 839
788 @$self{qw(child_w child_h)} 840 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y};
842
843 ($w, $h)
789} 844}
790 845
791sub size_allocate { 846sub size_allocate {
792 my ($self, $w, $h) = @_; 847 my ($self, $w, $h) = @_;
793 848
… …
853 my $class = shift; 908 my $class = shift;
854 909
855 my $self; 910 my $self;
856 911
857 my $slider = new CFClient::UI::Slider 912 my $slider = new CFClient::UI::Slider
858 vertical => 1, 913 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 914 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 915 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 916 $self->{vp}->set_offset (0, $_[1]);
862 }, 917 },
863 ; 918 ;
864 919
865 $self = $class->SUPER::new ( 920 $self = $class->SUPER::new (
… …
871 $self->{vp}->add ($self->{scrolled}); 926 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp}); 927 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 928 $self->add ($self->{slider});
874 929
875 $self 930 $self
931}
932
933sub update {
934 my ($self) = @_;
935
936 $self->SUPER::update;
937
938 # todo: overwrite size_allocate of child
939 my $child = $self->{vp}->child;
940 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 941}
877 942
878sub size_allocate { 943sub size_allocate {
879 my ($self, $w, $h) = @_; 944 my ($self, $w, $h) = @_;
880 945
… …
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1005 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1006
942sub new { 1007sub new {
943 my $class = shift; 1008 my $class = shift;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1009
947 my $self = $class->SUPER::new ( 1010 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1011 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1012 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1013 border => 0.6,
… …
1010 my ($ev, $x, $y) = @_; 1073 my ($ev, $x, $y) = @_;
1011 1074
1012 my $dx = $ev->{x} - $ox; 1075 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1076 my $dy = $ev->{y} - $oy;
1014 1077
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1082 $self->move ($self->{user_x}, $self->{user_y});
1018 $self->check_size; 1083 $self->check_size;
1019 }; 1084 };
1020 1085
1021 } elsif ($lr ^ $td) { 1086 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1087 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1025 $self->{motion} = sub { 1090 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
1027 1092
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1093 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1094
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1095 $self->{user_x} = $bx + $x - $ox;
1096 $self->{user_y} = $by + $y - $oy;
1097
1098 $self->move ($self->{user_x}, $self->{user_y});
1031 $self->update; 1099 $self->update;
1032 }; 1100 };
1033 } 1101 }
1034} 1102}
1035 1103
… …
1101 col_expand => [], 1169 col_expand => [],
1102 @_, 1170 @_,
1103 ) 1171 )
1104} 1172}
1105 1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1176}
1177
1106sub add { 1178sub add {
1107 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1108 1180
1109 $child->set_parent ($self); 1181 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1111 1183
1112 $child->check_size; 1184 $self->check_size (1);
1113} 1185}
1114 1186
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal? 1187# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1188sub clear {
1121 my ($self) = @_; 1189 my ($self) = @_;
1122 1190
1123 my @children = $self->children; 1191 my @children = $self->children;
1124 delete $self->{children}; 1192 delete $self->{children};
… …
1126 for (@children) { 1194 for (@children) {
1127 delete $_->{parent}; 1195 delete $_->{parent};
1128 $_->hide; 1196 $_->hide;
1129 } 1197 }
1130 1198
1199 $self->check_size (1);
1131 $self->update; 1200 $self->update;
1132} 1201}
1133 1202
1134sub get_wh { 1203sub get_wh {
1135 my ($self) = @_; 1204 my ($self) = @_;
… …
1167sub size_allocate { 1236sub size_allocate {
1168 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1169 1238
1170 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1171 1240
1172 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1174 1243
1175 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1301 }
1233} 1302}
1234 1303
1235############################################################################# 1304#############################################################################
1236 1305
1237package CFClient::UI::HBox; 1306package CFClient::UI::Box;
1238
1239# TODO: wrap into common Box base class
1240 1307
1241our @ISA = CFClient::UI::Container::; 1308our @ISA = CFClient::UI::Container::;
1242 1309
1243sub size_request { 1310sub size_request {
1244 my ($self) = @_; 1311 my ($self) = @_;
1245 1312
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1313 $self->{vertical}
1247 1314 ? (
1248 ( 1315 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1249 (List::Util::sum map $_->[0], @alloc), 1316 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250 (List::Util::max map $_->[1], @alloc), 1317 )
1251 ) 1318 : (
1319 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1320 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1321 )
1252} 1322}
1253 1323
1254sub size_allocate { 1324sub size_allocate {
1255 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1256 1326
1257 ($h, $w) = ($w, $h); 1327 my $space = $self->{vertical} ? $h : $w;
1258
1259 my $children = $self->{children}; 1328 my $children = $self->{children};
1260 1329
1261 my @h = map $_->{req_w}, @$children; 1330 my @req;
1262 1331
1263 my $req_h = List::Util::sum @h; 1332 if ($self->{homogeneous}) {
1264 1333 @req = ($space / (@$children || 1)) x @$children;
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else { 1334 } else {
1335 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1336 my $req = List::Util::sum @req;
1337
1338 if ($req > $space) {
1339 # ah well, not enough space
1340 $_ *= $space / $req for @req;
1341 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children; 1342 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270 $exp ||= 1;
1271 1343
1344 $space = ($space - $req) / $expand; # remaining space to give away
1345
1346 $req[$_] += $space * $children->[$_]{expand}
1272 for (0 .. $#$children) { 1347 for 0 .. $#$children;
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 } 1348 }
1279 } 1349 }
1280 1350
1281 CFClient::UI::harmonize \@h; 1351 CFClient::UI::harmonize \@req;
1282 1352
1283 my $y = 0; 1353 my $pos = 0;
1284 for (0 .. $#$children) { 1354 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_]; 1355 my $alloc = $req[$_];
1287 $child->configure ($y, 0, $h, $w); 1356 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288 1357
1289 $y += $h; 1358 $pos += $alloc;
1290 } 1359 }
1291 1360
1292 1 1361 1
1293} 1362}
1294 1363
1295############################################################################# 1364#############################################################################
1296 1365
1366package CFClient::UI::HBox;
1367
1368our @ISA = CFClient::UI::Box::;
1369
1370sub new {
1371 my $class = shift;
1372
1373 $class->SUPER::new (
1374 vertical => 0,
1375 @_,
1376 )
1377}
1378
1379#############################################################################
1380
1297package CFClient::UI::VBox; 1381package CFClient::UI::VBox;
1298 1382
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Box::;
1302 1384
1303sub size_request { 1385sub new {
1304 my ($self) = @_; 1386 my $class = shift;
1305 1387
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $class->SUPER::new (
1307 1389 vertical => 1,
1308 ( 1390 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1391 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1392}
1352 1393
1353############################################################################# 1394#############################################################################
1354 1395
1355package CFClient::UI::Label; 1396package CFClient::UI::Label;
… …
2132} 2173}
2133 2174
2134sub set_range { 2175sub set_range {
2135 my ($self, $range) = @_; 2176 my ($self, $range) = @_;
2136 2177
2137 $self->{range} = $range; 2178 ($range, $self->{range}) = ($self->{range}, $range);
2138 2179
2139 $self->update; 2180 $self->update
2181 if "@$range" ne "@{$self->{range}}";
2140} 2182}
2141 2183
2142sub set_value { 2184sub set_value {
2143 my ($self, $value) = @_; 2185 my ($self, $value) = @_;
2144 2186
… …
2527 2569
2528sub new { 2570sub new {
2529 my $class = shift; 2571 my $class = shift;
2530 2572
2531 my $self = $class->SUPER::new ( 2573 my $self = $class->SUPER::new (
2532 state => 0, 2574 state => 0,
2533 connect_activate => \&toggle_flopper, 2575 on_activate => \&toggle_flopper,
2534 @_ 2576 @_
2535 ); 2577 );
2536 2578
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2579 $self
2543} 2580}
2544 2581
2545sub toggle_flopper { 2582sub toggle_flopper {
2546 my ($self) = @_; 2583 my ($self) = @_;
2547 2584
2548 # TODO: use animation 2585 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2586}
2560 2587
2561############################################################################# 2588#############################################################################
2562 2589
2563package CFClient::UI::Tooltip; 2590package CFClient::UI::Tooltip;
… …
2709 $self->SUPER::DESTROY; 2736 $self->SUPER::DESTROY;
2710} 2737}
2711 2738
2712############################################################################# 2739#############################################################################
2713 2740
2714package CFClient::UI::InventoryItem;
2715
2716our @ISA = CFClient::UI::HBox::;
2717
2718sub new {
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory; 2741package CFClient::UI::Inventory;
2801 2742
2802our @ISA = CFClient::UI::ScrolledWindow::; 2743our @ISA = CFClient::UI::ScrolledWindow::;
2803 2744
2804sub new { 2745sub new {
… …
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835 2776
2836 $row++; 2777 $row++;
2837 } 2778 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845} 2779}
2846 2780
2847############################################################################# 2781#############################################################################
2848 2782
2849package CFClient::UI::Menu; 2783package CFClient::UI::Menu;
… …
3036 2970
3037sub new { 2971sub new {
3038 my $class = shift; 2972 my $class = shift;
3039 2973
3040 $class->SUPER::new ( 2974 $class->SUPER::new (
2975 visible => 1,
3041 @_, 2976 @_,
3042 ) 2977 )
3043} 2978}
3044 2979
3045sub configure { 2980sub configure {
… …
3072 if exists $child->{req_x}; 3007 if exists $child->{req_x};
3073 3008
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3075 if exists $child->{req_y}; 3010 if exists $child->{req_y};
3076 3011
3012 delete @$child{qw(req_x req_y)};
3013
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079 3016
3080 $child->configure ($X, $Y, $W, $H); 3017 $child->configure ($X, $Y, $W, $H);
3081 } 3018 }
… …
3100 $::WANT_REFRESH++; 3037 $::WANT_REFRESH++;
3101} 3038}
3102 3039
3103sub add { 3040sub add {
3104 my ($self, @children) = @_; 3041 my ($self, @children) = @_;
3105
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111 3042
3112 for my $child (@children) { 3043 for my $child (@children) {
3113 $child->{is_toplevel} = 1; 3044 $child->{is_toplevel} = 1;
3114 3045
3115 # integerise window positions 3046 # integerise window positions
3116 $child->{x} = int $child->{x}; 3047 $child->{x} = int $child->{x};
3117 $child->{y} = int $child->{y}; 3048 $child->{y} = int $child->{y};
3118 } 3049 }
3119 3050
3120 $self->SUPER::add (@children); 3051 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3121} 3058}
3122 3059
3123sub remove { 3060sub remove {
3124 my ($self, @children) = @_; 3061 my ($self, @children) = @_;
3125 3062
… …
3151 $_->() 3088 $_->()
3152 for values %{delete $self->{refresh_hook}}; 3089 for values %{delete $self->{refresh_hook}};
3153 } 3090 }
3154 3091
3155 if ($self->{check_size}) { 3092 if ($self->{check_size}) {
3156 my @queue = ([], []); 3093 my @queue;
3157 3094
3158 for (;;) { 3095 for (;;) {
3159 if ($self->{check_size}) { 3096 if ($self->{check_size}) {
3160 # heuristic: check containers last 3097 #TODO use array-of-depth approach
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3098
3099 @queue = sort { $a->{visible} <=> $b->{visible} }
3162 for values %{delete $self->{check_size}} 3100 @queue, values %{delete $self->{check_size}};
3163 } 3101 }
3164 3102
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3103 my $widget = pop @queue || last;
3166 3104
3105 defined $widget->{visible} or last; # do not resize invisible widgets
3106
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3168 ? @$widget{qw(user_w user_h)} 3108 ? @$widget{qw(def_w def_h)}
3169 : $widget->size_request; 3109 : $widget->size_request;
3170 3110
3171 if (delete $widget->{force_alloc} 3111 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#

Diff Legend

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