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.152 by root, Sun Apr 23 01:05:03 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
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 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
211# return top left coordinates 261# return top left coordinates
212sub _topleft { 262sub _topleft {
213 my ($self, $x, $y) = @_; 263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
214 267
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
216} 269}
217 270
218# translate global coordinates to local coordinate system 271# translate global coordinates to local coordinate system
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 349 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 350 glVertex $x , $y + $self->{h};
298 glEnd; 351 glEnd;
299 glDisable GL_BLEND; 352 glDisable GL_BLEND;
300 } 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 }
301} 368}
302 369
303sub _draw { 370sub _draw {
304 my ($self) = @_; 371 my ($self) = @_;
305 372
… …
325} 392}
326 393
327sub check_size { 394sub check_size {
328 my ($self) = @_; 395 my ($self) = @_;
329 396
330 return unless $self->{parent}; 397 $self->{parent}
398 or return 1;
331 399
332 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;
333 403
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w; 405 $self->{req_w} = $w;
336 $self->{req_h} = $h; 406 $self->{req_h} = $h;
337 407
338 $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
339 } 417 }
340} 418}
341 419
342sub update { 420sub update {
343 my ($self) = @_; 421 my ($self) = @_;
… …
353} 431}
354 432
355sub emit { 433sub emit {
356 my ($self, $signal, @args) = @_; 434 my ($self, $signal, @args) = @_;
357 435
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 437}
362 438
363sub DESTROY { 439sub DESTROY {
364 my ($self) = @_; 440 my ($self) = @_;
365 441
… …
432sub new { 508sub new {
433 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
434 510
435 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
436 512
437 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 );
438 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
439 519
440 $self 520 $self
441} 521}
442 522
… …
453 ]; 533 ];
454 534
455 $child->check_size; 535 $child->check_size;
456} 536}
457 537
538sub children {
539 @{ $_[0]{children} }
540}
541
458sub remove { 542sub remove {
459 my ($self, $child) = @_; 543 my ($self, $child) = @_;
460 544
461 delete $child->{parent}; 545 delete $child->{parent};
546 $child->hide;
462 547
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
464 549
465 $self->check_size; 550 $self->check_size;
466 $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 }
467} 564}
468 565
469sub find_widget { 566sub find_widget {
470 my ($self, $x, $y) = @_; 567 my ($self, $x, $y) = @_;
471 568
… …
631 border => 0.8, 728 border => 0.8,
632 @_ 729 @_
633 ); 730 );
634 731
635 $self 732 $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} 733}
656 734
657sub _draw { 735sub _draw {
658 my ($self) = @_; 736 my ($self) = @_;
659 737
… …
694 my $class = shift; 772 my $class = shift;
695 773
696 # TODO: user_x, user_y, overwrite moveto? 774 # TODO: user_x, user_y, overwrite moveto?
697 775
698 my $self = $class->SUPER::new ( 776 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 777 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 778 border_bg => [1, 1, 1, 1],
701 border => 0.8, 779 border => 0.8,
702 can_events => 1, 780 can_events => 1,
703 @_ 781 @_
704 ); 782 );
705 783
706 $self->{title} &&= new CFClient::UI::Label 784 $self->{title} &&= new CFClient::UI::Label
… …
717} 795}
718 796
719sub size_request { 797sub size_request {
720 my ($self) = @_; 798 my ($self) = @_;
721 799
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723
724 my ($w, $h) = $self->SUPER::size_request; 800 my ($w, $h) = $self->SUPER::size_request;
725 801
726 ( 802 (
727 $w + $self->border * 2, 803 $w + $self->border * 2,
728 $h + $self->border * 2, 804 $h + $self->border * 2,
… …
856 $self->{children}[$y][$x] = $child; 932 $self->{children}[$y][$x] = $child;
857 933
858 $child->check_size; 934 $child->check_size;
859} 935}
860 936
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
861# 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?
862sub clear { 942sub clear {
863 my ($self) = @_; 943 my ($self) = @_;
864 944
945 my @children = $self->children;
865 delete $self->{children}; 946 delete $self->{children};
947
948 for (@children) {
949 delete $_->{parent};
950 $_->hide;
951 }
952
866 $self->update; 953 $self->update;
867} 954}
868 955
869sub get_wh { 956sub get_wh {
870 my ($self) = @_; 957 my ($self) = @_;
… …
1093 1180
1094sub new { 1181sub new {
1095 my ($class, %arg) = @_; 1182 my ($class, %arg) = @_;
1096 1183
1097 my $self = $class->SUPER::new ( 1184 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1185 fg => [1, 1, 1],
1186 #font => default_font
1099 fontsize => 1, 1187 fontsize => 1,
1100 text => "", 1188 text => "",
1101 align => -1, 1189 align => -1,
1102 valign => -1, 1190 valign => -1,
1103 padding => 2, 1191 padding => 2,
1104 layout => new CFClient::Layout, 1192 layout => new CFClient::Layout,
1105 can_events => 0, 1193 can_events => 0,
1106 %arg 1194 %arg
1107 ); 1195 );
1108 1196
1109 if (exists $self->{template}) { 1197 if (exists $self->{template}) {
… …
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1117 1205
1118 $self 1206 $self
1119} 1207}
1120 1208
1121sub escape_text { 1209sub escape {
1122 local $_ = $_[1]; 1210 local $_ = $_[1];
1123 1211
1124 s/&/&amp;/g; 1212 s/&/&amp;/g;
1125 s/>/&gt;/g; 1213 s/>/&gt;/g;
1126 s/</&lt;/g; 1214 s/</&lt;/g;
1127 1215
1128 $_[1] 1216 $_[1]
1129} 1217}
1130 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
1131sub set_text { 1232sub set_text {
1132 my ($self, $text) = @_; 1233 my ($self, $text) = @_;
1133 1234
1235 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text";
1237
1134 $self->{layout}->set_text ($text); 1238 $self->{layout}->set_text ($text);
1135 1239
1136 delete $self->{texture}; 1240 delete $self->{texture};
1241 $self->update;
1137 $self->check_size; 1242 $self->check_size;
1138 $self->update;
1139} 1243}
1140 1244
1141sub set_markup { 1245sub set_markup {
1142 my ($self, $markup) = @_; 1246 my ($self, $markup) = @_;
1143 1247
1248 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup";
1250
1144 $self->{layout}->set_markup ($markup); 1251 $self->{layout}->set_markup ($markup);
1145 1252
1146 delete $self->{texture}; 1253 delete $self->{texture};
1254 $self->update;
1147 $self->check_size; 1255 $self->check_size;
1148 $self->update;
1149} 1256}
1150 1257
1151sub size_request { 1258sub size_request {
1152 my ($self) = @_; 1259 my ($self) = @_;
1153 1260
1154 $self->{layout}->set_width; 1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1264
1157 my ($w, $h) = $self->{layout}->size; 1265 my ($w, $h) = $self->{layout}->size;
1158 1266
1159 if (exists $self->{template}) { 1267 if (exists $self->{template}) {
1268 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1269 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1270
1162 my ($w2, $h2) = $self->{template}->size; 1271 my ($w2, $h2) = $self->{template}->size;
1163 1272
1164 $w = List::Util::max $w, $w2; 1273 $w = List::Util::max $w, $w2;
… …
1188 1297
1189sub _draw { 1298sub _draw {
1190 my ($self) = @_; 1299 my ($self) = @_;
1191 1300
1192 my $tex = $self->{texture} ||= do { 1301 my $tex = $self->{texture} ||= do {
1302 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1303 $self->{layout}->set_width ($self->{w});
1194 $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);
1195 new_from_layout CFClient::Texture $self->{layout} 1305 new_from_layout CFClient::Texture $self->{layout}
1196 }; 1306 };
1197 1307
… …
1230 1340
1231sub new { 1341sub new {
1232 my $class = shift; 1342 my $class = shift;
1233 1343
1234 $class->SUPER::new ( 1344 $class->SUPER::new (
1235 fg => [1, 1, 1], 1345 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1346 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1347 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1348 active_fg => [0, 0, 0],
1239 can_hover => 1, 1349 can_hover => 1,
1240 can_focus => 1, 1350 can_focus => 1,
1241 valign => 0, 1351 valign => 0,
1242 can_events => 1, 1352 can_events => 1,
1243 @_ 1353 @_
1244 ) 1354 )
1245} 1355}
1246 1356
… …
1400 my ($self, $ev) = @_; 1510 my ($self, $ev) = @_;
1401 1511
1402 my $sym = $ev->{sym}; 1512 my $sym = $ev->{sym};
1403 1513
1404 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} = '';
1405 $self->emit (activate => $self->get_text); 1519 $self->emit (activate => $txt);
1406 $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 }
1407 1543
1408 } else { 1544 } else {
1409 $self->SUPER::key_down ($ev); 1545 $self->SUPER::key_down ($ev);
1410 } 1546 }
1411 1547
… …
1425 1561
1426sub new { 1562sub new {
1427 my $class = shift; 1563 my $class = shift;
1428 1564
1429 $class->SUPER::new ( 1565 $class->SUPER::new (
1430 padding => 4, 1566 padding => 4,
1431 fg => [1, 1, 1], 1567 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2], 1568 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1569 active_fg => [0, 0, 1],
1434 can_hover => 1, 1570 can_hover => 1,
1435 align => 0, 1571 align => 0,
1436 valign => 0, 1572 valign => 0,
1437 can_events => 1, 1573 can_events => 1,
1438 @_ 1574 @_
1439 ) 1575 )
1440} 1576}
1441 1577
… …
1600 1736
1601package CFClient::UI::VGauge; 1737package CFClient::UI::VGauge;
1602 1738
1603our @ISA = CFClient::UI::Base::; 1739our @ISA = CFClient::UI::Base::;
1604 1740
1741use List::Util qw(min max);
1742
1605use CFClient::OpenGL; 1743use CFClient::OpenGL;
1606 1744
1607my %tex = ( 1745my %tex = (
1608 food => [ 1746 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1749 ],
1612 grace => [ 1750 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 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/
1615 ], 1753 ],
1616 hp => [ 1754 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1757 ],
1620 mana => [ 1758 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 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/
1623 ], 1761 ],
1624); 1762);
1625 1763
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1764# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1765sub new {
… …
1646} 1784}
1647 1785
1648sub set_max { 1786sub set_max {
1649 my ($self, $max) = @_; 1787 my ($self, $max) = @_;
1650 1788
1789 return if $self->{max_val} == $max;
1790
1651 $self->{max_val} = $max; 1791 $self->{max_val} = $max;
1792 $self->update;
1652} 1793}
1653 1794
1654sub set_value { 1795sub set_value {
1655 my ($self, $val, $max) = @_; 1796 my ($self, $val, $max) = @_;
1656 1797
1657 $self->set_max ($max) 1798 $self->set_max ($max)
1658 if defined $max; 1799 if defined $max;
1659 1800
1660 $max = $self->{max_val}; 1801 return if $self->{val} == $val;
1802
1661 $self->{val} = $val; 1803 $self->{val} = $val;
1662
1663 $self->update; 1804 $self->update;
1664} 1805}
1665 1806
1666sub _draw { 1807sub _draw {
1667 my ($self) = @_; 1808 my ($self) = @_;
1668 1809
1669 my $tex = $tex{$self->{type}}; 1810 my $tex = $tex{$self->{type}};
1811 my ($t1, $t2, $t3) = @$tex;
1670 1812
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1813 my ($w, $h) = ($self->{w}, $self->{h});
1672 1814
1673 if ($self->{vertical}) { 1815 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1816 glRotate 90, 0, 0, 1;
… …
1676 1818
1677 ($w, $h) = ($h, $w); 1819 ($w, $h) = ($h, $w);
1678 } 1820 }
1679 1821
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1822 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1823
1683 my $t1 = $tex->[0]; 1824 my $ycut1 = max 0, min 1, $ycut;
1684 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);
1685 1829
1686 glEnable GL_BLEND; 1830 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1834
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1835 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1836 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1837 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1838 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1839 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1840 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1841 glEnd;
1701 1842
1843 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1844 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1845 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1846 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1847 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1848 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1849 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 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 }
1709 1861
1710 glDisable GL_BLEND; 1862 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1863 glDisable GL_TEXTURE_2D;
1712} 1864}
1713 1865
… …
1719 1871
1720sub new { 1872sub new {
1721 my ($class, %arg) = @_; 1873 my ($class, %arg) = @_;
1722 1874
1723 my $self = $class->SUPER::new ( 1875 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 1876 tooltip => $arg{type},
1877 can_hover => 1,
1878 can_events => 1,
1725 %arg, 1879 %arg,
1726 ); 1880 );
1727 1881
1728 $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");
1729 $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);
1730 $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");
1731 1885
1732 $self 1886 $self
1733} 1887}
1734 1888
… …
1737 1891
1738 $self->{value}->set_fontsize ($fsize); 1892 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 1893 $self->{max} ->set_fontsize ($fsize);
1740} 1894}
1741 1895
1896sub set_max {
1897 my ($self, $max) = @_;
1898
1899 $self->{gauge}->set_max ($max);
1900 $self->{max}->set_text ($max);
1901}
1902
1742sub set_value { 1903sub set_value {
1743 my ($self, $val, $max) = @_; 1904 my ($self, $val, $max) = @_;
1744 1905
1745 $self->set_max ($max) 1906 $self->set_max ($max)
1746 if defined $max; 1907 if defined $max;
1747 1908
1748 $self->{gauge}->set_value ($val, $max); 1909 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 1910 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 1911}
1758 1912
1759############################################################################# 1913#############################################################################
1760 1914
1761package CFClient::UI::Slider; 1915package CFClient::UI::Slider;
… …
1901 2055
1902sub new { 2056sub new {
1903 my $class = shift; 2057 my $class = shift;
1904 2058
1905 my $self = $class->SUPER::new ( 2059 my $self = $class->SUPER::new (
1906 fontsize => 1, 2060 fontsize => 1,
2061 can_events => 0,
2062 #font => default_font
1907 @_, 2063 @_,
1908 2064
1909 layout => (new CFClient::Layout), 2065 layout => (new CFClient::Layout),
1910 par => [], 2066 par => [],
1911 height => 0, 2067 height => 0,
1912 children => [ 2068 children => [
1913 (new CFClient::UI::Empty expand => 1), 2069 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2070 (new CFClient::UI::Slider vertical => 1),
1915 ], 2071 ],
1916 ); 2072 );
1917 2073
… …
1951sub size_allocate { 2107sub size_allocate {
1952 my ($self, $w, $h) = @_; 2108 my ($self, $w, $h) = @_;
1953 2109
1954 $self->SUPER::size_allocate ($w, $h); 2110 $self->SUPER::size_allocate ($w, $h);
1955 2111
2112 $self->{layout}->set_font ($self->{font}) if $self->{font};
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1957 $self->{layout}->set_width ($self->{children}[0]{w}); 2114 $self->{layout}->set_width ($self->{children}[0]{w});
1958 2115
1959 $self->reflow; 2116 $self->reflow;
1960} 2117}
… …
2013 2170
2014 my $y = 0; 2171 my $y = 0;
2015 2172
2016 my $layout = $self->{layout}; 2173 my $layout = $self->{layout};
2017 2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176
2018 for my $par (@{$self->{par}}) { 2177 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2178 my $h = $par->[0];
2020 2179
2021 if ($y0 < $y + $h && $y < $y1) { 2180 if ($y0 < $y + $h && $y < $y1) {
2022 $layout->set_text ($par->[2]); 2181 $layout->set_text ($par->[2]);
… …
2039 my ($self) = @_; 2198 my ($self) = @_;
2040 2199
2041 if ($self->{texture}) { 2200 if ($self->{texture}) {
2042 glEnable GL_TEXTURE_2D; 2201 glEnable GL_TEXTURE_2D;
2043 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;
2044 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2045 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
2046 } 2206 }
2047 2207
2048 $self->{children}[1]->draw; 2208 $self->{children}[1]->draw;
… …
2099 2259
2100sub new { 2260sub new {
2101 my $class = shift; 2261 my $class = shift;
2102 2262
2103 my $self = $class->SUPER::new ( 2263 my $self = $class->SUPER::new (
2104 state => 0, 2264 state => 0,
2105 connect_activate => \&toggle_flopper, 2265 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2266 @_
2108 ); 2267 );
2109 2268
2110 if ($self->{state}) { 2269 if ($self->{state}) {
2111 $self->{state} = 0; 2270 $self->{state} = 0;
… …
2131 $self->emit (changed => $self->{state}); 2290 $self->emit (changed => $self->{state});
2132} 2291}
2133 2292
2134############################################################################# 2293#############################################################################
2135 2294
2295package CFClient::UI::Tooltip;
2296
2297our @ISA = CFClient::UI::Bin::;
2298
2299use CFClient::OpenGL;
2300
2301sub new {
2302 my $class = shift;
2303
2304 $class->SUPER::new (
2305 @_,
2306 can_events => 0,
2307 )
2308}
2309
2310sub set_markup {
2311 my ($self, $text) = @_;
2312
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2314 $self->{label}->set_markup ($text);
2315 $self->add ($self->{label});
2316}
2317
2318sub size_request {
2319 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324
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);
2332}
2333
2334sub _draw {
2335 my ($self) = @_;
2336
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375;
2339
2340 my ($w, $h) = @$self{qw(w h)};
2341
2342 glColor 1, 0.8, 0.4;
2343 glBegin GL_QUADS;
2344 glVertex 0 , 0;
2345 glVertex 0 , $h;
2346 glVertex $w, $h;
2347 glVertex $w, 0;
2348 glEnd;
2349
2350 glColor 0, 0, 0;
2351 glBegin GL_LINE_LOOP;
2352 glVertex 0 , 0;
2353 glVertex 0 , $h;
2354 glVertex $w, $h;
2355 glVertex $w, 0;
2356 glEnd;
2357
2358 glPopMatrix;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw;
2362}
2363
2364#############################################################################
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
2136package CFClient::UI::Root; 2404package CFClient::UI::Root;
2137 2405
2138our @ISA = CFClient::UI::Container::; 2406our @ISA = CFClient::UI::Container::;
2139 2407
2140use CFClient::OpenGL; 2408use CFClient::OpenGL;
… …
2215############################################################################# 2483#############################################################################
2216 2484
2217package CFClient::UI; 2485package CFClient::UI;
2218 2486
2219$ROOT = new CFClient::UI::Root; 2487$ROOT = new CFClient::UI::Root;
2220$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 2488$TOOLTIP = new CFClient::UI::Tooltip;
2221 2489
22221 24901
2223 2491

Diff Legend

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