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.134 by root, Wed Apr 19 06:06:45 2006 UTC vs.
Revision 1.173 by root, Tue Apr 25 10:30:48 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->motion_x, $ev->motion_y); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
27 56
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;
33 }
34 62
63 check_tooltip;
64 }
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->motion_x, $ev->motion_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) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
60 99
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 100 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 101
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) = @_;
87 131
88package CFClient::UI::Base; 132package CFClient::UI::Base;
89 133
90use strict; 134use strict;
91 135
92use SDL::OpenGL; 136use CFClient::OpenGL;
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 abtract"; 204 Carp::confess "size_request is abstract";
146} 205}
147 206
148sub configure { 207sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 208 my ($self, $x, $y, $w, $h) = @_;
150 209
210 if ($self->{aspect}) {
211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
213
214 # use alignment to adjust x, y
215
216 $x += int +($w - $w2) * 0.5;
217 $y += int +($h - $h2) * 0.5;
218
219 ($w, $h) = ($w2, $h2);
220 }
221
222 if ($self->{x} != $x || $self->{y} != $y) {
151 $self->{x} = $x; 223 $self->{x} = $x;
152 $self->{y} = $y; 224 $self->{y} = $y;
225 $self->update;
226 }
153 227
154 return unless $self->{w} != $w || $self->{h} != $h; 228 if ($self->{w} != $w || $self->{h} != $h) {
155
156 $self->{w} = $w; 229 $self->{w} = $w;
157 $self->{h} = $h; 230 $self->{h} = $h;
158 231
159 $self->size_allocate ($w, $h); 232 $self->size_allocate ($w, $h);
160 $self->update; 233 $self->update;
234 }
161} 235}
162 236
163sub size_allocate { 237sub size_allocate {
164 # nothing to be done 238 # nothing to be done
239}
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;
165} 259}
166 260
167# return top left coordinates 261# return top left coordinates
168sub _topleft { 262sub _topleft {
169 my ($self, $x, $y) = @_; 263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
170 267
171 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
172} 269}
173 270
174# translate global coordinates to local coordinate system 271# translate global coordinates to local coordinate system
252 glVertex $x + $self->{w}, $y + $self->{h}; 349 glVertex $x + $self->{w}, $y + $self->{h};
253 glVertex $x , $y + $self->{h}; 350 glVertex $x , $y + $self->{h};
254 glEnd; 351 glEnd;
255 glDisable GL_BLEND; 352 glDisable GL_BLEND;
256 } 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 }
257} 368}
258 369
259sub _draw { 370sub _draw {
260 my ($self) = @_; 371 my ($self) = @_;
261 372
262 warn "no draw defined for $self\n"; 373 warn "no draw defined for $self\n";
263} 374}
264 375
265sub find_widget { 376sub find_widget {
266 my ($self, $x, $y) = @_; 377 my ($self, $x, $y) = @_;
378
379 return () unless $self->{can_events};
267 380
268 return $self 381 return $self
269 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
270 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
271 384
279} 392}
280 393
281sub check_size { 394sub check_size {
282 my ($self) = @_; 395 my ($self) = @_;
283 396
284 my ($w, $h) = $self->size_request; 397 $self->{parent}
398 or return 1;
285 399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
286 if ($w != $self->{req_w} || $h != $self->{req_h}) { 404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
287 $self->{req_w} = $w; 405 $self->{req_w} = $w;
288 $self->{req_h} = $h; 406 $self->{req_h} = $h;
289 407
290 $self->{parent}->check_size 408 $self->{parent}->check_size
291 if $self->{parent}; 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
292 } 417 }
293} 418}
294 419
295sub update { 420sub update {
296 my ($self) = @_; 421 my ($self) = @_;
306} 431}
307 432
308sub emit { 433sub emit {
309 my ($self, $signal, @args) = @_; 434 my ($self, $signal, @args) = @_;
310 435
311 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
312 $cb->($self, @args);
313 }
314} 437}
315 438
316sub DESTROY { 439sub DESTROY {
317 my ($self) = @_; 440 my ($self) = @_;
318 441
324package CFClient::UI::DrawBG; 447package CFClient::UI::DrawBG;
325 448
326our @ISA = CFClient::UI::Base::; 449our @ISA = CFClient::UI::Base::;
327 450
328use strict; 451use strict;
329use SDL::OpenGL; 452use CFClient::OpenGL;
330 453
331sub new { 454sub new {
332 my $class = shift; 455 my $class = shift;
333 456
334 # range [value, low, high, page] 457 # range [value, low, high, page]
363 486
364package CFClient::UI::Empty; 487package CFClient::UI::Empty;
365 488
366our @ISA = CFClient::UI::Base::; 489our @ISA = CFClient::UI::Base::;
367 490
491sub new {
492 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg);
494}
495
368sub size_request { 496sub size_request {
369 (0, 0) 497 (0, 0)
370} 498}
371 499
372sub draw { } 500sub draw { }
380sub new { 508sub new {
381 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
382 510
383 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
384 512
385 my $self = $class->SUPER::new (children => [], %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
386 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
387 519
388 $self 520 $self
389} 521}
390 522
401 ]; 533 ];
402 534
403 $child->check_size; 535 $child->check_size;
404} 536}
405 537
538sub children {
539 @{ $_[0]{children} }
540}
541
406sub remove { 542sub remove {
407 my ($self, $child) = @_; 543 my ($self, $child) = @_;
408 544
409 delete $child->{parent}; 545 delete $child->{parent};
546 $child->hide;
410 547
411 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
412 549
413 $self->check_size; 550 $self->check_size;
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 }
414} 564}
415 565
416sub find_widget { 566sub find_widget {
417 my ($self, $x, $y) = @_; 567 my ($self, $x, $y) = @_;
418 568
482 632
483package CFClient::UI::Window; 633package CFClient::UI::Window;
484 634
485our @ISA = CFClient::UI::Bin::; 635our @ISA = CFClient::UI::Bin::;
486 636
487use SDL::OpenGL; 637use CFClient::OpenGL;
488 638
489sub new { 639sub new {
490 my ($class, %arg) = @_; 640 my ($class, %arg) = @_;
491 641
492 my $self = $class->SUPER::new (%arg); 642 my $self = $class->SUPER::new (%arg);
546sub new { die } 696sub new { die }
547 697
548sub size_request { 698sub size_request {
549 my ($self) = @_; 699 my ($self) = @_;
550 700
551 @$self{qw(child_w child_h)} = $self->child->size_request; 701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
552 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
553 703
554 @$self{qw(child_w child_h)} 704 @$self{qw(child_w child_h)}
555} 705}
556 706
565 715
566package CFClient::UI::Frame; 716package CFClient::UI::Frame;
567 717
568our @ISA = CFClient::UI::Bin::; 718our @ISA = CFClient::UI::Bin::;
569 719
570use SDL::OpenGL; 720use CFClient::OpenGL;
571
572sub size_request {
573 my ($self) = @_;
574 my $chld = $self->child
575 or return (0, 0);
576
577 $chld->move (2, 2);
578
579 map { $_ + 4 } $chld->size_request;
580}
581
582sub size_allocate {
583 my ($self, $x, $y, $w, $h) = @_;
584
585 $self->child->configure (2, 2, $w - 4, $h - 4);
586}
587
588sub _draw {
589 my ($self) = @_;
590
591 my $chld = $self->child;
592
593 my ($w, $h) = $chld->size_request;
594
595 glBegin GL_QUADS;
596 glColor 0, 0, 0;
597 glVertex 0 , 0;
598 glVertex 0 , $h + 4;
599 glVertex $w + 4 , $h + 4;
600 glVertex $w + 4 , 0;
601 glEnd;
602
603 $chld->draw;
604}
605
606#############################################################################
607
608package CFClient::UI::FancyFrame;
609
610our @ISA = CFClient::UI::Bin::;
611
612use SDL::OpenGL;
613
614my @tex =
615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
616 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
617 721
618sub new { 722sub new {
619 my $class = shift; 723 my $class = shift;
620 724
621 # TODO: user_x, user_y, overwrite moveto?
622
623 $class->SUPER::new ( 725 my $self = $class->SUPER::new (
624 bg => [1, 1, 1, 1], 726 bg => [1, 1, 1, 1],
625 border_bg => [1, 1, 1, 1], 727 border_bg => [1, 1, 1, 1],
626 border => 0.8, 728 border => 0.8,
627 @_ 729 @_
628 ) 730 );
731
732 $self
733}
734
735sub _draw {
736 my ($self) = @_;
737
738 my ($w, $h) = ($self->{w}, $self->{h});
739
740 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744
745# glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0;
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752
753
754 $self->child->draw;
755 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D;
757}
758
759#############################################################################
760
761package CFClient::UI::FancyFrame;
762
763our @ISA = CFClient::UI::Bin::;
764
765use CFClient::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770
771sub new {
772 my $class = shift;
773
774 # TODO: user_x, user_y, overwrite moveto?
775
776 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1],
779 border => 0.8,
780 can_events => 1,
781 @_
782 );
783
784 $self->{title} &&= new CFClient::UI::Label
785 align => 0,
786 valign => 1,
787 text => $self->{title},
788 fontsize => 1;
789
790 $self
629} 791}
630 792
631sub border { 793sub border {
632 int $_[0]{border} * $::FONTSIZE 794 int $_[0]{border} * $::FONTSIZE
633} 795}
634 796
635sub size_request { 797sub size_request {
636 my ($self) = @_; 798 my ($self) = @_;
637
638 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
639 799
640 my ($w, $h) = $self->SUPER::size_request; 800 my ($w, $h) = $self->SUPER::size_request;
641 801
642 ( 802 (
643 $w + $self->border * 2, 803 $w + $self->border * 2,
649 my ($self, $w, $h) = @_; 809 my ($self, $w, $h) = @_;
650 810
651 $h -= List::Util::max 0, $self->border * 2; 811 $h -= List::Util::max 0, $self->border * 2;
652 $w -= List::Util::max 0, $self->border * 2; 812 $w -= List::Util::max 0, $self->border * 2;
653 813
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
815 if $self->{title};
816
654 $self->child->configure ($self->border, $self->border, $w, $h); 817 $self->child->configure ($self->border, $self->border, $w, $h);
655} 818}
656 819
657sub button_down { 820sub button_down {
658 my ($self, $ev, $x, $y) = @_; 821 my ($self, $ev, $x, $y) = @_;
660 my $border = $self->border; 823 my $border = $self->border;
661 824
662 if ($x < $self->{w} && $x >= $self->{w} - $border 825 if ($x < $self->{w} && $x >= $self->{w} - $border
663 && $y < $self->{h} && $y >= $self->{h} - $border) { 826 && $y < $self->{h} && $y >= $self->{h} - $border) {
664 827
665 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 828 my ($ox, $oy) = ($ev->{x}, $ev->{y});
666 my ($bw, $bh) = ($self->{w}, $self->{h}); 829 my ($bw, $bh) = ($self->{w}, $self->{h});
667 830
668 $self->{motion} = sub { 831 $self->{motion} = sub {
669 my ($ev, $x, $y) = @_; 832 my ($ev, $x, $y) = @_;
670 833
671 ($x, $y) = ($ev->motion_x, $ev->motion_y); 834 ($x, $y) = ($ev->{x}, $ev->{y});
672 835
673 $self->{user_w} = $bw + $x - $ox; 836 $self->{user_w} = $bw + $x - $ox;
674 $self->{user_h} = $bh + $y - $oy; 837 $self->{user_h} = $bh + $y - $oy;
675 $self->check_size; 838 $self->check_size;
676 }; 839 };
677 840
678 } elsif ($x >= 0 && $x < $self->{w} 841 } elsif ($x >= 0 && $x < $self->{w}
679 && $y >= 0 && $y < $border) { 842 && $y >= 0 && $y < $border) {
680 843
681 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 844 my ($ox, $oy) = ($ev->{x}, $ev->{y});
682 my ($bx, $by) = ($self->{x}, $self->{y}); 845 my ($bx, $by) = ($self->{x}, $self->{y});
683 846
684 $self->{motion} = sub { 847 $self->{motion} = sub {
685 my ($ev, $x, $y) = @_; 848 my ($ev, $x, $y) = @_;
686 849
687 ($x, $y) = ($ev->motion_x, $ev->motion_y); 850 ($x, $y) = ($ev->{x}, $ev->{y});
688 851
689 $self->move ($bx + $x - $ox, $by + $y - $oy); 852 $self->move ($bx + $x - $ox, $by + $y - $oy);
690 $self->update; 853 $self->update;
691 }; 854 };
692 } 855 }
737 $bg->draw_quad ($border, $border, $cw, $ch); 900 $bg->draw_quad ($border, $border, $cw, $ch);
738 901
739 glDisable GL_TEXTURE_2D; 902 glDisable GL_TEXTURE_2D;
740 glDisable GL_BLEND; 903 glDisable GL_BLEND;
741 904
905 $self->{title}->draw if $self->{title};
742 $self->child->draw; 906 $self->child->draw;
743} 907}
744 908
745############################################################################# 909#############################################################################
746 910
748 912
749our @ISA = CFClient::UI::Base::; 913our @ISA = CFClient::UI::Base::;
750 914
751use List::Util qw(max sum); 915use List::Util qw(max sum);
752 916
753use SDL::OpenGL; 917use CFClient::OpenGL;
754 918
755sub new { 919sub new {
756 my $class = shift; 920 my $class = shift;
757 921
758 $class->SUPER::new ( 922 $class->SUPER::new (
768 $self->{children}[$y][$x] = $child; 932 $self->{children}[$y][$x] = $child;
769 933
770 $child->check_size; 934 $child->check_size;
771} 935}
772 936
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
773# 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?
774sub clear { 942sub clear {
775 my ($self) = @_; 943 my ($self) = @_;
776 944
945 my @children = $self->children;
777 delete $self->{children}; 946 delete $self->{children};
947
948 for (@children) {
949 delete $_->{parent};
950 $_->hide;
951 }
952
778 $self->update; 953 $self->update;
779} 954}
780 955
781sub get_wh { 956sub get_wh {
782 my ($self) = @_; 957 my ($self) = @_;
788 or next; 963 or next;
789 964
790 for my $x (0 .. $#$row) { 965 for my $x (0 .. $#$row) {
791 my $widget = $row->[$x] 966 my $widget = $row->[$x]
792 or next; 967 or next;
793 my ($w, $h) = $widget->size_request; 968 my ($w, $h) = @$widget{qw(req_w req_h)};
794 969
795 $w[$x] = max $w[$x], $w; 970 $w[$x] = max $w[$x], $w;
796 $h[$y] = max $h[$y], $h; 971 $h[$y] = max $h[$y], $h;
797 } 972 }
798 } 973 }
903 1078
904 ($h, $w) = ($w, $h); 1079 ($h, $w) = ($w, $h);
905 1080
906 my $children = $self->{children}; 1081 my $children = $self->{children};
907 1082
908 my @h = map +($_->size_request)[0], @$children; 1083 my @h = map $_->{req_w}, @$children;
909 1084
910 my $req_h = List::Util::sum @h; 1085 my $req_h = List::Util::sum @h;
911 1086
912 if ($req_h > $h) { 1087 if ($req_h > $h) {
913 # ah well, not enough space 1088 # ah well, not enough space
961sub size_allocate { 1136sub size_allocate {
962 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
963 1138
964 my $children = $self->{children}; 1139 my $children = $self->{children};
965 1140
966 my @h = map +($_->size_request)[1], @$children; 1141 my @h = map $_->{req_h}, @$children;
967 1142
968 my $req_h = List::Util::sum @h; 1143 my $req_h = List::Util::sum @h;
969 1144
970 if ($req_h > $h) { 1145 if ($req_h > $h) {
971 # ah well, not enough space 1146 # ah well, not enough space
999 1174
1000package CFClient::UI::Label; 1175package CFClient::UI::Label;
1001 1176
1002our @ISA = CFClient::UI::Base::; 1177our @ISA = CFClient::UI::Base::;
1003 1178
1004use SDL::OpenGL; 1179use CFClient::OpenGL;
1005 1180
1006sub new { 1181sub new {
1007 my ($class, %arg) = @_; 1182 my ($class, %arg) = @_;
1008 1183
1009 my $self = $class->SUPER::new ( 1184 my $self = $class->SUPER::new (
1010 fg => [1, 1, 1], 1185 fg => [1, 1, 1],
1186 #font => default_font
1011 fontsize => 1, 1187 fontsize => 1,
1012 text => "", 1188 text => "",
1013 align => -1, 1189 align => -1,
1014 valign => -1, 1190 valign => -1,
1015 padding => 2, 1191 padding => 2,
1016 layout => new CFClient::Layout, 1192 layout => new CFClient::Layout,
1193 can_events => 0,
1017 %arg 1194 %arg
1018 ); 1195 );
1019 1196
1020 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1197 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout;
1201 }
1021 1202
1022 $self->set_text (delete $self->{text}) if exists $self->{text}; 1203 $self->set_text (delete $self->{text}) if exists $self->{text};
1023 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1024 1205
1025 $self 1206 $self
1026} 1207}
1027 1208
1028sub escape_text { 1209sub escape {
1029 local $_ = $_[1]; 1210 local $_ = $_[1];
1030 1211
1031 s/&/&amp;/g; 1212 s/&/&amp;/g;
1032 s/>/&gt;/g; 1213 s/>/&gt;/g;
1033 s/</&lt;/g; 1214 s/</&lt;/g;
1034 1215
1035 $_[1] 1216 $_[1]
1036} 1217}
1037 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
1038sub set_text { 1232sub set_text {
1039 my ($self, $text) = @_; 1233 my ($self, $text) = @_;
1040 1234
1235 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text";
1237
1041 $self->{layout}->set_text ($text); 1238 $self->{layout}->set_text ($text);
1042 1239
1043 delete $self->{texture}; 1240 delete $self->{texture};
1044 $self->update; 1241 $self->update;
1242 $self->check_size;
1045} 1243}
1046 1244
1047sub set_markup { 1245sub set_markup {
1048 my ($self, $markup) = @_; 1246 my ($self, $markup) = @_;
1049 1247
1248 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup";
1250
1050 $self->{layout}->set_markup ($markup); 1251 $self->{layout}->set_markup ($markup);
1051 1252
1052 delete $self->{texture}; 1253 delete $self->{texture};
1053 $self->update; 1254 $self->update;
1255 $self->check_size;
1054} 1256}
1055 1257
1056sub size_request { 1258sub size_request {
1057 my ($self) = @_; 1259 my ($self) = @_;
1058 1260
1059 $self->{layout}->set_width; 1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1);
1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061 1264
1062 my ($w, $h) = $self->{layout}->size; 1265 my ($w, $h) = $self->{layout}->size;
1266
1267 if (exists $self->{template}) {
1268 $self->{template}->set_font ($self->{font}) if $self->{font};
1269 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1270
1271 my ($w2, $h2) = $self->{template}->size;
1272
1273 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2;
1275 }
1063 1276
1064 ( 1277 (
1065 $w + $self->{padding} * 2, 1278 $w + $self->{padding} * 2,
1066 $h + $self->{padding} * 2, 1279 $h + $self->{padding} * 2,
1067 ) 1280 )
1071 my ($self, $w, $h) = @_; 1284 my ($self, $w, $h) = @_;
1072 1285
1073 delete $self->{texture}; 1286 delete $self->{texture};
1074} 1287}
1075 1288
1289sub set_fontsize {
1290 my ($self, $fontsize) = @_;
1291
1292 $self->{fontsize} = $fontsize;
1293 delete $self->{texture};
1294 $self->check_size;
1295 $self->update;
1296}
1297
1076sub _draw { 1298sub _draw {
1077 my ($self) = @_; 1299 my ($self) = @_;
1078 1300
1079 my $tex = $self->{texture} ||= do { 1301 my $tex = $self->{texture} ||= do {
1302 $self->{layout}->set_font ($self->{font}) if $self->{font};
1080 $self->{layout}->set_width ($self->{w}); 1303 $self->{layout}->set_width ($self->{w});
1081 $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);
1082 new_from_layout CFClient::Texture $self->{layout} 1305 new_from_layout CFClient::Texture $self->{layout}
1083 }; 1306 };
1084 1307
1111 1334
1112package CFClient::UI::EntryBase; 1335package CFClient::UI::EntryBase;
1113 1336
1114our @ISA = CFClient::UI::Label::; 1337our @ISA = CFClient::UI::Label::;
1115 1338
1116use SDL; 1339use CFClient::OpenGL;
1117use SDL::OpenGL;
1118 1340
1119sub new { 1341sub new {
1120 my $class = shift; 1342 my $class = shift;
1121 1343
1122 $class->SUPER::new ( 1344 $class->SUPER::new (
1123 fg => [1, 1, 1], 1345 fg => [1, 1, 1],
1124 bg => [0, 0, 0, 0.2], 1346 bg => [0, 0, 0, 0.2],
1125 active_bg => [1, 1, 1, 0.5], 1347 active_bg => [1, 1, 1, 0.5],
1126 active_fg => [0, 0, 0], 1348 active_fg => [0, 0, 0],
1127 can_hover => 1, 1349 can_hover => 1,
1128 can_focus => 1, 1350 can_focus => 1,
1129 valign => 0, 1351 valign => 0,
1352 can_events => 1,
1130 @_ 1353 @_
1131 ) 1354 )
1132} 1355}
1133 1356
1134sub _set_text { 1357sub _set_text {
1162} 1385}
1163 1386
1164sub size_allocate { 1387sub size_allocate {
1165 my ($self, $w, $h) = @_; 1388 my ($self, $w, $h) = @_;
1166 1389
1167 $self->_set_text ($self->{text}); 1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1168} 1391}
1169 1392
1170sub set_text { 1393sub set_text {
1171 my ($self, $text) = @_; 1394 my ($self, $text) = @_;
1172 1395
1176} 1399}
1177 1400
1178sub key_down { 1401sub key_down {
1179 my ($self, $ev) = @_; 1402 my ($self, $ev) = @_;
1180 1403
1181 my $mod = $ev->key_mod; 1404 my $mod = $ev->{mod};
1182 my $sym = $ev->key_sym; 1405 my $sym = $ev->{sym};
1183
1184 my $uni = $ev->key_unicode; 1406 my $uni = $ev->{unicode};
1185 1407
1186 my $text = $self->get_text; 1408 my $text = $self->get_text;
1187 1409
1188 if ($sym == SDLK_BACKSPACE) { 1410 if ($sym == 8) {
1189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1190 } elsif ($sym == SDLK_DELETE) { 1412 } elsif ($sym == 127) {
1191 substr $text, $self->{cursor}, 1, ""; 1413 substr $text, $self->{cursor}, 1, "";
1192 } elsif ($sym == SDLK_LEFT) { 1414 } elsif ($sym == CFClient::SDLK_LEFT) {
1193 --$self->{cursor} if $self->{cursor}; 1415 --$self->{cursor} if $self->{cursor};
1194 } elsif ($sym == SDLK_RIGHT) { 1416 } elsif ($sym == CFClient::SDLK_RIGHT) {
1195 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1417 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1196 } elsif ($sym == SDLK_HOME) { 1418 } elsif ($sym == CFClient::SDLK_HOME) {
1197 $self->{cursor} = 0; 1419 $self->{cursor} = 0;
1198 } elsif ($sym == SDLK_END) { 1420 } elsif ($sym == CFClient::SDLK_END) {
1199 $self->{cursor} = length $text; 1421 $self->{cursor} = length $text;
1200 } elsif ($sym == SDLK_ESCAPE) { 1422 } elsif ($sym == 27) {
1201 $self->emit ('escape'); 1423 $self->emit ('escape');
1202 } elsif ($uni) { 1424 } elsif ($uni) {
1203 substr $text, $self->{cursor}++, 0, chr $uni; 1425 substr $text, $self->{cursor}++, 0, chr $uni;
1204 } 1426 }
1205 1427
1280 1502
1281package CFClient::UI::Entry; 1503package CFClient::UI::Entry;
1282 1504
1283our @ISA = CFClient::UI::EntryBase::; 1505our @ISA = CFClient::UI::EntryBase::;
1284 1506
1285use SDL; 1507use CFClient::OpenGL;
1286use SDL::OpenGL;
1287 1508
1288sub key_down { 1509sub key_down {
1289 my ($self, $ev) = @_; 1510 my ($self, $ev) = @_;
1290 1511
1291 my $sym = $ev->key_sym; 1512 my $sym = $ev->{sym};
1292 1513
1293 if ($sym == SDLK_RETURN) { 1514 if ($sym == 13) {
1515 unshift @{$self->{history}},
1516 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = '';
1294 $self->emit (activate => $self->get_text); 1519 $self->emit (activate => $txt);
1295 $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 }
1296 1543
1297 } else { 1544 } else {
1298 $self->SUPER::key_down ($ev); 1545 $self->SUPER::key_down ($ev);
1299 } 1546 }
1300 1547
1304 1551
1305package CFClient::UI::Button; 1552package CFClient::UI::Button;
1306 1553
1307our @ISA = CFClient::UI::Label::; 1554our @ISA = CFClient::UI::Label::;
1308 1555
1309use SDL; 1556use CFClient::OpenGL;
1310use SDL::OpenGL;
1311 1557
1312my @tex = 1558my @tex =
1313 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1314 qw(b1_button_active.png); 1560 qw(b1_button_active.png);
1315 1561
1316sub new { 1562sub new {
1317 my $class = shift; 1563 my $class = shift;
1318 1564
1319 $class->SUPER::new ( 1565 $class->SUPER::new (
1320 padding => 4, 1566 padding => 4,
1321 fg => [1, 1, 1], 1567 fg => [1, 1, 1],
1322 bg => [1, 1, 1, 0.2], 1568 bg => [1, 1, 1, 0.2],
1323 active_fg => [0, 0, 1], 1569 active_fg => [0, 0, 1],
1324 can_hover => 1, 1570 can_hover => 1,
1325 align => 0, 1571 align => 0,
1326 valign => 0, 1572 valign => 0,
1573 can_events => 1,
1327 @_ 1574 @_
1328 ) 1575 )
1329} 1576}
1330 1577
1331sub button_up { 1578sub button_up {
1365package CFClient::UI::CheckBox; 1612package CFClient::UI::CheckBox;
1366 1613
1367our @ISA = CFClient::UI::DrawBG::; 1614our @ISA = CFClient::UI::DrawBG::;
1368 1615
1369my @tex = 1616my @tex =
1370 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1371 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1618 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1372 1619
1373use SDL; 1620use CFClient::OpenGL;
1374use SDL::OpenGL;
1375 1621
1376sub new { 1622sub new {
1377 my $class = shift; 1623 my $class = shift;
1378 1624
1379 $class->SUPER::new ( 1625 $class->SUPER::new (
1425 glDisable GL_BLEND; 1671 glDisable GL_BLEND;
1426} 1672}
1427 1673
1428############################################################################# 1674#############################################################################
1429 1675
1430package CFClient::UI::VGauge; 1676package CFClient::UI::Image;
1431 1677
1432our @ISA = CFClient::UI::Base::; 1678our @ISA = CFClient::UI::Base::;
1433 1679
1434use SDL::OpenGL; 1680use CFClient::OpenGL;
1681use Carp qw/confess/;
1435 1682
1436my %tex = ( 1683our %loaded_images;
1437 food => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1439 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1440 ],
1441 grace => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1443 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1444 ],
1445 hp => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1448 ],
1449 mana => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1452 ],
1453);
1454 1684
1455# eg. VGauge->new (gauge => 'food'), default gauge: food
1456sub new { 1685sub new {
1457 my $class = shift; 1686 my $class = shift;
1458 1687
1459 my $self = $class->SUPER::new (gauge => 'food', @_); 1688 my $self = $class->SUPER::new (can_events => 0, @_);
1689
1690 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1691
1692 $loaded_images{$self->{image}} ||=
1693 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1694
1695 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1696
1697 Scalar::Util::weaken $loaded_images{$self->{image}};
1698
1699 $self->{aspect} = $tex->{w} / $tex->{h};
1460 1700
1461 $self 1701 $self
1462} 1702}
1463 1703
1464sub size_request { 1704sub size_request {
1465 my ($self) = @_; 1705 my ($self) = @_;
1466 1706
1467 my $tex = $tex{$self->{gauge}}[0]; 1707 ($self->{tex}->{w}, $self->{tex}->{h})
1468
1469 @$tex{qw(w h)}
1470}
1471
1472sub set_max {
1473 my ($self, $max) = @_;
1474
1475 $self->{max_val} = $max;
1476}
1477
1478sub set_value {
1479 my ($self, $val, $max) = @_;
1480
1481 $self->set_max ($max)
1482 if defined $max;
1483
1484 $max = $self->{max_val};
1485 $self->{val} = $val;
1486
1487 $self->update;
1488} 1708}
1489 1709
1490sub _draw { 1710sub _draw {
1491 my ($self) = @_; 1711 my ($self) = @_;
1492 1712
1493 my $tex = $tex{$self->{gauge}}; 1713 my $tex = $self->{tex};
1494 1714
1495 my ($w, $h) = ($self->{w}, $self->{h}); 1715 my ($w, $h) = ($self->{w}, $self->{h});
1496 1716
1497 my $ycut = $self->{val} / ($self->{max_val} || 1); 1717 if ($self->{rot90}) {
1498 $ycut = 1 if $self->{val} > $self->{max_val}; 1718 glRotate 90, 0, 0, 1;
1719 glTranslate 0, -$self->{w}, 0;
1499 1720
1500 my $t1 = $tex->[0]; 1721 ($w, $h) = ($h, $w);
1501 my $t2 = $tex->[1]; 1722 }
1502 1723
1503 glEnable GL_BLEND; 1724 glEnable GL_BLEND;
1504 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1505 glEnable GL_TEXTURE_2D; 1726 glEnable GL_TEXTURE_2D;
1506 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1507 1728
1729 $tex->draw_quad (0, 0, $w, $h);
1730
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D;
1733}
1734
1735#############################################################################
1736
1737package CFClient::UI::VGauge;
1738
1739our @ISA = CFClient::UI::Base::;
1740
1741use List::Util qw(min max);
1742
1743use CFClient::OpenGL;
1744
1745my %tex = (
1746 food => [
1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1749 ],
1750 grace => [
1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1752 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1753 ],
1754 hp => [
1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1757 ],
1758 mana => [
1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1760 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1761 ],
1762);
1763
1764# eg. VGauge->new (gauge => 'food'), default gauge: food
1765sub new {
1766 my $class = shift;
1767
1768 my $self = $class->SUPER::new (
1769 type => 'food',
1770 @_
1771 );
1772
1773 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1774
1775 $self
1776}
1777
1778sub size_request {
1779 my ($self) = @_;
1780
1781 #my $tex = $tex{$self->{type}}[0];
1782 #@$tex{qw(w h)}
1783 (0, 0)
1784}
1785
1786sub set_max {
1787 my ($self, $max) = @_;
1788
1789 return if $self->{max_val} == $max;
1790
1791 $self->{max_val} = $max;
1792 $self->update;
1793}
1794
1795sub set_value {
1796 my ($self, $val, $max) = @_;
1797
1798 $self->set_max ($max)
1799 if defined $max;
1800
1801 return if $self->{val} == $val;
1802
1803 $self->{val} = $val;
1804 $self->update;
1805}
1806
1807sub _draw {
1808 my ($self) = @_;
1809
1810 my $tex = $tex{$self->{type}};
1811 my ($t1, $t2, $t3) = @$tex;
1812
1813 my ($w, $h) = ($self->{w}, $self->{h});
1814
1815 if ($self->{vertical}) {
1816 glRotate 90, 0, 0, 1;
1817 glTranslate 0, -$self->{w}, 0;
1818
1819 ($w, $h) = ($h, $w);
1820 }
1821
1822 my $ycut = $self->{val} / ($self->{max_val} || 1);
1823
1824 my $ycut1 = max 0, min 1, $ycut;
1825 my $ycut2 = max 0, min 1, $ycut - 1;
1826
1508 my $h1 = $self->{h} - $ycut * $self->{h}; 1827 my $h1 = $self->{h} * (1 - $ycut1);
1509 my $h2 = $ycut * $self->{h}; 1828 my $h2 = $self->{h} * (1 - $ycut2);
1510 1829
1511 my $yp = 0; 1830 glEnable GL_BLEND;
1831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1832 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512 1834
1513 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1835 glBindTexture GL_TEXTURE_2D, $t1->{name};
1514 glBegin GL_QUADS; 1836 glBegin GL_QUADS;
1515 glTexCoord 0 , 0; glVertex 0 , $yp; 1837 glTexCoord 0 , 0; glVertex 0 , 0;
1516 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1838 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1517 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1839 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1518 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1840 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1519 glEnd; 1841 glEnd;
1520 1842
1521 $yp += $h1; 1843 my $ycut1 = List::Util::min 1, $ycut;
1522
1523 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1844 glBindTexture GL_TEXTURE_2D, $t2->{name};
1524 glBegin GL_QUADS; 1845 glBegin GL_QUADS;
1525 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1846 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1526 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1847 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1527 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1528 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1848 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1849 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1529 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 }
1530 1861
1531 glDisable GL_BLEND; 1862 glDisable GL_BLEND;
1532 glDisable GL_TEXTURE_2D; 1863 glDisable GL_TEXTURE_2D;
1533} 1864}
1534 1865
1535############################################################################# 1866#############################################################################
1536 1867
1868package CFClient::UI::Gauge;
1869
1870our @ISA = CFClient::UI::VBox::;
1871
1872sub new {
1873 my ($class, %arg) = @_;
1874
1875 my $self = $class->SUPER::new (
1876 tooltip => $arg{type},
1877 can_hover => 1,
1878 can_events => 1,
1879 %arg,
1880 );
1881
1882 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1883 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1884 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1885
1886 $self
1887}
1888
1889sub set_fontsize {
1890 my ($self, $fsize) = @_;
1891
1892 $self->{value}->set_fontsize ($fsize);
1893 $self->{max} ->set_fontsize ($fsize);
1894}
1895
1896sub set_max {
1897 my ($self, $max) = @_;
1898
1899 $self->{gauge}->set_max ($max);
1900 $self->{max}->set_text ($max);
1901}
1902
1903sub set_value {
1904 my ($self, $val, $max) = @_;
1905
1906 $self->set_max ($max)
1907 if defined $max;
1908
1909 $self->{gauge}->set_value ($val, $max);
1910 $self->{value}->set_text ($val);
1911}
1912
1913#############################################################################
1914
1537package CFClient::UI::Slider; 1915package CFClient::UI::Slider;
1538 1916
1539use strict; 1917use strict;
1540 1918
1541use SDL::OpenGL; 1919use CFClient::OpenGL;
1542 1920
1543our @ISA = CFClient::UI::DrawBG::; 1921our @ISA = CFClient::UI::DrawBG::;
1544 1922
1545my @tex = 1923my @tex =
1546 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1924 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1671 2049
1672package CFClient::UI::TextView; 2050package CFClient::UI::TextView;
1673 2051
1674our @ISA = CFClient::UI::HBox::; 2052our @ISA = CFClient::UI::HBox::;
1675 2053
1676use SDL::OpenGL; 2054use CFClient::OpenGL;
1677 2055
1678sub new { 2056sub new {
1679 my $class = shift; 2057 my $class = shift;
1680 2058
1681 my $self = $class->SUPER::new ( 2059 my $self = $class->SUPER::new (
1682 fontsize => 1, 2060 fontsize => 1,
2061 can_events => 0,
2062 #font => default_font
1683 @_, 2063 @_,
1684 2064
1685 layout => (new CFClient::Layout), 2065 layout => (new CFClient::Layout),
1686 par => [], 2066 par => [],
1687 height => 0, 2067 height => 0,
1688 children => [ 2068 children => [
1689 (new CFClient::UI::Empty expand => 1), 2069 (new CFClient::UI::Empty expand => 1),
1690 (new CFClient::UI::Slider vertical => 1), 2070 (new CFClient::UI::Slider vertical => 1),
1691 ], 2071 ],
1692 ); 2072 );
1693 2073
1727sub size_allocate { 2107sub size_allocate {
1728 my ($self, $w, $h) = @_; 2108 my ($self, $w, $h) = @_;
1729 2109
1730 $self->SUPER::size_allocate ($w, $h); 2110 $self->SUPER::size_allocate ($w, $h);
1731 2111
2112 $self->{layout}->set_font ($self->{font}) if $self->{font};
1732 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1733 $self->{layout}->set_width ($self->{children}[0]{w}); 2114 $self->{layout}->set_width ($self->{children}[0]{w});
1734 2115
1735 $self->reflow; 2116 $self->reflow;
1736} 2117}
1789 2170
1790 my $y = 0; 2171 my $y = 0;
1791 2172
1792 my $layout = $self->{layout}; 2173 my $layout = $self->{layout};
1793 2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176
1794 for my $par (@{$self->{par}}) { 2177 for my $par (@{$self->{par}}) {
1795 my $h = $par->[0]; 2178 my $h = $par->[0];
1796 2179
1797 if ($y0 < $y + $h && $y < $y1) { 2180 if ($y0 < $y + $h && $y < $y1) {
1798 $layout->set_text ($par->[2]); 2181 $layout->set_text ($par->[2]);
1815 my ($self) = @_; 2198 my ($self) = @_;
1816 2199
1817 if ($self->{texture}) { 2200 if ($self->{texture}) {
1818 glEnable GL_TEXTURE_2D; 2201 glEnable GL_TEXTURE_2D;
1819 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;
1820 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1821 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
1822 } 2206 }
1823 2207
1824 $self->{children}[1]->draw; 2208 $self->{children}[1]->draw;
1825 2209
1826} 2210}
1827 2211
1828############################################################################# 2212#############################################################################
1829 2213
1830package CFClient::UI::MapWidget;
1831
1832use strict;
1833
1834use List::Util qw(min max);
1835
1836use SDL;
1837use SDL::OpenGL;
1838
1839our @ISA = CFClient::UI::Base::;
1840
1841sub new {
1842 my $class = shift;
1843
1844 $class->SUPER::new (
1845 z => -1,
1846 can_focus => 1,
1847 list => (glGenLists 1),
1848 @_
1849 )
1850}
1851
1852sub key_down {
1853 print "MAPKEYDOWN\n";
1854}
1855
1856sub key_up {
1857}
1858
1859sub button_down {
1860 my ($self, $ev, $x, $y) = @_;
1861
1862 $self->focus_in;
1863
1864 if ($ev->button == 2) {
1865 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1866 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1867
1868 $self->{motion} = sub {
1869 my ($ev, $x, $y) = @_;
1870
1871 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1872
1873 $::CFG->{map_shift_x} = $bw + $x - $ox;
1874 $::CFG->{map_shift_y} = $bh + $y - $oy;
1875
1876 $self->update;
1877 };
1878 }
1879}
1880
1881sub button_up {
1882 my ($self, $ev, $x, $y) = @_;
1883
1884 delete $self->{motion};
1885}
1886
1887sub mouse_motion {
1888 my ($self, $ev, $x, $y) = @_;
1889
1890 $self->{motion}->($ev, $x, $y) if $self->{motion};
1891}
1892
1893sub size_request {
1894 (
1895 1 + 32 * int $::WIDTH / 32,
1896 1 + 32 * int $::HEIGHT / 32,
1897 )
1898}
1899
1900sub update {
1901 my ($self) = @_;
1902
1903 $self->{need_update} = 1;
1904 $self->SUPER::update;
1905}
1906
1907sub draw {
1908 my ($self) = @_;
1909
1910 if (delete $self->{need_update}) {
1911 glNewList $self->{list}, GL_COMPILE;
1912
1913 if ($::MAP) {
1914 my $sw = int $::WIDTH / 32;
1915 my $sh = int $::HEIGHT / 32;
1916
1917 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1918 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1919
1920 glTranslate $sx0 - 32, $sy0 - 32, 0;
1921
1922 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1923
1924 if ($::CFG->{fow_enable}) {
1925 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1926 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1927 glConvolutionFilter2D (
1928 GL_CONVOLUTION_2D,
1929 GL_ALPHA,
1930 3, 3,
1931 GL_ALPHA, GL_FLOAT,
1932 pack "f*",
1933 0.1, 0.1, 0.1,
1934 0.1, 0.2, 0.1,
1935 0.1, 0.1, 0.1,
1936 );
1937 glEnable GL_CONVOLUTION_2D;
1938 }
1939
1940 $self->{fow_texture} = new CFClient::Texture
1941 w => $w,
1942 h => $h,
1943 data => $data,
1944 internalformat => GL_ALPHA,
1945 format => GL_ALPHA;
1946
1947 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1948
1949 glEnable GL_BLEND;
1950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1951 glEnable GL_TEXTURE_2D;
1952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1953
1954 glColor +($::CFG->{fow_intensity}) x 3, 1;
1955 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1956
1957 glDisable GL_TEXTURE_2D;
1958 glDisable GL_BLEND;
1959 }
1960
1961 # HACK BEGIN
1962 {
1963 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1964 my ($w, $h) = (250, 250);
1965
1966 glEnable GL_BLEND;
1967 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1968 glEnable GL_TEXTURE_2D;
1969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1970
1971 $self->{mapmap_texture} =
1972 new CFClient::Texture
1973 w => $w,
1974 h => $h,
1975 data => $::MAP->mapmap ($w, $h),
1976 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1977
1978 $self->{mapmap_texture}->draw_quad (100, 100);
1979
1980 glDisable GL_TEXTURE_2D;
1981 glDisable GL_BLEND;
1982 }
1983 # HACK END
1984 }
1985
1986 glEndList;
1987 }
1988
1989 glPushMatrix;
1990 glCallList $self->{list};
1991 glPopMatrix;
1992
1993 if ($FOCUS != $self) {
1994 glColor 64/255, 64/255, 64/255;
1995 glLogicOp GL_AND;
1996 glEnable GL_COLOR_LOGIC_OP;
1997 glBegin GL_QUADS;
1998 glVertex 0, 0;
1999 glVertex 0, $::HEIGHT;
2000 glVertex $::WIDTH, $::HEIGHT;
2001 glVertex $::WIDTH, 0;
2002 glEnd;
2003 glDisable GL_COLOR_LOGIC_OP;
2004 }
2005}
2006
2007my %DIR = (
2008 SDLK_KP8, [1, "north"],
2009 SDLK_KP9, [2, "northeast"],
2010 SDLK_KP6, [3, "east"],
2011 SDLK_KP3, [4, "southeast"],
2012 SDLK_KP2, [5, "south"],
2013 SDLK_KP1, [6, "southwest"],
2014 SDLK_KP4, [7, "west"],
2015 SDLK_KP7, [8, "northwest"],
2016
2017 SDLK_UP, [1, "north"],
2018 SDLK_RIGHT, [3, "east"],
2019 SDLK_DOWN, [5, "south"],
2020 SDLK_LEFT, [7, "west"],
2021);
2022
2023sub key_down {
2024 my ($self, $ev) = @_;
2025
2026 my $mod = $ev->key_mod;
2027 my $sym = $ev->key_sym;
2028
2029 if ($sym == SDLK_KP5) {
2030 $::CONN->user_send ("stay fire");
2031 } elsif ($sym == SDLK_a) {
2032 $::CONN->user_send ("apply");
2033 } elsif ($sym == SDLK_QUOTE) {
2034 $self->emit ('activate_console');
2035 } elsif ($sym == SDLK_SLASH) {
2036 $self->emit ('activate_console' => '/');
2037 } elsif (exists $DIR{$sym}) {
2038 if ($mod & KMOD_SHIFT) {
2039 $self->{shft}++;
2040 $::CONN->user_send ("fire $DIR{$sym}[0]");
2041 } elsif ($mod & KMOD_CTRL) {
2042 $self->{ctrl}++;
2043 $::CONN->user_send ("run $DIR{$sym}[0]");
2044 } else {
2045 $::CONN->user_send ("$DIR{$sym}[1]");
2046 }
2047 }
2048}
2049
2050sub key_up {
2051 my ($self, $ev) = @_;
2052
2053 my $mod = $ev->key_mod;
2054 my $sym = $ev->key_sym;
2055
2056 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2057 $::CONN->user_send ("fire_stop");
2058 }
2059 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2060 $::CONN->user_send ("run_stop");
2061 }
2062}
2063
2064#############################################################################
2065
2066package CFClient::UI::Animator; 2214package CFClient::UI::Animator;
2067 2215
2068use SDL::OpenGL; 2216use CFClient::OpenGL;
2069 2217
2070our @ISA = CFClient::UI::Bin::; 2218our @ISA = CFClient::UI::Bin::;
2071 2219
2072sub moveto { 2220sub moveto {
2073 my ($self, $x, $y) = @_; 2221 my ($self, $x, $y) = @_;
2111 2259
2112sub new { 2260sub new {
2113 my $class = shift; 2261 my $class = shift;
2114 2262
2115 my $self = $class->SUPER::new ( 2263 my $self = $class->SUPER::new (
2116 state => 0, 2264 state => 0,
2117 connect_activate => \&toggle_flopper, 2265 connect_activate => \&toggle_flopper,
2118 @_ 2266 @_
2119 ); 2267 );
2120 2268
2121 if ($self->{state}) { 2269 if ($self->{state}) {
2142 $self->emit (changed => $self->{state}); 2290 $self->emit (changed => $self->{state});
2143} 2291}
2144 2292
2145############################################################################# 2293#############################################################################
2146 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
2147package CFClient::UI::Root; 2404package CFClient::UI::Root;
2148 2405
2149our @ISA = CFClient::UI::Container::; 2406our @ISA = CFClient::UI::Container::;
2150 2407
2151use SDL::OpenGL; 2408use CFClient::OpenGL;
2152 2409
2153sub check_size { 2410sub check_size {
2154 my ($self) = @_; 2411 my ($self) = @_;
2155 2412
2156 $self->configure (0, 0, $::WITH, $::HEIGHT); 2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2157} 2414}
2158 2415
2159sub size_request { 2416sub size_request {
2160 ($::WIDTH, $::HEIGHT) 2417 ($::WIDTH, $::HEIGHT)
2161} 2418}
2163sub configure { 2420sub configure {
2164 my ($self, $x, $y, $w, $h) = @_; 2421 my ($self, $x, $y, $w, $h) = @_;
2165 2422
2166 $self->SUPER::configure ($x, $y, $w, $h); 2423 $self->SUPER::configure ($x, $y, $w, $h);
2167 2424
2168 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2169 for @{$self->{children}}; 2425 for my $child (@{$self->{children}}) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430 $child->configure ($X, $Y, $W,$H);
2431 }
2170} 2432}
2171 2433
2172sub _topleft { 2434sub _topleft {
2173 my ($self, $x, $y) = @_; 2435 my ($self, $x, $y) = @_;
2174 2436
2182 ::refresh (); 2444 ::refresh ();
2183} 2445}
2184 2446
2185sub add { 2447sub add {
2186 my ($self, $child) = @_; 2448 my ($self, $child) = @_;
2449
2450 # integerize window positions
2451 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y};
2187 2453
2188 $self->SUPER::add ($child); 2454 $self->SUPER::add ($child);
2189} 2455}
2190 2456
2191sub on_refresh { 2457sub on_refresh {
2217############################################################################# 2483#############################################################################
2218 2484
2219package CFClient::UI; 2485package CFClient::UI;
2220 2486
2221$ROOT = new CFClient::UI::Root; 2487$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip;
2222 2489
22231 24901
2224 2491

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines