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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.164 by root, Mon Apr 24 06:57:39 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
14 41
15# class methods for events 42# class methods for events
16sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
18} 46}
19 47
20sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
22} 51}
23 52
24sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
25 my ($ev) = @_; 54 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
30 59
31 $GRAB = $widget; 60 $GRAB = $widget;
32 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
62
63 check_tooltip;
33 } 64 }
34 65
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 67
37 $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 }
38} 72}
39 73
40sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
41 my ($ev) = @_; 75 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
43 77
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 79
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 81
48 $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 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover && $hover->{can_hover}; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 108 check_tooltip;
109 }
110
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 }
71} 115}
72 116
73# convert position array to integers 117# convert position array to integers
74sub harmonize { 118sub harmonize {
75 my ($vals) = @_; 119 my ($vals) = @_;
… …
93 137
94sub new { 138sub new {
95 my $class = shift; 139 my $class = shift;
96 140
97 my $self = bless { 141 my $self = bless {
98 x => 0, 142 x => 0,
99 y => 0, 143 y => 0,
100 z => 0, 144 z => 0,
101 can_events => 1, 145 can_events => 1,
102 @_ 146 @_
103 }, $class; 147 }, $class;
104 148
105 for (keys %$self) { 149 for (keys %$self) {
… …
109 } 153 }
110 154
111 $self 155 $self
112} 156}
113 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
114sub show { 165sub show {
115 my ($self) = @_; 166 my ($self) = @_;
116 167
117 return if $self->{parent}; 168 return if $self->{parent};
118 169
… …
120} 171}
121 172
122sub hide { 173sub hide {
123 my ($self) = @_; 174 my ($self) = @_;
124 175
125 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
126 178
127 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
128} 181}
129 182
130sub move { 183sub move {
131 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
132 185
… …
135 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
136 189
137 $self->update; 190 $self->update;
138} 191}
139 192
140sub needs_redraw { 193sub set_size {
141 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
142} 200}
143 201
144sub size_request { 202sub size_request {
145 require Carp; 203 require Carp;
146 Carp::confess "size_request is abstract"; 204 Carp::confess "size_request is abstract";
… …
176 } 234 }
177} 235}
178 236
179sub size_allocate { 237sub size_allocate {
180 # 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;
181} 246}
182 247
183# return top left coordinates 248# return top left coordinates
184sub _topleft { 249sub _topleft {
185 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
… …
268 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
270 glEnd; 335 glEnd;
271 glDisable GL_BLEND; 336 glDisable GL_BLEND;
272 } 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 }
273} 352}
274 353
275sub _draw { 354sub _draw {
276 my ($self) = @_; 355 my ($self) = @_;
277 356
… …
297} 376}
298 377
299sub check_size { 378sub check_size {
300 my ($self) = @_; 379 my ($self) = @_;
301 380
302 return unless $self->{parent}; 381 $self->{parent}
382 or return 1;
303 383
304 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;
305 387
306 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
307 $self->{req_w} = $w; 389 $self->{req_w} = $w;
308 $self->{req_h} = $h; 390 $self->{req_h} = $h;
309 391
310 $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
311 } 401 }
312} 402}
313 403
314sub update { 404sub update {
315 my ($self) = @_; 405 my ($self) = @_;
… …
325} 415}
326 416
327sub emit { 417sub emit {
328 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
329 419
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
331 $cb->($self, @args);
332 }
333} 421}
334 422
335sub DESTROY { 423sub DESTROY {
336 my ($self) = @_; 424 my ($self) = @_;
337 425
… …
429 517
430sub remove { 518sub remove {
431 my ($self, $child) = @_; 519 my ($self, $child) = @_;
432 520
433 delete $child->{parent}; 521 delete $child->{parent};
522 $child->hide;
434 523
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
436 525
437 $self->check_size; 526 $self->check_size;
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 }
438} 540}
439 541
440sub find_widget { 542sub find_widget {
441 my ($self, $x, $y) = @_; 543 my ($self, $x, $y) = @_;
442 544
… …
602 border => 0.8, 704 border => 0.8,
603 @_ 705 @_
604 ); 706 );
605 707
606 $self 708 $self
607}
608
609sub set_size {
610 my ($self, $w, $h) = @_;
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614}
615
616sub size_request {
617 my ($self) = @_;
618 ($self->{req_w}, $self->{req_h})
619}
620
621sub size_allocate {
622 my ($self, $w, $h) = @_;
623 $self->{w} = $w;
624 $self->{h} = $h;
625 $self->child->configure (0, 0, $w, $h);
626} 709}
627 710
628sub _draw { 711sub _draw {
629 my ($self) = @_; 712 my ($self) = @_;
630 713
… …
665 my $class = shift; 748 my $class = shift;
666 749
667 # TODO: user_x, user_y, overwrite moveto? 750 # TODO: user_x, user_y, overwrite moveto?
668 751
669 my $self = $class->SUPER::new ( 752 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1], 753 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1], 754 border_bg => [1, 1, 1, 1],
672 border => 0.8, 755 border => 0.8,
673 can_events => 1, 756 can_events => 0,
674 @_ 757 @_
675 ); 758 );
676 759
677 $self->{title} &&= new CFClient::UI::Label 760 $self->{title} &&= new CFClient::UI::Label
678 align => 0, 761 align => 0,
… …
688} 771}
689 772
690sub size_request { 773sub size_request {
691 my ($self) = @_; 774 my ($self) = @_;
692 775
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
694
695 my ($w, $h) = $self->SUPER::size_request; 776 my ($w, $h) = $self->SUPER::size_request;
696 777
697 ( 778 (
698 $w + $self->border * 2, 779 $w + $self->border * 2,
699 $h + $self->border * 2, 780 $h + $self->border * 2,
… …
831 912
832# 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?
833sub clear { 914sub clear {
834 my ($self) = @_; 915 my ($self) = @_;
835 916
836 delete $self->{children}; 917 my $children = delete $self->{children};
918
919 for (grep $_, map @$_, grep $_, @$children) {
920 delete $_->{parent};
921 $_->hide;
922 }
923
837 $self->update; 924 $self->update;
838} 925}
839 926
840sub get_wh { 927sub get_wh {
841 my ($self) = @_; 928 my ($self) = @_;
… …
1064 1151
1065sub new { 1152sub new {
1066 my ($class, %arg) = @_; 1153 my ($class, %arg) = @_;
1067 1154
1068 my $self = $class->SUPER::new ( 1155 my $self = $class->SUPER::new (
1069 fg => [1, 1, 1], 1156 fg => [1, 1, 1],
1157 #font => default_font
1070 fontsize => 1, 1158 fontsize => 1,
1071 text => "", 1159 text => "",
1072 align => -1, 1160 align => -1,
1073 valign => -1, 1161 valign => -1,
1074 padding => 2, 1162 padding => 2,
1075 layout => new CFClient::Layout, 1163 layout => new CFClient::Layout,
1076 can_events => 0, 1164 can_events => 0,
1077 %arg 1165 %arg
1078 ); 1166 );
1079 1167
1080 if (exists $self->{template}) { 1168 if (exists $self->{template}) {
… …
1087 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1088 1176
1089 $self 1177 $self
1090} 1178}
1091 1179
1092sub escape_text { 1180sub escape {
1093 local $_ = $_[1]; 1181 local $_ = $_[1];
1094 1182
1095 s/&/&amp;/g; 1183 s/&/&amp;/g;
1096 s/>/&gt;/g; 1184 s/>/&gt;/g;
1097 s/</&lt;/g; 1185 s/</&lt;/g;
… …
1120} 1208}
1121 1209
1122sub size_request { 1210sub size_request {
1123 my ($self) = @_; 1211 my ($self) = @_;
1124 1212
1125 $self->{layout}->set_width; 1213 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $self->{layout}->set_width ($self->{max_w} || -1);
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1216
1128 my ($w, $h) = $self->{layout}->size; 1217 my ($w, $h) = $self->{layout}->size;
1129 1218
1130 if (exists $self->{template}) { 1219 if (exists $self->{template}) {
1220 $self->{template}->set_font ($self->{font}) if $self->{font};
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1221 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1222
1133 my ($w2, $h2) = $self->{template}->size; 1223 my ($w2, $h2) = $self->{template}->size;
1134 1224
1135 $w = List::Util::max $w, $w2; 1225 $w = List::Util::max $w, $w2;
… …
1150 1240
1151sub set_fontsize { 1241sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1242 my ($self, $fontsize) = @_;
1153 1243
1154 $self->{fontsize} = $fontsize; 1244 $self->{fontsize} = $fontsize;
1245 delete $self->{texture};
1155 $self->check_size; 1246 $self->check_size;
1247 $self->update;
1156} 1248}
1157 1249
1158sub _draw { 1250sub _draw {
1159 my ($self) = @_; 1251 my ($self) = @_;
1160 1252
1161 my $tex = $self->{texture} ||= do { 1253 my $tex = $self->{texture} ||= do {
1254 $self->{layout}->set_font ($self->{font}) if $self->{font};
1162 $self->{layout}->set_width ($self->{w}); 1255 $self->{layout}->set_width ($self->{w});
1163 $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);
1164 new_from_layout CFClient::Texture $self->{layout} 1257 new_from_layout CFClient::Texture $self->{layout}
1165 }; 1258 };
1166 1259
… …
1199 1292
1200sub new { 1293sub new {
1201 my $class = shift; 1294 my $class = shift;
1202 1295
1203 $class->SUPER::new ( 1296 $class->SUPER::new (
1204 fg => [1, 1, 1], 1297 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1298 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1299 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1300 active_fg => [0, 0, 0],
1208 can_hover => 1, 1301 can_hover => 1,
1209 can_focus => 1, 1302 can_focus => 1,
1210 valign => 0, 1303 valign => 0,
1211 can_events => 1, 1304 can_events => 1,
1212 @_ 1305 @_
1213 ) 1306 )
1214} 1307}
1215 1308
… …
1394 1487
1395sub new { 1488sub new {
1396 my $class = shift; 1489 my $class = shift;
1397 1490
1398 $class->SUPER::new ( 1491 $class->SUPER::new (
1399 padding => 4, 1492 padding => 4,
1400 fg => [1, 1, 1], 1493 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2], 1494 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 1495 active_fg => [0, 0, 1],
1403 can_hover => 1, 1496 can_hover => 1,
1404 align => 0, 1497 align => 0,
1405 valign => 0, 1498 valign => 0,
1406 can_events => 1, 1499 can_events => 1,
1407 @_ 1500 @_
1408 ) 1501 )
1409} 1502}
1410 1503
… …
1569 1662
1570package CFClient::UI::VGauge; 1663package CFClient::UI::VGauge;
1571 1664
1572our @ISA = CFClient::UI::Base::; 1665our @ISA = CFClient::UI::Base::;
1573 1666
1667use List::Util qw(min max);
1668
1574use CFClient::OpenGL; 1669use CFClient::OpenGL;
1575 1670
1576my %tex = ( 1671my %tex = (
1577 food => [ 1672 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1673 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1674 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 1675 ],
1581 grace => [ 1676 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1677 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 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/
1584 ], 1679 ],
1585 hp => [ 1680 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1681 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1682 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 1683 ],
1589 mana => [ 1684 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1685 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 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/
1592 ], 1687 ],
1593); 1688);
1594 1689
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 1690# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 1691sub new {
… …
1634 1729
1635sub _draw { 1730sub _draw {
1636 my ($self) = @_; 1731 my ($self) = @_;
1637 1732
1638 my $tex = $tex{$self->{type}}; 1733 my $tex = $tex{$self->{type}};
1734 my ($t1, $t2, $t3) = @$tex;
1639 1735
1640 my ($w, $h) = ($self->{w}, $self->{h}); 1736 my ($w, $h) = ($self->{w}, $self->{h});
1641 1737
1642 if ($self->{vertical}) { 1738 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 1739 glRotate 90, 0, 0, 1;
… …
1645 1741
1646 ($w, $h) = ($h, $w); 1742 ($w, $h) = ($h, $w);
1647 } 1743 }
1648 1744
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 1745 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 1746
1652 my $t1 = $tex->[0]; 1747 my $ycut1 = max 0, min 1, $ycut;
1653 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);
1654 1752
1655 glEnable GL_BLEND; 1753 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1754 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 1755 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 1757
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1758 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 1759 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 1760 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1761 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1762 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1763 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 1764 glEnd;
1670 1765
1766 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1767 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 1768 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1769 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1770 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1771 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1772 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 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 }
1678 1784
1679 glDisable GL_BLEND; 1785 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 1786 glDisable GL_TEXTURE_2D;
1681} 1787}
1682 1788
… …
1685package CFClient::UI::Gauge; 1791package CFClient::UI::Gauge;
1686 1792
1687our @ISA = CFClient::UI::VBox::; 1793our @ISA = CFClient::UI::VBox::;
1688 1794
1689sub new { 1795sub new {
1690 my ($class, %arg) = shift; 1796 my ($class, %arg) = @_;
1691 1797
1692 my $self = $class->SUPER::new ( 1798 my $self = $class->SUPER::new (
1693 @_, 1799 tooltip => $arg{type},
1800 can_hover => 1,
1801 %arg,
1694 ); 1802 );
1695 1803
1696 $self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 1806 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 1807
1702 $self 1808 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 1809}
1709 1810
1710sub set_fontsize { 1811sub set_fontsize {
1711 my ($self, $fsize) = @_; 1812 my ($self, $fsize) = @_;
1712 1813
… …
1876 1977
1877sub new { 1978sub new {
1878 my $class = shift; 1979 my $class = shift;
1879 1980
1880 my $self = $class->SUPER::new ( 1981 my $self = $class->SUPER::new (
1881 fontsize => 1, 1982 fontsize => 1,
1983 can_events => 0,
1984 #font => default_font
1882 @_, 1985 @_,
1883 1986
1884 layout => (new CFClient::Layout), 1987 layout => (new CFClient::Layout),
1885 par => [], 1988 par => [],
1886 height => 0, 1989 height => 0,
1887 children => [ 1990 children => [
1888 (new CFClient::UI::Empty expand => 1), 1991 (new CFClient::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 1992 (new CFClient::UI::Slider vertical => 1),
1890 ], 1993 ],
1891 ); 1994 );
1892 1995
… …
1926sub size_allocate { 2029sub size_allocate {
1927 my ($self, $w, $h) = @_; 2030 my ($self, $w, $h) = @_;
1928 2031
1929 $self->SUPER::size_allocate ($w, $h); 2032 $self->SUPER::size_allocate ($w, $h);
1930 2033
2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2035 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1932 $self->{layout}->set_width ($self->{children}[0]{w}); 2036 $self->{layout}->set_width ($self->{children}[0]{w});
1933 2037
1934 $self->reflow; 2038 $self->reflow;
1935} 2039}
… …
1987 my $y1 = $top + $self->{h}; 2091 my $y1 = $top + $self->{h};
1988 2092
1989 my $y = 0; 2093 my $y = 0;
1990 2094
1991 my $layout = $self->{layout}; 2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
1992 2098
1993 for my $par (@{$self->{par}}) { 2099 for my $par (@{$self->{par}}) {
1994 my $h = $par->[0]; 2100 my $h = $par->[0];
1995 2101
1996 if ($y0 < $y + $h && $y < $y1) { 2102 if ($y0 < $y + $h && $y < $y1) {
… …
2074 2180
2075sub new { 2181sub new {
2076 my $class = shift; 2182 my $class = shift;
2077 2183
2078 my $self = $class->SUPER::new ( 2184 my $self = $class->SUPER::new (
2079 state => 0, 2185 state => 0,
2080 connect_activate => \&toggle_flopper, 2186 connect_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 2187 @_
2083 ); 2188 );
2084 2189
2085 if ($self->{state}) { 2190 if ($self->{state}) {
2086 $self->{state} = 0; 2191 $self->{state} = 0;
… …
2106 $self->emit (changed => $self->{state}); 2211 $self->emit (changed => $self->{state});
2107} 2212}
2108 2213
2109############################################################################# 2214#############################################################################
2110 2215
2216package CFClient::UI::Tooltip;
2217
2218our @ISA = CFClient::UI::Bin::;
2219
2220use CFClient::OpenGL;
2221
2222sub new {
2223 my $class = shift;
2224
2225 $class->SUPER::new (
2226 @_,
2227 can_events => 0,
2228 )
2229}
2230
2231sub set_markup {
2232 my ($self, $text) = @_;
2233
2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2235 $self->{label}->set_markup ($text);
2236 $self->add ($self->{label});
2237}
2238
2239sub size_request {
2240 my ($self) = @_;
2241
2242 $self->child->set_max_size ($::WIDTH * 0.3);
2243
2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2245
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);
2253}
2254
2255sub _draw {
2256 my ($self) = @_;
2257
2258 glPushMatrix;
2259 glTranslate 0.375, 0.375;
2260
2261 my ($w, $h) = @$self{qw(w h)};
2262
2263 glColor 1, 0.8, 0.4;
2264 glBegin GL_QUADS;
2265 glVertex 0 , 0;
2266 glVertex 0 , $h;
2267 glVertex $w, $h;
2268 glVertex $w, 0;
2269 glEnd;
2270
2271 glColor 0, 0, 0;
2272 glBegin GL_LINE_LOOP;
2273 glVertex 0 , 0;
2274 glVertex 0 , $h;
2275 glVertex $w, $h;
2276 glVertex $w, 0;
2277 glEnd;
2278
2279 glPopMatrix;
2280
2281 glTranslate 2, 2;
2282 $self->SUPER::_draw;
2283}
2284
2285#############################################################################
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
2111package CFClient::UI::Root; 2325package CFClient::UI::Root;
2112 2326
2113our @ISA = CFClient::UI::Container::; 2327our @ISA = CFClient::UI::Container::;
2114 2328
2115use CFClient::OpenGL; 2329use CFClient::OpenGL;
… …
2190############################################################################# 2404#############################################################################
2191 2405
2192package CFClient::UI; 2406package CFClient::UI;
2193 2407
2194$ROOT = new CFClient::UI::Root; 2408$ROOT = new CFClient::UI::Root;
2409$TOOLTIP = new CFClient::UI::Tooltip;
2195 2410
21961 24111
2197 2412

Diff Legend

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