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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.164 by root, Mon Apr 24 06:57:39 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 23
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31 } 31 }
32 32
33 return; 33 return;
… …
39 delete $TOOLTIP->{owner}; 39 delete $TOOLTIP->{owner};
40} 40}
41 41
42# class methods for events 42# class methods for events
43sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
45} 46}
46 47
47sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
49} 51}
50 52
51sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
52 my ($ev) = @_; 54 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 63 check_tooltip;
62 } 64 }
63 65
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 67
66 $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 }
67} 72}
68 73
69sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
70 my ($ev) = @_; 75 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
72 77
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 79
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 81
77 $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 }
78 86
79 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 89 $grab->update if $grab;
82 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 107
100 check_tooltip; 108 check_tooltip;
101 } 109 }
102 110
103 $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 }
104} 115}
105 116
106# convert position array to integers 117# convert position array to integers
107sub harmonize { 118sub harmonize {
108 my ($vals) = @_; 119 my ($vals) = @_;
… …
126 137
127sub new { 138sub new {
128 my $class = shift; 139 my $class = shift;
129 140
130 my $self = bless { 141 my $self = bless {
131 x => 0, 142 x => 0,
132 y => 0, 143 y => 0,
133 z => 0, 144 z => 0,
134 can_events => 1, 145 can_events => 1,
135 @_ 146 @_
136 }, $class; 147 }, $class;
137 148
138 for (keys %$self) { 149 for (keys %$self) {
… …
142 } 153 }
143 154
144 $self 155 $self
145} 156}
146 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
147sub show { 165sub show {
148 my ($self) = @_; 166 my ($self) = @_;
149 167
150 return if $self->{parent}; 168 return if $self->{parent};
151 169
… …
153} 171}
154 172
155sub hide { 173sub hide {
156 my ($self) = @_; 174 my ($self) = @_;
157 175
158 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
159 178
160 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
161} 181}
162 182
163sub move { 183sub move {
164 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
165 185
… …
168 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
169 189
170 $self->update; 190 $self->update;
171} 191}
172 192
173sub needs_redraw { 193sub set_size {
174 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
175} 200}
176 201
177sub size_request { 202sub size_request {
178 require Carp; 203 require Carp;
179 Carp::confess "size_request is abstract"; 204 Carp::confess "size_request is abstract";
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
310 glEnd; 335 glEnd;
311 glDisable GL_BLEND; 336 glDisable GL_BLEND;
312 } 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 }
313} 352}
314 353
315sub _draw { 354sub _draw {
316 my ($self) = @_; 355 my ($self) = @_;
317 356
… …
337} 376}
338 377
339sub check_size { 378sub check_size {
340 my ($self) = @_; 379 my ($self) = @_;
341 380
342 return unless $self->{parent}; 381 $self->{parent}
382 or return 1;
343 383
344 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;
345 387
346 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w; 389 $self->{req_w} = $w;
348 $self->{req_h} = $h; 390 $self->{req_h} = $h;
349 391
350 $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
351 } 401 }
352} 402}
353 403
354sub update { 404sub update {
355 my ($self) = @_; 405 my ($self) = @_;
… …
365} 415}
366 416
367sub emit { 417sub emit {
368 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
369 419
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 421}
374 422
375sub DESTROY { 423sub DESTROY {
376 my ($self) = @_; 424 my ($self) = @_;
377 425
… …
469 517
470sub remove { 518sub remove {
471 my ($self, $child) = @_; 519 my ($self, $child) = @_;
472 520
473 delete $child->{parent}; 521 delete $child->{parent};
522 $child->hide;
474 523
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
476 525
477 $self->check_size; 526 $self->check_size;
478 $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 }
479} 540}
480 541
481sub find_widget { 542sub find_widget {
482 my ($self, $x, $y) = @_; 543 my ($self, $x, $y) = @_;
483 544
… …
643 border => 0.8, 704 border => 0.8,
644 @_ 705 @_
645 ); 706 );
646 707
647 $self 708 $self
648}
649
650sub set_size {
651 my ($self, $w, $h) = @_;
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655}
656
657sub size_request {
658 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h})
660}
661
662sub size_allocate {
663 my ($self, $w, $h) = @_;
664 $self->{w} = $w;
665 $self->{h} = $h;
666 $self->child->configure (0, 0, $w, $h);
667} 709}
668 710
669sub _draw { 711sub _draw {
670 my ($self) = @_; 712 my ($self) = @_;
671 713
… …
706 my $class = shift; 748 my $class = shift;
707 749
708 # TODO: user_x, user_y, overwrite moveto? 750 # TODO: user_x, user_y, overwrite moveto?
709 751
710 my $self = $class->SUPER::new ( 752 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 753 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 754 border_bg => [1, 1, 1, 1],
713 border => 0.8, 755 border => 0.8,
714 can_events => 1, 756 can_events => 0,
715 @_ 757 @_
716 ); 758 );
717 759
718 $self->{title} &&= new CFClient::UI::Label 760 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 761 align => 0,
… …
729} 771}
730 772
731sub size_request { 773sub size_request {
732 my ($self) = @_; 774 my ($self) = @_;
733 775
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735
736 my ($w, $h) = $self->SUPER::size_request; 776 my ($w, $h) = $self->SUPER::size_request;
737 777
738 ( 778 (
739 $w + $self->border * 2, 779 $w + $self->border * 2,
740 $h + $self->border * 2, 780 $h + $self->border * 2,
… …
872 912
873# 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?
874sub clear { 914sub clear {
875 my ($self) = @_; 915 my ($self) = @_;
876 916
877 delete $self->{children}; 917 my $children = delete $self->{children};
918
919 for (grep $_, map @$_, grep $_, @$children) {
920 delete $_->{parent};
921 $_->hide;
922 }
923
878 $self->update; 924 $self->update;
879} 925}
880 926
881sub get_wh { 927sub get_wh {
882 my ($self) = @_; 928 my ($self) = @_;
… …
1105 1151
1106sub new { 1152sub new {
1107 my ($class, %arg) = @_; 1153 my ($class, %arg) = @_;
1108 1154
1109 my $self = $class->SUPER::new ( 1155 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1156 fg => [1, 1, 1],
1111 #font => default_font 1157 #font => default_font
1112 fontsize => 1, 1158 fontsize => 1,
1113 text => "", 1159 text => "",
1114 align => -1, 1160 align => -1,
1115 valign => -1, 1161 valign => -1,
1116 padding => 2, 1162 padding => 2,
1117 layout => new CFClient::Layout, 1163 layout => new CFClient::Layout,
1118 can_events => 0, 1164 can_events => 0,
1119 %arg 1165 %arg
1120 ); 1166 );
1121 1167
1122 if (exists $self->{template}) { 1168 if (exists $self->{template}) {
… …
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130 1176
1131 $self 1177 $self
1132} 1178}
1133 1179
1134sub escape_text { 1180sub escape {
1135 local $_ = $_[1]; 1181 local $_ = $_[1];
1136 1182
1137 s/&/&amp;/g; 1183 s/&/&amp;/g;
1138 s/>/&gt;/g; 1184 s/>/&gt;/g;
1139 s/</&lt;/g; 1185 s/</&lt;/g;
… …
1246 1292
1247sub new { 1293sub new {
1248 my $class = shift; 1294 my $class = shift;
1249 1295
1250 $class->SUPER::new ( 1296 $class->SUPER::new (
1251 fg => [1, 1, 1], 1297 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1298 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1299 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1300 active_fg => [0, 0, 0],
1255 can_hover => 1, 1301 can_hover => 1,
1256 can_focus => 1, 1302 can_focus => 1,
1257 valign => 0, 1303 valign => 0,
1258 can_events => 1, 1304 can_events => 1,
1259 @_ 1305 @_
1260 ) 1306 )
1261} 1307}
1262 1308
… …
1441 1487
1442sub new { 1488sub new {
1443 my $class = shift; 1489 my $class = shift;
1444 1490
1445 $class->SUPER::new ( 1491 $class->SUPER::new (
1446 padding => 4, 1492 padding => 4,
1447 fg => [1, 1, 1], 1493 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1494 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1495 active_fg => [0, 0, 1],
1450 can_hover => 1, 1496 can_hover => 1,
1451 align => 0, 1497 align => 0,
1452 valign => 0, 1498 valign => 0,
1453 can_events => 1, 1499 can_events => 1,
1454 @_ 1500 @_
1455 ) 1501 )
1456} 1502}
1457 1503
… …
1616 1662
1617package CFClient::UI::VGauge; 1663package CFClient::UI::VGauge;
1618 1664
1619our @ISA = CFClient::UI::Base::; 1665our @ISA = CFClient::UI::Base::;
1620 1666
1667use List::Util qw(min max);
1668
1621use CFClient::OpenGL; 1669use CFClient::OpenGL;
1622 1670
1623my %tex = ( 1671my %tex = (
1624 food => [ 1672 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1673 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1674 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1675 ],
1628 grace => [ 1676 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1677 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 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/
1631 ], 1679 ],
1632 hp => [ 1680 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1681 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1682 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1683 ],
1636 mana => [ 1684 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1685 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 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/
1639 ], 1687 ],
1640); 1688);
1641 1689
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1690# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1691sub new {
… …
1681 1729
1682sub _draw { 1730sub _draw {
1683 my ($self) = @_; 1731 my ($self) = @_;
1684 1732
1685 my $tex = $tex{$self->{type}}; 1733 my $tex = $tex{$self->{type}};
1734 my ($t1, $t2, $t3) = @$tex;
1686 1735
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1736 my ($w, $h) = ($self->{w}, $self->{h});
1688 1737
1689 if ($self->{vertical}) { 1738 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1739 glRotate 90, 0, 0, 1;
… …
1692 1741
1693 ($w, $h) = ($h, $w); 1742 ($w, $h) = ($h, $w);
1694 } 1743 }
1695 1744
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1745 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1746
1699 my $t1 = $tex->[0]; 1747 my $ycut1 = max 0, min 1, $ycut;
1700 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);
1701 1752
1702 glEnable GL_BLEND; 1753 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1754 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1755 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1757
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1758 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1759 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1760 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1761 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1762 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1763 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1764 glEnd;
1717 1765
1766 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1767 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1768 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1769 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1770 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1771 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1772 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 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 }
1725 1784
1726 glDisable GL_BLEND; 1785 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1786 glDisable GL_TEXTURE_2D;
1728} 1787}
1729 1788
… …
1735 1794
1736sub new { 1795sub new {
1737 my ($class, %arg) = @_; 1796 my ($class, %arg) = @_;
1738 1797
1739 my $self = $class->SUPER::new ( 1798 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1799 tooltip => $arg{type},
1800 can_hover => 1,
1741 %arg, 1801 %arg,
1742 ); 1802 );
1743 1803
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1806 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1807
1748 $self 1808 $self
1749} 1809}
1750 1810
1751sub set_fontsize { 1811sub set_fontsize {
… …
1917 1977
1918sub new { 1978sub new {
1919 my $class = shift; 1979 my $class = shift;
1920 1980
1921 my $self = $class->SUPER::new ( 1981 my $self = $class->SUPER::new (
1922 fontsize => 1, 1982 fontsize => 1,
1983 can_events => 0,
1923 #font => default_font 1984 #font => default_font
1924 @_, 1985 @_,
1925 1986
1926 layout => (new CFClient::Layout), 1987 layout => (new CFClient::Layout),
1927 par => [], 1988 par => [],
1928 height => 0, 1989 height => 0,
1929 children => [ 1990 children => [
1930 (new CFClient::UI::Empty expand => 1), 1991 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 1992 (new CFClient::UI::Slider vertical => 1),
1932 ], 1993 ],
1933 ); 1994 );
1934 1995
… …
2119 2180
2120sub new { 2181sub new {
2121 my $class = shift; 2182 my $class = shift;
2122 2183
2123 my $self = $class->SUPER::new ( 2184 my $self = $class->SUPER::new (
2124 state => 0, 2185 state => 0,
2125 connect_activate => \&toggle_flopper, 2186 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2187 @_
2128 ); 2188 );
2129 2189
2130 if ($self->{state}) { 2190 if ($self->{state}) {
2131 $self->{state} = 0; 2191 $self->{state} = 0;
… …
2166 @_, 2226 @_,
2167 can_events => 0, 2227 can_events => 0,
2168 ) 2228 )
2169} 2229}
2170 2230
2171sub set_text { 2231sub set_markup {
2172 my ($self, $text) = @_; 2232 my ($self, $text) = @_;
2173 2233
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2175 $self->{label}->set_text ($text); 2235 $self->{label}->set_markup ($text);
2176 $self->add ($self->{label}); 2236 $self->add ($self->{label});
2177} 2237}
2178 2238
2179sub size_request { 2239sub size_request {
2180 my ($self) = @_; 2240 my ($self) = @_;
2181 2241
2182 $self->child->set_max_size ($::WIDTH * 0.2); 2242 $self->child->set_max_size ($::WIDTH * 0.3);
2183 2243
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2245
2186 ($w + 4, $h + 4) 2246 ($w + 4, $h + 4)
2247}
2248
2249sub size_allocate {
2250 my ($self, $w, $h) = @_;
2251
2252 $self->SUPER::size_allocate ($w - 4, $h - 4);
2187} 2253}
2188 2254
2189sub _draw { 2255sub _draw {
2190 my ($self) = @_; 2256 my ($self) = @_;
2191 2257
… …
2216 $self->SUPER::_draw; 2282 $self->SUPER::_draw;
2217} 2283}
2218 2284
2219############################################################################# 2285#############################################################################
2220 2286
2287package CFClient::UI::Face;
2288
2289our @ISA = CFClient::UI::Base::;
2290
2291use CFClient::OpenGL;
2292
2293sub new {
2294 my $class = shift;
2295
2296 $class->SUPER::new (
2297 aspect => 1,
2298 @_,
2299 )
2300}
2301
2302sub size_request {
2303 (32, 8)
2304}
2305
2306sub draw {
2307 my ($self) = @_;
2308
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2310
2311 if ($tex) {
2312 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2316 glColor 1, 1, 1, 1;
2317 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2318 glDisable GL_TEXTURE_2D;
2319 glDisable GL_BLEND;
2320 }
2321}
2322
2323#############################################################################
2324
2221package CFClient::UI::Root; 2325package CFClient::UI::Root;
2222 2326
2223our @ISA = CFClient::UI::Container::; 2327our @ISA = CFClient::UI::Container::;
2224 2328
2225use CFClient::OpenGL; 2329use CFClient::OpenGL;

Diff Legend

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