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.129 by root, Tue Apr 18 01:36:13 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) = @_;
288} 396}
289 397
290sub connect { 398sub connect {
291 my ($self, $signal, $cb) = @_; 399 my ($self, $signal, $cb) = @_;
292 400
293 push @{ $self->{cb}{$signal} }, $cb; 401 push @{ $self->{signal_cb}{$signal} }, $cb;
294} 402}
295 403
296sub emit { 404sub emit {
297 my ($self, $signal, @args) = @_; 405 my ($self, $signal, @args) = @_;
298 406
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
299 $_->($self, @args) 408 $cb->($self, @args);
300 for @{$self->{cb}{$signal} || []}; 409 }
301} 410}
302 411
303sub DESTROY { 412sub DESTROY {
304 my ($self) = @_; 413 my ($self) = @_;
305 414
311package CFClient::UI::DrawBG; 420package CFClient::UI::DrawBG;
312 421
313our @ISA = CFClient::UI::Base::; 422our @ISA = CFClient::UI::Base::;
314 423
315use strict; 424use strict;
316use SDL::OpenGL; 425use CFClient::OpenGL;
317 426
318sub new { 427sub new {
319 my $class = shift; 428 my $class = shift;
320 429
321 # range [value, low, high, page] 430 # range [value, low, high, page]
350 459
351package CFClient::UI::Empty; 460package CFClient::UI::Empty;
352 461
353our @ISA = CFClient::UI::Base::; 462our @ISA = CFClient::UI::Base::;
354 463
464sub new {
465 my ($class, %arg) = @_;
466 $class->SUPER::new (can_events => 0, %arg);
467}
468
355sub size_request { 469sub size_request {
356 (0, 0) 470 (0, 0)
357} 471}
358 472
359sub draw { } 473sub draw { }
367sub new { 481sub new {
368 my ($class, %arg) = @_; 482 my ($class, %arg) = @_;
369 483
370 my $children = delete $arg{children} || []; 484 my $children = delete $arg{children} || [];
371 485
372 my $self = $class->SUPER::new (children => [], %arg); 486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
373 $self->add ($_) for @$children; 487 $self->add ($_) for @$children;
374 488
375 $self 489 $self
376} 490}
377 491
385 $self->{children} = [ 499 $self->{children} = [
386 sort { $a->{z} <=> $b->{z} } 500 sort { $a->{z} <=> $b->{z} }
387 @{$self->{children}}, $child 501 @{$self->{children}}, $child
388 ]; 502 ];
389 503
390 $self->{w} = $self->{h} = -1;
391
392 $child->check_size; 504 $child->check_size;
393} 505}
394 506
395sub remove { 507sub remove {
396 my ($self, $widget) = @_; 508 my ($self, $child) = @_;
397 509
510 delete $child->{parent};
511
398 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
399 513
400 $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} = [];
401} 525}
402 526
403sub find_widget { 527sub find_widget {
404 my ($self, $x, $y) = @_; 528 my ($self, $x, $y) = @_;
405 529
435 559
436 $class->SUPER::new (children => [$child], %arg) 560 $class->SUPER::new (children => [$child], %arg)
437} 561}
438 562
439sub add { 563sub add {
440 my ($self, $widget) = @_; 564 my ($self, $child) = @_;
441 565
442 $self->{children} = []; 566 $self->{children} = [];
443 567
444 $self->SUPER::add ($widget); 568 $self->SUPER::add ($child);
445} 569}
446 570
447sub remove { 571sub remove {
448 my ($self, $widget) = @_; 572 my ($self, $widget) = @_;
449 573
469 593
470package CFClient::UI::Window; 594package CFClient::UI::Window;
471 595
472our @ISA = CFClient::UI::Bin::; 596our @ISA = CFClient::UI::Bin::;
473 597
474use SDL::OpenGL; 598use CFClient::OpenGL;
475 599
476sub new { 600sub new {
477 my ($class, %arg) = @_; 601 my ($class, %arg) = @_;
478 602
479 my $self = $class->SUPER::new (%arg); 603 my $self = $class->SUPER::new (%arg);
533sub new { die } 657sub new { die }
534 658
535sub size_request { 659sub size_request {
536 my ($self) = @_; 660 my ($self) = @_;
537 661
538 @$self{qw(child_w child_h)} = $self->child->size_request; 662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
539 $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)});
540 664
541 @$self{qw(child_w child_h)} 665 @$self{qw(child_w child_h)}
542} 666}
543 667
552 676
553package CFClient::UI::Frame; 677package CFClient::UI::Frame;
554 678
555our @ISA = CFClient::UI::Bin::; 679our @ISA = CFClient::UI::Bin::;
556 680
557use SDL::OpenGL; 681use CFClient::OpenGL;
558
559sub size_request {
560 my ($self) = @_;
561 my $chld = $self->child
562 or return (0, 0);
563
564 $chld->move (2, 2);
565
566 map { $_ + 4 } $chld->size_request;
567}
568
569sub size_allocate {
570 my ($self, $x, $y, $w, $h) = @_;
571
572 $self->child->configure (2, 2, $w - 4, $h - 4);
573}
574
575sub _draw {
576 my ($self) = @_;
577
578 my $chld = $self->child;
579
580 my ($w, $h) = $chld->size_request;
581
582 glBegin GL_QUADS;
583 glColor 0, 0, 0;
584 glVertex 0 , 0;
585 glVertex 0 , $h + 4;
586 glVertex $w + 4 , $h + 4;
587 glVertex $w + 4 , 0;
588 glEnd;
589
590 $chld->draw;
591}
592
593#############################################################################
594
595package CFClient::UI::FancyFrame;
596
597our @ISA = CFClient::UI::Bin::;
598
599use SDL::OpenGL;
600
601my @tex =
602 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
603 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
604 682
605sub new { 683sub new {
606 my $class = shift; 684 my $class = shift;
607 685
608 # TODO: user_x, user_y, overwrite moveto?
609
610 $class->SUPER::new ( 686 my $self = $class->SUPER::new (
611 bg => [1, 1, 1, 1], 687 bg => [1, 1, 1, 1],
612 border_bg => [1, 1, 1, 1], 688 border_bg => [1, 1, 1, 1],
613 border => int $::FONTSIZE * 0.8, 689 border => 0.8,
614 @_ 690 @_
615 ) 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
616} 756}
617 757
618sub size_request { 758sub size_request {
619 my ($self) = @_; 759 my ($self) = @_;
620 760
621 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
622
623 my ($w, $h) = $self->SUPER::size_request; 761 my ($w, $h) = $self->SUPER::size_request;
624 762
625 ( 763 (
626 $w + $self->{border} * 2, 764 $w + $self->border * 2,
627 $h + $self->{border} * 2, 765 $h + $self->border * 2,
628 ) 766 )
629} 767}
630 768
631sub size_allocate { 769sub size_allocate {
632 my ($self, $w, $h) = @_; 770 my ($self, $w, $h) = @_;
633 771
634 $h -= List::Util::max 0, $self->{border} * 2; 772 $h -= List::Util::max 0, $self->border * 2;
635 $w -= List::Util::max 0, $self->{border} * 2; 773 $w -= List::Util::max 0, $self->border * 2;
636 774
775 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
776 if $self->{title};
777
637 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 778 $self->child->configure ($self->border, $self->border, $w, $h);
638} 779}
639 780
640sub button_down { 781sub button_down {
641 my ($self, $ev, $x, $y) = @_; 782 my ($self, $ev, $x, $y) = @_;
642 783
784 my $border = $self->border;
785
643 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 786 if ($x < $self->{w} && $x >= $self->{w} - $border
644 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 787 && $y < $self->{h} && $y >= $self->{h} - $border) {
645 788
646 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 789 my ($ox, $oy) = ($ev->{x}, $ev->{y});
647 my ($bw, $bh) = ($self->{w}, $self->{h}); 790 my ($bw, $bh) = ($self->{w}, $self->{h});
648 791
649 $self->{motion} = sub { 792 $self->{motion} = sub {
650 my ($ev, $x, $y) = @_; 793 my ($ev, $x, $y) = @_;
651 794
652 ($x, $y) = ($ev->motion_x, $ev->motion_y); 795 ($x, $y) = ($ev->{x}, $ev->{y});
653 796
654 $self->{user_w} = $bw + $x - $ox; 797 $self->{user_w} = $bw + $x - $ox;
655 $self->{user_h} = $bh + $y - $oy; 798 $self->{user_h} = $bh + $y - $oy;
656 $self->check_size; 799 $self->check_size;
657 }; 800 };
658 801
659 } elsif ($x >= 0 && $x < $self->{w} 802 } elsif ($x >= 0 && $x < $self->{w}
660 && $y >= 0 && $y < $self->{border}) { 803 && $y >= 0 && $y < $border) {
661 804
662 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 805 my ($ox, $oy) = ($ev->{x}, $ev->{y});
663 my ($bx, $by) = ($self->{x}, $self->{y}); 806 my ($bx, $by) = ($self->{x}, $self->{y});
664 807
665 $self->{motion} = sub { 808 $self->{motion} = sub {
666 my ($ev, $x, $y) = @_; 809 my ($ev, $x, $y) = @_;
667 810
668 ($x, $y) = ($ev->motion_x, $ev->motion_y); 811 ($x, $y) = ($ev->{x}, $ev->{y});
669 812
670 $self->move ($bx + $x - $ox, $by + $y - $oy); 813 $self->move ($bx + $x - $ox, $by + $y - $oy);
671 $self->update; 814 $self->update;
672 }; 815 };
673 } 816 }
694 glEnable GL_BLEND; 837 glEnable GL_BLEND;
695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
696 glEnable GL_TEXTURE_2D; 839 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
698 841
842 my $border = $self->border;
843
699 glColor @{ $self->{border_bg} }; 844 glColor @{ $self->{border_bg} };
700 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 845 $tex[1]->draw_quad (0, 0, $w, $border);
701 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 846 $tex[3]->draw_quad (0, $border, $border, $ch);
702 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
703 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 848 $tex[4]->draw_quad (0, $h - $border, $w, $border);
704 849
705 my $bg = $tex[0]; 850 my $bg = $tex[0];
706 851
707 # TODO: repeat texture not scale 852 # TODO: repeat texture not scale
708 my $rep_x = $cw / $bg->{w}; 853 my $rep_x = $cw / $bg->{w};
711 glColor @{ $self->{bg} }; 856 glColor @{ $self->{bg} };
712 857
713 $bg->{s} = $rep_x; 858 $bg->{s} = $rep_x;
714 $bg->{t} = $rep_y; 859 $bg->{t} = $rep_y;
715 $bg->{wrap_mode} = 1; 860 $bg->{wrap_mode} = 1;
716 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 861 $bg->draw_quad ($border, $border, $cw, $ch);
717 862
718 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
719 glDisable GL_BLEND; 864 glDisable GL_BLEND;
720 865
866 $self->{title}->draw if $self->{title};
721 $self->child->draw; 867 $self->child->draw;
722} 868}
723 869
724############################################################################# 870#############################################################################
725 871
727 873
728our @ISA = CFClient::UI::Base::; 874our @ISA = CFClient::UI::Base::;
729 875
730use List::Util qw(max sum); 876use List::Util qw(max sum);
731 877
732use SDL::OpenGL; 878use CFClient::OpenGL;
733 879
734sub new { 880sub new {
735 my $class = shift; 881 my $class = shift;
736 882
737 $class->SUPER::new ( 883 $class->SUPER::new (
744 my ($self, $x, $y, $child) = @_; 890 my ($self, $x, $y, $child) = @_;
745 891
746 $child->set_parent ($self); 892 $child->set_parent ($self);
747 $self->{children}[$y][$x] = $child; 893 $self->{children}[$y][$x] = $child;
748 894
749 $self->{w} = $self->{h} = -1;
750
751 $child->check_size; 895 $child->check_size;
752} 896}
753 897
754# 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?
755sub clear { 899sub clear {
769 or next; 913 or next;
770 914
771 for my $x (0 .. $#$row) { 915 for my $x (0 .. $#$row) {
772 my $widget = $row->[$x] 916 my $widget = $row->[$x]
773 or next; 917 or next;
774 my ($w, $h) = $widget->size_request; 918 my ($w, $h) = @$widget{qw(req_w req_h)};
775 919
776 $w[$x] = max $w[$x], $w; 920 $w[$x] = max $w[$x], $w;
777 $h[$y] = max $h[$y], $h; 921 $h[$y] = max $h[$y], $h;
778 } 922 }
779 } 923 }
884 1028
885 ($h, $w) = ($w, $h); 1029 ($h, $w) = ($w, $h);
886 1030
887 my $children = $self->{children}; 1031 my $children = $self->{children};
888 1032
889 my @h = map +($_->size_request)[0], @$children; 1033 my @h = map $_->{req_w}, @$children;
890 1034
891 my $req_h = List::Util::sum @h; 1035 my $req_h = List::Util::sum @h;
892 1036
893 if ($req_h > $h) { 1037 if ($req_h > $h) {
894 # ah well, not enough space 1038 # ah well, not enough space
942sub size_allocate { 1086sub size_allocate {
943 my ($self, $w, $h) = @_; 1087 my ($self, $w, $h) = @_;
944 1088
945 my $children = $self->{children}; 1089 my $children = $self->{children};
946 1090
947 my @h = map +($_->size_request)[1], @$children; 1091 my @h = map $_->{req_h}, @$children;
948 1092
949 my $req_h = List::Util::sum @h; 1093 my $req_h = List::Util::sum @h;
950 1094
951 if ($req_h > $h) { 1095 if ($req_h > $h) {
952 # ah well, not enough space 1096 # ah well, not enough space
980 1124
981package CFClient::UI::Label; 1125package CFClient::UI::Label;
982 1126
983our @ISA = CFClient::UI::Base::; 1127our @ISA = CFClient::UI::Base::;
984 1128
985use SDL::OpenGL; 1129use CFClient::OpenGL;
986 1130
987sub new { 1131sub new {
988 my ($class, %arg) = @_; 1132 my ($class, %arg) = @_;
989 1133
990 my $self = $class->SUPER::new ( 1134 my $self = $class->SUPER::new (
991 fg => [1, 1, 1], 1135 fg => [1, 1, 1],
1136 #font => default_font
992 fontsize => $::FONTSIZE, 1137 fontsize => 1,
993 text => "", 1138 text => "",
994 align => -1, 1139 align => -1,
995 valign => -1, 1140 valign => -1,
996 padding => 2, 1141 padding => 2,
997 layout => new CFClient::Layout, 1142 layout => new CFClient::Layout,
1143 can_events => 0,
998 %arg 1144 %arg
999 ); 1145 );
1000 1146
1001 $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 }
1002 1152
1003 $self->set_text (delete $self->{text}) if exists $self->{text}; 1153 $self->set_text (delete $self->{text}) if exists $self->{text};
1004 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1154 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1005 1155
1006 $self 1156 $self
1007} 1157}
1008 1158
1009sub escape_text { 1159sub escape {
1010 local $_ = $_[1]; 1160 local $_ = $_[1];
1011 1161
1012 s/&/&amp;/g; 1162 s/&/&amp;/g;
1013 s/>/&gt;/g; 1163 s/>/&gt;/g;
1014 s/</&lt;/g; 1164 s/</&lt;/g;
1020 my ($self, $text) = @_; 1170 my ($self, $text) = @_;
1021 1171
1022 $self->{layout}->set_text ($text); 1172 $self->{layout}->set_text ($text);
1023 1173
1024 delete $self->{texture}; 1174 delete $self->{texture};
1175 $self->check_size;
1025 $self->update; 1176 $self->update;
1026} 1177}
1027 1178
1028sub set_markup { 1179sub set_markup {
1029 my ($self, $markup) = @_; 1180 my ($self, $markup) = @_;
1030 1181
1031 $self->{layout}->set_markup ($markup); 1182 $self->{layout}->set_markup ($markup);
1032 1183
1033 delete $self->{texture}; 1184 delete $self->{texture};
1185 $self->check_size;
1034 $self->update; 1186 $self->update;
1035} 1187}
1036 1188
1037sub size_request { 1189sub size_request {
1038 my ($self) = @_; 1190 my ($self) = @_;
1039 1191
1040 $self->{layout}->set_width; 1192 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{max_w} || -1);
1041 $self->{layout}->set_height ($self->{fontsize}); 1194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1042 1195
1043 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 }
1044 1207
1045 ( 1208 (
1046 $w + $self->{padding} * 2, 1209 $w + $self->{padding} * 2,
1047 $h + $self->{padding} * 2, 1210 $h + $self->{padding} * 2,
1048 ) 1211 )
1052 my ($self, $w, $h) = @_; 1215 my ($self, $w, $h) = @_;
1053 1216
1054 delete $self->{texture}; 1217 delete $self->{texture};
1055} 1218}
1056 1219
1057sub update { 1220sub set_fontsize {
1058 my ($self) = @_; 1221 my ($self, $fontsize) = @_;
1059 1222
1223 $self->{fontsize} = $fontsize;
1060 delete $self->{texture}; 1224 delete $self->{texture};
1225 $self->check_size;
1061 $self->SUPER::update; 1226 $self->update;
1062} 1227}
1063 1228
1064sub _draw { 1229sub _draw {
1065 my ($self) = @_; 1230 my ($self) = @_;
1066 1231
1067 my $tex = $self->{texture} ||= do { 1232 my $tex = $self->{texture} ||= do {
1233 $self->{layout}->set_font ($self->{font}) if $self->{font};
1068 $self->{layout}->set_width ($self->{w}); 1234 $self->{layout}->set_width ($self->{w});
1069 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1070 new_from_layout CFClient::Texture $self->{layout} 1236 new_from_layout CFClient::Texture $self->{layout}
1071 }; 1237 };
1072 1238
1073 glEnable GL_BLEND; 1239 glEnable GL_BLEND;
1074 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1099 1265
1100package CFClient::UI::EntryBase; 1266package CFClient::UI::EntryBase;
1101 1267
1102our @ISA = CFClient::UI::Label::; 1268our @ISA = CFClient::UI::Label::;
1103 1269
1104use SDL; 1270use CFClient::OpenGL;
1105use SDL::OpenGL;
1106 1271
1107sub new { 1272sub new {
1108 my $class = shift; 1273 my $class = shift;
1109 1274
1110 $class->SUPER::new ( 1275 $class->SUPER::new (
1113 active_bg => [1, 1, 1, 0.5], 1278 active_bg => [1, 1, 1, 0.5],
1114 active_fg => [0, 0, 0], 1279 active_fg => [0, 0, 0],
1115 can_hover => 1, 1280 can_hover => 1,
1116 can_focus => 1, 1281 can_focus => 1,
1117 valign => 0, 1282 valign => 0,
1283 can_events => 1,
1118 @_ 1284 @_
1119 ) 1285 )
1120} 1286}
1121 1287
1122sub _set_text { 1288sub _set_text {
1124 1290
1125 delete $self->{cur_h}; 1291 delete $self->{cur_h};
1126 1292
1127 return if $self->{text} eq $text; 1293 return if $self->{text} eq $text;
1128 1294
1295 delete $self->{texture};
1296
1129 $self->{last_activity} = $::NOW; 1297 $self->{last_activity} = $::NOW;
1130 $self->{text} = $text; 1298 $self->{text} = $text;
1131 1299
1132 $text =~ s/./*/g if $self->{hidden}; 1300 $text =~ s/./*/g if $self->{hidden};
1133 $self->{layout}->set_text ("$text "); 1301 $self->{layout}->set_text ("$text ");
1148} 1316}
1149 1317
1150sub size_allocate { 1318sub size_allocate {
1151 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1152 1320
1153 $self->_set_text ($self->{text}); 1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1154} 1322}
1155 1323
1156sub set_text { 1324sub set_text {
1157 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1158 1326
1162} 1330}
1163 1331
1164sub key_down { 1332sub key_down {
1165 my ($self, $ev) = @_; 1333 my ($self, $ev) = @_;
1166 1334
1167 my $mod = $ev->key_mod; 1335 my $mod = $ev->{mod};
1168 my $sym = $ev->key_sym; 1336 my $sym = $ev->{sym};
1169
1170 my $uni = $ev->key_unicode; 1337 my $uni = $ev->{unicode};
1171 1338
1172 my $text = $self->get_text; 1339 my $text = $self->get_text;
1173 1340
1174 if ($sym == SDLK_BACKSPACE) { 1341 if ($sym == 8) {
1175 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1176 } elsif ($sym == SDLK_DELETE) { 1343 } elsif ($sym == 127) {
1177 substr $text, $self->{cursor}, 1, ""; 1344 substr $text, $self->{cursor}, 1, "";
1178 } elsif ($sym == SDLK_LEFT) { 1345 } elsif ($sym == CFClient::SDLK_LEFT) {
1179 --$self->{cursor} if $self->{cursor}; 1346 --$self->{cursor} if $self->{cursor};
1180 } elsif ($sym == SDLK_RIGHT) { 1347 } elsif ($sym == CFClient::SDLK_RIGHT) {
1181 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1348 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1182 } elsif ($sym == SDLK_HOME) { 1349 } elsif ($sym == CFClient::SDLK_HOME) {
1183 $self->{cursor} = 0; 1350 $self->{cursor} = 0;
1184 } elsif ($sym == SDLK_END) { 1351 } elsif ($sym == CFClient::SDLK_END) {
1185 $self->{cursor} = length $text; 1352 $self->{cursor} = length $text;
1186 } elsif ($sym == SDLK_ESCAPE) { 1353 } elsif ($sym == 27) {
1187 $self->emit ('escape'); 1354 $self->emit ('escape');
1188 } elsif ($uni) { 1355 } elsif ($uni) {
1189 substr $text, $self->{cursor}++, 0, chr $uni; 1356 substr $text, $self->{cursor}++, 0, chr $uni;
1190 } 1357 }
1191 1358
1266 1433
1267package CFClient::UI::Entry; 1434package CFClient::UI::Entry;
1268 1435
1269our @ISA = CFClient::UI::EntryBase::; 1436our @ISA = CFClient::UI::EntryBase::;
1270 1437
1271use SDL; 1438use CFClient::OpenGL;
1272use SDL::OpenGL;
1273 1439
1274sub key_down { 1440sub key_down {
1275 my ($self, $ev) = @_; 1441 my ($self, $ev) = @_;
1276 1442
1277 my $sym = $ev->key_sym; 1443 my $sym = $ev->{sym};
1278 1444
1279 if ($sym == SDLK_RETURN) { 1445 if ($sym == 13) {
1280 $self->emit (activate => $self->get_text); 1446 $self->emit (activate => $self->get_text);
1281 $self->update; 1447 $self->update;
1282 1448
1283 } else { 1449 } else {
1284 $self->SUPER::key_down ($ev); 1450 $self->SUPER::key_down ($ev);
1290 1456
1291package CFClient::UI::Button; 1457package CFClient::UI::Button;
1292 1458
1293our @ISA = CFClient::UI::Label::; 1459our @ISA = CFClient::UI::Label::;
1294 1460
1295use SDL; 1461use CFClient::OpenGL;
1296use SDL::OpenGL;
1297 1462
1298my @tex = 1463my @tex =
1299 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1464 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1300 qw(b1_button_active.png); 1465 qw(b1_button_active.png);
1301 1466
1302sub new { 1467sub new {
1303 my $class = shift; 1468 my $class = shift;
1304 1469
1308 bg => [1, 1, 1, 0.2], 1473 bg => [1, 1, 1, 0.2],
1309 active_fg => [0, 0, 1], 1474 active_fg => [0, 0, 1],
1310 can_hover => 1, 1475 can_hover => 1,
1311 align => 0, 1476 align => 0,
1312 valign => 0, 1477 valign => 0,
1478 can_events => 1,
1313 @_ 1479 @_
1314 ) 1480 )
1315} 1481}
1316 1482
1317sub button_up { 1483sub button_up {
1351package CFClient::UI::CheckBox; 1517package CFClient::UI::CheckBox;
1352 1518
1353our @ISA = CFClient::UI::DrawBG::; 1519our @ISA = CFClient::UI::DrawBG::;
1354 1520
1355my @tex = 1521my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1522 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1357 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1523 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1358 1524
1359use SDL; 1525use CFClient::OpenGL;
1360use SDL::OpenGL;
1361 1526
1362sub new { 1527sub new {
1363 my $class = shift; 1528 my $class = shift;
1364 1529
1365 $class->SUPER::new ( 1530 $class->SUPER::new (
1411 glDisable GL_BLEND; 1576 glDisable GL_BLEND;
1412} 1577}
1413 1578
1414############################################################################# 1579#############################################################################
1415 1580
1416package CFClient::UI::VGauge; 1581package CFClient::UI::Image;
1417 1582
1418our @ISA = CFClient::UI::Base::; 1583our @ISA = CFClient::UI::Base::;
1419 1584
1420use SDL::OpenGL; 1585use CFClient::OpenGL;
1586use Carp qw/confess/;
1421 1587
1422my %tex = ( 1588our %loaded_images;
1423 food => [
1424 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426 ],
1427 grace => [
1428 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1429 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1430 ],
1431 hp => [
1432 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1433 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434 ],
1435 mana => [
1436 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1437 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1438 ],
1439);
1440 1589
1441# eg. VGauge->new (gauge => 'food'), default gauge: food
1442sub new { 1590sub new {
1443 my $class = shift; 1591 my $class = shift;
1444 1592
1445 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};
1446 1605
1447 $self 1606 $self
1448} 1607}
1449 1608
1450sub size_request { 1609sub size_request {
1451 my ($self) = @_; 1610 my ($self) = @_;
1452 1611
1453 my $tex = $tex{$self->{gauge}}[0]; 1612 ($self->{tex}->{w}, $self->{tex}->{h})
1454
1455 @$tex{qw(w h)}
1456}
1457
1458sub set_max {
1459 my ($self, $max) = @_;
1460
1461 $self->{max_val} = $max;
1462}
1463
1464sub set_value {
1465 my ($self, $val, $max) = @_;
1466
1467 $self->set_max ($max)
1468 if defined $max;
1469
1470 $max = $self->{max_val};
1471 $self->{val} = $val;
1472
1473 $self->update;
1474} 1613}
1475 1614
1476sub _draw { 1615sub _draw {
1477 my ($self) = @_; 1616 my ($self) = @_;
1478 1617
1479 my $tex = $tex{$self->{gauge}}; 1618 my $tex = $self->{tex};
1480 1619
1481 my ($w, $h) = ($self->{w}, $self->{h}); 1620 my ($w, $h) = ($self->{w}, $self->{h});
1482 1621
1483 my $ycut = $self->{val} / ($self->{max_val} || 1); 1622 if ($self->{rot90}) {
1484 $ycut = 1 if $self->{val} > $self->{max_val}; 1623 glRotate 90, 0, 0, 1;
1624 glTranslate 0, -$self->{w}, 0;
1485 1625
1486 my $t1 = $tex->[0]; 1626 ($w, $h) = ($h, $w);
1487 my $t2 = $tex->[1]; 1627 }
1488 1628
1489 glEnable GL_BLEND; 1629 glEnable GL_BLEND;
1490 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491 glEnable GL_TEXTURE_2D; 1631 glEnable GL_TEXTURE_2D;
1492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493 1633
1494 my $h1 = $self->{h} - $ycut * $self->{h}; 1634 $tex->draw_quad (0, 0, $w, $h);
1495 my $h2 = $ycut * $self->{h};
1496
1497 my $yp = 0;
1498
1499 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1500 glBegin (GL_QUADS);
1501 glTexCoord (0, 0); glVertex (0 , $yp);
1502 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1503 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1504 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1505 glEnd ();
1506
1507 $yp += $h1;
1508
1509 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1510 glBegin (GL_QUADS);
1511 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1512 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1513 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1514 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1515 glEnd ();
1516 1635
1517 glDisable GL_BLEND; 1636 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D; 1637 glDisable GL_TEXTURE_2D;
1519} 1638}
1520 1639
1521############################################################################# 1640#############################################################################
1522 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
1729 my $h1 = $self->{h} * (1 - $ycut1);
1730 my $h2 = $self->{h} * (1 - $ycut2);
1731
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;
1736
1737 glBindTexture GL_TEXTURE_2D, $t1->{name};
1738 glBegin GL_QUADS;
1739 glTexCoord 0 , 0; glVertex 0 , 0;
1740 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1741 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1742 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1743 glEnd;
1744
1745 my $ycut1 = List::Util::min 1, $ycut;
1746 glBindTexture GL_TEXTURE_2D, $t2->{name};
1747 glBegin GL_QUADS;
1748 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1749 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1750 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1751 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
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 }
1763
1764 glDisable GL_BLEND;
1765 glDisable GL_TEXTURE_2D;
1766}
1767
1768#############################################################################
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
1523package CFClient::UI::Slider; 1817package CFClient::UI::Slider;
1524 1818
1525use strict; 1819use strict;
1526 1820
1527use SDL::OpenGL; 1821use CFClient::OpenGL;
1528 1822
1529our @ISA = CFClient::UI::DrawBG::; 1823our @ISA = CFClient::UI::DrawBG::;
1530 1824
1531my @tex = 1825my @tex =
1532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1826 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1542 # TODO: calculations are off 1836 # TODO: calculations are off
1543 my $self = $class->SUPER::new ( 1837 my $self = $class->SUPER::new (
1544 fg => [1, 1, 1], 1838 fg => [1, 1, 1],
1545 active_fg => [0, 0, 0], 1839 active_fg => [0, 0, 0],
1546 range => [0, 0, 100, 10], 1840 range => [0, 0, 100, 10],
1547 req_w => 40, 1841 req_w => 20,
1548 req_h => 13, 1842 req_h => 20,
1549 vertical => 0, 1843 vertical => 0,
1550 can_hover => 1, 1844 can_hover => 1,
1551 inner_pad => 5, 1845 inner_pad => 5,
1552 @_ 1846 @_
1553 ); 1847 );
1657 1951
1658package CFClient::UI::TextView; 1952package CFClient::UI::TextView;
1659 1953
1660our @ISA = CFClient::UI::HBox::; 1954our @ISA = CFClient::UI::HBox::;
1661 1955
1662use SDL::OpenGL; 1956use CFClient::OpenGL;
1663 1957
1664sub new { 1958sub new {
1665 my $class = shift; 1959 my $class = shift;
1666 1960
1667 my $self = $class->SUPER::new ( 1961 my $self = $class->SUPER::new (
1668 req_w => $::WIDTH / 6,
1669 req_h => $::HEIGHT / 6,
1670 fontsize => $::FONTSIZE, 1962 fontsize => 1,
1963 #font => default_font
1671 @_, 1964 @_,
1672 1965
1673 layout => (new CFClient::Layout), 1966 layout => (new CFClient::Layout),
1674 par => [], 1967 par => [],
1675 height => 0, 1968 height => 0,
1696sub text_height { 1989sub text_height {
1697 my ($self, $text) = @_; 1990 my ($self, $text) = @_;
1698 1991
1699 my $layout = $self->{layout}; 1992 my $layout = $self->{layout};
1700 1993
1701 $layout->set_height ($self->{fontsize}); 1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1702 $layout->set_width ($self->{w}); 1995 $layout->set_width ($self->{w});
1703 $layout->set_text ($text); 1996 $layout->set_text ($text);
1704 1997
1705 ($layout->size)[1] 1998 ($layout->size)[1]
1706} 1999}
1710 2003
1711 $self->{need_reflow}++; 2004 $self->{need_reflow}++;
1712 $self->update; 2005 $self->update;
1713} 2006}
1714 2007
1715sub size_request {
1716 my ($self) = @_;
1717
1718 ($self->{req_w}, $self->{req_h})
1719}
1720
1721sub size_allocate { 2008sub size_allocate {
1722 my ($self, $w, $h) = @_; 2009 my ($self, $w, $h) = @_;
1723 2010
2011 $self->SUPER::size_allocate ($w, $h);
2012
2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1724 $self->{layout}->set_height ($self->{fontsize}); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1725 $self->{layout}->set_width ($self->{w}); 2015 $self->{layout}->set_width ($self->{children}[0]{w});
1726 2016
1727 $self->reflow; 2017 $self->reflow;
1728 $self->update;
1729} 2018}
1730 2019
1731sub add_paragraph { 2020sub add_paragraph {
1732 my ($self, $color, $text) = @_; 2021 my ($self, $color, $text) = @_;
1733 2022
1781 my $y1 = $top + $self->{h}; 2070 my $y1 = $top + $self->{h};
1782 2071
1783 my $y = 0; 2072 my $y = 0;
1784 2073
1785 my $layout = $self->{layout}; 2074 my $layout = $self->{layout};
2075
2076 $layout->set_font ($self->{font}) if $self->{font};
1786 2077
1787 for my $par (@{$self->{par}}) { 2078 for my $par (@{$self->{par}}) {
1788 my $h = $par->[0]; 2079 my $h = $par->[0];
1789 2080
1790 if ($y0 < $y + $h && $y < $y1) { 2081 if ($y0 < $y + $h && $y < $y1) {
1818 2109
1819} 2110}
1820 2111
1821############################################################################# 2112#############################################################################
1822 2113
1823package CFClient::UI::MapWidget;
1824
1825use strict;
1826
1827use List::Util qw(min max);
1828
1829use SDL;
1830use SDL::OpenGL;
1831
1832our @ISA = CFClient::UI::Base::;
1833
1834sub new {
1835 my $class = shift;
1836
1837 $class->SUPER::new (
1838 z => -1,
1839 can_focus => 1,
1840 list => (glGenLists 1),
1841 @_
1842 )
1843}
1844
1845sub key_down {
1846 print "MAPKEYDOWN\n";
1847}
1848
1849sub key_up {
1850}
1851
1852sub button_down {
1853 my ($self, $ev, $x, $y) = @_;
1854
1855 $self->focus_in;
1856
1857 if ($ev->button == 2) {
1858 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1859 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1860
1861 $self->{motion} = sub {
1862 my ($ev, $x, $y) = @_;
1863
1864 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1865
1866 $::CFG->{map_shift_x} = $bw + $x - $ox;
1867 $::CFG->{map_shift_y} = $bh + $y - $oy;
1868
1869 $self->update;
1870 };
1871 }
1872}
1873
1874sub button_up {
1875 my ($self, $ev, $x, $y) = @_;
1876
1877 delete $self->{motion};
1878}
1879
1880sub mouse_motion {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->{motion}->($ev, $x, $y) if $self->{motion};
1884}
1885
1886sub size_request {
1887 (
1888 1 + 32 * int $::WIDTH / 32,
1889 1 + 32 * int $::HEIGHT / 32,
1890 )
1891}
1892
1893sub update {
1894 my ($self) = @_;
1895
1896 $self->{need_update} = 1;
1897 $self->SUPER::update;
1898}
1899
1900sub draw {
1901 my ($self) = @_;
1902
1903 if (delete $self->{need_update}) {
1904 glNewList $self->{list}, GL_COMPILE;
1905
1906 if ($::MAP) {
1907 my $sw = int $::WIDTH / 32;
1908 my $sh = int $::HEIGHT / 32;
1909
1910 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1911 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1912
1913 glTranslate $sx0 - 32, $sy0 - 32, 0;
1914
1915 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1916
1917 if ($::CFG->{fow_enable}) {
1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1920 glConvolutionFilter2D (
1921 GL_CONVOLUTION_2D,
1922 GL_ALPHA,
1923 3, 3,
1924 GL_ALPHA, GL_FLOAT,
1925 pack "f*",
1926 0.1, 0.1, 0.1,
1927 0.1, 0.2, 0.1,
1928 0.1, 0.1, 0.1,
1929 );
1930 glEnable GL_CONVOLUTION_2D;
1931 }
1932
1933 $self->{fow_texture} = new CFClient::Texture
1934 w => $w,
1935 h => $h,
1936 data => $data,
1937 internalformat => GL_ALPHA,
1938 format => GL_ALPHA;
1939
1940 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1941
1942 glEnable GL_BLEND;
1943 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1944 glEnable GL_TEXTURE_2D;
1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1946
1947 glColor +($::CFG->{fow_intensity}) x 3, 1;
1948 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1949
1950 glDisable GL_TEXTURE_2D;
1951 glDisable GL_BLEND;
1952 }
1953
1954 # HACK BEGIN
1955 {
1956 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1957 my ($w, $h) = (250, 250);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963
1964 $self->{mapmap_texture} =
1965 new CFClient::Texture
1966 w => $w,
1967 h => $h,
1968 data => $::MAP->mapmap ($w, $h),
1969 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1970
1971 $self->{mapmap_texture}->draw_quad (100, 100);
1972
1973 glDisable GL_TEXTURE_2D;
1974 glDisable GL_BLEND;
1975 }
1976 # HACK END
1977 }
1978
1979 glEndList;
1980 }
1981
1982 glPushMatrix;
1983 glCallList $self->{list};
1984 glPopMatrix;
1985
1986 if ($FOCUS != $self) {
1987 glColor 64/255, 64/255, 64/255;
1988 glLogicOp GL_AND;
1989 glEnable GL_COLOR_LOGIC_OP;
1990 glBegin GL_QUADS;
1991 glVertex 0, 0;
1992 glVertex 0, $::HEIGHT;
1993 glVertex $::WIDTH, $::HEIGHT;
1994 glVertex $::WIDTH, 0;
1995 glEnd;
1996 glDisable GL_COLOR_LOGIC_OP;
1997 }
1998}
1999
2000my %DIR = (
2001 SDLK_KP8, [1, "north"],
2002 SDLK_KP9, [2, "northeast"],
2003 SDLK_KP6, [3, "east"],
2004 SDLK_KP3, [4, "southeast"],
2005 SDLK_KP2, [5, "south"],
2006 SDLK_KP1, [6, "southwest"],
2007 SDLK_KP4, [7, "west"],
2008 SDLK_KP7, [8, "northwest"],
2009
2010 SDLK_UP, [1, "north"],
2011 SDLK_RIGHT, [3, "east"],
2012 SDLK_DOWN, [5, "south"],
2013 SDLK_LEFT, [7, "west"],
2014);
2015
2016sub key_down {
2017 my ($self, $ev) = @_;
2018
2019 my $mod = $ev->key_mod;
2020 my $sym = $ev->key_sym;
2021
2022 if ($sym == SDLK_KP5) {
2023 $::CONN->user_send ("stay fire");
2024 } elsif ($sym == SDLK_a) {
2025 $::CONN->user_send ("apply");
2026 } elsif ($sym == SDLK_QUOTE) {
2027 $self->emit ('activate_console');
2028 } elsif ($sym == SDLK_SLASH) {
2029 $self->emit ('activate_console' => '/');
2030 } elsif (exists $DIR{$sym}) {
2031 if ($mod & KMOD_SHIFT) {
2032 $self->{shft}++;
2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
2034 } elsif ($mod & KMOD_CTRL) {
2035 $self->{ctrl}++;
2036 $::CONN->user_send ("run $DIR{$sym}[0]");
2037 } else {
2038 $::CONN->user_send ("$DIR{$sym}[1]");
2039 }
2040 }
2041}
2042
2043sub key_up {
2044 my ($self, $ev) = @_;
2045
2046 my $mod = $ev->key_mod;
2047 my $sym = $ev->key_sym;
2048
2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2050 $::CONN->user_send ("fire_stop");
2051 }
2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2053 $::CONN->user_send ("run_stop");
2054 }
2055}
2056
2057#############################################################################
2058
2059package CFClient::UI::Animator; 2114package CFClient::UI::Animator;
2060 2115
2061use SDL::OpenGL; 2116use CFClient::OpenGL;
2062 2117
2063our @ISA = CFClient::UI::Bin::; 2118our @ISA = CFClient::UI::Bin::;
2064 2119
2065sub moveto { 2120sub moveto {
2066 my ($self, $x, $y) = @_; 2121 my ($self, $x, $y) = @_;
2106 my $class = shift; 2161 my $class = shift;
2107 2162
2108 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
2109 state => 0, 2164 state => 0,
2110 connect_activate => \&toggle_flopper, 2165 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2111 @_ 2167 @_
2112 ); 2168 );
2113 2169
2114 if ($self->{state}) { 2170 if ($self->{state}) {
2115 $self->{state} = 0; 2171 $self->{state} = 0;
2135 $self->emit (changed => $self->{state}); 2191 $self->emit (changed => $self->{state});
2136} 2192}
2137 2193
2138############################################################################# 2194#############################################################################
2139 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
2140package CFClient::UI::Root; 2305package CFClient::UI::Root;
2141 2306
2142our @ISA = CFClient::UI::Container::; 2307our @ISA = CFClient::UI::Container::;
2143 2308
2144use SDL::OpenGL; 2309use CFClient::OpenGL;
2145 2310
2146sub check_size { 2311sub check_size {
2147 my ($self) = @_; 2312 my ($self) = @_;
2148 2313
2149 $self->configure (0, 0, $::WITH, $::HEIGHT); 2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2150} 2315}
2151 2316
2152sub size_request { 2317sub size_request {
2153 ($::WIDTH, $::HEIGHT) 2318 ($::WIDTH, $::HEIGHT)
2154} 2319}
2156sub configure { 2321sub configure {
2157 my ($self, $x, $y, $w, $h) = @_; 2322 my ($self, $x, $y, $w, $h) = @_;
2158 2323
2159 $self->SUPER::configure ($x, $y, $w, $h); 2324 $self->SUPER::configure ($x, $y, $w, $h);
2160 2325
2161 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2162 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 }
2163} 2333}
2164 2334
2165sub _topleft { 2335sub _topleft {
2166 my ($self, $x, $y) = @_; 2336 my ($self, $x, $y) = @_;
2167 2337
2175 ::refresh (); 2345 ::refresh ();
2176} 2346}
2177 2347
2178sub add { 2348sub add {
2179 my ($self, $child) = @_; 2349 my ($self, $child) = @_;
2350
2351 # integerize window positions
2352 $child->{x} = int $child->{x};
2353 $child->{y} = int $child->{y};
2180 2354
2181 $self->SUPER::add ($child); 2355 $self->SUPER::add ($child);
2182} 2356}
2183 2357
2184sub on_refresh { 2358sub on_refresh {
2210############################################################################# 2384#############################################################################
2211 2385
2212package CFClient::UI; 2386package CFClient::UI;
2213 2387
2214$ROOT = new CFClient::UI::Root; 2388$ROOT = new CFClient::UI::Root;
2389$TOOLTIP = new CFClient::UI::Tooltip;
2215 2390
22161 23911
2217 2392

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines