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.170 by root, Mon Apr 24 11:45:17 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";
… …
177 236
178sub size_allocate { 237sub size_allocate {
179 # nothing to be done 238 # nothing to be done
180} 239}
181 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;
246}
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) = @_;
251
252 $self->{parent}
253 or Carp::confess "no parent widget in _topleft\n";#d#
185 254
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 256}
188 257
189# translate global coordinates to local coordinate system 258# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 336 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 337 glVertex $x , $y + $self->{h};
269 glEnd; 338 glEnd;
270 glDisable GL_BLEND; 339 glDisable GL_BLEND;
271 } 340 }
341
342 if ($ENV{PCLIENT_DEBUG}) {
343 glPushMatrix;
344 glColor 1, 1, 0, 1;
345 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
346 glBegin GL_LINE_LOOP;
347 glVertex 0 , 0;
348 glVertex $self->{w}, 0;
349 glVertex $self->{w}, $self->{h};
350 glVertex 0 , $self->{h};
351 glEnd;
352 glPopMatrix;
353 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
354 }
272} 355}
273 356
274sub _draw { 357sub _draw {
275 my ($self) = @_; 358 my ($self) = @_;
276 359
277 warn "no draw defined for $self\n"; 360 warn "no draw defined for $self\n";
278} 361}
279 362
280sub find_widget { 363sub find_widget {
281 my ($self, $x, $y) = @_; 364 my ($self, $x, $y) = @_;
365
366 return () unless $self->{can_events};
282 367
283 return $self 368 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 369 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 370 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 371
… …
294} 379}
295 380
296sub check_size { 381sub check_size {
297 my ($self) = @_; 382 my ($self) = @_;
298 383
299 return unless $self->{parent}; 384 $self->{parent}
385 or return 1;
300 386
301 my ($w, $h) = $self->size_request; 387 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)}
389 : $self->size_request;
302 390
303 if ($w != $self->{req_w} || $h != $self->{req_h}) { 391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
304 $self->{req_w} = $w; 392 $self->{req_w} = $w;
305 $self->{req_h} = $h; 393 $self->{req_h} = $h;
306 394
307 $self->{parent}->check_size; 395 $self->{parent}->check_size
396 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h),
399 );
400
401 1
402 } else {
403 0
308 } 404 }
309} 405}
310 406
311sub update { 407sub update {
312 my ($self) = @_; 408 my ($self) = @_;
… …
322} 418}
323 419
324sub emit { 420sub emit {
325 my ($self, $signal, @args) = @_; 421 my ($self, $signal, @args) = @_;
326 422
327 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 423 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
328 $cb->($self, @args);
329 }
330} 424}
331 425
332sub DESTROY { 426sub DESTROY {
333 my ($self) = @_; 427 my ($self) = @_;
334 428
… …
379 473
380package CFClient::UI::Empty; 474package CFClient::UI::Empty;
381 475
382our @ISA = CFClient::UI::Base::; 476our @ISA = CFClient::UI::Base::;
383 477
478sub new {
479 my ($class, %arg) = @_;
480 $class->SUPER::new (can_events => 0, %arg);
481}
482
384sub size_request { 483sub size_request {
385 (0, 0) 484 (0, 0)
386} 485}
387 486
388sub draw { } 487sub draw { }
… …
396sub new { 495sub new {
397 my ($class, %arg) = @_; 496 my ($class, %arg) = @_;
398 497
399 my $children = delete $arg{children} || []; 498 my $children = delete $arg{children} || [];
400 499
401 my $self = $class->SUPER::new (children => [], %arg); 500 my $self = $class->SUPER::new (
501 children => [],
502 can_events => 0,
503 %arg,
504 );
402 $self->add ($_) for @$children; 505 $self->add ($_) for @$children;
403 506
404 $self 507 $self
405} 508}
406 509
… …
421 524
422sub remove { 525sub remove {
423 my ($self, $child) = @_; 526 my ($self, $child) = @_;
424 527
425 delete $child->{parent}; 528 delete $child->{parent};
529 $child->hide;
426 530
427 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
428 532
429 $self->check_size; 533 $self->check_size;
534 $self->update;
535}
536
537sub clear {
538 my ($self) = @_;
539
540 my $children = delete $self->{children};
541 $self->{children} = [];
542
543 for (@$children) {
544 delete $_->{parent};
545 $_->hide;
546 }
430} 547}
431 548
432sub find_widget { 549sub find_widget {
433 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
434 551
… …
594 border => 0.8, 711 border => 0.8,
595 @_ 712 @_
596 ); 713 );
597 714
598 $self 715 $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} 716}
619 717
620sub _draw { 718sub _draw {
621 my ($self) = @_; 719 my ($self) = @_;
622 720
… …
657 my $class = shift; 755 my $class = shift;
658 756
659 # TODO: user_x, user_y, overwrite moveto? 757 # TODO: user_x, user_y, overwrite moveto?
660 758
661 my $self = $class->SUPER::new ( 759 my $self = $class->SUPER::new (
662 bg => [1, 1, 1, 1], 760 bg => [1, 1, 1, 1],
663 border_bg => [1, 1, 1, 1], 761 border_bg => [1, 1, 1, 1],
664 border => 0.8, 762 border => 0.8,
763 can_events => 1,
665 @_ 764 @_
666 ); 765 );
667 766
668 $self->{title} &&= new CFClient::UI::Label 767 $self->{title} &&= new CFClient::UI::Label
669 align => 0, 768 align => 0,
… …
679} 778}
680 779
681sub size_request { 780sub size_request {
682 my ($self) = @_; 781 my ($self) = @_;
683 782
684 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
685
686 my ($w, $h) = $self->SUPER::size_request; 783 my ($w, $h) = $self->SUPER::size_request;
687 784
688 ( 785 (
689 $w + $self->border * 2, 786 $w + $self->border * 2,
690 $h + $self->border * 2, 787 $h + $self->border * 2,
… …
822 919
823# TODO: move to container class maybe? send childs a signal on removal? 920# TODO: move to container class maybe? send childs a signal on removal?
824sub clear { 921sub clear {
825 my ($self) = @_; 922 my ($self) = @_;
826 923
827 delete $self->{children}; 924 my $children = delete $self->{children};
925
926 for (grep $_, map @$_, grep $_, @$children) {
927 delete $_->{parent};
928 $_->hide;
929 }
930
828 $self->update; 931 $self->update;
829} 932}
830 933
831sub get_wh { 934sub get_wh {
832 my ($self) = @_; 935 my ($self) = @_;
… …
1055 1158
1056sub new { 1159sub new {
1057 my ($class, %arg) = @_; 1160 my ($class, %arg) = @_;
1058 1161
1059 my $self = $class->SUPER::new ( 1162 my $self = $class->SUPER::new (
1060 fg => [1, 1, 1], 1163 fg => [1, 1, 1],
1164 #font => default_font
1061 fontsize => 1, 1165 fontsize => 1,
1062 text => "", 1166 text => "",
1063 align => -1, 1167 align => -1,
1064 valign => -1, 1168 valign => -1,
1065 padding => 2, 1169 padding => 2,
1066 layout => new CFClient::Layout, 1170 layout => new CFClient::Layout,
1171 can_events => 0,
1067 %arg 1172 %arg
1068 ); 1173 );
1069 1174
1070 if (exists $self->{template}) { 1175 if (exists $self->{template}) {
1071 my $layout = new CFClient::Layout; 1176 my $layout = new CFClient::Layout;
… …
1077 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1182 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1078 1183
1079 $self 1184 $self
1080} 1185}
1081 1186
1082sub escape_text { 1187sub escape {
1083 local $_ = $_[1]; 1188 local $_ = $_[1];
1084 1189
1085 s/&/&amp;/g; 1190 s/&/&amp;/g;
1086 s/>/&gt;/g; 1191 s/>/&gt;/g;
1087 s/</&lt;/g; 1192 s/</&lt;/g;
… …
1110} 1215}
1111 1216
1112sub size_request { 1217sub size_request {
1113 my ($self) = @_; 1218 my ($self) = @_;
1114 1219
1115 $self->{layout}->set_width; 1220 $self->{layout}->set_font ($self->{font}) if $self->{font};
1221 $self->{layout}->set_width ($self->{max_w} || -1);
1116 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1222 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1117 1223
1118 my ($w, $h) = $self->{layout}->size; 1224 my ($w, $h) = $self->{layout}->size;
1119 1225
1120 if (exists $self->{template}) { 1226 if (exists $self->{template}) {
1227 $self->{template}->set_font ($self->{font}) if $self->{font};
1121 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1228 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1122 1229
1123 my ($w2, $h2) = $self->{template}->size; 1230 my ($w2, $h2) = $self->{template}->size;
1124 1231
1125 $w = List::Util::max $w, $w2; 1232 $w = List::Util::max $w, $w2;
… …
1140 1247
1141sub set_fontsize { 1248sub set_fontsize {
1142 my ($self, $fontsize) = @_; 1249 my ($self, $fontsize) = @_;
1143 1250
1144 $self->{fontsize} = $fontsize; 1251 $self->{fontsize} = $fontsize;
1252 delete $self->{texture};
1145 $self->check_size; 1253 $self->check_size;
1254 $self->update;
1146} 1255}
1147 1256
1148sub _draw { 1257sub _draw {
1149 my ($self) = @_; 1258 my ($self) = @_;
1150 1259
1151 my $tex = $self->{texture} ||= do { 1260 my $tex = $self->{texture} ||= do {
1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1152 $self->{layout}->set_width ($self->{w}); 1262 $self->{layout}->set_width ($self->{w});
1153 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1263 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1154 new_from_layout CFClient::Texture $self->{layout} 1264 new_from_layout CFClient::Texture $self->{layout}
1155 }; 1265 };
1156 1266
… …
1189 1299
1190sub new { 1300sub new {
1191 my $class = shift; 1301 my $class = shift;
1192 1302
1193 $class->SUPER::new ( 1303 $class->SUPER::new (
1194 fg => [1, 1, 1], 1304 fg => [1, 1, 1],
1195 bg => [0, 0, 0, 0.2], 1305 bg => [0, 0, 0, 0.2],
1196 active_bg => [1, 1, 1, 0.5], 1306 active_bg => [1, 1, 1, 0.5],
1197 active_fg => [0, 0, 0], 1307 active_fg => [0, 0, 0],
1198 can_hover => 1, 1308 can_hover => 1,
1199 can_focus => 1, 1309 can_focus => 1,
1200 valign => 0, 1310 valign => 0,
1311 can_events => 1,
1201 @_ 1312 @_
1202 ) 1313 )
1203} 1314}
1204 1315
1205sub _set_text { 1316sub _set_text {
… …
1358 my ($self, $ev) = @_; 1469 my ($self, $ev) = @_;
1359 1470
1360 my $sym = $ev->{sym}; 1471 my $sym = $ev->{sym};
1361 1472
1362 if ($sym == 13) { 1473 if ($sym == 13) {
1474 unshift @{$self->{history}},
1475 my $txt = $self->get_text;
1476 $self->{history_pointer} = -1;
1477 $self->{history_saveback} = '';
1363 $self->emit (activate => $self->get_text); 1478 $self->emit (activate => $txt);
1364 $self->update; 1479 $self->update;
1480
1481 } elsif ($sym == CFClient::SDLK_UP) {
1482 if ($self->{history_pointer} < 0) {
1483 $self->{history_saveback} = $self->get_text;
1484 }
1485 if (@{$self->{history} || []} > 0) {
1486 $self->{history_pointer}++;
1487 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1488 $self->{history_pointer} = @{$self->{history} || []} - 1;
1489 }
1490 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1491 }
1492
1493 } elsif ($sym == CFClient::SDLK_DOWN) {
1494 $self->{history_pointer}--;
1495 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1496
1497 if ($self->{history_pointer} >= 0) {
1498 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1499 } else {
1500 $self->set_text ($self->{history_saveback});
1501 }
1365 1502
1366 } else { 1503 } else {
1367 $self->SUPER::key_down ($ev); 1504 $self->SUPER::key_down ($ev);
1368 } 1505 }
1369 1506
… …
1383 1520
1384sub new { 1521sub new {
1385 my $class = shift; 1522 my $class = shift;
1386 1523
1387 $class->SUPER::new ( 1524 $class->SUPER::new (
1388 padding => 4, 1525 padding => 4,
1389 fg => [1, 1, 1], 1526 fg => [1, 1, 1],
1390 bg => [1, 1, 1, 0.2], 1527 bg => [1, 1, 1, 0.2],
1391 active_fg => [0, 0, 1], 1528 active_fg => [0, 0, 1],
1392 can_hover => 1, 1529 can_hover => 1,
1393 align => 0, 1530 align => 0,
1394 valign => 0, 1531 valign => 0,
1532 can_events => 1,
1395 @_ 1533 @_
1396 ) 1534 )
1397} 1535}
1398 1536
1399sub button_up { 1537sub button_up {
… …
1504our %loaded_images; 1642our %loaded_images;
1505 1643
1506sub new { 1644sub new {
1507 my $class = shift; 1645 my $class = shift;
1508 1646
1509 my $self = $class->SUPER::new (@_); 1647 my $self = $class->SUPER::new (can_events => 0, @_);
1510 1648
1511 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1649 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1512 1650
1513 $loaded_images{$self->{image}} ||= 1651 $loaded_images{$self->{image}} ||=
1514 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1652 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1556############################################################################# 1694#############################################################################
1557 1695
1558package CFClient::UI::VGauge; 1696package CFClient::UI::VGauge;
1559 1697
1560our @ISA = CFClient::UI::Base::; 1698our @ISA = CFClient::UI::Base::;
1699
1700use List::Util qw(min max);
1561 1701
1562use CFClient::OpenGL; 1702use CFClient::OpenGL;
1563 1703
1564my %tex = ( 1704my %tex = (
1565 food => [ 1705 food => [
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1706 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1707 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1568 ], 1708 ],
1569 grace => [ 1709 grace => [
1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1710 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1711 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1572 ], 1712 ],
1573 hp => [ 1713 hp => [
1574 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1714 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1575 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1715 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1576 ], 1716 ],
1577 mana => [ 1717 mana => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1719 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1580 ], 1720 ],
1581); 1721);
1582 1722
1583# eg. VGauge->new (gauge => 'food'), default gauge: food 1723# eg. VGauge->new (gauge => 'food'), default gauge: food
1584sub new { 1724sub new {
… …
1622 1762
1623sub _draw { 1763sub _draw {
1624 my ($self) = @_; 1764 my ($self) = @_;
1625 1765
1626 my $tex = $tex{$self->{type}}; 1766 my $tex = $tex{$self->{type}};
1767 my ($t1, $t2, $t3) = @$tex;
1627 1768
1628 my ($w, $h) = ($self->{w}, $self->{h}); 1769 my ($w, $h) = ($self->{w}, $self->{h});
1629 1770
1630 if ($self->{vertical}) { 1771 if ($self->{vertical}) {
1631 glRotate 90, 0, 0, 1; 1772 glRotate 90, 0, 0, 1;
… …
1633 1774
1634 ($w, $h) = ($h, $w); 1775 ($w, $h) = ($h, $w);
1635 } 1776 }
1636 1777
1637 my $ycut = $self->{val} / ($self->{max_val} || 1); 1778 my $ycut = $self->{val} / ($self->{max_val} || 1);
1638 $ycut = 1 if $self->{val} > $self->{max_val};
1639 1779
1640 my $t1 = $tex->[0]; 1780 my $ycut1 = max 0, min 1, $ycut;
1641 my $t2 = $tex->[1]; 1781 my $ycut2 = max 0, min 1, $ycut - 1;
1782
1783 my $h1 = $self->{h} * (1 - $ycut1);
1784 my $h2 = $self->{h} * (1 - $ycut2);
1642 1785
1643 glEnable GL_BLEND; 1786 glEnable GL_BLEND;
1644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1787 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1645 glEnable GL_TEXTURE_2D; 1788 glEnable GL_TEXTURE_2D;
1646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 1790
1648 my $h1 = $self->{h} - $ycut * $self->{h};
1649 my $h2 = $ycut * $self->{h};
1650
1651 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1791 glBindTexture GL_TEXTURE_2D, $t1->{name};
1652 glBegin GL_QUADS; 1792 glBegin GL_QUADS;
1653 glTexCoord 0 , 0; glVertex 0 , 0; 1793 glTexCoord 0 , 0; glVertex 0 , 0;
1654 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1794 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1655 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1795 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1656 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1796 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1657 glEnd; 1797 glEnd;
1658 1798
1799 my $ycut1 = List::Util::min 1, $ycut;
1659 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1800 glBindTexture GL_TEXTURE_2D, $t2->{name};
1660 glBegin GL_QUADS; 1801 glBegin GL_QUADS;
1661 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1802 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1662 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1803 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1663 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1804 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1664 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1805 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1665 glEnd; 1806 glEnd;
1807
1808 if ($t3) {
1809 glBindTexture GL_TEXTURE_2D, $t3->{name};
1810 glBegin GL_QUADS;
1811 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1812 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1813 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1814 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1815 glEnd;
1816 }
1666 1817
1667 glDisable GL_BLEND; 1818 glDisable GL_BLEND;
1668 glDisable GL_TEXTURE_2D; 1819 glDisable GL_TEXTURE_2D;
1669} 1820}
1670 1821
… …
1673package CFClient::UI::Gauge; 1824package CFClient::UI::Gauge;
1674 1825
1675our @ISA = CFClient::UI::VBox::; 1826our @ISA = CFClient::UI::VBox::;
1676 1827
1677sub new { 1828sub new {
1678 my ($class, %arg) = shift; 1829 my ($class, %arg) = @_;
1679 1830
1680 my $self = $class->SUPER::new ( 1831 my $self = $class->SUPER::new (
1681 @_, 1832 tooltip => $arg{type},
1833 can_hover => 1,
1834 %arg,
1682 ); 1835 );
1683 1836
1684 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1837 $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); 1838 $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"); 1839 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1687 1840
1688 $self 1841 $self
1689} 1842}
1690 1843
1691sub set_fontsize { 1844sub set_fontsize {
… …
1857 2010
1858sub new { 2011sub new {
1859 my $class = shift; 2012 my $class = shift;
1860 2013
1861 my $self = $class->SUPER::new ( 2014 my $self = $class->SUPER::new (
1862 fontsize => 1, 2015 fontsize => 1,
2016 can_events => 0,
2017 #font => default_font
1863 @_, 2018 @_,
1864 2019
1865 layout => (new CFClient::Layout), 2020 layout => (new CFClient::Layout),
1866 par => [], 2021 par => [],
1867 height => 0, 2022 height => 0,
1868 children => [ 2023 children => [
1869 (new CFClient::UI::Empty expand => 1), 2024 (new CFClient::UI::Empty expand => 1),
1870 (new CFClient::UI::Slider vertical => 1), 2025 (new CFClient::UI::Slider vertical => 1),
1871 ], 2026 ],
1872 ); 2027 );
1873 2028
… …
1907sub size_allocate { 2062sub size_allocate {
1908 my ($self, $w, $h) = @_; 2063 my ($self, $w, $h) = @_;
1909 2064
1910 $self->SUPER::size_allocate ($w, $h); 2065 $self->SUPER::size_allocate ($w, $h);
1911 2066
2067 $self->{layout}->set_font ($self->{font}) if $self->{font};
1912 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2068 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $self->{layout}->set_width ($self->{children}[0]{w}); 2069 $self->{layout}->set_width ($self->{children}[0]{w});
1914 2070
1915 $self->reflow; 2071 $self->reflow;
1916} 2072}
… …
1968 my $y1 = $top + $self->{h}; 2124 my $y1 = $top + $self->{h};
1969 2125
1970 my $y = 0; 2126 my $y = 0;
1971 2127
1972 my $layout = $self->{layout}; 2128 my $layout = $self->{layout};
2129
2130 $layout->set_font ($self->{font}) if $self->{font};
1973 2131
1974 for my $par (@{$self->{par}}) { 2132 for my $par (@{$self->{par}}) {
1975 my $h = $par->[0]; 2133 my $h = $par->[0];
1976 2134
1977 if ($y0 < $y + $h && $y < $y1) { 2135 if ($y0 < $y + $h && $y < $y1) {
… …
2055 2213
2056sub new { 2214sub new {
2057 my $class = shift; 2215 my $class = shift;
2058 2216
2059 my $self = $class->SUPER::new ( 2217 my $self = $class->SUPER::new (
2060 state => 0, 2218 state => 0,
2061 connect_activate => \&toggle_flopper, 2219 connect_activate => \&toggle_flopper,
2062 @_ 2220 @_
2063 ); 2221 );
2064 2222
2065 if ($self->{state}) { 2223 if ($self->{state}) {
… …
2086 $self->emit (changed => $self->{state}); 2244 $self->emit (changed => $self->{state});
2087} 2245}
2088 2246
2089############################################################################# 2247#############################################################################
2090 2248
2249package CFClient::UI::Tooltip;
2250
2251our @ISA = CFClient::UI::Bin::;
2252
2253use CFClient::OpenGL;
2254
2255sub new {
2256 my $class = shift;
2257
2258 $class->SUPER::new (
2259 @_,
2260 can_events => 0,
2261 )
2262}
2263
2264sub set_markup {
2265 my ($self, $text) = @_;
2266
2267 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2268 $self->{label}->set_markup ($text);
2269 $self->add ($self->{label});
2270}
2271
2272sub size_request {
2273 my ($self) = @_;
2274
2275 $self->child->set_max_size ($::WIDTH * 0.3);
2276
2277 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2278
2279 ($w + 4, $h + 4)
2280}
2281
2282sub size_allocate {
2283 my ($self, $w, $h) = @_;
2284
2285 $self->SUPER::size_allocate ($w - 4, $h - 4);
2286}
2287
2288sub _draw {
2289 my ($self) = @_;
2290
2291 glPushMatrix;
2292 glTranslate 0.375, 0.375;
2293
2294 my ($w, $h) = @$self{qw(w h)};
2295
2296 glColor 1, 0.8, 0.4;
2297 glBegin GL_QUADS;
2298 glVertex 0 , 0;
2299 glVertex 0 , $h;
2300 glVertex $w, $h;
2301 glVertex $w, 0;
2302 glEnd;
2303
2304 glColor 0, 0, 0;
2305 glBegin GL_LINE_LOOP;
2306 glVertex 0 , 0;
2307 glVertex 0 , $h;
2308 glVertex $w, $h;
2309 glVertex $w, 0;
2310 glEnd;
2311
2312 glPopMatrix;
2313
2314 glTranslate 2, 2;
2315 $self->SUPER::_draw;
2316}
2317
2318#############################################################################
2319
2320package CFClient::UI::Face;
2321
2322our @ISA = CFClient::UI::Base::;
2323
2324use CFClient::OpenGL;
2325
2326sub new {
2327 my $class = shift;
2328
2329 $class->SUPER::new (
2330 aspect => 1,
2331 @_,
2332 )
2333}
2334
2335sub size_request {
2336 (32, 8)
2337}
2338
2339sub draw {
2340 my ($self) = @_;
2341
2342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2343
2344 if ($tex) {
2345 glEnable GL_BLEND;
2346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1;
2350 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2351 glDisable GL_TEXTURE_2D;
2352 glDisable GL_BLEND;
2353 }
2354}
2355
2356#############################################################################
2357
2091package CFClient::UI::Root; 2358package CFClient::UI::Root;
2092 2359
2093our @ISA = CFClient::UI::Container::; 2360our @ISA = CFClient::UI::Container::;
2094 2361
2095use CFClient::OpenGL; 2362use CFClient::OpenGL;
… …
2170############################################################################# 2437#############################################################################
2171 2438
2172package CFClient::UI; 2439package CFClient::UI;
2173 2440
2174$ROOT = new CFClient::UI::Root; 2441$ROOT = new CFClient::UI::Root;
2442$TOOLTIP = new CFClient::UI::Tooltip;
2175 2443
21761 24441
2177 2445

Diff Legend

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