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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.213 by root, Wed May 17 15:18:57 2006 UTC

… …
140 140
141# call when resolution changes etc. 141# call when resolution changes etc.
142sub rescale_widgets { 142sub rescale_widgets {
143 my ($sx, $sy) = @_; 143 my ($sx, $sy) = @_;
144 144
145 # make a copy, otherwise for complains about freed values.
145 for my $widget (values %WIDGET) { 146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
146 if ($widget->{toplevel}) { 149 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
… …
280sub set_max_size { 283sub set_max_size {
281 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
282 285
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
288}
289
290sub set_tooltip {
291 my ($self, $tooltip) = @_;
292
293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
285} 299}
286 300
287# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
288sub coord2local { 302sub coord2local {
289 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
455 my $class = shift; 469 my $class = shift;
456 470
457 # range [value, low, high, page] 471 # range [value, low, high, page]
458 472
459 $class->SUPER::new ( 473 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
462 @_ 476 @_
463 ) 477 )
464} 478}
465 479
466sub _draw { 480sub _draw {
467 my ($self) = @_; 481 my ($self) = @_;
468 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
470 489
471 glEnable GL_BLEND; 490 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
474 493
475 glBegin GL_QUADS; 494 glBegin GL_QUADS;
476 glVertex 0 , 0; 495 glVertex 0 , 0;
477 glVertex 0 , $h; 496 glVertex 0 , $h;
478 glVertex $w, $h; 497 glVertex $w, $h;
479 glVertex $w, 0; 498 glVertex $w, 0;
480 glEnd; 499 glEnd;
481 500
482 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
483} 503}
484 504
485############################################################################# 505#############################################################################
486 506
487package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
1266 1286
1267############################################################################# 1287#############################################################################
1268 1288
1269package CFClient::UI::Label; 1289package CFClient::UI::Label;
1270 1290
1271our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1272 1292
1273use CFClient::OpenGL; 1293use CFClient::OpenGL;
1274 1294
1275sub new { 1295sub new {
1276 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1277 1297
1278 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1280 #font => default_font 1302 #font => default_font
1281 #text => initial text 1303 #text => initial text
1282 #markup => initial narkup 1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1307 layout => (new CFClient::Layout),
1284 fontsize => 1, 1308 fontsize => 1,
1285 align => -1, 1309 align => -1,
1286 valign => -1, 1310 valign => -1,
1287 padding => 2, 1311 padding => 2,
… …
1302 } 1326 }
1303 1327
1304 $self 1328 $self
1305} 1329}
1306 1330
1307sub escape { 1331sub escape($) {
1308 local $_ = $_[1]; 1332 local $_ = $_[0];
1309 1333
1310 s/&/&amp;/g; 1334 s/&/&amp;/g;
1311 s/>/&gt;/g; 1335 s/>/&gt;/g;
1312 s/</&lt;/g; 1336 s/</&lt;/g;
1313 1337
1314 $_[1] 1338 $_
1315} 1339}
1316 1340
1317sub update { 1341sub update {
1318 my ($self) = @_; 1342 my ($self) = @_;
1319 1343
… …
1352sub size_request { 1376sub size_request {
1353 my ($self) = @_; 1377 my ($self) = @_;
1354 1378
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1380 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1384
1359 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1360 1386
1361 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1391} 1417}
1392 1418
1393sub _draw { 1419sub _draw {
1394 my ($self) = @_; 1420 my ($self) = @_;
1395 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1396 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1425 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1427 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1431
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1433
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1660 my $class = shift; 1690 my $class = shift;
1661 1691
1662 $class->SUPER::new ( 1692 $class->SUPER::new (
1663 padding => 4, 1693 padding => 4,
1664 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1667 can_hover => 1, 1696 can_hover => 1,
1668 align => 0, 1697 align => 0,
1669 valign => 0, 1698 valign => 0,
1670 can_events => 1, 1699 can_events => 1,
… …
1718 1747
1719 $class->SUPER::new ( 1748 $class->SUPER::new (
1720 padding => 2, 1749 padding => 2,
1721 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1751 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1754 state => 0,
1724 can_hover => 1, 1755 can_hover => 1,
1725 @_ 1756 @_
1726 ) 1757 )
1727} 1758}
… …
2019 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2051 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2054 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
2025 req_w => $::WIDTH / 80, 2058 req_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2059 req_h => $::WIDTH / 80,
2027 vertical => 0, 2060 vertical => 0,
2028 can_hover => 1, 2061 can_hover => 1,
… …
2402 2435
2403sub set_tooltip_from { 2436sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2437 my ($self, $widget) = @_;
2405 2438
2406 $self->add (new CFClient::UI::Label 2439 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2440 markup => $widget->{tooltip},
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2442 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2446 );
2413} 2447}
2414 2448
2415sub size_request { 2449sub size_request {
2416 my ($self) = @_; 2450 my ($self) = @_;
… …
2494 2528
2495package CFClient::UI::InventoryItem; 2529package CFClient::UI::InventoryItem;
2496 2530
2497our @ISA = CFClient::UI::HBox::; 2531our @ISA = CFClient::UI::HBox::;
2498 2532
2499sub new { 2533sub _item_to_desc {
2500 my $class = shift; 2534 my ($item) = @_;
2501 2535
2502 my %args = @_; 2536 my $desc =
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2 2537 $item->{nrof} < 2
2507 ? $item->{name} 2538 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}"; 2539 : "$item->{nrof} $item->{name_pl}";
2509 2540
2510 $item->{flags} & Crossfire::Protocol::F_OPEN 2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)"; 2542 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED 2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)"; 2544 and $desc .= " (applied)";
… …
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED 2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)"; 2552 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED 2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *"; 2554 and $desc .= " *";
2524 2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2525 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2526 can_hover => 1, 2569 can_hover => 1,
2527 can_events => 1, 2570 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc) 2571 tooltip => ((CFClient::UI::Label::escape $desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub { 2573 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_; 2574 my ($self, $ev, $x, $y) = @_;
2532 2575
2533 # todo: maybe put examine on 1? but should just be a tooltip :( 2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) { 2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2584 $::CONN->send ("move $targ $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) { 2585 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}"); 2586 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) { 2587 } elsif ($ev->{button} == 3) {
2539 my @menu_items = ( 2588 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [ 2593 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") }, 2595 sub { $::CONN->send ("lock $item->{tag}") },
2547 ], 2596 ],
2548 ); 2597 );
2549 2598
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 } 2600 }
2552 2601
2553 1 2602 1
2554 }, 2603 },
2555 %args 2604 %args
2556 ); 2605 );
2606
2557 2607
2558 $self->add (new CFClient::UI::Face 2608 $self->add (new CFClient::UI::Face
2559 can_events => 0, 2609 can_events => 0,
2560 face => $item->{face}, 2610 face => $item->{face},
2561 anim => $item->{anim}, 2611 anim => $item->{anim},
2562 animspeed => $item->{animspeed}, 2612 animspeed => $item->{animspeed},
2563 ); 2613 );
2564 2614
2565 $self->add (new CFClient::UI::Label 2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2566 can_events => 0, 2616
2567 text => $desc, 2617 $self->{item} = $item;
2568 ); 2618
2619 $self->update_item;
2569 2620
2570 $self 2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2571} 2630}
2572 2631
2573############################################################################# 2632#############################################################################
2574 2633
2575package CFClient::UI::Inventory; 2634package CFClient::UI::Inventory;
… …
2599 } @$items; 2658 } @$items;
2600 2659
2601 $self->{real_items} = \@items; 2660 $self->{real_items} = \@items;
2602 2661
2603 for my $item (@items) { 2662 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2609 } 2665 }
2610 2666
2611 $self->{scrolled}->add (@items); 2667 $self->{scrolled}->add (@items);
2612 2668
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
… …
2694 2750
2695package CFClient::UI::Statusbox; 2751package CFClient::UI::Statusbox;
2696 2752
2697our @ISA = CFClient::UI::VBox::; 2753our @ISA = CFClient::UI::VBox::;
2698 2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2761 )
2762}
2763
2699sub reorder { 2764sub reorder {
2700 my ($self) = @_; 2765 my ($self) = @_;
2701 my $NOW = time; 2766 my $NOW = time;
2702 2767
2703 while (my ($k, $v) = each %{ $self->{item} }) { 2768 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2722 : $item->{text}; 2787 : $item->{text};
2723 2788
2724 for ($short) { 2789 for ($short) {
2725 s/^\s+//; 2790 s/^\s+//;
2726 s/\s+/ /g; 2791 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 2792 }
2730 2793
2731 new CFClient::UI::Label 2794 new CFClient::UI::Label
2732 markup => $short, 2795 markup => $short,
2733 tooltip => $item->{tooltip}, 2796 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 2797 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 2798 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 2801 fg => $item->{fg},
2738 can_events => 1, 2802 can_events => 1,
2739 can_hover => 1 2803 can_hover => 1
2740 }; 2804 };
2741 } 2805 }
… …
2768 $self->{item}{$group} = { 2832 $self->{item}{$group} = {
2769 id => ++$self->{id}, 2833 id => ++$self->{id},
2770 text => $text, 2834 text => $text,
2771 timeout => $timeout, 2835 timeout => $timeout,
2772 tooltip => $text, 2836 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 2837 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 2838 pri => 0,
2776 count => 1, 2839 count => 1,
2777 %arg, 2840 %arg,
2778 }; 2841 };
2779 } 2842 }
2780 2843
2781 $self->reorder; 2844 $self->reorder;
2845}
2846
2847sub reconfigure {
2848 my ($self) = @_;
2849
2850 delete $_->{label}
2851 for values %{ $self->{item} || {} };
2852
2853 $self->reorder;
2854 $self->SUPER::reconfigure;
2782} 2855}
2783 2856
2784############################################################################# 2857#############################################################################
2785 2858
2786package CFClient::UI::Root; 2859package CFClient::UI::Root;
… …
2961############################################################################# 3034#############################################################################
2962 3035
2963package CFClient::UI; 3036package CFClient::UI;
2964 3037
2965$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3040
29681 30411
2969 3042

Diff Legend

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