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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 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
… …
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 }, 259 },
225 ); 260 );
226} 261}
227 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)
272}
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
287 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self;
289
238 $self->focus_out; 290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
239} 293}
240 294
241sub hide { 295sub hide {
242 my ($self) = @_; 296 my ($self) = @_;
243 297
… …
258} 312}
259 313
260sub set_size { 314sub set_size {
261 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
262 316
263 $self->{user_w} = $w; 317 $self->{def_w} = $w;
264 $self->{user_h} = $h; 318 $self->{def_h} = $h;
265 319
266 $self->check_size; 320 $self->check_size;
267} 321}
268 322
269sub size_request { 323sub size_request {
… …
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 372 delete $self->{max_h}; $self->{max_h} = $h if $h;
319} 373}
320 374
321sub set_tooltip { 375sub set_tooltip {
322 my ($self, $tooltip) = @_; 376 my ($self, $tooltip) = @_;
377
378 $tooltip =~ s/^\s+//;
379 $tooltip =~ s/\s+$//;
380
381 return if $self->{tooltip} eq $tooltip;
323 382
324 $self->{tooltip} = $tooltip; 383 $self->{tooltip} = $tooltip;
325 384
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 385 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 386 delete $CFClient::UI::TOOLTIP->{owner};
… …
417 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix; 477 glPushMatrix;
419 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 481 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
424 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
425 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
426 glEnd; 485 glEnd;
427 glPopMatrix; 486 glPopMatrix;
428 #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;
429 } 488 }
430} 489}
… …
450sub set_parent { 509sub set_parent {
451 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
452 511
453 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
454 513
455 # TODO: req_w _does_change after ->reconfigure 514 $self->set_visible;
515
456 $self->check_size 516 $self->check_size;
457 unless exists $self->{req_w};
458
459 $self->show; 517 $self->show;
460} 518}
461 519
462sub check_size { 520sub check_size {
463 my ($self, $forced) = @_; 521 my ($self, $forced) = @_;
… …
488sub emit { 546sub emit {
489 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
490 548
491 $self->_emit ($signal, @args) 549 $self->_emit ($signal, @args)
492 || $self->$signal (@args); 550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
493} 555}
494 556
495sub DESTROY { 557sub DESTROY {
496 my ($self) = @_; 558 my ($self) = @_;
497 559
… …
610 delete $child->{parent}; 672 delete $child->{parent};
611 $child->hide; 673 $child->hide;
612 674
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 676
615 $self->check_size; 677 $self->check_size (1);
616 $self->update; 678 $self->update;
617} 679}
618 680
619sub clear { 681sub clear {
620 my ($self) = @_; 682 my ($self) = @_;
… …
760 822
761package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
762 824
763our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
764 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
765sub size_request { 837sub size_request {
766 my ($self) = @_; 838 my ($self) = @_;
767 839
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
769 841
… …
771} 843}
772 844
773sub size_allocate { 845sub size_allocate {
774 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
775 847
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
777# $w = $self->{w}; 849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
778 $self->child->configure (0, 0, $cw, $ch); 851 $self->child->configure (0, 0, $w, $h);
779 $self->update; 852 $self->update;
780} 853}
781 854
782sub set_offset { 855sub set_offset {
783 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
834 my $class = shift; 907 my $class = shift;
835 908
836 my $self; 909 my $self;
837 910
838 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
839 vertical => 1, 912 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 914 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 915 $self->{vp}->set_offset (0, $_[1]);
843 }, 916 },
844 ; 917 ;
845 918
846 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
… …
852 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp}); 926 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
855 928
856 $self 929 $self
930}
931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 940}
858 941
859sub size_allocate { 942sub size_allocate {
860 my ($self, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
861 944
… …
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1005
923sub new { 1006sub new {
924 my $class = shift; 1007 my $class = shift;
925
926 # TODO: user_x, user_y, overwrite moveto?
927 1008
928 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1010 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1011 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1012 border => 0.6,
… …
991 my ($ev, $x, $y) = @_; 1072 my ($ev, $x, $y) = @_;
992 1073
993 my $dx = $ev->{x} - $ox; 1074 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1075 my $dy = $ev->{y} - $oy;
995 1076
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1081 $self->move ($self->{user_x}, $self->{user_y});
999 $self->check_size; 1082 $self->check_size;
1000 }; 1083 };
1001 1084
1002 } elsif ($lr ^ $td) { 1085 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1086 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1006 $self->{motion} = sub { 1089 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1090 my ($ev, $x, $y) = @_;
1008 1091
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1092 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1093
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1094 $self->{user_x} = $bx + $x - $ox;
1095 $self->{user_y} = $by + $y - $oy;
1096
1097 $self->move ($self->{user_x}, $self->{user_y});
1012 $self->update; 1098 $self->update;
1013 }; 1099 };
1014 } 1100 }
1015} 1101}
1016 1102
… …
1078sub new { 1164sub new {
1079 my $class = shift; 1165 my $class = shift;
1080 1166
1081 $class->SUPER::new ( 1167 $class->SUPER::new (
1082 col_expand => [], 1168 col_expand => [],
1083 @_ 1169 @_,
1084 ) 1170 )
1171}
1172
1173sub children {
1174 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1175}
1086 1176
1087sub add { 1177sub add {
1088 my ($self, $x, $y, $child) = @_; 1178 my ($self, $x, $y, $child) = @_;
1089 1179
1090 $child->set_parent ($self); 1180 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1181 $self->{children}[$y][$x] = $child;
1092 1182
1093 $child->check_size; 1183 $self->check_size (1);
1094} 1184}
1095 1185
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1186# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1187sub clear {
1102 my ($self) = @_; 1188 my ($self) = @_;
1103 1189
1104 my @children = $self->children; 1190 my @children = $self->children;
1105 delete $self->{children}; 1191 delete $self->{children};
… …
1107 for (@children) { 1193 for (@children) {
1108 delete $_->{parent}; 1194 delete $_->{parent};
1109 $_->hide; 1195 $_->hide;
1110 } 1196 }
1111 1197
1198 $self->check_size (1);
1112 $self->update; 1199 $self->update;
1113} 1200}
1114 1201
1115sub get_wh { 1202sub get_wh {
1116 my ($self) = @_; 1203 my ($self) = @_;
… …
1148sub size_allocate { 1235sub size_allocate {
1149 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1150 1237
1151 my ($ws, $hs) = $self->get_wh; 1238 my ($ws, $hs) = $self->get_wh;
1152 1239
1153 my $req_w = sum @$ws; 1240 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1241 my $req_h = (sum @$hs) || 1;
1155 1242
1156 # TODO: nicer code && do row_expand 1243 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1244 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1245 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1246 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1300 }
1214} 1301}
1215 1302
1216############################################################################# 1303#############################################################################
1217 1304
1218package CFClient::UI::HBox; 1305package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1306
1222our @ISA = CFClient::UI::Container::; 1307our @ISA = CFClient::UI::Container::;
1223 1308
1224sub size_request { 1309sub size_request {
1225 my ($self) = @_; 1310 my ($self) = @_;
1226 1311
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1312 $self->{vertical}
1228 1313 ? (
1229 ( 1314 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1315 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1316 )
1232 ) 1317 : (
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 )
1233} 1321}
1234 1322
1235sub size_allocate { 1323sub size_allocate {
1236 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1237 1325
1238 ($h, $w) = ($w, $h); 1326 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1327 my $children = $self->{children};
1241 1328
1242 my @h = map $_->{req_w}, @$children; 1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1243
1244 my $req_h = List::Util::sum @h; 1330 my $req = List::Util::sum @req;
1245 1331
1246 if ($req_h > $h) { 1332 if ($req > $space) {
1247 # ah well, not enough space 1333 # ah well, not enough space
1248 $_ *= $h / $req_h for @h; 1334 $_ *= $space / $req for @req;
1249 } else { 1335 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1337
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1253 for (0 .. $#$children) { 1339 for 0 .. $#$children;
1254 my $child = $children->[$_];
1255
1256 my $alloc_h = $h[$_];
1257 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258 $h[$_] = $alloc_h;
1259 }
1260 } 1340 }
1261 1341
1262 CFClient::UI::harmonize \@h; 1342 CFClient::UI::harmonize \@req;
1263 1343
1264 my $y = 0; 1344 my $pos = 0;
1265 for (0 .. $#$children) { 1345 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1346 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1348
1270 $y += $h; 1349 $pos += $alloc;
1271 } 1350 }
1272 1351
1273 1 1352 1
1274} 1353}
1275 1354
1276############################################################################# 1355#############################################################################
1277 1356
1357package CFClient::UI::HBox;
1358
1359our @ISA = CFClient::UI::Box::;
1360
1361sub new {
1362 my $class = shift;
1363
1364 $class->SUPER::new (
1365 vertical => 0,
1366 @_,
1367 )
1368}
1369
1370#############################################################################
1371
1278package CFClient::UI::VBox; 1372package CFClient::UI::VBox;
1279 1373
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1374our @ISA = CFClient::UI::Box::;
1283 1375
1284sub size_request { 1376sub new {
1285 my ($self) = @_; 1377 my $class = shift;
1286 1378
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1379 $class->SUPER::new (
1288 1380 vertical => 1,
1289 ( 1381 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1382 )
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300 my $children = $self->{children};
1301
1302 my @h = map $_->{req_h}, @$children;
1303
1304 my $req_h = List::Util::sum @h;
1305
1306 if ($req_h > $h) {
1307 # ah well, not enough space
1308 $_ *= $h / $req_h for @h;
1309 } else {
1310 my $exp = List::Util::sum map $_->{expand}, @$children;
1311 $exp ||= 1;
1312
1313 for (0 .. $#$children) {
1314 my $child = $children->[$_];
1315
1316 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317 }
1318 }
1319
1320 CFClient::UI::harmonize \@h;
1321
1322 my $y = 0;
1323 for (0 .. $#$children) {
1324 my $child = $children->[$_];
1325 my $h = $h[$_];
1326 $child->configure (0, $y, $w, $h);
1327
1328 $y += $h;
1329 }
1330
1331 1
1332} 1383}
1333 1384
1334############################################################################# 1385#############################################################################
1335 1386
1336package CFClient::UI::Label; 1387package CFClient::UI::Label;
… …
1562 my ($self) = @_; 1613 my ($self) = @_;
1563 1614
1564 my ($w, $h) = $self->SUPER::size_request; 1615 my ($w, $h) = $self->SUPER::size_request;
1565 1616
1566 ($w + 1, $h) # add 1 for cursor 1617 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1618}
1574 1619
1575sub key_down { 1620sub key_down {
1576 my ($self, $ev) = @_; 1621 my ($self, $ev) = @_;
1577 1622
… …
2119} 2164}
2120 2165
2121sub set_range { 2166sub set_range {
2122 my ($self, $range) = @_; 2167 my ($self, $range) = @_;
2123 2168
2124 $self->{range} = $range; 2169 ($range, $self->{range}) = ($self->{range}, $range);
2125 2170
2126 $self->update; 2171 $self->update
2172 if "@$range" ne "@{$self->{range}}";
2127} 2173}
2128 2174
2129sub set_value { 2175sub set_value {
2130 my ($self, $value) = @_; 2176 my ($self, $value) = @_;
2131 2177
… …
2514 2560
2515sub new { 2561sub new {
2516 my $class = shift; 2562 my $class = shift;
2517 2563
2518 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2519 state => 0, 2565 state => 0,
2520 connect_activate => \&toggle_flopper, 2566 on_activate => \&toggle_flopper,
2521 @_ 2567 @_
2522 ); 2568 );
2523 2569
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2570 $self
2530} 2571}
2531 2572
2532sub toggle_flopper { 2573sub toggle_flopper {
2533 my ($self) = @_; 2574 my ($self) = @_;
2534 2575
2535 # TODO: use animation 2576 $self->{other}->toggle_visibility;
2536 if ($self->{state} = !$self->{state}) {
2537 $CFClient::UI::ROOT->add ($self->{other});
2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2539 $self->_emit ("open");
2540 } else {
2541 $CFClient::UI::ROOT->remove ($self->{other});
2542 $self->_emit ("close");
2543 }
2544
2545 $self->_emit (changed => $self->{state});
2546} 2577}
2547 2578
2548############################################################################# 2579#############################################################################
2549 2580
2550package CFClient::UI::Tooltip; 2581package CFClient::UI::Tooltip;
… …
2626 2657
2627sub new { 2658sub new {
2628 my $class = shift; 2659 my $class = shift;
2629 2660
2630 my $self = $class->SUPER::new ( 2661 my $self = $class->SUPER::new (
2631 aspect => 1, 2662 aspect => 1,
2663 can_events => 0,
2632 @_, 2664 @_,
2633 ); 2665 );
2634 2666
2635 if ($self->{anim} && $self->{animspeed}) { 2667 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2668 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2727 $self->SUPER::DESTROY;
2696} 2728}
2697 2729
2698############################################################################# 2730#############################################################################
2699 2731
2700package CFClient::UI::InventoryItem; 2732package CFClient::UI::Inventory;
2701 2733
2702our @ISA = CFClient::UI::HBox::; 2734our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub _item_to_desc {
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729 2735
2730sub new { 2736sub new {
2731 my $class = shift; 2737 my $class = shift;
2732 2738
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table), 2740 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2821 @_, 2741 @_,
2822 ); 2742 );
2823 2743
2824 $self 2744 $self
2825} 2745}
… …
2835 or ($a->{name} cmp $b->{name}) 2755 or ($a->{name} cmp $b->{name})
2836 } @$items; 2756 } @$items;
2837 2757
2838 $self->{real_items} = \@items; 2758 $self->{real_items} = \@items;
2839 2759
2760 my $row = 0;
2840 for my $item (@items) { 2761 for my $item (@items) {
2841 $item->{item} = $item; 2762 CFClient::Item::update_widgets $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845 2763
2846 my $i = 0; 2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2847 for (@items) { 2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2848 $self->{scrolled}->add (0, $i, $_); 2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852 2767
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2768 $row++;
2854} 2769 }
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859} 2770}
2860 2771
2861############################################################################# 2772#############################################################################
2862 2773
2863package CFClient::UI::Menu; 2774package CFClient::UI::Menu;
… …
2995sub add { 2906sub add {
2996 my ($self, $text, %arg) = @_; 2907 my ($self, $text, %arg) = @_;
2997 2908
2998 $text =~ s/^\s+//; 2909 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 2910 $text =~ s/\s+$//;
2911
2912 return unless $text;
3000 2913
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 2914 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 2915
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 2917
… …
3048 2961
3049sub new { 2962sub new {
3050 my $class = shift; 2963 my $class = shift;
3051 2964
3052 $class->SUPER::new ( 2965 $class->SUPER::new (
2966 visible => 1,
3053 @_, 2967 @_,
3054 ) 2968 )
3055} 2969}
3056 2970
3057sub configure { 2971sub configure {
… …
3084 if exists $child->{req_x}; 2998 if exists $child->{req_x};
3085 2999
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3087 if exists $child->{req_y}; 3001 if exists $child->{req_y};
3088 3002
3003 delete @$child{qw(req_x req_y)};
3004
3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091 3007
3092 $child->configure ($X, $Y, $W, $H); 3008 $child->configure ($X, $Y, $W, $H);
3093 } 3009 }
… …
3112 $::WANT_REFRESH++; 3028 $::WANT_REFRESH++;
3113} 3029}
3114 3030
3115sub add { 3031sub add {
3116 my ($self, @children) = @_; 3032 my ($self, @children) = @_;
3117
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123 3033
3124 for my $child (@children) { 3034 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3035 $child->{is_toplevel} = 1;
3126 3036
3127 # integerise window positions 3037 # integerise window positions
3128 $child->{x} = int $child->{x}; 3038 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y}; 3039 $child->{y} = int $child->{y};
3130 } 3040 }
3131 3041
3132 $self->SUPER::add (@children); 3042 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3133} 3049}
3134 3050
3135sub remove { 3051sub remove {
3136 my ($self, @children) = @_; 3052 my ($self, @children) = @_;
3137 3053
… …
3163 $_->() 3079 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3080 for values %{delete $self->{refresh_hook}};
3165 } 3081 }
3166 3082
3167 if ($self->{check_size}) { 3083 if ($self->{check_size}) {
3168 my @queue = ([], []); 3084 my @queue;
3169 3085
3170 for (;;) { 3086 for (;;) {
3171 if ($self->{check_size}) { 3087 if ($self->{check_size}) {
3172 # heuristic: check containers last 3088 #TODO use array-of-depth approach
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3089
3090 @queue = sort { $a->{visible} <=> $b->{visible} }
3174 for values %{delete $self->{check_size}} 3091 @queue, values %{delete $self->{check_size}};
3175 } 3092 }
3176 3093
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3094 my $widget = pop @queue || last;
3178 3095
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3180 ? @$widget{qw(user_w user_h)} 3099 ? @$widget{qw(def_w def_h)}
3181 : $widget->size_request; 3100 : $widget->size_request;
3182 3101
3183 if (delete $widget->{force_alloc} 3102 if (delete $widget->{force_alloc}
3184 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#

Diff Legend

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