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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.294 by root, Tue Jun 6 03:19:26 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);
… …
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;
389
390 $self->realloc;
388} 391}
389 392
390sub set_tooltip { 393sub set_tooltip {
391 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
392 395
… …
397 400
398 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
399 402
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 406 }
404} 407}
405 408
406# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
407sub coord2local { 410sub coord2local {
… …
855 my $tex = $self->{texture} 858 my $tex = $self->{texture}
856 or return; 859 or return;
857 860
858 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862 glColor 0, 0, 0, 1; 863 glColor 0, 0, 0, 1;
863 864
864 $tex->draw_quad (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865 866
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
868} 868}
869 869
870############################################################################# 870#############################################################################
871 871
… …
1539 1539
1540 delete $self->{texture}; 1540 delete $self->{texture};
1541 $self->SUPER::update; 1541 $self->SUPER::update;
1542} 1542}
1543 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1544sub set_text { 1551sub set_text {
1545 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1546 1553
1547 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1549 1556
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1552 1559
1560 delete $self->{size_req};
1553 $self->realloc; 1561 $self->realloc;
1554 $self->update; 1562 $self->update;
1555} 1563}
1556 1564
1557sub set_markup { 1565sub set_markup {
… …
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1572
1565 $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;
1566 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1567 1575
1576 delete $self->{size_req};
1568 $self->realloc; 1577 $self->realloc;
1569 $self->update; 1578 $self->update;
1570} 1579}
1571 1580
1572sub size_request { 1581sub size_request {
1573 my ($self) = @_; 1582 my ($self) = @_;
1574 1583
1584 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1590
1581 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1582 1592
1583 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1596
1587 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1588 1598
1589 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1591 } 1604 };
1592 1605
1593 ($w, $h) 1606 @{ $self->{size_req} }
1594} 1607}
1595 1608
1596sub size_allocate { 1609sub size_allocate {
1597 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1598 1611
… …
1607 1620
1608 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1609 delete $self->{texture}; 1622 delete $self->{texture};
1610 1623
1611 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1612} 1633}
1613 1634
1614sub _draw { 1635sub _draw {
1615 my ($self) = @_; 1636 my ($self) = @_;
1616 1637
… …
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1638 }; 1659 };
1639 1660
1640 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1642 1665
1643 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1644 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1646 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1648 } 1673 }
1649 1674
1650 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1651} 1676}
1652 1677
… …
1669 can_hover => 1, 1694 can_hover => 1,
1670 can_focus => 1, 1695 can_focus => 1,
1671 valign => 0, 1696 valign => 0,
1672 can_events => 1, 1697 can_events => 1,
1673 #text => ... 1698 #text => ...
1699 #hidden => "*",
1674 @_ 1700 @_
1675 ) 1701 )
1676} 1702}
1677 1703
1678sub _set_text { 1704sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1712 $self->{text} = $text;
1687 1713
1688 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1690 1717
1691 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1692 $self->update; 1721 $self->update;
1693} 1722}
1694 1723
1695sub set_text { 1724sub set_text {
1696 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1697 1726
1698 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1728 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1729}
1703 1730
1704sub get_text { 1731sub get_text {
1705 $_[0]{text} 1732 $_[0]{text}
1706} 1733}
… …
1913} 1940}
1914 1941
1915sub _draw { 1942sub _draw {
1916 my ($self) = @_; 1943 my ($self) = @_;
1917 1944
1918 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 1946
1924 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1927 1950
… …
2454 my $class = shift; 2477 my $class = shift;
2455 2478
2456 my $self = $class->SUPER::new ( 2479 my $self = $class->SUPER::new (
2457 fontsize => 1, 2480 fontsize => 1,
2458 can_events => 0, 2481 can_events => 0,
2482 indent => 0,
2459 #font => default_font 2483 #font => default_font
2460 @_, 2484 @_,
2461 2485
2462 layout => (new CFClient::Layout 1), 2486 layout => (new CFClient::Layout 1),
2463 par => [], 2487 par => [],
… …
2486 $self->SUPER::size_allocate ($w, $h); 2510 $self->SUPER::size_allocate ($w, $h);
2487 2511
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2512 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2514 $self->{layout}->set_width ($self->{children}[0]{w});
2515 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2516
2492 $self->reflow; 2517 $self->reflow;
2493} 2518}
2494 2519
2495sub text_size { 2520sub text_size {
… …
2497 2522
2498 my $layout = $self->{layout}; 2523 my $layout = $self->{layout};
2499 2524
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2526 $layout->set_width ($self->{children}[0]{w} - $indent);
2527 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2528 $layout->set_markup ($text);
2503 2529
2504 $layout->size 2530 $layout->size
2505} 2531}
2506 2532
… …
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559 2585
2560 for (@{$self->{par}}) { 2586 for (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562 $layout->set_width ($W - $_->[3]); 2588 $layout->set_width ($W - $_->[3]);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2563 $layout->set_markup ($_->[4]); 2590 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2591 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2592 $_->[0] = $w + $_->[3];
2566 $_->[1] = $h; 2593 $_->[1] = $h;
2567 } 2594 }
… …
2575 2602
2576 delete $self->{texture}; 2603 delete $self->{texture};
2577 } 2604 }
2578 2605
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2607 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2608 glClear GL_COLOR_BUFFER_BIT;
2582 2609
2583 my $top = int $self->{children}[1]{range}[0]; 2610 my $top = int $self->{children}[1]{range}[0];
2584 2611
2585 my $y0 = $top; 2612 my $y0 = $top;
… …
2599 my $h = $par->[1]; 2626 my $h = $par->[1];
2600 2627
2601 if ($y0 < $y + $h && $y < $y1) { 2628 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] }); 2629 $layout->set_foreground (@{ $par->[2] });
2603 $layout->set_width ($W - $par->[3]); 2630 $layout->set_width ($W - $par->[3]);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2604 $layout->set_markup ($par->[4]); 2632 $layout->set_markup ($par->[4]);
2605 2633
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2634 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2607 2635
2608 glRasterPos $par->[3], $y - $y0; 2636 glRasterPos $par->[3], $y - $y0;
… …
2620sub _draw { 2648sub _draw {
2621 my ($self) = @_; 2649 my ($self) = @_;
2622 2650
2623 glEnable GL_TEXTURE_2D; 2651 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2653 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2654 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2655 glDisable GL_TEXTURE_2D;
2628 2656
2629 $self->{children}[1]->draw; 2657 $self->{children}[1]->draw;
2630 2658
2631} 2659}
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2886 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 2887
2860 if ($tex) { 2888 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 2889 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 2891 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 2893 glDisable GL_TEXTURE_2D;
2866 } 2894 }
2867} 2895}
2868 2896
… …
2901 ); 2929 );
2902 2930
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2931 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2904 2932
2905 for my $item (@{ $self->{items} }) { 2933 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 2934 my ($widget, $cb, $tooltip) = @$item;
2907 2935
2908 # handle various types of items, only text for now 2936 # handle various types of items, only text for now
2909 if (!ref $widget) { 2937 if (!ref $widget) {
2910 $widget = new CFClient::UI::Label 2938 $widget = new CFClient::UI::Label
2911 can_hover => 1, 2939 can_hover => 1,
2912 can_events => 1, 2940 can_events => 1,
2913 text => $widget; 2941 text => $widget,
2942 tooltip => $tooltip
2914 } 2943 }
2915 2944
2916 $self->{item}{$widget} = $item; 2945 $self->{item}{$widget} = $item;
2917 2946
2918 $self->{vbox}->add ($widget); 2947 $self->{vbox}->add ($widget);
… …
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3098 $self->_emit (page_changed => $self->{multiplexer}{current});
3070} 3099}
3071 3100
3072############################################################################# 3101#############################################################################
3073 3102
3074package CFClient::UI::Statusbox; 3103package CFClient::UI::Combobox;
3075 3104
3105use utf8;
3106
3076our @ISA = CFClient::UI::VBox::; 3107our @ISA = CFClient::UI::Button::;
3077 3108
3078sub new { 3109sub new {
3079 my $class = shift; 3110 my $class = shift;
3080 3111
3081 $class->SUPER::new ( 3112 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ...
3114 value => undef,
3115 @_,
3116 );
3117
3118 $self->_set_value ($self->{value});
3119
3120 $self
3121}
3122
3123sub button_down {
3124 my ($self, $ev) = @_;
3125
3126 my @menu_items;
3127
3128 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_;
3130
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3132 }
3133
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135}
3136
3137sub _set_value {
3138 my ($self, $value) = @_;
3139
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3141 or return;
3142
3143 $self->{value} = $item->[1];
3144 $self->set_markup ("$item->[0] ⇓");
3145 $self->set_tooltip ($item->[2]);
3146}
3147
3148sub set_value {
3149 my ($self, $value) = @_;
3150
3151 return unless $self->{value} ne $value;
3152
3153 $self->_set_value ($value);
3154 $self->_emit (changed => $value);
3155}
3156
3157#############################################################################
3158
3159package CFClient::UI::Statusbox;
3160
3161our @ISA = CFClient::UI::VBox::;
3162
3163sub new {
3164 my $class = shift;
3165
3166 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3167 fontsize => 0.8,
3083 @_, 3168 @_,
3084 ) 3169 );
3170
3171 Scalar::Util::weaken (my $this = $self);
3172
3173 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3174
3175 $self
3085} 3176}
3086 3177
3087sub reorder { 3178sub reorder {
3088 my ($self) = @_; 3179 my ($self) = @_;
3089 my $NOW = time; 3180 my $NOW = Time::HiRes::time;
3181
3182 # freeze display when hovering over any label
3183 return if $CFClient::UI::TOOLTIP->{owner}
3184 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3185 values %{ $self->{item} };
3090 3186
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3187 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3188 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3189 }
3094 3190
… …
3097 my @items = sort { 3193 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3194 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3195 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3196 } values %{ $self->{item} };
3101 3197
3198 $self->{timer}->interval (1);
3199
3102 my $count = 10 + 1; 3200 my $count = 10 + 1;
3103 for my $item (@items) { 3201 for my $item (@items) {
3104 last unless --$count; 3202 last unless --$count;
3105 3203
3106 push @widgets, $item->{label} ||= do { 3204 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3205 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3206 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3207 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3208 : $item->{text};
3111 3209
… …
3119 tooltip => $item->{tooltip}, 3217 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3218 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3219 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3220 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3221 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3222 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3223 can_events => 1,
3126 can_hover => 1 3224 can_hover => 1
3127 }; 3225 };
3226
3227 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3228 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3229 $label->update;
3230 $label->set_max_size (undef, $label->{req_h} * $diff)
3231 if $diff < 1;
3232 $self->{timer}->interval (1/30);
3233 } else {
3234 $label->{fg}[3] = $item->{fg}[3] || 1;
3235 }
3236
3237 push @widgets, $label;
3128 } 3238 }
3129 3239
3130 $self->clear; 3240 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3241 $self->SUPER::add (reverse @widgets);
3132} 3242}
… …
3137 $text =~ s/^\s+//; 3247 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3248 $text =~ s/\s+$//;
3139 3249
3140 return unless $text; 3250 return unless $text;
3141 3251
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3252 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3253
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3254 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3255
3146 if (my $item = $self->{item}{$group}) { 3256 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3257 if ($item->{text} eq $text) {
… …
3177 3287
3178 $self->reorder; 3288 $self->reorder;
3179 $self->SUPER::reconfigure; 3289 $self->SUPER::reconfigure;
3180} 3290}
3181 3291
3292sub DESTROY {
3293 my ($self) = @_;
3294
3295 $self->{timer}->cancel;
3296
3297 $self->SUPER::DESTROY;
3298}
3299
3182############################################################################# 3300#############################################################################
3183 3301
3184package CFClient::UI::Inventory; 3302package CFClient::UI::Inventory;
3185 3303
3186our @ISA = CFClient::UI::ScrolledWindow::; 3304our @ISA = CFClient::UI::ScrolledWindow::;
… …
3432 commands => [], 3550 commands => [],
3433 @_, 3551 @_,
3434 ) 3552 )
3435} 3553}
3436 3554
3437# XXX: Do sorting? Argl... 3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3557my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3559my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3561
3562sub rebuild_spell_list {
3563 my ($self) = @_;
3564
3565 $CFClient::UI::ROOT->on_refresh ($self => sub {
3566 $self->clear;
3567
3568 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3569 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3570 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3571 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3572
3573 my $row = 0;
3574
3575 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576 my $spell = $self->{spell}{$_};
3577
3578 $row++;
3579
3580 $self->add (0, $row, new CFClient::UI::Face
3581 face => $spell->{face},
3582 can_hover => 1,
3583 can_events => 1,
3584 tooltip => $spell->{message},
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $spell->{message},
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3598
3599 # TODO: should be done via popup
3600 $self->add (5, $row, new CFClient::UI::Button
3601 text => "bind",
3602 tooltip => "bind spell readying (cast command) to key",
3603 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604 );
3605 }
3606 });
3607}
3608
3438sub add_spell { 3609sub add_spell {
3439 my ($self, $spell) = @_; 3610 my ($self, $spell) = @_;
3611
3440 $self->{spells}->{$spell->{name}} = $spell; 3612 $self->{spell}->{$spell->{name}} = $spell;
3441 3613 $self->rebuild_spell_list;
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469} 3614}
3470 3615
3471sub remove_spell { 3616sub remove_spell {
3472 my ($self, $spell) = @_; 3617 my ($self, $spell) = @_;
3618
3473 delete $self->{spells}->{$spell->{name}}; 3619 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3620 $self->rebuild_spell_list;
3475} 3621}
3476 3622
3477############################################################################# 3623#############################################################################
3478 3624
3479package CFClient::UI::Root; 3625package CFClient::UI::Root;
3480 3626
3481our @ISA = CFClient::UI::Container::; 3627our @ISA = CFClient::UI::Container::;
3628
3629use List::Util qw(min max);
3482 3630
3483use CFClient::OpenGL; 3631use CFClient::OpenGL;
3484 3632
3485sub new { 3633sub new {
3486 my $class = shift; 3634 my $class = shift;
… …
3621 3769
3622 delete $queue{$widget+0}; 3770 delete $queue{$widget+0};
3623 3771
3624 my ($w, $h) = $widget->size_request; 3772 my ($w, $h) = $widget->size_request;
3625 3773
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3774 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3775 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3776
3777 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3778 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3779
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3780 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3781 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3782
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3783 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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