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.76 by root, Tue Apr 11 21:24:09 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 12:29:46 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;
… …
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for ($vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
… …
79use SDL::OpenGL; 92use SDL::OpenGL;
80 93
81sub new { 94sub new {
82 my $class = shift; 95 my $class = shift;
83 96
84 bless { 97 my $self = bless {
85 x => 0, 98 x => 0,
86 y => 0, 99 y => 0,
87 z => 0, 100 z => 0,
88 w => -1, 101 w => -1,
89 h => -1, 102 h => -1,
90 @_ 103 @_
91 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
92} 113}
93 114
94sub move { 115sub move {
95 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 117 $self->{x} = $x;
… …
125 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
126 147
127 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
128} 149}
129 150
130# translate global koordinates to local coordinate system 151# translate global coordinates to local coordinate system
131sub translate { 152sub translate {
132 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
133 154
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
135} 156}
136 157
137sub focus_in { 158sub focus_in {
138 my ($self) = @_; 159 my ($self) = @_;
139 160
140 return if $FOCUS == $self; 161 return if $FOCUS == $self;
162 return unless $self->{can_focus};
141 163
142 my $focus = $FOCUS; $FOCUS = $self; 164 my $focus = $FOCUS; $FOCUS = $self;
143 $focus->update if $focus; 165 $focus->update if $focus;
144 $FOCUS->update; 166 $FOCUS->update;
145} 167}
… …
178 glPushMatrix; 200 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 201 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 202 $self->_draw;
181 glPopMatrix; 203 glPopMatrix;
182 204
183 if ($self == $HOVER) { 205 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 206 my ($x, $y) = @$self{qw(x y)};
185 207
186 glColor 0, 0, 1, 0.2; 208 glColor 0, 0, 1, 0.2;
187 glEnable GL_BLEND; 209 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
200 my ($self) = @_; 222 my ($self) = @_;
201 223
202 warn "no draw defined for $self\n"; 224 warn "no draw defined for $self\n";
203} 225}
204 226
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 { 227sub find_widget {
217 my ($self, $x, $y) = @_; 228 my ($self, $x, $y) = @_;
218 229
219 return $self 230 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 231 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 232 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 233
223 () 234 ()
224} 235}
225 236
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 237sub set_parent {
229 my ($self, $par) = @_; 238 my ($self, $par) = @_;
230 239
231 $self->{parent} = $par; 240 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 241 Scalar::Util::weaken $self->{parent};
… …
276 285
277 # range [value, low, high, page] 286 # range [value, low, high, page]
278 287
279 $class->SUPER::new ( 288 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2], 289 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 290 active_bg => [1, 1, 1, 0.5],
282 @_ 291 @_
283 ) 292 )
284} 293}
285 294
286sub _draw { 295sub _draw {
… …
330 339
331 $self 340 $self
332} 341}
333 342
334sub add { 343sub add {
335 my ($self, $chld, $expand) = @_; 344 my ($self, $chld) = @_;
336 345
337 $chld->{expand} = $expand;
338 $chld->set_parent ($self); 346 $chld->set_parent ($self);
339 347
340 $self->{children} = [ 348 $self->{children} = [
341 sort { $a->{z} <=> $b->{z} } 349 sort { $a->{z} <=> $b->{z} }
342 @{$self->{children}}, $chld 350 @{$self->{children}}, $chld
… …
444} 452}
445 453
446sub render_chld { 454sub render_chld {
447 my ($self) = @_; 455 my ($self) = @_;
448 456
449 $self->{texture} = 457 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
450 CFClient::Texture->new_from_opengl ( 458 glClearColor 0, 0, 0, 1;
451 $self->{w}, $self->{h}, sub { $self->child->draw } 459 glClear GL_COLOR_BUFFER_BIT;
452 ); 460 $self->child->draw;
461 };
453} 462}
454 463
455sub size_allocate { 464sub size_allocate {
456 my ($self, $x, $y, $w, $h) = @_; 465 my ($self, $x, $y, $w, $h) = @_;
457 466
… …
535 544
536my @tex = 545my @tex =
537 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 546 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
538 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 547 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
539 548
549sub new {
550 my $class = shift;
551
552 # TODO: user_x, user_y, overwrite moveto?
553
554 $class->SUPER::new (
555 bg => [1, 1, 1, 1],
556 border_bg => [1, 1, 1, 1],
557 border => $::FONTSIZE * 0.8,
558 @_
559 )
560}
561
540sub size_request { 562sub size_request {
541 my ($self) = @_; 563 my ($self) = @_;
542 564
565 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
566
543 my ($w, $h) = $self->SUPER::size_request; 567 my ($w, $h) = $self->SUPER::size_request;
544 568
545 $h += $tex[1]->{h}; 569 (
546 $h += $tex[4]->{h}; 570 $w + $self->{border} * 2,
547 $w += $tex[2]->{w}; 571 $h + $self->{border} * 2,
548 $w += $tex[3]->{w}; 572 )
549
550 ($w, $h)
551} 573}
552 574
553sub size_allocate { 575sub size_allocate {
554 my ($self, $x, $y, $w, $h) = @_; 576 my ($self, $x, $y, $w, $h) = @_;
555 577
556 $self->_size_allocate ($x, $y, $w, $h) or return; 578 $self->_size_allocate ($x, $y, $w, $h) or return;
557 579
558 $h -= $tex[1]->{h}; 580 $h -= List::Util::max 0, $self->{border} * 2;
559 $h -= $tex[4]->{h}; 581 $w -= List::Util::max 0, $self->{border} * 2;
560 $w -= $tex[2]->{w};
561 $w -= $tex[3]->{w};
562 582
563 $h = $h < 0 ? 0 : $h; 583 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
564 $w = $w < 0 ? 0 : $w; 584}
565 585
566 my $child = $self->child; 586sub button_down {
587 my ($self, $ev, $x, $y) = @_;
567 588
568 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); 589 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
590 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
591
592 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
593 my ($bw, $bh) = ($self->{w}, $self->{h});
594
595 $self->{motion} = sub {
596 my ($ev, $x, $y) = @_;
597
598 ($x, $y) = ($ev->motion_x, $ev->motion_y);
599
600 $self->{user_w} = $bw + $x - $ox;
601 $self->{user_h} = $bh + $y - $oy;
602 $self->update;
603 };
604
605 } elsif ($x >= 0 && $x < $self->{w}
606 && $y >= 0 && $y < $self->{border}) {
607
608 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
609 my ($bx, $by) = ($self->{x}, $self->{y});
610
611 $self->{motion} = sub {
612 my ($ev, $x, $y) = @_;
613
614 ($x, $y) = ($ev->motion_x, $ev->motion_y);
615
616 $self->move ($bx + $x - $ox, $by + $y - $oy);
617 $self->update;
618 };
619 }
620}
621
622sub button_up {
623 my ($self, $ev, $x, $y) = @_;
624
625 delete $self->{motion};
626}
627
628sub mouse_motion {
629 my ($self, $ev, $x, $y) = @_;
630
631 $self->{motion}->($ev, $x, $y) if $self->{motion};
569} 632}
570 633
571sub _draw { 634sub _draw {
572 my ($self) = @_; 635 my ($self) = @_;
573 636
574 my ($w, $h) = ($self->{w}, $self->{h}); 637 my ($w, $h ) = ($self->{w}, $self->{h});
575 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 638 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
576 639
577 glEnable GL_BLEND; 640 glEnable GL_BLEND;
578 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
579 glEnable GL_TEXTURE_2D; 642 glEnable GL_TEXTURE_2D;
580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
581 644
582 my $top = $tex[1]; 645 glColor @{ $self->{border_bg} };
583 $top->draw_quad (0, 0, $w, $top->{h}); 646 $tex[1]->draw_quad (0, 0, $w, $self->{border});
584 647 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
585 my $left = $tex[3]; 648 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
586 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 649 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
587
588 my $right = $tex[2];
589 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
590
591 my $bottom = $tex[4];
592 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
593 650
594 my $bg = $tex[0]; 651 my $bg = $tex[0];
595 652
596 glBindTexture GL_TEXTURE_2D, $bg->{name}; 653 # TODO: repeat texture not scale
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
598 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
599 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
600
601 my $rep_x = $cw / $bg->{w}; 654 my $rep_x = $cw / $bg->{w};
602 my $rep_y = $ch / $bg->{h}; 655 my $rep_y = $ch / $bg->{h};
603 656
657 glColor @{ $self->{bg} };
658
659 $bg->{s} = $rep_x;
660 $bg->{t} = $rep_y;
661 $bg->{wrap_mode} = 1;
604 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 662 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
605 663
606 glDisable GL_TEXTURE_2D; 664 glDisable GL_TEXTURE_2D;
607 glDisable GL_BLEND; 665 glDisable GL_BLEND;
608 666
609 $self->child->draw; 667 $self->child->draw;
610
611} 668}
612 669
613############################################################################# 670#############################################################################
614 671
615package CFClient::UI::Table; 672package CFClient::UI::Table;
… …
617our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
618 675
619use List::Util qw(max sum); 676use List::Util qw(max sum);
620 677
621use SDL::OpenGL; 678use SDL::OpenGL;
679
680sub new {
681 my $class = shift;
682
683 $class->SUPER::new (
684 col_expand => [],
685 @_
686 )
687}
622 688
623sub add { 689sub add {
624 my ($self, $x, $y, $chld) = @_; 690 my ($self, $x, $y, $chld) = @_;
625 691
626 $self->{children}[$y][$x] = $chld; 692 $self->{children}[$y][$x] = $chld;
… …
656 my ($self) = @_; 722 my ($self) = @_;
657 723
658 my ($ws, $hs) = $self->get_wh; 724 my ($ws, $hs) = $self->get_wh;
659 725
660 ( 726 (
661 (List::Util::sum @$ws), 727 (sum @$ws),
662 (List::Util::sum @$hs), 728 (sum @$hs),
663 ) 729 )
664} 730}
665 731
666sub size_allocate { 732sub size_allocate {
667 my ($self, $x, $y, $w, $h) = @_; 733 my ($self, $x, $y, $w, $h) = @_;
668 734
669 $self->_size_allocate ($x, $y, $w, $h) or return; 735 $self->_size_allocate ($x, $y, $w, $h) or return;
670 736
671 my ($ws, $hs) = $self->get_wh; 737 my ($ws, $hs) = $self->get_wh;
672 738
673 my $req_w = List::Util::sum @$ws; 739 my $req_w = sum @$ws;
674 my $req_h = List::Util::sum @$hs; 740 my $req_h = sum @$hs;
741
742 # TODO: nicer code && do row_expand
743 my @col_expand = @{$self->{col_expand}};
744 @col_expand = (1) x @$ws unless @col_expand;
745 my $col_expand = (sum @col_expand) || 1;
675 746
676 # linearly scale sizes 747 # linearly scale sizes
677 $_ *= $req_w / $w for @$ws; 748 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
678 $_ *= $req_h / $h for @$hs; 749 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
750
751 CFClient::UI::harmonize $ws;
752 CFClient::UI::harmonize $hs;
679 753
680 my $y; 754 my $y;
681 755
682 for my $r (0 .. $#{$self->{children}}) { 756 for my $r (0 .. $#{$self->{children}}) {
683 my $row = $self->{children}[$r] 757 my $row = $self->{children}[$r]
… …
685 759
686 my $x = 0; 760 my $x = 0;
687 my $row_h = $hs->[$r]; 761 my $row_h = $hs->[$r];
688 762
689 for my $c (0 .. $#$row) { 763 for my $c (0 .. $#$row) {
690 my $widget = $row->[$c]
691 or next;
692
693 my $col_w = $ws->[$c]; 764 my $col_w = $ws->[$c];
694 765
766 if (my $widget = $row->[$c]) {
695 $widget->size_allocate ($x, $y, $col_w, $row_h); 767 $widget->size_allocate ($x, $y, $col_w, $row_h);
768 }
696 769
697 $x += $col_w; 770 $x += $col_w;
698 } 771 }
699 772
700 $y += $row_h; 773 $y += $row_h;
… …
746} 819}
747 820
748sub size_allocate { 821sub size_allocate {
749 my ($self, $x, $y, $w, $h) = @_; 822 my ($self, $x, $y, $w, $h) = @_;
750 823
751 $self->_size_allocate ($x, $y, $w, $h) or return; 824 $self->_size_allocate ($x, $y, $w, $h);
752
753 return unless $self->{w};
754 825
755 ($h, $w) = ($w, $h); 826 ($h, $w) = ($w, $h);
756 827
757 my $children = $self->{children}; 828 my $children = $self->{children};
758 829
… …
760 831
761 my $req_h = List::Util::sum @h; 832 my $req_h = List::Util::sum @h;
762 833
763 if ($req_h > $h) { 834 if ($req_h > $h) {
764 # ah well, not enough space 835 # ah well, not enough space
765 $_ = $h[$_] * $h / $req_h for @h; 836 $_ *= $h / $req_h for @h;
766 } else { 837 } else {
767 my @exp = grep $_->{expand}, @$children; 838 my $exp = List::Util::sum map $_->{expand}, @$children;
768 @exp = @$children unless @exp; 839 $exp ||= 1;
769 840
770 my %exp = map +($_ => 1), @exp;
771
772 for (0 .. $#$children) { 841 for (0 .. $#$children) {
773 my $child = $children->[$_]; 842 my $child = $children->[$_];
774 843
775 my $alloc_h = $h[$_]; 844 my $alloc_h = $h[$_];
776 $alloc_h += ($h - $req_h) / @exp if $exp{$child}; 845 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
777 $h[$_] = $alloc_h; 846 $h[$_] = $alloc_h;
778 } 847 }
779 } 848 }
849
850 CFClient::UI::harmonize \@h;
780 851
781 my $y = 0; 852 my $y = 0;
782 for (0 .. $#$children) { 853 for (0 .. $#$children) {
783 my $child = $children->[$_]; 854 my $child = $children->[$_];
784 my $h = $h[$_]; 855 my $h = $h[$_];
… …
808} 879}
809 880
810sub size_allocate { 881sub size_allocate {
811 my ($self, $x, $y, $w, $h) = @_; 882 my ($self, $x, $y, $w, $h) = @_;
812 883
813 $self->_size_allocate ($x, $y, $w, $h) or return; 884 $self->_size_allocate ($x, $y, $w, $h);
814
815 return unless $self->{h};
816 885
817 my $children = $self->{children}; 886 my $children = $self->{children};
818 887
819 my @h = map +($_->size_request)[1], @$children; 888 my @h = map +($_->size_request)[1], @$children;
820 889
821 my $req_h = List::Util::sum @h; 890 my $req_h = List::Util::sum @h;
822 891
823 if ($req_h > $h) { 892 if ($req_h > $h) {
824 # ah well, not enough space 893 # ah well, not enough space
825 $_ = $h[$_] * $h / $req_h for @h; 894 $_ *= $h / $req_h for @h;
826 } else { 895 } else {
827 my @exp = grep $_->{expand}, @$children; 896 my $exp = List::Util::sum map $_->{expand}, @$children;
828 @exp = @$children unless @exp; 897 $exp ||= 1;
829 898
830 my %exp = map +($_ => 1), @exp;
831
832 for (0 .. $#$children) { 899 for (0 .. $#$children) {
833 my $child = $children->[$_]; 900 my $child = $children->[$_];
834 901
835 my $alloc_h = $h[$_]; 902 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
836 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
837 $h[$_] = $alloc_h;
838 } 903 }
839 } 904 }
905
906 CFClient::UI::harmonize \@h;
840 907
841 my $y = 0; 908 my $y = 0;
842 for (0 .. $#$children) { 909 for (0 .. $#$children) {
843 my $child = $children->[$_]; 910 my $child = $children->[$_];
844 my $h = $h[$_]; 911 my $h = $h[$_];
… …
858 925
859sub new { 926sub new {
860 my ($class, %arg) = @_; 927 my ($class, %arg) = @_;
861 928
862 my $self = $class->SUPER::new ( 929 my $self = $class->SUPER::new (
863 fg => [1, 1, 1], 930 fg => [1, 1, 1],
864 height => $::FONTSIZE, 931 fontsize => $::FONTSIZE,
865 text => "", 932 text => "",
866 align => -1, 933 align => -1,
867 padding => 2, 934 padding => 2,
868 layout => new CFClient::Layout, 935 layout => new CFClient::Layout,
869 %arg 936 %arg
870 ); 937 );
871 938
872 $self->set_text ($self->{text}); 939 $self->set_text ($self->{text});
873 940
… …
889 956
890 $self->{text} = $text; 957 $self->{text} = $text;
891 $self->{layout}->set_markup ($text); 958 $self->{layout}->set_markup ($text);
892 959
893 delete $self->{texture}; 960 delete $self->{texture};
961# $self->{w} = $self->{h} = -1;
894 $self->update; 962 $self->update;
895} 963}
896 964
897sub get_text { 965sub get_text {
898 my ($self, $text) = @_; 966 my ($self, $text) = @_;
… …
902 970
903sub size_request { 971sub size_request {
904 my ($self) = @_; 972 my ($self) = @_;
905 973
906 $self->{layout}->set_width; 974 $self->{layout}->set_width;
907 $self->{layout}->set_height ($self->{height}); 975 $self->{layout}->set_height ($self->{fontsize});
908 my ($w, $h) = $self->{layout}->size; 976 my ($w, $h) = $self->{layout}->size;
909 977
910 ( 978 (
911 $w + $self->{padding} * 2, 979 $w + $self->{padding} * 2,
912 $h + $self->{padding} * 2, 980 $h + $self->{padding} * 2,
… …
931sub _draw { 999sub _draw {
932 my ($self) = @_; 1000 my ($self) = @_;
933 1001
934 my $tex = $self->{texture} ||= do { 1002 my $tex = $self->{texture} ||= do {
935 $self->{layout}->set_width ($self->{w}); 1003 $self->{layout}->set_width ($self->{w});
1004 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
936 new_from_layout CFClient::Texture $self->{layout} 1005 new_from_layout CFClient::Texture $self->{layout}
937 }; 1006 };
938 1007
939 glEnable GL_BLEND; 1008 glEnable GL_BLEND;
940 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1009 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
941 glEnable GL_TEXTURE_2D; 1010 glEnable GL_TEXTURE_2D;
942 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1011 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
943 1012
944 glColor @{$self->{fg}}; 1013 glColor @{$self->{fg}};
945 1014
946 my $x = 1015 my $x =
947 $self->{align} < 0 ? $self->{padding} 1016 $self->{align} < 0 ? $self->{padding}
948 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1017 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949 : ($self->{w} - $tex->{w}) * 0.5; 1018 : ($self->{w} - $tex->{w}) * 0.5;
950 1019
951 $tex->draw_quad ($x, 0); 1020 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
952 1021
953 glDisable GL_TEXTURE_2D; 1022 glDisable GL_TEXTURE_2D;
954 glDisable GL_BLEND; 1023 glDisable GL_BLEND;
955} 1024}
956 1025
… …
967 my $class = shift; 1036 my $class = shift;
968 1037
969 $class->SUPER::new ( 1038 $class->SUPER::new (
970 fg => [1, 1, 1], 1039 fg => [1, 1, 1],
971 bg => [0, 0, 0, 0.2], 1040 bg => [0, 0, 0, 0.2],
972 active_bg => [1, 1, 1], 1041 active_bg => [1, 1, 1, 0.5],
973 active_fg => [0, 0, 0], 1042 active_fg => [0, 0, 0],
1043 can_hover => 1,
1044 can_focus => 1,
974 @_ 1045 @_
975 ) 1046 )
976} 1047}
977 1048
978sub _set_text { 1049sub _set_text {
979 my ($self, $text) = @_; 1050 my ($self, $text) = @_;
980 1051
1052 my $old_text = $self->{text};
1053
981 $self->{last_activity} = $::NOW; 1054 $self->{last_activity} = $::NOW;
982 1055
983 $self->{text} = $text; 1056 $self->{text} = $text;
984 $self->{layout}->set_width ($self->{w}); 1057 $self->{layout}->set_width ($self->{w});
1058 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
985 1059
986 $text =~ s/./*/g if $self->{hidden}; 1060 $text =~ s/./*/g if $self->{hidden};
987 1061
988 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1062 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
989 1063
990 $text = substr $text, 0, $self->{cursor}; 1064 $text = substr $text, 0, $self->{cursor};
991 utf8::encode $text; 1065 utf8::encode $text;
992 1066
993 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1068
1069 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1070 if $old_text ne $self->{text};
994} 1071}
995 1072
996sub size_request { 1073sub size_request {
997 my ($self) = @_; 1074 my ($self) = @_;
998 1075
… …
1037 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1114 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1038 } elsif ($sym == SDLK_HOME) { 1115 } elsif ($sym == SDLK_HOME) {
1039 $self->{cursor} = 0; 1116 $self->{cursor} = 0;
1040 } elsif ($sym == SDLK_END) { 1117 } elsif ($sym == SDLK_END) {
1041 $self->{cursor} = length $text; 1118 $self->{cursor} = length $text;
1119 } elsif ($sym == SDLK_ESCAPE) {
1120 $self->emit ('escape');
1042 } elsif ($uni) { 1121 } elsif ($uni) {
1043 substr $text, $self->{cursor}++, 0, chr $uni; 1122 substr $text, $self->{cursor}++, 0, chr $uni;
1044 } 1123 }
1045 1124
1046 $self->_set_text ($text); 1125 $self->_set_text ($text);
… …
1108 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1187 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1109 glEnd; 1188 glEnd;
1110 } 1189 }
1111} 1190}
1112 1191
1113#############################################################################
1114
1115package CFClient::UI::Slider; 1192package CFClient::UI::LineEntry;
1116 1193
1117use strict; 1194our @ISA = CFClient::UI::Entry::;
1118 1195
1196use SDL;
1119use SDL::OpenGL; 1197use SDL::OpenGL;
1120 1198
1199sub key_down {
1200 my ($self, $ev) = @_;
1201
1202 my $sym = $ev->key_sym;
1203
1204 if ($sym == SDLK_RETURN) {
1205 $self->emit (activate => $self->get_text);
1206 $self->update;
1207
1208 } else {
1209 $self->SUPER::key_down ($ev);
1210 }
1211
1212}
1213
1214#############################################################################
1215
1216package CFClient::UI::Button;
1217
1121our @ISA = CFClient::UI::DrawBG::; 1218our @ISA = CFClient::UI::Label::;
1219
1220use SDL;
1221use SDL::OpenGL;
1222
1223my @tex =
1224 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1225 qw(b1_button_active.png);
1122 1226
1123sub new { 1227sub new {
1124 my $class = shift; 1228 my $class = shift;
1125 1229
1230 $class->SUPER::new (
1231 padding => 4,
1232 fg => [1, 1, 1],
1233 bg => [1, 1, 1, 0.2],
1234 active_fg => [1, 1, 0],
1235 can_hover => 1,
1236 @_
1237 )
1238}
1239
1240sub button_up {
1241 my ($self, $ev, $x, $y) = @_;
1242
1243 if ($x >= 0 && $x < $self->{w}
1244 && $y >= 0 && $y < $self->{h}) {
1245 $self->emit ("activate");
1246 }
1247}
1248
1249sub _draw {
1250 my ($self) = @_;
1251
1252 local $self->{fg} = $self->{fg};
1253 my $tex = $tex[0];
1254
1255 glEnable GL_BLEND;
1256 glEnable GL_TEXTURE_2D;
1257 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1258
1259 if ($GRAB == $self) {
1260 $self->{fg} = $self->{active_fg};
1261 }
1262
1263 glBindTexture GL_TEXTURE_2D, $tex->{name};
1264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1265
1266 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1267
1268 glDisable GL_TEXTURE_2D;
1269 glDisable GL_BLEND;
1270
1271 $self->SUPER::_draw;
1272}
1273
1274#############################################################################
1275
1276package CFClient::UI::CheckBox;
1277
1278our @ISA = CFClient::UI::DrawBG::;
1279
1280my @tex =
1281 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1282 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1283
1284use SDL;
1285use SDL::OpenGL;
1286
1287sub new {
1288 my $class = shift;
1289
1290 $class->SUPER::new (
1291 padding => 2,
1292 fg => [1, 1, 1],
1293 active_fg => [1, 1, 0],
1294 state => 0,
1295 can_hover => 1,
1296 @_
1297 )
1298}
1299
1300sub size_request {
1301 my ($self) = @_;
1302
1303 ($self->{padding} * 2 + 6) x 2
1304}
1305
1306sub size_allocate {
1307 my ($self, $x, $y, $w, $h) = @_;
1308
1309 $self->_size_allocate ($x, $y, $w, $h);
1310}
1311
1312sub button_down {
1313 my ($self, $ev, $x, $y) = @_;
1314
1315 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1316 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1317 $self->{state} = !$self->{state};
1318 $self->emit (changed => $self->{state});
1319 }
1320}
1321
1322sub _draw {
1323 my ($self) = @_;
1324
1325 $self->SUPER::_draw;
1326
1327 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1328
1329 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1330
1331 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1332
1333 glEnable GL_BLEND;
1334 glEnable GL_TEXTURE_2D;
1335 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1336
1337 my $tex = $self->{state} ? $tex[1] : $tex[0];
1338
1339 $tex->draw_quad (0, 0, $s, $s);
1340
1341 glDisable GL_TEXTURE_2D;
1342 glDisable GL_BLEND;
1343}
1344
1345#############################################################################
1346
1347package CFClient::UI::Slider;
1348
1349use strict;
1350
1351use SDL::OpenGL;
1352
1353our @ISA = CFClient::UI::DrawBG::;
1354
1355my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1357 qw(s1_slider.png s1_slider_bg.png);
1358
1359sub new {
1360 my $class = shift;
1361
1126 # range [value, low, high, page] 1362 # range [value, low, high, page]
1127 1363
1364 # TODO: 0-width page
1365 # TODO: req_w/h are wrong with vertical
1366 # TODO: calculations are off
1128 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1129 fg => [1, 1, 1], 1368 fg => [1, 1, 1],
1130 active_fg => [0, 0, 0], 1369 active_fg => [0, 0, 0],
1131 range => [0, 0, 100, 10], 1370 range => [0, 0, 100, 10],
1132 req_w => 40, 1371 req_w => 40,
1133 req_h => 10, 1372 req_h => 13,
1134 vertical => 0, 1373 vertical => 0,
1374 can_hover => 1,
1375 inner_pad => 5,
1135 @_ 1376 @_
1136 ); 1377 );
1137 1378
1138 $self 1379 $self
1139} 1380}
… …
1160 if ($GRAB == $self) { 1401 if ($GRAB == $self) {
1161 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1402 my ($value, $lo, $hi, $page) = @{$self->{range}};
1162 1403
1163 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1404 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1164 1405
1406 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1407 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1408
1409 $x -= $inner_pad_px; # substract the padding
1165 $x = $x * ($hi - $lo) / $w + $lo; 1410 $x = $x * ($hi - $lo) / $inner_w + $lo;
1166 $x = $lo if $x < $lo; 1411 $x = $lo if $x < $lo;
1167 $x = $hi - $page if $x > $hi - $page; 1412 $x = $hi - $page if $x > $hi - $page;
1168 $self->{range}[0] = $x; 1413 $self->{range}[0] = $x;
1169 1414
1170 $self->emit (changed => $x); 1415 $self->emit (changed => $x);
1171 $self->update; 1416 $self->update;
1172 } 1417 }
1418}
1419
1420# the inner_* stuff is for generating a padding for the slider handle,
1421# so that the handle doesn't leave the texture. This calculation isn't 100%
1422# correct propably, but it does the job for now
1423sub _calc_inner_pad_px {
1424 my ($self, $w) = @_;
1425 ($w / 100) * $self->{inner_pad} # % to pixels
1173} 1426}
1174 1427
1175sub _draw { 1428sub _draw {
1176 my ($self) = @_; 1429 my ($self) = @_;
1177 1430
… …
1191 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1444 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1192 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1445 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1193 1446
1194 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1447 my ($value, $lo, $hi, $page) = @{$self->{range}};
1195 1448
1449 $hi = $value + 1 if $lo == $hi;
1450
1451 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1452 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1453
1196 $page = int $page * $w / ($hi - $lo); 1454 $page = int $page * $inner_w / ($hi - $lo);
1197 $value = int +($value - $lo) * $w / ($hi - $lo); 1455 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1198 1456
1199 $w -= $page; 1457 $w -= $page;
1200 $page &= ~1; 1458 $page &= ~1;
1201 glTranslate $page * 0.5, 0, 0; 1459 glTranslate $page * 0.5, 0, 0;
1460 $page ||= 2;
1202 1461
1203 glColor @$fg;
1204 glBegin GL_LINES;
1205 glVertex 0, 0; glVertex 0, $h;
1206 glVertex $w - 1, 0; glVertex $w - 1, $h;
1207 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1208 glEnd;
1209
1210 my $knob_a = $value - $page * 0.5; 1462 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1211 my $knob_b = $value + $page * 0.5; 1463 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1212 1464
1213 glBegin GL_QUADS; 1465 glEnable GL_BLEND;
1214 glColor @$fg; 1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215 glVertex $knob_a, 0; 1467 glEnable GL_TEXTURE_2D;
1216 glVertex $knob_a, $h; 1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1217 glVertex $knob_b, $h;
1218 glVertex $knob_b, 0;
1219 1469
1220 if ($knob_a < $knob_b - 2) { 1470 # draw background
1221 glColor @$bg; 1471 $tex[1]->draw_quad (0, 0, $w, $h);
1222 glVertex $knob_a + 1, 1; 1472
1223 glVertex $knob_a + 1, $h - 1; 1473 # draw handle
1224 glVertex $knob_b - 1, $h - 1; 1474 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1225 glVertex $knob_b - 1, 1; 1475
1476 glDisable GL_BLEND;
1477 glDisable GL_TEXTURE_2D;
1478}
1479
1480#############################################################################
1481
1482package CFClient::UI::TextView;
1483
1484our @ISA = CFClient::UI::HBox::;
1485
1486use SDL::OpenGL;
1487
1488sub new {
1489 my $class = shift;
1490
1491 my $self = $class->SUPER::new (
1492 req_w => $::WIDTH / 6,
1493 req_h => $::HEIGHT / 6,
1494 fontsize => $::FONTSIZE,
1495 @_,
1496
1497 layout => (new CFClient::Layout),
1498 par => [],
1499 height => 0,
1500 children => [
1501 (new CFClient::UI::Empty expand => 1),
1502 (new CFClient::UI::Slider vertical => 1),
1503 ],
1504 );
1505
1506 $self->{children}[1]->connect (changed => sub {
1507 $self->update;
1508 });
1509
1510 $self
1511}
1512
1513sub set_fontsize {
1514 my ($self, $fontsize) = @_;
1515
1516 $self->{fontsize} = $fontsize;
1517 $self->reflow;
1518}
1519
1520sub text_height {
1521 my ($self, $text) = @_;
1522
1523 my $layout = $self->{layout};
1524
1525 $layout->set_height ($self->{fontsize});
1526 $layout->set_width ($self->{w});
1527 $layout->set_text ($text);
1226 } 1528
1227 glEnd; 1529 ($layout->size)[1]
1530}
1531
1532sub reflow {
1533 my ($self) = @_;
1534
1535 $self->{need_reflow}++;
1536 $self->update;
1537}
1538
1539sub size_request {
1540 my ($self) = @_;
1541
1542 ($self->{req_w}, $self->{req_h})
1543}
1544
1545sub size_allocate {
1546 my ($self, $x, $y, $w, $h) = @_;
1547
1548 $self->SUPER::size_allocate ($x, $y, $w, $h);
1549
1550 $self->{layout}->set_height ($self->{fontsize});
1551 $self->{layout}->set_width ($self->{w});
1552
1553 $self->reflow;
1554}
1555
1556sub add_paragraph {
1557 my ($self, $color, $text) = @_;
1558
1559 #TODO: intelligently "reformat" paragraph
1560
1561 my $height = $self->text_height ($text);
1562
1563 $self->{height} += $height;
1564
1565 push @{$self->{par}}, [$height, $color, $text];
1566
1567 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1568 $self->{children}[1]->update;
1569}
1570
1571sub update {
1572 my ($self) = @_;
1573
1574 $self->SUPER::update;
1575
1576 return unless $self->{h} > 0;
1577
1578 delete $self->{texture};
1579
1580 $TOPLEVEL->on_refresh ($self, sub {
1581 if (delete $self->{need_reflow}) {
1582 my $height = 0;
1583
1584 $height += $_->[0] = $self->text_height ($_->[2])
1585 for @{$self->{par}};
1586
1587 $self->{height} = $height;
1588
1589 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1590
1591 delete $self->{texture};
1592 }
1593
1594 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1595 glClearColor 0, 0, 0, 1;
1596 glClear GL_COLOR_BUFFER_BIT;
1597
1598 glEnable GL_BLEND;
1599 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1600 glEnable GL_TEXTURE_2D;
1601 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1602
1603 my $top = int $self->{children}[1]{range}[0];
1604
1605 my $y0 = $top;
1606 my $y1 = $top + $self->{h};
1607
1608 my $y = 0;
1609
1610 my $layout = $self->{layout};
1611
1612 for my $par (@{$self->{par}}) {
1613 my $h = $par->[0];
1614
1615 if ($y0 < $y + $h && $y < $y1) {
1616 $layout->set_text ($par->[2]);
1617
1618 glColor @{ $par->[1] };
1619 my ($W, $H) = $layout->size;
1620 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1621 }
1622
1623 $y += $h;
1624 }
1625
1626 glDisable GL_TEXTURE_2D;
1627 glDisable GL_BLEND;
1628 };
1629 });
1630}
1631
1632sub _draw {
1633 my ($self) = @_;
1634
1635 if ($self->{texture}) {
1636 glEnable GL_TEXTURE_2D;
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1638 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1639 glDisable GL_TEXTURE_2D;
1640 }
1641
1642 $self->{children}[1]->draw;
1643
1228} 1644}
1229 1645
1230############################################################################# 1646#############################################################################
1231 1647
1232package CFClient::UI::MapWidget; 1648package CFClient::UI::MapWidget;
… …
1242 1658
1243sub new { 1659sub new {
1244 my $class = shift; 1660 my $class = shift;
1245 1661
1246 $class->SUPER::new ( 1662 $class->SUPER::new (
1247 z => -1, 1663 z => -1,
1664 can_focus => 1,
1248 list => (glGenLists 1), 1665 list => (glGenLists 1),
1249 @_ 1666 @_
1250 ) 1667 )
1251} 1668}
1252 1669
1253sub key_down { 1670sub key_down {
… …
1255} 1672}
1256 1673
1257sub key_up { 1674sub key_up {
1258} 1675}
1259 1676
1677sub button_down {
1678 my ($self, $ev, $x, $y) = @_;
1679
1680 $self->focus_in;
1681
1682 if ($ev->button == 2) {
1683 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1684 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1685
1686 $self->{motion} = sub {
1687 my ($ev, $x, $y) = @_;
1688
1689 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1690
1691 $::CFG->{map_shift_x} = $bw + $x - $ox;
1692 $::CFG->{map_shift_y} = $bh + $y - $oy;
1693
1694 $self->update;
1695 };
1696 }
1697}
1698
1699sub button_up {
1700 my ($self, $ev, $x, $y) = @_;
1701
1702 delete $self->{motion};
1703}
1704
1705sub mouse_motion {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 $self->{motion}->($ev, $x, $y) if $self->{motion};
1709}
1710
1260sub size_request { 1711sub size_request {
1261 ( 1712 (
1262 1 + int $::WIDTH / 32, 1713 1 + 32 * int $::WIDTH / 32,
1263 1 + int $::HEIGHT / 32, 1714 1 + 32 * int $::HEIGHT / 32,
1264 ) 1715 )
1265} 1716}
1266 1717
1267sub update { 1718sub update {
1268 my ($self) = @_; 1719 my ($self) = @_;
1269 1720
1270 $self->{need_update} = 1; 1721 $self->{need_update} = 1;
1271 $self->SUPER::update; 1722 $self->SUPER::update;
1272} 1723}
1273 1724
1274sub _draw { 1725sub draw {
1275 my ($self) = @_; 1726 my ($self) = @_;
1276 1727
1277 if (delete $self->{need_update}) { 1728 if (delete $self->{need_update}) {
1278 glNewList $self->{list}, GL_COMPILE; 1729 glNewList $self->{list}, GL_COMPILE;
1279 1730
1280 my $mx = $::CONN->{mapx}; 1731 if ($::MAP) {
1281 my $my = $::CONN->{mapy};
1282
1283 my $map = $::CONN->{map};
1284
1285 my ($xofs, $yofs);
1286
1287 my $sw = 1 + int $::WIDTH / 32; 1732 my $sw = int $::WIDTH / 32;
1288 my $sh = 1 + int $::HEIGHT / 32; 1733 my $sh = int $::HEIGHT / 32;
1289 1734
1290 if ($::CONN->{mapw} > $sw) { 1735 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1291 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1736 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1292 } else { 1737
1293 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1738 glTranslate $sx0 - 32, $sy0 - 32, 0;
1739
1740 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1741
1742 if ($::CFG->{fow_enable}) {
1743 if ($::CFG->{fow_smooth}) { # smooth fog of war
1744 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1745 glConvolutionFilter2D
1746 GL_CONVOLUTION_2D,
1747 GL_ALPHA,
1748 3, 3,
1749 GL_ALPHA, GL_FLOAT,
1750 pack "f*",
1751 0.1, 0.1, 0.1,
1752 0.1, 0.2, 0.1,
1753 0.1, 0.1, 0.1,
1754 ;
1755 glEnable GL_CONVOLUTION_2D;
1756 }
1757
1758 my $tex = new CFClient::Texture
1759 w => $w,
1760 h => $h,
1761 data => $data,
1762 internalformat => GL_ALPHA,
1763 format => GL_ALPHA;
1764
1765 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1766
1767 glEnable GL_BLEND;
1768 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1769 glEnable GL_TEXTURE_2D;
1770 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1771
1772 glColor +($::CFG->{fow_intensity}) x 3, 1;
1773 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1774
1775 glDisable GL_TEXTURE_2D;
1776 glDisable GL_BLEND;
1777 }
1778
1779 # HACK BEGIN
1780 {
1781 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1782 my ($w, $h) = (250, 250);
1783
1784 glEnable GL_BLEND;
1785 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1786 glEnable GL_TEXTURE_2D;
1787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1788
1789 CFClient::Texture->new (
1790 w => $w,
1791 h => $h,
1792 data => $::MAP->mapmap ($w, $h),
1793 type => GL_UNSIGNED_INT_8_8_8_8_REV
1794 )->draw_quad (100, 100);
1795
1796 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND;
1798 }
1799 # HACK END
1294 } 1800 }
1295 1801
1296 if ($::CONN->{maph} > $sh) {
1297 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1298 } else {
1299 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1300 }
1301
1302 glEnable GL_TEXTURE_2D;
1303 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1306
1307 my $sw4 = ($sw + 3) & ~3;
1308 my $darkness = "\x00" x ($sw4 * $sh);
1309
1310 for my $x (0 .. $sw - 1) {
1311 my $row = $map->[$x + $xofs];
1312 for my $y (0 .. $sh - 1) {
1313
1314 my $cell = $row->[$y + $yofs]
1315 or next;
1316
1317 my $dark = $cell->[0];
1318 if ($dark < 0) {
1319 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1320 } else {
1321 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1322 }
1323
1324 for my $num (grep $_, @$cell[1,2,3]) {
1325 my $tex = $::CONN->{face}[$num]{texture} || next;
1326
1327 my ($w, $h) = @$tex{qw(w h)};
1328
1329 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1330 }
1331 }
1332 }
1333
1334# if (1) { # higher quality darkness
1335# $lighting =~ s/(.)/$1$1$1/gs;
1336# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1337#
1338# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1339#
1340# $lighting = $pb->get_pixels;
1341# $lighting =~ s/(.)../$1/gs;
1342# }
1343
1344 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1345
1346 $darkness = new CFClient::Texture
1347 w => $sw4,
1348 h => $sh,
1349 data => $darkness,
1350 internalformat => GL_ALPHA,
1351 format => GL_ALPHA;
1352
1353 glColor 0.45, 0.45, 0.45, 1;
1354 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1355
1356 glDisable GL_TEXTURE_2D;
1357 glDisable GL_BLEND;
1358
1359 glEndList; 1802 glEndList;
1360 } 1803 }
1361 1804
1805 glPushMatrix;
1362 glCallList $self->{list}; 1806 glCallList $self->{list};
1807 glPopMatrix;
1808
1809 if ($FOCUS != $self) {
1810 glColor 64/255, 64/255, 64/255;
1811 glLogicOp GL_AND;
1812 glEnable GL_COLOR_LOGIC_OP;
1813 glBegin GL_QUADS;
1814 glVertex 0, 0;
1815 glVertex 0, $::HEIGHT;
1816 glVertex $::WIDTH, $::HEIGHT;
1817 glVertex $::WIDTH, 0;
1818 glEnd;
1819 glDisable GL_COLOR_LOGIC_OP;
1820 }
1363} 1821}
1364 1822
1365my %DIR = ( 1823my %DIR = (
1366 SDLK_KP8, [1, "north"], 1824 SDLK_KP8, [1, "north"],
1367 SDLK_KP9, [2, "northeast"], 1825 SDLK_KP9, [2, "northeast"],
… …
1383 1841
1384 my $mod = $ev->key_mod; 1842 my $mod = $ev->key_mod;
1385 my $sym = $ev->key_sym; 1843 my $sym = $ev->key_sym;
1386 1844
1387 if ($sym == SDLK_KP5) { 1845 if ($sym == SDLK_KP5) {
1388 $::CONN->send ("command stay fire"); 1846 $::CONN->user_send ("command stay fire");
1847 } elsif ($sym == SDLK_a) {
1848 $::CONN->user_send ("command apply");
1849 } elsif ($sym == SDLK_QUOTE) {
1850 $self->emit ('activate_console');
1851 } elsif ($sym == SDLK_SLASH) {
1852 $self->emit ('activate_console' => '/');
1389 } elsif (exists $DIR{$sym}) { 1853 } elsif (exists $DIR{$sym}) {
1390 if ($mod & KMOD_SHIFT) { 1854 if ($mod & KMOD_SHIFT) {
1391 $self->{shft}++; 1855 $self->{shft}++;
1392 $::CONN->send ("command fire $DIR{$sym}[0]"); 1856 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1393 } elsif ($mod & KMOD_CTRL) { 1857 } elsif ($mod & KMOD_CTRL) {
1394 $self->{ctrl}++; 1858 $self->{ctrl}++;
1395 $::CONN->send ("command run $DIR{$sym}[0]"); 1859 $::CONN->user_send ("command run $DIR{$sym}[0]");
1396 } else { 1860 } else {
1397 $::CONN->send ("command $DIR{$sym}[1]"); 1861 $::CONN->user_send ("command $DIR{$sym}[1]");
1398 } 1862 }
1399 } 1863 }
1400} 1864}
1401 1865
1402sub key_up { 1866sub key_up {
… …
1404 1868
1405 my $mod = $ev->key_mod; 1869 my $mod = $ev->key_mod;
1406 my $sym = $ev->key_sym; 1870 my $sym = $ev->key_sym;
1407 1871
1408 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1872 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1409 $::CONN->send ("command fire_stop"); 1873 $::CONN->user_send ("command fire_stop");
1410 } 1874 }
1411 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1875 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1412 $::CONN->send ("command run_stop"); 1876 $::CONN->user_send ("command run_stop");
1413 } 1877 }
1414} 1878}
1415 1879
1416############################################################################# 1880#############################################################################
1417 1881
… …
1455 glPopMatrix; 1919 glPopMatrix;
1456} 1920}
1457 1921
1458############################################################################# 1922#############################################################################
1459 1923
1924package CFClient::UI::Flopper;
1925
1926our @ISA = CFClient::UI::Button::;
1927
1928sub new {
1929 my $class = shift;
1930
1931 my $self = $class->SUPER::new (
1932 state => 0,
1933 connect_activate => \&toggle_flopper,
1934 @_
1935 );
1936
1937 if ($self->{state}) {
1938 $self->{state} = 0;
1939 $self->toggle_flopper;
1940 }
1941
1942 $self
1943}
1944
1945sub toggle_flopper {
1946 my ($self) = @_;
1947
1948 # TODO: use animation
1949 if ($self->{state} = !$self->{state}) {
1950 $CFClient::UI::TOPLEVEL->add ($self->{other});
1951 $self->{other}->move (
1952 ($::WIDTH - $self->{other}{w}) * 0.5,
1953 ($::HEIGHT - $self->{other}{h}) * 0.5,
1954 );
1955 } else {
1956 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1957 }
1958}
1959
1960#############################################################################
1961
1460package CFClient::UI::Toplevel; 1962package CFClient::UI::Toplevel;
1461 1963
1462our @ISA = CFClient::UI::Container::; 1964our @ISA = CFClient::UI::Container::;
1965
1966use SDL::OpenGL;
1463 1967
1464sub size_request { 1968sub size_request {
1465 ($::WIDTH, $::HEIGHT) 1969 ($::WIDTH, $::HEIGHT)
1466} 1970}
1467 1971
… …
1493 $self->SUPER::add ($widget); 1997 $self->SUPER::add ($widget);
1494 1998
1495 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 1999 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1496} 2000}
1497 2001
2002sub on_refresh {
2003 my ($self, $id, $cb) = @_;
2004
2005 $self->{refresh_hook}{$id} = $cb;
2006}
2007
1498sub draw { 2008sub draw {
1499 my ($self) = @_; 2009 my ($self) = @_;
1500 2010
2011 while (my $rcb = delete $self->{refresh_hook}) {
2012 $_->() for values %$rcb;
2013 }
2014
2015 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2016 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2017 glClear GL_COLOR_BUFFER_BIT;
2018
2019 glMatrixMode GL_PROJECTION;
2020 glLoadIdentity;
2021 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2022 glMatrixMode GL_MODELVIEW;
2023 glLoadIdentity;
2024
1501 $self->_draw; 2025 $self->_draw;
1502} 2026}
1503 2027
1504############################################################################# 2028#############################################################################
1505 2029

Diff Legend

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