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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 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_markup ($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;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260}
261
228sub set_max_size { 262sub set_max_size {
229 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
230 264
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 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} 267}
241 268
242# translate global coordinates to local coordinate system 269# translate global coordinates to local coordinate system
243sub coord2local { 270sub coord2local {
244 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
245 272
246 my ($X, $Y) = $self->_topleft; 273 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 274}
249 275
250# translate local coordinates to global coordinate system 276# translate local coordinates to global coordinate system
251sub coord2global { 277sub coord2global {
252 my ($self, $x, $y) = @_; 278 my ($self, $x, $y) = @_;
253 279
254 my ($X, $Y) = $self->_topleft; 280 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 281}
257 282
258sub focus_in { 283sub focus_in {
259 my ($self) = @_; 284 my ($self) = @_;
260 285
… …
358 383
359sub set_parent { 384sub set_parent {
360 my ($self, $parent) = @_; 385 my ($self, $parent) = @_;
361 386
362 Scalar::Util::weaken ($self->{parent} = $parent); 387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
363} 391}
364 392
365sub check_size { 393sub check_size {
366 my ($self) = @_; 394 my ($self, $forced) = @_;
367 395
368 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
369 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
370
371 my ($w, $h) = $self->{user_w} && $self->{user_h}
372 ? @$self{qw(user_w user_h)}
373 : $self->size_request;
374
375 if ($w != $self->{req_w} || $h != $self->{req_h}) {
376 $self->{req_w} = $w;
377 $self->{req_h} = $h;
378
379 $self->{parent}->check_size
380 or $self->size_allocate (
381 (List::Util::max $self->{w}, $w),
382 (List::Util::max $self->{h}, $h),
383 );
384
385 1
386 } else {
387 0
388 }
389} 398}
390 399
391sub update { 400sub update {
392 my ($self) = @_; 401 my ($self) = @_;
393 402
… …
402} 411}
403 412
404sub emit { 413sub emit {
405 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
406 415
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 417}
411 418
412sub DESTROY { 419sub DESTROY {
413 my ($self) = @_; 420 my ($self) = @_;
414 421
… …
481sub new { 488sub new {
482 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
483 490
484 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
485 492
486 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 );
487 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
488 499
489 $self 500 $self
490} 501}
491 502
492sub add { 503sub add {
493 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
494 505
495 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
496 508
497 use sort 'stable'; 509 use sort 'stable';
498 510
499 $self->{children} = [ 511 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
502 ]; 514 ];
503 515
504 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
505} 522}
506 523
507sub remove { 524sub remove {
508 my ($self, $child) = @_; 525 my ($self, $child) = @_;
509 526
510 delete $child->{parent}; 527 delete $child->{parent};
528 $child->hide;
511 529
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 531
514 $self->check_size; 532 $self->check_size;
515 $self->update; 533 $self->update;
516} 534}
517 535
518sub clear { 536sub clear {
519 my ($self) = @_; 537 my ($self) = @_;
520 538
521 delete $_->{parent} 539 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 540 $self->{children} = [];
541
542 for (@$children) {
543 delete $_->{parent};
544 $_->hide;
545 }
546
547 $self->check_size;
548 $self->update;
525} 549}
526 550
527sub find_widget { 551sub find_widget {
528 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
529 553
… …
604} 628}
605 629
606sub update { 630sub update {
607 my ($self) = @_; 631 my ($self) = @_;
608 632
609 # we want to do this delayed... 633 $ROOT->on_refresh ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 634 $self->SUPER::update;
612}
613
614sub render_chld {
615 my ($self) = @_;
616
617 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618 glClearColor 0, 0, 0, 1;
619 glClear GL_COLOR_BUFFER_BIT;
620 $self->child->draw;
621 };
622} 635}
623 636
624sub size_allocate { 637sub size_allocate {
625 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
626 639
627 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
628 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
629 $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 };
630} 664}
631 665
632sub _draw { 666sub _draw {
633 my ($self) = @_; 667 my ($self) = @_;
634 668
635 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
636 670
637 my $tex = $self->{texture} 671 my $tex = $self->{texture}
638 or return; 672 or return;
639 673
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
643 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;
644 677
645 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 679
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
649} 681}
650 682
651############################################################################# 683#############################################################################
652 684
653package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
654 686
655our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
656 688
657sub new { die }
658
659sub size_request { 689sub size_request {
660 my ($self) = @_; 690 my ($self) = @_;
661 691
662 @$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)};
663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
664 694
665 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
666} 696}
667 697
668sub _draw { 698sub size_allocate {
669 my ($self) = @_; 699 my ($self, $w, $h) = @_;
670 700
671 $self->{children}[1]->draw; 701 $self->update;
672} 702}
673 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
674 706
675############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
676 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
677package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
678 752
679our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
680
681use CFClient::OpenGL;
682 754
683sub new { 755sub new {
684 my $class = shift; 756 my $class = shift;
685 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
686 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
687 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
688 border_bg => [1, 1, 1, 1], 770 slider => $slider,
689 border => 0.8,
690 @_ 771 @_,
691 ); 772 );
692 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
693 $self 778 $self
694} 779}
695 780
696sub _draw { 781#TODO# update range on size_allocate depeneing on child
697 my ($self) = @_; 782# update viewport offset on scroll
698 783
699 my ($w, $h) = ($self->{w}, $self->{h}); 784#############################################################################
700 785
701 glEnable GL_BLEND; 786package CFClient::UI::Frame;
702 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
703 glEnable GL_TEXTURE_2D;
704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705 787
706# glBegin GL_QUADS; 788our @ISA = CFClient::UI::Bin::;
707# glColor 0, 0, 0, 0;
708# glVertex 0 , 0;
709# glVertex 0 , $h;
710# glVertex $w, $h;
711# glVertex $w, 0;
712# glEnd;
713 789
714 790use CFClient::OpenGL;
715 $self->child->draw;
716 glDisable GL_BLEND;
717 glDisable GL_TEXTURE_2D;
718}
719 791
720############################################################################# 792#############################################################################
721 793
722package CFClient::UI::FancyFrame; 794package CFClient::UI::FancyFrame;
723 795
… …
733 my $class = shift; 805 my $class = shift;
734 806
735 # TODO: user_x, user_y, overwrite moveto? 807 # TODO: user_x, user_y, overwrite moveto?
736 808
737 my $self = $class->SUPER::new ( 809 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 810 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 811 border_bg => [1, 1, 1, 1],
740 border => 0.8, 812 border => 0.6,
741 can_events => 1, 813 can_events => 1,
742 @_ 814 @_
743 ); 815 );
744 816
745 $self->{title} &&= new CFClient::UI::Label 817 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 818 align => 0,
747 valign => 1, 819 valign => 1,
748 text => $self->{title}, 820 text => $self->{title},
749 fontsize => 1; 821 fontsize => $self->{border};
750 822
751 $self 823 $self
752} 824}
753 825
754sub border { 826sub border {
… …
779} 851}
780 852
781sub button_down { 853sub button_down {
782 my ($self, $ev, $x, $y) = @_; 854 my ($self, $ev, $x, $y) = @_;
783 855
856 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 857 my $border = $self->border;
785 858
786 if ($x < $self->{w} && $x >= $self->{w} - $border 859 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 860 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 861
862 if ($lr & $td) {
863 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 865 my ($bw, $bh) = ($self->{w}, $self->{h});
791 866
867 my $mx = $x < $border;
868 my $my = $y < $border;
869
792 $self->{motion} = sub { 870 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 871 my ($ev, $x, $y) = @_;
794 872
795 ($x, $y) = ($ev->{x}, $ev->{y}); 873 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy;
796 875
797 $self->{user_w} = $bw + $x - $ox; 876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
799 $self->check_size; 879 $self->check_size;
800 }; 880 };
801 881
802 } elsif ($x >= 0 && $x < $self->{w} 882 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 883 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 884 my ($bx, $by) = ($self->{x}, $self->{y});
807 885
808 $self->{motion} = sub { 886 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 887 my ($ev, $x, $y) = @_;
… …
832 my ($self) = @_; 910 my ($self) = @_;
833 911
834 my ($w, $h ) = ($self->{w}, $self->{h}); 912 my ($w, $h ) = ($self->{w}, $self->{h});
835 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
836 914
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841 917
842 my $border = $self->border; 918 my $border = $self->border;
843 919
844 glColor @{ $self->{border_bg} }; 920 glColor @{ $self->{border_bg} };
845 $tex[1]->draw_quad (0, 0, $w, $border); 921 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
849 925
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850 my $bg = $tex[0]; 927 my $bg = $tex[0];
851 928
852 # TODO: repeat texture not scale 929 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 930 my $rep_x = $cw / $bg->{w};
854 my $rep_y = $ch / $bg->{h}; 931 my $rep_y = $ch / $bg->{h};
855 932
856 glColor @{ $self->{bg} }; 933 glColor @{ $self->{bg} };
857 934
858 $bg->{s} = $rep_x; 935 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y; 936 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1; 937 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 938 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 }
862 940
863 glDisable GL_TEXTURE_2D; 941 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND;
865 942
866 $self->{title}->draw if $self->{title}; 943 $self->{title}->draw if $self->{title};
944
867 $self->child->draw; 945 $self->child->draw;
868} 946}
869 947
870############################################################################# 948#############################################################################
871 949
… …
893 $self->{children}[$y][$x] = $child; 971 $self->{children}[$y][$x] = $child;
894 972
895 $child->check_size; 973 $child->check_size;
896} 974}
897 975
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
898# TODO: move to container class maybe? send childs a signal on removal? 980# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 981sub clear {
900 my ($self) = @_; 982 my ($self) = @_;
901 983
984 my @children = $self->children;
902 delete $self->{children}; 985 delete $self->{children};
986
987 for (@children) {
988 delete $_->{parent};
989 $_->hide;
990 }
991
903 $self->update; 992 $self->update;
904} 993}
905 994
906sub get_wh { 995sub get_wh {
907 my ($self) = @_; 996 my ($self) = @_;
… …
1084} 1173}
1085 1174
1086sub size_allocate { 1175sub size_allocate {
1087 my ($self, $w, $h) = @_; 1176 my ($self, $w, $h) = @_;
1088 1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1089 my $children = $self->{children}; 1180 my $children = $self->{children};
1090 1181
1091 my @h = map $_->{req_h}, @$children; 1182 my @h = map $_->{req_h}, @$children;
1092 1183
1093 my $req_h = List::Util::sum @h; 1184 my $req_h = List::Util::sum @h;
… …
1130 1221
1131sub new { 1222sub new {
1132 my ($class, %arg) = @_; 1223 my ($class, %arg) = @_;
1133 1224
1134 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1226 fg => [1, 1, 1],
1136 #font => default_font 1227 #font => default_font
1228 #text => initial text
1229 #markup => initial narkup
1230 layout => (new CFClient::Layout),
1137 fontsize => 1, 1231 fontsize => 1,
1138 text => "",
1139 align => -1, 1232 align => -1,
1140 valign => -1, 1233 valign => -1,
1141 padding => 2, 1234 padding => 2,
1142 layout => new CFClient::Layout,
1143 can_events => 0, 1235 can_events => 0,
1144 %arg 1236 %arg
1145 ); 1237 );
1146 1238
1147 if (exists $self->{template}) { 1239 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1240 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1241 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1242 $self->{template} = $layout;
1151 } 1243 }
1152 1244
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1245 if (exists $self->{markup}) {
1154 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1246 $self->set_markup (delete $self->{markup});
1247 } else {
1248 $self->set_text (delete $self->{text});
1249 }
1155 1250
1156 $self 1251 $self
1157} 1252}
1158 1253
1159sub escape { 1254sub escape {
… …
1164 s/</&lt;/g; 1259 s/</&lt;/g;
1165 1260
1166 $_[1] 1261 $_[1]
1167} 1262}
1168 1263
1264sub update {
1265 my ($self) = @_;
1266
1267 delete $self->{texture};
1268 $self->SUPER::update;
1269}
1270
1169sub set_text { 1271sub set_text {
1170 my ($self, $text) = @_; 1272 my ($self, $text) = @_;
1171 1273
1274 return if $self->{text} eq "T$text";
1275 $self->{text} = "T$text";
1276
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1172 $self->{layout}->set_text ($text); 1278 $self->{layout}->set_text ($text);
1173 1279
1174 delete $self->{texture}; 1280 $self->update;
1175 $self->check_size; 1281 $self->check_size;
1176 $self->update;
1177} 1282}
1178 1283
1179sub set_markup { 1284sub set_markup {
1180 my ($self, $markup) = @_; 1285 my ($self, $markup) = @_;
1181 1286
1287 return if $self->{text} eq "M$markup";
1288 $self->{text} = "M$markup";
1289
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1182 $self->{layout}->set_markup ($markup); 1293 $self->{layout}->set_markup ($markup);
1183 1294
1184 delete $self->{texture}; 1295 $self->update;
1185 $self->check_size; 1296 $self->check_size;
1186 $self->update;
1187} 1297}
1188 1298
1189sub size_request { 1299sub size_request {
1190 my ($self) = @_; 1300 my ($self) = @_;
1191 1301
… …
1220sub set_fontsize { 1330sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1331 my ($self, $fontsize) = @_;
1222 1332
1223 $self->{fontsize} = $fontsize; 1333 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1334 delete $self->{texture};
1335
1336 $self->update;
1225 $self->check_size; 1337 $self->check_size;
1226 $self->update;
1227} 1338}
1228 1339
1229sub _draw { 1340sub _draw {
1230 my ($self) = @_; 1341 my ($self) = @_;
1231 1342
1232 my $tex = $self->{texture} ||= do { 1343 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1345 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $self->{layout}->set_width ($self->{w}); 1346 $self->{layout}->set_width ($self->{w});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1348
1236 new_from_layout CFClient::Texture $self->{layout} 1349 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5;
1354
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5;
1358
1359 $tex
1237 }; 1360 };
1238 1361
1239 glEnable GL_BLEND;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 glEnable GL_TEXTURE_2D; 1362 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1364
1365 if ($tex->{format} == GL_ALPHA) {
1244 glColor @{$self->{fg}}; 1366 glColor @{$self->{fg}};
1245
1246 $self->{ox} = int (
1247 $self->{align} < 0 ? $self->{padding}
1248 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1249 : ($self->{w} - $tex->{w}) * 0.5
1250 );
1251
1252 $self->{oy} = int (
1253 $self->{valign} < 0 ? $self->{padding}
1254 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1255 : ($self->{h} - $tex->{h}) * 0.5
1256 );
1257
1258 $tex->draw_quad ($self->{ox}, $self->{oy}); 1367 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1368 } else {
1369 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1370 }
1259 1371
1260 glDisable GL_TEXTURE_2D; 1372 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1373}
1263 1374
1264############################################################################# 1375#############################################################################
1265 1376
1266package CFClient::UI::EntryBase; 1377package CFClient::UI::EntryBase;
… …
1271 1382
1272sub new { 1383sub new {
1273 my $class = shift; 1384 my $class = shift;
1274 1385
1275 $class->SUPER::new ( 1386 $class->SUPER::new (
1276 fg => [1, 1, 1], 1387 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1388 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1389 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1390 active_fg => [0, 0, 0],
1280 can_hover => 1, 1391 can_hover => 1,
1281 can_focus => 1, 1392 can_focus => 1,
1282 valign => 0, 1393 valign => 0,
1283 can_events => 1, 1394 can_events => 1,
1284 @_ 1395 @_
1285 ) 1396 )
1286} 1397}
1287 1398
… …
1301 $self->{layout}->set_text ("$text "); 1412 $self->{layout}->set_text ("$text ");
1302 1413
1303 $self->emit (changed => $self->{text}); 1414 $self->emit (changed => $self->{text});
1304} 1415}
1305 1416
1417sub set_text {
1418 my ($self, $text) = @_;
1419
1420 $self->{cursor} = length $text;
1421 $self->_set_text ($text);
1422 $self->check_size;
1423 $self->update;
1424}
1425
1306sub get_text { 1426sub get_text {
1307 $_[0]{text} 1427 $_[0]{text}
1308} 1428}
1309 1429
1310sub size_request { 1430sub size_request {
… …
1317 1437
1318sub size_allocate { 1438sub size_allocate {
1319 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1320 1440
1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1322}
1323
1324sub set_text {
1325 my ($self, $text) = @_;
1326
1327 $self->{cursor} = length $text;
1328 $self->_set_text ($text);
1329 $self->update;
1330} 1442}
1331 1443
1332sub key_down { 1444sub key_down {
1333 my ($self, $ev) = @_; 1445 my ($self, $ev) = @_;
1334 1446
… …
1441 my ($self, $ev) = @_; 1553 my ($self, $ev) = @_;
1442 1554
1443 my $sym = $ev->{sym}; 1555 my $sym = $ev->{sym};
1444 1556
1445 if ($sym == 13) { 1557 if ($sym == 13) {
1558 unshift @{$self->{history}},
1559 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1562 $self->emit (activate => $txt);
1447 $self->update; 1563 $self->update;
1564
1565 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text;
1568 }
1569 if (@{$self->{history} || []} > 0) {
1570 $self->{history_pointer}++;
1571 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1572 $self->{history_pointer} = @{$self->{history} || []} - 1;
1573 }
1574 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1575 }
1576
1577 } elsif ($sym == CFClient::SDLK_DOWN) {
1578 $self->{history_pointer}--;
1579 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1580
1581 if ($self->{history_pointer} >= 0) {
1582 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1583 } else {
1584 $self->set_text ($self->{history_saveback});
1585 }
1448 1586
1449 } else { 1587 } else {
1450 $self->SUPER::key_down ($ev); 1588 $self->SUPER::key_down ($ev);
1451 } 1589 }
1452 1590
… …
1466 1604
1467sub new { 1605sub new {
1468 my $class = shift; 1606 my $class = shift;
1469 1607
1470 $class->SUPER::new ( 1608 $class->SUPER::new (
1471 padding => 4, 1609 padding => 4,
1472 fg => [1, 1, 1], 1610 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1611 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1612 active_fg => [0, 0, 1],
1475 can_hover => 1, 1613 can_hover => 1,
1476 align => 0, 1614 align => 0,
1477 valign => 0, 1615 valign => 0,
1478 can_events => 1, 1616 can_events => 1,
1479 @_ 1617 @_
1480 ) 1618 )
1481} 1619}
1482 1620
… …
1496 1634
1497 if ($GRAB == $self) { 1635 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg}; 1636 $self->{fg} = $self->{active_fg};
1499 } 1637 }
1500 1638
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1641 glColor 0, 0, 0, 1;
1506 1642
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1643 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1644
1509 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1646
1512 $self->SUPER::_draw; 1647 $self->SUPER::_draw;
1513} 1648}
1514 1649
1515############################################################################# 1650#############################################################################
… …
1562 1697
1563 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1564 1699
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 1701
1567 glEnable GL_BLEND; 1702 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703
1568 glEnable GL_TEXTURE_2D; 1704 glEnable GL_TEXTURE_2D;
1569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570
1571 my $tex = $self->{state} ? $tex[1] : $tex[0];
1572
1573 $tex->draw_quad (0, 0, $s, $s); 1705 $tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575 glDisable GL_TEXTURE_2D; 1706 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 1707}
1578 1708
1579############################################################################# 1709#############################################################################
1580 1710
1581package CFClient::UI::Image; 1711package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 1754 glTranslate 0, -$self->{w}, 0;
1625 1755
1626 ($w, $h) = ($h, $w); 1756 ($w, $h) = ($h, $w);
1627 } 1757 }
1628 1758
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 1761
1634 $tex->draw_quad (0, 0, $w, $h); 1762 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 1763
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 1764 glDisable GL_TEXTURE_2D;
1638} 1765}
1639 1766
1640############################################################################# 1767#############################################################################
1641 1768
… …
1689} 1816}
1690 1817
1691sub set_max { 1818sub set_max {
1692 my ($self, $max) = @_; 1819 my ($self, $max) = @_;
1693 1820
1821 return if $self->{max_val} == $max;
1822
1694 $self->{max_val} = $max; 1823 $self->{max_val} = $max;
1824 $self->update;
1695} 1825}
1696 1826
1697sub set_value { 1827sub set_value {
1698 my ($self, $val, $max) = @_; 1828 my ($self, $val, $max) = @_;
1699 1829
1700 $self->set_max ($max) 1830 $self->set_max ($max)
1701 if defined $max; 1831 if defined $max;
1702 1832
1703 $max = $self->{max_val}; 1833 return if $self->{val} == $val;
1834
1704 $self->{val} = $val; 1835 $self->{val} = $val;
1705
1706 $self->update; 1836 $self->update;
1707} 1837}
1708 1838
1709sub _draw { 1839sub _draw {
1710 my ($self) = @_; 1840 my ($self) = @_;
… …
1773 1903
1774sub new { 1904sub new {
1775 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1776 1906
1777 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 1908 tooltip => $arg{type},
1909 can_hover => 1,
1779 can_events => 1, 1910 can_events => 1,
1780 can_hover => 1,
1781 %arg, 1911 %arg,
1782 ); 1912 );
1783 1913
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1914 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1915 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 1923
1794 $self->{value}->set_fontsize ($fsize); 1924 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 1925 $self->{max} ->set_fontsize ($fsize);
1796} 1926}
1797 1927
1928sub set_max {
1929 my ($self, $max) = @_;
1930
1931 $self->{gauge}->set_max ($max);
1932 $self->{max}->set_text ($max);
1933}
1934
1798sub set_value { 1935sub set_value {
1799 my ($self, $val, $max) = @_; 1936 my ($self, $val, $max) = @_;
1800 1937
1801 $self->set_max ($max) 1938 $self->set_max ($max)
1802 if defined $max; 1939 if defined $max;
1803 1940
1804 $self->{gauge}->set_value ($val, $max); 1941 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 1942 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813} 1943}
1814 1944
1815############################################################################# 1945#############################################################################
1816 1946
1817package CFClient::UI::Slider; 1947package CFClient::UI::Slider;
… …
1836 # TODO: calculations are off 1966 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 1967 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 1969 active_fg => [0, 0, 0],
1840 range => [0, 0, 100, 10], 1970 range => [0, 0, 100, 10],
1841 req_w => 20, 1971 req_w => $::WIDTH / 80,
1842 req_h => 20, 1972 req_h => $::WIDTH / 80,
1843 vertical => 0, 1973 vertical => 0,
1844 can_hover => 1, 1974 can_hover => 1,
1845 inner_pad => 5, 1975 inner_pad => 5,
1846 @_ 1976 @_
1847 ); 1977 );
… …
1930 $page ||= 2; 2060 $page ||= 2;
1931 2061
1932 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934 2064
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2065 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2067
1940 # draw background 2068 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1942 2070
1943 # draw handle 2071 # draw handle
1944 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1945 2073
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2074 glDisable GL_TEXTURE_2D;
1948} 2075}
1949 2076
1950############################################################################# 2077#############################################################################
1951 2078
… …
1957 2084
1958sub new { 2085sub new {
1959 my $class = shift; 2086 my $class = shift;
1960 2087
1961 my $self = $class->SUPER::new ( 2088 my $self = $class->SUPER::new (
1962 fontsize => 1, 2089 fontsize => 1,
2090 can_events => 0,
1963 #font => default_font 2091 #font => default_font
1964 @_, 2092 @_,
1965 2093
1966 layout => (new CFClient::Layout), 2094 layout => (new CFClient::Layout 1),
1967 par => [], 2095 par => [],
1968 height => 0, 2096 height => 0,
1969 children => [ 2097 children => [
1970 (new CFClient::UI::Empty expand => 1), 2098 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2099 (new CFClient::UI::Slider vertical => 1),
1972 ], 2100 ],
1973 ); 2101 );
1974 2102
1975 $self->{children}[1]->connect (changed => sub { 2103 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2104
1979 $self 2105 $self
1980} 2106}
1981 2107
1982sub set_fontsize { 2108sub set_fontsize {
… …
1990 my ($self, $text) = @_; 2116 my ($self, $text) = @_;
1991 2117
1992 my $layout = $self->{layout}; 2118 my $layout = $self->{layout};
1993 2119
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w}); 2121 $layout->set_width ($self->{children}[0]{w});
1996 $layout->set_text ($text); 2122 $layout->set_markup ($text);
1997 2123
1998 ($layout->size)[1] 2124 ($layout->size)[1]
1999} 2125}
2000 2126
2001sub reflow { 2127sub reflow {
… …
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054 2180
2055 delete $self->{texture}; 2181 delete $self->{texture};
2056 } 2182 }
2057 2183
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059 glClearColor 0, 0, 0, 1; 2185 glClearColor 0, 0, 0, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2186 glClear GL_COLOR_BUFFER_BIT;
2061 2187
2062 glEnable GL_BLEND;
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D; 2188 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066 2190
2067 my $top = int $self->{children}[1]{range}[0]; 2191 my $top = int $self->{children}[1]{range}[0];
2068 2192
… …
2077 2201
2078 for my $par (@{$self->{par}}) { 2202 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2203 my $h = $par->[0];
2080 2204
2081 if ($y0 < $y + $h && $y < $y1) { 2205 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] });
2082 $layout->set_text ($par->[2]); 2207 $layout->set_markup ($par->[2]);
2083 2208
2084 glColor @{ $par->[1] };
2085 my ($W, $H) = $layout->size; 2209 my ($W, $H) = $layout->size;
2086 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2087 } 2211 }
2088 2212
2089 $y += $h; 2213 $y += $h;
2090 } 2214 }
2091 2215
2092 glDisable GL_TEXTURE_2D; 2216 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND;
2094 }; 2217 };
2095 }); 2218 });
2096} 2219}
2097 2220
2098sub _draw { 2221sub _draw {
2099 my ($self) = @_; 2222 my ($self) = @_;
2100 2223
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2224 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2226 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2228 glDisable GL_TEXTURE_2D;
2106 }
2107 2229
2108 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2109 2231
2110} 2232}
2111 2233
… …
2159 2281
2160sub new { 2282sub new {
2161 my $class = shift; 2283 my $class = shift;
2162 2284
2163 my $self = $class->SUPER::new ( 2285 my $self = $class->SUPER::new (
2164 state => 0, 2286 state => 0,
2165 connect_activate => \&toggle_flopper, 2287 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2288 @_
2168 ); 2289 );
2169 2290
2170 if ($self->{state}) { 2291 if ($self->{state}) {
2171 $self->{state} = 0; 2292 $self->{state} = 0;
… …
2206 @_, 2327 @_,
2207 can_events => 0, 2328 can_events => 0,
2208 ) 2329 )
2209} 2330}
2210 2331
2211sub set_markup { 2332sub set_tooltip_from {
2212 my ($self, $text) = @_; 2333 my ($self, $widget) = @_;
2213 2334
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2335 $self->add (new CFClient::UI::Label
2215 $self->{label}->set_markup ($text); 2336 markup => $widget->{tooltip},
2216 $self->add ($self->{label}); 2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8,
2339 fg => [0, 0, 0, 1],
2340 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 );
2217} 2342}
2218 2343
2219sub size_request { 2344sub size_request {
2220 my ($self) = @_; 2345 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2346
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2348
2226 ($w + 4, $h + 4) 2349 ($w + 4, $h + 4)
2227} 2350}
… …
2233} 2356}
2234 2357
2235sub _draw { 2358sub _draw {
2236 my ($self) = @_; 2359 my ($self) = @_;
2237 2360
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375; 2361 glTranslate 0.375, 0.375;
2240 2362
2241 my ($w, $h) = @$self{qw(w h)}; 2363 my ($w, $h) = @$self{qw(w h)};
2242 2364
2243 glColor 1, 0.8, 0.4; 2365 glColor 1, 0.8, 0.4;
… …
2254 glVertex 0 , $h; 2376 glVertex 0 , $h;
2255 glVertex $w, $h; 2377 glVertex $w, $h;
2256 glVertex $w, 0; 2378 glVertex $w, 0;
2257 glEnd; 2379 glEnd;
2258 2380
2259 glPopMatrix; 2381 glTranslate 2 - 0.375, 2 - 0.375;
2260
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw; 2382 $self->SUPER::_draw;
2263} 2383}
2264 2384
2265############################################################################# 2385#############################################################################
2266 2386
… …
2281 2401
2282sub size_request { 2402sub size_request {
2283 (32, 8) 2403 (32, 8)
2284} 2404}
2285 2405
2286sub draw { 2406sub _draw {
2287 my ($self) = @_; 2407 my ($self) = @_;
2288 2408
2409 return unless $::CONN;#d# manage and cache textures differently
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290 2411
2412 # TODO animation
2291 if ($tex) { 2413 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2414 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2416 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D; 2418 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 } 2419 }
2420}
2421
2422#############################################################################
2423
2424package CFClient::UI::InventoryItem;
2425
2426our @ISA = CFClient::UI::HBox::;
2427
2428sub new {
2429 my $class = shift;
2430
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new (
2441 can_hover => 1,
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487
2488#############################################################################
2489
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_,
2500 );
2501
2502 $self
2503}
2504
2505sub set_items {
2506 my ($self, $items) = @_;
2507
2508 $self->{scrolled}->clear;
2509 return unless $items;
2510
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2512
2513 $self->{real_items} = \@items;
2514
2515 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2521 }
2522
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524}
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Menu;
2534
2535our @ISA = CFClient::UI::FancyFrame::;
2536
2537use CFClient::OpenGL;
2538
2539sub new {
2540 my $class = shift;
2541
2542 my $self = $class->SUPER::new (
2543 items => [],
2544 z => 100,
2545 @_,
2546 );
2547
2548 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2549
2550 for my $item (@{ $self->{items} }) {
2551 my ($widget, $cb) = @$item;
2552
2553 # handle various types of items, only text for now
2554 if (!ref $widget) {
2555 $widget = new CFClient::UI::Label
2556 can_hover => 1,
2557 can_events => 1,
2558 text => $widget;
2559 }
2560
2561 $self->{item}{$widget} = $item;
2562
2563 $self->{vbox}->add ($widget);
2564 }
2565
2566 $self
2567}
2568
2569# popup given the event (must be a mouse button down event currently)
2570sub popup {
2571 my ($self, $ev) = @_;
2572
2573 $self->emit ("popdown");
2574
2575 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self;
2577 $self->{button} = $ev->{button};
2578
2579 $self->show;
2580 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2581}
2582
2583sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_;
2585
2586 # TODO: should use vbox->find_widget or so
2587 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2588 $self->{hover} = $self->{item}{$HOVER};
2589}
2590
2591sub button_up {
2592 my ($self, $ev, $x, $y) = @_;
2593
2594 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB;
2596 $self->hide;
2597
2598 $self->emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover};
2600 }
2601}
2602
2603#############################################################################
2604
2605package CFClient::UI::Statusbox;
2606
2607our @ISA = CFClient::UI::VBox::;
2608
2609sub reorder {
2610 my ($self) = @_;
2611 my $NOW = time;
2612
2613 while (my ($k, $v) = each %{ $self->{item} }) {
2614 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2615 }
2616
2617 my @widgets;
2618
2619 my @items = sort {
2620 $a->{pri} <=> $b->{pri}
2621 or $b->{id} <=> $a->{id}
2622 } values %{ $self->{item} };
2623
2624 my $count = 10 + 1;
2625 for my $item (@items) {
2626 last unless --$count;
2627
2628 push @widgets, $item->{label} ||= do {
2629 # TODO: doesn't handle markup well (read as: at all)
2630 my $short = $item->{count} > 1
2631 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text};
2633
2634 for ($short) {
2635 s/^\s+//;
2636 s/\012.*/…/s;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 }
2640
2641 new CFClient::UI::Label
2642 markup => $short,
2643 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize},
2647 color => $item->{color},
2648 can_events => 1,
2649 can_hover => 1
2650 };
2651 }
2652
2653 $self->clear;
2654 $self->SUPER::add (reverse @widgets);
2655}
2656
2657sub add {
2658 my ($self, $text, %arg) = @_;
2659
2660 my $timeout = time + ((delete $arg{timeout}) || 60);
2661
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663
2664 if (my $item = $self->{item}{$group}) {
2665 if ($item->{text} eq $text) {
2666 $item->{count}++;
2667 } else {
2668 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text;
2670 }
2671 $item->{timeout} = $timeout;
2672 delete $item->{label};
2673 } else {
2674 $self->{item}{$group} = {
2675 id => ++$self->{id},
2676 text => $text,
2677 timeout => $timeout,
2678 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0,
2682 count => 1,
2683 %arg,
2684 };
2685 }
2686
2687 $self->reorder;
2301} 2688}
2302 2689
2303############################################################################# 2690#############################################################################
2304 2691
2305package CFClient::UI::Root; 2692package CFClient::UI::Root;
2306 2693
2307our @ISA = CFClient::UI::Container::; 2694our @ISA = CFClient::UI::Container::;
2308 2695
2309use CFClient::OpenGL; 2696use CFClient::OpenGL;
2310 2697
2311sub check_size { 2698sub new {
2312 my ($self) = @_; 2699 my $class = shift;
2313 2700
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2701 $class->SUPER::new (
2315} 2702 @_,
2316 2703 )
2317sub size_request {
2318 ($::WIDTH, $::HEIGHT)
2319} 2704}
2320 2705
2321sub configure { 2706sub configure {
2322 my ($self, $x, $y, $w, $h) = @_; 2707 my ($self, $x, $y, $w, $h) = @_;
2323 2708
2324 $self->SUPER::configure ($x, $y, $w, $h); 2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2325 2712
2713sub check_size {
2714 my ($self) = @_;
2715
2716 $self->size_allocate ($self->{w}, $self->{h})
2717 if $self->{w};
2718}
2719
2720sub size_request {
2721 my ($self) = @_;
2722
2723 ($self->{w}, $self->{h})
2724}
2725
2726sub size_allocate {
2727 my ($self, $w, $h) = @_;
2728
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744
2326 for my $child (@{$self->{children}}) { 2745 for my $child ($self->children) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328 2747
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2748 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2331 $child->configure ($X, $Y, $W,$H); 2750 $child->configure ($X, $Y, $W, $H);
2332 } 2751 }
2333}
2334 2752
2335sub _topleft { 2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755}
2756
2757sub coord2local {
2336 my ($self, $x, $y) = @_; 2758 my ($self, $x, $y) = @_;
2337 2759
2338 ($x, $y) 2760 ($x, $y)
2339} 2761}
2340 2762
2763sub coord2global {
2764 my ($self, $x, $y) = @_;
2765
2766 ($x, $y)
2767}
2768
2341sub update { 2769sub update {
2342 my ($self) = @_; 2770 my ($self) = @_;
2343 2771
2344 $self->check_size; 2772 $self->check_size;
2345 ::refresh (); 2773 $::WANT_REFRESH++;
2346} 2774}
2347 2775
2348sub add { 2776sub add {
2349 my ($self, $child) = @_; 2777 my ($self, $child) = @_;
2350 2778
2351 # integerize window positions 2779 # integerise window positions
2352 $child->{x} = int $child->{x}; 2780 $child->{x} = int $child->{x};
2353 $child->{y} = int $child->{y}; 2781 $child->{y} = int $child->{y};
2354 2782
2355 $self->SUPER::add ($child); 2783 $self->SUPER::add ($child);
2356} 2784}
… …
2359 my ($self, $id, $cb) = @_; 2787 my ($self, $id, $cb) = @_;
2360 2788
2361 $self->{refresh_hook}{$id} = $cb; 2789 $self->{refresh_hook}{$id} = $cb;
2362} 2790}
2363 2791
2364sub draw { 2792sub draw {
2365 my ($self) = @_; 2793 my ($self) = @_;
2366 2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839
2367 while (my $rcb = delete $self->{refresh_hook}) { 2840 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 2841 $_->()
2842 for values %{delete $self->{refresh_hook}};
2369 } 2843 }
2370 2844
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2845 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 2847 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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