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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.201 by root, Sat May 13 23:17:49 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
14our $BUTTON_STATE; 15our $BUTTON_STATE;
15 16
16sub check_tooltip { 17sub check_tooltip {
17 if (!$GRAB) { 18 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 20 if (length $widget->{tooltip}) {
20 21
21 if ($TOOLTIP->{owner} != $widget) { 22 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 23 $TOOLTIP->{owner} = $widget;
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_text ($widget->{tooltip}); 29 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
31 } 41 }
32 42
33 return; 43 return;
34 } 44 }
35 } 45 }
… …
39 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
40} 50}
41 51
42# class methods for events 52# class methods for events
43sub feed_sdl_key_down_event { 53sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
55 if $FOCUS;
45} 56}
46 57
47sub feed_sdl_key_up_event { 58sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
60 if $FOCUS;
49} 61}
50 62
51sub feed_sdl_button_down_event { 63sub feed_sdl_button_down_event {
52 my ($ev) = @_; 64 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 73 check_tooltip;
62 } 74 }
63 75
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 77
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 78 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y);
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
67} 82}
68 83
69sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
70 my ($ev) = @_; 85 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
72 87
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 89
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 91
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 92 if ($GRAB) {
93 ($x, $y) = $GRAB->coord2local ($x, $y);
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
78 96
79 if (!$BUTTON_STATE) { 97 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 98 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 99 $grab->update if $grab;
82 $GRAB->update if $GRAB; 100 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 116 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 117
100 check_tooltip; 118 check_tooltip;
101 } 119 }
102 120
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
104} 125}
105 126
106# convert position array to integers 127# convert position array to integers
107sub harmonize { 128sub harmonize {
108 my ($vals) = @_; 129 my ($vals) = @_;
… …
126 147
127sub new { 148sub new {
128 my $class = shift; 149 my $class = shift;
129 150
130 my $self = bless { 151 my $self = bless {
131 x => 0, 152 x => 0,
132 y => 0, 153 y => 0,
133 z => 0, 154 z => 0,
134 can_events => 1, 155 can_events => 1,
135 @_ 156 @_
136 }, $class; 157 }, $class;
137 158
138 for (keys %$self) { 159 for (keys %$self) {
… …
142 } 163 }
143 164
144 $self 165 $self
145} 166}
146 167
168sub destroy {
169 my ($self) = @_;
170
171 $self->hide;
172 %$self = ();
173}
174
147sub show { 175sub show {
148 my ($self) = @_; 176 my ($self) = @_;
149 177
150 return if $self->{parent}; 178 return if $self->{parent};
151 179
… …
153} 181}
154 182
155sub hide { 183sub hide {
156 my ($self) = @_; 184 my ($self) = @_;
157 185
158 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
159 188
160 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
161} 191}
162 192
163sub move { 193sub move {
164 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
165 195
… …
204 $self->{y} = $y; 234 $self->{y} = $y;
205 $self->update; 235 $self->update;
206 } 236 }
207 237
208 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
209 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
210 $self->{h} = $h;
211
212 $self->size_allocate ($w, $h);
213 $self->update;
214 } 240 }
215} 241}
216 242
217sub size_allocate { 243sub size_allocate {
218 # nothing to be done 244 # nothing to be done
219} 245}
220 246
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
221sub set_max_size { 261sub set_max_size {
222 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
223 263
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
226}
227
228# return top left coordinates
229sub _topleft {
230 my ($self, $x, $y) = @_;
231
232 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
233} 266}
234 267
235# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
236sub coord2local { 269sub coord2local {
237 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
238 271
239 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240 ($x - $X, $y - $Y)
241} 273}
242 274
243# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
244sub coord2global { 276sub coord2global {
245 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
246 278
247 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248 ($x + $X, $y + $Y)
249} 280}
250 281
251sub focus_in { 282sub focus_in {
252 my ($self) = @_; 283 my ($self) = @_;
253 284
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
315 glEnd; 346 glEnd;
316 glDisable GL_BLEND; 347 glDisable GL_BLEND;
317 } 348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
318} 363}
319 364
320sub _draw { 365sub _draw {
321 my ($self) = @_; 366 my ($self) = @_;
322 367
… …
337 382
338sub set_parent { 383sub set_parent {
339 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
340 385
341 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
342} 391}
343 392
344sub check_size { 393sub check_size {
345 my ($self) = @_; 394 my ($self, $forced) = @_;
346 395
347 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
348 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
349
350 my ($w, $h) = $self->{user_w} && $self->{user_h}
351 ? @$self{qw(user_w user_h)}
352 : $self->size_request;
353
354 if ($w != $self->{req_w} || $h != $self->{req_h}) {
355 $self->{req_w} = $w;
356 $self->{req_h} = $h;
357
358 $self->{parent}->check_size
359 or $self->size_allocate (
360 (List::Util::max $self->{w}, $w),
361 (List::Util::max $self->{h}, $h),
362 );
363
364 1
365 } else {
366 0
367 }
368} 398}
369 399
370sub update { 400sub update {
371 my ($self) = @_; 401 my ($self) = @_;
372 402
… …
381} 411}
382 412
383sub emit { 413sub emit {
384 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
385 415
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
387 $cb->($self, @args);
388 }
389} 417}
390 418
391sub DESTROY { 419sub DESTROY {
392 my ($self) = @_; 420 my ($self) = @_;
393 421
… …
460sub new { 488sub new {
461 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
462 490
463 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
464 492
465 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 493 my $self = $class->SUPER::new (
494 children => [],
495 can_events => 0,
496 %arg,
497 );
466 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
467 499
468 $self 500 $self
469} 501}
470 502
471sub add { 503sub add {
472 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
473 505
474 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
475 508
476 use sort 'stable'; 509 use sort 'stable';
477 510
478 $self->{children} = [ 511 $self->{children} = [
479 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
480 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
481 ]; 514 ];
482 515
483 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
484} 522}
485 523
486sub remove { 524sub remove {
487 my ($self, $child) = @_; 525 my ($self, $child) = @_;
488 526
489 delete $child->{parent}; 527 delete $child->{parent};
528 $child->hide;
490 529
491 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531
532 $self->check_size;
533 $self->update;
534}
535
536sub clear {
537 my ($self) = @_;
538
539 my $children = delete $self->{children};
540 $self->{children} = [];
541
542 for (@$children) {
543 delete $_->{parent};
544 $_->hide;
545 }
492 546
493 $self->check_size; 547 $self->check_size;
494 $self->update; 548 $self->update;
495} 549}
496 550
… …
574} 628}
575 629
576sub update { 630sub update {
577 my ($self) = @_; 631 my ($self) = @_;
578 632
579 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 634 $self->SUPER::update;
582}
583
584sub render_chld {
585 my ($self) = @_;
586
587 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588 glClearColor 0, 0, 0, 1;
589 glClear GL_COLOR_BUFFER_BIT;
590 $self->child->draw;
591 };
592} 635}
593 636
594sub size_allocate { 637sub size_allocate {
595 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
596 639
597 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
598 643
644sub _render {
645 $_[0]{children}[0]->draw;
646}
647
648sub render_child {
649 my ($self) = @_;
650
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT;
654
599 $self->render_chld; 655 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 };
600} 664}
601 665
602sub _draw { 666sub _draw {
603 my ($self) = @_; 667 my ($self) = @_;
604 668
605 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
606 670
607 my $tex = $self->{texture} 671 my $tex = $self->{texture}
608 or return; 672 or return;
609 673
610 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1;
614 677
615 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616 679
617 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
619} 681}
620 682
621############################################################################# 683#############################################################################
622 684
623package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
624 686
625our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
626 688
627sub new { die }
628
629sub size_request { 689sub size_request {
630 my ($self) = @_; 690 my ($self) = @_;
631 691
632 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
634 694
635 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
636} 696}
637 697
638sub _draw { 698sub size_allocate {
639 my ($self) = @_; 699 my ($self, $w, $h) = @_;
640 700
641 $self->{children}[1]->draw; 701 $self->update;
642} 702}
643 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
644 706
645############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
646 709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
647package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
648 752
649our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
650
651use CFClient::OpenGL;
652 754
653sub new { 755sub new {
654 my $class = shift; 756 my $class = shift;
655 757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
656 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
657 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
658 border_bg => [1, 1, 1, 1], 770 slider => $slider,
659 border => 0.8,
660 @_ 771 @_,
661 ); 772 );
662 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
663 $self 778 $self
664} 779}
665 780
781#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll
783
784#############################################################################
785
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use CFClient::OpenGL;
791
792sub new {
793 my $class = shift;
794
795 $class->SUPER::new (
796 bg => undef,
797 @_,
798 )
799}
800
666sub _draw { 801sub _draw {
667 my ($self) = @_; 802 my ($self) = @_;
668 803
669 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
670 806
671 glEnable GL_BLEND; 807 glEnable GL_BLEND;
672 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 810
676# glBegin GL_QUADS; 811 glBegin GL_QUADS;
677# glColor 0, 0, 0, 0;
678# glVertex 0 , 0; 812 glVertex 0 , 0;
679# glVertex 0 , $h; 813 glVertex 0 , $h;
680# glVertex $w, $h; 814 glVertex $w, $h;
681# glVertex $w, 0; 815 glVertex $w, 0;
682# glEnd; 816 glEnd;
683 817
684
685 $self->child->draw;
686 glDisable GL_BLEND; 818 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
688} 822}
689 823
690############################################################################# 824#############################################################################
691 825
692package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
703 my $class = shift; 837 my $class = shift;
704 838
705 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
706 840
707 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
710 border => 0.8, 844 border => 0.6,
711 can_events => 1, 845 can_events => 1,
712 @_ 846 @_
713 ); 847 );
714 848
715 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 850 align => 0,
717 valign => 1, 851 valign => 1,
718 text => $self->{title}, 852 text => $self->{title},
719 fontsize => 1; 853 fontsize => $self->{border};
720 854
721 $self 855 $self
722} 856}
723 857
724sub border { 858sub border {
… …
749} 883}
750 884
751sub button_down { 885sub button_down {
752 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
753 887
888 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 889 my $border = $self->border;
755 890
756 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
761 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
762 $self->{motion} = sub { 902 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
764 904
765 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
766 907
767 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
768 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
769 $self->check_size; 911 $self->check_size;
770 }; 912 };
771 913
772 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
777 917
778 $self->{motion} = sub { 918 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
802 my ($self) = @_; 942 my ($self) = @_;
803 943
804 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
805 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806 946
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811 949
812 my $border = $self->border; 950 my $border = $self->border;
813 951
814 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
815 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
819 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820 my $bg = $tex[0]; 959 my $bg = $tex[0];
821 960
822 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
824 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
825 964
826 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
827 966
828 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
832 972
833 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND;
835 974
836 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
837 $self->child->draw; 977 $self->child->draw;
838} 978}
839 979
840############################################################################# 980#############################################################################
841 981
… …
863 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
864 1004
865 $child->check_size; 1005 $child->check_size;
866} 1006}
867 1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
868# TODO: move to container class maybe? send childs a signal on removal? 1012# TODO: move to container class maybe? send childs a signal on removal?
869sub clear { 1013sub clear {
870 my ($self) = @_; 1014 my ($self) = @_;
871 1015
1016 my @children = $self->children;
872 delete $self->{children}; 1017 delete $self->{children};
1018
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023
873 $self->update; 1024 $self->update;
874} 1025}
875 1026
876sub get_wh { 1027sub get_wh {
877 my ($self) = @_; 1028 my ($self) = @_;
… …
1054} 1205}
1055 1206
1056sub size_allocate { 1207sub size_allocate {
1057 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1058 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1059 my $children = $self->{children}; 1212 my $children = $self->{children};
1060 1213
1061 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1062 1215
1063 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1100 1253
1101sub new { 1254sub new {
1102 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1103 1256
1104 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1106 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1107 fontsize => 1, 1263 fontsize => 1,
1108 text => "",
1109 align => -1, 1264 align => -1,
1110 valign => -1, 1265 valign => -1,
1111 padding => 2, 1266 padding => 2,
1112 layout => new CFClient::Layout,
1113 can_events => 0, 1267 can_events => 0,
1114 %arg 1268 %arg
1115 ); 1269 );
1116 1270
1117 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1118 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1119 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1120 $self->{template} = $layout; 1274 $self->{template} = $layout;
1121 } 1275 }
1122 1276
1123 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1124 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1278 $self->set_markup (delete $self->{markup});
1279 } else {
1280 $self->set_text (delete $self->{text});
1281 }
1125 1282
1126 $self 1283 $self
1127} 1284}
1128 1285
1129sub escape_text { 1286sub escape {
1130 local $_ = $_[1]; 1287 local $_ = $_[1];
1131 1288
1132 s/&/&amp;/g; 1289 s/&/&amp;/g;
1133 s/>/&gt;/g; 1290 s/>/&gt;/g;
1134 s/</&lt;/g; 1291 s/</&lt;/g;
1135 1292
1136 $_[1] 1293 $_[1]
1137} 1294}
1138 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1139sub set_text { 1303sub set_text {
1140 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1141 1305
1306 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text";
1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1143 1311
1144 delete $self->{texture}; 1312 $self->update;
1145 $self->check_size; 1313 $self->check_size;
1146 $self->update;
1147} 1314}
1148 1315
1149sub set_markup { 1316sub set_markup {
1150 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1151 1318
1319 return if $self->{text} eq "M$markup";
1320 $self->{text} = "M$markup";
1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1153 1326
1154 delete $self->{texture}; 1327 $self->update;
1155 $self->check_size; 1328 $self->check_size;
1156 $self->update;
1157} 1329}
1158 1330
1159sub size_request { 1331sub size_request {
1160 my ($self) = @_; 1332 my ($self) = @_;
1161 1333
… …
1190sub set_fontsize { 1362sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1192 1364
1193 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1195 $self->check_size; 1369 $self->check_size;
1196 $self->update;
1197} 1370}
1198 1371
1199sub _draw { 1372sub _draw {
1200 my ($self) = @_; 1373 my ($self) = @_;
1201 1374
1202 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1380
1206 new_from_layout CFClient::Texture $self->{layout} 1381 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1207 }; 1392 };
1208 1393
1209 glEnable GL_BLEND;
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1396
1397 if ($tex->{format} == GL_ALPHA) {
1214 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1215
1216 $self->{ox} = int (
1217 $self->{align} < 0 ? $self->{padding}
1218 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219 : ($self->{w} - $tex->{w}) * 0.5
1220 );
1221
1222 $self->{oy} = int (
1223 $self->{valign} < 0 ? $self->{padding}
1224 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225 : ($self->{h} - $tex->{h}) * 0.5
1226 );
1227
1228 $tex->draw_quad ($self->{ox}, $self->{oy}); 1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1229 1403
1230 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1405}
1233 1406
1234############################################################################# 1407#############################################################################
1235 1408
1236package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1241 1414
1242sub new { 1415sub new {
1243 my $class = shift; 1416 my $class = shift;
1244 1417
1245 $class->SUPER::new ( 1418 $class->SUPER::new (
1246 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1250 can_hover => 1, 1423 can_hover => 1,
1251 can_focus => 1, 1424 can_focus => 1,
1252 valign => 0, 1425 valign => 0,
1253 can_events => 1, 1426 can_events => 1,
1254 @_ 1427 @_
1255 ) 1428 )
1256} 1429}
1257 1430
… …
1271 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1272 1445
1273 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1274} 1447}
1275 1448
1449sub set_text {
1450 my ($self, $text) = @_;
1451
1452 $self->{cursor} = length $text;
1453 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456}
1457
1276sub get_text { 1458sub get_text {
1277 $_[0]{text} 1459 $_[0]{text}
1278} 1460}
1279 1461
1280sub size_request { 1462sub size_request {
… …
1287 1469
1288sub size_allocate { 1470sub size_allocate {
1289 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1290 1472
1291 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292}
1293
1294sub set_text {
1295 my ($self, $text) = @_;
1296
1297 $self->{cursor} = length $text;
1298 $self->_set_text ($text);
1299 $self->update;
1300} 1474}
1301 1475
1302sub key_down { 1476sub key_down {
1303 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1304 1478
… …
1306 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1308 1482
1309 my $text = $self->get_text; 1483 my $text = $self->get_text;
1310 1484
1311 if ($sym == 8) { 1485 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1498 $self->emit ('escape');
1325 } elsif ($uni) { 1499 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1327 } 1501 }
1328 1502
… …
1411 my ($self, $ev) = @_; 1585 my ($self, $ev) = @_;
1412 1586
1413 my $sym = $ev->{sym}; 1587 my $sym = $ev->{sym};
1414 1588
1415 if ($sym == 13) { 1589 if ($sym == 13) {
1590 unshift @{$self->{history}},
1591 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1594 $self->emit (activate => $txt);
1417 $self->update; 1595 $self->update;
1596
1597 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text;
1600 }
1601 if (@{$self->{history} || []} > 0) {
1602 $self->{history_pointer}++;
1603 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1604 $self->{history_pointer} = @{$self->{history} || []} - 1;
1605 }
1606 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1607 }
1608
1609 } elsif ($sym == CFClient::SDLK_DOWN) {
1610 $self->{history_pointer}--;
1611 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1612
1613 if ($self->{history_pointer} >= 0) {
1614 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1615 } else {
1616 $self->set_text ($self->{history_saveback});
1617 }
1418 1618
1419 } else { 1619 } else {
1420 $self->SUPER::key_down ($ev); 1620 $self->SUPER::key_down ($ev);
1421 } 1621 }
1422 1622
… …
1436 1636
1437sub new { 1637sub new {
1438 my $class = shift; 1638 my $class = shift;
1439 1639
1440 $class->SUPER::new ( 1640 $class->SUPER::new (
1441 padding => 4, 1641 padding => 4,
1442 fg => [1, 1, 1], 1642 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2], 1643 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1644 active_fg => [0, 0, 1],
1445 can_hover => 1, 1645 can_hover => 1,
1446 align => 0, 1646 align => 0,
1447 valign => 0, 1647 valign => 0,
1448 can_events => 1, 1648 can_events => 1,
1449 @_ 1649 @_
1450 ) 1650 )
1451} 1651}
1452 1652
… …
1466 1666
1467 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1468 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1469 } 1669 }
1470 1670
1471 glEnable GL_BLEND;
1472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1476 1674
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1676
1479 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1678
1482 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1483} 1680}
1484 1681
1485############################################################################# 1682#############################################################################
… …
1532 1729
1533 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1534 1731
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 1733
1537 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1538 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1539 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541 my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 1739}
1548 1740
1549############################################################################# 1741#############################################################################
1550 1742
1551package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1595 1787
1596 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1597 } 1789 }
1598 1790
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 1793
1604 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 1795
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1608} 1797}
1609 1798
1610############################################################################# 1799#############################################################################
1611 1800
… …
1659} 1848}
1660 1849
1661sub set_max { 1850sub set_max {
1662 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1663 1852
1853 return if $self->{max_val} == $max;
1854
1664 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1665} 1857}
1666 1858
1667sub set_value { 1859sub set_value {
1668 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1669 1861
1670 $self->set_max ($max) 1862 $self->set_max ($max)
1671 if defined $max; 1863 if defined $max;
1672 1864
1673 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1674 $self->{val} = $val; 1867 $self->{val} = $val;
1675
1676 $self->update; 1868 $self->update;
1677} 1869}
1678 1870
1679sub _draw { 1871sub _draw {
1680 my ($self) = @_; 1872 my ($self) = @_;
… …
1743 1935
1744sub new { 1936sub new {
1745 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1746 1938
1747 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 1940 tooltip => $arg{type},
1941 can_hover => 1,
1942 can_events => 1,
1749 %arg, 1943 %arg,
1750 ); 1944 );
1751 1945
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1946 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1947 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1948 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 1949
1756 $self 1950 $self
1757} 1951}
1758 1952
1759sub set_fontsize { 1953sub set_fontsize {
… …
1761 1955
1762 $self->{value}->set_fontsize ($fsize); 1956 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 1957 $self->{max} ->set_fontsize ($fsize);
1764} 1958}
1765 1959
1960sub set_max {
1961 my ($self, $max) = @_;
1962
1963 $self->{gauge}->set_max ($max);
1964 $self->{max}->set_text ($max);
1965}
1966
1766sub set_value { 1967sub set_value {
1767 my ($self, $val, $max) = @_; 1968 my ($self, $val, $max) = @_;
1768 1969
1769 $self->set_max ($max) 1970 $self->set_max ($max)
1770 if defined $max; 1971 if defined $max;
1771 1972
1772 $self->{gauge}->set_value ($val, $max); 1973 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 1974 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 1975}
1782 1976
1783############################################################################# 1977#############################################################################
1784 1978
1785package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
… …
1804 # TODO: calculations are off 1998 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1807 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1808 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1809 req_w => 20, 2003 req_w => $::WIDTH / 80,
1810 req_h => 20, 2004 req_h => $::WIDTH / 80,
1811 vertical => 0, 2005 vertical => 0,
1812 can_hover => 1, 2006 can_hover => 1,
1813 inner_pad => 5, 2007 inner_pad => 5,
1814 @_ 2008 @_
1815 ); 2009 );
… …
1898 $page ||= 2; 2092 $page ||= 2;
1899 2093
1900 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902 2096
1903 glEnable GL_BLEND;
1904 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2099
1908 # draw background 2100 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1910 2102
1911 # draw handle 2103 # draw handle
1912 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1913 2105
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
1916} 2107}
1917 2108
1918############################################################################# 2109#############################################################################
1919 2110
… …
1925 2116
1926sub new { 2117sub new {
1927 my $class = shift; 2118 my $class = shift;
1928 2119
1929 my $self = $class->SUPER::new ( 2120 my $self = $class->SUPER::new (
1930 fontsize => 1, 2121 fontsize => 1,
2122 can_events => 0,
1931 #font => default_font 2123 #font => default_font
1932 @_, 2124 @_,
1933 2125
1934 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
1935 par => [], 2127 par => [],
1936 height => 0, 2128 height => 0,
1937 children => [ 2129 children => [
1938 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
1940 ], 2132 ],
1941 ); 2133 );
1942 2134
1943 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2136
1947 $self 2137 $self
1948} 2138}
1949 2139
1950sub set_fontsize { 2140sub set_fontsize {
… …
1958 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1959 2149
1960 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
1961 2151
1962 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
1964 $layout->set_text ($text); 2154 $layout->set_markup ($text);
1965 2155
1966 ($layout->size)[1] 2156 ($layout->size)[1]
1967} 2157}
1968 2158
1969sub reflow { 2159sub reflow {
… …
2007 2197
2008 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2009 2199
2010 delete $self->{texture}; 2200 delete $self->{texture};
2011 2201
2012 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2013 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2204 my $height = 0;
2015 2205
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2017 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2022 2212
2023 delete $self->{texture}; 2213 delete $self->{texture};
2024 } 2214 }
2025 2215
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2027 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2029 2219
2030 glEnable GL_BLEND;
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034 2222
2035 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2036 2224
… …
2045 2233
2046 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2235 my $h = $par->[0];
2048 2236
2049 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2050 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2051 2240
2052 glColor @{ $par->[1] };
2053 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2054 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2055 } 2243 }
2056 2244
2057 $y += $h; 2245 $y += $h;
2058 } 2246 }
2059 2247
2060 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND;
2062 }; 2249 };
2063 }); 2250 });
2064} 2251}
2065 2252
2066sub _draw { 2253sub _draw {
2067 my ($self) = @_; 2254 my ($self) = @_;
2068 2255
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2258 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2074 }
2075 2261
2076 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2077 2263
2078} 2264}
2079 2265
… …
2127 2313
2128sub new { 2314sub new {
2129 my $class = shift; 2315 my $class = shift;
2130 2316
2131 my $self = $class->SUPER::new ( 2317 my $self = $class->SUPER::new (
2132 state => 0, 2318 state => 0,
2133 connect_activate => \&toggle_flopper, 2319 connect_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2320 @_
2136 ); 2321 );
2137 2322
2138 if ($self->{state}) { 2323 if ($self->{state}) {
2139 $self->{state} = 0; 2324 $self->{state} = 0;
… …
2174 @_, 2359 @_,
2175 can_events => 0, 2360 can_events => 0,
2176 ) 2361 )
2177} 2362}
2178 2363
2179sub set_text { 2364sub set_tooltip_from {
2180 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2181 2366
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2183 $self->{label}->set_text ($text); 2368 markup => $widget->{tooltip},
2184 $self->add ($self->{label}); 2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8,
2371 fg => [0, 0, 0, 1],
2372 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 );
2185} 2374}
2186 2375
2187sub size_request { 2376sub size_request {
2188 my ($self) = @_; 2377 my ($self) = @_;
2189 2378
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2380
2194 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2195} 2382}
2196 2383
2384sub size_allocate {
2385 my ($self, $w, $h) = @_;
2386
2387 $self->SUPER::size_allocate ($w - 4, $h - 4);
2388}
2389
2197sub _draw { 2390sub _draw {
2198 my ($self) = @_; 2391 my ($self) = @_;
2199 2392
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2202 2394
2203 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2204 2396
2205 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2408 glVertex 0 , $h;
2217 glVertex $w, $h; 2409 glVertex $w, $h;
2218 glVertex $w, 0; 2410 glVertex $w, 0;
2219 glEnd; 2411 glEnd;
2220 2412
2221 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2222
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2225} 2415}
2226 2416
2227############################################################################# 2417#############################################################################
2228 2418
2419package CFClient::UI::Face;
2420
2421our @ISA = CFClient::UI::Base::;
2422
2423use CFClient::OpenGL;
2424
2425sub new {
2426 my $class = shift;
2427
2428 $class->SUPER::new (
2429 aspect => 1,
2430 @_,
2431 )
2432}
2433
2434sub size_request {
2435 (32, 8)
2436}
2437
2438sub _draw {
2439 my ($self) = @_;
2440
2441 return unless $::CONN;#d# manage and cache textures differently
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2443
2444 # TODO animation
2445 if ($tex) {
2446 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D;
2451 }
2452}
2453
2454#############################################################################
2455
2456package CFClient::UI::InventoryItem;
2457
2458our @ISA = CFClient::UI::HBox::;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort {
2544 ($a->{type} <=> $b->{type})
2545 or ($a->{name} cmp $b->{name})
2546 } @$items;
2547
2548 $self->{real_items} = \@items;
2549
2550 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2556 }
2557
2558 $self->{scrolled}->add (@items);
2559
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566}
2567
2568#############################################################################
2569
2570package CFClient::UI::Menu;
2571
2572our @ISA = CFClient::UI::FancyFrame::;
2573
2574use CFClient::OpenGL;
2575
2576sub new {
2577 my $class = shift;
2578
2579 my $self = $class->SUPER::new (
2580 items => [],
2581 z => 100,
2582 @_,
2583 );
2584
2585 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2586
2587 for my $item (@{ $self->{items} }) {
2588 my ($widget, $cb) = @$item;
2589
2590 # handle various types of items, only text for now
2591 if (!ref $widget) {
2592 $widget = new CFClient::UI::Label
2593 can_hover => 1,
2594 can_events => 1,
2595 text => $widget;
2596 }
2597
2598 $self->{item}{$widget} = $item;
2599
2600 $self->{vbox}->add ($widget);
2601 }
2602
2603 $self
2604}
2605
2606# popup given the event (must be a mouse button down event currently)
2607sub popup {
2608 my ($self, $ev) = @_;
2609
2610 $self->emit ("popdown");
2611
2612 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self;
2614 $self->{button} = $ev->{button};
2615
2616 $self->show;
2617 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2618}
2619
2620sub mouse_motion {
2621 my ($self, $ev, $x, $y) = @_;
2622
2623 # TODO: should use vbox->find_widget or so
2624 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2625 $self->{hover} = $self->{item}{$HOVER};
2626}
2627
2628sub button_up {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB;
2633 $self->hide;
2634
2635 $self->emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover};
2637 }
2638}
2639
2640#############################################################################
2641
2642package CFClient::UI::Statusbox;
2643
2644our @ISA = CFClient::UI::VBox::;
2645
2646sub reorder {
2647 my ($self) = @_;
2648 my $NOW = time;
2649
2650 while (my ($k, $v) = each %{ $self->{item} }) {
2651 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2652 }
2653
2654 my @widgets;
2655
2656 my @items = sort {
2657 $a->{pri} <=> $b->{pri}
2658 or $b->{id} <=> $a->{id}
2659 } values %{ $self->{item} };
2660
2661 my $count = 10 + 1;
2662 for my $item (@items) {
2663 last unless --$count;
2664
2665 push @widgets, $item->{label} ||= do {
2666 # TODO: doesn't handle markup well (read as: at all)
2667 my $short = $item->{count} > 1
2668 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text};
2670
2671 for ($short) {
2672 s/^\s+//;
2673 s/\012.*/…/s;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 }
2677
2678 new CFClient::UI::Label
2679 markup => $short,
2680 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize},
2684 color => $item->{color},
2685 can_events => 1,
2686 can_hover => 1
2687 };
2688 }
2689
2690 $self->clear;
2691 $self->SUPER::add (reverse @widgets);
2692}
2693
2694sub add {
2695 my ($self, $text, %arg) = @_;
2696
2697 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//;
2699
2700 my $timeout = time + ((delete $arg{timeout}) || 60);
2701
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703
2704 if (my $item = $self->{item}{$group}) {
2705 if ($item->{text} eq $text) {
2706 $item->{count}++;
2707 } else {
2708 $item->{count} = 1;
2709 $item->{text} = $item->{tooltip} = $text;
2710 }
2711 $item->{id} = ++$self->{id};
2712 $item->{timeout} = $timeout;
2713 delete $item->{label};
2714 } else {
2715 $self->{item}{$group} = {
2716 id => ++$self->{id},
2717 text => $text,
2718 timeout => $timeout,
2719 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0,
2723 count => 1,
2724 %arg,
2725 };
2726 }
2727
2728 $self->reorder;
2729}
2730
2731#############################################################################
2732
2229package CFClient::UI::Root; 2733package CFClient::UI::Root;
2230 2734
2231our @ISA = CFClient::UI::Container::; 2735our @ISA = CFClient::UI::Container::;
2232 2736
2233use CFClient::OpenGL; 2737use CFClient::OpenGL;
2234 2738
2235sub check_size { 2739sub new {
2236 my ($self) = @_; 2740 my $class = shift;
2237 2741
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2742 $class->SUPER::new (
2239} 2743 @_,
2240 2744 )
2241sub size_request {
2242 ($::WIDTH, $::HEIGHT)
2243} 2745}
2244 2746
2245sub configure { 2747sub configure {
2246 my ($self, $x, $y, $w, $h) = @_; 2748 my ($self, $x, $y, $w, $h) = @_;
2247 2749
2248 $self->SUPER::configure ($x, $y, $w, $h); 2750 $self->{w} = $w;
2751 $self->{h} = $h;
2752}
2249 2753
2754sub check_size {
2755 my ($self) = @_;
2756
2757 $self->size_allocate ($self->{w}, $self->{h})
2758 if $self->{w};
2759}
2760
2761sub size_request {
2762 my ($self) = @_;
2763
2764 ($self->{w}, $self->{h})
2765}
2766
2767sub size_allocate {
2768 my ($self, $w, $h) = @_;
2769
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785
2250 for my $child (@{$self->{children}}) { 2786 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2787 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 2788
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2789 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2254 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2255 $child->configure ($X, $Y, $W,$H); 2791 $child->configure ($X, $Y, $W, $H);
2256 } 2792 }
2257}
2258 2793
2259sub _topleft { 2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796}
2797
2798sub coord2local {
2260 my ($self, $x, $y) = @_; 2799 my ($self, $x, $y) = @_;
2261 2800
2262 ($x, $y) 2801 ($x, $y)
2263} 2802}
2264 2803
2804sub coord2global {
2805 my ($self, $x, $y) = @_;
2806
2807 ($x, $y)
2808}
2809
2265sub update { 2810sub update {
2266 my ($self) = @_; 2811 my ($self) = @_;
2267 2812
2268 $self->check_size; 2813 $self->check_size;
2269 ::refresh (); 2814 $::WANT_REFRESH++;
2270} 2815}
2271 2816
2272sub add { 2817sub add {
2273 my ($self, $child) = @_; 2818 my ($self, $child) = @_;
2274 2819
2275 # integerize window positions 2820 # integerise window positions
2276 $child->{x} = int $child->{x}; 2821 $child->{x} = int $child->{x};
2277 $child->{y} = int $child->{y}; 2822 $child->{y} = int $child->{y};
2278 2823
2279 $self->SUPER::add ($child); 2824 $self->SUPER::add ($child);
2280} 2825}
… …
2283 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2284 2829
2285 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2286} 2831}
2287 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2288sub draw { 2839sub draw {
2289 my ($self) = @_; 2840 my ($self) = @_;
2290 2841
2291 while (my $rcb = delete $self->{refresh_hook}) { 2842 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 2843 $_->()
2844 for values %{delete $self->{refresh_hook}};
2845 }
2846
2847 if ($self->{check_size}) {
2848 my @queue = ([], []);
2849
2850 for (;;) {
2851 if ($self->{check_size}) {
2852 # heuristic: check containers last
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2854 for values %{delete $self->{check_size}}
2855 }
2856
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2858
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2860 ? @$widget{qw(user_w user_h)}
2861 : $widget->size_request;
2862
2863 if (delete $widget->{force_alloc}
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2866
2867 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h;
2869
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2871
2872 $widget->{parent}->check_size
2873 if $widget->{parent};
2874 }
2875 }
2876 }
2877
2878 while ($self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) {
2880 my ($widget, $w, $h) = @$_;
2881
2882 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0;
2884
2885 $widget->{w} = $w;
2886 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h);
2888 $widget->emit (size_allocate => $w, $h);
2889 }
2890 }
2891
2892 while ($self->{post_alloc_hook}) {
2893 $_->()
2894 for values %{delete $self->{post_alloc_hook}};
2293 } 2895 }
2294 2896
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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