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.298 by root, Wed Jun 7 07:00:30 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;
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; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1636 1665
1637 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1638 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1640 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1642 } 1673 }
1643 1674
1644 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1645} 1676}
1646 1677
… …
1663 can_hover => 1, 1694 can_hover => 1,
1664 can_focus => 1, 1695 can_focus => 1,
1665 valign => 0, 1696 valign => 0,
1666 can_events => 1, 1697 can_events => 1,
1667 #text => ... 1698 #text => ...
1699 #hidden => "*",
1668 @_ 1700 @_
1669 ) 1701 )
1670} 1702}
1671 1703
1672sub _set_text { 1704sub _set_text {
… …
1674 1706
1675 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1676 1708
1677 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1678 1710
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1712 $self->{text} = $text;
1683 1713
1684 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1686 1717
1687 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1688} 1722}
1689 1723
1690sub set_text { 1724sub set_text {
1691 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1692 1726
1693 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1728 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1729}
1698 1730
1699sub get_text { 1731sub get_text {
1700 $_[0]{text} 1732 $_[0]{text}
1701} 1733}
… …
1781 my ($self) = @_; 1813 my ($self) = @_;
1782 1814
1783 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1784 1816
1785 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1788 } else { 1820 } else {
1789 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1790 } 1822 }
1791 1823
1792 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1827 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1908} 1940}
1909 1941
1910sub _draw { 1942sub _draw {
1911 my ($self) = @_; 1943 my ($self) = @_;
1912 1944
1913 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 1946
1919 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1922 1950
… …
2147 2175
2148 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2150 2178
2151 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2184
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2278sub set_range { 2307sub set_range {
2279 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2280 2309
2281 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2282 2311
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2285} 2316}
2286 2317
2287sub set_value { 2318sub set_value {
2288 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2289 2320
… …
2342} 2373}
2343 2374
2344sub update { 2375sub update {
2345 my ($self) = @_; 2376 my ($self) = @_;
2346 2377
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2378 delete $self->{knob_w};
2379 $self->SUPER::update;
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2349 2387
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2352 2390
… …
2358 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2360 2398
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2363 }); 2401 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2402
2371 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2372 2404
2373 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2374 2406
… …
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.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2575 2611
2576 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2577 2613
2578 my $y0 = $top; 2614 my $y0 = $top;
… …
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;
… …
2613sub _draw { 2650sub _draw {
2614 my ($self) = @_; 2651 my ($self) = @_;
2615 2652
2616 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2621 2658
2622 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2623 2660
2624} 2661}
… …
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
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2891 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 2892
2853 if ($tex) { 2893 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 2894 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 2896 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2897 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 2898 glDisable GL_TEXTURE_2D;
2859 } 2899 }
2860} 2900}
2861 2901
… …
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
3067package CFClient::UI::Statusbox; 3108package CFClient::UI::Combobox;
3068 3109
3110use utf8;
3111
3069our @ISA = CFClient::UI::VBox::; 3112our @ISA = CFClient::UI::Button::;
3070 3113
3071sub new { 3114sub new {
3072 my $class = shift; 3115 my $class = shift;
3073 3116
3074 $class->SUPER::new ( 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
3164package CFClient::UI::Statusbox;
3165
3166our @ISA = CFClient::UI::VBox::;
3167
3168sub new {
3169 my $class = shift;
3170
3171 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3172 fontsize => 0.8,
3076 @_, 3173 @_,
3077 ) 3174 );
3175
3176 Scalar::Util::weaken (my $this = $self);
3177
3178 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3179
3180 $self
3078} 3181}
3079 3182
3080sub reorder { 3183sub reorder {
3081 my ($self) = @_; 3184 my ($self) = @_;
3082 my $NOW = 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} };
3083 3191
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3192 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3194 }
3087 3195
… …
3090 my @items = sort { 3198 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3199 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3200 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3201 } values %{ $self->{item} };
3094 3202
3203 $self->{timer}->interval (1);
3204
3095 my $count = 10 + 1; 3205 my $count = 10 + 1;
3096 for my $item (@items) { 3206 for my $item (@items) {
3097 last unless --$count; 3207 last unless --$count;
3098 3208
3099 push @widgets, $item->{label} ||= do { 3209 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3210 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3211 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3212 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3213 : $item->{text};
3104 3214
… …
3112 tooltip => $item->{tooltip}, 3222 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3223 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3224 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3225 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3226 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3227 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3228 can_events => 1,
3119 can_hover => 1 3229 can_hover => 1
3120 }; 3230 };
3231
3232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3234 $label->update;
3235 $label->set_max_size (undef, $label->{req_h} * $diff)
3236 if $diff < 1;
3237 $self->{timer}->interval (1/30);
3238 } else {
3239 $label->{fg}[3] = $item->{fg}[3] || 1;
3240 }
3241
3242 push @widgets, $label;
3121 } 3243 }
3122 3244
3123 $self->clear; 3245 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3246 $self->SUPER::add (reverse @widgets);
3125} 3247}
… …
3130 $text =~ s/^\s+//; 3252 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3253 $text =~ s/\s+$//;
3132 3254
3133 return unless $text; 3255 return unless $text;
3134 3256
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3257 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3258
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3259 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3260
3139 if (my $item = $self->{item}{$group}) { 3261 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3262 if ($item->{text} eq $text) {
… …
3170 3292
3171 $self->reorder; 3293 $self->reorder;
3172 $self->SUPER::reconfigure; 3294 $self->SUPER::reconfigure;
3173} 3295}
3174 3296
3297sub DESTROY {
3298 my ($self) = @_;
3299
3300 $self->{timer}->cancel;
3301
3302 $self->SUPER::DESTROY;
3303}
3304
3175############################################################################# 3305#############################################################################
3176 3306
3177package CFClient::UI::Inventory; 3307package CFClient::UI::Inventory;
3178 3308
3179our @ISA = CFClient::UI::ScrolledWindow::; 3309our @ISA = CFClient::UI::ScrolledWindow::;
… …
3425 commands => [], 3555 commands => [],
3426 @_, 3556 @_,
3427 ) 3557 )
3428} 3558}
3429 3559
3430# 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 => 0, can_events => 1, can_hover => 1, tooltip =>
3563 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3564my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3565 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3566my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3567 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3568my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3569 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3570
3571sub rebuild_spell_list {
3572 my ($self) = @_;
3573
3574 $CFClient::UI::ROOT->on_refresh ($self => sub {
3575 $self->clear;
3576
3577 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3578 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3579 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3580 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3581
3582 my $row = 0;
3583
3584 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3585 my $spell = $self->{spell}{$_};
3586
3587 $row++;
3588
3589 my $spell_cb = sub {
3590 my ($widget, $ev) = @_;
3591
3592 if ($ev->{button} == 1) {
3593 $::CONN->user_send ("cast $spell->{name}");
3594 } elsif ($ev->{button} == 2) {
3595 $::CONN->user_send ("invoke $spell->{name}");
3596 } elsif ($ev->{button} == 3) {
3597 (new CFClient::UI::Menu
3598 items => [
3599 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3600 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3601 ],
3602 )->popup ($ev);
3603 } else {
3604 return 0;
3605 }
3606
3607 1
3608 };
3609
3610 $self->add (0, $row, new CFClient::UI::Face
3611 face => $spell->{face},
3612 can_hover => 1,
3613 can_events => 1,
3614 tooltip => $spell->{message},
3615 on_button_down => $spell_cb,
3616 );
3617
3618 $self->add (1, $row, new CFClient::UI::Label
3619 expand => 1,
3620 text => $spell->{name},
3621 can_hover => 1,
3622 can_events => 1,
3623 tooltip => "$spell->{message}$TOOLTIP_ALL",
3624 on_button_down => $spell_cb,
3625 );
3626
3627 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3628 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3629 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3630 }
3631 });
3632}
3633
3431sub add_spell { 3634sub add_spell {
3432 my ($self, $spell) = @_; 3635 my ($self, $spell) = @_;
3636
3433 $self->{spells}->{$spell->{name}} = $spell; 3637 $self->{spell}->{$spell->{name}} = $spell;
3434 3638 $self->rebuild_spell_list;
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462} 3639}
3463 3640
3464sub remove_spell { 3641sub remove_spell {
3465 my ($self, $spell) = @_; 3642 my ($self, $spell) = @_;
3643
3466 delete $self->{spells}->{$spell->{name}}; 3644 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3645 $self->rebuild_spell_list;
3468} 3646}
3469 3647
3470############################################################################# 3648#############################################################################
3471 3649
3472package CFClient::UI::Root; 3650package CFClient::UI::Root;
3473 3651
3474our @ISA = CFClient::UI::Container::; 3652our @ISA = CFClient::UI::Container::;
3653
3654use List::Util qw(min max);
3475 3655
3476use CFClient::OpenGL; 3656use CFClient::OpenGL;
3477 3657
3478sub new { 3658sub new {
3479 my $class = shift; 3659 my $class = shift;
… …
3614 3794
3615 delete $queue{$widget+0}; 3795 delete $queue{$widget+0};
3616 3796
3617 my ($w, $h) = $widget->size_request; 3797 my ($w, $h) = $widget->size_request;
3618 3798
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3799 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3800 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3801
3802 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3803 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3804
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3805 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3806 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3807
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3808 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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