ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.173 by root, Tue Apr 25 10:30:48 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
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252}
253
254sub set_max_size {
255 my ($self, $w, $h) = @_;
256
257 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h;
259}
260
216# return top left coordinates 261# return top left coordinates
217sub _topleft { 262sub _topleft {
218 my ($self, $x, $y) = @_; 263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
219 267
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
221} 269}
222 270
223# translate global coordinates to local coordinate system 271# translate global coordinates to local coordinate system
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 349 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 350 glVertex $x , $y + $self->{h};
303 glEnd; 351 glEnd;
304 glDisable GL_BLEND; 352 glDisable GL_BLEND;
305 } 353 }
354
355 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix;
357 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0;
361 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h};
364 glEnd;
365 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 }
306} 368}
307 369
308sub _draw { 370sub _draw {
309 my ($self) = @_; 371 my ($self) = @_;
310 372
… …
330} 392}
331 393
332sub check_size { 394sub check_size {
333 my ($self) = @_; 395 my ($self) = @_;
334 396
335 return unless $self->{parent}; 397 $self->{parent}
398 or return 1;
336 399
337 my ($w, $h) = $self->size_request; 400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
338 403
339 if ($w != $self->{req_w} || $h != $self->{req_h}) { 404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w; 405 $self->{req_w} = $w;
341 $self->{req_h} = $h; 406 $self->{req_h} = $h;
342 407
343 $self->{parent}->check_size; 408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
344 } 417 }
345} 418}
346 419
347sub update { 420sub update {
348 my ($self) = @_; 421 my ($self) = @_;
… …
358} 431}
359 432
360sub emit { 433sub emit {
361 my ($self, $signal, @args) = @_; 434 my ($self, $signal, @args) = @_;
362 435
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 437}
367 438
368sub DESTROY { 439sub DESTROY {
369 my ($self) = @_; 440 my ($self) = @_;
370 441
… …
437sub new { 508sub new {
438 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
439 510
440 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
441 512
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
443 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
444 519
445 $self 520 $self
446} 521}
447 522
… …
458 ]; 533 ];
459 534
460 $child->check_size; 535 $child->check_size;
461} 536}
462 537
538sub children {
539 @{ $_[0]{children} }
540}
541
463sub remove { 542sub remove {
464 my ($self, $child) = @_; 543 my ($self, $child) = @_;
465 544
466 delete $child->{parent}; 545 delete $child->{parent};
546 $child->hide;
467 547
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
469 549
470 $self->check_size; 550 $self->check_size;
471 $self->update; 551 $self->update;
552}
553
554sub clear {
555 my ($self) = @_;
556
557 my $children = delete $self->{children};
558 $self->{children} = [];
559
560 for (@$children) {
561 delete $_->{parent};
562 $_->hide;
563 }
472} 564}
473 565
474sub find_widget { 566sub find_widget {
475 my ($self, $x, $y) = @_; 567 my ($self, $x, $y) = @_;
476 568
… …
636 border => 0.8, 728 border => 0.8,
637 @_ 729 @_
638 ); 730 );
639 731
640 $self 732 $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} 733}
661 734
662sub _draw { 735sub _draw {
663 my ($self) = @_; 736 my ($self) = @_;
664 737
… …
699 my $class = shift; 772 my $class = shift;
700 773
701 # TODO: user_x, user_y, overwrite moveto? 774 # TODO: user_x, user_y, overwrite moveto?
702 775
703 my $self = $class->SUPER::new ( 776 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 777 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 778 border_bg => [1, 1, 1, 1],
706 border => 0.8, 779 border => 0.8,
707 can_events => 1, 780 can_events => 1,
708 @_ 781 @_
709 ); 782 );
710 783
711 $self->{title} &&= new CFClient::UI::Label 784 $self->{title} &&= new CFClient::UI::Label
… …
722} 795}
723 796
724sub size_request { 797sub size_request {
725 my ($self) = @_; 798 my ($self) = @_;
726 799
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728
729 my ($w, $h) = $self->SUPER::size_request; 800 my ($w, $h) = $self->SUPER::size_request;
730 801
731 ( 802 (
732 $w + $self->border * 2, 803 $w + $self->border * 2,
733 $h + $self->border * 2, 804 $h + $self->border * 2,
… …
861 $self->{children}[$y][$x] = $child; 932 $self->{children}[$y][$x] = $child;
862 933
863 $child->check_size; 934 $child->check_size;
864} 935}
865 936
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
866# TODO: move to container class maybe? send childs a signal on removal? 941# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 942sub clear {
868 my ($self) = @_; 943 my ($self) = @_;
869 944
945 my @children = $self->children;
870 delete $self->{children}; 946 delete $self->{children};
947
948 for (@children) {
949 delete $_->{parent};
950 $_->hide;
951 }
952
871 $self->update; 953 $self->update;
872} 954}
873 955
874sub get_wh { 956sub get_wh {
875 my ($self) = @_; 957 my ($self) = @_;
… …
1098 1180
1099sub new { 1181sub new {
1100 my ($class, %arg) = @_; 1182 my ($class, %arg) = @_;
1101 1183
1102 my $self = $class->SUPER::new ( 1184 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1185 fg => [1, 1, 1],
1186 #font => default_font
1104 fontsize => 1, 1187 fontsize => 1,
1105 text => "", 1188 text => "",
1106 align => -1, 1189 align => -1,
1107 valign => -1, 1190 valign => -1,
1108 padding => 2, 1191 padding => 2,
1109 layout => new CFClient::Layout, 1192 layout => new CFClient::Layout,
1110 can_events => 0, 1193 can_events => 0,
1111 %arg 1194 %arg
1112 ); 1195 );
1113 1196
1114 if (exists $self->{template}) { 1197 if (exists $self->{template}) {
… …
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1122 1205
1123 $self 1206 $self
1124} 1207}
1125 1208
1126sub escape_text { 1209sub escape {
1127 local $_ = $_[1]; 1210 local $_ = $_[1];
1128 1211
1129 s/&/&amp;/g; 1212 s/&/&amp;/g;
1130 s/>/&gt;/g; 1213 s/>/&gt;/g;
1131 s/</&lt;/g; 1214 s/</&lt;/g;
1132 1215
1133 $_[1] 1216 $_[1]
1134} 1217}
1135 1218
1219sub update {
1220 my ($self) = @_;
1221
1222 delete $self->{texture};
1223 $self->SUPER::update;
1224}
1225
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1136sub set_text { 1232sub set_text {
1137 my ($self, $text) = @_; 1233 my ($self, $text) = @_;
1138 1234
1235 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text";
1237
1139 $self->{layout}->set_text ($text); 1238 $self->{layout}->set_text ($text);
1140 1239
1141 delete $self->{texture}; 1240 delete $self->{texture};
1241 $self->update;
1142 $self->check_size; 1242 $self->check_size;
1143 $self->update;
1144} 1243}
1145 1244
1146sub set_markup { 1245sub set_markup {
1147 my ($self, $markup) = @_; 1246 my ($self, $markup) = @_;
1148 1247
1248 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup";
1250
1149 $self->{layout}->set_markup ($markup); 1251 $self->{layout}->set_markup ($markup);
1150 1252
1151 delete $self->{texture}; 1253 delete $self->{texture};
1254 $self->update;
1152 $self->check_size; 1255 $self->check_size;
1153 $self->update;
1154} 1256}
1155 1257
1156sub size_request { 1258sub size_request {
1157 my ($self) = @_; 1259 my ($self) = @_;
1158 1260
1159 $self->{layout}->set_width; 1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1264
1162 my ($w, $h) = $self->{layout}->size; 1265 my ($w, $h) = $self->{layout}->size;
1163 1266
1164 if (exists $self->{template}) { 1267 if (exists $self->{template}) {
1268 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1269 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1270
1167 my ($w2, $h2) = $self->{template}->size; 1271 my ($w2, $h2) = $self->{template}->size;
1168 1272
1169 $w = List::Util::max $w, $w2; 1273 $w = List::Util::max $w, $w2;
… …
1193 1297
1194sub _draw { 1298sub _draw {
1195 my ($self) = @_; 1299 my ($self) = @_;
1196 1300
1197 my $tex = $self->{texture} ||= do { 1301 my $tex = $self->{texture} ||= do {
1302 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1303 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1200 new_from_layout CFClient::Texture $self->{layout} 1305 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1306 };
1202 1307
… …
1235 1340
1236sub new { 1341sub new {
1237 my $class = shift; 1342 my $class = shift;
1238 1343
1239 $class->SUPER::new ( 1344 $class->SUPER::new (
1240 fg => [1, 1, 1], 1345 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1346 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1347 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1348 active_fg => [0, 0, 0],
1244 can_hover => 1, 1349 can_hover => 1,
1245 can_focus => 1, 1350 can_focus => 1,
1246 valign => 0, 1351 valign => 0,
1247 can_events => 1, 1352 can_events => 1,
1248 @_ 1353 @_
1249 ) 1354 )
1250} 1355}
1251 1356
… …
1405 my ($self, $ev) = @_; 1510 my ($self, $ev) = @_;
1406 1511
1407 my $sym = $ev->{sym}; 1512 my $sym = $ev->{sym};
1408 1513
1409 if ($sym == 13) { 1514 if ($sym == 13) {
1515 unshift @{$self->{history}},
1516 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1519 $self->emit (activate => $txt);
1411 $self->update; 1520 $self->update;
1521
1522 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text;
1525 }
1526 if (@{$self->{history} || []} > 0) {
1527 $self->{history_pointer}++;
1528 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1529 $self->{history_pointer} = @{$self->{history} || []} - 1;
1530 }
1531 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1532 }
1533
1534 } elsif ($sym == CFClient::SDLK_DOWN) {
1535 $self->{history_pointer}--;
1536 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1537
1538 if ($self->{history_pointer} >= 0) {
1539 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1540 } else {
1541 $self->set_text ($self->{history_saveback});
1542 }
1412 1543
1413 } else { 1544 } else {
1414 $self->SUPER::key_down ($ev); 1545 $self->SUPER::key_down ($ev);
1415 } 1546 }
1416 1547
… …
1430 1561
1431sub new { 1562sub new {
1432 my $class = shift; 1563 my $class = shift;
1433 1564
1434 $class->SUPER::new ( 1565 $class->SUPER::new (
1435 padding => 4, 1566 padding => 4,
1436 fg => [1, 1, 1], 1567 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1568 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1569 active_fg => [0, 0, 1],
1439 can_hover => 1, 1570 can_hover => 1,
1440 align => 0, 1571 align => 0,
1441 valign => 0, 1572 valign => 0,
1442 can_events => 1, 1573 can_events => 1,
1443 @_ 1574 @_
1444 ) 1575 )
1445} 1576}
1446 1577
… …
1605 1736
1606package CFClient::UI::VGauge; 1737package CFClient::UI::VGauge;
1607 1738
1608our @ISA = CFClient::UI::Base::; 1739our @ISA = CFClient::UI::Base::;
1609 1740
1741use List::Util qw(min max);
1742
1610use CFClient::OpenGL; 1743use CFClient::OpenGL;
1611 1744
1612my %tex = ( 1745my %tex = (
1613 food => [ 1746 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1749 ],
1617 grace => [ 1750 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1752 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1753 ],
1621 hp => [ 1754 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1757 ],
1625 mana => [ 1758 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1760 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1761 ],
1629); 1762);
1630 1763
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1764# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1765sub new {
… …
1651} 1784}
1652 1785
1653sub set_max { 1786sub set_max {
1654 my ($self, $max) = @_; 1787 my ($self, $max) = @_;
1655 1788
1789 return if $self->{max_val} == $max;
1790
1656 $self->{max_val} = $max; 1791 $self->{max_val} = $max;
1792 $self->update;
1657} 1793}
1658 1794
1659sub set_value { 1795sub set_value {
1660 my ($self, $val, $max) = @_; 1796 my ($self, $val, $max) = @_;
1661 1797
1662 $self->set_max ($max) 1798 $self->set_max ($max)
1663 if defined $max; 1799 if defined $max;
1664 1800
1665 $max = $self->{max_val}; 1801 return if $self->{val} == $val;
1802
1666 $self->{val} = $val; 1803 $self->{val} = $val;
1667
1668 $self->update; 1804 $self->update;
1669} 1805}
1670 1806
1671sub _draw { 1807sub _draw {
1672 my ($self) = @_; 1808 my ($self) = @_;
1673 1809
1674 my $tex = $tex{$self->{type}}; 1810 my $tex = $tex{$self->{type}};
1811 my ($t1, $t2, $t3) = @$tex;
1675 1812
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1813 my ($w, $h) = ($self->{w}, $self->{h});
1677 1814
1678 if ($self->{vertical}) { 1815 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1816 glRotate 90, 0, 0, 1;
… …
1681 1818
1682 ($w, $h) = ($h, $w); 1819 ($w, $h) = ($h, $w);
1683 } 1820 }
1684 1821
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1822 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1823
1688 my $t1 = $tex->[0]; 1824 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1825 my $ycut2 = max 0, min 1, $ycut - 1;
1826
1827 my $h1 = $self->{h} * (1 - $ycut1);
1828 my $h2 = $self->{h} * (1 - $ycut2);
1690 1829
1691 glEnable GL_BLEND; 1830 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1834
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1835 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1836 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1837 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1838 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1839 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1840 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1841 glEnd;
1706 1842
1843 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1844 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1845 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1846 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1847 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1848 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1849 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1850 glEnd;
1851
1852 if ($t3) {
1853 glBindTexture GL_TEXTURE_2D, $t3->{name};
1854 glBegin GL_QUADS;
1855 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1856 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1857 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1858 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1859 glEnd;
1860 }
1714 1861
1715 glDisable GL_BLEND; 1862 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1863 glDisable GL_TEXTURE_2D;
1717} 1864}
1718 1865
… …
1724 1871
1725sub new { 1872sub new {
1726 my ($class, %arg) = @_; 1873 my ($class, %arg) = @_;
1727 1874
1728 my $self = $class->SUPER::new ( 1875 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1876 tooltip => $arg{type},
1877 can_hover => 1,
1878 can_events => 1,
1730 %arg, 1879 %arg,
1731 ); 1880 );
1732 1881
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1882 $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); 1883 $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"); 1884 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1885
1737 $self 1886 $self
1738} 1887}
1739 1888
… …
1742 1891
1743 $self->{value}->set_fontsize ($fsize); 1892 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 1893 $self->{max} ->set_fontsize ($fsize);
1745} 1894}
1746 1895
1896sub set_max {
1897 my ($self, $max) = @_;
1898
1899 $self->{gauge}->set_max ($max);
1900 $self->{max}->set_text ($max);
1901}
1902
1747sub set_value { 1903sub set_value {
1748 my ($self, $val, $max) = @_; 1904 my ($self, $val, $max) = @_;
1749 1905
1750 $self->set_max ($max) 1906 $self->set_max ($max)
1751 if defined $max; 1907 if defined $max;
1752 1908
1753 $self->{gauge}->set_value ($val, $max); 1909 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 1910 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 1911}
1763 1912
1764############################################################################# 1913#############################################################################
1765 1914
1766package CFClient::UI::Slider; 1915package CFClient::UI::Slider;
… …
1906 2055
1907sub new { 2056sub new {
1908 my $class = shift; 2057 my $class = shift;
1909 2058
1910 my $self = $class->SUPER::new ( 2059 my $self = $class->SUPER::new (
1911 fontsize => 1, 2060 fontsize => 1,
2061 can_events => 0,
2062 #font => default_font
1912 @_, 2063 @_,
1913 2064
1914 layout => (new CFClient::Layout), 2065 layout => (new CFClient::Layout),
1915 par => [], 2066 par => [],
1916 height => 0, 2067 height => 0,
1917 children => [ 2068 children => [
1918 (new CFClient::UI::Empty expand => 1), 2069 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2070 (new CFClient::UI::Slider vertical => 1),
1920 ], 2071 ],
1921 ); 2072 );
1922 2073
… …
1956sub size_allocate { 2107sub size_allocate {
1957 my ($self, $w, $h) = @_; 2108 my ($self, $w, $h) = @_;
1958 2109
1959 $self->SUPER::size_allocate ($w, $h); 2110 $self->SUPER::size_allocate ($w, $h);
1960 2111
2112 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2114 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2115
1964 $self->reflow; 2116 $self->reflow;
1965} 2117}
… …
2018 2170
2019 my $y = 0; 2171 my $y = 0;
2020 2172
2021 my $layout = $self->{layout}; 2173 my $layout = $self->{layout};
2022 2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176
2023 for my $par (@{$self->{par}}) { 2177 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2178 my $h = $par->[0];
2025 2179
2026 if ($y0 < $y + $h && $y < $y1) { 2180 if ($y0 < $y + $h && $y < $y1) {
2027 $layout->set_text ($par->[2]); 2181 $layout->set_text ($par->[2]);
… …
2044 my ($self) = @_; 2198 my ($self) = @_;
2045 2199
2046 if ($self->{texture}) { 2200 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2201 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2050 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
2051 } 2206 }
2052 2207
2053 $self->{children}[1]->draw; 2208 $self->{children}[1]->draw;
… …
2104 2259
2105sub new { 2260sub new {
2106 my $class = shift; 2261 my $class = shift;
2107 2262
2108 my $self = $class->SUPER::new ( 2263 my $self = $class->SUPER::new (
2109 state => 0, 2264 state => 0,
2110 connect_activate => \&toggle_flopper, 2265 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2266 @_
2113 ); 2267 );
2114 2268
2115 if ($self->{state}) { 2269 if ($self->{state}) {
2116 $self->{state} = 0; 2270 $self->{state} = 0;
… …
2151 @_, 2305 @_,
2152 can_events => 0, 2306 can_events => 0,
2153 ) 2307 )
2154} 2308}
2155 2309
2156sub set_text { 2310sub set_markup {
2157 my ($self, $text) = @_; 2311 my ($self, $text) = @_;
2158 2312
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2160 $self->{label}->set_text ($text); 2314 $self->{label}->set_markup ($text);
2161 $self->add ($self->{label}); 2315 $self->add ($self->{label});
2162} 2316}
2163 2317
2164sub size_request { 2318sub size_request {
2165 my ($self) = @_; 2319 my ($self) = @_;
2166 2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2324
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2325 ($w + 4, $h + 4)
2326}
2327
2328sub size_allocate {
2329 my ($self, $w, $h) = @_;
2330
2331 $self->SUPER::size_allocate ($w - 4, $h - 4);
2173} 2332}
2174 2333
2175sub _draw { 2334sub _draw {
2176 my ($self) = @_; 2335 my ($self) = @_;
2177 2336
… …
2202 $self->SUPER::_draw; 2361 $self->SUPER::_draw;
2203} 2362}
2204 2363
2205############################################################################# 2364#############################################################################
2206 2365
2366package CFClient::UI::Face;
2367
2368our @ISA = CFClient::UI::Base::;
2369
2370use CFClient::OpenGL;
2371
2372sub new {
2373 my $class = shift;
2374
2375 $class->SUPER::new (
2376 aspect => 1,
2377 @_,
2378 )
2379}
2380
2381sub size_request {
2382 (32, 8)
2383}
2384
2385sub draw {
2386 my ($self) = @_;
2387
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389
2390 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 }
2400}
2401
2402#############################################################################
2403
2207package CFClient::UI::Root; 2404package CFClient::UI::Root;
2208 2405
2209our @ISA = CFClient::UI::Container::; 2406our @ISA = CFClient::UI::Container::;
2210 2407
2211use CFClient::OpenGL; 2408use CFClient::OpenGL;

Diff Legend

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