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.152 by root, Sun Apr 23 01:05:03 2006 UTC vs.
Revision 1.163 by root, Mon Apr 24 06:40:29 2006 UTC

… …
14our $BUTTON_STATE; 14our $BUTTON_STATE;
15 15
16sub check_tooltip { 16sub check_tooltip {
17 if (!$GRAB) { 17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 19 if (length $widget->{tooltip}) {
20 20
21 if ($TOOLTIP->{owner} != $widget) { 21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
23 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show; 30 $TOOLTIP->show;
26 } 31 }
27 32
28 return; 33 return;
… …
34 delete $TOOLTIP->{owner}; 39 delete $TOOLTIP->{owner};
35} 40}
36 41
37# class methods for events 42# class methods for events
38sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
40} 46}
41 47
42sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
44} 51}
45 52
46sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
47 my ($ev) = @_; 54 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 63 check_tooltip;
57 } 64 }
58 65
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 67
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
62} 72}
63 73
64sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
65 my ($ev) = @_; 75 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
67 77
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 79
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 81
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
73 86
74 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 89 $grab->update if $grab;
77 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 107
95 check_tooltip; 108 check_tooltip;
96 } 109 }
97 110
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
99} 115}
100 116
101# convert position array to integers 117# convert position array to integers
102sub harmonize { 118sub harmonize {
103 my ($vals) = @_; 119 my ($vals) = @_;
… …
137 } 153 }
138 154
139 $self 155 $self
140} 156}
141 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
142sub show { 165sub show {
143 my ($self) = @_; 166 my ($self) = @_;
144 167
145 return if $self->{parent}; 168 return if $self->{parent};
146 169
… …
148} 171}
149 172
150sub hide { 173sub hide {
151 my ($self) = @_; 174 my ($self) = @_;
152 175
153 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
154 178
155 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
156} 181}
157 182
158sub move { 183sub move {
159 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
160 185
… …
163 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
164 189
165 $self->update; 190 $self->update;
166} 191}
167 192
168sub needs_redraw { 193sub set_size {
169 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
170} 200}
171 201
172sub size_request { 202sub size_request {
173 require Carp; 203 require Carp;
174 Carp::confess "size_request is abstract"; 204 Carp::confess "size_request is abstract";
… …
204 } 234 }
205} 235}
206 236
207sub size_allocate { 237sub size_allocate {
208 # nothing to be done 238 # nothing to be done
239}
240
241sub set_max_size {
242 my ($self, $w, $h) = @_;
243
244 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h;
209} 246}
210 247
211# return top left coordinates 248# return top left coordinates
212sub _topleft { 249sub _topleft {
213 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
298 glEnd; 335 glEnd;
299 glDisable GL_BLEND; 336 glDisable GL_BLEND;
300 } 337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0;
345 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h};
348 glEnd;
349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
301} 352}
302 353
303sub _draw { 354sub _draw {
304 my ($self) = @_; 355 my ($self) = @_;
305 356
… …
325} 376}
326 377
327sub check_size { 378sub check_size {
328 my ($self) = @_; 379 my ($self) = @_;
329 380
330 return unless $self->{parent}; 381 $self->{parent}
382 or return 1;
331 383
332 my ($w, $h) = $self->size_request; 384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
333 387
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w; 389 $self->{req_w} = $w;
336 $self->{req_h} = $h; 390 $self->{req_h} = $h;
337 391
338 $self->{parent}->check_size; 392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
339 } 401 }
340} 402}
341 403
342sub update { 404sub update {
343 my ($self) = @_; 405 my ($self) = @_;
… …
353} 415}
354 416
355sub emit { 417sub emit {
356 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
357 419
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 421}
362 422
363sub DESTROY { 423sub DESTROY {
364 my ($self) = @_; 424 my ($self) = @_;
365 425
… …
457 517
458sub remove { 518sub remove {
459 my ($self, $child) = @_; 519 my ($self, $child) = @_;
460 520
461 delete $child->{parent}; 521 delete $child->{parent};
522 $child->hide;
462 523
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
464 525
465 $self->check_size; 526 $self->check_size;
466 $self->update; 527 $self->update;
528}
529
530sub clear {
531 my ($self) = @_;
532
533 my $children = delete $self->{children};
534 $self->{children} = [];
535
536 for (@$children) {
537 delete $_->{parent};
538 $_->hide;
539 }
467} 540}
468 541
469sub find_widget { 542sub find_widget {
470 my ($self, $x, $y) = @_; 543 my ($self, $x, $y) = @_;
471 544
… …
631 border => 0.8, 704 border => 0.8,
632 @_ 705 @_
633 ); 706 );
634 707
635 $self 708 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644
645sub size_request {
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649
650sub size_allocate {
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655} 709}
656 710
657sub _draw { 711sub _draw {
658 my ($self) = @_; 712 my ($self) = @_;
659 713
… …
717} 771}
718 772
719sub size_request { 773sub size_request {
720 my ($self) = @_; 774 my ($self) = @_;
721 775
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723
724 my ($w, $h) = $self->SUPER::size_request; 776 my ($w, $h) = $self->SUPER::size_request;
725 777
726 ( 778 (
727 $w + $self->border * 2, 779 $w + $self->border * 2,
728 $h + $self->border * 2, 780 $h + $self->border * 2,
… …
860 912
861# TODO: move to container class maybe? send childs a signal on removal? 913# TODO: move to container class maybe? send childs a signal on removal?
862sub clear { 914sub clear {
863 my ($self) = @_; 915 my ($self) = @_;
864 916
865 delete $self->{children}; 917 my $children = delete $self->{children};
918
919 for (grep $_, map @$_, grep $_, @$children) {
920 delete $_->{parent};
921 $_->hide;
922 }
923
866 $self->update; 924 $self->update;
867} 925}
868 926
869sub get_wh { 927sub get_wh {
870 my ($self) = @_; 928 my ($self) = @_;
… …
1094sub new { 1152sub new {
1095 my ($class, %arg) = @_; 1153 my ($class, %arg) = @_;
1096 1154
1097 my $self = $class->SUPER::new ( 1155 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1156 fg => [1, 1, 1],
1157 #font => default_font
1099 fontsize => 1, 1158 fontsize => 1,
1100 text => "", 1159 text => "",
1101 align => -1, 1160 align => -1,
1102 valign => -1, 1161 valign => -1,
1103 padding => 2, 1162 padding => 2,
… …
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1117 1176
1118 $self 1177 $self
1119} 1178}
1120 1179
1121sub escape_text { 1180sub escape {
1122 local $_ = $_[1]; 1181 local $_ = $_[1];
1123 1182
1124 s/&/&amp;/g; 1183 s/&/&amp;/g;
1125 s/>/&gt;/g; 1184 s/>/&gt;/g;
1126 s/</&lt;/g; 1185 s/</&lt;/g;
… …
1149} 1208}
1150 1209
1151sub size_request { 1210sub size_request {
1152 my ($self) = @_; 1211 my ($self) = @_;
1153 1212
1154 $self->{layout}->set_width; 1213 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1216
1157 my ($w, $h) = $self->{layout}->size; 1217 my ($w, $h) = $self->{layout}->size;
1158 1218
1159 if (exists $self->{template}) { 1219 if (exists $self->{template}) {
1220 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1221 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1222
1162 my ($w2, $h2) = $self->{template}->size; 1223 my ($w2, $h2) = $self->{template}->size;
1163 1224
1164 $w = List::Util::max $w, $w2; 1225 $w = List::Util::max $w, $w2;
… …
1188 1249
1189sub _draw { 1250sub _draw {
1190 my ($self) = @_; 1251 my ($self) = @_;
1191 1252
1192 my $tex = $self->{texture} ||= do { 1253 my $tex = $self->{texture} ||= do {
1254 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1255 $self->{layout}->set_width ($self->{w});
1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1195 new_from_layout CFClient::Texture $self->{layout} 1257 new_from_layout CFClient::Texture $self->{layout}
1196 }; 1258 };
1197 1259
… …
1600 1662
1601package CFClient::UI::VGauge; 1663package CFClient::UI::VGauge;
1602 1664
1603our @ISA = CFClient::UI::Base::; 1665our @ISA = CFClient::UI::Base::;
1604 1666
1667use List::Util qw(min max);
1668
1605use CFClient::OpenGL; 1669use CFClient::OpenGL;
1606 1670
1607my %tex = ( 1671my %tex = (
1608 food => [ 1672 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1673 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1674 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1675 ],
1612 grace => [ 1676 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1677 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1678 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1615 ], 1679 ],
1616 hp => [ 1680 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1681 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1682 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1683 ],
1620 mana => [ 1684 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1685 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1686 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1623 ], 1687 ],
1624); 1688);
1625 1689
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1690# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1691sub new {
… …
1665 1729
1666sub _draw { 1730sub _draw {
1667 my ($self) = @_; 1731 my ($self) = @_;
1668 1732
1669 my $tex = $tex{$self->{type}}; 1733 my $tex = $tex{$self->{type}};
1734 my ($t1, $t2, $t3) = @$tex;
1670 1735
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1736 my ($w, $h) = ($self->{w}, $self->{h});
1672 1737
1673 if ($self->{vertical}) { 1738 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1739 glRotate 90, 0, 0, 1;
… …
1676 1741
1677 ($w, $h) = ($h, $w); 1742 ($w, $h) = ($h, $w);
1678 } 1743 }
1679 1744
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1745 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1746
1683 my $t1 = $tex->[0]; 1747 my $ycut1 = max 0, min 1, $ycut;
1684 my $t2 = $tex->[1]; 1748 my $ycut2 = max 0, min 1, $ycut - 1;
1749
1750 my $h1 = $self->{h} * (1 - $ycut1);
1751 my $h2 = $self->{h} * (1 - $ycut2);
1685 1752
1686 glEnable GL_BLEND; 1753 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1754 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1755 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1757
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1758 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1759 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1760 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1761 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1762 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1763 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1764 glEnd;
1701 1765
1766 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1767 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1768 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1769 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1770 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1771 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1772 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 glEnd; 1773 glEnd;
1774
1775 if ($t3) {
1776 glBindTexture GL_TEXTURE_2D, $t3->{name};
1777 glBegin GL_QUADS;
1778 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1779 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1780 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1781 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1782 glEnd;
1783 }
1709 1784
1710 glDisable GL_BLEND; 1785 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1786 glDisable GL_TEXTURE_2D;
1712} 1787}
1713 1788
… …
1720sub new { 1795sub new {
1721 my ($class, %arg) = @_; 1796 my ($class, %arg) = @_;
1722 1797
1723 my $self = $class->SUPER::new ( 1798 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 1799 tooltip => $arg{type},
1800 can_events => 1,
1801 can_hover => 1,
1725 %arg, 1802 %arg,
1726 ); 1803 );
1727 1804
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1805 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1806 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1807 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 1808
1732 $self 1809 $self
1733} 1810}
1734 1811
… …
1902sub new { 1979sub new {
1903 my $class = shift; 1980 my $class = shift;
1904 1981
1905 my $self = $class->SUPER::new ( 1982 my $self = $class->SUPER::new (
1906 fontsize => 1, 1983 fontsize => 1,
1984 #font => default_font
1907 @_, 1985 @_,
1908 1986
1909 layout => (new CFClient::Layout), 1987 layout => (new CFClient::Layout),
1910 par => [], 1988 par => [],
1911 height => 0, 1989 height => 0,
… …
1951sub size_allocate { 2029sub size_allocate {
1952 my ($self, $w, $h) = @_; 2030 my ($self, $w, $h) = @_;
1953 2031
1954 $self->SUPER::size_allocate ($w, $h); 2032 $self->SUPER::size_allocate ($w, $h);
1955 2033
2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2035 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1957 $self->{layout}->set_width ($self->{children}[0]{w}); 2036 $self->{layout}->set_width ($self->{children}[0]{w});
1958 2037
1959 $self->reflow; 2038 $self->reflow;
1960} 2039}
… …
2012 my $y1 = $top + $self->{h}; 2091 my $y1 = $top + $self->{h};
2013 2092
2014 my $y = 0; 2093 my $y = 0;
2015 2094
2016 my $layout = $self->{layout}; 2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
2017 2098
2018 for my $par (@{$self->{par}}) { 2099 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2100 my $h = $par->[0];
2020 2101
2021 if ($y0 < $y + $h && $y < $y1) { 2102 if ($y0 < $y + $h && $y < $y1) {
… …
2131 $self->emit (changed => $self->{state}); 2212 $self->emit (changed => $self->{state});
2132} 2213}
2133 2214
2134############################################################################# 2215#############################################################################
2135 2216
2217package CFClient::UI::Tooltip;
2218
2219our @ISA = CFClient::UI::Bin::;
2220
2221use CFClient::OpenGL;
2222
2223sub new {
2224 my $class = shift;
2225
2226 $class->SUPER::new (
2227 @_,
2228 can_events => 0,
2229 )
2230}
2231
2232sub set_markup {
2233 my ($self, $text) = @_;
2234
2235 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2236 $self->{label}->set_markup ($text);
2237 $self->add ($self->{label});
2238}
2239
2240sub size_request {
2241 my ($self) = @_;
2242
2243 $self->child->set_max_size ($::WIDTH * 0.3);
2244
2245 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2246
2247 ($w + 4, $h + 4)
2248}
2249
2250sub size_allocate {
2251 my ($self, $w, $h) = @_;
2252
2253 $self->SUPER::size_allocate ($w - 4, $h - 4);
2254}
2255
2256sub _draw {
2257 my ($self) = @_;
2258
2259 glPushMatrix;
2260 glTranslate 0.375, 0.375;
2261
2262 my ($w, $h) = @$self{qw(w h)};
2263
2264 glColor 1, 0.8, 0.4;
2265 glBegin GL_QUADS;
2266 glVertex 0 , 0;
2267 glVertex 0 , $h;
2268 glVertex $w, $h;
2269 glVertex $w, 0;
2270 glEnd;
2271
2272 glColor 0, 0, 0;
2273 glBegin GL_LINE_LOOP;
2274 glVertex 0 , 0;
2275 glVertex 0 , $h;
2276 glVertex $w, $h;
2277 glVertex $w, 0;
2278 glEnd;
2279
2280 glPopMatrix;
2281
2282 glTranslate 2, 2;
2283 $self->SUPER::_draw;
2284}
2285
2286#############################################################################
2287
2288package CFClient::UI::Face;
2289
2290our @ISA = CFClient::UI::Base::;
2291
2292use CFClient::OpenGL;
2293
2294sub new {
2295 my $class = shift;
2296
2297 $class->SUPER::new (
2298 aspect => 1,
2299 @_,
2300 )
2301}
2302
2303sub size_request {
2304 (32, 8)
2305}
2306
2307sub draw {
2308 my ($self) = @_;
2309
2310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2311
2312 if ($tex) {
2313 glEnable GL_BLEND;
2314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315 glEnable GL_TEXTURE_2D;
2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2317 glColor 1, 1, 1, 1;
2318 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2319 glDisable GL_TEXTURE_2D;
2320 glDisable GL_BLEND;
2321 }
2322}
2323
2324#############################################################################
2325
2136package CFClient::UI::Root; 2326package CFClient::UI::Root;
2137 2327
2138our @ISA = CFClient::UI::Container::; 2328our @ISA = CFClient::UI::Container::;
2139 2329
2140use CFClient::OpenGL; 2330use CFClient::OpenGL;
… …
2215############################################################################# 2405#############################################################################
2216 2406
2217package CFClient::UI; 2407package CFClient::UI;
2218 2408
2219$ROOT = new CFClient::UI::Root; 2409$ROOT = new CFClient::UI::Root;
2220$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 2410$TOOLTIP = new CFClient::UI::Tooltip;
2221 2411
22221 24121
2223 2413

Diff Legend

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