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.154 by root, Sun Apr 23 02:20:57 2006 UTC vs.
Revision 1.167 by elmex, Mon Apr 24 08:44:23 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;
… …
1188 1253
1189sub _draw { 1254sub _draw {
1190 my ($self) = @_; 1255 my ($self) = @_;
1191 1256
1192 my $tex = $self->{texture} ||= do { 1257 my $tex = $self->{texture} ||= do {
1258 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1259 $self->{layout}->set_width ($self->{w});
1194 $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);
1195 new_from_layout CFClient::Texture $self->{layout} 1261 new_from_layout CFClient::Texture $self->{layout}
1196 }; 1262 };
1197 1263
… …
1230 1296
1231sub new { 1297sub new {
1232 my $class = shift; 1298 my $class = shift;
1233 1299
1234 $class->SUPER::new ( 1300 $class->SUPER::new (
1235 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1239 can_hover => 1, 1305 can_hover => 1,
1240 can_focus => 1, 1306 can_focus => 1,
1241 valign => 0, 1307 valign => 0,
1242 can_events => 1, 1308 can_events => 1,
1243 @_ 1309 @_
1244 ) 1310 )
1245} 1311}
1246 1312
… …
1400 my ($self, $ev) = @_; 1466 my ($self, $ev) = @_;
1401 1467
1402 my $sym = $ev->{sym}; 1468 my $sym = $ev->{sym};
1403 1469
1404 if ($sym == 13) { 1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1405 $self->emit (activate => $self->get_text); 1474 $self->emit (activate => $txt);
1406 $self->update; 1475 $self->update;
1476
1477 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text;
1480 }
1481 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1;
1484 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486
1487 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490
1491 if ($self->{history_pointer} >= 0) {
1492 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1493 } else {
1494 $self->set_text ($self->{history_saveback});
1495 }
1407 1496
1408 } else { 1497 } else {
1409 $self->SUPER::key_down ($ev); 1498 $self->SUPER::key_down ($ev);
1410 } 1499 }
1411 1500
… …
1425 1514
1426sub new { 1515sub new {
1427 my $class = shift; 1516 my $class = shift;
1428 1517
1429 $class->SUPER::new ( 1518 $class->SUPER::new (
1430 padding => 4, 1519 padding => 4,
1431 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2], 1521 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1522 active_fg => [0, 0, 1],
1434 can_hover => 1, 1523 can_hover => 1,
1435 align => 0, 1524 align => 0,
1436 valign => 0, 1525 valign => 0,
1437 can_events => 1, 1526 can_events => 1,
1438 @_ 1527 @_
1439 ) 1528 )
1440} 1529}
1441 1530
… …
1600 1689
1601package CFClient::UI::VGauge; 1690package CFClient::UI::VGauge;
1602 1691
1603our @ISA = CFClient::UI::Base::; 1692our @ISA = CFClient::UI::Base::;
1604 1693
1694use List::Util qw(min max);
1695
1605use CFClient::OpenGL; 1696use CFClient::OpenGL;
1606 1697
1607my %tex = ( 1698my %tex = (
1608 food => [ 1699 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1700 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1701 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1702 ],
1612 grace => [ 1703 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1704 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1705 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1615 ], 1706 ],
1616 hp => [ 1707 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1708 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1709 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1710 ],
1620 mana => [ 1711 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1712 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1713 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1623 ], 1714 ],
1624); 1715);
1625 1716
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1717# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1718sub new {
… …
1665 1756
1666sub _draw { 1757sub _draw {
1667 my ($self) = @_; 1758 my ($self) = @_;
1668 1759
1669 my $tex = $tex{$self->{type}}; 1760 my $tex = $tex{$self->{type}};
1761 my ($t1, $t2, $t3) = @$tex;
1670 1762
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1763 my ($w, $h) = ($self->{w}, $self->{h});
1672 1764
1673 if ($self->{vertical}) { 1765 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1766 glRotate 90, 0, 0, 1;
… …
1676 1768
1677 ($w, $h) = ($h, $w); 1769 ($w, $h) = ($h, $w);
1678 } 1770 }
1679 1771
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1772 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1773
1683 my $t1 = $tex->[0]; 1774 my $ycut1 = max 0, min 1, $ycut;
1684 my $t2 = $tex->[1]; 1775 my $ycut2 = max 0, min 1, $ycut - 1;
1776
1777 my $h1 = $self->{h} * (1 - $ycut1);
1778 my $h2 = $self->{h} * (1 - $ycut2);
1685 1779
1686 glEnable GL_BLEND; 1780 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1784
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1785 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1786 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1787 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1788 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1789 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1790 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1791 glEnd;
1701 1792
1793 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1794 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1795 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1796 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1797 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1798 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1799 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 glEnd; 1800 glEnd;
1801
1802 if ($t3) {
1803 glBindTexture GL_TEXTURE_2D, $t3->{name};
1804 glBegin GL_QUADS;
1805 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1806 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1807 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1808 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1809 glEnd;
1810 }
1709 1811
1710 glDisable GL_BLEND; 1812 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1813 glDisable GL_TEXTURE_2D;
1712} 1814}
1713 1815
… …
1719 1821
1720sub new { 1822sub new {
1721 my ($class, %arg) = @_; 1823 my ($class, %arg) = @_;
1722 1824
1723 my $self = $class->SUPER::new ( 1825 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 1826 tooltip => $arg{type},
1827 can_hover => 1,
1725 %arg, 1828 %arg,
1726 ); 1829 );
1727 1830
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1833 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 1834
1732 $self 1835 $self
1733} 1836}
1734 1837
… …
1901 2004
1902sub new { 2005sub new {
1903 my $class = shift; 2006 my $class = shift;
1904 2007
1905 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1906 fontsize => 1, 2009 fontsize => 1,
2010 can_events => 0,
2011 #font => default_font
1907 @_, 2012 @_,
1908 2013
1909 layout => (new CFClient::Layout), 2014 layout => (new CFClient::Layout),
1910 par => [], 2015 par => [],
1911 height => 0, 2016 height => 0,
1912 children => [ 2017 children => [
1913 (new CFClient::UI::Empty expand => 1), 2018 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2019 (new CFClient::UI::Slider vertical => 1),
1915 ], 2020 ],
1916 ); 2021 );
1917 2022
… …
1951sub size_allocate { 2056sub size_allocate {
1952 my ($self, $w, $h) = @_; 2057 my ($self, $w, $h) = @_;
1953 2058
1954 $self->SUPER::size_allocate ($w, $h); 2059 $self->SUPER::size_allocate ($w, $h);
1955 2060
2061 $self->{layout}->set_font ($self->{font}) if $self->{font};
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2062 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1957 $self->{layout}->set_width ($self->{children}[0]{w}); 2063 $self->{layout}->set_width ($self->{children}[0]{w});
1958 2064
1959 $self->reflow; 2065 $self->reflow;
1960} 2066}
… …
2012 my $y1 = $top + $self->{h}; 2118 my $y1 = $top + $self->{h};
2013 2119
2014 my $y = 0; 2120 my $y = 0;
2015 2121
2016 my $layout = $self->{layout}; 2122 my $layout = $self->{layout};
2123
2124 $layout->set_font ($self->{font}) if $self->{font};
2017 2125
2018 for my $par (@{$self->{par}}) { 2126 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2127 my $h = $par->[0];
2020 2128
2021 if ($y0 < $y + $h && $y < $y1) { 2129 if ($y0 < $y + $h && $y < $y1) {
… …
2099 2207
2100sub new { 2208sub new {
2101 my $class = shift; 2209 my $class = shift;
2102 2210
2103 my $self = $class->SUPER::new ( 2211 my $self = $class->SUPER::new (
2104 state => 0, 2212 state => 0,
2105 connect_activate => \&toggle_flopper, 2213 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2214 @_
2108 ); 2215 );
2109 2216
2110 if ($self->{state}) { 2217 if ($self->{state}) {
2111 $self->{state} = 0; 2218 $self->{state} = 0;
… …
2146 @_, 2253 @_,
2147 can_events => 0, 2254 can_events => 0,
2148 ) 2255 )
2149} 2256}
2150 2257
2151sub set_text { 2258sub set_markup {
2152 my ($self, $text) = @_; 2259 my ($self, $text) = @_;
2153 2260
2154 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2155 $self->{label}->set_text ($text); 2262 $self->{label}->set_markup ($text);
2156 $self->add ($self->{label}); 2263 $self->add ($self->{label});
2157} 2264}
2158 2265
2159sub size_request { 2266sub size_request {
2160 my ($self) = @_; 2267 my ($self) = @_;
2161 2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163 2272
2164 $w = List::Util::min $::WIDTH * 0.2, $w;
2165 $h = List::Util::max $::HEIGHT * 0.2, $h;
2166
2167 ($w + 4, $h + 4) 2273 ($w + 4, $h + 4)
2274}
2275
2276sub size_allocate {
2277 my ($self, $w, $h) = @_;
2278
2279 $self->SUPER::size_allocate ($w - 4, $h - 4);
2168} 2280}
2169 2281
2170sub _draw { 2282sub _draw {
2171 my ($self) = @_; 2283 my ($self) = @_;
2172 2284
… …
2197 $self->SUPER::_draw; 2309 $self->SUPER::_draw;
2198} 2310}
2199 2311
2200############################################################################# 2312#############################################################################
2201 2313
2314package CFClient::UI::Face;
2315
2316our @ISA = CFClient::UI::Base::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 aspect => 1,
2325 @_,
2326 )
2327}
2328
2329sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_;
2335
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348}
2349
2350#############################################################################
2351
2202package CFClient::UI::Root; 2352package CFClient::UI::Root;
2203 2353
2204our @ISA = CFClient::UI::Container::; 2354our @ISA = CFClient::UI::Container::;
2205 2355
2206use CFClient::OpenGL; 2356use CFClient::OpenGL;

Diff Legend

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