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.149 by root, Sat Apr 22 23:11:32 2006 UTC vs.
Revision 1.166 by root, Mon Apr 24 08:38:36 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
14 41
15# class methods for events 42# class methods for events
16sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
18} 46}
19 47
20sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
22} 51}
23 52
24sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
25 my ($ev) = @_; 54 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
30 59
31 $GRAB = $widget; 60 $GRAB = $widget;
32 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
62
63 check_tooltip;
33 } 64 }
34 65
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 67
37 $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 }
38} 72}
39 73
40sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
41 my ($ev) = @_; 75 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
43 77
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 79
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 81
48 $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 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover && $hover->{can_hover}; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 108 check_tooltip;
109 }
110
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 }
71} 115}
72 116
73# convert position array to integers 117# convert position array to integers
74sub harmonize { 118sub harmonize {
75 my ($vals) = @_; 119 my ($vals) = @_;
… …
93 137
94sub new { 138sub new {
95 my $class = shift; 139 my $class = shift;
96 140
97 my $self = bless { 141 my $self = bless {
98 x => 0, 142 x => 0,
99 y => 0, 143 y => 0,
100 z => 0, 144 z => 0,
145 can_events => 1,
101 @_ 146 @_
102 }, $class; 147 }, $class;
103 148
104 for (keys %$self) { 149 for (keys %$self) {
105 if (/^connect_(.*)$/) { 150 if (/^connect_(.*)$/) {
… …
108 } 153 }
109 154
110 $self 155 $self
111} 156}
112 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
113sub show { 165sub show {
114 my ($self) = @_; 166 my ($self) = @_;
115 167
116 return if $self->{parent}; 168 return if $self->{parent};
117 169
… …
119} 171}
120 172
121sub hide { 173sub hide {
122 my ($self) = @_; 174 my ($self) = @_;
123 175
124 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
125 178
126 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
127} 181}
128 182
129sub move { 183sub move {
130 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
131 185
… …
134 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
135 189
136 $self->update; 190 $self->update;
137} 191}
138 192
139sub needs_redraw { 193sub set_size {
140 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
141} 200}
142 201
143sub size_request { 202sub size_request {
144 require Carp; 203 require Carp;
145 Carp::confess "size_request is abstract"; 204 Carp::confess "size_request is abstract";
… …
175 } 234 }
176} 235}
177 236
178sub size_allocate { 237sub size_allocate {
179 # nothing to be done 238 # nothing to be done
239}
240
241sub set_max_size {
242 my ($self, $w, $h) = @_;
243
244 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h;
180} 246}
181 247
182# return top left coordinates 248# return top left coordinates
183sub _topleft { 249sub _topleft {
184 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
269 glEnd; 335 glEnd;
270 glDisable GL_BLEND; 336 glDisable GL_BLEND;
271 } 337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0;
345 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h};
348 glEnd;
349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
272} 352}
273 353
274sub _draw { 354sub _draw {
275 my ($self) = @_; 355 my ($self) = @_;
276 356
277 warn "no draw defined for $self\n"; 357 warn "no draw defined for $self\n";
278} 358}
279 359
280sub find_widget { 360sub find_widget {
281 my ($self, $x, $y) = @_; 361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
282 364
283 return $self 365 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 368
… …
294} 376}
295 377
296sub check_size { 378sub check_size {
297 my ($self) = @_; 379 my ($self) = @_;
298 380
299 return unless $self->{parent}; 381 $self->{parent}
382 or return 1;
300 383
301 my ($w, $h) = $self->size_request; 384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
302 387
303 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
304 $self->{req_w} = $w; 389 $self->{req_w} = $w;
305 $self->{req_h} = $h; 390 $self->{req_h} = $h;
306 391
307 $self->{parent}->check_size; 392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
308 } 401 }
309} 402}
310 403
311sub update { 404sub update {
312 my ($self) = @_; 405 my ($self) = @_;
… …
322} 415}
323 416
324sub emit { 417sub emit {
325 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
326 419
327 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
328 $cb->($self, @args);
329 }
330} 421}
331 422
332sub DESTROY { 423sub DESTROY {
333 my ($self) = @_; 424 my ($self) = @_;
334 425
… …
379 470
380package CFClient::UI::Empty; 471package CFClient::UI::Empty;
381 472
382our @ISA = CFClient::UI::Base::; 473our @ISA = CFClient::UI::Base::;
383 474
475sub new {
476 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg);
478}
479
384sub size_request { 480sub size_request {
385 (0, 0) 481 (0, 0)
386} 482}
387 483
388sub draw { } 484sub draw { }
… …
396sub new { 492sub new {
397 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
398 494
399 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
400 496
401 my $self = $class->SUPER::new (children => [], %arg); 497 my $self = $class->SUPER::new (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
402 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
403 503
404 $self 504 $self
405} 505}
406 506
… …
421 521
422sub remove { 522sub remove {
423 my ($self, $child) = @_; 523 my ($self, $child) = @_;
424 524
425 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
426 527
427 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
428 529
429 $self->check_size; 530 $self->check_size;
531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
430} 544}
431 545
432sub find_widget { 546sub find_widget {
433 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
434 548
… …
594 border => 0.8, 708 border => 0.8,
595 @_ 709 @_
596 ); 710 );
597 711
598 $self 712 $self
599}
600
601sub set_size {
602 my ($self, $w, $h) = @_;
603 $self->{req_w} = $w;
604 $self->{req_h} = $h;
605 $self->check_size;
606}
607
608sub size_request {
609 my ($self) = @_;
610 ($self->{req_w}, $self->{req_h})
611}
612
613sub size_allocate {
614 my ($self, $w, $h) = @_;
615 $self->{w} = $w;
616 $self->{h} = $h;
617 $self->child->configure (0, 0, $w, $h);
618} 713}
619 714
620sub _draw { 715sub _draw {
621 my ($self) = @_; 716 my ($self) = @_;
622 717
… …
657 my $class = shift; 752 my $class = shift;
658 753
659 # TODO: user_x, user_y, overwrite moveto? 754 # TODO: user_x, user_y, overwrite moveto?
660 755
661 my $self = $class->SUPER::new ( 756 my $self = $class->SUPER::new (
662 bg => [1, 1, 1, 1], 757 bg => [1, 1, 1, 1],
663 border_bg => [1, 1, 1, 1], 758 border_bg => [1, 1, 1, 1],
664 border => 0.8, 759 border => 0.8,
760 can_events => 1,
665 @_ 761 @_
666 ); 762 );
667 763
668 $self->{title} &&= new CFClient::UI::Label 764 $self->{title} &&= new CFClient::UI::Label
669 align => 0, 765 align => 0,
… …
679} 775}
680 776
681sub size_request { 777sub size_request {
682 my ($self) = @_; 778 my ($self) = @_;
683 779
684 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
685
686 my ($w, $h) = $self->SUPER::size_request; 780 my ($w, $h) = $self->SUPER::size_request;
687 781
688 ( 782 (
689 $w + $self->border * 2, 783 $w + $self->border * 2,
690 $h + $self->border * 2, 784 $h + $self->border * 2,
… …
822 916
823# TODO: move to container class maybe? send childs a signal on removal? 917# TODO: move to container class maybe? send childs a signal on removal?
824sub clear { 918sub clear {
825 my ($self) = @_; 919 my ($self) = @_;
826 920
827 delete $self->{children}; 921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
828 $self->update; 928 $self->update;
829} 929}
830 930
831sub get_wh { 931sub get_wh {
832 my ($self) = @_; 932 my ($self) = @_;
… …
1055 1155
1056sub new { 1156sub new {
1057 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
1058 1158
1059 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
1060 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
1161 #font => default_font
1061 fontsize => 1, 1162 fontsize => 1,
1062 text => "", 1163 text => "",
1063 align => -1, 1164 align => -1,
1064 valign => -1, 1165 valign => -1,
1065 padding => 2, 1166 padding => 2,
1066 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1168 can_events => 0,
1067 %arg 1169 %arg
1068 ); 1170 );
1069 1171
1070 if (exists $self->{template}) { 1172 if (exists $self->{template}) {
1071 my $layout = new CFClient::Layout; 1173 my $layout = new CFClient::Layout;
… …
1077 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1078 1180
1079 $self 1181 $self
1080} 1182}
1081 1183
1082sub escape_text { 1184sub escape {
1083 local $_ = $_[1]; 1185 local $_ = $_[1];
1084 1186
1085 s/&/&amp;/g; 1187 s/&/&amp;/g;
1086 s/>/&gt;/g; 1188 s/>/&gt;/g;
1087 s/</&lt;/g; 1189 s/</&lt;/g;
… …
1110} 1212}
1111 1213
1112sub size_request { 1214sub size_request {
1113 my ($self) = @_; 1215 my ($self) = @_;
1114 1216
1115 $self->{layout}->set_width; 1217 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1);
1116 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1117 1220
1118 my ($w, $h) = $self->{layout}->size; 1221 my ($w, $h) = $self->{layout}->size;
1119 1222
1120 if (exists $self->{template}) { 1223 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font};
1121 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1122 1226
1123 my ($w2, $h2) = $self->{template}->size; 1227 my ($w2, $h2) = $self->{template}->size;
1124 1228
1125 $w = List::Util::max $w, $w2; 1229 $w = List::Util::max $w, $w2;
… …
1140 1244
1141sub set_fontsize { 1245sub set_fontsize {
1142 my ($self, $fontsize) = @_; 1246 my ($self, $fontsize) = @_;
1143 1247
1144 $self->{fontsize} = $fontsize; 1248 $self->{fontsize} = $fontsize;
1249 delete $self->{texture};
1145 $self->check_size; 1250 $self->check_size;
1251 $self->update;
1146} 1252}
1147 1253
1148sub _draw { 1254sub _draw {
1149 my ($self) = @_; 1255 my ($self) = @_;
1150 1256
1151 my $tex = $self->{texture} ||= do { 1257 my $tex = $self->{texture} ||= do {
1258 $self->{layout}->set_font ($self->{font}) if $self->{font};
1152 $self->{layout}->set_width ($self->{w}); 1259 $self->{layout}->set_width ($self->{w});
1153 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1154 new_from_layout CFClient::Texture $self->{layout} 1261 new_from_layout CFClient::Texture $self->{layout}
1155 }; 1262 };
1156 1263
… …
1189 1296
1190sub new { 1297sub new {
1191 my $class = shift; 1298 my $class = shift;
1192 1299
1193 $class->SUPER::new ( 1300 $class->SUPER::new (
1194 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1195 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1196 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1197 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1198 can_hover => 1, 1305 can_hover => 1,
1199 can_focus => 1, 1306 can_focus => 1,
1200 valign => 0, 1307 valign => 0,
1308 can_events => 1,
1201 @_ 1309 @_
1202 ) 1310 )
1203} 1311}
1204 1312
1205sub _set_text { 1313sub _set_text {
… …
1383 1491
1384sub new { 1492sub new {
1385 my $class = shift; 1493 my $class = shift;
1386 1494
1387 $class->SUPER::new ( 1495 $class->SUPER::new (
1388 padding => 4, 1496 padding => 4,
1389 fg => [1, 1, 1], 1497 fg => [1, 1, 1],
1390 bg => [1, 1, 1, 0.2], 1498 bg => [1, 1, 1, 0.2],
1391 active_fg => [0, 0, 1], 1499 active_fg => [0, 0, 1],
1392 can_hover => 1, 1500 can_hover => 1,
1393 align => 0, 1501 align => 0,
1394 valign => 0, 1502 valign => 0,
1503 can_events => 1,
1395 @_ 1504 @_
1396 ) 1505 )
1397} 1506}
1398 1507
1399sub button_up { 1508sub button_up {
… …
1504our %loaded_images; 1613our %loaded_images;
1505 1614
1506sub new { 1615sub new {
1507 my $class = shift; 1616 my $class = shift;
1508 1617
1509 my $self = $class->SUPER::new (@_); 1618 my $self = $class->SUPER::new (can_events => 0, @_);
1510 1619
1511 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1620 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1512 1621
1513 $loaded_images{$self->{image}} ||= 1622 $loaded_images{$self->{image}} ||=
1514 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1623 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1556############################################################################# 1665#############################################################################
1557 1666
1558package CFClient::UI::VGauge; 1667package CFClient::UI::VGauge;
1559 1668
1560our @ISA = CFClient::UI::Base::; 1669our @ISA = CFClient::UI::Base::;
1670
1671use List::Util qw(min max);
1561 1672
1562use CFClient::OpenGL; 1673use CFClient::OpenGL;
1563 1674
1564my %tex = ( 1675my %tex = (
1565 food => [ 1676 food => [
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1677 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1678 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1568 ], 1679 ],
1569 grace => [ 1680 grace => [
1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1681 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1682 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1572 ], 1683 ],
1573 hp => [ 1684 hp => [
1574 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1685 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1575 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1686 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1576 ], 1687 ],
1577 mana => [ 1688 mana => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1689 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1690 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1580 ], 1691 ],
1581); 1692);
1582 1693
1583# eg. VGauge->new (gauge => 'food'), default gauge: food 1694# eg. VGauge->new (gauge => 'food'), default gauge: food
1584sub new { 1695sub new {
… …
1622 1733
1623sub _draw { 1734sub _draw {
1624 my ($self) = @_; 1735 my ($self) = @_;
1625 1736
1626 my $tex = $tex{$self->{type}}; 1737 my $tex = $tex{$self->{type}};
1738 my ($t1, $t2, $t3) = @$tex;
1627 1739
1628 my ($w, $h) = ($self->{w}, $self->{h}); 1740 my ($w, $h) = ($self->{w}, $self->{h});
1629 1741
1630 if ($self->{vertical}) { 1742 if ($self->{vertical}) {
1631 glRotate 90, 0, 0, 1; 1743 glRotate 90, 0, 0, 1;
… …
1633 1745
1634 ($w, $h) = ($h, $w); 1746 ($w, $h) = ($h, $w);
1635 } 1747 }
1636 1748
1637 my $ycut = $self->{val} / ($self->{max_val} || 1); 1749 my $ycut = $self->{val} / ($self->{max_val} || 1);
1638 $ycut = 1 if $self->{val} > $self->{max_val};
1639 1750
1640 my $t1 = $tex->[0]; 1751 my $ycut1 = max 0, min 1, $ycut;
1641 my $t2 = $tex->[1]; 1752 my $ycut2 = max 0, min 1, $ycut - 1;
1753
1754 my $h1 = $self->{h} * (1 - $ycut1);
1755 my $h2 = $self->{h} * (1 - $ycut2);
1642 1756
1643 glEnable GL_BLEND; 1757 glEnable GL_BLEND;
1644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1758 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1645 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 1761
1648 my $h1 = $self->{h} - $ycut * $self->{h};
1649 my $h2 = $ycut * $self->{h};
1650
1651 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1762 glBindTexture GL_TEXTURE_2D, $t1->{name};
1652 glBegin GL_QUADS; 1763 glBegin GL_QUADS;
1653 glTexCoord 0 , 0; glVertex 0 , 0; 1764 glTexCoord 0 , 0; glVertex 0 , 0;
1654 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1765 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1655 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1766 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1656 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1767 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1657 glEnd; 1768 glEnd;
1658 1769
1770 my $ycut1 = List::Util::min 1, $ycut;
1659 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1771 glBindTexture GL_TEXTURE_2D, $t2->{name};
1660 glBegin GL_QUADS; 1772 glBegin GL_QUADS;
1661 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1773 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1662 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1774 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1663 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1775 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1664 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1776 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1665 glEnd; 1777 glEnd;
1778
1779 if ($t3) {
1780 glBindTexture GL_TEXTURE_2D, $t3->{name};
1781 glBegin GL_QUADS;
1782 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1783 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1784 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1785 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1786 glEnd;
1787 }
1666 1788
1667 glDisable GL_BLEND; 1789 glDisable GL_BLEND;
1668 glDisable GL_TEXTURE_2D; 1790 glDisable GL_TEXTURE_2D;
1669} 1791}
1670 1792
… …
1673package CFClient::UI::Gauge; 1795package CFClient::UI::Gauge;
1674 1796
1675our @ISA = CFClient::UI::VBox::; 1797our @ISA = CFClient::UI::VBox::;
1676 1798
1677sub new { 1799sub new {
1678 my ($class, %arg) = shift; 1800 my ($class, %arg) = @_;
1679 1801
1680 my $self = $class->SUPER::new ( 1802 my $self = $class->SUPER::new (
1681 @_, 1803 tooltip => $arg{type},
1804 can_hover => 1,
1805 %arg,
1682 ); 1806 );
1683 1807
1684 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1808 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1685 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1809 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1686 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1810 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1687 1811
1688 $self 1812 $self
1689} 1813}
1690 1814
1691sub set_fontsize { 1815sub set_fontsize {
… …
1857 1981
1858sub new { 1982sub new {
1859 my $class = shift; 1983 my $class = shift;
1860 1984
1861 my $self = $class->SUPER::new ( 1985 my $self = $class->SUPER::new (
1862 fontsize => 1, 1986 fontsize => 1,
1987 can_events => 0,
1988 #font => default_font
1863 @_, 1989 @_,
1864 1990
1865 layout => (new CFClient::Layout), 1991 layout => (new CFClient::Layout),
1866 par => [], 1992 par => [],
1867 height => 0, 1993 height => 0,
1868 children => [ 1994 children => [
1869 (new CFClient::UI::Empty expand => 1), 1995 (new CFClient::UI::Empty expand => 1),
1870 (new CFClient::UI::Slider vertical => 1), 1996 (new CFClient::UI::Slider vertical => 1),
1871 ], 1997 ],
1872 ); 1998 );
1873 1999
… …
1907sub size_allocate { 2033sub size_allocate {
1908 my ($self, $w, $h) = @_; 2034 my ($self, $w, $h) = @_;
1909 2035
1910 $self->SUPER::size_allocate ($w, $h); 2036 $self->SUPER::size_allocate ($w, $h);
1911 2037
2038 $self->{layout}->set_font ($self->{font}) if $self->{font};
1912 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2039 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $self->{layout}->set_width ($self->{children}[0]{w}); 2040 $self->{layout}->set_width ($self->{children}[0]{w});
1914 2041
1915 $self->reflow; 2042 $self->reflow;
1916} 2043}
… …
1968 my $y1 = $top + $self->{h}; 2095 my $y1 = $top + $self->{h};
1969 2096
1970 my $y = 0; 2097 my $y = 0;
1971 2098
1972 my $layout = $self->{layout}; 2099 my $layout = $self->{layout};
2100
2101 $layout->set_font ($self->{font}) if $self->{font};
1973 2102
1974 for my $par (@{$self->{par}}) { 2103 for my $par (@{$self->{par}}) {
1975 my $h = $par->[0]; 2104 my $h = $par->[0];
1976 2105
1977 if ($y0 < $y + $h && $y < $y1) { 2106 if ($y0 < $y + $h && $y < $y1) {
… …
2055 2184
2056sub new { 2185sub new {
2057 my $class = shift; 2186 my $class = shift;
2058 2187
2059 my $self = $class->SUPER::new ( 2188 my $self = $class->SUPER::new (
2060 state => 0, 2189 state => 0,
2061 connect_activate => \&toggle_flopper, 2190 connect_activate => \&toggle_flopper,
2062 @_ 2191 @_
2063 ); 2192 );
2064 2193
2065 if ($self->{state}) { 2194 if ($self->{state}) {
… …
2086 $self->emit (changed => $self->{state}); 2215 $self->emit (changed => $self->{state});
2087} 2216}
2088 2217
2089############################################################################# 2218#############################################################################
2090 2219
2220package CFClient::UI::Tooltip;
2221
2222our @ISA = CFClient::UI::Bin::;
2223
2224use CFClient::OpenGL;
2225
2226sub new {
2227 my $class = shift;
2228
2229 $class->SUPER::new (
2230 @_,
2231 can_events => 0,
2232 )
2233}
2234
2235sub set_markup {
2236 my ($self, $text) = @_;
2237
2238 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2239 $self->{label}->set_markup ($text);
2240 $self->add ($self->{label});
2241}
2242
2243sub size_request {
2244 my ($self) = @_;
2245
2246 $self->child->set_max_size ($::WIDTH * 0.3);
2247
2248 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2249
2250 ($w + 4, $h + 4)
2251}
2252
2253sub size_allocate {
2254 my ($self, $w, $h) = @_;
2255
2256 $self->SUPER::size_allocate ($w - 4, $h - 4);
2257}
2258
2259sub _draw {
2260 my ($self) = @_;
2261
2262 glPushMatrix;
2263 glTranslate 0.375, 0.375;
2264
2265 my ($w, $h) = @$self{qw(w h)};
2266
2267 glColor 1, 0.8, 0.4;
2268 glBegin GL_QUADS;
2269 glVertex 0 , 0;
2270 glVertex 0 , $h;
2271 glVertex $w, $h;
2272 glVertex $w, 0;
2273 glEnd;
2274
2275 glColor 0, 0, 0;
2276 glBegin GL_LINE_LOOP;
2277 glVertex 0 , 0;
2278 glVertex 0 , $h;
2279 glVertex $w, $h;
2280 glVertex $w, 0;
2281 glEnd;
2282
2283 glPopMatrix;
2284
2285 glTranslate 2, 2;
2286 $self->SUPER::_draw;
2287}
2288
2289#############################################################################
2290
2291package CFClient::UI::Face;
2292
2293our @ISA = CFClient::UI::Base::;
2294
2295use CFClient::OpenGL;
2296
2297sub new {
2298 my $class = shift;
2299
2300 $class->SUPER::new (
2301 aspect => 1,
2302 @_,
2303 )
2304}
2305
2306sub size_request {
2307 (32, 8)
2308}
2309
2310sub draw {
2311 my ($self) = @_;
2312
2313 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2314
2315 if ($tex) {
2316 glEnable GL_BLEND;
2317 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2318 glEnable GL_TEXTURE_2D;
2319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2320 glColor 1, 1, 1, 1;
2321 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2322 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND;
2324 }
2325}
2326
2327#############################################################################
2328
2091package CFClient::UI::Root; 2329package CFClient::UI::Root;
2092 2330
2093our @ISA = CFClient::UI::Container::; 2331our @ISA = CFClient::UI::Container::;
2094 2332
2095use CFClient::OpenGL; 2333use CFClient::OpenGL;
… …
2170############################################################################# 2408#############################################################################
2171 2409
2172package CFClient::UI; 2410package CFClient::UI;
2173 2411
2174$ROOT = new CFClient::UI::Root; 2412$ROOT = new CFClient::UI::Root;
2413$TOOLTIP = new CFClient::UI::Tooltip;
2175 2414
21761 24151
2177 2416

Diff Legend

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