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.75 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC

… …
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47 47
48 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
79use SDL::OpenGL; 79use SDL::OpenGL;
80 80
81sub new { 81sub new {
82 my $class = shift; 82 my $class = shift;
83 83
84 bless { 84 my $self = bless {
85 x => 0, 85 x => 0,
86 y => 0, 86 y => 0,
87 z => 0, 87 z => 0,
88 w => -1, 88 w => -1,
89 h => -1, 89 h => -1,
90 @_ 90 @_
91 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
92} 100}
93 101
94sub move { 102sub move {
95 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 104 $self->{x} = $x;
… …
125 my ($self, $x, $y, $w, $h) = @_; 133 my ($self, $x, $y, $w, $h) = @_;
126 134
127 $self->_size_allocate ($x, $y, $w, $h); 135 $self->_size_allocate ($x, $y, $w, $h);
128} 136}
129 137
130# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
131sub translate { 139sub translate {
132 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
133 141
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
135} 143}
136 144
137sub focus_in { 145sub focus_in {
138 my ($self) = @_; 146 my ($self) = @_;
139 147
140 return if $FOCUS == $self; 148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
141 150
142 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
143 $focus->update if $focus; 152 $focus->update if $focus;
144 $FOCUS->update; 153 $FOCUS->update;
145} 154}
… …
178 glPushMatrix; 187 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 189 $self->_draw;
181 glPopMatrix; 190 glPopMatrix;
182 191
183 if ($self == $HOVER) { 192 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 193 my ($x, $y) = @$self{qw(x y)};
185 194
186 glColor 1, 1, 1, 0.1; 195 glColor 0, 0, 1, 0.2;
187 glEnable GL_BLEND; 196 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 198 glBegin GL_QUADS;
190 glVertex $x , $y; 199 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y; 200 glVertex $x + $self->{w}, $y;
… …
200 my ($self) = @_; 209 my ($self) = @_;
201 210
202 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
203} 212}
204 213
205sub bbox {
206 my ($self) = @_;
207 my ($w, $h) = $self->size_request;
208 (
209 $self->{x},
210 $self->{y},
211 $self->{x} = $w,
212 $self->{y} = $h
213 )
214}
215
216sub find_widget { 214sub find_widget {
217 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
218 216
219 return $self 217 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 218 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 220
223 () 221 ()
224} 222}
225 223
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 224sub set_parent {
229 my ($self, $par) = @_; 225 my ($self, $par) = @_;
230 226
231 $self->{parent} = $par; 227 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
275 my $class = shift; 271 my $class = shift;
276 272
277 # range [value, low, high, page] 273 # range [value, low, high, page]
278 274
279 $class->SUPER::new ( 275 $class->SUPER::new (
280 bg => [0, 0, 0, 0.4], 276 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 277 active_bg => [1, 1, 1, 0.5],
282 @_ 278 @_
283 ) 279 )
284} 280}
285 281
286sub _draw { 282sub _draw {
287 my ($self) = @_; 283 my ($self) = @_;
288 284
289 my ($w, $h) = @$self{qw(w h)}; 285 my ($w, $h) = @$self{qw(w h)};
290 286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
291 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
292 glBegin GL_QUADS; 291 glBegin GL_QUADS;
293 glVertex 0 , 0; 292 glVertex 0 , 0;
294 glVertex 0 , $h; 293 glVertex 0 , $h;
295 glVertex $w, $h; 294 glVertex $w, $h;
296 glVertex $w, 0; 295 glVertex $w, 0;
297 glEnd; 296 glEnd;
297
298 glDisable GL_BLEND;
298} 299}
299 300
300############################################################################# 301#############################################################################
301 302
302package CFClient::UI::Empty; 303package CFClient::UI::Empty;
… …
325 326
326 $self 327 $self
327} 328}
328 329
329sub add { 330sub add {
330 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
331 332
332 $chld->{expand} = $expand;
333 $chld->set_parent ($self); 333 $chld->set_parent ($self);
334 334
335 $self->{children} = [ 335 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 337 @{$self->{children}}, $chld
… …
530 530
531my @tex = 531my @tex =
532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
534 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
535sub size_request { 548sub size_request {
536 my ($self) = @_; 549 my ($self) = @_;
537 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
538 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
539 554
540 $h += $tex[1]->{h}; 555 (
541 $h += $tex[4]->{h}; 556 $w + $self->{border} * 2,
542 $w += $tex[2]->{w}; 557 $h + $self->{border} * 2,
543 $w += $tex[3]->{w}; 558 )
544
545 ($w, $h)
546} 559}
547 560
548sub size_allocate { 561sub size_allocate {
549 my ($self, $x, $y, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
550 563
551 $self->_size_allocate ($x, $y, $w, $h) or return; 564 $self->_size_allocate ($x, $y, $w, $h) or return;
552 565
553 $h -= $tex[1]->{h}; 566 $h -= List::Util::max 0, $self->{border} * 2;
554 $h -= $tex[4]->{h}; 567 $w -= List::Util::max 0, $self->{border} * 2;
555 $w -= $tex[2]->{w};
556 $w -= $tex[3]->{w};
557 568
558 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
559 $w = $w < 0 ? 0 : $w; 570}
560 571
561 my $child = $self->child; 572sub button_down {
573 my ($self, $ev, $x, $y) = @_;
562 574
563 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
564} 618}
565 619
566sub _draw { 620sub _draw {
567 my ($self) = @_; 621 my ($self) = @_;
568 622
569 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
570 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
571 625
572 glEnable GL_BLEND; 626 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
574 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
576 630
577 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
578 $top->draw_quad (0, 0, $w, $top->{h}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
579 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
580 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
581 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
582
583 my $right = $tex[2];
584 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
585
586 my $bottom = $tex[4];
587 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
588 636
589 my $bg = $tex[0]; 637 my $bg = $tex[0];
590 glBindTexture GL_TEXTURE_2D, $bg->{name};
591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
592 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
593 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
594 638
639 # TODO: repeat texture not scale
595 my $rep_x = $cw / $bg->{w}; 640 my $rep_x = $cw / $bg->{w};
596 my $rep_y = $ch / $bg->{h}; 641 my $rep_y = $ch / $bg->{h};
597 642
643 glColor @{ $self->{bg} };
598 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
599 645
646 glDisable GL_TEXTURE_2D;
600 glDisable GL_BLEND; 647 glDisable GL_BLEND;
601 glDisable GL_TEXTURE_2D;
602 648
603 $self->child->draw; 649 $self->child->draw;
604
605} 650}
606 651
607############################################################################# 652#############################################################################
608 653
609package CFClient::UI::Table; 654package CFClient::UI::Table;
… …
611our @ISA = CFClient::UI::Base::; 656our @ISA = CFClient::UI::Base::;
612 657
613use List::Util qw(max sum); 658use List::Util qw(max sum);
614 659
615use SDL::OpenGL; 660use SDL::OpenGL;
661
662sub new {
663 my $class = shift;
664
665 $class->SUPER::new (
666 col_expand => [],
667 @_
668 )
669}
616 670
617sub add { 671sub add {
618 my ($self, $x, $y, $chld) = @_; 672 my ($self, $x, $y, $chld) = @_;
619 673
620 $self->{children}[$y][$x] = $chld; 674 $self->{children}[$y][$x] = $chld;
… …
650 my ($self) = @_; 704 my ($self) = @_;
651 705
652 my ($ws, $hs) = $self->get_wh; 706 my ($ws, $hs) = $self->get_wh;
653 707
654 ( 708 (
655 (List::Util::sum @$ws), 709 (sum @$ws),
656 (List::Util::sum @$hs), 710 (sum @$hs),
657 ) 711 )
658} 712}
659 713
660sub size_allocate { 714sub size_allocate {
661 my ($self, $x, $y, $w, $h) = @_; 715 my ($self, $x, $y, $w, $h) = @_;
662 716
663 $self->_size_allocate ($x, $y, $w, $h) or return; 717 $self->_size_allocate ($x, $y, $w, $h) or return;
664 718
665 my ($ws, $hs) = $self->get_wh; 719 my ($ws, $hs) = $self->get_wh;
666 720
667 my $req_w = List::Util::sum @$ws; 721 my $req_w = sum @$ws;
668 my $req_h = List::Util::sum @$hs; 722 my $req_h = sum @$hs;
723
724 # TODO: nicer code && do row_expand
725 my @col_expand = @{$self->{col_expand}};
726 @col_expand = (1) x @$ws unless @col_expand;
727 my $col_expand = (sum @col_expand) || 1;
669 728
670 # linearly scale sizes 729 # linearly scale sizes
671 $_ *= $req_w / $w for @$ws; 730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
672 $_ *= $req_h / $h for @$hs; 731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
673 732
674 my $y; 733 my $y;
675 734
676 for my $r (0 .. $#{$self->{children}}) { 735 for my $r (0 .. $#{$self->{children}}) {
677 my $row = $self->{children}[$r] 736 my $row = $self->{children}[$r]
… …
679 738
680 my $x = 0; 739 my $x = 0;
681 my $row_h = $hs->[$r]; 740 my $row_h = $hs->[$r];
682 741
683 for my $c (0 .. $#$row) { 742 for my $c (0 .. $#$row) {
684 my $widget = $row->[$c]
685 or next;
686
687 my $col_w = $ws->[$c]; 743 my $col_w = $ws->[$c];
688 744
745 if (my $widget = $row->[$c]) {
689 $widget->size_allocate ($x, $y, $col_w, $row_h); 746 $widget->size_allocate ($x, $y, $col_w, $row_h);
747 }
690 748
691 $x += $col_w; 749 $x += $col_w;
692 } 750 }
693 751
694 $y += $row_h; 752 $y += $row_h;
695 } 753 }
696 754
697} 755}
698 756
757sub find_widget {
758 my ($self, $x, $y) = @_;
759
760 $x -= $self->{x};
761 $y -= $self->{y};
762
763 my $res;
764
765 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
766 $res = $_->find_widget ($x, $y)
767 and return $res;
768 }
769
770 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
771}
772
699sub _draw { 773sub _draw {
700 my ($self) = @_; 774 my ($self) = @_;
701 775
702 for (grep $_, @{$self->{children}}) { 776 for (grep $_, @{$self->{children}}) {
703 $_->draw for grep $_, @$_; 777 $_->draw for grep $_, @$_;
704 } 778 }
705} 779}
706 780
707############################################################################# 781#############################################################################
708 782
783package CFClient::UI::HBox;
784
785# TODO: wrap into common Box base class
786
787our @ISA = CFClient::UI::Container::;
788
789sub size_request {
790 my ($self) = @_;
791
792 my @alloc = map [$_->size_request], @{$self->{children}};
793
794 (
795 (List::Util::sum map $_->[0], @alloc),
796 (List::Util::max map $_->[1], @alloc),
797 )
798}
799
800sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804
805 ($h, $w) = ($w, $h);
806
807 my $children = $self->{children};
808
809 my @h = map +($_->size_request)[0], @$children;
810
811 my $req_h = List::Util::sum @h;
812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ *= $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
826 }
827 }
828
829 my $y = 0;
830 for (0 .. $#$children) {
831 my $child = $children->[$_];
832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
834
835 $y += $h;
836 }
837}
838
839#############################################################################
840
709package CFClient::UI::VBox; 841package CFClient::UI::VBox;
710 842
843# TODO: wrap into common Box base class
844
711our @ISA = CFClient::UI::Container::; 845our @ISA = CFClient::UI::Container::;
712
713use SDL::OpenGL;
714 846
715sub size_request { 847sub size_request {
716 my ($self) = @_; 848 my ($self) = @_;
717 849
718 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
724} 856}
725 857
726sub size_allocate { 858sub size_allocate {
727 my ($self, $x, $y, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
728 860
729 $self->_size_allocate ($x, $y, $w, $h) or return; 861 $self->_size_allocate ($x, $y, $w, $h);
730
731 return unless $self->{h};
732 862
733 my $children = $self->{children}; 863 my $children = $self->{children};
734 864
735 my @h = map +($_->size_request)[1], @$children; 865 my @h = map +($_->size_request)[1], @$children;
736 866
737 my $req_h = List::Util::sum @h; 867 my $req_h = List::Util::sum @h;
738 868
739 if ($req_h > $h) { 869 if ($req_h > $h) {
740 # ah well, not enough space 870 # ah well, not enough space
741 $_ = $h[$_] * $h / $req_h for @h; 871 $_ *= $h / $req_h for @h;
742 } else { 872 } else {
743 my @exp = grep $_->{expand}, @$children; 873 my $exp = List::Util::sum map $_->{expand}, @$children;
744 @exp = @$children unless @exp; 874 $exp ||= 1;
745 875
746 my %exp = map +($_ => 1), @exp;
747
748 for (0 .. $#$children) { 876 for (0 .. $#$children) {
749 my $child = $children->[$_]; 877 my $child = $children->[$_];
750 878
751 my $alloc_h = $h[$_]; 879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
752 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
753 $h[$_] = $alloc_h;
754 } 880 }
755 } 881 }
756 882
757 my $y = 0; 883 my $y = 0;
758 for (0 .. $#$children) { 884 for (0 .. $#$children) {
… …
774 900
775sub new { 901sub new {
776 my ($class, %arg) = @_; 902 my ($class, %arg) = @_;
777 903
778 my $self = $class->SUPER::new ( 904 my $self = $class->SUPER::new (
779 fg => [1, 1, 1], 905 fg => [1, 1, 1],
780 height => $::FONTSIZE, 906 height => $::FONTSIZE,
781 text => "", 907 text => "",
782 align => -1, 908 align => -1,
909 padding => 2,
783 layout => new CFClient::Layout, 910 layout => new CFClient::Layout,
784 %arg 911 %arg
785 ); 912 );
786 913
787 $self->set_text ($self->{text}); 914 $self->set_text ($self->{text});
788 915
… …
804 931
805 $self->{text} = $text; 932 $self->{text} = $text;
806 $self->{layout}->set_markup ($text); 933 $self->{layout}->set_markup ($text);
807 934
808 delete $self->{texture}; 935 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
809 $self->update; 937 $self->update;
810} 938}
811 939
812sub get_text { 940sub get_text {
813 my ($self, $text) = @_; 941 my ($self, $text) = @_;
… …
818sub size_request { 946sub size_request {
819 my ($self) = @_; 947 my ($self) = @_;
820 948
821 $self->{layout}->set_width; 949 $self->{layout}->set_width;
822 $self->{layout}->set_height ($self->{height}); 950 $self->{layout}->set_height ($self->{height});
823 $self->{layout}->size 951 my ($w, $h) = $self->{layout}->size;
824# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 952
825# ( 953 (
826# $self->{texture}{w}, 954 $w + $self->{padding} * 2,
827# $self->{texture}{h}, 955 $h + $self->{padding} * 2,
828# ) 956 )
829# } else {
830# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
831#
832# ($w, $h)
833# }
834} 957}
835 958
836sub size_allocate { 959sub size_allocate {
837 my ($self, $x, $y, $w, $h) = @_; 960 my ($self, $x, $y, $w, $h) = @_;
838 961
… …
851sub _draw { 974sub _draw {
852 my ($self) = @_; 975 my ($self) = @_;
853 976
854 my $tex = $self->{texture} ||= do { 977 my $tex = $self->{texture} ||= do {
855 $self->{layout}->set_width ($self->{w}); 978 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
856 new_from_layout CFClient::Texture $self->{layout} 980 new_from_layout CFClient::Texture $self->{layout}
857 }; 981 };
858 982
859 glEnable GL_BLEND; 983 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863 987
864 glColor @{$self->{fg}}; 988 glColor @{$self->{fg}};
865 989
866 my $x = 990 my $x =
867 $self->{align} < 0 ? 0 991 $self->{align} < 0 ? $self->{padding}
868 : $self->{align} > 0 ? $self->{w} - $tex->{w} 992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
869 : ($self->{w} - $tex->{w}) * 0.5; 993 : ($self->{w} - $tex->{w}) * 0.5;
870 994
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
871 $tex->draw_quad ($x, 0); 996 $tex->draw_quad (0, 0);
872 997
873 glDisable GL_TEXTURE_2D; 998 glDisable GL_TEXTURE_2D;
874 glDisable GL_BLEND; 999 glDisable GL_BLEND;
875} 1000}
876 1001
… …
886sub new { 1011sub new {
887 my $class = shift; 1012 my $class = shift;
888 1013
889 $class->SUPER::new ( 1014 $class->SUPER::new (
890 fg => [1, 1, 1], 1015 fg => [1, 1, 1],
891 bg => [0, 0, 0, 0.4], 1016 bg => [0, 0, 0, 0.2],
892 active_bg => [1, 1, 1], 1017 active_bg => [1, 1, 1, 0.5],
893 active_fg => [0, 0, 0], 1018 active_fg => [0, 0, 0],
1019 can_hover => 1,
1020 can_focus => 1,
894 @_ 1021 @_
895 ) 1022 )
896} 1023}
897 1024
898sub _set_text { 1025sub _set_text {
… …
900 1027
901 $self->{last_activity} = $::NOW; 1028 $self->{last_activity} = $::NOW;
902 1029
903 $self->{text} = $text; 1030 $self->{text} = $text;
904 $self->{layout}->set_width ($self->{w}); 1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
905 1033
906 $text =~ s/./*/g if $self->{hidden}; 1034 $text =~ s/./*/g if $self->{hidden};
907 1035
908
909 $self->{layout}->set_markup ($self->escape_text ($text)); 1036 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
910 1037
911 $text = substr $text, 0, $self->{cursor}; 1038 $text = substr $text, 0, $self->{cursor};
912 utf8::encode $text; 1039 utf8::encode $text;
913 1040
914 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
… …
954 substr $text, $self->{cursor}, 1, ""; 1081 substr $text, $self->{cursor}, 1, "";
955 } elsif ($sym == SDLK_LEFT) { 1082 } elsif ($sym == SDLK_LEFT) {
956 --$self->{cursor} if $self->{cursor}; 1083 --$self->{cursor} if $self->{cursor};
957 } elsif ($sym == SDLK_RIGHT) { 1084 } elsif ($sym == SDLK_RIGHT) {
958 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1085 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text;
959 } elsif ($uni) { 1090 } elsif ($uni) {
960 substr $text, $self->{cursor}++, 0, chr $uni; 1091 substr $text, $self->{cursor}++, 0, chr $uni;
961 } 1092 }
962 1093
963 $self->_set_text ($text); 1094 $self->_set_text ($text);
… …
978 $self->SUPER::button_down ($ev, $x, $y); 1109 $self->SUPER::button_down ($ev, $x, $y);
979 1110
980 my $idx = $self->{layout}->xy_to_index ($x, $y); 1111 my $idx = $self->{layout}->xy_to_index ($x, $y);
981 1112
982 # byte-index to char-index 1113 # byte-index to char-index
983 my $text = $self->{layout}; 1114 my $text = $self->{text};
984 utf8::encode $text; 1115 utf8::encode $text;
985 $self->{cursor} = length substr $text, 0, $idx; 1116 $self->{cursor} = length substr $text, 0, $idx;
986 1117
987 $self->_set_text ($self->{text}); 1118 $self->_set_text ($self->{text});
988 $self->update; 1119 $self->update;
… …
1003 $self->{fg} = $self->{active_fg}; 1134 $self->{fg} = $self->{active_fg};
1004 } else { 1135 } else {
1005 glColor @{$self->{bg}}; 1136 glColor @{$self->{bg}};
1006 } 1137 }
1007 1138
1139 glEnable GL_BLEND;
1140 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1008 glBegin GL_QUADS; 1141 glBegin GL_QUADS;
1009 glVertex 0 , 0; 1142 glVertex 0 , 0;
1010 glVertex 0 , $self->{h}; 1143 glVertex 0 , $self->{h};
1011 glVertex $self->{w}, $self->{h}; 1144 glVertex $self->{w}, $self->{h};
1012 glVertex $self->{w}, 0; 1145 glVertex $self->{w}, 0;
1013 glEnd; 1146 glEnd;
1147 glDisable GL_BLEND;
1014 1148
1015 $self->SUPER::_draw; 1149 $self->SUPER::_draw;
1016 1150
1017 #TODO: force update every cursor change :( 1151 #TODO: force update every cursor change :(
1018 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
1022 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1156 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1023 glEnd; 1157 glEnd;
1024 } 1158 }
1025} 1159}
1026 1160
1027#############################################################################
1028
1029package CFClient::UI::Slider; 1161package CFClient::UI::LineEntry;
1030 1162
1031use strict; 1163our @ISA = CFClient::UI::Entry::;
1032 1164
1165use SDL;
1033use SDL::OpenGL; 1166use SDL::OpenGL;
1034 1167
1035our @ISA = CFClient::UI::DrawBG::; 1168sub key_down {
1036
1037sub size_request {
1038 my ($self) = @_; 1169 my ($self, $ev) = @_;
1039 1170
1040 my $w = 50; 1171 my $sym = $ev->key_sym;
1041 my $h = 10;
1042 1172
1043 $self->{vertical} ? ($h, $w) : ($w, $h) 1173 if ($sym == SDLK_RETURN) {
1174 $self->emit (activate => $self->get_text);
1175 $self->update;
1176
1177 } else {
1178 $self->SUPER::key_down ($ev);
1179 }
1180
1044} 1181}
1182
1183#############################################################################
1184
1185package CFClient::UI::Button;
1186
1187our @ISA = CFClient::UI::Label::;
1188
1189use SDL;
1190use SDL::OpenGL;
1191
1192my @tex =
1193 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1194 qw(b1_button_active.png);
1045 1195
1046sub new { 1196sub new {
1047 my $class = shift; 1197 my $class = shift;
1048 1198
1199 $class->SUPER::new (
1200 padding => 4,
1201 fg => [1, 1, 1],
1202 bg => [1, 1, 1, 0.2],
1203 active_fg => [1, 1, 0],
1204 can_hover => 1,
1205 @_
1206 )
1207}
1208
1209sub button_up {
1210 my ($self, $ev, $x, $y) = @_;
1211
1212 if ($x >= 0 && $x < $self->{w}
1213 && $y >= 0 && $y < $self->{h}) {
1214 $self->emit ("activate");
1215 }
1216}
1217
1218sub _draw {
1219 my ($self) = @_;
1220
1221 local $self->{fg} = $self->{fg};
1222 my $tex = $tex[0];
1223
1224 glEnable GL_BLEND;
1225 glEnable GL_TEXTURE_2D;
1226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1227
1228 if ($GRAB == $self) {
1229 $self->{fg} = $self->{active_fg};
1230 }
1231
1232 glBindTexture GL_TEXTURE_2D, $tex->{name};
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1234
1235 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1236
1237 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239
1240 $self->SUPER::_draw;
1241}
1242
1243#############################################################################
1244
1245package CFClient::UI::CheckBox;
1246
1247our @ISA = CFClient::UI::DrawBG::;
1248
1249use SDL;
1250use SDL::OpenGL;
1251
1252sub new {
1253 my $class = shift;
1254
1255 $class->SUPER::new (
1256 padding => 2,
1257 fg => [1, 1, 1],
1258 active_fg => [1, 1, 0],
1259 state => 0,
1260 can_hover => 1,
1261 @_
1262 )
1263}
1264
1265sub size_request {
1266 my ($self) = @_;
1267
1268 ($self->{padding} * 2 + 6) x 2
1269}
1270
1271sub size_allocate {
1272 my ($self, $x, $y, $w, $h) = @_;
1273
1274 $self->_size_allocate ($x, $y, $w, $h);
1275}
1276
1277sub button_down {
1278 my ($self, $ev, $x, $y) = @_;
1279
1280 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1281 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1282 $self->{state} = !$self->{state};
1283 $self->emit (changed => $self->{state});
1284 }
1285}
1286
1287sub _draw {
1288 my ($self) = @_;
1289
1290 $self->SUPER::_draw;
1291
1292 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1293
1294 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1295
1296 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1297
1298 glBegin GL_LINE_LOOP;
1299 glVertex 0 , 0;
1300 glVertex 0 , $s;
1301 glVertex $s, $s;
1302 glVertex $s, 0;
1303 glEnd;
1304
1305 if ($self->{state}) {
1306 glBegin GL_LINES;
1307 glVertex 0 , 0;
1308 glVertex $s, $s;
1309 glVertex $s, 0;
1310 glVertex 0 , $s;
1311 glEnd;
1312 }
1313}
1314
1315#############################################################################
1316
1317package CFClient::UI::Slider;
1318
1319use strict;
1320
1321use SDL::OpenGL;
1322
1323our @ISA = CFClient::UI::DrawBG::;
1324
1325my @tex =
1326 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1327 qw(s1_slider.png s1_slider_bg.png);
1328
1329sub new {
1330 my $class = shift;
1331
1049 # range [value, low, high, page] 1332 # range [value, low, high, page]
1050 1333
1334 # TODO: 0-width page
1335 # TODO: req_w/h are wrong with vertical
1336 # TODO: calculations are off
1051 $class->SUPER::new ( 1337 my $self = $class->SUPER::new (
1052 fg => [1, 1, 1], 1338 fg => [1, 1, 1],
1053 active_fg => [0, 0, 0], 1339 active_fg => [0, 0, 0],
1054 range => [0, 0, 100, 10], 1340 range => [0, 0, 100, 10],
1341 req_w => 40,
1342 req_h => 13,
1055 vertical => 1, 1343 vertical => 0,
1344 can_hover => 1,
1056 @_ 1345 @_
1057 ) 1346 );
1347
1348 $self
1349}
1350
1351sub size_request {
1352 my ($self) = @_;
1353
1354 my $w = $self->{req_w};
1355 my $h = $self->{req_h};
1356
1357 $self->{vertical} ? ($h, $w) : ($w, $h)
1058} 1358}
1059 1359
1060sub button_down { 1360sub button_down {
1061 my ($self, $ev, $x, $y) = @_; 1361 my ($self, $ev, $x, $y) = @_;
1062 1362
… …
1101 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1401 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1102 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1402 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1103 1403
1104 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1404 my ($value, $lo, $hi, $page) = @{$self->{range}};
1105 1405
1406 # the inner_* stuff is for generating a padding for the slider handle,
1407 # so that the handle doesn't leave the texture. This calculation isn't 100%
1408 # correct propably, but it does the job for now
1409 my $inner_pad = 5; # 5% of width for slider bg texture border
1410 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1411 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1412
1106 $page = int $page * $w / ($hi - $lo); 1413 $page = int $page * $inner_w / ($hi - $lo);
1107 $value = int +($value - $lo) * $w / ($hi - $lo); 1414 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1108 1415
1109 $w -= $page; 1416 $w -= $page;
1110 $page &= ~1; 1417 $page &= ~1;
1111 glTranslate $page * 0.5, 0, 0; 1418 glTranslate $page * 0.5, 0, 0;
1419 $page ||= 2;
1112 1420
1113 glColor @$fg;
1114 glBegin GL_LINES;
1115 glVertex 0, 0; glVertex 0, $h;
1116 glVertex $w - 1, 0; glVertex $w - 1, $h;
1117 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1118 glEnd;
1119
1120 my $knob_a = $value - $page * 0.5; 1421 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1121 my $knob_b = $value + $page * 0.5; 1422 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1122 1423
1123 glBegin GL_QUADS; 1424 glEnable GL_BLEND;
1124 glColor @$fg; 1425 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1125 glVertex $knob_a, 0; 1426 glEnable GL_TEXTURE_2D;
1126 glVertex $knob_a, $h; 1427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1127 glVertex $knob_b, $h;
1128 glVertex $knob_b, 0;
1129 1428
1130 if ($knob_a < $knob_b - 2) { 1429 # draw background
1131 glColor @$bg; 1430 $tex[1]->draw_quad (0, 0, $w, $h);
1132 glVertex $knob_a + 1, 1; 1431
1133 glVertex $knob_a + 1, $h - 1; 1432 # draw handle
1134 glVertex $knob_b - 1, $h - 1; 1433 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1135 glVertex $knob_b - 1, 1; 1434
1435 glDisable GL_BLEND;
1436 glDisable GL_TEXTURE_2D;
1437}
1438
1439#############################################################################
1440
1441package CFClient::UI::TextView;
1442
1443our @ISA = CFClient::UI::HBox::;
1444
1445use SDL::OpenGL;
1446
1447sub new {
1448 my $class = shift;
1449
1450 my $self = $class->SUPER::new (
1451 par => [],
1452 @_,
1453 children => [
1454 (new CFClient::UI::Empty expand => 1),
1455 (new CFClient::UI::Slider vertical => 1),
1456 ],
1457 );
1458
1459 $self
1460}
1461
1462sub add_paragraph {
1463 my ($self, $color, $text) = @_;
1464
1465 push @{$self->{par}}, [$color, $text];
1466 my $count = scalar @{$self->{par}};
1467 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1468 $self->{children}[1]->update;
1469}
1470
1471sub _draw {
1472 my ($self) = @_;
1473
1474 my $par = $self->{par};
1475
1476 my $bottom = (scalar @$par) - 1;
1477
1478 my $w = $self->{children}[0]{w};
1479 my $y = $self->{h};
1480
1481 glEnable GL_BLEND;
1482 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483 glEnable GL_TEXTURE_2D;
1484 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1485
1486 # TODO: everything!
1487 while ($y > 0 && $bottom >= 0) {
1488 my $par = $par->[$bottom--];
1489
1490 my $layout = new CFClient::Layout;
1491
1492 $layout->set_height ($::FONTSIZE);
1493 $layout->set_width ($w);
1494 $layout->set_text ($par->[1]);
1495 my $tex = new_from_layout CFClient::Texture $layout;
1496 $y -= $tex->{h};
1497
1498 glColor @{ $par->[0] };
1499 $tex->draw_quad (0, $y);
1136 } 1500 }
1137 glEnd; 1501
1502 glDisable GL_TEXTURE_2D;
1503 glDisable GL_BLEND;
1138} 1504}
1139 1505
1140############################################################################# 1506#############################################################################
1141 1507
1142package CFClient::UI::MapWidget; 1508package CFClient::UI::MapWidget;
… …
1152 1518
1153sub new { 1519sub new {
1154 my $class = shift; 1520 my $class = shift;
1155 1521
1156 $class->SUPER::new ( 1522 $class->SUPER::new (
1157 z => -1, 1523 z => -1,
1524 can_focus => 1,
1158 list => (glGenLists 1), 1525 list => (glGenLists 1),
1159 @_ 1526 @_
1160 ) 1527 )
1161} 1528}
1162 1529
1163sub key_down { 1530sub key_down {
… …
1167sub key_up { 1534sub key_up {
1168} 1535}
1169 1536
1170sub size_request { 1537sub size_request {
1171 ( 1538 (
1172 1 + int $::WIDTH / 32, 1539 1 + 32 * int $::WIDTH / 32,
1173 1 + int $::HEIGHT / 32, 1540 1 + 32 * int $::HEIGHT / 32,
1174 ) 1541 )
1175} 1542}
1176 1543
1177sub update { 1544sub update {
1178 my ($self) = @_; 1545 my ($self) = @_;
1179 1546
1180 $self->{need_update} = 1; 1547 $self->{need_update} = 1;
1181 $self->SUPER::update; 1548 $self->SUPER::update;
1182} 1549}
1183 1550
1184sub _draw { 1551sub draw {
1185 my ($self) = @_; 1552 my ($self) = @_;
1186 1553
1554 $self->{need_update}++;#d#
1187 if (delete $self->{need_update}) { 1555 if (delete $self->{need_update}) {
1188 glNewList $self->{list}, GL_COMPILE; 1556 glNewList $self->{list}, GL_COMPILE;
1189 1557
1190 my $mx = $::CONN->{mapx};
1191 my $my = $::CONN->{mapy};
1192
1193 my $map = $::CONN->{map};
1194
1195 my ($xofs, $yofs);
1196
1197 my $sw = 1 + int $::WIDTH / 32; 1558 my $sw = int $::WIDTH / 32;
1198 my $sh = 1 + int $::HEIGHT / 32; 1559 my $sh = int $::HEIGHT / 32;
1199 1560
1200 if ($::CONN->{mapw} > $sw) { 1561 if ($::MAP) {
1201 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1562 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1202 } else {
1203 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1204 }
1205 1563
1206 if ($::CONN->{maph} > $sh) { 1564 if ($::CFG->{fow_enable}) {
1207 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1565 if ($::CFG->{fow_smooth}) { # smooth fog of war
1208 } else { 1566 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1209 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1567 glConvolutionFilter2D
1210 } 1568 GL_CONVOLUTION_2D,
1211 1569 GL_ALPHA,
1212 glEnable GL_TEXTURE_2D; 1570 3, 3,
1213 glEnable GL_BLEND; 1571 GL_ALPHA, GL_FLOAT,
1214 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1572 pack "f*",
1215 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1573 0.1, 0.1, 0.1,
1216 1574 0.1, 0.2, 0.1,
1217 my $sw4 = ($sw + 3) & ~3; 1575 0.1, 0.1, 0.1,
1218 my $darkness = "\x00" x ($sw4 * $sh);
1219
1220 for my $x (0 .. $sw - 1) {
1221 my $row = $map->[$x + $xofs];
1222 for my $y (0 .. $sh - 1) {
1223
1224 my $cell = $row->[$y + $yofs]
1225 or next; 1576 ;
1226 1577 glEnable GL_CONVOLUTION_2D;
1227 my $dark = $cell->[0];
1228 if ($dark < 0) {
1229 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1230 } else {
1231 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1232 } 1578 }
1233 1579
1234 for my $num (grep $_, @$cell[1,2,3]) { 1580 my $tex = new CFClient::Texture
1235 my $tex = $::CONN->{face}[$num]{texture} || next; 1581 w => $w,
1236 1582 h => $h,
1237 my ($w, $h) = @$tex{qw(w h)}; 1583 data => $data,
1584 internalformat => GL_ALPHA,
1585 format => GL_ALPHA;
1238 1586
1239 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1587 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1240 } 1588
1589 glEnable GL_BLEND;
1590 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1592
1593 glColor +($::CFG->{fow_intensity}) x 3, 1;
1594 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1595
1596 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1241 } 1598 }
1242 } 1599 }
1243 1600
1244# if (1) { # higher quality darkness
1245# $lighting =~ s/(.)/$1$1$1/gs;
1246# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1247#
1248# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1249#
1250# $lighting = $pb->get_pixels;
1251# $lighting =~ s/(.)../$1/gs;
1252# }
1253
1254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1255
1256 $darkness = new CFClient::Texture
1257 w => $sw4,
1258 h => $sh,
1259 data => $darkness,
1260 internalformat => GL_ALPHA,
1261 format => GL_ALPHA;
1262
1263 glColor 0.45, 0.45, 0.45, 1;
1264 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1265
1266 glDisable GL_TEXTURE_2D;
1267 glDisable GL_BLEND;
1268
1269 glEndList; 1601 glEndList;
1270 } 1602 }
1271 1603
1272 glCallList $self->{list}; 1604 glCallList $self->{list};
1605
1606 if ($FOCUS != $self) {
1607 glColor 64/255, 64/255, 64/255;
1608 glLogicOp GL_AND;
1609 glEnable GL_COLOR_LOGIC_OP;
1610 glBegin GL_QUADS;
1611 glVertex 0, 0;
1612 glVertex 0, $::HEIGHT;
1613 glVertex $::WIDTH, $::HEIGHT;
1614 glVertex $::WIDTH, 0;
1615 glEnd;
1616 glDisable GL_COLOR_LOGIC_OP;
1617 }
1273} 1618}
1274 1619
1275my %DIR = ( 1620my %DIR = (
1276 SDLK_KP8, [1, "north"], 1621 SDLK_KP8, [1, "north"],
1277 SDLK_KP9, [2, "northeast"], 1622 SDLK_KP9, [2, "northeast"],
… …
1293 1638
1294 my $mod = $ev->key_mod; 1639 my $mod = $ev->key_mod;
1295 my $sym = $ev->key_sym; 1640 my $sym = $ev->key_sym;
1296 1641
1297 if ($sym == SDLK_KP5) { 1642 if ($sym == SDLK_KP5) {
1298 $::CONN->send ("command stay fire"); 1643 $::CONN->user_send ("command stay fire");
1644 } elsif ($sym == SDLK_a) {
1645 $::CONN->user_send ("command apply");
1299 } elsif (exists $DIR{$sym}) { 1646 } elsif (exists $DIR{$sym}) {
1300 if ($mod & KMOD_SHIFT) { 1647 if ($mod & KMOD_SHIFT) {
1301 $self->{shft}++; 1648 $self->{shft}++;
1302 $::CONN->send ("command fire $DIR{$sym}[0]"); 1649 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1303 } elsif ($mod & KMOD_CTRL) { 1650 } elsif ($mod & KMOD_CTRL) {
1304 $self->{ctrl}++; 1651 $self->{ctrl}++;
1305 $::CONN->send ("command run $DIR{$sym}[0]"); 1652 $::CONN->user_send ("command run $DIR{$sym}[0]");
1306 } else { 1653 } else {
1307 $::CONN->send ("command $DIR{$sym}[1]"); 1654 $::CONN->user_send ("command $DIR{$sym}[1]");
1308 } 1655 }
1309 } 1656 }
1310} 1657}
1311 1658
1312sub key_up { 1659sub key_up {
… …
1314 1661
1315 my $mod = $ev->key_mod; 1662 my $mod = $ev->key_mod;
1316 my $sym = $ev->key_sym; 1663 my $sym = $ev->key_sym;
1317 1664
1318 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1665 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1319 $::CONN->send ("command fire_stop"); 1666 $::CONN->user_send ("command fire_stop");
1320 } 1667 }
1321 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1668 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1322 $::CONN->send ("command run_stop"); 1669 $::CONN->user_send ("command run_stop");
1323 } 1670 }
1324} 1671}
1325 1672
1326############################################################################# 1673#############################################################################
1327 1674
… …
1365 glPopMatrix; 1712 glPopMatrix;
1366} 1713}
1367 1714
1368############################################################################# 1715#############################################################################
1369 1716
1717package CFClient::UI::Flopper;
1718
1719our @ISA = CFClient::UI::Button::;
1720
1721sub new {
1722 my $class = shift;
1723
1724 my $self = $class->SUPER::new (
1725 state => 0,
1726 connect_activate => \&toggle_flopper,
1727 @_
1728 );
1729
1730 if ($self->{state}) {
1731 $self->{state} = 0;
1732 $self->toggle_flopper;
1733 }
1734
1735 $self
1736}
1737
1738sub toggle_flopper {
1739 my ($self) = @_;
1740
1741 # TODO: use animation
1742 if ($self->{state} = !$self->{state}) {
1743 $CFClient::UI::TOPLEVEL->add ($self->{other});
1744 $self->{other}->move (
1745 ($::WIDTH - $self->{other}{w}) * 0.5,
1746 ($::HEIGHT - $self->{other}{h}) * 0.5,
1747 );
1748 } else {
1749 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1750 }
1751}
1752
1753#############################################################################
1754
1370package CFClient::UI::Toplevel; 1755package CFClient::UI::Toplevel;
1371 1756
1372our @ISA = CFClient::UI::Container::; 1757our @ISA = CFClient::UI::Container::;
1373 1758
1374sub size_request { 1759sub size_request {

Diff Legend

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