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.172 by root, Tue Apr 25 09:52:04 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 children {
242}
243
244sub set_max_size {
245 my ($self, $w, $h) = @_;
246
247 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h;
249}
250
182# return top left coordinates 251# return top left coordinates
183sub _topleft { 252sub _topleft {
184 my ($self, $x, $y) = @_; 253 my ($self, $x, $y) = @_;
254
255 $self->{parent}
256 or Carp::confess "no parent widget in _topleft\n";#d#
185 257
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 259}
188 260
189# translate global coordinates to local coordinate system 261# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 339 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 340 glVertex $x , $y + $self->{h};
269 glEnd; 341 glEnd;
270 glDisable GL_BLEND; 342 glDisable GL_BLEND;
271 } 343 }
344
345 if ($ENV{PCLIENT_DEBUG}) {
346 glPushMatrix;
347 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0;
351 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h};
354 glEnd;
355 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 }
272} 358}
273 359
274sub _draw { 360sub _draw {
275 my ($self) = @_; 361 my ($self) = @_;
276 362
277 warn "no draw defined for $self\n"; 363 warn "no draw defined for $self\n";
278} 364}
279 365
280sub find_widget { 366sub find_widget {
281 my ($self, $x, $y) = @_; 367 my ($self, $x, $y) = @_;
368
369 return () unless $self->{can_events};
282 370
283 return $self 371 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 372 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 373 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 374
… …
294} 382}
295 383
296sub check_size { 384sub check_size {
297 my ($self) = @_; 385 my ($self) = @_;
298 386
299 return unless $self->{parent}; 387 $self->{parent}
388 or return 1;
300 389
301 my ($w, $h) = $self->size_request; 390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
302 393
303 if ($w != $self->{req_w} || $h != $self->{req_h}) { 394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
304 $self->{req_w} = $w; 395 $self->{req_w} = $w;
305 $self->{req_h} = $h; 396 $self->{req_h} = $h;
306 397
307 $self->{parent}->check_size; 398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
308 } 407 }
309} 408}
310 409
311sub update { 410sub update {
312 my ($self) = @_; 411 my ($self) = @_;
… …
322} 421}
323 422
324sub emit { 423sub emit {
325 my ($self, $signal, @args) = @_; 424 my ($self, $signal, @args) = @_;
326 425
327 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
328 $cb->($self, @args);
329 }
330} 427}
331 428
332sub DESTROY { 429sub DESTROY {
333 my ($self) = @_; 430 my ($self) = @_;
334 431
… …
379 476
380package CFClient::UI::Empty; 477package CFClient::UI::Empty;
381 478
382our @ISA = CFClient::UI::Base::; 479our @ISA = CFClient::UI::Base::;
383 480
481sub new {
482 my ($class, %arg) = @_;
483 $class->SUPER::new (can_events => 0, %arg);
484}
485
384sub size_request { 486sub size_request {
385 (0, 0) 487 (0, 0)
386} 488}
387 489
388sub draw { } 490sub draw { }
… …
396sub new { 498sub new {
397 my ($class, %arg) = @_; 499 my ($class, %arg) = @_;
398 500
399 my $children = delete $arg{children} || []; 501 my $children = delete $arg{children} || [];
400 502
401 my $self = $class->SUPER::new (children => [], %arg); 503 my $self = $class->SUPER::new (
504 children => [],
505 can_events => 0,
506 %arg,
507 );
402 $self->add ($_) for @$children; 508 $self->add ($_) for @$children;
403 509
404 $self 510 $self
405} 511}
406 512
… …
417 ]; 523 ];
418 524
419 $child->check_size; 525 $child->check_size;
420} 526}
421 527
528sub children {
529 @{ $_[0]{children} }
530}
531
422sub remove { 532sub remove {
423 my ($self, $child) = @_; 533 my ($self, $child) = @_;
424 534
425 delete $child->{parent}; 535 delete $child->{parent};
536 $child->hide;
426 537
427 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
428 539
429 $self->check_size; 540 $self->check_size;
541 $self->update;
542}
543
544sub clear {
545 my ($self) = @_;
546
547 my $children = delete $self->{children};
548 $self->{children} = [];
549
550 for (@$children) {
551 delete $_->{parent};
552 $_->hide;
553 }
430} 554}
431 555
432sub find_widget { 556sub find_widget {
433 my ($self, $x, $y) = @_; 557 my ($self, $x, $y) = @_;
434 558
… …
594 border => 0.8, 718 border => 0.8,
595 @_ 719 @_
596 ); 720 );
597 721
598 $self 722 $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} 723}
619 724
620sub _draw { 725sub _draw {
621 my ($self) = @_; 726 my ($self) = @_;
622 727
… …
657 my $class = shift; 762 my $class = shift;
658 763
659 # TODO: user_x, user_y, overwrite moveto? 764 # TODO: user_x, user_y, overwrite moveto?
660 765
661 my $self = $class->SUPER::new ( 766 my $self = $class->SUPER::new (
662 bg => [1, 1, 1, 1], 767 bg => [1, 1, 1, 1],
663 border_bg => [1, 1, 1, 1], 768 border_bg => [1, 1, 1, 1],
664 border => 0.8, 769 border => 0.8,
770 can_events => 1,
665 @_ 771 @_
666 ); 772 );
667 773
668 $self->{title} &&= new CFClient::UI::Label 774 $self->{title} &&= new CFClient::UI::Label
669 align => 0, 775 align => 0,
… …
679} 785}
680 786
681sub size_request { 787sub size_request {
682 my ($self) = @_; 788 my ($self) = @_;
683 789
684 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
685
686 my ($w, $h) = $self->SUPER::size_request; 790 my ($w, $h) = $self->SUPER::size_request;
687 791
688 ( 792 (
689 $w + $self->border * 2, 793 $w + $self->border * 2,
690 $h + $self->border * 2, 794 $h + $self->border * 2,
… …
818 $self->{children}[$y][$x] = $child; 922 $self->{children}[$y][$x] = $child;
819 923
820 $child->check_size; 924 $child->check_size;
821} 925}
822 926
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
823# TODO: move to container class maybe? send childs a signal on removal? 931# TODO: move to container class maybe? send childs a signal on removal?
824sub clear { 932sub clear {
825 my ($self) = @_; 933 my ($self) = @_;
826 934
935 my @children = $self->children;
827 delete $self->{children}; 936 delete $self->{children};
937
938 for (@children) {
939 delete $_->{parent};
940 $_->hide;
941 }
942
828 $self->update; 943 $self->update;
829} 944}
830 945
831sub get_wh { 946sub get_wh {
832 my ($self) = @_; 947 my ($self) = @_;
… …
1055 1170
1056sub new { 1171sub new {
1057 my ($class, %arg) = @_; 1172 my ($class, %arg) = @_;
1058 1173
1059 my $self = $class->SUPER::new ( 1174 my $self = $class->SUPER::new (
1060 fg => [1, 1, 1], 1175 fg => [1, 1, 1],
1176 #font => default_font
1061 fontsize => 1, 1177 fontsize => 1,
1062 text => "", 1178 text => "",
1063 align => -1, 1179 align => -1,
1064 valign => -1, 1180 valign => -1,
1065 padding => 2, 1181 padding => 2,
1066 layout => new CFClient::Layout, 1182 layout => new CFClient::Layout,
1183 can_events => 0,
1067 %arg 1184 %arg
1068 ); 1185 );
1069 1186
1070 if (exists $self->{template}) { 1187 if (exists $self->{template}) {
1071 my $layout = new CFClient::Layout; 1188 my $layout = new CFClient::Layout;
… …
1077 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1078 1195
1079 $self 1196 $self
1080} 1197}
1081 1198
1082sub escape_text { 1199sub escape {
1083 local $_ = $_[1]; 1200 local $_ = $_[1];
1084 1201
1085 s/&/&amp;/g; 1202 s/&/&amp;/g;
1086 s/>/&gt;/g; 1203 s/>/&gt;/g;
1087 s/</&lt;/g; 1204 s/</&lt;/g;
… …
1110} 1227}
1111 1228
1112sub size_request { 1229sub size_request {
1113 my ($self) = @_; 1230 my ($self) = @_;
1114 1231
1115 $self->{layout}->set_width; 1232 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1);
1116 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1117 1235
1118 my ($w, $h) = $self->{layout}->size; 1236 my ($w, $h) = $self->{layout}->size;
1119 1237
1120 if (exists $self->{template}) { 1238 if (exists $self->{template}) {
1239 $self->{template}->set_font ($self->{font}) if $self->{font};
1121 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1240 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1122 1241
1123 my ($w2, $h2) = $self->{template}->size; 1242 my ($w2, $h2) = $self->{template}->size;
1124 1243
1125 $w = List::Util::max $w, $w2; 1244 $w = List::Util::max $w, $w2;
… …
1140 1259
1141sub set_fontsize { 1260sub set_fontsize {
1142 my ($self, $fontsize) = @_; 1261 my ($self, $fontsize) = @_;
1143 1262
1144 $self->{fontsize} = $fontsize; 1263 $self->{fontsize} = $fontsize;
1264 delete $self->{texture};
1145 $self->check_size; 1265 $self->check_size;
1266 $self->update;
1146} 1267}
1147 1268
1148sub _draw { 1269sub _draw {
1149 my ($self) = @_; 1270 my ($self) = @_;
1150 1271
1151 my $tex = $self->{texture} ||= do { 1272 my $tex = $self->{texture} ||= do {
1273 $self->{layout}->set_font ($self->{font}) if $self->{font};
1152 $self->{layout}->set_width ($self->{w}); 1274 $self->{layout}->set_width ($self->{w});
1153 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1154 new_from_layout CFClient::Texture $self->{layout} 1276 new_from_layout CFClient::Texture $self->{layout}
1155 }; 1277 };
1156 1278
… …
1189 1311
1190sub new { 1312sub new {
1191 my $class = shift; 1313 my $class = shift;
1192 1314
1193 $class->SUPER::new ( 1315 $class->SUPER::new (
1194 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1195 bg => [0, 0, 0, 0.2], 1317 bg => [0, 0, 0, 0.2],
1196 active_bg => [1, 1, 1, 0.5], 1318 active_bg => [1, 1, 1, 0.5],
1197 active_fg => [0, 0, 0], 1319 active_fg => [0, 0, 0],
1198 can_hover => 1, 1320 can_hover => 1,
1199 can_focus => 1, 1321 can_focus => 1,
1200 valign => 0, 1322 valign => 0,
1323 can_events => 1,
1201 @_ 1324 @_
1202 ) 1325 )
1203} 1326}
1204 1327
1205sub _set_text { 1328sub _set_text {
… …
1358 my ($self, $ev) = @_; 1481 my ($self, $ev) = @_;
1359 1482
1360 my $sym = $ev->{sym}; 1483 my $sym = $ev->{sym};
1361 1484
1362 if ($sym == 13) { 1485 if ($sym == 13) {
1486 unshift @{$self->{history}},
1487 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = '';
1363 $self->emit (activate => $self->get_text); 1490 $self->emit (activate => $txt);
1364 $self->update; 1491 $self->update;
1492
1493 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text;
1496 }
1497 if (@{$self->{history} || []} > 0) {
1498 $self->{history_pointer}++;
1499 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1500 $self->{history_pointer} = @{$self->{history} || []} - 1;
1501 }
1502 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1503 }
1504
1505 } elsif ($sym == CFClient::SDLK_DOWN) {
1506 $self->{history_pointer}--;
1507 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1508
1509 if ($self->{history_pointer} >= 0) {
1510 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1511 } else {
1512 $self->set_text ($self->{history_saveback});
1513 }
1365 1514
1366 } else { 1515 } else {
1367 $self->SUPER::key_down ($ev); 1516 $self->SUPER::key_down ($ev);
1368 } 1517 }
1369 1518
… …
1383 1532
1384sub new { 1533sub new {
1385 my $class = shift; 1534 my $class = shift;
1386 1535
1387 $class->SUPER::new ( 1536 $class->SUPER::new (
1388 padding => 4, 1537 padding => 4,
1389 fg => [1, 1, 1], 1538 fg => [1, 1, 1],
1390 bg => [1, 1, 1, 0.2], 1539 bg => [1, 1, 1, 0.2],
1391 active_fg => [0, 0, 1], 1540 active_fg => [0, 0, 1],
1392 can_hover => 1, 1541 can_hover => 1,
1393 align => 0, 1542 align => 0,
1394 valign => 0, 1543 valign => 0,
1544 can_events => 1,
1395 @_ 1545 @_
1396 ) 1546 )
1397} 1547}
1398 1548
1399sub button_up { 1549sub button_up {
… …
1504our %loaded_images; 1654our %loaded_images;
1505 1655
1506sub new { 1656sub new {
1507 my $class = shift; 1657 my $class = shift;
1508 1658
1509 my $self = $class->SUPER::new (@_); 1659 my $self = $class->SUPER::new (can_events => 0, @_);
1510 1660
1511 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1661 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1512 1662
1513 $loaded_images{$self->{image}} ||= 1663 $loaded_images{$self->{image}} ||=
1514 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1664 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1556############################################################################# 1706#############################################################################
1557 1707
1558package CFClient::UI::VGauge; 1708package CFClient::UI::VGauge;
1559 1709
1560our @ISA = CFClient::UI::Base::; 1710our @ISA = CFClient::UI::Base::;
1711
1712use List::Util qw(min max);
1561 1713
1562use CFClient::OpenGL; 1714use CFClient::OpenGL;
1563 1715
1564my %tex = ( 1716my %tex = (
1565 food => [ 1717 food => [
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1719 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1568 ], 1720 ],
1569 grace => [ 1721 grace => [
1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1722 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1723 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1572 ], 1724 ],
1573 hp => [ 1725 hp => [
1574 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1726 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1575 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1727 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1576 ], 1728 ],
1577 mana => [ 1729 mana => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1730 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1731 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1580 ], 1732 ],
1581); 1733);
1582 1734
1583# eg. VGauge->new (gauge => 'food'), default gauge: food 1735# eg. VGauge->new (gauge => 'food'), default gauge: food
1584sub new { 1736sub new {
… …
1622 1774
1623sub _draw { 1775sub _draw {
1624 my ($self) = @_; 1776 my ($self) = @_;
1625 1777
1626 my $tex = $tex{$self->{type}}; 1778 my $tex = $tex{$self->{type}};
1779 my ($t1, $t2, $t3) = @$tex;
1627 1780
1628 my ($w, $h) = ($self->{w}, $self->{h}); 1781 my ($w, $h) = ($self->{w}, $self->{h});
1629 1782
1630 if ($self->{vertical}) { 1783 if ($self->{vertical}) {
1631 glRotate 90, 0, 0, 1; 1784 glRotate 90, 0, 0, 1;
… …
1633 1786
1634 ($w, $h) = ($h, $w); 1787 ($w, $h) = ($h, $w);
1635 } 1788 }
1636 1789
1637 my $ycut = $self->{val} / ($self->{max_val} || 1); 1790 my $ycut = $self->{val} / ($self->{max_val} || 1);
1638 $ycut = 1 if $self->{val} > $self->{max_val};
1639 1791
1640 my $t1 = $tex->[0]; 1792 my $ycut1 = max 0, min 1, $ycut;
1641 my $t2 = $tex->[1]; 1793 my $ycut2 = max 0, min 1, $ycut - 1;
1794
1795 my $h1 = $self->{h} * (1 - $ycut1);
1796 my $h2 = $self->{h} * (1 - $ycut2);
1642 1797
1643 glEnable GL_BLEND; 1798 glEnable GL_BLEND;
1644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1645 glEnable GL_TEXTURE_2D; 1800 glEnable GL_TEXTURE_2D;
1646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 1802
1648 my $h1 = $self->{h} - $ycut * $self->{h};
1649 my $h2 = $ycut * $self->{h};
1650
1651 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1803 glBindTexture GL_TEXTURE_2D, $t1->{name};
1652 glBegin GL_QUADS; 1804 glBegin GL_QUADS;
1653 glTexCoord 0 , 0; glVertex 0 , 0; 1805 glTexCoord 0 , 0; glVertex 0 , 0;
1654 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1806 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1655 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1807 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1656 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1808 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1657 glEnd; 1809 glEnd;
1658 1810
1811 my $ycut1 = List::Util::min 1, $ycut;
1659 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1812 glBindTexture GL_TEXTURE_2D, $t2->{name};
1660 glBegin GL_QUADS; 1813 glBegin GL_QUADS;
1661 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1814 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1662 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1815 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1663 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1816 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1664 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1817 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1665 glEnd; 1818 glEnd;
1819
1820 if ($t3) {
1821 glBindTexture GL_TEXTURE_2D, $t3->{name};
1822 glBegin GL_QUADS;
1823 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1824 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1825 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1826 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1827 glEnd;
1828 }
1666 1829
1667 glDisable GL_BLEND; 1830 glDisable GL_BLEND;
1668 glDisable GL_TEXTURE_2D; 1831 glDisable GL_TEXTURE_2D;
1669} 1832}
1670 1833
… …
1673package CFClient::UI::Gauge; 1836package CFClient::UI::Gauge;
1674 1837
1675our @ISA = CFClient::UI::VBox::; 1838our @ISA = CFClient::UI::VBox::;
1676 1839
1677sub new { 1840sub new {
1678 my ($class, %arg) = shift; 1841 my ($class, %arg) = @_;
1679 1842
1680 my $self = $class->SUPER::new ( 1843 my $self = $class->SUPER::new (
1681 @_, 1844 tooltip => $arg{type},
1845 can_hover => 1,
1846 can_events => 1,
1847 %arg,
1682 ); 1848 );
1683 1849
1684 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1850 $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); 1851 $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"); 1852 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1687 1853
1688 $self 1854 $self
1689} 1855}
1690 1856
1691sub set_fontsize { 1857sub set_fontsize {
… …
1857 2023
1858sub new { 2024sub new {
1859 my $class = shift; 2025 my $class = shift;
1860 2026
1861 my $self = $class->SUPER::new ( 2027 my $self = $class->SUPER::new (
1862 fontsize => 1, 2028 fontsize => 1,
2029 can_events => 0,
2030 #font => default_font
1863 @_, 2031 @_,
1864 2032
1865 layout => (new CFClient::Layout), 2033 layout => (new CFClient::Layout),
1866 par => [], 2034 par => [],
1867 height => 0, 2035 height => 0,
1868 children => [ 2036 children => [
1869 (new CFClient::UI::Empty expand => 1), 2037 (new CFClient::UI::Empty expand => 1),
1870 (new CFClient::UI::Slider vertical => 1), 2038 (new CFClient::UI::Slider vertical => 1),
1871 ], 2039 ],
1872 ); 2040 );
1873 2041
… …
1907sub size_allocate { 2075sub size_allocate {
1908 my ($self, $w, $h) = @_; 2076 my ($self, $w, $h) = @_;
1909 2077
1910 $self->SUPER::size_allocate ($w, $h); 2078 $self->SUPER::size_allocate ($w, $h);
1911 2079
2080 $self->{layout}->set_font ($self->{font}) if $self->{font};
1912 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2081 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $self->{layout}->set_width ($self->{children}[0]{w}); 2082 $self->{layout}->set_width ($self->{children}[0]{w});
1914 2083
1915 $self->reflow; 2084 $self->reflow;
1916} 2085}
… …
1969 2138
1970 my $y = 0; 2139 my $y = 0;
1971 2140
1972 my $layout = $self->{layout}; 2141 my $layout = $self->{layout};
1973 2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144
1974 for my $par (@{$self->{par}}) { 2145 for my $par (@{$self->{par}}) {
1975 my $h = $par->[0]; 2146 my $h = $par->[0];
1976 2147
1977 if ($y0 < $y + $h && $y < $y1) { 2148 if ($y0 < $y + $h && $y < $y1) {
1978 $layout->set_text ($par->[2]); 2149 $layout->set_text ($par->[2]);
… …
1995 my ($self) = @_; 2166 my ($self) = @_;
1996 2167
1997 if ($self->{texture}) { 2168 if ($self->{texture}) {
1998 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1;
2000 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2001 glDisable GL_TEXTURE_2D; 2173 glDisable GL_TEXTURE_2D;
2002 } 2174 }
2003 2175
2004 $self->{children}[1]->draw; 2176 $self->{children}[1]->draw;
… …
2055 2227
2056sub new { 2228sub new {
2057 my $class = shift; 2229 my $class = shift;
2058 2230
2059 my $self = $class->SUPER::new ( 2231 my $self = $class->SUPER::new (
2060 state => 0, 2232 state => 0,
2061 connect_activate => \&toggle_flopper, 2233 connect_activate => \&toggle_flopper,
2062 @_ 2234 @_
2063 ); 2235 );
2064 2236
2065 if ($self->{state}) { 2237 if ($self->{state}) {
… …
2086 $self->emit (changed => $self->{state}); 2258 $self->emit (changed => $self->{state});
2087} 2259}
2088 2260
2089############################################################################# 2261#############################################################################
2090 2262
2263package CFClient::UI::Tooltip;
2264
2265our @ISA = CFClient::UI::Bin::;
2266
2267use CFClient::OpenGL;
2268
2269sub new {
2270 my $class = shift;
2271
2272 $class->SUPER::new (
2273 @_,
2274 can_events => 0,
2275 )
2276}
2277
2278sub set_markup {
2279 my ($self, $text) = @_;
2280
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2282 $self->{label}->set_markup ($text);
2283 $self->add ($self->{label});
2284}
2285
2286sub size_request {
2287 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292
2293 ($w + 4, $h + 4)
2294}
2295
2296sub size_allocate {
2297 my ($self, $w, $h) = @_;
2298
2299 $self->SUPER::size_allocate ($w - 4, $h - 4);
2300}
2301
2302sub _draw {
2303 my ($self) = @_;
2304
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375;
2307
2308 my ($w, $h) = @$self{qw(w h)};
2309
2310 glColor 1, 0.8, 0.4;
2311 glBegin GL_QUADS;
2312 glVertex 0 , 0;
2313 glVertex 0 , $h;
2314 glVertex $w, $h;
2315 glVertex $w, 0;
2316 glEnd;
2317
2318 glColor 0, 0, 0;
2319 glBegin GL_LINE_LOOP;
2320 glVertex 0 , 0;
2321 glVertex 0 , $h;
2322 glVertex $w, $h;
2323 glVertex $w, 0;
2324 glEnd;
2325
2326 glPopMatrix;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw;
2330}
2331
2332#############################################################################
2333
2334package CFClient::UI::Face;
2335
2336our @ISA = CFClient::UI::Base::;
2337
2338use CFClient::OpenGL;
2339
2340sub new {
2341 my $class = shift;
2342
2343 $class->SUPER::new (
2344 aspect => 1,
2345 @_,
2346 )
2347}
2348
2349sub size_request {
2350 (32, 8)
2351}
2352
2353sub draw {
2354 my ($self) = @_;
2355
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357
2358 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 }
2368}
2369
2370#############################################################################
2371
2091package CFClient::UI::Root; 2372package CFClient::UI::Root;
2092 2373
2093our @ISA = CFClient::UI::Container::; 2374our @ISA = CFClient::UI::Container::;
2094 2375
2095use CFClient::OpenGL; 2376use CFClient::OpenGL;
… …
2170############################################################################# 2451#############################################################################
2171 2452
2172package CFClient::UI; 2453package CFClient::UI;
2173 2454
2174$ROOT = new CFClient::UI::Root; 2455$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip;
2175 2457
21761 24581
2177 2459

Diff Legend

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