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.124 by elmex, Mon Apr 17 20:29:37 2006 UTC vs.
Revision 1.153 by root, Sun Apr 23 02:14:33 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 (exists $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23 $TOOLTIP->set_text ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show;
26 }
27
28 return;
29 }
30 }
31 }
32
33 $TOOLTIP->hide;
34 delete $TOOLTIP->{owner};
35}
14 36
15# class methods for events 37# class methods for events
16sub feed_sdl_key_down_event { 38sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 39 $FOCUS->key_down ($_[0]) if $FOCUS;
18} 40}
21 $FOCUS->key_up ($_[0]) if $FOCUS; 43 $FOCUS->key_up ($_[0]) if $FOCUS;
22} 44}
23 45
24sub feed_sdl_button_down_event { 46sub feed_sdl_button_down_event {
25 my ($ev) = @_; 47 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 48 my ($x, $y) = ($ev->{x}, $ev->{y});
27 49
28 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 51 my $widget = $ROOT->find_widget ($x, $y);
30 52
31 $GRAB = $widget; 53 $GRAB = $widget;
32 $GRAB->update if $GRAB; 54 $GRAB->update if $GRAB;
33 }
34 55
56 check_tooltip;
57 }
58
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 59 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 60
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 62}
39 63
40sub feed_sdl_button_up_event { 64sub feed_sdl_button_up_event {
41 my ($ev) = @_; 65 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
43 67
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 68 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 69
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 71
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 73
50 if (!$BUTTON_STATE) { 74 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 75 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 76 $grab->update if $grab;
53 $GRAB->update if $GRAB; 77 $GRAB->update if $GRAB;
78
79 check_tooltip;
54 } 80 }
55} 81}
56 82
57sub feed_sdl_motion_event { 83sub feed_sdl_motion_event {
58 my ($ev) = @_; 84 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
60 86
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 88
63 if ($widget != $HOVER) { 89 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
65 91
66 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
94
95 check_tooltip;
68 } 96 }
69 97
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71} 99}
72 100
87 115
88package CFClient::UI::Base; 116package CFClient::UI::Base;
89 117
90use strict; 118use strict;
91 119
92use SDL::OpenGL; 120use CFClient::OpenGL;
93 121
94sub new { 122sub new {
95 my $class = shift; 123 my $class = shift;
96 124
97 my $self = bless { 125 my $self = bless {
98 x => 0, 126 x => 0,
99 y => 0, 127 y => 0,
100 z => 0, 128 z => 0,
101 w => -1, 129 can_events => 1,
102 h => -1,
103 @_ 130 @_
104 }, $class; 131 }, $class;
105 132
106 for (keys %$self) { 133 for (keys %$self) {
107 if (/^connect_(.*)$/) { 134 if (/^connect_(.*)$/) {
110 } 137 }
111 138
112 $self 139 $self
113} 140}
114 141
142sub show {
143 my ($self) = @_;
144
145 return if $self->{parent};
146
147 $CFClient::UI::ROOT->add ($self);
148}
149
150sub hide {
151 my ($self) = @_;
152
153 return unless $self->{parent};
154
155 $self->{parent}->remove ($self);
156}
157
115sub move { 158sub move {
116 my ($self, $x, $y, $z) = @_; 159 my ($self, $x, $y, $z) = @_;
160
117 $self->{x} = int $x; 161 $self->{x} = int $x;
118 $self->{y} = int $y; 162 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 163 $self->{z} = $z if defined $z;
164
165 $self->update;
120} 166}
121 167
122sub needs_redraw { 168sub needs_redraw {
123 0 169 0
124} 170}
125 171
126sub size_request { 172sub size_request {
127 require Carp; 173 require Carp;
128 Carp::confess "size_request is abtract"; 174 Carp::confess "size_request is abstract";
129} 175}
130 176
131sub _size_allocate { 177sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 178 my ($self, $x, $y, $w, $h) = @_;
133 179
180 if ($self->{aspect}) {
181 my $w2 = List::Util::min $w, int $h * $self->{aspect};
182 my $h2 = List::Util::min $h, int $w / $self->{aspect};
183
184 # use alignment to adjust x, y
185
186 $x += int +($w - $w2) * 0.5;
187 $y += int +($h - $h2) * 0.5;
188
189 ($w, $h) = ($w2, $h2);
190 }
191
192 if ($self->{x} != $x || $self->{y} != $y) {
134 $self->{x} = $x; 193 $self->{x} = $x;
135 $self->{y} = $y; 194 $self->{y} = $y;
195 $self->update;
196 }
136 197
137 return unless $self->{w} != $w || $self->{h} != $h; 198 if ($self->{w} != $w || $self->{h} != $h) {
138
139 $self->{w} = $w; 199 $self->{w} = $w;
140 $self->{h} = $h; 200 $self->{h} = $h;
141 201
202 $self->size_allocate ($w, $h);
203 $self->update;
142 1 204 }
143} 205}
144 206
145sub size_allocate { 207sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_; 208 # nothing to be done
147
148 $self->_size_allocate ($x, $y, $w, $h);
149} 209}
150 210
151# return top left coordinates 211# return top left coordinates
152sub _topleft { 212sub _topleft {
153 my ($self, $x, $y) = @_; 213 my ($self, $x, $y) = @_;
247} 307}
248 308
249sub find_widget { 309sub find_widget {
250 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
251 311
312 return () unless $self->{can_events};
313
252 return $self 314 return $self
253 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 315 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
254 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 316 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
255 317
256 () 318 ()
260 my ($self, $parent) = @_; 322 my ($self, $parent) = @_;
261 323
262 Scalar::Util::weaken ($self->{parent} = $parent); 324 Scalar::Util::weaken ($self->{parent} = $parent);
263} 325}
264 326
327sub check_size {
328 my ($self) = @_;
329
330 return unless $self->{parent};
331
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340}
341
265sub update { 342sub update {
266 my ($self) = @_; 343 my ($self) = @_;
267 344
268 $self->{parent}->update 345 $self->{parent}->update
269 if $self->{parent}; 346 if $self->{parent};
270} 347}
271 348
272sub connect { 349sub connect {
273 my ($self, $signal, $cb) = @_; 350 my ($self, $signal, $cb) = @_;
274 351
275 push @{ $self->{cb}{$signal} }, $cb; 352 push @{ $self->{signal_cb}{$signal} }, $cb;
276} 353}
277 354
278sub emit { 355sub emit {
279 my ($self, $signal, @args) = @_; 356 my ($self, $signal, @args) = @_;
280 357
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
281 $_->($self, @args) 359 $cb->($self, @args);
282 for @{$self->{cb}{$signal} || []}; 360 }
283} 361}
284 362
285sub DESTROY { 363sub DESTROY {
286 my ($self) = @_; 364 my ($self) = @_;
287 365
293package CFClient::UI::DrawBG; 371package CFClient::UI::DrawBG;
294 372
295our @ISA = CFClient::UI::Base::; 373our @ISA = CFClient::UI::Base::;
296 374
297use strict; 375use strict;
298use SDL::OpenGL; 376use CFClient::OpenGL;
299 377
300sub new { 378sub new {
301 my $class = shift; 379 my $class = shift;
302 380
303 # range [value, low, high, page] 381 # range [value, low, high, page]
332 410
333package CFClient::UI::Empty; 411package CFClient::UI::Empty;
334 412
335our @ISA = CFClient::UI::Base::; 413our @ISA = CFClient::UI::Base::;
336 414
415sub new {
416 my ($class, %arg) = @_;
417 $class->SUPER::new (can_events => 0, %arg);
418}
419
337sub size_request { 420sub size_request {
338 (0, 0) 421 (0, 0)
339} 422}
340 423
341sub draw { } 424sub draw { }
349sub new { 432sub new {
350 my ($class, %arg) = @_; 433 my ($class, %arg) = @_;
351 434
352 my $children = delete $arg{children} || []; 435 my $children = delete $arg{children} || [];
353 436
354 my $self = $class->SUPER::new (children => [], %arg); 437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
355 $self->add ($_) for @$children; 438 $self->add ($_) for @$children;
356 439
357 $self 440 $self
358} 441}
359 442
367 $self->{children} = [ 450 $self->{children} = [
368 sort { $a->{z} <=> $b->{z} } 451 sort { $a->{z} <=> $b->{z} }
369 @{$self->{children}}, $child 452 @{$self->{children}}, $child
370 ]; 453 ];
371 454
372 $self->{w} = $self->{h} = -1; 455 $child->check_size;
456}
457
458sub remove {
459 my ($self, $child) = @_;
460
461 delete $child->{parent};
462
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
464
465 $self->check_size;
373 $self->update; 466 $self->update;
374}
375
376sub remove {
377 my ($self, $widget) = @_;
378
379 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
380
381 $self->size_allocate (0, 0, $self->{w}, $self->{h});
382} 467}
383 468
384sub find_widget { 469sub find_widget {
385 my ($self, $x, $y) = @_; 470 my ($self, $x, $y) = @_;
386 471
416 501
417 $class->SUPER::new (children => [$child], %arg) 502 $class->SUPER::new (children => [$child], %arg)
418} 503}
419 504
420sub add { 505sub add {
421 my ($self, $widget) = @_; 506 my ($self, $child) = @_;
422 507
423 $self->{children} = []; 508 $self->{children} = [];
424 509
425 $self->SUPER::add ($widget); 510 $self->SUPER::add ($child);
426} 511}
427 512
428sub remove { 513sub remove {
429 my ($self, $widget) = @_; 514 my ($self, $widget) = @_;
430 515
439sub size_request { 524sub size_request {
440 $_[0]{children}[0]->size_request 525 $_[0]{children}[0]->size_request
441} 526}
442 527
443sub size_allocate { 528sub size_allocate {
444 my ($self, $x, $y, $w, $h) = @_; 529 my ($self, $w, $h) = @_;
445 530
446 $self->_size_allocate ($x, $y, $w, $h) or return;
447
448 $self->{children}[0]->size_allocate (0, 0, $w, $h); 531 $self->{children}[0]->configure (0, 0, $w, $h);
449} 532}
450 533
451############################################################################# 534#############################################################################
452 535
453package CFClient::UI::Window; 536package CFClient::UI::Window;
454 537
455our @ISA = CFClient::UI::Bin::; 538our @ISA = CFClient::UI::Bin::;
456 539
457use SDL::OpenGL; 540use CFClient::OpenGL;
458 541
459sub new { 542sub new {
460 my ($class, %arg) = @_; 543 my ($class, %arg) = @_;
461 544
462 my $self = $class->SUPER::new (%arg); 545 my $self = $class->SUPER::new (%arg);
479 $self->child->draw; 562 $self->child->draw;
480 }; 563 };
481} 564}
482 565
483sub size_allocate { 566sub size_allocate {
484 my ($self, $x, $y, $w, $h) = @_; 567 my ($self, $w, $h) = @_;
485 568
486 $self->_size_allocate ($x, $y, $w, $h) or return;
487
488 $self->child->size_allocate (0, 0, $w, $h); 569 $self->child->configure (0, 0, $w, $h);
489 570
490 $self->render_chld; 571 $self->render_chld;
491} 572}
492 573
493sub _draw { 574sub _draw {
509 glDisable GL_TEXTURE_2D; 590 glDisable GL_TEXTURE_2D;
510} 591}
511 592
512############################################################################# 593#############################################################################
513 594
595package CFClient::UI::ViewPort;
596
597our @ISA = CFClient::UI::Window::;
598
599sub new { die }
600
601sub size_request {
602 my ($self) = @_;
603
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
606
607 @$self{qw(child_w child_h)}
608}
609
610sub _draw {
611 my ($self) = @_;
612
613 $self->{children}[1]->draw;
614}
615
616
617#############################################################################
618
514package CFClient::UI::Frame; 619package CFClient::UI::Frame;
515 620
516our @ISA = CFClient::UI::Bin::; 621our @ISA = CFClient::UI::Bin::;
517 622
518use SDL::OpenGL; 623use CFClient::OpenGL;
519
520sub size_request {
521 my ($self) = @_;
522 my $chld = $self->child
523 or return (0, 0);
524
525 $chld->move (2, 2);
526
527 map { $_ + 4 } $chld->size_request;
528}
529
530sub size_allocate {
531 my ($self, $x, $y, $w, $h) = @_;
532
533 $self->_size_allocate ($x, $y, $w, $h) or return;
534
535 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
536}
537
538sub _draw {
539 my ($self) = @_;
540
541 my $chld = $self->child;
542
543 my ($w, $h) = $chld->size_request;
544
545 glBegin GL_QUADS;
546 glColor 0, 0, 0;
547 glVertex 0 , 0;
548 glVertex 0 , $h + 4;
549 glVertex $w + 4 , $h + 4;
550 glVertex $w + 4 , 0;
551 glEnd;
552
553 $chld->draw;
554}
555
556#############################################################################
557
558package CFClient::UI::FancyFrame;
559
560our @ISA = CFClient::UI::Bin::;
561
562use SDL::OpenGL;
563
564my @tex =
565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
566 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
567 624
568sub new { 625sub new {
569 my $class = shift; 626 my $class = shift;
570 627
571 # TODO: user_x, user_y, overwrite moveto?
572
573 $class->SUPER::new ( 628 my $self = $class->SUPER::new (
574 bg => [1, 1, 1, 1], 629 bg => [1, 1, 1, 1],
575 border_bg => [1, 1, 1, 1], 630 border_bg => [1, 1, 1, 1],
576 border => int $::FONTSIZE * 0.8, 631 border => 0.8,
577 @_ 632 @_
633 );
634
635 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644
645sub size_request {
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649
650sub size_allocate {
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655}
656
657sub _draw {
658 my ($self) = @_;
659
660 my ($w, $h) = ($self->{w}, $self->{h});
661
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666
667# glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0;
670# glVertex 0 , $h;
671# glVertex $w, $h;
672# glVertex $w, 0;
673# glEnd;
674
675
676 $self->child->draw;
677 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D;
679}
680
681#############################################################################
682
683package CFClient::UI::FancyFrame;
684
685our @ISA = CFClient::UI::Bin::;
686
687use CFClient::OpenGL;
688
689my @tex =
690 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
691 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
692
693sub new {
694 my $class = shift;
695
696 # TODO: user_x, user_y, overwrite moveto?
697
698 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1],
701 border => 0.8,
702 can_events => 1,
703 @_
704 );
705
706 $self->{title} &&= new CFClient::UI::Label
707 align => 0,
708 valign => 1,
709 text => $self->{title},
710 fontsize => 1;
711
712 $self
713}
714
715sub border {
716 int $_[0]{border} * $::FONTSIZE
717}
718
719sub size_request {
720 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723
724 my ($w, $h) = $self->SUPER::size_request;
725
726 (
727 $w + $self->border * 2,
728 $h + $self->border * 2,
578 ) 729 )
579} 730}
580 731
581sub size_request {
582 my ($self) = @_;
583
584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
586 my ($w, $h) = $self->SUPER::size_request;
587
588 (
589 $w + $self->{border} * 2,
590 $h + $self->{border} * 2,
591 )
592}
593
594sub size_allocate { 732sub size_allocate {
595 my ($self, $x, $y, $w, $h) = @_; 733 my ($self, $w, $h) = @_;
596 734
597 $self->_size_allocate ($x, $y, $w, $h) or return;
598
599 $h -= List::Util::max 0, $self->{border} * 2; 735 $h -= List::Util::max 0, $self->border * 2;
600 $w -= List::Util::max 0, $self->{border} * 2; 736 $w -= List::Util::max 0, $self->border * 2;
601 737
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
739 if $self->{title};
740
602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 741 $self->child->configure ($self->border, $self->border, $w, $h);
603} 742}
604 743
605sub button_down { 744sub button_down {
606 my ($self, $ev, $x, $y) = @_; 745 my ($self, $ev, $x, $y) = @_;
607 746
747 my $border = $self->border;
748
608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 749 if ($x < $self->{w} && $x >= $self->{w} - $border
609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 750 && $y < $self->{h} && $y >= $self->{h} - $border) {
610 751
611 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 752 my ($ox, $oy) = ($ev->{x}, $ev->{y});
612 my ($bw, $bh) = ($self->{w}, $self->{h}); 753 my ($bw, $bh) = ($self->{w}, $self->{h});
613 754
614 $self->{motion} = sub { 755 $self->{motion} = sub {
615 my ($ev, $x, $y) = @_; 756 my ($ev, $x, $y) = @_;
616 757
617 ($x, $y) = ($ev->motion_x, $ev->motion_y); 758 ($x, $y) = ($ev->{x}, $ev->{y});
618 759
619 $self->{user_w} = $bw + $x - $ox; 760 $self->{user_w} = $bw + $x - $ox;
620 $self->{user_h} = $bh + $y - $oy; 761 $self->{user_h} = $bh + $y - $oy;
621 $self->update; 762 $self->check_size;
622 }; 763 };
623 764
624 } elsif ($x >= 0 && $x < $self->{w} 765 } elsif ($x >= 0 && $x < $self->{w}
625 && $y >= 0 && $y < $self->{border}) { 766 && $y >= 0 && $y < $border) {
626 767
627 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 768 my ($ox, $oy) = ($ev->{x}, $ev->{y});
628 my ($bx, $by) = ($self->{x}, $self->{y}); 769 my ($bx, $by) = ($self->{x}, $self->{y});
629 770
630 $self->{motion} = sub { 771 $self->{motion} = sub {
631 my ($ev, $x, $y) = @_; 772 my ($ev, $x, $y) = @_;
632 773
633 ($x, $y) = ($ev->motion_x, $ev->motion_y); 774 ($x, $y) = ($ev->{x}, $ev->{y});
634 775
635 $self->move ($bx + $x - $ox, $by + $y - $oy); 776 $self->move ($bx + $x - $ox, $by + $y - $oy);
636 $self->update; 777 $self->update;
637 }; 778 };
638 } 779 }
659 glEnable GL_BLEND; 800 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 802 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
663 804
805 my $border = $self->border;
806
664 glColor @{ $self->{border_bg} }; 807 glColor @{ $self->{border_bg} };
665 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 808 $tex[1]->draw_quad (0, 0, $w, $border);
666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 809 $tex[3]->draw_quad (0, $border, $border, $ch);
667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 811 $tex[4]->draw_quad (0, $h - $border, $w, $border);
669 812
670 my $bg = $tex[0]; 813 my $bg = $tex[0];
671 814
672 # TODO: repeat texture not scale 815 # TODO: repeat texture not scale
673 my $rep_x = $cw / $bg->{w}; 816 my $rep_x = $cw / $bg->{w};
676 glColor @{ $self->{bg} }; 819 glColor @{ $self->{bg} };
677 820
678 $bg->{s} = $rep_x; 821 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y; 822 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1; 823 $bg->{wrap_mode} = 1;
681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 824 $bg->draw_quad ($border, $border, $cw, $ch);
682 825
683 glDisable GL_TEXTURE_2D; 826 glDisable GL_TEXTURE_2D;
684 glDisable GL_BLEND; 827 glDisable GL_BLEND;
685 828
829 $self->{title}->draw if $self->{title};
686 $self->child->draw; 830 $self->child->draw;
687} 831}
688 832
689############################################################################# 833#############################################################################
690 834
692 836
693our @ISA = CFClient::UI::Base::; 837our @ISA = CFClient::UI::Base::;
694 838
695use List::Util qw(max sum); 839use List::Util qw(max sum);
696 840
697use SDL::OpenGL; 841use CFClient::OpenGL;
698 842
699sub new { 843sub new {
700 my $class = shift; 844 my $class = shift;
701 845
702 $class->SUPER::new ( 846 $class->SUPER::new (
709 my ($self, $x, $y, $child) = @_; 853 my ($self, $x, $y, $child) = @_;
710 854
711 $child->set_parent ($self); 855 $child->set_parent ($self);
712 $self->{children}[$y][$x] = $child; 856 $self->{children}[$y][$x] = $child;
713 857
714 $self->{w} = $self->{h} = -1; 858 $child->check_size;
715 $self->update;
716} 859}
717 860
718# TODO: move to container class maybe? send childs a signal on removal? 861# TODO: move to container class maybe? send childs a signal on removal?
719sub clear { 862sub clear {
720 my ($self) = @_; 863 my ($self) = @_;
733 or next; 876 or next;
734 877
735 for my $x (0 .. $#$row) { 878 for my $x (0 .. $#$row) {
736 my $widget = $row->[$x] 879 my $widget = $row->[$x]
737 or next; 880 or next;
738 my ($w, $h) = $widget->size_request; 881 my ($w, $h) = @$widget{qw(req_w req_h)};
739 882
740 $w[$x] = max $w[$x], $w; 883 $w[$x] = max $w[$x], $w;
741 $h[$y] = max $h[$y], $h; 884 $h[$y] = max $h[$y], $h;
742 } 885 }
743 } 886 }
755 (sum @$hs), 898 (sum @$hs),
756 ) 899 )
757} 900}
758 901
759sub size_allocate { 902sub size_allocate {
760 my ($self, $x, $y, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
761
762 $self->_size_allocate ($x, $y, $w, $h) or return;
763 904
764 my ($ws, $hs) = $self->get_wh; 905 my ($ws, $hs) = $self->get_wh;
765 906
766 my $req_w = sum @$ws; 907 my $req_w = sum @$ws;
767 my $req_h = sum @$hs; 908 my $req_h = sum @$hs;
789 930
790 for my $c (0 .. $#$row) { 931 for my $c (0 .. $#$row) {
791 my $col_w = $ws->[$c]; 932 my $col_w = $ws->[$c];
792 933
793 if (my $widget = $row->[$c]) { 934 if (my $widget = $row->[$c]) {
794 $widget->size_allocate ($x, $y, $col_w, $row_h); 935 $widget->configure ($x, $y, $col_w, $row_h);
795 } 936 }
796 937
797 $x += $col_w; 938 $x += $col_w;
798 } 939 }
799 940
844 (List::Util::max map $_->[1], @alloc), 985 (List::Util::max map $_->[1], @alloc),
845 ) 986 )
846} 987}
847 988
848sub size_allocate { 989sub size_allocate {
849 my ($self, $x, $y, $w, $h) = @_; 990 my ($self, $w, $h) = @_;
850
851 $self->_size_allocate ($x, $y, $w, $h);
852 991
853 ($h, $w) = ($w, $h); 992 ($h, $w) = ($w, $h);
854 993
855 my $children = $self->{children}; 994 my $children = $self->{children};
856 995
857 my @h = map +($_->size_request)[0], @$children; 996 my @h = map $_->{req_w}, @$children;
858 997
859 my $req_h = List::Util::sum @h; 998 my $req_h = List::Util::sum @h;
860 999
861 if ($req_h > $h) { 1000 if ($req_h > $h) {
862 # ah well, not enough space 1001 # ah well, not enough space
878 1017
879 my $y = 0; 1018 my $y = 0;
880 for (0 .. $#$children) { 1019 for (0 .. $#$children) {
881 my $child = $children->[$_]; 1020 my $child = $children->[$_];
882 my $h = $h[$_]; 1021 my $h = $h[$_];
883 $child->size_allocate ($y, 0, $h, $w); 1022 $child->configure ($y, 0, $h, $w);
884 1023
885 $y += $h; 1024 $y += $h;
886 } 1025 }
1026
1027 1
887} 1028}
888 1029
889############################################################################# 1030#############################################################################
890 1031
891package CFClient::UI::VBox; 1032package CFClient::UI::VBox;
904 (List::Util::sum map $_->[1], @alloc), 1045 (List::Util::sum map $_->[1], @alloc),
905 ) 1046 )
906} 1047}
907 1048
908sub size_allocate { 1049sub size_allocate {
909 my ($self, $x, $y, $w, $h) = @_; 1050 my ($self, $w, $h) = @_;
910
911 $self->_size_allocate ($x, $y, $w, $h);
912 1051
913 my $children = $self->{children}; 1052 my $children = $self->{children};
914 1053
915 my @h = map +($_->size_request)[1], @$children; 1054 my @h = map $_->{req_h}, @$children;
916 1055
917 my $req_h = List::Util::sum @h; 1056 my $req_h = List::Util::sum @h;
918 1057
919 if ($req_h > $h) { 1058 if ($req_h > $h) {
920 # ah well, not enough space 1059 # ah well, not enough space
934 1073
935 my $y = 0; 1074 my $y = 0;
936 for (0 .. $#$children) { 1075 for (0 .. $#$children) {
937 my $child = $children->[$_]; 1076 my $child = $children->[$_];
938 my $h = $h[$_]; 1077 my $h = $h[$_];
939 $child->size_allocate (0, $y, $w, $h); 1078 $child->configure (0, $y, $w, $h);
940 1079
941 $y += $h; 1080 $y += $h;
942 } 1081 }
1082
1083 1
943} 1084}
944 1085
945############################################################################# 1086#############################################################################
946 1087
947package CFClient::UI::Label; 1088package CFClient::UI::Label;
948 1089
949our @ISA = CFClient::UI::Base::; 1090our @ISA = CFClient::UI::Base::;
950 1091
951use SDL::OpenGL; 1092use CFClient::OpenGL;
952 1093
953sub new { 1094sub new {
954 my ($class, %arg) = @_; 1095 my ($class, %arg) = @_;
955 1096
956 my $self = $class->SUPER::new ( 1097 my $self = $class->SUPER::new (
957 fg => [1, 1, 1], 1098 fg => [1, 1, 1],
958 fontsize => $::FONTSIZE, 1099 fontsize => 1,
959 text => "", 1100 text => "",
960 align => -1, 1101 align => -1,
961 valign => -1, 1102 valign => -1,
962 padding => 2, 1103 padding => 2,
963 layout => new CFClient::Layout, 1104 layout => new CFClient::Layout,
1105 can_events => 0,
964 %arg 1106 %arg
965 ); 1107 );
966 1108
967 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1109 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout;
1113 }
968 1114
969 $self->set_text (delete $self->{text}) if exists $self->{text}; 1115 $self->set_text (delete $self->{text}) if exists $self->{text};
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
971 1117
972 $self 1118 $self
986 my ($self, $text) = @_; 1132 my ($self, $text) = @_;
987 1133
988 $self->{layout}->set_text ($text); 1134 $self->{layout}->set_text ($text);
989 1135
990 delete $self->{texture}; 1136 delete $self->{texture};
1137 $self->check_size;
991 $self->update; 1138 $self->update;
992} 1139}
993 1140
994sub set_markup { 1141sub set_markup {
995 my ($self, $markup) = @_; 1142 my ($self, $markup) = @_;
996 1143
997 $self->{layout}->set_markup ($markup); 1144 $self->{layout}->set_markup ($markup);
998 1145
999 delete $self->{texture}; 1146 delete $self->{texture};
1147 $self->check_size;
1000 $self->update; 1148 $self->update;
1001} 1149}
1002 1150
1003sub size_request { 1151sub size_request {
1004 my ($self) = @_; 1152 my ($self) = @_;
1005 1153
1006 $self->{layout}->set_width; 1154 $self->{layout}->set_width;
1007 $self->{layout}->set_height ($self->{fontsize}); 1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1008 1156
1009 my ($w, $h) = $self->{layout}->size; 1157 my ($w, $h) = $self->{layout}->size;
1158
1159 if (exists $self->{template}) {
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161
1162 my ($w2, $h2) = $self->{template}->size;
1163
1164 $w = List::Util::max $w, $w2;
1165 $h = List::Util::max $h, $h2;
1166 }
1010 1167
1011 ( 1168 (
1012 $w + $self->{padding} * 2, 1169 $w + $self->{padding} * 2,
1013 $h + $self->{padding} * 2, 1170 $h + $self->{padding} * 2,
1014 ) 1171 )
1015} 1172}
1016 1173
1017sub size_allocate { 1174sub size_allocate {
1018 my ($self, $x, $y, $w, $h) = @_; 1175 my ($self, $w, $h) = @_;
1019
1020 $self->_size_allocate ($x, $y, $w, $h) or return;
1021 1176
1022 delete $self->{texture}; 1177 delete $self->{texture};
1023} 1178}
1024 1179
1025sub update { 1180sub set_fontsize {
1026 my ($self) = @_; 1181 my ($self, $fontsize) = @_;
1027 1182
1183 $self->{fontsize} = $fontsize;
1028 delete $self->{texture}; 1184 delete $self->{texture};
1185 $self->check_size;
1029 $self->SUPER::update; 1186 $self->update;
1030} 1187}
1031 1188
1032sub _draw { 1189sub _draw {
1033 my ($self) = @_; 1190 my ($self) = @_;
1034 1191
1035 my $tex = $self->{texture} ||= do { 1192 my $tex = $self->{texture} ||= do {
1036 $self->{layout}->set_width ($self->{w}); 1193 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1038 new_from_layout CFClient::Texture $self->{layout} 1195 new_from_layout CFClient::Texture $self->{layout}
1039 }; 1196 };
1040 1197
1041 glEnable GL_BLEND; 1198 glEnable GL_BLEND;
1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1067 1224
1068package CFClient::UI::EntryBase; 1225package CFClient::UI::EntryBase;
1069 1226
1070our @ISA = CFClient::UI::Label::; 1227our @ISA = CFClient::UI::Label::;
1071 1228
1072use SDL; 1229use CFClient::OpenGL;
1073use SDL::OpenGL;
1074 1230
1075sub new { 1231sub new {
1076 my $class = shift; 1232 my $class = shift;
1077 1233
1078 $class->SUPER::new ( 1234 $class->SUPER::new (
1081 active_bg => [1, 1, 1, 0.5], 1237 active_bg => [1, 1, 1, 0.5],
1082 active_fg => [0, 0, 0], 1238 active_fg => [0, 0, 0],
1083 can_hover => 1, 1239 can_hover => 1,
1084 can_focus => 1, 1240 can_focus => 1,
1085 valign => 0, 1241 valign => 0,
1242 can_events => 1,
1086 @_ 1243 @_
1087 ) 1244 )
1088} 1245}
1089 1246
1090sub _set_text { 1247sub _set_text {
1092 1249
1093 delete $self->{cur_h}; 1250 delete $self->{cur_h};
1094 1251
1095 return if $self->{text} eq $text; 1252 return if $self->{text} eq $text;
1096 1253
1254 delete $self->{texture};
1255
1097 $self->{last_activity} = $::NOW; 1256 $self->{last_activity} = $::NOW;
1098 $self->{text} = $text; 1257 $self->{text} = $text;
1099 1258
1100 $text =~ s/./*/g if $self->{hidden}; 1259 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text "); 1260 $self->{layout}->set_text ("$text ");
1114 1273
1115 ($w + 1, $h) # add 1 for cursor 1274 ($w + 1, $h) # add 1 for cursor
1116} 1275}
1117 1276
1118sub size_allocate { 1277sub size_allocate {
1119 my ($self, $x, $y, $w, $h) = @_; 1278 my ($self, $w, $h) = @_;
1120 1279
1121 $self->SUPER::size_allocate ($x, $y, $w, $h); 1280 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1122
1123 $self->_set_text ($self->{text});
1124} 1281}
1125 1282
1126sub set_text { 1283sub set_text {
1127 my ($self, $text) = @_; 1284 my ($self, $text) = @_;
1128 1285
1132} 1289}
1133 1290
1134sub key_down { 1291sub key_down {
1135 my ($self, $ev) = @_; 1292 my ($self, $ev) = @_;
1136 1293
1137 my $mod = $ev->key_mod; 1294 my $mod = $ev->{mod};
1138 my $sym = $ev->key_sym; 1295 my $sym = $ev->{sym};
1139
1140 my $uni = $ev->key_unicode; 1296 my $uni = $ev->{unicode};
1141 1297
1142 my $text = $self->get_text; 1298 my $text = $self->get_text;
1143 1299
1144 if ($sym == SDLK_BACKSPACE) { 1300 if ($sym == 8) {
1145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1301 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1146 } elsif ($sym == SDLK_DELETE) { 1302 } elsif ($sym == 127) {
1147 substr $text, $self->{cursor}, 1, ""; 1303 substr $text, $self->{cursor}, 1, "";
1148 } elsif ($sym == SDLK_LEFT) { 1304 } elsif ($sym == CFClient::SDLK_LEFT) {
1149 --$self->{cursor} if $self->{cursor}; 1305 --$self->{cursor} if $self->{cursor};
1150 } elsif ($sym == SDLK_RIGHT) { 1306 } elsif ($sym == CFClient::SDLK_RIGHT) {
1151 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1307 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1152 } elsif ($sym == SDLK_HOME) { 1308 } elsif ($sym == CFClient::SDLK_HOME) {
1153 $self->{cursor} = 0; 1309 $self->{cursor} = 0;
1154 } elsif ($sym == SDLK_END) { 1310 } elsif ($sym == CFClient::SDLK_END) {
1155 $self->{cursor} = length $text; 1311 $self->{cursor} = length $text;
1156 } elsif ($sym == SDLK_ESCAPE) { 1312 } elsif ($sym == 27) {
1157 $self->emit ('escape'); 1313 $self->emit ('escape');
1158 } elsif ($uni) { 1314 } elsif ($uni) {
1159 substr $text, $self->{cursor}++, 0, chr $uni; 1315 substr $text, $self->{cursor}++, 0, chr $uni;
1160 } 1316 }
1161 1317
1236 1392
1237package CFClient::UI::Entry; 1393package CFClient::UI::Entry;
1238 1394
1239our @ISA = CFClient::UI::EntryBase::; 1395our @ISA = CFClient::UI::EntryBase::;
1240 1396
1241use SDL; 1397use CFClient::OpenGL;
1242use SDL::OpenGL;
1243 1398
1244sub key_down { 1399sub key_down {
1245 my ($self, $ev) = @_; 1400 my ($self, $ev) = @_;
1246 1401
1247 my $sym = $ev->key_sym; 1402 my $sym = $ev->{sym};
1248 1403
1249 if ($sym == SDLK_RETURN) { 1404 if ($sym == 13) {
1250 $self->emit (activate => $self->get_text); 1405 $self->emit (activate => $self->get_text);
1251 $self->update; 1406 $self->update;
1252 1407
1253 } else { 1408 } else {
1254 $self->SUPER::key_down ($ev); 1409 $self->SUPER::key_down ($ev);
1260 1415
1261package CFClient::UI::Button; 1416package CFClient::UI::Button;
1262 1417
1263our @ISA = CFClient::UI::Label::; 1418our @ISA = CFClient::UI::Label::;
1264 1419
1265use SDL; 1420use CFClient::OpenGL;
1266use SDL::OpenGL;
1267 1421
1268my @tex = 1422my @tex =
1269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1423 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1270 qw(b1_button_active.png); 1424 qw(b1_button_active.png);
1271 1425
1272sub new { 1426sub new {
1273 my $class = shift; 1427 my $class = shift;
1274 1428
1276 padding => 4, 1430 padding => 4,
1277 fg => [1, 1, 1], 1431 fg => [1, 1, 1],
1278 bg => [1, 1, 1, 0.2], 1432 bg => [1, 1, 1, 0.2],
1279 active_fg => [0, 0, 1], 1433 active_fg => [0, 0, 1],
1280 can_hover => 1, 1434 can_hover => 1,
1435 align => 0,
1436 valign => 0,
1437 can_events => 1,
1281 @_ 1438 @_
1282 ) 1439 )
1283} 1440}
1284 1441
1285sub button_up { 1442sub button_up {
1319package CFClient::UI::CheckBox; 1476package CFClient::UI::CheckBox;
1320 1477
1321our @ISA = CFClient::UI::DrawBG::; 1478our @ISA = CFClient::UI::DrawBG::;
1322 1479
1323my @tex = 1480my @tex =
1324 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1325 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1482 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1326 1483
1327use SDL; 1484use CFClient::OpenGL;
1328use SDL::OpenGL;
1329 1485
1330sub new { 1486sub new {
1331 my $class = shift; 1487 my $class = shift;
1332 1488
1333 $class->SUPER::new ( 1489 $class->SUPER::new (
1344 my ($self) = @_; 1500 my ($self) = @_;
1345 1501
1346 ($self->{padding} * 2 + 6) x 2 1502 ($self->{padding} * 2 + 6) x 2
1347} 1503}
1348 1504
1349sub size_allocate {
1350 my ($self, $x, $y, $w, $h) = @_;
1351
1352 $self->_size_allocate ($x, $y, $w, $h);
1353}
1354
1355sub button_down { 1505sub button_down {
1356 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
1357 1507
1358 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1508 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1359 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1509 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1385 glDisable GL_BLEND; 1535 glDisable GL_BLEND;
1386} 1536}
1387 1537
1388############################################################################# 1538#############################################################################
1389 1539
1390package CFClient::UI::VGauge; 1540package CFClient::UI::Image;
1391 1541
1392our @ISA = CFClient::UI::Base::; 1542our @ISA = CFClient::UI::Base::;
1393 1543
1394use SDL::OpenGL; 1544use CFClient::OpenGL;
1545use Carp qw/confess/;
1395 1546
1396my %tex = ( 1547our %loaded_images;
1397 food => [
1398 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1399 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1400 ],
1401 grace => [
1402 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1403 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1404 ],
1405 hp => [
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1407 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1408 ],
1409 mana => [
1410 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1411 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1412 ],
1413);
1414 1548
1415# eg. VGauge->new (gauge => 'food'), default gauge: food
1416sub new { 1549sub new {
1417 my $class = shift; 1550 my $class = shift;
1418 1551
1419 my $self = $class->SUPER::new (gauge => 'food', @_); 1552 my $self = $class->SUPER::new (can_events => 0, @_);
1553
1554 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1555
1556 $loaded_images{$self->{image}} ||=
1557 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1558
1559 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1560
1561 Scalar::Util::weaken $loaded_images{$self->{image}};
1562
1563 $self->{aspect} = $tex->{w} / $tex->{h};
1420 1564
1421 $self 1565 $self
1422} 1566}
1423 1567
1424sub size_request { 1568sub size_request {
1425 my ($self) = @_; 1569 my ($self) = @_;
1426 1570
1427 ($self->{w}, $self->{h}) 1571 ($self->{tex}->{w}, $self->{tex}->{h})
1428}
1429
1430sub set_max {
1431 my ($self, $max) = @_;
1432 $self->{max_val} = $max;
1433}
1434
1435sub set_value {
1436 my ($self, $val, $max) = @_;
1437
1438 $self->set_max ($max)
1439 if defined $max;
1440
1441 $max = $self->{max_val};
1442 $self->{val} = $val;
1443
1444 $self->update;
1445} 1572}
1446 1573
1447sub _draw { 1574sub _draw {
1448 my ($self) = @_; 1575 my ($self) = @_;
1449 1576
1450 my $tex = $tex{$self->{gauge}}; 1577 my $tex = $self->{tex};
1451 1578
1452 my ($w, $h) = ($self->{w}, $self->{h}); 1579 my ($w, $h) = ($self->{w}, $self->{h});
1453 1580
1454 my $ycut = $self->{val} / ($self->{max_val} || 1); 1581 if ($self->{rot90}) {
1455 $ycut = 1 if $self->{val} > $self->{max_val}; 1582 glRotate 90, 0, 0, 1;
1583 glTranslate 0, -$self->{w}, 0;
1456 1584
1457 my $t1 = $tex->[0]; 1585 ($w, $h) = ($h, $w);
1458 my $t2 = $tex->[1]; 1586 }
1459 1587
1460 glEnable GL_BLEND; 1588 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D; 1590 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 1592
1593 $tex->draw_quad (0, 0, $w, $h);
1594
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D;
1597}
1598
1599#############################################################################
1600
1601package CFClient::UI::VGauge;
1602
1603our @ISA = CFClient::UI::Base::;
1604
1605use CFClient::OpenGL;
1606
1607my %tex = (
1608 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ],
1612 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1615 ],
1616 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ],
1620 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1623 ],
1624);
1625
1626# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new {
1628 my $class = shift;
1629
1630 my $self = $class->SUPER::new (
1631 type => 'food',
1632 @_
1633 );
1634
1635 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1636
1637 $self
1638}
1639
1640sub size_request {
1641 my ($self) = @_;
1642
1643 #my $tex = $tex{$self->{type}}[0];
1644 #@$tex{qw(w h)}
1645 (0, 0)
1646}
1647
1648sub set_max {
1649 my ($self, $max) = @_;
1650
1651 $self->{max_val} = $max;
1652}
1653
1654sub set_value {
1655 my ($self, $val, $max) = @_;
1656
1657 $self->set_max ($max)
1658 if defined $max;
1659
1660 $max = $self->{max_val};
1661 $self->{val} = $val;
1662
1663 $self->update;
1664}
1665
1666sub _draw {
1667 my ($self) = @_;
1668
1669 my $tex = $tex{$self->{type}};
1670
1671 my ($w, $h) = ($self->{w}, $self->{h});
1672
1673 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1;
1675 glTranslate 0, -$self->{w}, 0;
1676
1677 ($w, $h) = ($h, $w);
1678 }
1679
1680 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682
1683 my $t1 = $tex->[0];
1684 my $t2 = $tex->[1];
1685
1686 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690
1465 my $h1 = $self->{h} - $ycut * $self->{h}; 1691 my $h1 = $self->{h} - $ycut * $self->{h};
1466 my $h2 = $ycut * $self->{h}; 1692 my $h2 = $ycut * $self->{h};
1467 1693
1468 my $yp = 0;
1469
1470 glBindTexture (GL_TEXTURE_2D, $t1->{name}); 1694 glBindTexture GL_TEXTURE_2D, $t1->{name};
1471 glBegin (GL_QUADS); 1695 glBegin GL_QUADS;
1472 glTexCoord (0, 0); glVertex (0 , $yp); 1696 glTexCoord 0 , 0; glVertex 0 , 0;
1473 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1); 1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1474 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1); 1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1475 glTexCoord (1, 0); glVertex (0 + $w, $yp); 1699 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1476 glEnd (); 1700 glEnd;
1477 1701
1478 $yp += $h1;
1479
1480 glBindTexture (GL_TEXTURE_2D, $t2->{name}); 1702 glBindTexture GL_TEXTURE_2D, $t2->{name};
1481 glBegin (GL_QUADS); 1703 glBegin GL_QUADS;
1482 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp); 1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1483 glTexCoord (0, 1); glVertex (0 , $yp + $h2); 1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1484 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2); 1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1485 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp); 1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1486 glEnd (); 1708 glEnd;
1487 1709
1488 glDisable GL_BLEND; 1710 glDisable GL_BLEND;
1489 glDisable GL_TEXTURE_2D; 1711 glDisable GL_TEXTURE_2D;
1490} 1712}
1491 1713
1492############################################################################# 1714#############################################################################
1493 1715
1716package CFClient::UI::Gauge;
1717
1718our @ISA = CFClient::UI::VBox::;
1719
1720sub new {
1721 my ($class, %arg) = @_;
1722
1723 my $self = $class->SUPER::new (
1724 tooltip => $arg{type},
1725 %arg,
1726 );
1727
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731
1732 $self
1733}
1734
1735sub set_fontsize {
1736 my ($self, $fsize) = @_;
1737
1738 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize);
1740}
1741
1742sub set_value {
1743 my ($self, $val, $max) = @_;
1744
1745 $self->set_max ($max)
1746 if defined $max;
1747
1748 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757}
1758
1759#############################################################################
1760
1494package CFClient::UI::Slider; 1761package CFClient::UI::Slider;
1495 1762
1496use strict; 1763use strict;
1497 1764
1498use SDL::OpenGL; 1765use CFClient::OpenGL;
1499 1766
1500our @ISA = CFClient::UI::DrawBG::; 1767our @ISA = CFClient::UI::DrawBG::;
1501 1768
1502my @tex = 1769my @tex =
1503 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1770 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1513 # TODO: calculations are off 1780 # TODO: calculations are off
1514 my $self = $class->SUPER::new ( 1781 my $self = $class->SUPER::new (
1515 fg => [1, 1, 1], 1782 fg => [1, 1, 1],
1516 active_fg => [0, 0, 0], 1783 active_fg => [0, 0, 0],
1517 range => [0, 0, 100, 10], 1784 range => [0, 0, 100, 10],
1518 req_w => 40, 1785 req_w => 20,
1519 req_h => 13, 1786 req_h => 20,
1520 vertical => 0, 1787 vertical => 0,
1521 can_hover => 1, 1788 can_hover => 1,
1522 inner_pad => 5, 1789 inner_pad => 5,
1523 @_ 1790 @_
1524 ); 1791 );
1628 1895
1629package CFClient::UI::TextView; 1896package CFClient::UI::TextView;
1630 1897
1631our @ISA = CFClient::UI::HBox::; 1898our @ISA = CFClient::UI::HBox::;
1632 1899
1633use SDL::OpenGL; 1900use CFClient::OpenGL;
1634 1901
1635sub new { 1902sub new {
1636 my $class = shift; 1903 my $class = shift;
1637 1904
1638 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
1639 req_w => $::WIDTH / 6,
1640 req_h => $::HEIGHT / 6,
1641 fontsize => $::FONTSIZE, 1906 fontsize => 1,
1642 @_, 1907 @_,
1643 1908
1644 layout => (new CFClient::Layout), 1909 layout => (new CFClient::Layout),
1645 par => [], 1910 par => [],
1646 height => 0, 1911 height => 0,
1667sub text_height { 1932sub text_height {
1668 my ($self, $text) = @_; 1933 my ($self, $text) = @_;
1669 1934
1670 my $layout = $self->{layout}; 1935 my $layout = $self->{layout};
1671 1936
1672 $layout->set_height ($self->{fontsize}); 1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1673 $layout->set_width ($self->{w}); 1938 $layout->set_width ($self->{w});
1674 $layout->set_text ($text); 1939 $layout->set_text ($text);
1675 1940
1676 ($layout->size)[1] 1941 ($layout->size)[1]
1677} 1942}
1681 1946
1682 $self->{need_reflow}++; 1947 $self->{need_reflow}++;
1683 $self->update; 1948 $self->update;
1684} 1949}
1685 1950
1686sub size_request {
1687 my ($self) = @_;
1688
1689 ($self->{req_w}, $self->{req_h})
1690}
1691
1692sub size_allocate { 1951sub size_allocate {
1693 my ($self, $x, $y, $w, $h) = @_; 1952 my ($self, $w, $h) = @_;
1694 1953
1695 $self->SUPER::size_allocate ($x, $y, $w, $h); 1954 $self->SUPER::size_allocate ($w, $h);
1696 1955
1697 $self->{layout}->set_height ($self->{fontsize}); 1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1698 $self->{layout}->set_width ($self->{w}); 1957 $self->{layout}->set_width ($self->{children}[0]{w});
1699 1958
1700 $self->reflow; 1959 $self->reflow;
1701} 1960}
1702 1961
1703sub add_paragraph { 1962sub add_paragraph {
1790 2049
1791} 2050}
1792 2051
1793############################################################################# 2052#############################################################################
1794 2053
1795package CFClient::UI::MapWidget;
1796
1797use strict;
1798
1799use List::Util qw(min max);
1800
1801use SDL;
1802use SDL::OpenGL;
1803
1804our @ISA = CFClient::UI::Base::;
1805
1806sub new {
1807 my $class = shift;
1808
1809 $class->SUPER::new (
1810 z => -1,
1811 can_focus => 1,
1812 list => (glGenLists 1),
1813 @_
1814 )
1815}
1816
1817sub key_down {
1818 print "MAPKEYDOWN\n";
1819}
1820
1821sub key_up {
1822}
1823
1824sub button_down {
1825 my ($self, $ev, $x, $y) = @_;
1826
1827 $self->focus_in;
1828
1829 if ($ev->button == 2) {
1830 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1831 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1832
1833 $self->{motion} = sub {
1834 my ($ev, $x, $y) = @_;
1835
1836 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1837
1838 $::CFG->{map_shift_x} = $bw + $x - $ox;
1839 $::CFG->{map_shift_y} = $bh + $y - $oy;
1840
1841 $self->update;
1842 };
1843 }
1844}
1845
1846sub button_up {
1847 my ($self, $ev, $x, $y) = @_;
1848
1849 delete $self->{motion};
1850}
1851
1852sub mouse_motion {
1853 my ($self, $ev, $x, $y) = @_;
1854
1855 $self->{motion}->($ev, $x, $y) if $self->{motion};
1856}
1857
1858sub size_request {
1859 (
1860 1 + 32 * int $::WIDTH / 32,
1861 1 + 32 * int $::HEIGHT / 32,
1862 )
1863}
1864
1865sub update {
1866 my ($self) = @_;
1867
1868 $self->{need_update} = 1;
1869 $self->SUPER::update;
1870}
1871
1872sub draw {
1873 my ($self) = @_;
1874
1875 if (delete $self->{need_update}) {
1876 glNewList $self->{list}, GL_COMPILE;
1877
1878 if ($::MAP) {
1879 my $sw = int $::WIDTH / 32;
1880 my $sh = int $::HEIGHT / 32;
1881
1882 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1883 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1884
1885 glTranslate $sx0 - 32, $sy0 - 32, 0;
1886
1887 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1888
1889 if ($::CFG->{fow_enable}) {
1890 if ($::CFG->{fow_smooth}) { # smooth fog of war
1891 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1892 glConvolutionFilter2D
1893 GL_CONVOLUTION_2D,
1894 GL_ALPHA,
1895 3, 3,
1896 GL_ALPHA, GL_FLOAT,
1897 pack "f*",
1898 0.1, 0.1, 0.1,
1899 0.1, 0.2, 0.1,
1900 0.1, 0.1, 0.1,
1901 ;
1902 glEnable GL_CONVOLUTION_2D;
1903 }
1904
1905 $self->{fow_texture} = new CFClient::Texture
1906 w => $w,
1907 h => $h,
1908 data => $data,
1909 internalformat => GL_ALPHA,
1910 format => GL_ALPHA;
1911
1912 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1913
1914 glEnable GL_BLEND;
1915 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1916 glEnable GL_TEXTURE_2D;
1917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1918
1919 glColor +($::CFG->{fow_intensity}) x 3, 1;
1920 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1921
1922 glDisable GL_TEXTURE_2D;
1923 glDisable GL_BLEND;
1924 }
1925
1926 # HACK BEGIN
1927 {
1928 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1929 my ($w, $h) = (250, 250);
1930
1931 glEnable GL_BLEND;
1932 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1933 glEnable GL_TEXTURE_2D;
1934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1935
1936 $self->{mapmap_texture} =
1937 new CFClient::Texture
1938 w => $w,
1939 h => $h,
1940 data => $::MAP->mapmap ($w, $h),
1941 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1942
1943 $self->{mapmap_texture}->draw_quad (100, 100);
1944
1945 glDisable GL_TEXTURE_2D;
1946 glDisable GL_BLEND;
1947 }
1948 # HACK END
1949 }
1950
1951 glEndList;
1952 }
1953
1954 glPushMatrix;
1955 glCallList $self->{list};
1956 glPopMatrix;
1957
1958 if ($FOCUS != $self) {
1959 glColor 64/255, 64/255, 64/255;
1960 glLogicOp GL_AND;
1961 glEnable GL_COLOR_LOGIC_OP;
1962 glBegin GL_QUADS;
1963 glVertex 0, 0;
1964 glVertex 0, $::HEIGHT;
1965 glVertex $::WIDTH, $::HEIGHT;
1966 glVertex $::WIDTH, 0;
1967 glEnd;
1968 glDisable GL_COLOR_LOGIC_OP;
1969 }
1970}
1971
1972my %DIR = (
1973 SDLK_KP8, [1, "north"],
1974 SDLK_KP9, [2, "northeast"],
1975 SDLK_KP6, [3, "east"],
1976 SDLK_KP3, [4, "southeast"],
1977 SDLK_KP2, [5, "south"],
1978 SDLK_KP1, [6, "southwest"],
1979 SDLK_KP4, [7, "west"],
1980 SDLK_KP7, [8, "northwest"],
1981
1982 SDLK_UP, [1, "north"],
1983 SDLK_RIGHT, [3, "east"],
1984 SDLK_DOWN, [5, "south"],
1985 SDLK_LEFT, [7, "west"],
1986);
1987
1988sub key_down {
1989 my ($self, $ev) = @_;
1990
1991 my $mod = $ev->key_mod;
1992 my $sym = $ev->key_sym;
1993
1994 if ($sym == SDLK_KP5) {
1995 $::CONN->user_send ("stay fire");
1996 } elsif ($sym == SDLK_a) {
1997 $::CONN->user_send ("apply");
1998 } elsif ($sym == SDLK_QUOTE) {
1999 $self->emit ('activate_console');
2000 } elsif ($sym == SDLK_SLASH) {
2001 $self->emit ('activate_console' => '/');
2002 } elsif (exists $DIR{$sym}) {
2003 if ($mod & KMOD_SHIFT) {
2004 $self->{shft}++;
2005 $::CONN->user_send ("fire $DIR{$sym}[0]");
2006 } elsif ($mod & KMOD_CTRL) {
2007 $self->{ctrl}++;
2008 $::CONN->user_send ("run $DIR{$sym}[0]");
2009 } else {
2010 $::CONN->user_send ("$DIR{$sym}[1]");
2011 }
2012 }
2013}
2014
2015sub key_up {
2016 my ($self, $ev) = @_;
2017
2018 my $mod = $ev->key_mod;
2019 my $sym = $ev->key_sym;
2020
2021 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2022 $::CONN->user_send ("fire_stop");
2023 }
2024 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2025 $::CONN->user_send ("run_stop");
2026 }
2027}
2028
2029#############################################################################
2030
2031package CFClient::UI::Animator; 2054package CFClient::UI::Animator;
2032 2055
2033use SDL::OpenGL; 2056use CFClient::OpenGL;
2034 2057
2035our @ISA = CFClient::UI::Bin::; 2058our @ISA = CFClient::UI::Bin::;
2036 2059
2037sub moveto { 2060sub moveto {
2038 my ($self, $x, $y) = @_; 2061 my ($self, $x, $y) = @_;
2078 my $class = shift; 2101 my $class = shift;
2079 2102
2080 my $self = $class->SUPER::new ( 2103 my $self = $class->SUPER::new (
2081 state => 0, 2104 state => 0,
2082 connect_activate => \&toggle_flopper, 2105 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2083 @_ 2107 @_
2084 ); 2108 );
2085 2109
2086 if ($self->{state}) { 2110 if ($self->{state}) {
2087 $self->{state} = 0; 2111 $self->{state} = 0;
2107 $self->emit (changed => $self->{state}); 2131 $self->emit (changed => $self->{state});
2108} 2132}
2109 2133
2110############################################################################# 2134#############################################################################
2111 2135
2136package CFClient::UI::Tooltip;
2137
2138our @ISA = CFClient::UI::Bin::;
2139
2140use CFClient::OpenGL;
2141
2142sub new {
2143 my $class = shift;
2144
2145 $class->SUPER::new (
2146 @_,
2147 can_events => 0,
2148 )
2149}
2150
2151sub set_text {
2152 my ($self, $text) = @_;
2153
2154 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8;
2155 $self->{label}->set_text ($text);
2156 $self->add ($self->{label});
2157}
2158
2159sub size_request {
2160 my ($self) = @_;
2161
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163
2164 $w = List::Util::min $::WIDTH * 0.2, $w;
2165
2166 ($w, $h)
2167}
2168
2169#############################################################################
2170
2112package CFClient::UI::Root; 2171package CFClient::UI::Root;
2113 2172
2114our @ISA = CFClient::UI::Container::; 2173our @ISA = CFClient::UI::Container::;
2115 2174
2116use SDL::OpenGL; 2175use CFClient::OpenGL;
2176
2177sub check_size {
2178 my ($self) = @_;
2179
2180 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2181}
2117 2182
2118sub size_request { 2183sub size_request {
2119 ($::WIDTH, $::HEIGHT) 2184 ($::WIDTH, $::HEIGHT)
2120} 2185}
2121 2186
2122sub size_allocate { 2187sub configure {
2123 my ($self, $x, $y, $w, $h) = @_; 2188 my ($self, $x, $y, $w, $h) = @_;
2124 2189
2125 $self->_size_allocate ($x, $y, $w, $h); 2190 $self->SUPER::configure ($x, $y, $w, $h);
2126 2191
2127 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
2128 for @{$self->{children}}; 2192 for my $child (@{$self->{children}}) {
2193 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2194
2195 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2196 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2197 $child->configure ($X, $Y, $W,$H);
2198 }
2129} 2199}
2130 2200
2131sub _topleft { 2201sub _topleft {
2132 my ($self, $x, $y) = @_; 2202 my ($self, $x, $y) = @_;
2133 2203
2135} 2205}
2136 2206
2137sub update { 2207sub update {
2138 my ($self) = @_; 2208 my ($self) = @_;
2139 2209
2140 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2210 $self->check_size;
2141 ::refresh (); 2211 ::refresh ();
2142} 2212}
2143 2213
2144sub add { 2214sub add {
2145 my ($self, $widget) = @_; 2215 my ($self, $child) = @_;
2146 2216
2217 # integerize window positions
2218 $child->{x} = int $child->{x};
2219 $child->{y} = int $child->{y};
2220
2147 $self->SUPER::add ($widget); 2221 $self->SUPER::add ($child);
2148
2149 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2150} 2222}
2151 2223
2152sub on_refresh { 2224sub on_refresh {
2153 my ($self, $id, $cb) = @_; 2225 my ($self, $id, $cb) = @_;
2154 2226
2178############################################################################# 2250#############################################################################
2179 2251
2180package CFClient::UI; 2252package CFClient::UI;
2181 2253
2182$ROOT = new CFClient::UI::Root; 2254$ROOT = new CFClient::UI::Root;
2255$TOOLTIP = new CFClient::UI::Tooltip;
2183 2256
21841 22571
2185 2258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines