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.170 by root, Mon Apr 24 11:45:17 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";
… …
206 236
207sub size_allocate { 237sub size_allocate {
208 # nothing to be done 238 # nothing to be done
209} 239}
210 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
211# return top left coordinates 248# return top left coordinates
212sub _topleft { 249sub _topleft {
213 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
251
252 $self->{parent}
253 or Carp::confess "no parent widget in _topleft\n";#d#
214 254
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
216} 256}
217 257
218# translate global coordinates to local coordinate system 258# translate global coordinates to local coordinate system
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 336 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 337 glVertex $x , $y + $self->{h};
298 glEnd; 338 glEnd;
299 glDisable GL_BLEND; 339 glDisable GL_BLEND;
300 } 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 }
301} 355}
302 356
303sub _draw { 357sub _draw {
304 my ($self) = @_; 358 my ($self) = @_;
305 359
… …
325} 379}
326 380
327sub check_size { 381sub check_size {
328 my ($self) = @_; 382 my ($self) = @_;
329 383
330 return unless $self->{parent}; 384 $self->{parent}
385 or return 1;
331 386
332 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;
333 390
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w; 392 $self->{req_w} = $w;
336 $self->{req_h} = $h; 393 $self->{req_h} = $h;
337 394
338 $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
339 } 404 }
340} 405}
341 406
342sub update { 407sub update {
343 my ($self) = @_; 408 my ($self) = @_;
… …
353} 418}
354 419
355sub emit { 420sub emit {
356 my ($self, $signal, @args) = @_; 421 my ($self, $signal, @args) = @_;
357 422
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 423 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 424}
362 425
363sub DESTROY { 426sub DESTROY {
364 my ($self) = @_; 427 my ($self) = @_;
365 428
… …
432sub new { 495sub new {
433 my ($class, %arg) = @_; 496 my ($class, %arg) = @_;
434 497
435 my $children = delete $arg{children} || []; 498 my $children = delete $arg{children} || [];
436 499
437 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 );
438 $self->add ($_) for @$children; 505 $self->add ($_) for @$children;
439 506
440 $self 507 $self
441} 508}
442 509
… …
457 524
458sub remove { 525sub remove {
459 my ($self, $child) = @_; 526 my ($self, $child) = @_;
460 527
461 delete $child->{parent}; 528 delete $child->{parent};
529 $child->hide;
462 530
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
464 532
465 $self->check_size; 533 $self->check_size;
466 $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 }
467} 547}
468 548
469sub find_widget { 549sub find_widget {
470 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
471 551
… …
631 border => 0.8, 711 border => 0.8,
632 @_ 712 @_
633 ); 713 );
634 714
635 $self 715 $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} 716}
656 717
657sub _draw { 718sub _draw {
658 my ($self) = @_; 719 my ($self) = @_;
659 720
… …
694 my $class = shift; 755 my $class = shift;
695 756
696 # TODO: user_x, user_y, overwrite moveto? 757 # TODO: user_x, user_y, overwrite moveto?
697 758
698 my $self = $class->SUPER::new ( 759 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 760 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 761 border_bg => [1, 1, 1, 1],
701 border => 0.8, 762 border => 0.8,
702 can_events => 1, 763 can_events => 1,
703 @_ 764 @_
704 ); 765 );
705 766
706 $self->{title} &&= new CFClient::UI::Label 767 $self->{title} &&= new CFClient::UI::Label
… …
717} 778}
718 779
719sub size_request { 780sub size_request {
720 my ($self) = @_; 781 my ($self) = @_;
721 782
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723
724 my ($w, $h) = $self->SUPER::size_request; 783 my ($w, $h) = $self->SUPER::size_request;
725 784
726 ( 785 (
727 $w + $self->border * 2, 786 $w + $self->border * 2,
728 $h + $self->border * 2, 787 $h + $self->border * 2,
… …
860 919
861# 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?
862sub clear { 921sub clear {
863 my ($self) = @_; 922 my ($self) = @_;
864 923
865 delete $self->{children}; 924 my $children = delete $self->{children};
925
926 for (grep $_, map @$_, grep $_, @$children) {
927 delete $_->{parent};
928 $_->hide;
929 }
930
866 $self->update; 931 $self->update;
867} 932}
868 933
869sub get_wh { 934sub get_wh {
870 my ($self) = @_; 935 my ($self) = @_;
… …
1093 1158
1094sub new { 1159sub new {
1095 my ($class, %arg) = @_; 1160 my ($class, %arg) = @_;
1096 1161
1097 my $self = $class->SUPER::new ( 1162 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1163 fg => [1, 1, 1],
1164 #font => default_font
1099 fontsize => 1, 1165 fontsize => 1,
1100 text => "", 1166 text => "",
1101 align => -1, 1167 align => -1,
1102 valign => -1, 1168 valign => -1,
1103 padding => 2, 1169 padding => 2,
1104 layout => new CFClient::Layout, 1170 layout => new CFClient::Layout,
1105 can_events => 0, 1171 can_events => 0,
1106 %arg 1172 %arg
1107 ); 1173 );
1108 1174
1109 if (exists $self->{template}) { 1175 if (exists $self->{template}) {
… …
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1182 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1117 1183
1118 $self 1184 $self
1119} 1185}
1120 1186
1121sub escape_text { 1187sub escape {
1122 local $_ = $_[1]; 1188 local $_ = $_[1];
1123 1189
1124 s/&/&amp;/g; 1190 s/&/&amp;/g;
1125 s/>/&gt;/g; 1191 s/>/&gt;/g;
1126 s/</&lt;/g; 1192 s/</&lt;/g;
… …
1149} 1215}
1150 1216
1151sub size_request { 1217sub size_request {
1152 my ($self) = @_; 1218 my ($self) = @_;
1153 1219
1154 $self->{layout}->set_width; 1220 $self->{layout}->set_font ($self->{font}) if $self->{font};
1221 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1222 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1223
1157 my ($w, $h) = $self->{layout}->size; 1224 my ($w, $h) = $self->{layout}->size;
1158 1225
1159 if (exists $self->{template}) { 1226 if (exists $self->{template}) {
1227 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1228 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1229
1162 my ($w2, $h2) = $self->{template}->size; 1230 my ($w2, $h2) = $self->{template}->size;
1163 1231
1164 $w = List::Util::max $w, $w2; 1232 $w = List::Util::max $w, $w2;
… …
1179 1247
1180sub set_fontsize { 1248sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1249 my ($self, $fontsize) = @_;
1182 1250
1183 $self->{fontsize} = $fontsize; 1251 $self->{fontsize} = $fontsize;
1252 delete $self->{texture};
1184 $self->check_size; 1253 $self->check_size;
1254 $self->update;
1185} 1255}
1186 1256
1187sub _draw { 1257sub _draw {
1188 my ($self) = @_; 1258 my ($self) = @_;
1189 1259
1190 my $tex = $self->{texture} ||= do { 1260 my $tex = $self->{texture} ||= do {
1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1191 $self->{layout}->set_width ($self->{w}); 1262 $self->{layout}->set_width ($self->{w});
1192 $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);
1193 new_from_layout CFClient::Texture $self->{layout} 1264 new_from_layout CFClient::Texture $self->{layout}
1194 }; 1265 };
1195 1266
… …
1228 1299
1229sub new { 1300sub new {
1230 my $class = shift; 1301 my $class = shift;
1231 1302
1232 $class->SUPER::new ( 1303 $class->SUPER::new (
1233 fg => [1, 1, 1], 1304 fg => [1, 1, 1],
1234 bg => [0, 0, 0, 0.2], 1305 bg => [0, 0, 0, 0.2],
1235 active_bg => [1, 1, 1, 0.5], 1306 active_bg => [1, 1, 1, 0.5],
1236 active_fg => [0, 0, 0], 1307 active_fg => [0, 0, 0],
1237 can_hover => 1, 1308 can_hover => 1,
1238 can_focus => 1, 1309 can_focus => 1,
1239 valign => 0, 1310 valign => 0,
1240 can_events => 1, 1311 can_events => 1,
1241 @_ 1312 @_
1242 ) 1313 )
1243} 1314}
1244 1315
… …
1398 my ($self, $ev) = @_; 1469 my ($self, $ev) = @_;
1399 1470
1400 my $sym = $ev->{sym}; 1471 my $sym = $ev->{sym};
1401 1472
1402 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} = '';
1403 $self->emit (activate => $self->get_text); 1478 $self->emit (activate => $txt);
1404 $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 }
1405 1502
1406 } else { 1503 } else {
1407 $self->SUPER::key_down ($ev); 1504 $self->SUPER::key_down ($ev);
1408 } 1505 }
1409 1506
… …
1423 1520
1424sub new { 1521sub new {
1425 my $class = shift; 1522 my $class = shift;
1426 1523
1427 $class->SUPER::new ( 1524 $class->SUPER::new (
1428 padding => 4, 1525 padding => 4,
1429 fg => [1, 1, 1], 1526 fg => [1, 1, 1],
1430 bg => [1, 1, 1, 0.2], 1527 bg => [1, 1, 1, 0.2],
1431 active_fg => [0, 0, 1], 1528 active_fg => [0, 0, 1],
1432 can_hover => 1, 1529 can_hover => 1,
1433 align => 0, 1530 align => 0,
1434 valign => 0, 1531 valign => 0,
1435 can_events => 1, 1532 can_events => 1,
1436 @_ 1533 @_
1437 ) 1534 )
1438} 1535}
1439 1536
… …
1598 1695
1599package CFClient::UI::VGauge; 1696package CFClient::UI::VGauge;
1600 1697
1601our @ISA = CFClient::UI::Base::; 1698our @ISA = CFClient::UI::Base::;
1602 1699
1700use List::Util qw(min max);
1701
1603use CFClient::OpenGL; 1702use CFClient::OpenGL;
1604 1703
1605my %tex = ( 1704my %tex = (
1606 food => [ 1705 food => [
1607 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1706 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1707 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609 ], 1708 ],
1610 grace => [ 1709 grace => [
1611 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1710 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612 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/
1613 ], 1712 ],
1614 hp => [ 1713 hp => [
1615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1714 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1715 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617 ], 1716 ],
1618 mana => [ 1717 mana => [
1619 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620 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/
1621 ], 1720 ],
1622); 1721);
1623 1722
1624# eg. VGauge->new (gauge => 'food'), default gauge: food 1723# eg. VGauge->new (gauge => 'food'), default gauge: food
1625sub new { 1724sub new {
… …
1663 1762
1664sub _draw { 1763sub _draw {
1665 my ($self) = @_; 1764 my ($self) = @_;
1666 1765
1667 my $tex = $tex{$self->{type}}; 1766 my $tex = $tex{$self->{type}};
1767 my ($t1, $t2, $t3) = @$tex;
1668 1768
1669 my ($w, $h) = ($self->{w}, $self->{h}); 1769 my ($w, $h) = ($self->{w}, $self->{h});
1670 1770
1671 if ($self->{vertical}) { 1771 if ($self->{vertical}) {
1672 glRotate 90, 0, 0, 1; 1772 glRotate 90, 0, 0, 1;
… …
1674 1774
1675 ($w, $h) = ($h, $w); 1775 ($w, $h) = ($h, $w);
1676 } 1776 }
1677 1777
1678 my $ycut = $self->{val} / ($self->{max_val} || 1); 1778 my $ycut = $self->{val} / ($self->{max_val} || 1);
1679 $ycut = 1 if $self->{val} > $self->{max_val};
1680 1779
1681 my $t1 = $tex->[0]; 1780 my $ycut1 = max 0, min 1, $ycut;
1682 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);
1683 1785
1684 glEnable GL_BLEND; 1786 glEnable GL_BLEND;
1685 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1787 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1686 glEnable GL_TEXTURE_2D; 1788 glEnable GL_TEXTURE_2D;
1687 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688 1790
1689 my $h1 = $self->{h} - $ycut * $self->{h};
1690 my $h2 = $ycut * $self->{h};
1691
1692 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1791 glBindTexture GL_TEXTURE_2D, $t1->{name};
1693 glBegin GL_QUADS; 1792 glBegin GL_QUADS;
1694 glTexCoord 0 , 0; glVertex 0 , 0; 1793 glTexCoord 0 , 0; glVertex 0 , 0;
1695 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1794 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1696 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1795 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1697 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1796 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1698 glEnd; 1797 glEnd;
1699 1798
1799 my $ycut1 = List::Util::min 1, $ycut;
1700 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1800 glBindTexture GL_TEXTURE_2D, $t2->{name};
1701 glBegin GL_QUADS; 1801 glBegin GL_QUADS;
1702 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1802 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1803 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1704 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1804 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1705 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1805 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1706 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 }
1707 1817
1708 glDisable GL_BLEND; 1818 glDisable GL_BLEND;
1709 glDisable GL_TEXTURE_2D; 1819 glDisable GL_TEXTURE_2D;
1710} 1820}
1711 1821
… …
1717 1827
1718sub new { 1828sub new {
1719 my ($class, %arg) = @_; 1829 my ($class, %arg) = @_;
1720 1830
1721 my $self = $class->SUPER::new ( 1831 my $self = $class->SUPER::new (
1722 tooltip => $arg{type}, 1832 tooltip => $arg{type},
1833 can_hover => 1,
1723 %arg, 1834 %arg,
1724 ); 1835 );
1725 1836
1726 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1837 $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); 1838 $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"); 1839 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1729 1840
1730 $self 1841 $self
1731} 1842}
1732 1843
… …
1899 2010
1900sub new { 2011sub new {
1901 my $class = shift; 2012 my $class = shift;
1902 2013
1903 my $self = $class->SUPER::new ( 2014 my $self = $class->SUPER::new (
1904 fontsize => 1, 2015 fontsize => 1,
2016 can_events => 0,
2017 #font => default_font
1905 @_, 2018 @_,
1906 2019
1907 layout => (new CFClient::Layout), 2020 layout => (new CFClient::Layout),
1908 par => [], 2021 par => [],
1909 height => 0, 2022 height => 0,
1910 children => [ 2023 children => [
1911 (new CFClient::UI::Empty expand => 1), 2024 (new CFClient::UI::Empty expand => 1),
1912 (new CFClient::UI::Slider vertical => 1), 2025 (new CFClient::UI::Slider vertical => 1),
1913 ], 2026 ],
1914 ); 2027 );
1915 2028
… …
1949sub size_allocate { 2062sub size_allocate {
1950 my ($self, $w, $h) = @_; 2063 my ($self, $w, $h) = @_;
1951 2064
1952 $self->SUPER::size_allocate ($w, $h); 2065 $self->SUPER::size_allocate ($w, $h);
1953 2066
2067 $self->{layout}->set_font ($self->{font}) if $self->{font};
1954 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2068 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $self->{layout}->set_width ($self->{children}[0]{w}); 2069 $self->{layout}->set_width ($self->{children}[0]{w});
1956 2070
1957 $self->reflow; 2071 $self->reflow;
1958} 2072}
… …
2010 my $y1 = $top + $self->{h}; 2124 my $y1 = $top + $self->{h};
2011 2125
2012 my $y = 0; 2126 my $y = 0;
2013 2127
2014 my $layout = $self->{layout}; 2128 my $layout = $self->{layout};
2129
2130 $layout->set_font ($self->{font}) if $self->{font};
2015 2131
2016 for my $par (@{$self->{par}}) { 2132 for my $par (@{$self->{par}}) {
2017 my $h = $par->[0]; 2133 my $h = $par->[0];
2018 2134
2019 if ($y0 < $y + $h && $y < $y1) { 2135 if ($y0 < $y + $h && $y < $y1) {
… …
2097 2213
2098sub new { 2214sub new {
2099 my $class = shift; 2215 my $class = shift;
2100 2216
2101 my $self = $class->SUPER::new ( 2217 my $self = $class->SUPER::new (
2102 state => 0, 2218 state => 0,
2103 connect_activate => \&toggle_flopper, 2219 connect_activate => \&toggle_flopper,
2104 can_events => 1,
2105 @_ 2220 @_
2106 ); 2221 );
2107 2222
2108 if ($self->{state}) { 2223 if ($self->{state}) {
2109 $self->{state} = 0; 2224 $self->{state} = 0;
… …
2129 $self->emit (changed => $self->{state}); 2244 $self->emit (changed => $self->{state});
2130} 2245}
2131 2246
2132############################################################################# 2247#############################################################################
2133 2248
2249package CFClient::UI::Tooltip;
2250
2251our @ISA = CFClient::UI::Bin::;
2252
2253use CFClient::OpenGL;
2254
2255sub new {
2256 my $class = shift;
2257
2258 $class->SUPER::new (
2259 @_,
2260 can_events => 0,
2261 )
2262}
2263
2264sub set_markup {
2265 my ($self, $text) = @_;
2266
2267 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2268 $self->{label}->set_markup ($text);
2269 $self->add ($self->{label});
2270}
2271
2272sub size_request {
2273 my ($self) = @_;
2274
2275 $self->child->set_max_size ($::WIDTH * 0.3);
2276
2277 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2278
2279 ($w + 4, $h + 4)
2280}
2281
2282sub size_allocate {
2283 my ($self, $w, $h) = @_;
2284
2285 $self->SUPER::size_allocate ($w - 4, $h - 4);
2286}
2287
2288sub _draw {
2289 my ($self) = @_;
2290
2291 glPushMatrix;
2292 glTranslate 0.375, 0.375;
2293
2294 my ($w, $h) = @$self{qw(w h)};
2295
2296 glColor 1, 0.8, 0.4;
2297 glBegin GL_QUADS;
2298 glVertex 0 , 0;
2299 glVertex 0 , $h;
2300 glVertex $w, $h;
2301 glVertex $w, 0;
2302 glEnd;
2303
2304 glColor 0, 0, 0;
2305 glBegin GL_LINE_LOOP;
2306 glVertex 0 , 0;
2307 glVertex 0 , $h;
2308 glVertex $w, $h;
2309 glVertex $w, 0;
2310 glEnd;
2311
2312 glPopMatrix;
2313
2314 glTranslate 2, 2;
2315 $self->SUPER::_draw;
2316}
2317
2318#############################################################################
2319
2320package CFClient::UI::Face;
2321
2322our @ISA = CFClient::UI::Base::;
2323
2324use CFClient::OpenGL;
2325
2326sub new {
2327 my $class = shift;
2328
2329 $class->SUPER::new (
2330 aspect => 1,
2331 @_,
2332 )
2333}
2334
2335sub size_request {
2336 (32, 8)
2337}
2338
2339sub draw {
2340 my ($self) = @_;
2341
2342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2343
2344 if ($tex) {
2345 glEnable GL_BLEND;
2346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1;
2350 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2351 glDisable GL_TEXTURE_2D;
2352 glDisable GL_BLEND;
2353 }
2354}
2355
2356#############################################################################
2357
2134package CFClient::UI::Root; 2358package CFClient::UI::Root;
2135 2359
2136our @ISA = CFClient::UI::Container::; 2360our @ISA = CFClient::UI::Container::;
2137 2361
2138use CFClient::OpenGL; 2362use CFClient::OpenGL;
… …
2213############################################################################# 2437#############################################################################
2214 2438
2215package CFClient::UI; 2439package CFClient::UI;
2216 2440
2217$ROOT = new CFClient::UI::Root; 2441$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 2442$TOOLTIP = new CFClient::UI::Tooltip;
2219 2443
22201 24441
2221 2445

Diff Legend

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