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.133 by root, Tue Apr 18 21:39:31 2006 UTC vs.
Revision 1.162 by root, Mon Apr 24 06:05:35 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->key_down ($_[0]) if $FOCUS;
18} 45}
… …
21 $FOCUS->key_up ($_[0]) if $FOCUS; 48 $FOCUS->key_up ($_[0]) if $FOCUS;
22} 49}
23 50
24sub feed_sdl_button_down_event { 51sub feed_sdl_button_down_event {
25 my ($ev) = @_; 52 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 53 my ($x, $y) = ($ev->{x}, $ev->{y});
27 54
28 if (!$BUTTON_STATE) { 55 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 56 my $widget = $ROOT->find_widget ($x, $y);
30 57
31 $GRAB = $widget; 58 $GRAB = $widget;
32 $GRAB->update if $GRAB; 59 $GRAB->update if $GRAB;
33 }
34 60
61 check_tooltip;
62 }
63
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 64 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 65
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 67}
39 68
40sub feed_sdl_button_up_event { 69sub feed_sdl_button_up_event {
41 my ($ev) = @_; 70 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 71 my ($x, $y) = ($ev->{x}, $ev->{y});
43 72
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 73 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 74
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 76
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 78
50 if (!$BUTTON_STATE) { 79 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 80 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 81 $grab->update if $grab;
53 $GRAB->update if $GRAB; 82 $GRAB->update if $GRAB;
83
84 check_tooltip;
54 } 85 }
55} 86}
56 87
57sub feed_sdl_motion_event { 88sub feed_sdl_motion_event {
58 my ($ev) = @_; 89 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 90 my ($x, $y) = ($ev->{x}, $ev->{y});
60 91
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 92 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 93
63 if ($widget != $HOVER) { 94 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 95 my $hover = $HOVER; $HOVER = $widget;
65 96
66 $hover->update if $hover && $hover->{can_hover}; 97 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 98 $HOVER->update if $HOVER && $HOVER->{can_hover};
99
100 check_tooltip;
68 } 101 }
69 102
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71} 104}
72 105
… …
87 120
88package CFClient::UI::Base; 121package CFClient::UI::Base;
89 122
90use strict; 123use strict;
91 124
92use SDL::OpenGL; 125use CFClient::OpenGL;
93 126
94sub new { 127sub new {
95 my $class = shift; 128 my $class = shift;
96 129
97 my $self = bless { 130 my $self = bless {
98 x => 0, 131 x => 0,
99 y => 0, 132 y => 0,
100 z => 0, 133 z => 0,
101 w => -1, 134 can_events => 1,
102 h => -1,
103 @_ 135 @_
104 }, $class; 136 }, $class;
105 137
106 for (keys %$self) { 138 for (keys %$self) {
107 if (/^connect_(.*)$/) { 139 if (/^connect_(.*)$/) {
… …
110 } 142 }
111 143
112 $self 144 $self
113} 145}
114 146
147sub destroy {
148 my ($self) = @_;
149
150 $self->hide;
151 %$self = ();
152}
153
154sub show {
155 my ($self) = @_;
156
157 return if $self->{parent};
158
159 $CFClient::UI::ROOT->add ($self);
160}
161
162sub hide {
163 my ($self) = @_;
164
165 return unless $self->{parent};
166
167 $self->{parent}->remove ($self);
168}
169
115sub move { 170sub move {
116 my ($self, $x, $y, $z) = @_; 171 my ($self, $x, $y, $z) = @_;
117 172
118 $self->{x} = int $x; 173 $self->{x} = int $x;
119 $self->{y} = int $y; 174 $self->{y} = int $y;
120 $self->{z} = $z if defined $z; 175 $self->{z} = $z if defined $z;
121 176
122 $self->update; 177 $self->update;
123} 178}
124 179
125sub needs_redraw { 180sub set_size {
126 0 181 my ($self, $w, $h) = @_;
182
183 $self->{user_w} = $w;
184 $self->{user_h} = $h;
185
186 $self->check_size;
127} 187}
128 188
129sub size_request { 189sub size_request {
130 require Carp; 190 require Carp;
131 Carp::confess "size_request is abtract"; 191 Carp::confess "size_request is abstract";
132} 192}
133 193
134sub configure { 194sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 195 my ($self, $x, $y, $w, $h) = @_;
136 196
197 if ($self->{aspect}) {
198 my $w2 = List::Util::min $w, int $h * $self->{aspect};
199 my $h2 = List::Util::min $h, int $w / $self->{aspect};
200
201 # use alignment to adjust x, y
202
203 $x += int +($w - $w2) * 0.5;
204 $y += int +($h - $h2) * 0.5;
205
206 ($w, $h) = ($w2, $h2);
207 }
208
209 if ($self->{x} != $x || $self->{y} != $y) {
137 $self->{x} = $x; 210 $self->{x} = $x;
138 $self->{y} = $y; 211 $self->{y} = $y;
212 $self->update;
213 }
139 214
140 return unless $self->{w} != $w || $self->{h} != $h; 215 if ($self->{w} != $w || $self->{h} != $h) {
141
142 $self->{w} = $w; 216 $self->{w} = $w;
143 $self->{h} = $h; 217 $self->{h} = $h;
144 218
145 $self->size_allocate ($w, $h); 219 $self->size_allocate ($w, $h);
220 $self->update;
221 }
146} 222}
147 223
148sub size_allocate { 224sub size_allocate {
149 # nothing to be done 225 # nothing to be done
226}
227
228sub set_max_size {
229 my ($self, $w, $h) = @_;
230
231 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h;
150} 233}
151 234
152# return top left coordinates 235# return top left coordinates
153sub _topleft { 236sub _topleft {
154 my ($self, $x, $y) = @_; 237 my ($self, $x, $y) = @_;
… …
237 glVertex $x + $self->{w}, $y + $self->{h}; 320 glVertex $x + $self->{w}, $y + $self->{h};
238 glVertex $x , $y + $self->{h}; 321 glVertex $x , $y + $self->{h};
239 glEnd; 322 glEnd;
240 glDisable GL_BLEND; 323 glDisable GL_BLEND;
241 } 324 }
325
326 if ($ENV{PCLIENT_DEBUG}) {
327 glPushMatrix;
328 glColor 1, 1, 0, 1;
329 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
330 glBegin GL_LINE_LOOP;
331 glVertex 0 , 0;
332 glVertex $self->{w}, 0;
333 glVertex $self->{w}, $self->{h};
334 glVertex 0 , $self->{h};
335 glEnd;
336 glPopMatrix;
337 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
338 }
242} 339}
243 340
244sub _draw { 341sub _draw {
245 my ($self) = @_; 342 my ($self) = @_;
246 343
247 warn "no draw defined for $self\n"; 344 warn "no draw defined for $self\n";
248} 345}
249 346
250sub find_widget { 347sub find_widget {
251 my ($self, $x, $y) = @_; 348 my ($self, $x, $y) = @_;
349
350 return () unless $self->{can_events};
252 351
253 return $self 352 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 353 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 354 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256 355
… …
264} 363}
265 364
266sub check_size { 365sub check_size {
267 my ($self) = @_; 366 my ($self) = @_;
268 367
269 my ($w, $h) = $self->size_request; 368 $self->{parent}
369 or return 1;
270 370
371 my ($w, $h) = $self->{user_w} && $self->{user_h}
372 ? @$self{qw(user_w user_h)}
373 : $self->size_request;
374
271 if ($w != $self->{req_w} || $h != $self->{req_h}) { 375 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w; 376 $self->{req_w} = $w;
273 $self->{req_h} = $h; 377 $self->{req_h} = $h;
274 378
275 $self->{parent}->check_size 379 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h); 380 or $self->size_allocate (
279 $self->update; 381 (List::Util::max $self->{w}, $w),
382 (List::Util::max $self->{h}, $h),
383 );
384
385 1
386 } else {
387 0
280 } 388 }
281} 389}
282 390
283sub update { 391sub update {
284 my ($self) = @_; 392 my ($self) = @_;
… …
312package CFClient::UI::DrawBG; 420package CFClient::UI::DrawBG;
313 421
314our @ISA = CFClient::UI::Base::; 422our @ISA = CFClient::UI::Base::;
315 423
316use strict; 424use strict;
317use SDL::OpenGL; 425use CFClient::OpenGL;
318 426
319sub new { 427sub new {
320 my $class = shift; 428 my $class = shift;
321 429
322 # range [value, low, high, page] 430 # range [value, low, high, page]
… …
351 459
352package CFClient::UI::Empty; 460package CFClient::UI::Empty;
353 461
354our @ISA = CFClient::UI::Base::; 462our @ISA = CFClient::UI::Base::;
355 463
464sub new {
465 my ($class, %arg) = @_;
466 $class->SUPER::new (can_events => 0, %arg);
467}
468
356sub size_request { 469sub size_request {
357 (0, 0) 470 (0, 0)
358} 471}
359 472
360sub draw { } 473sub draw { }
… …
368sub new { 481sub new {
369 my ($class, %arg) = @_; 482 my ($class, %arg) = @_;
370 483
371 my $children = delete $arg{children} || []; 484 my $children = delete $arg{children} || [];
372 485
373 my $self = $class->SUPER::new (children => [], %arg); 486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
374 $self->add ($_) for @$children; 487 $self->add ($_) for @$children;
375 488
376 $self 489 $self
377} 490}
378 491
… …
386 $self->{children} = [ 499 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 500 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 501 @{$self->{children}}, $child
389 ]; 502 ];
390 503
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 504 $child->check_size;
394} 505}
395 506
396sub remove { 507sub remove {
397 my ($self, $widget) = @_; 508 my ($self, $child) = @_;
398 509
510 delete $child->{parent};
511
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 513
401 $self->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub clear {
519 my ($self) = @_;
520
521 delete $_->{parent}
522 for @{ delete $self->{children} };
523
524 $self->{children} = [];
402} 525}
403 526
404sub find_widget { 527sub find_widget {
405 my ($self, $x, $y) = @_; 528 my ($self, $x, $y) = @_;
406 529
… …
436 559
437 $class->SUPER::new (children => [$child], %arg) 560 $class->SUPER::new (children => [$child], %arg)
438} 561}
439 562
440sub add { 563sub add {
441 my ($self, $widget) = @_; 564 my ($self, $child) = @_;
442 565
443 $self->{children} = []; 566 $self->{children} = [];
444 567
445 $self->SUPER::add ($widget); 568 $self->SUPER::add ($child);
446} 569}
447 570
448sub remove { 571sub remove {
449 my ($self, $widget) = @_; 572 my ($self, $widget) = @_;
450 573
… …
470 593
471package CFClient::UI::Window; 594package CFClient::UI::Window;
472 595
473our @ISA = CFClient::UI::Bin::; 596our @ISA = CFClient::UI::Bin::;
474 597
475use SDL::OpenGL; 598use CFClient::OpenGL;
476 599
477sub new { 600sub new {
478 my ($class, %arg) = @_; 601 my ($class, %arg) = @_;
479 602
480 my $self = $class->SUPER::new (%arg); 603 my $self = $class->SUPER::new (%arg);
… …
534sub new { die } 657sub new { die }
535 658
536sub size_request { 659sub size_request {
537 my ($self) = @_; 660 my ($self) = @_;
538 661
539 @$self{qw(child_w child_h)} = $self->child->size_request; 662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
540 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541 664
542 @$self{qw(child_w child_h)} 665 @$self{qw(child_w child_h)}
543} 666}
544 667
… …
553 676
554package CFClient::UI::Frame; 677package CFClient::UI::Frame;
555 678
556our @ISA = CFClient::UI::Bin::; 679our @ISA = CFClient::UI::Bin::;
557 680
558use SDL::OpenGL; 681use CFClient::OpenGL;
559
560sub size_request {
561 my ($self) = @_;
562 my $chld = $self->child
563 or return (0, 0);
564
565 $chld->move (2, 2);
566
567 map { $_ + 4 } $chld->size_request;
568}
569
570sub size_allocate {
571 my ($self, $x, $y, $w, $h) = @_;
572
573 $self->child->configure (2, 2, $w - 4, $h - 4);
574}
575
576sub _draw {
577 my ($self) = @_;
578
579 my $chld = $self->child;
580
581 my ($w, $h) = $chld->size_request;
582
583 glBegin GL_QUADS;
584 glColor 0, 0, 0;
585 glVertex 0 , 0;
586 glVertex 0 , $h + 4;
587 glVertex $w + 4 , $h + 4;
588 glVertex $w + 4 , 0;
589 glEnd;
590
591 $chld->draw;
592}
593
594#############################################################################
595
596package CFClient::UI::FancyFrame;
597
598our @ISA = CFClient::UI::Bin::;
599
600use SDL::OpenGL;
601
602my @tex =
603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
604 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
605 682
606sub new { 683sub new {
607 my $class = shift; 684 my $class = shift;
608 685
609 # TODO: user_x, user_y, overwrite moveto?
610
611 $class->SUPER::new ( 686 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 687 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 688 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 689 border => 0.8,
615 @_ 690 @_
616 ) 691 );
692
693 $self
694}
695
696sub _draw {
697 my ($self) = @_;
698
699 my ($w, $h) = ($self->{w}, $self->{h});
700
701 glEnable GL_BLEND;
702 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
703 glEnable GL_TEXTURE_2D;
704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705
706# glBegin GL_QUADS;
707# glColor 0, 0, 0, 0;
708# glVertex 0 , 0;
709# glVertex 0 , $h;
710# glVertex $w, $h;
711# glVertex $w, 0;
712# glEnd;
713
714
715 $self->child->draw;
716 glDisable GL_BLEND;
717 glDisable GL_TEXTURE_2D;
718}
719
720#############################################################################
721
722package CFClient::UI::FancyFrame;
723
724our @ISA = CFClient::UI::Bin::;
725
726use CFClient::OpenGL;
727
728my @tex =
729 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
730 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
731
732sub new {
733 my $class = shift;
734
735 # TODO: user_x, user_y, overwrite moveto?
736
737 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1],
740 border => 0.8,
741 can_events => 1,
742 @_
743 );
744
745 $self->{title} &&= new CFClient::UI::Label
746 align => 0,
747 valign => 1,
748 text => $self->{title},
749 fontsize => 1;
750
751 $self
752}
753
754sub border {
755 int $_[0]{border} * $::FONTSIZE
617} 756}
618 757
619sub size_request { 758sub size_request {
620 my ($self) = @_; 759 my ($self) = @_;
621 760
622 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624 my ($w, $h) = $self->SUPER::size_request; 761 my ($w, $h) = $self->SUPER::size_request;
625 762
626 ( 763 (
627 $w + $self->{border} * 2, 764 $w + $self->border * 2,
628 $h + $self->{border} * 2, 765 $h + $self->border * 2,
629 ) 766 )
630} 767}
631 768
632sub size_allocate { 769sub size_allocate {
633 my ($self, $w, $h) = @_; 770 my ($self, $w, $h) = @_;
634 771
635 $h -= List::Util::max 0, $self->{border} * 2; 772 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 773 $w -= List::Util::max 0, $self->border * 2;
637 774
775 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
776 if $self->{title};
777
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 778 $self->child->configure ($self->border, $self->border, $w, $h);
639} 779}
640 780
641sub button_down { 781sub button_down {
642 my ($self, $ev, $x, $y) = @_; 782 my ($self, $ev, $x, $y) = @_;
643 783
784 my $border = $self->border;
785
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 786 if ($x < $self->{w} && $x >= $self->{w} - $border
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 787 && $y < $self->{h} && $y >= $self->{h} - $border) {
646 788
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 789 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 790 my ($bw, $bh) = ($self->{w}, $self->{h});
649 791
650 $self->{motion} = sub { 792 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 793 my ($ev, $x, $y) = @_;
652 794
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 795 ($x, $y) = ($ev->{x}, $ev->{y});
654 796
655 $self->{user_w} = $bw + $x - $ox; 797 $self->{user_w} = $bw + $x - $ox;
656 $self->{user_h} = $bh + $y - $oy; 798 $self->{user_h} = $bh + $y - $oy;
657 $self->check_size; 799 $self->check_size;
658 }; 800 };
659 801
660 } elsif ($x >= 0 && $x < $self->{w} 802 } elsif ($x >= 0 && $x < $self->{w}
661 && $y >= 0 && $y < $self->{border}) { 803 && $y >= 0 && $y < $border) {
662 804
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 805 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 806 my ($bx, $by) = ($self->{x}, $self->{y});
665 807
666 $self->{motion} = sub { 808 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 809 my ($ev, $x, $y) = @_;
668 810
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 811 ($x, $y) = ($ev->{x}, $ev->{y});
670 812
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 813 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 814 $self->update;
673 }; 815 };
674 } 816 }
… …
695 glEnable GL_BLEND; 837 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 839 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 841
842 my $border = $self->border;
843
700 glColor @{ $self->{border_bg} }; 844 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 845 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 846 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 848 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 849
706 my $bg = $tex[0]; 850 my $bg = $tex[0];
707 851
708 # TODO: repeat texture not scale 852 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 853 my $rep_x = $cw / $bg->{w};
… …
712 glColor @{ $self->{bg} }; 856 glColor @{ $self->{bg} };
713 857
714 $bg->{s} = $rep_x; 858 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 859 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 860 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 861 $bg->draw_quad ($border, $border, $cw, $ch);
718 862
719 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 864 glDisable GL_BLEND;
721 865
866 $self->{title}->draw if $self->{title};
722 $self->child->draw; 867 $self->child->draw;
723} 868}
724 869
725############################################################################# 870#############################################################################
726 871
… …
728 873
729our @ISA = CFClient::UI::Base::; 874our @ISA = CFClient::UI::Base::;
730 875
731use List::Util qw(max sum); 876use List::Util qw(max sum);
732 877
733use SDL::OpenGL; 878use CFClient::OpenGL;
734 879
735sub new { 880sub new {
736 my $class = shift; 881 my $class = shift;
737 882
738 $class->SUPER::new ( 883 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 890 my ($self, $x, $y, $child) = @_;
746 891
747 $child->set_parent ($self); 892 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 893 $self->{children}[$y][$x] = $child;
749 894
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 895 $child->check_size;
753} 896}
754 897
755# TODO: move to container class maybe? send childs a signal on removal? 898# TODO: move to container class maybe? send childs a signal on removal?
756sub clear { 899sub clear {
… …
770 or next; 913 or next;
771 914
772 for my $x (0 .. $#$row) { 915 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 916 my $widget = $row->[$x]
774 or next; 917 or next;
775 my ($w, $h) = $widget->size_request; 918 my ($w, $h) = @$widget{qw(req_w req_h)};
776 919
777 $w[$x] = max $w[$x], $w; 920 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 921 $h[$y] = max $h[$y], $h;
779 } 922 }
780 } 923 }
… …
885 1028
886 ($h, $w) = ($w, $h); 1029 ($h, $w) = ($w, $h);
887 1030
888 my $children = $self->{children}; 1031 my $children = $self->{children};
889 1032
890 my @h = map +($_->size_request)[0], @$children; 1033 my @h = map $_->{req_w}, @$children;
891 1034
892 my $req_h = List::Util::sum @h; 1035 my $req_h = List::Util::sum @h;
893 1036
894 if ($req_h > $h) { 1037 if ($req_h > $h) {
895 # ah well, not enough space 1038 # ah well, not enough space
… …
943sub size_allocate { 1086sub size_allocate {
944 my ($self, $w, $h) = @_; 1087 my ($self, $w, $h) = @_;
945 1088
946 my $children = $self->{children}; 1089 my $children = $self->{children};
947 1090
948 my @h = map +($_->size_request)[1], @$children; 1091 my @h = map $_->{req_h}, @$children;
949 1092
950 my $req_h = List::Util::sum @h; 1093 my $req_h = List::Util::sum @h;
951 1094
952 if ($req_h > $h) { 1095 if ($req_h > $h) {
953 # ah well, not enough space 1096 # ah well, not enough space
… …
981 1124
982package CFClient::UI::Label; 1125package CFClient::UI::Label;
983 1126
984our @ISA = CFClient::UI::Base::; 1127our @ISA = CFClient::UI::Base::;
985 1128
986use SDL::OpenGL; 1129use CFClient::OpenGL;
987 1130
988sub new { 1131sub new {
989 my ($class, %arg) = @_; 1132 my ($class, %arg) = @_;
990 1133
991 my $self = $class->SUPER::new ( 1134 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1135 fg => [1, 1, 1],
1136 #font => default_font
993 fontsize => $::FONTSIZE, 1137 fontsize => 1,
994 text => "", 1138 text => "",
995 align => -1, 1139 align => -1,
996 valign => -1, 1140 valign => -1,
997 padding => 2, 1141 padding => 2,
998 layout => new CFClient::Layout, 1142 layout => new CFClient::Layout,
1143 can_events => 0,
999 %arg 1144 %arg
1000 ); 1145 );
1001 1146
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1147 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout;
1151 }
1003 1152
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1153 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1154 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006 1155
1007 $self 1156 $self
1008} 1157}
1009 1158
1010sub escape_text { 1159sub escape {
1011 local $_ = $_[1]; 1160 local $_ = $_[1];
1012 1161
1013 s/&/&amp;/g; 1162 s/&/&amp;/g;
1014 s/>/&gt;/g; 1163 s/>/&gt;/g;
1015 s/</&lt;/g; 1164 s/</&lt;/g;
… …
1021 my ($self, $text) = @_; 1170 my ($self, $text) = @_;
1022 1171
1023 $self->{layout}->set_text ($text); 1172 $self->{layout}->set_text ($text);
1024 1173
1025 delete $self->{texture}; 1174 delete $self->{texture};
1175 $self->check_size;
1026 $self->update; 1176 $self->update;
1027} 1177}
1028 1178
1029sub set_markup { 1179sub set_markup {
1030 my ($self, $markup) = @_; 1180 my ($self, $markup) = @_;
1031 1181
1032 $self->{layout}->set_markup ($markup); 1182 $self->{layout}->set_markup ($markup);
1033 1183
1034 delete $self->{texture}; 1184 delete $self->{texture};
1185 $self->check_size;
1035 $self->update; 1186 $self->update;
1036} 1187}
1037 1188
1038sub size_request { 1189sub size_request {
1039 my ($self) = @_; 1190 my ($self) = @_;
1040 1191
1041 $self->{layout}->set_width; 1192 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{max_w} || -1);
1042 $self->{layout}->set_height ($self->{fontsize}); 1194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1195
1044 my ($w, $h) = $self->{layout}->size; 1196 my ($w, $h) = $self->{layout}->size;
1197
1198 if (exists $self->{template}) {
1199 $self->{template}->set_font ($self->{font}) if $self->{font};
1200 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1201
1202 my ($w2, $h2) = $self->{template}->size;
1203
1204 $w = List::Util::max $w, $w2;
1205 $h = List::Util::max $h, $h2;
1206 }
1045 1207
1046 ( 1208 (
1047 $w + $self->{padding} * 2, 1209 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1210 $h + $self->{padding} * 2,
1049 ) 1211 )
… …
1053 my ($self, $w, $h) = @_; 1215 my ($self, $w, $h) = @_;
1054 1216
1055 delete $self->{texture}; 1217 delete $self->{texture};
1056} 1218}
1057 1219
1058sub update { 1220sub set_fontsize {
1059 my ($self) = @_; 1221 my ($self, $fontsize) = @_;
1060 1222
1223 $self->{fontsize} = $fontsize;
1061 delete $self->{texture}; 1224 delete $self->{texture};
1225 $self->check_size;
1062 $self->SUPER::update; 1226 $self->update;
1063} 1227}
1064 1228
1065sub _draw { 1229sub _draw {
1066 my ($self) = @_; 1230 my ($self) = @_;
1067 1231
1068 my $tex = $self->{texture} ||= do { 1232 my $tex = $self->{texture} ||= do {
1233 $self->{layout}->set_font ($self->{font}) if $self->{font};
1069 $self->{layout}->set_width ($self->{w}); 1234 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071 new_from_layout CFClient::Texture $self->{layout} 1236 new_from_layout CFClient::Texture $self->{layout}
1072 }; 1237 };
1073 1238
1074 glEnable GL_BLEND; 1239 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1100 1265
1101package CFClient::UI::EntryBase; 1266package CFClient::UI::EntryBase;
1102 1267
1103our @ISA = CFClient::UI::Label::; 1268our @ISA = CFClient::UI::Label::;
1104 1269
1105use SDL; 1270use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1271
1108sub new { 1272sub new {
1109 my $class = shift; 1273 my $class = shift;
1110 1274
1111 $class->SUPER::new ( 1275 $class->SUPER::new (
… …
1114 active_bg => [1, 1, 1, 0.5], 1278 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1279 active_fg => [0, 0, 0],
1116 can_hover => 1, 1280 can_hover => 1,
1117 can_focus => 1, 1281 can_focus => 1,
1118 valign => 0, 1282 valign => 0,
1283 can_events => 1,
1119 @_ 1284 @_
1120 ) 1285 )
1121} 1286}
1122 1287
1123sub _set_text { 1288sub _set_text {
… …
1125 1290
1126 delete $self->{cur_h}; 1291 delete $self->{cur_h};
1127 1292
1128 return if $self->{text} eq $text; 1293 return if $self->{text} eq $text;
1129 1294
1295 delete $self->{texture};
1296
1130 $self->{last_activity} = $::NOW; 1297 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1298 $self->{text} = $text;
1132 1299
1133 $text =~ s/./*/g if $self->{hidden}; 1300 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1301 $self->{layout}->set_text ("$text ");
… …
1149} 1316}
1150 1317
1151sub size_allocate { 1318sub size_allocate {
1152 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1153 1320
1154 $self->_set_text ($self->{text}); 1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155} 1322}
1156 1323
1157sub set_text { 1324sub set_text {
1158 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1159 1326
… …
1163} 1330}
1164 1331
1165sub key_down { 1332sub key_down {
1166 my ($self, $ev) = @_; 1333 my ($self, $ev) = @_;
1167 1334
1168 my $mod = $ev->key_mod; 1335 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1336 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1337 my $uni = $ev->{unicode};
1172 1338
1173 my $text = $self->get_text; 1339 my $text = $self->get_text;
1174 1340
1175 if ($sym == SDLK_BACKSPACE) { 1341 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1343 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1344 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1345 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1346 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1347 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1348 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1349 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1350 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1351 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1352 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1353 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1354 $self->emit ('escape');
1189 } elsif ($uni) { 1355 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1356 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1357 }
1192 1358
… …
1267 1433
1268package CFClient::UI::Entry; 1434package CFClient::UI::Entry;
1269 1435
1270our @ISA = CFClient::UI::EntryBase::; 1436our @ISA = CFClient::UI::EntryBase::;
1271 1437
1272use SDL; 1438use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1439
1275sub key_down { 1440sub key_down {
1276 my ($self, $ev) = @_; 1441 my ($self, $ev) = @_;
1277 1442
1278 my $sym = $ev->key_sym; 1443 my $sym = $ev->{sym};
1279 1444
1280 if ($sym == SDLK_RETURN) { 1445 if ($sym == 13) {
1281 $self->emit (activate => $self->get_text); 1446 $self->emit (activate => $self->get_text);
1282 $self->update; 1447 $self->update;
1283 1448
1284 } else { 1449 } else {
1285 $self->SUPER::key_down ($ev); 1450 $self->SUPER::key_down ($ev);
… …
1291 1456
1292package CFClient::UI::Button; 1457package CFClient::UI::Button;
1293 1458
1294our @ISA = CFClient::UI::Label::; 1459our @ISA = CFClient::UI::Label::;
1295 1460
1296use SDL; 1461use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1462
1299my @tex = 1463my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1464 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1465 qw(b1_button_active.png);
1302 1466
1303sub new { 1467sub new {
1304 my $class = shift; 1468 my $class = shift;
1305 1469
… …
1309 bg => [1, 1, 1, 0.2], 1473 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1474 active_fg => [0, 0, 1],
1311 can_hover => 1, 1475 can_hover => 1,
1312 align => 0, 1476 align => 0,
1313 valign => 0, 1477 valign => 0,
1478 can_events => 1,
1314 @_ 1479 @_
1315 ) 1480 )
1316} 1481}
1317 1482
1318sub button_up { 1483sub button_up {
… …
1352package CFClient::UI::CheckBox; 1517package CFClient::UI::CheckBox;
1353 1518
1354our @ISA = CFClient::UI::DrawBG::; 1519our @ISA = CFClient::UI::DrawBG::;
1355 1520
1356my @tex = 1521my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1522 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1523 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1524
1360use SDL; 1525use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1526
1363sub new { 1527sub new {
1364 my $class = shift; 1528 my $class = shift;
1365 1529
1366 $class->SUPER::new ( 1530 $class->SUPER::new (
… …
1412 glDisable GL_BLEND; 1576 glDisable GL_BLEND;
1413} 1577}
1414 1578
1415############################################################################# 1579#############################################################################
1416 1580
1417package CFClient::UI::VGauge; 1581package CFClient::UI::Image;
1418 1582
1419our @ISA = CFClient::UI::Base::; 1583our @ISA = CFClient::UI::Base::;
1420 1584
1421use SDL::OpenGL; 1585use CFClient::OpenGL;
1586use Carp qw/confess/;
1422 1587
1423my %tex = ( 1588our %loaded_images;
1424 food => [
1425 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1426 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427 ],
1428 grace => [
1429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1430 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1431 ],
1432 hp => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435 ],
1436 mana => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1439 ],
1440);
1441 1589
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1590sub new {
1444 my $class = shift; 1591 my $class = shift;
1445 1592
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1593 my $self = $class->SUPER::new (can_events => 0, @_);
1594
1595 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1596
1597 $loaded_images{$self->{image}} ||=
1598 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1599
1600 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1601
1602 Scalar::Util::weaken $loaded_images{$self->{image}};
1603
1604 $self->{aspect} = $tex->{w} / $tex->{h};
1447 1605
1448 $self 1606 $self
1449} 1607}
1450 1608
1451sub size_request { 1609sub size_request {
1452 my ($self) = @_; 1610 my ($self) = @_;
1453 1611
1454 my $tex = $tex{$self->{gauge}}[0]; 1612 ($self->{tex}->{w}, $self->{tex}->{h})
1455
1456 @$tex{qw(w h)}
1457}
1458
1459sub set_max {
1460 my ($self, $max) = @_;
1461
1462 $self->{max_val} = $max;
1463}
1464
1465sub set_value {
1466 my ($self, $val, $max) = @_;
1467
1468 $self->set_max ($max)
1469 if defined $max;
1470
1471 $max = $self->{max_val};
1472 $self->{val} = $val;
1473
1474 $self->update;
1475} 1613}
1476 1614
1477sub _draw { 1615sub _draw {
1478 my ($self) = @_; 1616 my ($self) = @_;
1479 1617
1480 my $tex = $tex{$self->{gauge}}; 1618 my $tex = $self->{tex};
1481 1619
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1620 my ($w, $h) = ($self->{w}, $self->{h});
1483 1621
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1622 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1623 glRotate 90, 0, 0, 1;
1624 glTranslate 0, -$self->{w}, 0;
1486 1625
1487 my $t1 = $tex->[0]; 1626 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1627 }
1489 1628
1490 glEnable GL_BLEND; 1629 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1631 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1633
1634 $tex->draw_quad (0, 0, $w, $h);
1635
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D;
1638}
1639
1640#############################################################################
1641
1642package CFClient::UI::VGauge;
1643
1644our @ISA = CFClient::UI::Base::;
1645
1646use List::Util qw(min max);
1647
1648use CFClient::OpenGL;
1649
1650my %tex = (
1651 food => [
1652 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1653 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1654 ],
1655 grace => [
1656 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1657 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1658 ],
1659 hp => [
1660 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1661 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1662 ],
1663 mana => [
1664 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1665 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1666 ],
1667);
1668
1669# eg. VGauge->new (gauge => 'food'), default gauge: food
1670sub new {
1671 my $class = shift;
1672
1673 my $self = $class->SUPER::new (
1674 type => 'food',
1675 @_
1676 );
1677
1678 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1679
1680 $self
1681}
1682
1683sub size_request {
1684 my ($self) = @_;
1685
1686 #my $tex = $tex{$self->{type}}[0];
1687 #@$tex{qw(w h)}
1688 (0, 0)
1689}
1690
1691sub set_max {
1692 my ($self, $max) = @_;
1693
1694 $self->{max_val} = $max;
1695}
1696
1697sub set_value {
1698 my ($self, $val, $max) = @_;
1699
1700 $self->set_max ($max)
1701 if defined $max;
1702
1703 $max = $self->{max_val};
1704 $self->{val} = $val;
1705
1706 $self->update;
1707}
1708
1709sub _draw {
1710 my ($self) = @_;
1711
1712 my $tex = $tex{$self->{type}};
1713 my ($t1, $t2, $t3) = @$tex;
1714
1715 my ($w, $h) = ($self->{w}, $self->{h});
1716
1717 if ($self->{vertical}) {
1718 glRotate 90, 0, 0, 1;
1719 glTranslate 0, -$self->{w}, 0;
1720
1721 ($w, $h) = ($h, $w);
1722 }
1723
1724 my $ycut = $self->{val} / ($self->{max_val} || 1);
1725
1726 my $ycut1 = max 0, min 1, $ycut;
1727 my $ycut2 = max 0, min 1, $ycut - 1;
1728
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1729 my $h1 = $self->{h} * (1 - $ycut1);
1496 my $h2 = $ycut * $self->{h}; 1730 my $h2 = $self->{h} * (1 - $ycut2);
1497 1731
1498 my $yp = 0; 1732 glEnable GL_BLEND;
1733 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1734 glEnable GL_TEXTURE_2D;
1735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499 1736
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1737 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1738 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1739 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1740 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1741 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1742 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1743 glEnd;
1507 1744
1508 $yp += $h1; 1745 my $ycut1 = List::Util::min 1, $ycut;
1509
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1746 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1747 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1748 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1749 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1750 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1751 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516 glEnd; 1752 glEnd;
1753
1754 if ($t3) {
1755 glBindTexture GL_TEXTURE_2D, $t3->{name};
1756 glBegin GL_QUADS;
1757 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1758 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1759 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1760 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1761 glEnd;
1762 }
1517 1763
1518 glDisable GL_BLEND; 1764 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1765 glDisable GL_TEXTURE_2D;
1520} 1766}
1521 1767
1522############################################################################# 1768#############################################################################
1523 1769
1770package CFClient::UI::Gauge;
1771
1772our @ISA = CFClient::UI::VBox::;
1773
1774sub new {
1775 my ($class, %arg) = @_;
1776
1777 my $self = $class->SUPER::new (
1778 tooltip => $arg{type},
1779 can_events => 1,
1780 can_hover => 1,
1781 %arg,
1782 );
1783
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1786 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1787
1788 $self
1789}
1790
1791sub set_fontsize {
1792 my ($self, $fsize) = @_;
1793
1794 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize);
1796}
1797
1798sub set_value {
1799 my ($self, $val, $max) = @_;
1800
1801 $self->set_max ($max)
1802 if defined $max;
1803
1804 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813}
1814
1815#############################################################################
1816
1524package CFClient::UI::Slider; 1817package CFClient::UI::Slider;
1525 1818
1526use strict; 1819use strict;
1527 1820
1528use SDL::OpenGL; 1821use CFClient::OpenGL;
1529 1822
1530our @ISA = CFClient::UI::DrawBG::; 1823our @ISA = CFClient::UI::DrawBG::;
1531 1824
1532my @tex = 1825my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1826 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1836 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1837 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1838 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1839 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1840 range => [0, 0, 100, 10],
1548 req_w => 40, 1841 req_w => 20,
1549 req_h => 13, 1842 req_h => 20,
1550 vertical => 0, 1843 vertical => 0,
1551 can_hover => 1, 1844 can_hover => 1,
1552 inner_pad => 5, 1845 inner_pad => 5,
1553 @_ 1846 @_
1554 ); 1847 );
… …
1658 1951
1659package CFClient::UI::TextView; 1952package CFClient::UI::TextView;
1660 1953
1661our @ISA = CFClient::UI::HBox::; 1954our @ISA = CFClient::UI::HBox::;
1662 1955
1663use SDL::OpenGL; 1956use CFClient::OpenGL;
1664 1957
1665sub new { 1958sub new {
1666 my $class = shift; 1959 my $class = shift;
1667 1960
1668 my $self = $class->SUPER::new ( 1961 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6,
1670 req_h => $::HEIGHT / 6,
1671 fontsize => $::FONTSIZE, 1962 fontsize => 1,
1963 #font => default_font
1672 @_, 1964 @_,
1673 1965
1674 layout => (new CFClient::Layout), 1966 layout => (new CFClient::Layout),
1675 par => [], 1967 par => [],
1676 height => 0, 1968 height => 0,
… …
1697sub text_height { 1989sub text_height {
1698 my ($self, $text) = @_; 1990 my ($self, $text) = @_;
1699 1991
1700 my $layout = $self->{layout}; 1992 my $layout = $self->{layout};
1701 1993
1702 $layout->set_height ($self->{fontsize}); 1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 1995 $layout->set_width ($self->{w});
1704 $layout->set_text ($text); 1996 $layout->set_text ($text);
1705 1997
1706 ($layout->size)[1] 1998 ($layout->size)[1]
1707} 1999}
… …
1711 2003
1712 $self->{need_reflow}++; 2004 $self->{need_reflow}++;
1713 $self->update; 2005 $self->update;
1714} 2006}
1715 2007
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 2008sub size_allocate {
1723 my ($self, $w, $h) = @_; 2009 my ($self, $w, $h) = @_;
1724 2010
2011 $self->SUPER::size_allocate ($w, $h);
2012
2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1725 $self->{layout}->set_height ($self->{fontsize}); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 2015 $self->{layout}->set_width ($self->{children}[0]{w});
1727 2016
1728 $self->reflow; 2017 $self->reflow;
1729 $self->update;
1730} 2018}
1731 2019
1732sub add_paragraph { 2020sub add_paragraph {
1733 my ($self, $color, $text) = @_; 2021 my ($self, $color, $text) = @_;
1734 2022
… …
1782 my $y1 = $top + $self->{h}; 2070 my $y1 = $top + $self->{h};
1783 2071
1784 my $y = 0; 2072 my $y = 0;
1785 2073
1786 my $layout = $self->{layout}; 2074 my $layout = $self->{layout};
2075
2076 $layout->set_font ($self->{font}) if $self->{font};
1787 2077
1788 for my $par (@{$self->{par}}) { 2078 for my $par (@{$self->{par}}) {
1789 my $h = $par->[0]; 2079 my $h = $par->[0];
1790 2080
1791 if ($y0 < $y + $h && $y < $y1) { 2081 if ($y0 < $y + $h && $y < $y1) {
… …
1819 2109
1820} 2110}
1821 2111
1822############################################################################# 2112#############################################################################
1823 2113
1824package CFClient::UI::MapWidget;
1825
1826use strict;
1827
1828use List::Util qw(min max);
1829
1830use SDL;
1831use SDL::OpenGL;
1832
1833our @ISA = CFClient::UI::Base::;
1834
1835sub new {
1836 my $class = shift;
1837
1838 $class->SUPER::new (
1839 z => -1,
1840 can_focus => 1,
1841 list => (glGenLists 1),
1842 @_
1843 )
1844}
1845
1846sub key_down {
1847 print "MAPKEYDOWN\n";
1848}
1849
1850sub key_up {
1851}
1852
1853sub button_down {
1854 my ($self, $ev, $x, $y) = @_;
1855
1856 $self->focus_in;
1857
1858 if ($ev->button == 2) {
1859 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862 $self->{motion} = sub {
1863 my ($ev, $x, $y) = @_;
1864
1865 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867 $::CFG->{map_shift_x} = $bw + $x - $ox;
1868 $::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870 $self->update;
1871 };
1872 }
1873}
1874
1875sub button_up {
1876 my ($self, $ev, $x, $y) = @_;
1877
1878 delete $self->{motion};
1879}
1880
1881sub mouse_motion {
1882 my ($self, $ev, $x, $y) = @_;
1883
1884 $self->{motion}->($ev, $x, $y) if $self->{motion};
1885}
1886
1887sub size_request {
1888 (
1889 1 + 32 * int $::WIDTH / 32,
1890 1 + 32 * int $::HEIGHT / 32,
1891 )
1892}
1893
1894sub update {
1895 my ($self) = @_;
1896
1897 $self->{need_update} = 1;
1898 $self->SUPER::update;
1899}
1900
1901sub draw {
1902 my ($self) = @_;
1903
1904 if (delete $self->{need_update}) {
1905 glNewList $self->{list}, GL_COMPILE;
1906
1907 if ($::MAP) {
1908 my $sw = int $::WIDTH / 32;
1909 my $sh = int $::HEIGHT / 32;
1910
1911 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914 glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1916 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1917
1918 if ($::CFG->{fow_enable}) {
1919 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1920 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1921 glConvolutionFilter2D (
1922 GL_CONVOLUTION_2D,
1923 GL_ALPHA,
1924 3, 3,
1925 GL_ALPHA, GL_FLOAT,
1926 pack "f*",
1927 0.1, 0.1, 0.1,
1928 0.1, 0.2, 0.1,
1929 0.1, 0.1, 0.1,
1930 );
1931 glEnable GL_CONVOLUTION_2D;
1932 }
1933
1934 $self->{fow_texture} = new CFClient::Texture
1935 w => $w,
1936 h => $h,
1937 data => $data,
1938 internalformat => GL_ALPHA,
1939 format => GL_ALPHA;
1940
1941 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1942
1943 glEnable GL_BLEND;
1944 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1945 glEnable GL_TEXTURE_2D;
1946 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1947
1948 glColor +($::CFG->{fow_intensity}) x 3, 1;
1949 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1950
1951 glDisable GL_TEXTURE_2D;
1952 glDisable GL_BLEND;
1953 }
1954
1955 # HACK BEGIN
1956 {
1957 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958 my ($w, $h) = (250, 250);
1959
1960 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965 $self->{mapmap_texture} =
1966 new CFClient::Texture
1967 w => $w,
1968 h => $h,
1969 data => $::MAP->mapmap ($w, $h),
1970 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972 $self->{mapmap_texture}->draw_quad (100, 100);
1973
1974 glDisable GL_TEXTURE_2D;
1975 glDisable GL_BLEND;
1976 }
1977 # HACK END
1978 }
1979
1980 glEndList;
1981 }
1982
1983 glPushMatrix;
1984 glCallList $self->{list};
1985 glPopMatrix;
1986
1987 if ($FOCUS != $self) {
1988 glColor 64/255, 64/255, 64/255;
1989 glLogicOp GL_AND;
1990 glEnable GL_COLOR_LOGIC_OP;
1991 glBegin GL_QUADS;
1992 glVertex 0, 0;
1993 glVertex 0, $::HEIGHT;
1994 glVertex $::WIDTH, $::HEIGHT;
1995 glVertex $::WIDTH, 0;
1996 glEnd;
1997 glDisable GL_COLOR_LOGIC_OP;
1998 }
1999}
2000
2001my %DIR = (
2002 SDLK_KP8, [1, "north"],
2003 SDLK_KP9, [2, "northeast"],
2004 SDLK_KP6, [3, "east"],
2005 SDLK_KP3, [4, "southeast"],
2006 SDLK_KP2, [5, "south"],
2007 SDLK_KP1, [6, "southwest"],
2008 SDLK_KP4, [7, "west"],
2009 SDLK_KP7, [8, "northwest"],
2010
2011 SDLK_UP, [1, "north"],
2012 SDLK_RIGHT, [3, "east"],
2013 SDLK_DOWN, [5, "south"],
2014 SDLK_LEFT, [7, "west"],
2015);
2016
2017sub key_down {
2018 my ($self, $ev) = @_;
2019
2020 my $mod = $ev->key_mod;
2021 my $sym = $ev->key_sym;
2022
2023 if ($sym == SDLK_KP5) {
2024 $::CONN->user_send ("stay fire");
2025 } elsif ($sym == SDLK_a) {
2026 $::CONN->user_send ("apply");
2027 } elsif ($sym == SDLK_QUOTE) {
2028 $self->emit ('activate_console');
2029 } elsif ($sym == SDLK_SLASH) {
2030 $self->emit ('activate_console' => '/');
2031 } elsif (exists $DIR{$sym}) {
2032 if ($mod & KMOD_SHIFT) {
2033 $self->{shft}++;
2034 $::CONN->user_send ("fire $DIR{$sym}[0]");
2035 } elsif ($mod & KMOD_CTRL) {
2036 $self->{ctrl}++;
2037 $::CONN->user_send ("run $DIR{$sym}[0]");
2038 } else {
2039 $::CONN->user_send ("$DIR{$sym}[1]");
2040 }
2041 }
2042}
2043
2044sub key_up {
2045 my ($self, $ev) = @_;
2046
2047 my $mod = $ev->key_mod;
2048 my $sym = $ev->key_sym;
2049
2050 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2051 $::CONN->user_send ("fire_stop");
2052 }
2053 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2054 $::CONN->user_send ("run_stop");
2055 }
2056}
2057
2058#############################################################################
2059
2060package CFClient::UI::Animator; 2114package CFClient::UI::Animator;
2061 2115
2062use SDL::OpenGL; 2116use CFClient::OpenGL;
2063 2117
2064our @ISA = CFClient::UI::Bin::; 2118our @ISA = CFClient::UI::Bin::;
2065 2119
2066sub moveto { 2120sub moveto {
2067 my ($self, $x, $y) = @_; 2121 my ($self, $x, $y) = @_;
… …
2107 my $class = shift; 2161 my $class = shift;
2108 2162
2109 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
2110 state => 0, 2164 state => 0,
2111 connect_activate => \&toggle_flopper, 2165 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2112 @_ 2167 @_
2113 ); 2168 );
2114 2169
2115 if ($self->{state}) { 2170 if ($self->{state}) {
2116 $self->{state} = 0; 2171 $self->{state} = 0;
… …
2136 $self->emit (changed => $self->{state}); 2191 $self->emit (changed => $self->{state});
2137} 2192}
2138 2193
2139############################################################################# 2194#############################################################################
2140 2195
2196package CFClient::UI::Tooltip;
2197
2198our @ISA = CFClient::UI::Bin::;
2199
2200use CFClient::OpenGL;
2201
2202sub new {
2203 my $class = shift;
2204
2205 $class->SUPER::new (
2206 @_,
2207 can_events => 0,
2208 )
2209}
2210
2211sub set_markup {
2212 my ($self, $text) = @_;
2213
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2215 $self->{label}->set_markup ($text);
2216 $self->add ($self->{label});
2217}
2218
2219sub size_request {
2220 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225
2226 ($w + 4, $h + 4)
2227}
2228
2229sub size_allocate {
2230 my ($self, $w, $h) = @_;
2231
2232 $self->SUPER::size_allocate ($w - 4, $h - 4);
2233}
2234
2235sub _draw {
2236 my ($self) = @_;
2237
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375;
2240
2241 my ($w, $h) = @$self{qw(w h)};
2242
2243 glColor 1, 0.8, 0.4;
2244 glBegin GL_QUADS;
2245 glVertex 0 , 0;
2246 glVertex 0 , $h;
2247 glVertex $w, $h;
2248 glVertex $w, 0;
2249 glEnd;
2250
2251 glColor 0, 0, 0;
2252 glBegin GL_LINE_LOOP;
2253 glVertex 0 , 0;
2254 glVertex 0 , $h;
2255 glVertex $w, $h;
2256 glVertex $w, 0;
2257 glEnd;
2258
2259 glPopMatrix;
2260
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw;
2263}
2264
2265#############################################################################
2266
2267package CFClient::UI::Face;
2268
2269our @ISA = CFClient::UI::Base::;
2270
2271use CFClient::OpenGL;
2272
2273sub new {
2274 my $class = shift;
2275
2276 $class->SUPER::new (
2277 aspect => 1,
2278 @_,
2279 )
2280}
2281
2282sub size_request {
2283 (32, 8)
2284}
2285
2286sub draw {
2287 my ($self) = @_;
2288
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290
2291 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 }
2301}
2302
2303#############################################################################
2304
2141package CFClient::UI::Root; 2305package CFClient::UI::Root;
2142 2306
2143our @ISA = CFClient::UI::Container::; 2307our @ISA = CFClient::UI::Container::;
2144 2308
2145use SDL::OpenGL; 2309use CFClient::OpenGL;
2146 2310
2147sub check_size { 2311sub check_size {
2148 my ($self) = @_; 2312 my ($self) = @_;
2149 2313
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151} 2315}
2152 2316
2153sub size_request { 2317sub size_request {
2154 ($::WIDTH, $::HEIGHT) 2318 ($::WIDTH, $::HEIGHT)
2155} 2319}
… …
2157sub configure { 2321sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2322 my ($self, $x, $y, $w, $h) = @_;
2159 2323
2160 $self->SUPER::configure ($x, $y, $w, $h); 2324 $self->SUPER::configure ($x, $y, $w, $h);
2161 2325
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}}; 2326 for my $child (@{$self->{children}}) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2331 $child->configure ($X, $Y, $W,$H);
2332 }
2164} 2333}
2165 2334
2166sub _topleft { 2335sub _topleft {
2167 my ($self, $x, $y) = @_; 2336 my ($self, $x, $y) = @_;
2168 2337
… …
2176 ::refresh (); 2345 ::refresh ();
2177} 2346}
2178 2347
2179sub add { 2348sub add {
2180 my ($self, $child) = @_; 2349 my ($self, $child) = @_;
2350
2351 # integerize window positions
2352 $child->{x} = int $child->{x};
2353 $child->{y} = int $child->{y};
2181 2354
2182 $self->SUPER::add ($child); 2355 $self->SUPER::add ($child);
2183} 2356}
2184 2357
2185sub on_refresh { 2358sub on_refresh {
… …
2211############################################################################# 2384#############################################################################
2212 2385
2213package CFClient::UI; 2386package CFClient::UI;
2214 2387
2215$ROOT = new CFClient::UI::Root; 2388$ROOT = new CFClient::UI::Root;
2389$TOOLTIP = new CFClient::UI::Tooltip;
2216 2390
22171 23911
2218 2392

Diff Legend

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