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.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.194 by root, Thu May 11 23:41:47 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
232 $self->{y} = $y; 233 $self->{y} = $y;
233 $self->update; 234 $self->update;
234 } 235 }
235 236
236 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 239 }
244} 240}
245 241
246sub size_allocate { 242sub size_allocate {
247 # nothing to be done 243 # nothing to be done
… …
255 my ($self) = @_; 251 my ($self) = @_;
256 252
257 $_->reconfigure 253 $_->reconfigure
258 for $self->children; 254 for $self->children;
259 255
260 $_->check_size; 256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
261} 259}
262 260
263sub set_max_size { 261sub set_max_size {
264 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
265 263
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
268}
269
270# return top left coordinates
271sub _topleft {
272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
276
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
278} 266}
279 267
280# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
281sub coord2local { 269sub coord2local {
282 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
283 271
284 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 273}
287 274
288# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
289sub coord2global { 276sub coord2global {
290 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
291 278
292 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 280}
295 281
296sub focus_in { 282sub focus_in {
297 my ($self) = @_; 283 my ($self) = @_;
298 284
… …
396 382
397sub set_parent { 383sub set_parent {
398 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
399 385
400 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
401} 390}
402 391
403sub check_size { 392sub check_size {
404 my ($self) = @_; 393 my ($self) = @_;
405 394
406 $self->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427} 396}
428 397
429sub update { 398sub update {
430 my ($self) = @_; 399 my ($self) = @_;
431 400
… …
528 497
529 $self 498 $self
530} 499}
531 500
532sub add { 501sub add {
533 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
534 503
535 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
536 506
537 use sort 'stable'; 507 use sort 'stable';
538 508
539 $self->{children} = [ 509 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
542 ]; 512 ];
543 513
544 $child->check_size; 514 $self->check_size;
545 $self->update; 515 $self->update;
546} 516}
547 517
548sub children { 518sub children {
549 @{ $_[0]{children} } 519 @{ $_[0]{children} }
… …
697 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
698 668
699 my $tex = $self->{texture} 669 my $tex = $self->{texture}
700 or return; 670 or return;
701 671
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 674 glColor 0, 0, 0, 1;
707 675
708 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 677
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
712} 679}
713 680
714############################################################################# 681#############################################################################
715 682
… …
737 704
738 $self->{view_x} = int $x; 705 $self->{view_x} = int $x;
739 $self->{view_y} = int $y; 706 $self->{view_y} = int $y;
740 707
741 $self->update; 708 $self->update;
709}
710
711# hmm, this does not work for topleft of $self... but we should not ask for that
712sub coord2local {
713 my ($self, $x, $y) = @_;
714
715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
725}
726
727sub find_widget {
728 my ($self, $x, $y) = @_;
729
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y)
736 }
742} 737}
743 738
744sub _render { 739sub _render {
745 my ($self) = @_; 740 my ($self) = @_;
746 741
… …
1216} 1211}
1217 1212
1218sub size_allocate { 1213sub size_allocate {
1219 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1220 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1221 my $children = $self->{children}; 1218 my $children = $self->{children};
1222 1219
1223 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1224 1221
1225 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1264 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1265 1262
1266 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1268 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1269 fontsize => 1, 1269 fontsize => 1,
1270 text => "",
1271 align => -1, 1270 align => -1,
1272 valign => -1, 1271 valign => -1,
1273 padding => 2, 1272 padding => 2,
1274 layout => new CFClient::Layout,
1275 can_events => 0, 1273 can_events => 0,
1276 %arg 1274 %arg
1277 ); 1275 );
1278 1276
1279 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1280 $self->{template} = $layout;
1283 } 1281 }
1284 1282
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1287 1288
1288 $self 1289 $self
1289} 1290}
1290 1291
1291sub escape { 1292sub escape {
… …
1303 1304
1304 delete $self->{texture}; 1305 delete $self->{texture};
1305 $self->SUPER::update; 1306 $self->SUPER::update;
1306} 1307}
1307 1308
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1309sub set_text {
1315 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1316 1311
1317 return if $self->{text} eq "T$text"; 1312 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1313 $self->{text} = "T$text";
1319 1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1321 1317
1322 delete $self->{texture};
1323 $self->update; 1318 $self->update;
1324 $self->check_size; 1319 $self->check_size;
1325} 1320}
1326 1321
1327sub set_markup { 1322sub set_markup {
1328 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1329 1324
1330 return if $self->{text} eq "M$markup"; 1325 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1326 $self->{text} = "M$markup";
1332 1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1334 1332
1335 delete $self->{texture};
1336 $self->update; 1333 $self->update;
1337 $self->check_size; 1334 $self->check_size;
1338} 1335}
1339 1336
1340sub size_request { 1337sub size_request {
… …
1371sub set_fontsize { 1368sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1373 1370
1374 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1376 $self->check_size; 1375 $self->check_size;
1377 $self->update;
1378} 1376}
1379 1377
1380sub _draw { 1378sub _draw {
1381 my ($self) = @_; 1379 my ($self) = @_;
1382 1380
1383 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1387 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1388 }; 1398 };
1389 1399
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1402
1403 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1396
1397 $self->{ox} = int (
1398 $self->{align} < 0 ? $self->{padding}
1399 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400 : ($self->{w} - $tex->{w}) * 0.5
1401 );
1402
1403 $self->{oy} = int (
1404 $self->{valign} < 0 ? $self->{padding}
1405 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406 : ($self->{h} - $tex->{h}) * 0.5
1407 );
1408
1409 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1410 1409
1411 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1411}
1414 1412
1415############################################################################# 1413#############################################################################
1416 1414
1417package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1452 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1453 1451
1454 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1455} 1453}
1456 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1457sub get_text { 1464sub get_text {
1458 $_[0]{text} 1465 $_[0]{text}
1459} 1466}
1460 1467
1461sub size_request { 1468sub size_request {
… …
1468 1475
1469sub size_allocate { 1476sub size_allocate {
1470 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1471 1478
1472 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473}
1474
1475sub set_text {
1476 my ($self, $text) = @_;
1477
1478 $self->{cursor} = length $text;
1479 $self->_set_text ($text);
1480 $self->update;
1481} 1480}
1482 1481
1483sub key_down { 1482sub key_down {
1484 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1485 1484
… …
2464} 2463}
2465 2464
2466sub _draw { 2465sub _draw {
2467 my ($self) = @_; 2466 my ($self) = @_;
2468 2467
2468 return unless $::CONN;#d# manage and cache textures differently
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470 2470
2471 # TODO animation 2471 # TODO animation
2472 if ($tex) { 2472 if ($tex) {
2473 glEnable GL_BLEND; 2473 glEnable GL_BLEND;
… …
2481 } 2481 }
2482} 2482}
2483 2483
2484############################################################################# 2484#############################################################################
2485 2485
2486package CFClient::UI::InventoryItem;
2487
2488our @ISA = CFClient::UI::HBox::;
2489
2490sub new {
2491 my $class = shift;
2492
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new (
2503 can_hover => 1,
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_,
2562 );
2563
2564 $self
2565}
2566
2567sub set_items {
2568 my ($self, $items) = @_;
2569
2570 $self->{scrolled}->clear;
2571 return unless $items;
2572
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2574
2575 $self->{real_items} = \@items;
2576
2577 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2583 }
2584
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591}
2592
2593#############################################################################
2594
2486package CFClient::UI::Menu; 2595package CFClient::UI::Menu;
2487 2596
2488our @ISA = CFClient::UI::FancyFrame::; 2597our @ISA = CFClient::UI::FancyFrame::;
2489 2598
2490use CFClient::OpenGL; 2599use CFClient::OpenGL;
… …
2553 } 2662 }
2554} 2663}
2555 2664
2556############################################################################# 2665#############################################################################
2557 2666
2667package CFClient::UI::Statusbox;
2668
2669our @ISA = CFClient::UI::VBox::;
2670
2671sub reorder {
2672 my ($self) = @_;
2673 my $NOW = time;
2674
2675 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 }
2678
2679 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2681 my $count = 10 + 1;
2682 for my $item (@items) {
2683 last unless --$count;
2684
2685 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text};
2688 for ($short) {
2689 s/^\s+//;
2690 s/\012.*//s;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 }
2694
2695 new CFClient::UI::Label
2696 markup => $short,
2697 tooltip => delete $item->{tooltip},
2698 fontsize => delete $item->{fontsize},
2699 color => delete $item->{color},
2700 can_events => 1,
2701 can_hover => 1,
2702 };
2703 }
2704
2705 $self->clear;
2706 $self->SUPER::add (@widgets);
2707}
2708
2709sub add {
2710 my ($self, $text, %arg) = @_;
2711
2712 my $item = {
2713 time => time,
2714 text => $text,
2715 timeout => 60,
2716 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8],
2719 %arg,
2720 };
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726
2727 $self->reorder;
2728}
2729
2730#############################################################################
2731
2558package CFClient::UI::Root; 2732package CFClient::UI::Root;
2559 2733
2560our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2561 2735
2562use CFClient::OpenGL; 2736use CFClient::OpenGL;
2563 2737
2564sub check_size { 2738sub new {
2565 my ($self) = @_; 2739 my $class = shift;
2566 2740
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2741 $class->SUPER::new (
2568} 2742 @_,
2569 2743 )
2570sub size_request {
2571 ($::WIDTH, $::HEIGHT)
2572} 2744}
2573 2745
2574sub configure { 2746sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 2747 my ($self, $x, $y, $w, $h) = @_;
2576 2748
2577 $self->SUPER::configure ($x, $y, $w, $h); 2749 $self->{w} = $w;
2750 $self->{h} = $h;
2751}
2578 2752
2753sub check_size {
2754 my ($self) = @_;
2755
2756 $self->size_allocate ($self->{w}, $self->{h})
2757 if $self->{w};
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762
2763 ($self->{w}, $self->{h})
2764}
2765
2766sub size_allocate {
2767 my ($self, $w, $h) = @_;
2768
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784
2579 for my $child (@{$self->{children}}) { 2785 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 2787
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2583 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2584 $child->configure ($X, $Y, $W,$H); 2790 $child->configure ($X, $Y, $W, $H);
2585 } 2791 }
2586}
2587 2792
2588sub _topleft { 2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2589 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2590 2799
2591 ($x, $y) 2800 ($x, $y)
2592} 2801}
2593 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2594sub update { 2809sub update {
2595 my ($self) = @_; 2810 my ($self) = @_;
2596 2811
2597 $self->check_size; 2812 $self->check_size;
2598 ::refresh (); 2813 $::WANT_REFRESH++;
2599} 2814}
2600 2815
2601sub add { 2816sub add {
2602 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2603 2818
2604 # integerize window positions 2819 # integerise window positions
2605 $child->{x} = int $child->{x}; 2820 $child->{x} = int $child->{x};
2606 $child->{y} = int $child->{y}; 2821 $child->{y} = int $child->{y};
2607 2822
2608 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2609} 2824}
… …
2612 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2613 2828
2614 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2615} 2830}
2616 2831
2617sub draw { 2832sub draw {
2618 my ($self) = @_; 2833 my ($self) = @_;
2619 2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878
2620 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2622 } 2882 }
2623 2883
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;
… …
2634 $self->_draw; 2894 $self->_draw;
2635} 2895}
2636 2896
2637############################################################################# 2897#############################################################################
2638 2898
2639package CFClient::UI::Inventory;
2640
2641our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2650
2651 $self
2652}
2653
2654sub set_items {
2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662 $self->{real_items} = \@items;
2663
2664 for my $item (@items) {
2665 my $desc = $item->{nrof} < 2
2666 ? $item->{name}
2667 : "$item->{nrof} $item->{name_pl}";
2668
2669 my $hb = new CFClient::UI::HBox;
2670
2671 $hb->add (my $f = new CFClient::UI::Face
2672 can_events => 0,
2673 face => $item->{face},
2674 anim => $item->{anim},
2675 animspeed => $item->{animspeed},
2676 expand => 1,
2677 );
2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2680 }
2681
2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683}
2684
2685sub size_request {
2686 my ($self) = @_;
2687 (100, 200)
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI; 2899package CFClient::UI;
2693 2900
2694$ROOT = new CFClient::UI::Root; 2901$ROOT = new CFClient::UI::Root;
2695$TOOLTIP = new CFClient::UI::Tooltip; 2902$TOOLTIP = new CFClient::UI::Tooltip;
2696 2903

Diff Legend

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