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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.200 by root, Sat May 13 00:27:09 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
… …
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) {
… …
160} 181}
161 182
162sub hide { 183sub hide {
163 my ($self) = @_; 184 my ($self) = @_;
164 185
165 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
166 188
167 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
168} 191}
169 192
170sub move { 193sub move {
171 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
172 195
… …
211 $self->{y} = $y; 234 $self->{y} = $y;
212 $self->update; 235 $self->update;
213 } 236 }
214 237
215 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 240 }
222} 241}
223 242
224sub size_allocate { 243sub size_allocate {
225 # nothing to be done 244 # nothing to be done
226} 245}
227 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
228sub set_max_size { 261sub set_max_size {
229 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
230 263
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
233}
234
235# return top left coordinates
236sub _topleft {
237 my ($self, $x, $y) = @_;
238
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 266}
241 267
242# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
243sub coord2local { 269sub coord2local {
244 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
245 271
246 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 273}
249 274
250# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
251sub coord2global { 276sub coord2global {
252 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
253 278
254 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 280}
257 281
258sub focus_in { 282sub focus_in {
259 my ($self) = @_; 283 my ($self) = @_;
260 284
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
322 glEnd; 346 glEnd;
323 glDisable GL_BLEND; 347 glDisable GL_BLEND;
324 } 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 }
325} 363}
326 364
327sub _draw { 365sub _draw {
328 my ($self) = @_; 366 my ($self) = @_;
329 367
… …
344 382
345sub set_parent { 383sub set_parent {
346 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
347 385
348 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};
349} 391}
350 392
351sub check_size { 393sub check_size {
352 my ($self) = @_; 394 my ($self, $forced) = @_;
353 395
354 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
355 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
356
357 my ($w, $h) = $self->{user_w} && $self->{user_h}
358 ? @$self{qw(user_w user_h)}
359 : $self->size_request;
360
361 if ($w != $self->{req_w} || $h != $self->{req_h}) {
362 $self->{req_w} = $w;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else {
373 0
374 }
375} 398}
376 399
377sub update { 400sub update {
378 my ($self) = @_; 401 my ($self) = @_;
379 402
… …
388} 411}
389 412
390sub emit { 413sub emit {
391 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
392 415
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 417}
397 418
398sub DESTROY { 419sub DESTROY {
399 my ($self) = @_; 420 my ($self) = @_;
400 421
… …
467sub new { 488sub new {
468 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
469 490
470 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
471 492
472 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 );
473 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
474 499
475 $self 500 $self
476} 501}
477 502
478sub add { 503sub add {
479 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
480 505
481 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
482 508
483 use sort 'stable'; 509 use sort 'stable';
484 510
485 $self->{children} = [ 511 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
488 ]; 514 ];
489 515
490 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
491} 522}
492 523
493sub remove { 524sub remove {
494 my ($self, $child) = @_; 525 my ($self, $child) = @_;
495 526
496 delete $child->{parent}; 527 delete $child->{parent};
528 $child->hide;
497 529
498 $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 }
499 546
500 $self->check_size; 547 $self->check_size;
501 $self->update; 548 $self->update;
502} 549}
503 550
… …
581} 628}
582 629
583sub update { 630sub update {
584 my ($self) = @_; 631 my ($self) = @_;
585 632
586 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 634 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 635}
600 636
601sub size_allocate { 637sub size_allocate {
602 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
603 639
604 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
605 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
606 $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 };
607} 664}
608 665
609sub _draw { 666sub _draw {
610 my ($self) = @_; 667 my ($self) = @_;
611 668
612 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
613 670
614 my $tex = $self->{texture} 671 my $tex = $self->{texture}
615 or return; 672 or return;
616 673
617 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
620 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;
621 677
622 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623 679
624 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
626} 681}
627 682
628############################################################################# 683#############################################################################
629 684
630package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
631 686
632our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
633 688
634sub new { die }
635
636sub size_request { 689sub size_request {
637 my ($self) = @_; 690 my ($self) = @_;
638 691
639 @$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)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
641 694
642 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
643} 696}
644 697
645sub _draw { 698sub size_allocate {
646 my ($self) = @_; 699 my ($self, $w, $h) = @_;
647 700
648 $self->{children}[1]->draw; 701 $self->update;
649} 702}
650 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
651 706
652############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
653 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
654package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
655 752
656our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
657
658use CFClient::OpenGL;
659 754
660sub new { 755sub new {
661 my $class = shift; 756 my $class = shift;
662 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
663 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
664 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
665 border_bg => [1, 1, 1, 1], 770 slider => $slider,
666 border => 0.8,
667 @_ 771 @_,
668 ); 772 );
669 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
670 $self 778 $self
671} 779}
672 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
673sub _draw { 801sub _draw {
674 my ($self) = @_; 802 my ($self) = @_;
675 803
676 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
677 806
678 glEnable GL_BLEND; 807 glEnable GL_BLEND;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682 810
683# glBegin GL_QUADS; 811 glBegin GL_QUADS;
684# glColor 0, 0, 0, 0;
685# glVertex 0 , 0; 812 glVertex 0 , 0;
686# glVertex 0 , $h; 813 glVertex 0 , $h;
687# glVertex $w, $h; 814 glVertex $w, $h;
688# glVertex $w, 0; 815 glVertex $w, 0;
689# glEnd; 816 glEnd;
690 817
691
692 $self->child->draw;
693 glDisable GL_BLEND; 818 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
695} 822}
696 823
697############################################################################# 824#############################################################################
698 825
699package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
710 my $class = shift; 837 my $class = shift;
711 838
712 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
713 840
714 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
717 border => 0.8, 844 border => 0.6,
718 can_events => 1, 845 can_events => 1,
719 @_ 846 @_
720 ); 847 );
721 848
722 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 850 align => 0,
724 valign => 1, 851 valign => 1,
725 text => $self->{title}, 852 text => $self->{title},
726 fontsize => 1; 853 fontsize => $self->{border};
727 854
728 $self 855 $self
729} 856}
730 857
731sub border { 858sub border {
… …
756} 883}
757 884
758sub button_down { 885sub button_down {
759 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
760 887
888 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 889 my $border = $self->border;
762 890
763 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
768 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
769 $self->{motion} = sub { 902 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
771 904
772 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
773 907
774 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 911 $self->check_size;
777 }; 912 };
778 913
779 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
784 917
785 $self->{motion} = sub { 918 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
809 my ($self) = @_; 942 my ($self) = @_;
810 943
811 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
812 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813 946
814 glEnable GL_BLEND;
815 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818 949
819 my $border = $self->border; 950 my $border = $self->border;
820 951
821 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
822 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
826 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 959 my $bg = $tex[0];
828 960
829 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
832 964
833 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
834 966
835 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
839 972
840 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND;
842 974
843 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
844 $self->child->draw; 977 $self->child->draw;
845} 978}
846 979
847############################################################################# 980#############################################################################
848 981
… …
870 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
871 1004
872 $child->check_size; 1005 $child->check_size;
873} 1006}
874 1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
875# 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?
876sub clear { 1013sub clear {
877 my ($self) = @_; 1014 my ($self) = @_;
878 1015
1016 my @children = $self->children;
879 delete $self->{children}; 1017 delete $self->{children};
1018
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023
880 $self->update; 1024 $self->update;
881} 1025}
882 1026
883sub get_wh { 1027sub get_wh {
884 my ($self) = @_; 1028 my ($self) = @_;
… …
1061} 1205}
1062 1206
1063sub size_allocate { 1207sub size_allocate {
1064 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1065 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1066 my $children = $self->{children}; 1212 my $children = $self->{children};
1067 1213
1068 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1069 1215
1070 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1107 1253
1108sub new { 1254sub new {
1109 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1110 1256
1111 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1113 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1114 fontsize => 1, 1263 fontsize => 1,
1115 text => "",
1116 align => -1, 1264 align => -1,
1117 valign => -1, 1265 valign => -1,
1118 padding => 2, 1266 padding => 2,
1119 layout => new CFClient::Layout,
1120 can_events => 0, 1267 can_events => 0,
1121 %arg 1268 %arg
1122 ); 1269 );
1123 1270
1124 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1274 $self->{template} = $layout;
1128 } 1275 }
1129 1276
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1131 $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 }
1132 1282
1133 $self 1283 $self
1134} 1284}
1135 1285
1136sub escape_text { 1286sub escape {
1137 local $_ = $_[1]; 1287 local $_ = $_[1];
1138 1288
1139 s/&/&amp;/g; 1289 s/&/&amp;/g;
1140 s/>/&gt;/g; 1290 s/>/&gt;/g;
1141 s/</&lt;/g; 1291 s/</&lt;/g;
1142 1292
1143 $_[1] 1293 $_[1]
1144} 1294}
1145 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1146sub set_text { 1303sub set_text {
1147 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1148 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;
1149 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1150 1311
1151 delete $self->{texture}; 1312 $self->update;
1152 $self->check_size; 1313 $self->check_size;
1153 $self->update;
1154} 1314}
1155 1315
1156sub set_markup { 1316sub set_markup {
1157 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1158 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;
1159 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1160 1326
1161 delete $self->{texture}; 1327 $self->update;
1162 $self->check_size; 1328 $self->check_size;
1163 $self->update;
1164} 1329}
1165 1330
1166sub size_request { 1331sub size_request {
1167 my ($self) = @_; 1332 my ($self) = @_;
1168 1333
… …
1197sub set_fontsize { 1362sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1199 1364
1200 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1202 $self->check_size; 1369 $self->check_size;
1203 $self->update;
1204} 1370}
1205 1371
1206sub _draw { 1372sub _draw {
1207 my ($self) = @_; 1373 my ($self) = @_;
1208 1374
1209 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1212 $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
1213 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
1214 }; 1392 };
1215 1393
1216 glEnable GL_BLEND;
1217 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220 1396
1397 if ($tex->{format} == GL_ALPHA) {
1221 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1222
1223 $self->{ox} = int (
1224 $self->{align} < 0 ? $self->{padding}
1225 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226 : ($self->{w} - $tex->{w}) * 0.5
1227 );
1228
1229 $self->{oy} = int (
1230 $self->{valign} < 0 ? $self->{padding}
1231 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232 : ($self->{h} - $tex->{h}) * 0.5
1233 );
1234
1235 $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 }
1236 1403
1237 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1405}
1240 1406
1241############################################################################# 1407#############################################################################
1242 1408
1243package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1248 1414
1249sub new { 1415sub new {
1250 my $class = shift; 1416 my $class = shift;
1251 1417
1252 $class->SUPER::new ( 1418 $class->SUPER::new (
1253 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1257 can_hover => 1, 1423 can_hover => 1,
1258 can_focus => 1, 1424 can_focus => 1,
1259 valign => 0, 1425 valign => 0,
1260 can_events => 1, 1426 can_events => 1,
1261 @_ 1427 @_
1262 ) 1428 )
1263} 1429}
1264 1430
… …
1278 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1279 1445
1280 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1281} 1447}
1282 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
1283sub get_text { 1458sub get_text {
1284 $_[0]{text} 1459 $_[0]{text}
1285} 1460}
1286 1461
1287sub size_request { 1462sub size_request {
… …
1294 1469
1295sub size_allocate { 1470sub size_allocate {
1296 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1297 1472
1298 $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
1299}
1300
1301sub set_text {
1302 my ($self, $text) = @_;
1303
1304 $self->{cursor} = length $text;
1305 $self->_set_text ($text);
1306 $self->update;
1307} 1474}
1308 1475
1309sub key_down { 1476sub key_down {
1310 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1311 1478
… …
1313 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1314 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1315 1482
1316 my $text = $self->get_text; 1483 my $text = $self->get_text;
1317 1484
1318 if ($sym == 8) { 1485 if ($uni == 8) {
1319 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1321 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1322 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1323 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1324 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1325 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1326 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1327 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1328 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1329 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1330 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1331 $self->emit ('escape'); 1498 $self->emit ('escape');
1332 } elsif ($uni) { 1499 } elsif ($uni) {
1333 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1334 } 1501 }
1335 1502
… …
1418 my ($self, $ev) = @_; 1585 my ($self, $ev) = @_;
1419 1586
1420 my $sym = $ev->{sym}; 1587 my $sym = $ev->{sym};
1421 1588
1422 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} = '';
1423 $self->emit (activate => $self->get_text); 1594 $self->emit (activate => $txt);
1424 $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 }
1425 1618
1426 } else { 1619 } else {
1427 $self->SUPER::key_down ($ev); 1620 $self->SUPER::key_down ($ev);
1428 } 1621 }
1429 1622
… …
1443 1636
1444sub new { 1637sub new {
1445 my $class = shift; 1638 my $class = shift;
1446 1639
1447 $class->SUPER::new ( 1640 $class->SUPER::new (
1448 padding => 4, 1641 padding => 4,
1449 fg => [1, 1, 1], 1642 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1643 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1644 active_fg => [0, 0, 1],
1452 can_hover => 1, 1645 can_hover => 1,
1453 align => 0, 1646 align => 0,
1454 valign => 0, 1647 valign => 0,
1455 can_events => 1, 1648 can_events => 1,
1456 @_ 1649 @_
1457 ) 1650 )
1458} 1651}
1459 1652
… …
1473 1666
1474 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1476 } 1669 }
1477 1670
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1483 1674
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1676
1486 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1678
1489 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1490} 1680}
1491 1681
1492############################################################################# 1682#############################################################################
… …
1539 1729
1540 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;
1541 1731
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 1733
1544 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1545 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548 my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 1739}
1555 1740
1556############################################################################# 1741#############################################################################
1557 1742
1558package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1601 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1602 1787
1603 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1604 } 1789 }
1605 1790
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 1793
1611 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 1795
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1615} 1797}
1616 1798
1617############################################################################# 1799#############################################################################
1618 1800
… …
1666} 1848}
1667 1849
1668sub set_max { 1850sub set_max {
1669 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1670 1852
1853 return if $self->{max_val} == $max;
1854
1671 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1672} 1857}
1673 1858
1674sub set_value { 1859sub set_value {
1675 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1676 1861
1677 $self->set_max ($max) 1862 $self->set_max ($max)
1678 if defined $max; 1863 if defined $max;
1679 1864
1680 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1681 $self->{val} = $val; 1867 $self->{val} = $val;
1682
1683 $self->update; 1868 $self->update;
1684} 1869}
1685 1870
1686sub _draw { 1871sub _draw {
1687 my ($self) = @_; 1872 my ($self) = @_;
… …
1750 1935
1751sub new { 1936sub new {
1752 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1753 1938
1754 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1940 tooltip => $arg{type},
1941 can_hover => 1,
1756 can_events => 1, 1942 can_events => 1,
1757 can_hover => 1,
1758 %arg, 1943 %arg,
1759 ); 1944 );
1760 1945
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1946 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1762 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1947 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1770 1955
1771 $self->{value}->set_fontsize ($fsize); 1956 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 1957 $self->{max} ->set_fontsize ($fsize);
1773} 1958}
1774 1959
1960sub set_max {
1961 my ($self, $max) = @_;
1962
1963 $self->{gauge}->set_max ($max);
1964 $self->{max}->set_text ($max);
1965}
1966
1775sub set_value { 1967sub set_value {
1776 my ($self, $val, $max) = @_; 1968 my ($self, $val, $max) = @_;
1777 1969
1778 $self->set_max ($max) 1970 $self->set_max ($max)
1779 if defined $max; 1971 if defined $max;
1780 1972
1781 $self->{gauge}->set_value ($val, $max); 1973 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 1974 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 1975}
1791 1976
1792############################################################################# 1977#############################################################################
1793 1978
1794package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
… …
1813 # TODO: calculations are off 1998 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1817 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1818 req_w => 20, 2003 req_w => $::WIDTH / 80,
1819 req_h => 20, 2004 req_h => $::WIDTH / 80,
1820 vertical => 0, 2005 vertical => 0,
1821 can_hover => 1, 2006 can_hover => 1,
1822 inner_pad => 5, 2007 inner_pad => 5,
1823 @_ 2008 @_
1824 ); 2009 );
… …
1907 $page ||= 2; 2092 $page ||= 2;
1908 2093
1909 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1910 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1911 2096
1912 glEnable GL_BLEND;
1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1914 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916 2099
1917 # draw background 2100 # draw background
1918 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1919 2102
1920 # draw handle 2103 # draw handle
1921 $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);
1922 2105
1923 glDisable GL_BLEND;
1924 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
1925} 2107}
1926 2108
1927############################################################################# 2109#############################################################################
1928 2110
… …
1934 2116
1935sub new { 2117sub new {
1936 my $class = shift; 2118 my $class = shift;
1937 2119
1938 my $self = $class->SUPER::new ( 2120 my $self = $class->SUPER::new (
1939 fontsize => 1, 2121 fontsize => 1,
2122 can_events => 0,
1940 #font => default_font 2123 #font => default_font
1941 @_, 2124 @_,
1942 2125
1943 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
1944 par => [], 2127 par => [],
1945 height => 0, 2128 height => 0,
1946 children => [ 2129 children => [
1947 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
1949 ], 2132 ],
1950 ); 2133 );
1951 2134
1952 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2136
1956 $self 2137 $self
1957} 2138}
1958 2139
1959sub set_fontsize { 2140sub set_fontsize {
… …
1967 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1968 2149
1969 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
1970 2151
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
1973 $layout->set_text ($text); 2154 $layout->set_markup ($text);
1974 2155
1975 ($layout->size)[1] 2156 ($layout->size)[1]
1976} 2157}
1977 2158
1978sub reflow { 2159sub reflow {
… …
2016 2197
2017 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2018 2199
2019 delete $self->{texture}; 2200 delete $self->{texture};
2020 2201
2021 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2022 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2023 my $height = 0; 2204 my $height = 0;
2024 2205
2025 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2026 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2031 2212
2032 delete $self->{texture}; 2213 delete $self->{texture};
2033 } 2214 }
2034 2215
2035 $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 {
2036 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2038 2219
2039 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2222
2044 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2045 2224
… …
2054 2233
2055 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2056 my $h = $par->[0]; 2235 my $h = $par->[0];
2057 2236
2058 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2059 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2060 2240
2061 glColor @{ $par->[1] };
2062 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2063 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);
2064 } 2243 }
2065 2244
2066 $y += $h; 2245 $y += $h;
2067 } 2246 }
2068 2247
2069 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2070 glDisable GL_BLEND;
2071 }; 2249 };
2072 }); 2250 });
2073} 2251}
2074 2252
2075sub _draw { 2253sub _draw {
2076 my ($self) = @_; 2254 my ($self) = @_;
2077 2255
2078 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2081 $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});
2082 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2083 }
2084 2261
2085 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2086 2263
2087} 2264}
2088 2265
… …
2136 2313
2137sub new { 2314sub new {
2138 my $class = shift; 2315 my $class = shift;
2139 2316
2140 my $self = $class->SUPER::new ( 2317 my $self = $class->SUPER::new (
2141 state => 0, 2318 state => 0,
2142 connect_activate => \&toggle_flopper, 2319 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2320 @_
2145 ); 2321 );
2146 2322
2147 if ($self->{state}) { 2323 if ($self->{state}) {
2148 $self->{state} = 0; 2324 $self->{state} = 0;
… …
2183 @_, 2359 @_,
2184 can_events => 0, 2360 can_events => 0,
2185 ) 2361 )
2186} 2362}
2187 2363
2188sub set_text { 2364sub set_tooltip_from {
2189 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2190 2366
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2192 $self->{label}->set_text ($text); 2368 markup => $widget->{tooltip},
2193 $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 );
2194} 2374}
2195 2375
2196sub size_request { 2376sub size_request {
2197 my ($self) = @_; 2377 my ($self) = @_;
2198 2378
2199 $self->child->set_max_size ($::WIDTH * 0.3);
2200
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2380
2203 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2204} 2382}
2205 2383
2384sub size_allocate {
2385 my ($self, $w, $h) = @_;
2386
2387 $self->SUPER::size_allocate ($w - 4, $h - 4);
2388}
2389
2206sub _draw { 2390sub _draw {
2207 my ($self) = @_; 2391 my ($self) = @_;
2208 2392
2209 glPushMatrix;
2210 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2211 2394
2212 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2213 2396
2214 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2225 glVertex 0 , $h; 2408 glVertex 0 , $h;
2226 glVertex $w, $h; 2409 glVertex $w, $h;
2227 glVertex $w, 0; 2410 glVertex $w, 0;
2228 glEnd; 2411 glEnd;
2229 2412
2230 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2231
2232 glTranslate 2, 2;
2233 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2234} 2415}
2235 2416
2236############################################################################# 2417#############################################################################
2237 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 { $a->{type} <=> $b->{type} } @$items;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Menu;
2566
2567our @ISA = CFClient::UI::FancyFrame::;
2568
2569use CFClient::OpenGL;
2570
2571sub new {
2572 my $class = shift;
2573
2574 my $self = $class->SUPER::new (
2575 items => [],
2576 z => 100,
2577 @_,
2578 );
2579
2580 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2581
2582 for my $item (@{ $self->{items} }) {
2583 my ($widget, $cb) = @$item;
2584
2585 # handle various types of items, only text for now
2586 if (!ref $widget) {
2587 $widget = new CFClient::UI::Label
2588 can_hover => 1,
2589 can_events => 1,
2590 text => $widget;
2591 }
2592
2593 $self->{item}{$widget} = $item;
2594
2595 $self->{vbox}->add ($widget);
2596 }
2597
2598 $self
2599}
2600
2601# popup given the event (must be a mouse button down event currently)
2602sub popup {
2603 my ($self, $ev) = @_;
2604
2605 $self->emit ("popdown");
2606
2607 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self;
2609 $self->{button} = $ev->{button};
2610
2611 $self->show;
2612 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2613}
2614
2615sub mouse_motion {
2616 my ($self, $ev, $x, $y) = @_;
2617
2618 # TODO: should use vbox->find_widget or so
2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2620 $self->{hover} = $self->{item}{$HOVER};
2621}
2622
2623sub button_up {
2624 my ($self, $ev, $x, $y) = @_;
2625
2626 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB;
2628 $self->hide;
2629
2630 $self->emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover};
2632 }
2633}
2634
2635#############################################################################
2636
2637package CFClient::UI::Statusbox;
2638
2639our @ISA = CFClient::UI::VBox::;
2640
2641sub reorder {
2642 my ($self) = @_;
2643 my $NOW = time;
2644
2645 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 }
2648
2649 my @widgets;
2650
2651 my @items = sort {
2652 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} };
2655
2656 my $count = 10 + 1;
2657 for my $item (@items) {
2658 last unless --$count;
2659
2660 push @widgets, $item->{label} ||= do {
2661 # TODO: doesn't handle markup well (read as: at all)
2662 my $short = $item->{count} > 1
2663 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text};
2665
2666 for ($short) {
2667 s/^\s+//;
2668 s/\012.*/…/s;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 }
2672
2673 new CFClient::UI::Label
2674 markup => $short,
2675 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize},
2679 color => $item->{color},
2680 can_events => 1,
2681 can_hover => 1
2682 };
2683 }
2684
2685 $self->clear;
2686 $self->SUPER::add (reverse @widgets);
2687}
2688
2689sub add {
2690 my ($self, $text, %arg) = @_;
2691
2692 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//;
2694
2695 my $timeout = time + ((delete $arg{timeout}) || 60);
2696
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698
2699 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) {
2701 $item->{count}++;
2702 } else {
2703 $item->{count} = 1;
2704 $item->{text} = $item->{tooltip} = $text;
2705 }
2706 $item->{id} = ++$self->{id};
2707 $item->{timeout} = $timeout;
2708 delete $item->{label};
2709 } else {
2710 $self->{item}{$group} = {
2711 id => ++$self->{id},
2712 text => $text,
2713 timeout => $timeout,
2714 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0,
2718 count => 1,
2719 %arg,
2720 };
2721 }
2722
2723 $self->reorder;
2724}
2725
2726#############################################################################
2727
2238package CFClient::UI::Root; 2728package CFClient::UI::Root;
2239 2729
2240our @ISA = CFClient::UI::Container::; 2730our @ISA = CFClient::UI::Container::;
2241 2731
2242use CFClient::OpenGL; 2732use CFClient::OpenGL;
2243 2733
2244sub check_size { 2734sub new {
2245 my ($self) = @_; 2735 my $class = shift;
2246 2736
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2737 $class->SUPER::new (
2248} 2738 @_,
2249 2739 )
2250sub size_request {
2251 ($::WIDTH, $::HEIGHT)
2252} 2740}
2253 2741
2254sub configure { 2742sub configure {
2255 my ($self, $x, $y, $w, $h) = @_; 2743 my ($self, $x, $y, $w, $h) = @_;
2256 2744
2257 $self->SUPER::configure ($x, $y, $w, $h); 2745 $self->{w} = $w;
2746 $self->{h} = $h;
2747}
2258 2748
2749sub check_size {
2750 my ($self) = @_;
2751
2752 $self->size_allocate ($self->{w}, $self->{h})
2753 if $self->{w};
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758
2759 ($self->{w}, $self->{h})
2760}
2761
2762sub size_allocate {
2763 my ($self, $w, $h) = @_;
2764
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780
2259 for my $child (@{$self->{children}}) { 2781 for my $child ($self->children) {
2260 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2261 2783
2262 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2784 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2263 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2264 $child->configure ($X, $Y, $W,$H); 2786 $child->configure ($X, $Y, $W, $H);
2265 } 2787 }
2266}
2267 2788
2268sub _topleft { 2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791}
2792
2793sub coord2local {
2269 my ($self, $x, $y) = @_; 2794 my ($self, $x, $y) = @_;
2270 2795
2271 ($x, $y) 2796 ($x, $y)
2272} 2797}
2273 2798
2799sub coord2global {
2800 my ($self, $x, $y) = @_;
2801
2802 ($x, $y)
2803}
2804
2274sub update { 2805sub update {
2275 my ($self) = @_; 2806 my ($self) = @_;
2276 2807
2277 $self->check_size; 2808 $self->check_size;
2278 ::refresh (); 2809 $::WANT_REFRESH++;
2279} 2810}
2280 2811
2281sub add { 2812sub add {
2282 my ($self, $child) = @_; 2813 my ($self, $child) = @_;
2283 2814
2284 # integerize window positions 2815 # integerise window positions
2285 $child->{x} = int $child->{x}; 2816 $child->{x} = int $child->{x};
2286 $child->{y} = int $child->{y}; 2817 $child->{y} = int $child->{y};
2287 2818
2288 $self->SUPER::add ($child); 2819 $self->SUPER::add ($child);
2289} 2820}
… …
2292 my ($self, $id, $cb) = @_; 2823 my ($self, $id, $cb) = @_;
2293 2824
2294 $self->{refresh_hook}{$id} = $cb; 2825 $self->{refresh_hook}{$id} = $cb;
2295} 2826}
2296 2827
2828sub on_post_alloc {
2829 my ($self, $id, $cb) = @_;
2830
2831 $self->{post_alloc_hook}{$id} = $cb;
2832}
2833
2297sub draw { 2834sub draw {
2298 my ($self) = @_; 2835 my ($self) = @_;
2299 2836
2300 while (my $rcb = delete $self->{refresh_hook}) { 2837 while ($self->{refresh_hook}) {
2301 $_->() for values %$rcb; 2838 $_->()
2839 for values %{delete $self->{refresh_hook}};
2840 }
2841
2842 if ($self->{check_size}) {
2843 my @queue = ([], []);
2844
2845 for (;;) {
2846 if ($self->{check_size}) {
2847 # heuristic: check containers last
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2849 for values %{delete $self->{check_size}}
2850 }
2851
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2853
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2855 ? @$widget{qw(user_w user_h)}
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861
2862 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h;
2864
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2866
2867 $widget->{parent}->check_size
2868 if $widget->{parent};
2869 }
2870 }
2871 }
2872
2873 while ($self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) {
2875 my ($widget, $w, $h) = @$_;
2876
2877 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0;
2879
2880 $widget->{w} = $w;
2881 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h);
2883 $widget->emit (size_allocate => $w, $h);
2884 }
2885 }
2886
2887 while ($self->{post_alloc_hook}) {
2888 $_->()
2889 for values %{delete $self->{post_alloc_hook}};
2302 } 2890 }
2303 2891
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2892 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 2894 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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