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.151 by root, Sun Apr 23 00:57:39 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
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
23 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show; 30 $TOOLTIP->show;
26 } 31 }
27 32
28 return; 33 return;
… …
34 delete $TOOLTIP->{owner}; 39 delete $TOOLTIP->{owner};
35} 40}
36 41
37# class methods for events 42# class methods for events
38sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
40} 46}
41 47
42sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
44} 51}
45 52
46sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
47 my ($ev) = @_; 54 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 63 check_tooltip;
57 } 64 }
58 65
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 67
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
62} 72}
63 73
64sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
65 my ($ev) = @_; 75 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
67 77
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 79
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 81
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
73 86
74 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 89 $grab->update if $grab;
77 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 107
95 check_tooltip; 108 check_tooltip;
96 } 109 }
97 110
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
99} 115}
100 116
101# convert position array to integers 117# convert position array to integers
102sub harmonize { 118sub harmonize {
103 my ($vals) = @_; 119 my ($vals) = @_;
… …
121 137
122sub new { 138sub new {
123 my $class = shift; 139 my $class = shift;
124 140
125 my $self = bless { 141 my $self = bless {
126 x => 0, 142 x => 0,
127 y => 0, 143 y => 0,
128 z => 0, 144 z => 0,
129 can_events => 1, 145 can_events => 1,
130 @_ 146 @_
131 }, $class; 147 }, $class;
132 148
133 for (keys %$self) { 149 for (keys %$self) {
… …
137 } 153 }
138 154
139 $self 155 $self
140} 156}
141 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
142sub show { 165sub show {
143 my ($self) = @_; 166 my ($self) = @_;
144 167
145 return if $self->{parent}; 168 return if $self->{parent};
146 169
… …
148} 171}
149 172
150sub hide { 173sub hide {
151 my ($self) = @_; 174 my ($self) = @_;
152 175
153 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
154 178
155 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
156} 181}
157 182
158sub move { 183sub move {
159 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
160 185
… …
163 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
164 189
165 $self->update; 190 $self->update;
166} 191}
167 192
168sub needs_redraw { 193sub set_size {
169 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
170} 200}
171 201
172sub size_request { 202sub size_request {
173 require Carp; 203 require Carp;
174 Carp::confess "size_request is abstract"; 204 Carp::confess "size_request is abstract";
… …
204 } 234 }
205} 235}
206 236
207sub size_allocate { 237sub size_allocate {
208 # nothing to be done 238 # nothing to be done
239}
240
241sub set_max_size {
242 my ($self, $w, $h) = @_;
243
244 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h;
209} 246}
210 247
211# return top left coordinates 248# return top left coordinates
212sub _topleft { 249sub _topleft {
213 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
298 glEnd; 335 glEnd;
299 glDisable GL_BLEND; 336 glDisable GL_BLEND;
300 } 337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0;
345 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h};
348 glEnd;
349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
301} 352}
302 353
303sub _draw { 354sub _draw {
304 my ($self) = @_; 355 my ($self) = @_;
305 356
… …
325} 376}
326 377
327sub check_size { 378sub check_size {
328 my ($self) = @_; 379 my ($self) = @_;
329 380
330 return unless $self->{parent}; 381 $self->{parent}
382 or return 1;
331 383
332 my ($w, $h) = $self->size_request; 384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
333 387
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w; 389 $self->{req_w} = $w;
336 $self->{req_h} = $h; 390 $self->{req_h} = $h;
337 391
338 $self->{parent}->check_size; 392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
339 } 401 }
340} 402}
341 403
342sub update { 404sub update {
343 my ($self) = @_; 405 my ($self) = @_;
… …
353} 415}
354 416
355sub emit { 417sub emit {
356 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
357 419
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 421}
362 422
363sub DESTROY { 423sub DESTROY {
364 my ($self) = @_; 424 my ($self) = @_;
365 425
… …
432sub new { 492sub new {
433 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
434 494
435 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
436 496
437 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 );
438 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
439 503
440 $self 504 $self
441} 505}
442 506
… …
457 521
458sub remove { 522sub remove {
459 my ($self, $child) = @_; 523 my ($self, $child) = @_;
460 524
461 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
462 527
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
464 529
465 $self->check_size; 530 $self->check_size;
466 $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 }
467} 544}
468 545
469sub find_widget { 546sub find_widget {
470 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
471 548
… …
631 border => 0.8, 708 border => 0.8,
632 @_ 709 @_
633 ); 710 );
634 711
635 $self 712 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644
645sub size_request {
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649
650sub size_allocate {
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655} 713}
656 714
657sub _draw { 715sub _draw {
658 my ($self) = @_; 716 my ($self) = @_;
659 717
… …
694 my $class = shift; 752 my $class = shift;
695 753
696 # TODO: user_x, user_y, overwrite moveto? 754 # TODO: user_x, user_y, overwrite moveto?
697 755
698 my $self = $class->SUPER::new ( 756 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 757 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 758 border_bg => [1, 1, 1, 1],
701 border => 0.8, 759 border => 0.8,
702 can_events => 1, 760 can_events => 1,
703 @_ 761 @_
704 ); 762 );
705 763
706 $self->{title} &&= new CFClient::UI::Label 764 $self->{title} &&= new CFClient::UI::Label
… …
717} 775}
718 776
719sub size_request { 777sub size_request {
720 my ($self) = @_; 778 my ($self) = @_;
721 779
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723
724 my ($w, $h) = $self->SUPER::size_request; 780 my ($w, $h) = $self->SUPER::size_request;
725 781
726 ( 782 (
727 $w + $self->border * 2, 783 $w + $self->border * 2,
728 $h + $self->border * 2, 784 $h + $self->border * 2,
… …
860 916
861# 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?
862sub clear { 918sub clear {
863 my ($self) = @_; 919 my ($self) = @_;
864 920
865 delete $self->{children}; 921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
866 $self->update; 928 $self->update;
867} 929}
868 930
869sub get_wh { 931sub get_wh {
870 my ($self) = @_; 932 my ($self) = @_;
… …
1093 1155
1094sub new { 1156sub new {
1095 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
1096 1158
1097 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
1161 #font => default_font
1099 fontsize => 1, 1162 fontsize => 1,
1100 text => "", 1163 text => "",
1101 align => -1, 1164 align => -1,
1102 valign => -1, 1165 valign => -1,
1103 padding => 2, 1166 padding => 2,
1104 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1105 can_events => 0, 1168 can_events => 0,
1106 %arg 1169 %arg
1107 ); 1170 );
1108 1171
1109 if (exists $self->{template}) { 1172 if (exists $self->{template}) {
… …
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1117 1180
1118 $self 1181 $self
1119} 1182}
1120 1183
1121sub escape_text { 1184sub escape {
1122 local $_ = $_[1]; 1185 local $_ = $_[1];
1123 1186
1124 s/&/&amp;/g; 1187 s/&/&amp;/g;
1125 s/>/&gt;/g; 1188 s/>/&gt;/g;
1126 s/</&lt;/g; 1189 s/</&lt;/g;
… …
1149} 1212}
1150 1213
1151sub size_request { 1214sub size_request {
1152 my ($self) = @_; 1215 my ($self) = @_;
1153 1216
1154 $self->{layout}->set_width; 1217 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1220
1157 my ($w, $h) = $self->{layout}->size; 1221 my ($w, $h) = $self->{layout}->size;
1158 1222
1159 if (exists $self->{template}) { 1223 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1226
1162 my ($w2, $h2) = $self->{template}->size; 1227 my ($w2, $h2) = $self->{template}->size;
1163 1228
1164 $w = List::Util::max $w, $w2; 1229 $w = List::Util::max $w, $w2;
… …
1179 1244
1180sub set_fontsize { 1245sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1246 my ($self, $fontsize) = @_;
1182 1247
1183 $self->{fontsize} = $fontsize; 1248 $self->{fontsize} = $fontsize;
1249 delete $self->{texture};
1184 $self->check_size; 1250 $self->check_size;
1251 $self->update;
1185} 1252}
1186 1253
1187sub _draw { 1254sub _draw {
1188 my ($self) = @_; 1255 my ($self) = @_;
1189 1256
1190 my $tex = $self->{texture} ||= do { 1257 my $tex = $self->{texture} ||= do {
1258 $self->{layout}->set_font ($self->{font}) if $self->{font};
1191 $self->{layout}->set_width ($self->{w}); 1259 $self->{layout}->set_width ($self->{w});
1192 $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);
1193 new_from_layout CFClient::Texture $self->{layout} 1261 new_from_layout CFClient::Texture $self->{layout}
1194 }; 1262 };
1195 1263
… …
1228 1296
1229sub new { 1297sub new {
1230 my $class = shift; 1298 my $class = shift;
1231 1299
1232 $class->SUPER::new ( 1300 $class->SUPER::new (
1233 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1234 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1235 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1236 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1237 can_hover => 1, 1305 can_hover => 1,
1238 can_focus => 1, 1306 can_focus => 1,
1239 valign => 0, 1307 valign => 0,
1240 can_events => 1, 1308 can_events => 1,
1241 @_ 1309 @_
1242 ) 1310 )
1243} 1311}
1244 1312
… …
1398 my ($self, $ev) = @_; 1466 my ($self, $ev) = @_;
1399 1467
1400 my $sym = $ev->{sym}; 1468 my $sym = $ev->{sym};
1401 1469
1402 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} = '';
1403 $self->emit (activate => $self->get_text); 1475 $self->emit (activate => $txt);
1404 $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 }
1405 1499
1406 } else { 1500 } else {
1407 $self->SUPER::key_down ($ev); 1501 $self->SUPER::key_down ($ev);
1408 } 1502 }
1409 1503
… …
1423 1517
1424sub new { 1518sub new {
1425 my $class = shift; 1519 my $class = shift;
1426 1520
1427 $class->SUPER::new ( 1521 $class->SUPER::new (
1428 padding => 4, 1522 padding => 4,
1429 fg => [1, 1, 1], 1523 fg => [1, 1, 1],
1430 bg => [1, 1, 1, 0.2], 1524 bg => [1, 1, 1, 0.2],
1431 active_fg => [0, 0, 1], 1525 active_fg => [0, 0, 1],
1432 can_hover => 1, 1526 can_hover => 1,
1433 align => 0, 1527 align => 0,
1434 valign => 0, 1528 valign => 0,
1435 can_events => 1, 1529 can_events => 1,
1436 @_ 1530 @_
1437 ) 1531 )
1438} 1532}
1439 1533
… …
1598 1692
1599package CFClient::UI::VGauge; 1693package CFClient::UI::VGauge;
1600 1694
1601our @ISA = CFClient::UI::Base::; 1695our @ISA = CFClient::UI::Base::;
1602 1696
1697use List::Util qw(min max);
1698
1603use CFClient::OpenGL; 1699use CFClient::OpenGL;
1604 1700
1605my %tex = ( 1701my %tex = (
1606 food => [ 1702 food => [
1607 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1703 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1704 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609 ], 1705 ],
1610 grace => [ 1706 grace => [
1611 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1707 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612 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/
1613 ], 1709 ],
1614 hp => [ 1710 hp => [
1615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1711 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1712 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617 ], 1713 ],
1618 mana => [ 1714 mana => [
1619 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1715 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620 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/
1621 ], 1717 ],
1622); 1718);
1623 1719
1624# eg. VGauge->new (gauge => 'food'), default gauge: food 1720# eg. VGauge->new (gauge => 'food'), default gauge: food
1625sub new { 1721sub new {
… …
1663 1759
1664sub _draw { 1760sub _draw {
1665 my ($self) = @_; 1761 my ($self) = @_;
1666 1762
1667 my $tex = $tex{$self->{type}}; 1763 my $tex = $tex{$self->{type}};
1764 my ($t1, $t2, $t3) = @$tex;
1668 1765
1669 my ($w, $h) = ($self->{w}, $self->{h}); 1766 my ($w, $h) = ($self->{w}, $self->{h});
1670 1767
1671 if ($self->{vertical}) { 1768 if ($self->{vertical}) {
1672 glRotate 90, 0, 0, 1; 1769 glRotate 90, 0, 0, 1;
… …
1674 1771
1675 ($w, $h) = ($h, $w); 1772 ($w, $h) = ($h, $w);
1676 } 1773 }
1677 1774
1678 my $ycut = $self->{val} / ($self->{max_val} || 1); 1775 my $ycut = $self->{val} / ($self->{max_val} || 1);
1679 $ycut = 1 if $self->{val} > $self->{max_val};
1680 1776
1681 my $t1 = $tex->[0]; 1777 my $ycut1 = max 0, min 1, $ycut;
1682 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);
1683 1782
1684 glEnable GL_BLEND; 1783 glEnable GL_BLEND;
1685 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1784 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1686 glEnable GL_TEXTURE_2D; 1785 glEnable GL_TEXTURE_2D;
1687 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1786 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688 1787
1689 my $h1 = $self->{h} - $ycut * $self->{h};
1690 my $h2 = $ycut * $self->{h};
1691
1692 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1788 glBindTexture GL_TEXTURE_2D, $t1->{name};
1693 glBegin GL_QUADS; 1789 glBegin GL_QUADS;
1694 glTexCoord 0 , 0; glVertex 0 , 0; 1790 glTexCoord 0 , 0; glVertex 0 , 0;
1695 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1791 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1696 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1792 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1697 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1793 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1698 glEnd; 1794 glEnd;
1699 1795
1796 my $ycut1 = List::Util::min 1, $ycut;
1700 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1797 glBindTexture GL_TEXTURE_2D, $t2->{name};
1701 glBegin GL_QUADS; 1798 glBegin GL_QUADS;
1702 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1799 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1800 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1704 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1801 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1705 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1802 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1706 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 }
1707 1814
1708 glDisable GL_BLEND; 1815 glDisable GL_BLEND;
1709 glDisable GL_TEXTURE_2D; 1816 glDisable GL_TEXTURE_2D;
1710} 1817}
1711 1818
… …
1717 1824
1718sub new { 1825sub new {
1719 my ($class, %arg) = @_; 1826 my ($class, %arg) = @_;
1720 1827
1721 my $self = $class->SUPER::new ( 1828 my $self = $class->SUPER::new (
1722 tooltip => $arg{type}, 1829 tooltip => $arg{type},
1830 can_hover => 1,
1723 %arg, 1831 %arg,
1724 ); 1832 );
1725 1833
1726 $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");
1727 $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);
1728 $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");
1729 1837
1730 $self 1838 $self
1731} 1839}
1732 1840
… …
1899 2007
1900sub new { 2008sub new {
1901 my $class = shift; 2009 my $class = shift;
1902 2010
1903 my $self = $class->SUPER::new ( 2011 my $self = $class->SUPER::new (
1904 fontsize => 1, 2012 fontsize => 1,
2013 can_events => 0,
2014 #font => default_font
1905 @_, 2015 @_,
1906 2016
1907 layout => (new CFClient::Layout), 2017 layout => (new CFClient::Layout),
1908 par => [], 2018 par => [],
1909 height => 0, 2019 height => 0,
1910 children => [ 2020 children => [
1911 (new CFClient::UI::Empty expand => 1), 2021 (new CFClient::UI::Empty expand => 1),
1912 (new CFClient::UI::Slider vertical => 1), 2022 (new CFClient::UI::Slider vertical => 1),
1913 ], 2023 ],
1914 ); 2024 );
1915 2025
… …
1949sub size_allocate { 2059sub size_allocate {
1950 my ($self, $w, $h) = @_; 2060 my ($self, $w, $h) = @_;
1951 2061
1952 $self->SUPER::size_allocate ($w, $h); 2062 $self->SUPER::size_allocate ($w, $h);
1953 2063
2064 $self->{layout}->set_font ($self->{font}) if $self->{font};
1954 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $self->{layout}->set_width ($self->{children}[0]{w}); 2066 $self->{layout}->set_width ($self->{children}[0]{w});
1956 2067
1957 $self->reflow; 2068 $self->reflow;
1958} 2069}
… …
2010 my $y1 = $top + $self->{h}; 2121 my $y1 = $top + $self->{h};
2011 2122
2012 my $y = 0; 2123 my $y = 0;
2013 2124
2014 my $layout = $self->{layout}; 2125 my $layout = $self->{layout};
2126
2127 $layout->set_font ($self->{font}) if $self->{font};
2015 2128
2016 for my $par (@{$self->{par}}) { 2129 for my $par (@{$self->{par}}) {
2017 my $h = $par->[0]; 2130 my $h = $par->[0];
2018 2131
2019 if ($y0 < $y + $h && $y < $y1) { 2132 if ($y0 < $y + $h && $y < $y1) {
… …
2097 2210
2098sub new { 2211sub new {
2099 my $class = shift; 2212 my $class = shift;
2100 2213
2101 my $self = $class->SUPER::new ( 2214 my $self = $class->SUPER::new (
2102 state => 0, 2215 state => 0,
2103 connect_activate => \&toggle_flopper, 2216 connect_activate => \&toggle_flopper,
2104 can_events => 1,
2105 @_ 2217 @_
2106 ); 2218 );
2107 2219
2108 if ($self->{state}) { 2220 if ($self->{state}) {
2109 $self->{state} = 0; 2221 $self->{state} = 0;
… …
2129 $self->emit (changed => $self->{state}); 2241 $self->emit (changed => $self->{state});
2130} 2242}
2131 2243
2132############################################################################# 2244#############################################################################
2133 2245
2246package CFClient::UI::Tooltip;
2247
2248our @ISA = CFClient::UI::Bin::;
2249
2250use CFClient::OpenGL;
2251
2252sub new {
2253 my $class = shift;
2254
2255 $class->SUPER::new (
2256 @_,
2257 can_events => 0,
2258 )
2259}
2260
2261sub set_markup {
2262 my ($self, $text) = @_;
2263
2264 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2265 $self->{label}->set_markup ($text);
2266 $self->add ($self->{label});
2267}
2268
2269sub size_request {
2270 my ($self) = @_;
2271
2272 $self->child->set_max_size ($::WIDTH * 0.3);
2273
2274 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2275
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);
2283}
2284
2285sub _draw {
2286 my ($self) = @_;
2287
2288 glPushMatrix;
2289 glTranslate 0.375, 0.375;
2290
2291 my ($w, $h) = @$self{qw(w h)};
2292
2293 glColor 1, 0.8, 0.4;
2294 glBegin GL_QUADS;
2295 glVertex 0 , 0;
2296 glVertex 0 , $h;
2297 glVertex $w, $h;
2298 glVertex $w, 0;
2299 glEnd;
2300
2301 glColor 0, 0, 0;
2302 glBegin GL_LINE_LOOP;
2303 glVertex 0 , 0;
2304 glVertex 0 , $h;
2305 glVertex $w, $h;
2306 glVertex $w, 0;
2307 glEnd;
2308
2309 glPopMatrix;
2310
2311 glTranslate 2, 2;
2312 $self->SUPER::_draw;
2313}
2314
2315#############################################################################
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
2134package CFClient::UI::Root; 2355package CFClient::UI::Root;
2135 2356
2136our @ISA = CFClient::UI::Container::; 2357our @ISA = CFClient::UI::Container::;
2137 2358
2138use CFClient::OpenGL; 2359use CFClient::OpenGL;
… …
2213############################################################################# 2434#############################################################################
2214 2435
2215package CFClient::UI; 2436package CFClient::UI;
2216 2437
2217$ROOT = new CFClient::UI::Root; 2438$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 2439$TOOLTIP = new CFClient::UI::Tooltip;
2219 2440
22201 24411
2221 2442

Diff Legend

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