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.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.169 by elmex, Mon Apr 24 10:43: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";
… …
209 } 234 }
210} 235}
211 236
212sub size_allocate { 237sub size_allocate {
213 # 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;
214} 246}
215 247
216# return top left coordinates 248# return top left coordinates
217sub _topleft { 249sub _topleft {
218 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
303 glEnd; 335 glEnd;
304 glDisable GL_BLEND; 336 glDisable GL_BLEND;
305 } 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 }
306} 352}
307 353
308sub _draw { 354sub _draw {
309 my ($self) = @_; 355 my ($self) = @_;
310 356
… …
330} 376}
331 377
332sub check_size { 378sub check_size {
333 my ($self) = @_; 379 my ($self) = @_;
334 380
335 return unless $self->{parent}; 381 $self->{parent}
382 or return 1;
336 383
337 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;
338 387
339 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w; 389 $self->{req_w} = $w;
341 $self->{req_h} = $h; 390 $self->{req_h} = $h;
342 391
343 $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
344 } 401 }
345} 402}
346 403
347sub update { 404sub update {
348 my ($self) = @_; 405 my ($self) = @_;
… …
358} 415}
359 416
360sub emit { 417sub emit {
361 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
362 419
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 421}
367 422
368sub DESTROY { 423sub DESTROY {
369 my ($self) = @_; 424 my ($self) = @_;
370 425
… …
437sub new { 492sub new {
438 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
439 494
440 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
441 496
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 497 my $self = $class->SUPER::new (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
443 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
444 503
445 $self 504 $self
446} 505}
447 506
… …
462 521
463sub remove { 522sub remove {
464 my ($self, $child) = @_; 523 my ($self, $child) = @_;
465 524
466 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
467 527
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
469 529
470 $self->check_size; 530 $self->check_size;
471 $self->update; 531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
472} 544}
473 545
474sub find_widget { 546sub find_widget {
475 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
476 548
… …
636 border => 0.8, 708 border => 0.8,
637 @_ 709 @_
638 ); 710 );
639 711
640 $self 712 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648}
649
650sub size_request {
651 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h})
653}
654
655sub size_allocate {
656 my ($self, $w, $h) = @_;
657 $self->{w} = $w;
658 $self->{h} = $h;
659 $self->child->configure (0, 0, $w, $h);
660} 713}
661 714
662sub _draw { 715sub _draw {
663 my ($self) = @_; 716 my ($self) = @_;
664 717
… …
699 my $class = shift; 752 my $class = shift;
700 753
701 # TODO: user_x, user_y, overwrite moveto? 754 # TODO: user_x, user_y, overwrite moveto?
702 755
703 my $self = $class->SUPER::new ( 756 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 757 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 758 border_bg => [1, 1, 1, 1],
706 border => 0.8, 759 border => 0.8,
707 can_events => 1, 760 can_events => 1,
708 @_ 761 @_
709 ); 762 );
710 763
711 $self->{title} &&= new CFClient::UI::Label 764 $self->{title} &&= new CFClient::UI::Label
… …
722} 775}
723 776
724sub size_request { 777sub size_request {
725 my ($self) = @_; 778 my ($self) = @_;
726 779
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728
729 my ($w, $h) = $self->SUPER::size_request; 780 my ($w, $h) = $self->SUPER::size_request;
730 781
731 ( 782 (
732 $w + $self->border * 2, 783 $w + $self->border * 2,
733 $h + $self->border * 2, 784 $h + $self->border * 2,
… …
865 916
866# TODO: move to container class maybe? send childs a signal on removal? 917# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 918sub clear {
868 my ($self) = @_; 919 my ($self) = @_;
869 920
870 delete $self->{children}; 921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
871 $self->update; 928 $self->update;
872} 929}
873 930
874sub get_wh { 931sub get_wh {
875 my ($self) = @_; 932 my ($self) = @_;
… …
1098 1155
1099sub new { 1156sub new {
1100 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
1101 1158
1102 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
1161 #font => default_font
1104 fontsize => 1, 1162 fontsize => 1,
1105 text => "", 1163 text => "",
1106 align => -1, 1164 align => -1,
1107 valign => -1, 1165 valign => -1,
1108 padding => 2, 1166 padding => 2,
1109 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1110 can_events => 0, 1168 can_events => 0,
1111 %arg 1169 %arg
1112 ); 1170 );
1113 1171
1114 if (exists $self->{template}) { 1172 if (exists $self->{template}) {
… …
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1122 1180
1123 $self 1181 $self
1124} 1182}
1125 1183
1126sub escape_text { 1184sub escape {
1127 local $_ = $_[1]; 1185 local $_ = $_[1];
1128 1186
1129 s/&/&amp;/g; 1187 s/&/&amp;/g;
1130 s/>/&gt;/g; 1188 s/>/&gt;/g;
1131 s/</&lt;/g; 1189 s/</&lt;/g;
… …
1154} 1212}
1155 1213
1156sub size_request { 1214sub size_request {
1157 my ($self) = @_; 1215 my ($self) = @_;
1158 1216
1159 $self->{layout}->set_width; 1217 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1220
1162 my ($w, $h) = $self->{layout}->size; 1221 my ($w, $h) = $self->{layout}->size;
1163 1222
1164 if (exists $self->{template}) { 1223 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1226
1167 my ($w2, $h2) = $self->{template}->size; 1227 my ($w2, $h2) = $self->{template}->size;
1168 1228
1169 $w = List::Util::max $w, $w2; 1229 $w = List::Util::max $w, $w2;
… …
1193 1253
1194sub _draw { 1254sub _draw {
1195 my ($self) = @_; 1255 my ($self) = @_;
1196 1256
1197 my $tex = $self->{texture} ||= do { 1257 my $tex = $self->{texture} ||= do {
1258 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1259 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1200 new_from_layout CFClient::Texture $self->{layout} 1261 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1262 };
1202 1263
… …
1235 1296
1236sub new { 1297sub new {
1237 my $class = shift; 1298 my $class = shift;
1238 1299
1239 $class->SUPER::new ( 1300 $class->SUPER::new (
1240 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1244 can_hover => 1, 1305 can_hover => 1,
1245 can_focus => 1, 1306 can_focus => 1,
1246 valign => 0, 1307 valign => 0,
1247 can_events => 1, 1308 can_events => 1,
1248 @_ 1309 @_
1249 ) 1310 )
1250} 1311}
1251 1312
… …
1405 my ($self, $ev) = @_; 1466 my ($self, $ev) = @_;
1406 1467
1407 my $sym = $ev->{sym}; 1468 my $sym = $ev->{sym};
1408 1469
1409 if ($sym == 13) { 1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1474 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1475 $self->emit (activate => $txt);
1411 $self->update; 1476 $self->update;
1477
1478 } elsif ($sym == CFClient::SDLK_UP) {
1479 if ($self->{history_pointer} < 0) {
1480 $self->{history_saveback} = $self->get_text;
1481 }
1482 if (@{$self->{history} || []} > 0) {
1483 $self->{history_pointer}++;
1484 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1485 $self->{history_pointer} = @{$self->{history} || []} - 1;
1486 }
1487 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1488 }
1489
1490 } elsif ($sym == CFClient::SDLK_DOWN) {
1491 $self->{history_pointer}--;
1492 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1493
1494 if ($self->{history_pointer} >= 0) {
1495 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1496 } else {
1497 $self->set_text ($self->{history_saveback});
1498 }
1412 1499
1413 } else { 1500 } else {
1414 $self->SUPER::key_down ($ev); 1501 $self->SUPER::key_down ($ev);
1415 } 1502 }
1416 1503
… …
1430 1517
1431sub new { 1518sub new {
1432 my $class = shift; 1519 my $class = shift;
1433 1520
1434 $class->SUPER::new ( 1521 $class->SUPER::new (
1435 padding => 4, 1522 padding => 4,
1436 fg => [1, 1, 1], 1523 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1524 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1525 active_fg => [0, 0, 1],
1439 can_hover => 1, 1526 can_hover => 1,
1440 align => 0, 1527 align => 0,
1441 valign => 0, 1528 valign => 0,
1442 can_events => 1, 1529 can_events => 1,
1443 @_ 1530 @_
1444 ) 1531 )
1445} 1532}
1446 1533
… …
1605 1692
1606package CFClient::UI::VGauge; 1693package CFClient::UI::VGauge;
1607 1694
1608our @ISA = CFClient::UI::Base::; 1695our @ISA = CFClient::UI::Base::;
1609 1696
1697use List::Util qw(min max);
1698
1610use CFClient::OpenGL; 1699use CFClient::OpenGL;
1611 1700
1612my %tex = ( 1701my %tex = (
1613 food => [ 1702 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1703 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1704 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1705 ],
1617 grace => [ 1706 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1707 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1708 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1709 ],
1621 hp => [ 1710 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1711 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1712 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1713 ],
1625 mana => [ 1714 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1715 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1716 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1717 ],
1629); 1718);
1630 1719
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1720# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1721sub new {
… …
1670 1759
1671sub _draw { 1760sub _draw {
1672 my ($self) = @_; 1761 my ($self) = @_;
1673 1762
1674 my $tex = $tex{$self->{type}}; 1763 my $tex = $tex{$self->{type}};
1764 my ($t1, $t2, $t3) = @$tex;
1675 1765
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1766 my ($w, $h) = ($self->{w}, $self->{h});
1677 1767
1678 if ($self->{vertical}) { 1768 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1769 glRotate 90, 0, 0, 1;
… …
1681 1771
1682 ($w, $h) = ($h, $w); 1772 ($w, $h) = ($h, $w);
1683 } 1773 }
1684 1774
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1775 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1776
1688 my $t1 = $tex->[0]; 1777 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1778 my $ycut2 = max 0, min 1, $ycut - 1;
1779
1780 my $h1 = $self->{h} * (1 - $ycut1);
1781 my $h2 = $self->{h} * (1 - $ycut2);
1690 1782
1691 glEnable GL_BLEND; 1783 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1784 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1785 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1786 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1787
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1788 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1789 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1790 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1791 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1792 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1793 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1794 glEnd;
1706 1795
1796 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1797 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1798 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1799 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1800 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1801 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1802 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1803 glEnd;
1804
1805 if ($t3) {
1806 glBindTexture GL_TEXTURE_2D, $t3->{name};
1807 glBegin GL_QUADS;
1808 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1809 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1810 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1811 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1812 glEnd;
1813 }
1714 1814
1715 glDisable GL_BLEND; 1815 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1816 glDisable GL_TEXTURE_2D;
1717} 1817}
1718 1818
… …
1724 1824
1725sub new { 1825sub new {
1726 my ($class, %arg) = @_; 1826 my ($class, %arg) = @_;
1727 1827
1728 my $self = $class->SUPER::new ( 1828 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1829 tooltip => $arg{type},
1830 can_hover => 1,
1730 %arg, 1831 %arg,
1731 ); 1832 );
1732 1833
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1834 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1835 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1836 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1837
1737 $self 1838 $self
1738} 1839}
1739 1840
… …
1906 2007
1907sub new { 2008sub new {
1908 my $class = shift; 2009 my $class = shift;
1909 2010
1910 my $self = $class->SUPER::new ( 2011 my $self = $class->SUPER::new (
1911 fontsize => 1, 2012 fontsize => 1,
2013 can_events => 0,
2014 #font => default_font
1912 @_, 2015 @_,
1913 2016
1914 layout => (new CFClient::Layout), 2017 layout => (new CFClient::Layout),
1915 par => [], 2018 par => [],
1916 height => 0, 2019 height => 0,
1917 children => [ 2020 children => [
1918 (new CFClient::UI::Empty expand => 1), 2021 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2022 (new CFClient::UI::Slider vertical => 1),
1920 ], 2023 ],
1921 ); 2024 );
1922 2025
… …
1956sub size_allocate { 2059sub size_allocate {
1957 my ($self, $w, $h) = @_; 2060 my ($self, $w, $h) = @_;
1958 2061
1959 $self->SUPER::size_allocate ($w, $h); 2062 $self->SUPER::size_allocate ($w, $h);
1960 2063
2064 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2066 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2067
1964 $self->reflow; 2068 $self->reflow;
1965} 2069}
… …
2017 my $y1 = $top + $self->{h}; 2121 my $y1 = $top + $self->{h};
2018 2122
2019 my $y = 0; 2123 my $y = 0;
2020 2124
2021 my $layout = $self->{layout}; 2125 my $layout = $self->{layout};
2126
2127 $layout->set_font ($self->{font}) if $self->{font};
2022 2128
2023 for my $par (@{$self->{par}}) { 2129 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2130 my $h = $par->[0];
2025 2131
2026 if ($y0 < $y + $h && $y < $y1) { 2132 if ($y0 < $y + $h && $y < $y1) {
… …
2104 2210
2105sub new { 2211sub new {
2106 my $class = shift; 2212 my $class = shift;
2107 2213
2108 my $self = $class->SUPER::new ( 2214 my $self = $class->SUPER::new (
2109 state => 0, 2215 state => 0,
2110 connect_activate => \&toggle_flopper, 2216 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2217 @_
2113 ); 2218 );
2114 2219
2115 if ($self->{state}) { 2220 if ($self->{state}) {
2116 $self->{state} = 0; 2221 $self->{state} = 0;
… …
2151 @_, 2256 @_,
2152 can_events => 0, 2257 can_events => 0,
2153 ) 2258 )
2154} 2259}
2155 2260
2156sub set_text { 2261sub set_markup {
2157 my ($self, $text) = @_; 2262 my ($self, $text) = @_;
2158 2263
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2264 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2160 $self->{label}->set_text ($text); 2265 $self->{label}->set_markup ($text);
2161 $self->add ($self->{label}); 2266 $self->add ($self->{label});
2162} 2267}
2163 2268
2164sub size_request { 2269sub size_request {
2165 my ($self) = @_; 2270 my ($self) = @_;
2166 2271
2272 $self->child->set_max_size ($::WIDTH * 0.3);
2273
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2274 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2275
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2276 ($w + 4, $h + 4)
2277}
2278
2279sub size_allocate {
2280 my ($self, $w, $h) = @_;
2281
2282 $self->SUPER::size_allocate ($w - 4, $h - 4);
2173} 2283}
2174 2284
2175sub _draw { 2285sub _draw {
2176 my ($self) = @_; 2286 my ($self) = @_;
2177 2287
… …
2202 $self->SUPER::_draw; 2312 $self->SUPER::_draw;
2203} 2313}
2204 2314
2205############################################################################# 2315#############################################################################
2206 2316
2317package CFClient::UI::Face;
2318
2319our @ISA = CFClient::UI::Base::;
2320
2321use CFClient::OpenGL;
2322
2323sub new {
2324 my $class = shift;
2325
2326 $class->SUPER::new (
2327 aspect => 1,
2328 @_,
2329 )
2330}
2331
2332sub size_request {
2333 (32, 8)
2334}
2335
2336sub draw {
2337 my ($self) = @_;
2338
2339 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2340
2341 if ($tex) {
2342 glEnable GL_BLEND;
2343 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2344 glEnable GL_TEXTURE_2D;
2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2346 glColor 1, 1, 1, 1;
2347 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2348 glDisable GL_TEXTURE_2D;
2349 glDisable GL_BLEND;
2350 }
2351}
2352
2353#############################################################################
2354
2207package CFClient::UI::Root; 2355package CFClient::UI::Root;
2208 2356
2209our @ISA = CFClient::UI::Container::; 2357our @ISA = CFClient::UI::Container::;
2210 2358
2211use CFClient::OpenGL; 2359use CFClient::OpenGL;

Diff Legend

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