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

Diff Legend

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