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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.289 by root, Mon Jun 5 21:43:56 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 {
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 553
551 glPushMatrix; 554 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 556
556 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 559 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 561 glBegin GL_QUADS;
563 glVertex $x , $y; 562 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
567 glEnd; 566 glEnd;
568 glDisable GL_BLEND; 567 glDisable GL_BLEND;
569 } 568 }
570 569
571 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 571 glPushMatrix;
573 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 575 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
580 glEnd; 579 glEnd;
581 glPopMatrix; 580 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
584} 586}
585 587
586sub _draw { 588sub _draw {
587 my ($self) = @_; 589 my ($self) = @_;
588 590
… …
626 628
627 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
629 631
630 glEnable GL_BLEND; 632 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 634 glColor_premultiply @$color;
633 635
634 glBegin GL_QUADS; 636 glBegin GL_QUADS;
635 glVertex 0 , 0; 637 glVertex 0 , 0;
636 glVertex 0 , $h; 638 glVertex 0 , $h;
637 glVertex $w, $h; 639 glVertex $w, $h;
… …
794 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
795} 797}
796 798
797############################################################################# 799#############################################################################
798 800
801# back-buffered drawing area
802
799package CFClient::UI::Window; 803package CFClient::UI::Window;
800 804
801our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
802 806
803use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
854 my $tex = $self->{texture} 858 my $tex = $self->{texture}
855 or return; 859 or return;
856 860
857 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
860 864
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 866
863 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
864} 868}
… …
1033 1037
1034 if ($self->{bg}) { 1038 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
1036 1040
1037 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
1040 1044
1041 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1046 glVertex 0 , 0;
1043 glVertex 0 , $h; 1047 glVertex 0 , $h;
1044 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1158 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1159 1163
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1168 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1169 };
1166 1170
1167 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1173 1177
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1179
1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177 }; 1183 };
1178 } else { 1184 } else {
1179 return 0; 1185 return 0;
1180 } 1186 }
1181 1187
… …
1533 1539
1534 delete $self->{texture}; 1540 delete $self->{texture};
1535 $self->SUPER::update; 1541 $self->SUPER::update;
1536} 1542}
1537 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1538sub set_text { 1551sub set_text {
1539 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1540 1553
1541 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1543 1556
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1546 1559
1560 delete $self->{size_req};
1547 $self->realloc; 1561 $self->realloc;
1548 $self->update; 1562 $self->update;
1549} 1563}
1550 1564
1551sub set_markup { 1565sub set_markup {
… …
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1572
1559 $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;
1560 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1561 1575
1576 delete $self->{size_req};
1562 $self->realloc; 1577 $self->realloc;
1563 $self->update; 1578 $self->update;
1564} 1579}
1565 1580
1566sub size_request { 1581sub size_request {
1567 my ($self) = @_; 1582 my ($self) = @_;
1568 1583
1584 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1590
1575 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1576 1592
1577 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1596
1581 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1582 1598
1583 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1585 } 1604 };
1586 1605
1587 ($w, $h) 1606 @{ $self->{size_req} }
1588} 1607}
1589 1608
1590sub size_allocate { 1609sub size_allocate {
1591 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1592 1611
… …
1601 1620
1602 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1603 delete $self->{texture}; 1622 delete $self->{texture};
1604 1623
1605 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1606} 1633}
1607 1634
1608sub _draw { 1635sub _draw {
1609 my ($self) = @_; 1636 my ($self) = @_;
1610 1637
… …
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1632 }; 1659 };
1633 1660
1634 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1636 1662
1637 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1638 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 } 1670 }
1643 1671
1644 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1645} 1673}
… …
1674 1702
1675 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1676 1704
1677 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1678 1706
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1708 $self->{text} = $text;
1683 1709
1684 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1686 1713
1687 $self->_emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1688} 1718}
1689 1719
1690sub set_text { 1720sub set_text {
1691 my ($self, $text) = @_; 1721 my ($self, $text) = @_;
1692 1722
1693 $self->{cursor} = length $text; 1723 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1724 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1725}
1698 1726
1699sub get_text { 1727sub get_text {
1700 $_[0]{text} 1728 $_[0]{text}
1701} 1729}
… …
1781 my ($self) = @_; 1809 my ($self) = @_;
1782 1810
1783 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1784 1812
1785 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1788 } else { 1816 } else {
1789 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1790 } 1818 }
1791 1819
1792 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1823 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1908} 1936}
1909 1937
1910sub _draw { 1938sub _draw {
1911 my ($self) = @_; 1939 my ($self) = @_;
1912 1940
1913 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 1942
1919 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1922 1946
… …
2147 2171
2148 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
2150 2174
2151 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2180
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
2342} 2367}
2343 2368
2344sub update { 2369sub update {
2345 my ($self) = @_; 2370 my ($self) = @_;
2346 2371
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2372 delete $self->{knob_w};
2373 $self->SUPER::update;
2374}
2375
2376sub _draw {
2377 my ($self) = @_;
2378
2379 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2380 $self->set_value ($self->{range}[0]);
2349 2381
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2383 my $range = ($hi - $page - $lo) || 1e-100;
2352 2384
… …
2358 $value = ($value - $lo) / $range; 2390 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2391 $value = $value * $self->{scale} + $self->{offset};
2360 2392
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2393 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2394 $self->{knob_w} = $knob_w;
2363 }); 2395 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2396
2371 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
2372 2398
2373 glScale $self->{w}, $self->{h}; 2399 glScale $self->{w}, $self->{h};
2374 2400
… …
2568 2594
2569 delete $self->{texture}; 2595 delete $self->{texture};
2570 } 2596 }
2571 2597
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2599 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2575 2601
2576 my $top = int $self->{children}[1]{range}[0]; 2602 my $top = int $self->{children}[1]{range}[0];
2577 2603
2578 my $y0 = $top; 2604 my $y0 = $top;
… …
2613sub _draw { 2639sub _draw {
2614 my ($self) = @_; 2640 my ($self) = @_;
2615 2641
2616 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2644 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2621 2647
2622 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2623 2649
2624} 2650}
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 2878
2853 if ($tex) { 2879 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 2880 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 2882 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 2884 glDisable GL_TEXTURE_2D;
2859 } 2885 }
2860} 2886}
2861 2887
… …
3069our @ISA = CFClient::UI::VBox::; 3095our @ISA = CFClient::UI::VBox::;
3070 3096
3071sub new { 3097sub new {
3072 my $class = shift; 3098 my $class = shift;
3073 3099
3074 $class->SUPER::new ( 3100 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3101 fontsize => 0.8,
3076 @_, 3102 @_,
3077 ) 3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
3078} 3110}
3079 3111
3080sub reorder { 3112sub reorder {
3081 my ($self) = @_; 3113 my ($self) = @_;
3082 my $NOW = time; 3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
3083 3120
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3121 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3123 }
3087 3124
… …
3090 my @items = sort { 3127 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3128 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3129 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3130 } values %{ $self->{item} };
3094 3131
3132 $self->{timer}->interval (1);
3133
3095 my $count = 10 + 1; 3134 my $count = 10 + 1;
3096 for my $item (@items) { 3135 for my $item (@items) {
3097 last unless --$count; 3136 last unless --$count;
3098 3137
3099 push @widgets, $item->{label} ||= do { 3138 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3139 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3140 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3141 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3142 : $item->{text};
3104 3143
… …
3112 tooltip => $item->{tooltip}, 3151 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3152 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3153 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3154 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3155 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3156 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3157 can_events => 1,
3119 can_hover => 1 3158 can_hover => 1
3120 }; 3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
3121 } 3172 }
3122 3173
3123 $self->clear; 3174 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3175 $self->SUPER::add (reverse @widgets);
3125} 3176}
… …
3130 $text =~ s/^\s+//; 3181 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3182 $text =~ s/\s+$//;
3132 3183
3133 return unless $text; 3184 return unless $text;
3134 3185
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3187
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3189
3139 if (my $item = $self->{item}{$group}) { 3190 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3191 if ($item->{text} eq $text) {
… …
3170 3221
3171 $self->reorder; 3222 $self->reorder;
3172 $self->SUPER::reconfigure; 3223 $self->SUPER::reconfigure;
3173} 3224}
3174 3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
3175############################################################################# 3234#############################################################################
3176 3235
3177package CFClient::UI::Inventory; 3236package CFClient::UI::Inventory;
3178 3237
3179our @ISA = CFClient::UI::ScrolledWindow::; 3238our @ISA = CFClient::UI::ScrolledWindow::;
… …
3471 3530
3472package CFClient::UI::Root; 3531package CFClient::UI::Root;
3473 3532
3474our @ISA = CFClient::UI::Container::; 3533our @ISA = CFClient::UI::Container::;
3475 3534
3535use List::Util qw(min max);
3536
3476use CFClient::OpenGL; 3537use CFClient::OpenGL;
3477 3538
3478sub new { 3539sub new {
3479 my $class = shift; 3540 my $class = shift;
3480 3541
… …
3614 3675
3615 delete $queue{$widget+0}; 3676 delete $queue{$widget+0};
3616 3677
3617 my ($w, $h) = $widget->size_request; 3678 my ($w, $h) = $widget->size_request;
3618 3679
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3680 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3681 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3682
3683 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3684 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3685
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3686 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3687 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3688
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3689 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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