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.156 by elmex, Sun Apr 23 02:50:42 2006 UTC vs.
Revision 1.172 by root, Tue Apr 25 09:52:04 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 children {
242}
243
244sub set_max_size {
245 my ($self, $w, $h) = @_;
246
247 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h;
249}
250
216# return top left coordinates 251# return top left coordinates
217sub _topleft { 252sub _topleft {
218 my ($self, $x, $y) = @_; 253 my ($self, $x, $y) = @_;
254
255 $self->{parent}
256 or Carp::confess "no parent widget in _topleft\n";#d#
219 257
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
221} 259}
222 260
223# translate global coordinates to local coordinate system 261# translate global coordinates to local coordinate system
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 339 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 340 glVertex $x , $y + $self->{h};
303 glEnd; 341 glEnd;
304 glDisable GL_BLEND; 342 glDisable GL_BLEND;
305 } 343 }
344
345 if ($ENV{PCLIENT_DEBUG}) {
346 glPushMatrix;
347 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0;
351 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h};
354 glEnd;
355 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 }
306} 358}
307 359
308sub _draw { 360sub _draw {
309 my ($self) = @_; 361 my ($self) = @_;
310 362
… …
330} 382}
331 383
332sub check_size { 384sub check_size {
333 my ($self) = @_; 385 my ($self) = @_;
334 386
335 return unless $self->{parent}; 387 $self->{parent}
388 or return 1;
336 389
337 my ($w, $h) = $self->size_request; 390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
338 393
339 if ($w != $self->{req_w} || $h != $self->{req_h}) { 394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w; 395 $self->{req_w} = $w;
341 $self->{req_h} = $h; 396 $self->{req_h} = $h;
342 397
343 $self->{parent}->check_size; 398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
344 } 407 }
345} 408}
346 409
347sub update { 410sub update {
348 my ($self) = @_; 411 my ($self) = @_;
… …
358} 421}
359 422
360sub emit { 423sub emit {
361 my ($self, $signal, @args) = @_; 424 my ($self, $signal, @args) = @_;
362 425
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 427}
367 428
368sub DESTROY { 429sub DESTROY {
369 my ($self) = @_; 430 my ($self) = @_;
370 431
… …
437sub new { 498sub new {
438 my ($class, %arg) = @_; 499 my ($class, %arg) = @_;
439 500
440 my $children = delete $arg{children} || []; 501 my $children = delete $arg{children} || [];
441 502
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 503 my $self = $class->SUPER::new (
504 children => [],
505 can_events => 0,
506 %arg,
507 );
443 $self->add ($_) for @$children; 508 $self->add ($_) for @$children;
444 509
445 $self 510 $self
446} 511}
447 512
… …
458 ]; 523 ];
459 524
460 $child->check_size; 525 $child->check_size;
461} 526}
462 527
528sub children {
529 @{ $_[0]{children} }
530}
531
463sub remove { 532sub remove {
464 my ($self, $child) = @_; 533 my ($self, $child) = @_;
465 534
466 delete $child->{parent}; 535 delete $child->{parent};
536 $child->hide;
467 537
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
469 539
470 $self->check_size; 540 $self->check_size;
471 $self->update; 541 $self->update;
542}
543
544sub clear {
545 my ($self) = @_;
546
547 my $children = delete $self->{children};
548 $self->{children} = [];
549
550 for (@$children) {
551 delete $_->{parent};
552 $_->hide;
553 }
472} 554}
473 555
474sub find_widget { 556sub find_widget {
475 my ($self, $x, $y) = @_; 557 my ($self, $x, $y) = @_;
476 558
… …
636 border => 0.8, 718 border => 0.8,
637 @_ 719 @_
638 ); 720 );
639 721
640 $self 722 $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} 723}
661 724
662sub _draw { 725sub _draw {
663 my ($self) = @_; 726 my ($self) = @_;
664 727
… …
699 my $class = shift; 762 my $class = shift;
700 763
701 # TODO: user_x, user_y, overwrite moveto? 764 # TODO: user_x, user_y, overwrite moveto?
702 765
703 my $self = $class->SUPER::new ( 766 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 767 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 768 border_bg => [1, 1, 1, 1],
706 border => 0.8, 769 border => 0.8,
707 can_events => 1, 770 can_events => 1,
708 @_ 771 @_
709 ); 772 );
710 773
711 $self->{title} &&= new CFClient::UI::Label 774 $self->{title} &&= new CFClient::UI::Label
… …
722} 785}
723 786
724sub size_request { 787sub size_request {
725 my ($self) = @_; 788 my ($self) = @_;
726 789
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728
729 my ($w, $h) = $self->SUPER::size_request; 790 my ($w, $h) = $self->SUPER::size_request;
730 791
731 ( 792 (
732 $w + $self->border * 2, 793 $w + $self->border * 2,
733 $h + $self->border * 2, 794 $h + $self->border * 2,
… …
861 $self->{children}[$y][$x] = $child; 922 $self->{children}[$y][$x] = $child;
862 923
863 $child->check_size; 924 $child->check_size;
864} 925}
865 926
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
866# TODO: move to container class maybe? send childs a signal on removal? 931# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 932sub clear {
868 my ($self) = @_; 933 my ($self) = @_;
869 934
935 my @children = $self->children;
870 delete $self->{children}; 936 delete $self->{children};
937
938 for (@children) {
939 delete $_->{parent};
940 $_->hide;
941 }
942
871 $self->update; 943 $self->update;
872} 944}
873 945
874sub get_wh { 946sub get_wh {
875 my ($self) = @_; 947 my ($self) = @_;
… …
1098 1170
1099sub new { 1171sub new {
1100 my ($class, %arg) = @_; 1172 my ($class, %arg) = @_;
1101 1173
1102 my $self = $class->SUPER::new ( 1174 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1175 fg => [1, 1, 1],
1176 #font => default_font
1104 fontsize => 1, 1177 fontsize => 1,
1105 text => "", 1178 text => "",
1106 align => -1, 1179 align => -1,
1107 valign => -1, 1180 valign => -1,
1108 padding => 2, 1181 padding => 2,
1109 layout => new CFClient::Layout, 1182 layout => new CFClient::Layout,
1110 can_events => 0, 1183 can_events => 0,
1111 %arg 1184 %arg
1112 ); 1185 );
1113 1186
1114 if (exists $self->{template}) { 1187 if (exists $self->{template}) {
… …
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1122 1195
1123 $self 1196 $self
1124} 1197}
1125 1198
1126sub escape_text { 1199sub escape {
1127 local $_ = $_[1]; 1200 local $_ = $_[1];
1128 1201
1129 s/&/&amp;/g; 1202 s/&/&amp;/g;
1130 s/>/&gt;/g; 1203 s/>/&gt;/g;
1131 s/</&lt;/g; 1204 s/</&lt;/g;
… …
1154} 1227}
1155 1228
1156sub size_request { 1229sub size_request {
1157 my ($self) = @_; 1230 my ($self) = @_;
1158 1231
1159 $self->{layout}->set_width; 1232 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1235
1162 my ($w, $h) = $self->{layout}->size; 1236 my ($w, $h) = $self->{layout}->size;
1163 1237
1164 if (exists $self->{template}) { 1238 if (exists $self->{template}) {
1239 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1240 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1241
1167 my ($w2, $h2) = $self->{template}->size; 1242 my ($w2, $h2) = $self->{template}->size;
1168 1243
1169 $w = List::Util::max $w, $w2; 1244 $w = List::Util::max $w, $w2;
… …
1193 1268
1194sub _draw { 1269sub _draw {
1195 my ($self) = @_; 1270 my ($self) = @_;
1196 1271
1197 my $tex = $self->{texture} ||= do { 1272 my $tex = $self->{texture} ||= do {
1273 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1274 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1200 new_from_layout CFClient::Texture $self->{layout} 1276 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1277 };
1202 1278
… …
1235 1311
1236sub new { 1312sub new {
1237 my $class = shift; 1313 my $class = shift;
1238 1314
1239 $class->SUPER::new ( 1315 $class->SUPER::new (
1240 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1317 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1318 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1319 active_fg => [0, 0, 0],
1244 can_hover => 1, 1320 can_hover => 1,
1245 can_focus => 1, 1321 can_focus => 1,
1246 valign => 0, 1322 valign => 0,
1247 can_events => 1, 1323 can_events => 1,
1248 @_ 1324 @_
1249 ) 1325 )
1250} 1326}
1251 1327
… …
1405 my ($self, $ev) = @_; 1481 my ($self, $ev) = @_;
1406 1482
1407 my $sym = $ev->{sym}; 1483 my $sym = $ev->{sym};
1408 1484
1409 if ($sym == 13) { 1485 if ($sym == 13) {
1486 unshift @{$self->{history}},
1487 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1490 $self->emit (activate => $txt);
1411 $self->update; 1491 $self->update;
1492
1493 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text;
1496 }
1497 if (@{$self->{history} || []} > 0) {
1498 $self->{history_pointer}++;
1499 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1500 $self->{history_pointer} = @{$self->{history} || []} - 1;
1501 }
1502 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1503 }
1504
1505 } elsif ($sym == CFClient::SDLK_DOWN) {
1506 $self->{history_pointer}--;
1507 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1508
1509 if ($self->{history_pointer} >= 0) {
1510 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1511 } else {
1512 $self->set_text ($self->{history_saveback});
1513 }
1412 1514
1413 } else { 1515 } else {
1414 $self->SUPER::key_down ($ev); 1516 $self->SUPER::key_down ($ev);
1415 } 1517 }
1416 1518
… …
1430 1532
1431sub new { 1533sub new {
1432 my $class = shift; 1534 my $class = shift;
1433 1535
1434 $class->SUPER::new ( 1536 $class->SUPER::new (
1435 padding => 4, 1537 padding => 4,
1436 fg => [1, 1, 1], 1538 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1539 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1540 active_fg => [0, 0, 1],
1439 can_hover => 1, 1541 can_hover => 1,
1440 align => 0, 1542 align => 0,
1441 valign => 0, 1543 valign => 0,
1442 can_events => 1, 1544 can_events => 1,
1443 @_ 1545 @_
1444 ) 1546 )
1445} 1547}
1446 1548
… …
1605 1707
1606package CFClient::UI::VGauge; 1708package CFClient::UI::VGauge;
1607 1709
1608our @ISA = CFClient::UI::Base::; 1710our @ISA = CFClient::UI::Base::;
1609 1711
1712use List::Util qw(min max);
1713
1610use CFClient::OpenGL; 1714use CFClient::OpenGL;
1611 1715
1612my %tex = ( 1716my %tex = (
1613 food => [ 1717 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1719 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1720 ],
1617 grace => [ 1721 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1722 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1723 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1724 ],
1621 hp => [ 1725 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1726 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1727 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1728 ],
1625 mana => [ 1729 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1730 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1731 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1732 ],
1629); 1733);
1630 1734
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1735# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1736sub new {
… …
1670 1774
1671sub _draw { 1775sub _draw {
1672 my ($self) = @_; 1776 my ($self) = @_;
1673 1777
1674 my $tex = $tex{$self->{type}}; 1778 my $tex = $tex{$self->{type}};
1779 my ($t1, $t2, $t3) = @$tex;
1675 1780
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1781 my ($w, $h) = ($self->{w}, $self->{h});
1677 1782
1678 if ($self->{vertical}) { 1783 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1784 glRotate 90, 0, 0, 1;
… …
1681 1786
1682 ($w, $h) = ($h, $w); 1787 ($w, $h) = ($h, $w);
1683 } 1788 }
1684 1789
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1790 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1791
1688 my $t1 = $tex->[0]; 1792 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1793 my $ycut2 = max 0, min 1, $ycut - 1;
1794
1795 my $h1 = $self->{h} * (1 - $ycut1);
1796 my $h2 = $self->{h} * (1 - $ycut2);
1690 1797
1691 glEnable GL_BLEND; 1798 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1800 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1802
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1803 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1804 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1805 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1806 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1807 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1808 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1809 glEnd;
1706 1810
1811 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1812 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1813 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1814 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1815 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1816 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1817 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1818 glEnd;
1819
1820 if ($t3) {
1821 glBindTexture GL_TEXTURE_2D, $t3->{name};
1822 glBegin GL_QUADS;
1823 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1824 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1825 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1826 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1827 glEnd;
1828 }
1714 1829
1715 glDisable GL_BLEND; 1830 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1831 glDisable GL_TEXTURE_2D;
1717} 1832}
1718 1833
… …
1724 1839
1725sub new { 1840sub new {
1726 my ($class, %arg) = @_; 1841 my ($class, %arg) = @_;
1727 1842
1728 my $self = $class->SUPER::new ( 1843 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1844 tooltip => $arg{type},
1845 can_hover => 1,
1846 can_events => 1,
1730 %arg, 1847 %arg,
1731 ); 1848 );
1732 1849
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1850 $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, can_events => 1, can_hover => 1); 1851 $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", can_events => 1, can_hover => 1); 1852 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1853
1737 $self 1854 $self
1738} 1855}
1739 1856
1740sub set_fontsize { 1857sub set_fontsize {
… …
1906 2023
1907sub new { 2024sub new {
1908 my $class = shift; 2025 my $class = shift;
1909 2026
1910 my $self = $class->SUPER::new ( 2027 my $self = $class->SUPER::new (
1911 fontsize => 1, 2028 fontsize => 1,
2029 can_events => 0,
2030 #font => default_font
1912 @_, 2031 @_,
1913 2032
1914 layout => (new CFClient::Layout), 2033 layout => (new CFClient::Layout),
1915 par => [], 2034 par => [],
1916 height => 0, 2035 height => 0,
1917 children => [ 2036 children => [
1918 (new CFClient::UI::Empty expand => 1), 2037 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2038 (new CFClient::UI::Slider vertical => 1),
1920 ], 2039 ],
1921 ); 2040 );
1922 2041
… …
1956sub size_allocate { 2075sub size_allocate {
1957 my ($self, $w, $h) = @_; 2076 my ($self, $w, $h) = @_;
1958 2077
1959 $self->SUPER::size_allocate ($w, $h); 2078 $self->SUPER::size_allocate ($w, $h);
1960 2079
2080 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2081 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2082 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2083
1964 $self->reflow; 2084 $self->reflow;
1965} 2085}
… …
2018 2138
2019 my $y = 0; 2139 my $y = 0;
2020 2140
2021 my $layout = $self->{layout}; 2141 my $layout = $self->{layout};
2022 2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144
2023 for my $par (@{$self->{par}}) { 2145 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2146 my $h = $par->[0];
2025 2147
2026 if ($y0 < $y + $h && $y < $y1) { 2148 if ($y0 < $y + $h && $y < $y1) {
2027 $layout->set_text ($par->[2]); 2149 $layout->set_text ($par->[2]);
… …
2044 my ($self) = @_; 2166 my ($self) = @_;
2045 2167
2046 if ($self->{texture}) { 2168 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2050 glDisable GL_TEXTURE_2D; 2173 glDisable GL_TEXTURE_2D;
2051 } 2174 }
2052 2175
2053 $self->{children}[1]->draw; 2176 $self->{children}[1]->draw;
… …
2104 2227
2105sub new { 2228sub new {
2106 my $class = shift; 2229 my $class = shift;
2107 2230
2108 my $self = $class->SUPER::new ( 2231 my $self = $class->SUPER::new (
2109 state => 0, 2232 state => 0,
2110 connect_activate => \&toggle_flopper, 2233 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2234 @_
2113 ); 2235 );
2114 2236
2115 if ($self->{state}) { 2237 if ($self->{state}) {
2116 $self->{state} = 0; 2238 $self->{state} = 0;
… …
2151 @_, 2273 @_,
2152 can_events => 0, 2274 can_events => 0,
2153 ) 2275 )
2154} 2276}
2155 2277
2156sub set_text { 2278sub set_markup {
2157 my ($self, $text) = @_; 2279 my ($self, $text) = @_;
2158 2280
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2160 $self->{label}->set_text ($text); 2282 $self->{label}->set_markup ($text);
2161 $self->add ($self->{label}); 2283 $self->add ($self->{label});
2162} 2284}
2163 2285
2164sub size_request { 2286sub size_request {
2165 my ($self) = @_; 2287 my ($self) = @_;
2166 2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2292
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2293 ($w + 4, $h + 4)
2294}
2295
2296sub size_allocate {
2297 my ($self, $w, $h) = @_;
2298
2299 $self->SUPER::size_allocate ($w - 4, $h - 4);
2173} 2300}
2174 2301
2175sub _draw { 2302sub _draw {
2176 my ($self) = @_; 2303 my ($self) = @_;
2177 2304
… …
2202 $self->SUPER::_draw; 2329 $self->SUPER::_draw;
2203} 2330}
2204 2331
2205############################################################################# 2332#############################################################################
2206 2333
2334package CFClient::UI::Face;
2335
2336our @ISA = CFClient::UI::Base::;
2337
2338use CFClient::OpenGL;
2339
2340sub new {
2341 my $class = shift;
2342
2343 $class->SUPER::new (
2344 aspect => 1,
2345 @_,
2346 )
2347}
2348
2349sub size_request {
2350 (32, 8)
2351}
2352
2353sub draw {
2354 my ($self) = @_;
2355
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357
2358 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 }
2368}
2369
2370#############################################################################
2371
2207package CFClient::UI::Root; 2372package CFClient::UI::Root;
2208 2373
2209our @ISA = CFClient::UI::Container::; 2374our @ISA = CFClient::UI::Container::;
2210 2375
2211use CFClient::OpenGL; 2376use CFClient::OpenGL;

Diff Legend

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