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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.299 by root, Wed Jun 7 07:17:37 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
277 delete $self->{visible}; 278 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
314} 315}
315 316
316sub move_abs { 317sub move_abs {
317 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
318 319
319 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
322 323
323 $self->update; 324 $self->update;
324} 325}
325 326
… …
381} 382}
382 383
383sub set_max_size { 384sub set_max_size {
384 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
385 386
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
388 389
389 $self->realloc; 390 $self->realloc;
390} 391}
391 392
392sub set_tooltip { 393sub set_tooltip {
… …
399 400
400 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
401 402
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 406 }
406} 407}
407 408
408# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
409sub coord2local { 410sub coord2local {
… …
1538 1539
1539 delete $self->{texture}; 1540 delete $self->{texture};
1540 $self->SUPER::update; 1541 $self->SUPER::update;
1541} 1542}
1542 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1543sub set_text { 1551sub set_text {
1544 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1545 1553
1546 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1548 1556
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1551 1559
1560 delete $self->{size_req};
1552 $self->realloc; 1561 $self->realloc;
1553 $self->update; 1562 $self->update;
1554} 1563}
1555 1564
1556sub set_markup { 1565sub set_markup {
… …
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1572
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1566 1575
1576 delete $self->{size_req};
1567 $self->realloc; 1577 $self->realloc;
1568 $self->update; 1578 $self->update;
1569} 1579}
1570 1580
1571sub size_request { 1581sub size_request {
1572 my ($self) = @_; 1582 my ($self) = @_;
1573 1583
1584 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1590
1580 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1581 1592
1582 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1596
1586 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1587 1598
1588 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1590 } 1604 };
1591 1605
1592 ($w, $h) 1606 @{ $self->{size_req} }
1593} 1607}
1594 1608
1595sub size_allocate { 1609sub size_allocate {
1596 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1597 1611
… …
1606 1620
1607 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1608 delete $self->{texture}; 1622 delete $self->{texture};
1609 1623
1610 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1611} 1633}
1612 1634
1613sub _draw { 1635sub _draw {
1614 my ($self) = @_; 1636 my ($self) = @_;
1615 1637
… …
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1637 }; 1659 };
1638 1660
1639 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1665
1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668 glColor @{$self->{fg}};
1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670 } else {
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641
1642 glColor_premultiply @{$self->{fg}}
1643 if $tex->{format} == GL_ALPHA;
1644
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673 }
1646 1674
1647 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1648} 1676}
1649 1677
1650############################################################################# 1678#############################################################################
… …
1666 can_hover => 1, 1694 can_hover => 1,
1667 can_focus => 1, 1695 can_focus => 1,
1668 valign => 0, 1696 valign => 0,
1669 can_events => 1, 1697 can_events => 1,
1670 #text => ... 1698 #text => ...
1699 #hidden => "*",
1671 @_ 1700 @_
1672 ) 1701 )
1673} 1702}
1674 1703
1675sub _set_text { 1704sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 1712 $self->{text} = $text;
1684 1713
1685 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1687 1717
1688 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1689 $self->update; 1721 $self->update;
1690} 1722}
1691 1723
1692sub set_text { 1724sub set_text {
1693 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1694 1726
1695 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1728 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1729}
1700 1730
1701sub get_text { 1731sub get_text {
1702 $_[0]{text} 1732 $_[0]{text}
1703} 1733}
… …
2277sub set_range { 2307sub set_range {
2278 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2279 2309
2280 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2281 2311
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2284} 2316}
2285 2317
2286sub set_value { 2318sub set_value {
2287 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2288 2320
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2437 2469
2438############################################################################# 2470#############################################################################
2439 2471
2440package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2441 2473
2442our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2443 2475
2444use CFClient::OpenGL; 2476use CFClient::OpenGL;
2445 2477
… …
2447 my $class = shift; 2479 my $class = shift;
2448 2480
2449 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2450 fontsize => 1, 2482 fontsize => 1,
2451 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2452 #font => default_font 2485 #font => default_font
2453 @_, 2486 @_,
2454 2487
2455 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2456 par => [], 2489 par => [],
… …
2479 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2480 2513
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2518
2485 $self->reflow; 2519 $self->reflow;
2486} 2520}
2487 2521
2488sub text_size { 2522sub text_size {
… …
2490 2524
2491 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2492 2526
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2496 2531
2497 $layout->size 2532 $layout->size
2498} 2533}
2499 2534
… …
2538 2573
2539 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2540 2575
2541 delete $self->{texture}; 2576 delete $self->{texture};
2542 2577
2543 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2580
2546 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2582 my $height = 0;
2548 2583
… …
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552 2587
2553 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2556 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h; 2595 $_->[1] = $h;
2560 } 2596 }
… …
2563 } 2599 }
2564 2600
2565 $self->{height} = $height; 2601 $self->{height} = $height;
2566 2602
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568 2604
2569 delete $self->{texture}; 2605 delete $self->{texture};
2570 } 2606 }
2571 2607
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 2609 glClearColor 0, 0, 0, 0;
… …
2592 my $h = $par->[1]; 2628 my $h = $par->[1];
2593 2629
2594 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2598 2635
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600 2637
2601 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2754 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2755 . "visible $widget->{visible}";
2719 } 2756 }
2757
2758 $tooltip =~ s/^\n+//;
2759 $tooltip =~ s/\n+$//;
2720 2760
2721 $self->add (new CFClient::UI::Label 2761 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2762 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2763 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2764 fontsize => 0.8,
… …
2752 or return; 2792 or return;
2753 2793
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2794 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2795
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2796 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2797 if $x + $self->{w} > $self->{root}{w};
2758 2798
2759 $self->move_abs ($x, $y); 2799 $self->move_abs ($x, $y);
2760 }); 2800 });
2761} 2801}
2762 2802
… …
2894 ); 2934 );
2895 2935
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2936 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 2937
2898 for my $item (@{ $self->{items} }) { 2938 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 2939 my ($widget, $cb, $tooltip) = @$item;
2900 2940
2901 # handle various types of items, only text for now 2941 # handle various types of items, only text for now
2902 if (!ref $widget) { 2942 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label 2943 $widget = new CFClient::UI::Label
2904 can_hover => 1, 2944 can_hover => 1,
2905 can_events => 1, 2945 can_events => 1,
2906 text => $widget; 2946 markup => $widget,
2947 tooltip => $tooltip
2907 } 2948 }
2908 2949
2909 $self->{item}{$widget} = $item; 2950 $self->{item}{$widget} = $item;
2910 2951
2911 $self->{vbox}->add ($widget); 2952 $self->{vbox}->add ($widget);
… …
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3103 $self->_emit (page_changed => $self->{multiplexer}{current});
3063} 3104}
3064 3105
3065############################################################################# 3106#############################################################################
3066 3107
3108package CFClient::UI::Combobox;
3109
3110use utf8;
3111
3112our @ISA = CFClient::UI::Button::;
3113
3114sub new {
3115 my $class = shift;
3116
3117 my $self = $class->SUPER::new (
3118 options => [], # [value, title, longdesc], ...
3119 value => undef,
3120 @_,
3121 );
3122
3123 $self->_set_value ($self->{value});
3124
3125 $self
3126}
3127
3128sub button_down {
3129 my ($self, $ev) = @_;
3130
3131 my @menu_items;
3132
3133 for (@{ $self->{options} }) {
3134 my ($value, $title, $tooltip) = @$_;
3135
3136 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3137 }
3138
3139 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3140}
3141
3142sub _set_value {
3143 my ($self, $value) = @_;
3144
3145 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3146 or return;
3147
3148 $self->{value} = $item->[0];
3149 $self->set_markup ("$item->[1] ⇓");
3150 $self->set_tooltip ($item->[2]);
3151}
3152
3153sub set_value {
3154 my ($self, $value) = @_;
3155
3156 return unless $self->{value} ne $value;
3157
3158 $self->_set_value ($value);
3159 $self->_emit (changed => $value);
3160}
3161
3162#############################################################################
3163
3067package CFClient::UI::Statusbox; 3164package CFClient::UI::Statusbox;
3068 3165
3069our @ISA = CFClient::UI::VBox::; 3166our @ISA = CFClient::UI::VBox::;
3070 3167
3071sub new { 3168sub new {
… …
3076 @_, 3173 @_,
3077 ); 3174 );
3078 3175
3079 Scalar::Util::weaken (my $this = $self); 3176 Scalar::Util::weaken (my $this = $self);
3080 3177
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3178 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3179
3086 $self 3180 $self
3087} 3181}
3088 3182
3089sub reorder { 3183sub reorder {
3090 my ($self) = @_; 3184 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3185 my $NOW = Time::HiRes::time;
3186
3187 # freeze display when hovering over any label
3188 return if $CFClient::UI::TOOLTIP->{owner}
3189 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3190 values %{ $self->{item} };
3092 3191
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3192 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3194 }
3096 3195
… …
3105 3204
3106 my $count = 10 + 1; 3205 my $count = 10 + 1;
3107 for my $item (@items) { 3206 for my $item (@items) {
3108 last unless --$count; 3207 last unless --$count;
3109 3208
3110 push @widgets, $item->{label} ||= do { 3209 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3210 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3211 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3212 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3213 : $item->{text};
3115 3214
… …
3123 tooltip => $item->{tooltip}, 3222 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3223 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3224 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3225 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3226 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3227 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3228 can_events => 1,
3131 can_hover => 1 3229 can_hover => 1
3132 }; 3230 };
3133 3231
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update; 3234 $label->update;
3235 $label->set_max_size (undef, $label->{req_h} * $diff)
3236 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3237 $self->{timer}->interval (1/30);
3238 } else {
3239 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3240 }
3241
3242 push @widgets, $label;
3143 } 3243 }
3144 3244
3145 $self->clear; 3245 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3246 $self->SUPER::add (reverse @widgets);
3147} 3247}
… …
3455 commands => [], 3555 commands => [],
3456 @_, 3556 @_,
3457 ) 3557 )
3458} 3558}
3459 3559
3460# XXX: Do sorting? Argl... 3560my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3561
3562my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3563 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3564my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3565 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3566my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3567 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3568my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3569 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3570my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3571 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3572
3573sub rebuild_spell_list {
3574 my ($self) = @_;
3575
3576 $CFClient::UI::ROOT->on_refresh ($self => sub {
3577 $self->clear;
3578
3579 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3580 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3581 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3582 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3583 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3584
3585 my $row = 0;
3586
3587 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3588 my $spell = $self->{spell}{$_};
3589
3590 $row++;
3591
3592 my $spell_cb = sub {
3593 my ($widget, $ev) = @_;
3594
3595 if ($ev->{button} == 1) {
3596 $::CONN->user_send ("cast $spell->{name}");
3597 } elsif ($ev->{button} == 2) {
3598 $::CONN->user_send ("invoke $spell->{name}");
3599 } elsif ($ev->{button} == 3) {
3600 (new CFClient::UI::Menu
3601 items => [
3602 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3603 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3604 ],
3605 )->popup ($ev);
3606 } else {
3607 return 0;
3608 }
3609
3610 1
3611 };
3612
3613 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3614
3615 #TODO: add path info to tooltip
3616 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3617
3618 $self->add (0, $row, new CFClient::UI::Face
3619 face => $spell->{face},
3620 can_hover => 1,
3621 can_events => 1,
3622 tooltip => $tooltip,
3623 on_button_down => $spell_cb,
3624 );
3625
3626 $self->add (1, $row, new CFClient::UI::Label
3627 expand => 1,
3628 text => $spell->{name},
3629 can_hover => 1,
3630 can_events => 1,
3631 tooltip => $tooltip,
3632 on_button_down => $spell_cb,
3633 );
3634
3635 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3636 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3637 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3638 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3639 }
3640 });
3641}
3642
3461sub add_spell { 3643sub add_spell {
3462 my ($self, $spell) = @_; 3644 my ($self, $spell) = @_;
3645
3463 $self->{spells}->{$spell->{name}} = $spell; 3646 $self->{spell}->{$spell->{name}} = $spell;
3464 3647 $self->rebuild_spell_list;
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492} 3648}
3493 3649
3494sub remove_spell { 3650sub remove_spell {
3495 my ($self, $spell) = @_; 3651 my ($self, $spell) = @_;
3652
3496 delete $self->{spells}->{$spell->{name}}; 3653 delete $self->{spell}->{$spell->{name}};
3497 $self->rebuild_spell_list; 3654 $self->rebuild_spell_list;
3498} 3655}
3499 3656
3500############################################################################# 3657#############################################################################
3501 3658

Diff Legend

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