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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 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 {
… …
523} 526}
524 527
525sub reconfigure { 528sub reconfigure {
526 my ($self) = @_; 529 my ($self) = @_;
527 530
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
528 $self->realloc; 535 $self->realloc;
529 $self->update; 536 $self->update;
530} 537}
531 538
532# using global variables seems a bit hacky, but passing through all drawing 539# using global variables seems a bit hacky, but passing through all drawing
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 557
551 glPushMatrix; 558 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 560
556 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 563 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 565 glBegin GL_QUADS;
563 glVertex $x , $y; 566 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 567 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 568 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 569 glVertex 0 , $self->{h};
567 glEnd; 570 glEnd;
568 glDisable GL_BLEND; 571 glDisable GL_BLEND;
569 } 572 }
570 573
571 if ($ENV{CFPLUS_DEBUG} & 1) { 574 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 575 glPushMatrix;
573 glColor 1, 1, 0, 1; 576 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 577 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 578 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 579 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 580 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 581 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 582 glVertex 0 , $self->{h} - 1;
580 glEnd; 583 glEnd;
581 glPopMatrix; 584 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
584} 590}
585 591
586sub _draw { 592sub _draw {
587 my ($self) = @_; 593 my ($self) = @_;
588 594
… …
626 632
627 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
629 635
630 glEnable GL_BLEND; 636 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 638 glColor_premultiply @$color;
633 639
634 glBegin GL_QUADS; 640 glBegin GL_QUADS;
635 glVertex 0 , 0; 641 glVertex 0 , 0;
636 glVertex 0 , $h; 642 glVertex 0 , $h;
637 glVertex $w, $h; 643 glVertex $w, $h;
… …
794 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
795} 801}
796 802
797############################################################################# 803#############################################################################
798 804
805# back-buffered drawing area
806
799package CFClient::UI::Window; 807package CFClient::UI::Window;
800 808
801our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
802 810
803use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
854 my $tex = $self->{texture} 862 my $tex = $self->{texture}
855 or return; 863 or return;
856 864
857 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
860 868
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 870
863 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
864} 872}
… …
955package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
956 964
957our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
958 966
959sub new { 967sub new {
960 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
961 971
962 my $self; 972 my $self;
963 973
964 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
965 vertical => 1, 975 vertical => 1,
… …
970 ; 980 ;
971 981
972 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 984 slider => $slider,
975 @_, 985 %arg,
976 ); 986 );
977 987
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
981 990
982 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
983} 998}
984 999
985sub update { 1000sub update {
986 my ($self) = @_; 1001 my ($self) = @_;
987 1002
… …
1026 1041
1027 if ($self->{bg}) { 1042 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
1029 1044
1030 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
1033 1048
1034 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1050 glVertex 0 , 0;
1036 glVertex 0 , $h; 1051 glVertex 0 , $h;
1037 glVertex $w, $h; 1052 glVertex $w, $h;
… …
1151 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
1152 1167
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1170
1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1172 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1173 };
1159 1174
1160 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1166 1181
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1183
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1187 };
1171 } else { 1188 } else {
1172 return 0; 1189 return 0;
1173 } 1190 }
1174 1191
… …
1526 1543
1527 delete $self->{texture}; 1544 delete $self->{texture};
1528 $self->SUPER::update; 1545 $self->SUPER::update;
1529} 1546}
1530 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1531sub set_text { 1555sub set_text {
1532 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1533 1557
1534 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1536 1560
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1539 1563
1564 delete $self->{req_h};
1540 $self->realloc; 1565 $self->realloc;
1541 $self->update; 1566 $self->update;
1542} 1567}
1543 1568
1544sub set_markup { 1569sub set_markup {
… …
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1576
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1554 1579
1580 delete $self->{req_h};
1555 $self->realloc; 1581 $self->realloc;
1556 $self->update; 1582 $self->update;
1557} 1583}
1558 1584
1559sub size_request { 1585sub size_request {
1560 my ($self) = @_; 1586 my ($self) = @_;
1561 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1596
1568 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1569 1598
1570 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1602
1574 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1575 1604
1576 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1578 } 1607 }
1579 1608
1580 ($w, $h) 1609 ($w, $h)
1610 }
1581} 1611}
1582 1612
1583sub size_allocate { 1613sub size_allocate {
1584 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1585 1615
… …
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1625 }; 1655 };
1626 1656
1627 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1629 1658
1630 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1631 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 } 1666 }
1636 1667
1637 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1638} 1669}
… …
1667 1698
1668 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1669 1700
1670 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1671 1702
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1704 $self->{text} = $text;
1676 1705
1677 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1679 1709
1680 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1681} 1714}
1682 1715
1683sub set_text { 1716sub set_text {
1684 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1685 1718
1686 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1720 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1721}
1691 1722
1692sub get_text { 1723sub get_text {
1693 $_[0]{text} 1724 $_[0]{text}
1694} 1725}
… …
1774 my ($self) = @_; 1805 my ($self) = @_;
1775 1806
1776 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1777 1808
1778 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1781 } else { 1812 } else {
1782 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1783 } 1814 }
1784 1815
1785 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1819 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1901} 1932}
1902 1933
1903sub _draw { 1934sub _draw {
1904 my ($self) = @_; 1935 my ($self) = @_;
1905 1936
1906 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1938
1912 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1915 1942
… …
2140 2167
2141 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
2143 2170
2144 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2176
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2335} 2363}
2336 2364
2337sub update { 2365sub update {
2338 my ($self) = @_; 2366 my ($self) = @_;
2339 2367
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2342 2377
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2345 2380
… …
2351 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2353 2388
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2356 }); 2391 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2392
2364 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2365 2394
2366 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2367 2396
… …
2561 2590
2562 delete $self->{texture}; 2591 delete $self->{texture};
2563 } 2592 }
2564 2593
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2568 2597
2569 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2570 2599
2571 my $y0 = $top; 2600 my $y0 = $top;
… …
2606sub _draw { 2635sub _draw {
2607 my ($self) = @_; 2636 my ($self) = @_;
2608 2637
2609 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2614 2643
2615 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2616 2645
2617} 2646}
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 2874
2846 if ($tex) { 2875 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2852 } 2881 }
2853} 2882}
2854 2883
… …
3022 my $class = shift; 3051 my $class = shift;
3023 3052
3024 my $self = $class->SUPER::new ( 3053 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3054 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3027 @_, 3057 @_,
3028 ); 3058 );
3029 3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3062
3032 $self 3063 $self
3033} 3064}
3034 3065
3035sub add { 3066sub add {
… …
3060our @ISA = CFClient::UI::VBox::; 3091our @ISA = CFClient::UI::VBox::;
3061 3092
3062sub new { 3093sub new {
3063 my $class = shift; 3094 my $class = shift;
3064 3095
3065 $class->SUPER::new ( 3096 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3097 fontsize => 0.8,
3067 @_, 3098 @_,
3068 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
3069} 3106}
3070 3107
3071sub reorder { 3108sub reorder {
3072 my ($self) = @_; 3109 my ($self) = @_;
3073 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
3074 3116
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3119 }
3078 3120
… …
3081 my @items = sort { 3123 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
3085 3127
3128 $self->{timer}->interval (1);
3129
3086 my $count = 10 + 1; 3130 my $count = 10 + 1;
3087 for my $item (@items) { 3131 for my $item (@items) {
3088 last unless --$count; 3132 last unless --$count;
3089 3133
3090 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3138 : $item->{text};
3095 3139
… …
3103 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3153 can_events => 1,
3110 can_hover => 1 3154 can_hover => 1
3111 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
3112 } 3168 }
3113 3169
3114 $self->clear; 3170 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
3116} 3172}
… …
3121 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
3123 3179
3124 return unless $text; 3180 return unless $text;
3125 3181
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3183
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3185
3130 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
3161 3217
3162 $self->reorder; 3218 $self->reorder;
3163 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
3164} 3220}
3165 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
3166############################################################################# 3230#############################################################################
3167 3231
3168package CFClient::UI::Inventory; 3232package CFClient::UI::Inventory;
3169 3233
3170our @ISA = CFClient::UI::ScrolledWindow::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
3171 3235
3172sub new { 3236sub new {
3173 my $class = shift; 3237 my $class = shift;
3174 3238
3175 my $self = $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3241 @_,
3178 ); 3242 );
3179 3243
3180 $self 3244 $self
3181} 3245}
3182 3246
3183sub set_items { 3247sub set_items {
3184 my ($self, $items) = @_; 3248 my ($self, $items) = @_;
3185 3249
3186 $self->{scrolled}->clear; 3250 $self->{child}->clear;
3187 return unless $items; 3251 return unless $items;
3188 3252
3189 my @items = sort { 3253 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3254 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3255 or ($a->{name} cmp $b->{name})
… …
3195 3259
3196 my $row = 0; 3260 my $row = 0;
3197 for my $item (@items) { 3261 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3262 CFClient::Item::update_widgets $item;
3199 3263
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3264 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3265 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3266 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3267
3204 $row++; 3268 $row++;
3205 } 3269 }
3206} 3270}
3207 3271
… …
3404 3468
3405############################################################################# 3469#############################################################################
3406 3470
3407package CFClient::UI::SpellList; 3471package CFClient::UI::SpellList;
3408 3472
3409our @ISA = CFClient::UI::ScrolledWindow::; 3473our @ISA = CFClient::UI::Table::;
3410 3474
3411sub new { 3475sub new {
3412 my $class = shift; 3476 my $class = shift;
3413 3477
3414 my $self = $class->SUPER::new ( 3478 my $self = $class->SUPER::new (
3415 binding => [], 3479 binding => [],
3416 commands => [], 3480 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3481 @_,
3419 ) 3482 )
3420} 3483}
3421 3484
3422# XXX: Do sorting? Argl... 3485# XXX: Do sorting? Argl...
3423sub add_spell { 3486sub add_spell {
3424 my ($self, $spell) = @_; 3487 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell; 3488 $self->{spells}->{$spell->{name}} = $spell;
3426 3489
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face}, 3491 face => $spell->{face},
3429 can_hover => 1, 3492 can_hover => 1,
3430 can_events => 1, 3493 can_events => 1,
3431 tooltip => $spell->{message}); 3494 tooltip => $spell->{message});
3432 3495
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name}, 3497 text => $spell->{name},
3435 can_hover => 1, 3498 can_hover => 1,
3436 can_events => 1, 3499 can_events => 1,
3437 tooltip => $spell->{message}, 3500 tooltip => $spell->{message},
3438 expand => 1); 3501 expand => 1);
3439 3502
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1); 3506 expand => 1);
3444 3507
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key", 3509 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448} 3511}
3449 3512
3450sub rebuild_spell_list { 3513sub rebuild_spell_list {
… …
3462############################################################################# 3525#############################################################################
3463 3526
3464package CFClient::UI::Root; 3527package CFClient::UI::Root;
3465 3528
3466our @ISA = CFClient::UI::Container::; 3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3467 3532
3468use CFClient::OpenGL; 3533use CFClient::OpenGL;
3469 3534
3470sub new { 3535sub new {
3471 my $class = shift; 3536 my $class = shift;
… …
3606 3671
3607 delete $queue{$widget+0}; 3672 delete $queue{$widget+0};
3608 3673
3609 my ($w, $h) = $widget->size_request; 3674 my ($w, $h) = $widget->size_request;
3610 3675
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3681
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3682 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3683 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3684
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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