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.81 by root, Wed Apr 12 00:40:45 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->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_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($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;
… …
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->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->coord2local ($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;
… …
133 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
134 147
135 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
136} 149}
137 150
138# translate global koordinates to local coordinate system 151# return top left coordinates
139sub translate { 152sub _topleft {
140 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
141 154
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
143} 172}
144 173
145sub focus_in { 174sub focus_in {
146 my ($self) = @_; 175 my ($self) = @_;
147 176
148 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
149 179
150 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
151 $focus->update if $focus; 181 $focus->update if $focus;
152 $FOCUS->update; 182 $FOCUS->update;
153} 183}
… …
186 glPushMatrix; 216 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 217 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 218 $self->_draw;
189 glPopMatrix; 219 glPopMatrix;
190 220
191 if ($self == $HOVER) { 221 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 222 my ($x, $y) = @$self{qw(x y)};
193 223
194 glColor 0, 0, 1, 0.2; 224 glColor 0, 0, 1, 0.2;
195 glEnable GL_BLEND; 225 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
219 249
220 () 250 ()
221} 251}
222 252
223sub set_parent { 253sub set_parent {
224 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
225 255
226 $self->{parent} = $par;
227 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
228}
229
230sub get_parent {
231 $_[0]->{parent}
232} 257}
233 258
234sub update { 259sub update {
235 my ($self) = @_; 260 my ($self) = @_;
236 261
… …
325 350
326 $self 351 $self
327} 352}
328 353
329sub add { 354sub add {
330 my ($self, $chld) = @_; 355 my ($self, $child) = @_;
331 356
332 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
333 360
334 $self->{children} = [ 361 $self->{children} = [
335 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
336 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
337 ]; 364 ];
338 365
339 $self->{w} = $self->{h} = -1; 366 $self->{w} = $self->{h} = -1;
340 $self->update; 367 $self->update;
341} 368}
… …
438} 465}
439 466
440sub render_chld { 467sub render_chld {
441 my ($self) = @_; 468 my ($self) = @_;
442 469
443 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
445 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
446 ); 473 $self->child->draw;
474 };
447} 475}
448 476
449sub size_allocate { 477sub size_allocate {
450 my ($self, $x, $y, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
451 479
… …
529 557
530my @tex = 558my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 560 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533 561
562sub new {
563 my $class = shift;
564
565 # TODO: user_x, user_y, overwrite moveto?
566
567 $class->SUPER::new (
568 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1],
570 border => $::FONTSIZE * 0.8,
571 @_
572 )
573}
574
534sub size_request { 575sub size_request {
535 my ($self) = @_; 576 my ($self) = @_;
536 577
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538 579
539 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
540 581
541 $h += $tex[1]->{h}; 582 (
542 $h += $tex[4]->{h}; 583 $w + $self->{border} * 2,
543 $w += $tex[2]->{w}; 584 $h + $self->{border} * 2,
544 $w += $tex[3]->{w}; 585 )
545
546 ($w, $h)
547} 586}
548 587
549sub size_allocate { 588sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
551 590
552 $self->_size_allocate ($x, $y, $w, $h) or return; 591 $self->_size_allocate ($x, $y, $w, $h) or return;
553 592
554 $h -= $tex[1]{h}; 593 $h -= List::Util::max 0, $self->{border} * 2;
555 $h -= $tex[4]{h}; 594 $w -= List::Util::max 0, $self->{border} * 2;
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558 595
559 $h = $h < 0 ? 0 : $h; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
560 $w = $w < 0 ? 0 : $w;
561
562 my $child = $self->child;
563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565} 597}
566 598
567sub button_down { 599sub button_down {
568 my ($self, $ev, $x, $y) = @_; 600 my ($self, $ev, $x, $y) = @_;
569 601
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572 604
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 605 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h}); 606 my ($bw, $bh) = ($self->{w}, $self->{h});
575 607
576 $self->{motion} = sub { 608 $self->{motion} = sub {
… …
582 $self->{user_h} = $bh + $y - $oy; 614 $self->{user_h} = $bh + $y - $oy;
583 $self->update; 615 $self->update;
584 }; 616 };
585 617
586 } elsif ($x >= 0 && $x < $self->{w} 618 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) { 619 && $y >= 0 && $y < $self->{border}) {
588 620
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 621 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y}); 622 my ($bx, $by) = ($self->{x}, $self->{y});
591 623
592 $self->{motion} = sub { 624 $self->{motion} = sub {
… …
613} 645}
614 646
615sub _draw { 647sub _draw {
616 my ($self) = @_; 648 my ($self) = @_;
617 649
618 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 652
621 glEnable GL_BLEND; 653 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625 657
626 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
627 $top->draw_quad (0, 0, $w, $top->{h}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
628 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
631
632 my $right = $tex[2];
633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635 my $bottom = $tex[4];
636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637 663
638 my $bg = $tex[0]; 664 my $bg = $tex[0];
639 665
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 666 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
643 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
644
645 my $rep_x = $cw / $bg->{w}; 667 my $rep_x = $cw / $bg->{w};
646 my $rep_y = $ch / $bg->{h}; 668 my $rep_y = $ch / $bg->{h};
647 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
648 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
649 676
650 glDisable GL_TEXTURE_2D; 677 glDisable GL_TEXTURE_2D;
651 glDisable GL_BLEND; 678 glDisable GL_BLEND;
652 679
653 $self->child->draw; 680 $self->child->draw;
654
655} 681}
656 682
657############################################################################# 683#############################################################################
658 684
659package CFClient::UI::Table; 685package CFClient::UI::Table;
… …
672 @_ 698 @_
673 ) 699 )
674} 700}
675 701
676sub add { 702sub add {
677 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
678 704
705 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 707
682 $self->{w} = $self->{h} = -1; 708 $self->{w} = $self->{h} = -1;
709 $self->update;
710}
711
712# TODO: move to container class maybe? send childs a signal on removal?
713sub clear {
714 my ($self) = @_;
715
716 delete $self->{children};
683 $self->update; 717 $self->update;
684} 718}
685 719
686sub get_wh { 720sub get_wh {
687 my ($self) = @_; 721 my ($self) = @_;
… …
733 767
734 # linearly scale sizes 768 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 771
772 CFClient::UI::harmonize $ws;
773 CFClient::UI::harmonize $hs;
774
738 my $y; 775 my $y;
739 776
740 for my $r (0 .. $#{$self->{children}}) { 777 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r] 778 my $row = $self->{children}[$r]
742 or next; 779 or next;
743 780
744 my $x = 0; 781 my $x = 0;
745 my $row_h = $hs->[$r]; 782 my $row_h = $hs->[$r];
746 783
747 for my $c (0 .. $#$row) { 784 for my $c (0 .. $#$row) {
748 my $widget = $row->[$c]
749 or next;
750
751 my $col_w = $ws->[$c]; 785 my $col_w = $ws->[$c];
752 786
787 if (my $widget = $row->[$c]) {
753 $widget->size_allocate ($x, $y, $col_w, $row_h); 788 $widget->size_allocate ($x, $y, $col_w, $row_h);
789 }
754 790
755 $x += $col_w; 791 $x += $col_w;
756 } 792 }
757 793
758 $y += $row_h; 794 $y += $row_h;
… …
804} 840}
805 841
806sub size_allocate { 842sub size_allocate {
807 my ($self, $x, $y, $w, $h) = @_; 843 my ($self, $x, $y, $w, $h) = @_;
808 844
809 $self->_size_allocate ($x, $y, $w, $h) or return; 845 $self->_size_allocate ($x, $y, $w, $h);
810
811 return unless $self->{w};
812 846
813 ($h, $w) = ($w, $h); 847 ($h, $w) = ($w, $h);
814 848
815 my $children = $self->{children}; 849 my $children = $self->{children};
816 850
… …
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 866 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 867 $h[$_] = $alloc_h;
834 } 868 }
835 } 869 }
836 870
871 CFClient::UI::harmonize \@h;
872
837 my $y = 0; 873 my $y = 0;
838 for (0 .. $#$children) { 874 for (0 .. $#$children) {
839 my $child = $children->[$_]; 875 my $child = $children->[$_];
840 my $h = $h[$_]; 876 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 877 $child->size_allocate ($y, 0, $h, $w);
… …
864} 900}
865 901
866sub size_allocate { 902sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_; 903 my ($self, $x, $y, $w, $h) = @_;
868 904
869 $self->_size_allocate ($x, $y, $w, $h) or return; 905 $self->_size_allocate ($x, $y, $w, $h);
870
871 return unless $self->{h};
872 906
873 my $children = $self->{children}; 907 my $children = $self->{children};
874 908
875 my @h = map +($_->size_request)[1], @$children; 909 my @h = map +($_->size_request)[1], @$children;
876 910
… …
888 922
889 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
890 } 924 }
891 } 925 }
892 926
927 CFClient::UI::harmonize \@h;
928
893 my $y = 0; 929 my $y = 0;
894 for (0 .. $#$children) { 930 for (0 .. $#$children) {
895 my $child = $children->[$_]; 931 my $child = $children->[$_];
896 my $h = $h[$_]; 932 my $h = $h[$_];
897 $child->size_allocate (0, $y, $w, $h); 933 $child->size_allocate (0, $y, $w, $h);
… …
910 946
911sub new { 947sub new {
912 my ($class, %arg) = @_; 948 my ($class, %arg) = @_;
913 949
914 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
915 fg => [1, 1, 1], 951 fg => [1, 1, 1],
916 height => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
917 text => "", 953 text => "",
918 align => -1, 954 align => -1,
919 padding => 2, 955 padding => 2,
920 layout => new CFClient::Layout, 956 layout => new CFClient::Layout,
921 %arg 957 %arg
922 ); 958 );
923 959
924 $self->set_text ($self->{text}); 960 $self->set_text ($self->{text});
925 961
… …
955 991
956sub size_request { 992sub size_request {
957 my ($self) = @_; 993 my ($self) = @_;
958 994
959 $self->{layout}->set_width; 995 $self->{layout}->set_width;
960 $self->{layout}->set_height ($self->{height}); 996 $self->{layout}->set_height ($self->{fontsize});
961 my ($w, $h) = $self->{layout}->size; 997 my ($w, $h) = $self->{layout}->size;
962 998
963 ( 999 (
964 $w + $self->{padding} * 2, 1000 $w + $self->{padding} * 2,
965 $h + $self->{padding} * 2, 1001 $h + $self->{padding} * 2,
… …
984sub _draw { 1020sub _draw {
985 my ($self) = @_; 1021 my ($self) = @_;
986 1022
987 my $tex = $self->{texture} ||= do { 1023 my $tex = $self->{texture} ||= do {
988 $self->{layout}->set_width ($self->{w}); 1024 $self->{layout}->set_width ($self->{w});
989 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1025 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
990 new_from_layout CFClient::Texture $self->{layout} 1026 new_from_layout CFClient::Texture $self->{layout}
991 }; 1027 };
992 1028
993 glEnable GL_BLEND; 1029 glEnable GL_BLEND;
994 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1030 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
995 glEnable GL_TEXTURE_2D; 1031 glEnable GL_TEXTURE_2D;
996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
997 1033
998 glColor @{$self->{fg}}; 1034 glColor @{$self->{fg}};
999 1035
1000 my $x = 1036 my $x =
1001 $self->{align} < 0 ? $self->{padding} 1037 $self->{align} < 0 ? $self->{padding}
1002 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1038 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1003 : ($self->{w} - $tex->{w}) * 0.5; 1039 : ($self->{w} - $tex->{w}) * 0.5;
1004 1040
1005 $tex->draw_quad ($x, $self->{padding}); 1041 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1006 1042
1007 glDisable GL_TEXTURE_2D; 1043 glDisable GL_TEXTURE_2D;
1008 glDisable GL_BLEND; 1044 glDisable GL_BLEND;
1009} 1045}
1010 1046
… …
1023 $class->SUPER::new ( 1059 $class->SUPER::new (
1024 fg => [1, 1, 1], 1060 fg => [1, 1, 1],
1025 bg => [0, 0, 0, 0.2], 1061 bg => [0, 0, 0, 0.2],
1026 active_bg => [1, 1, 1, 0.5], 1062 active_bg => [1, 1, 1, 0.5],
1027 active_fg => [0, 0, 0], 1063 active_fg => [0, 0, 0],
1064 can_hover => 1,
1065 can_focus => 1,
1028 @_ 1066 @_
1029 ) 1067 )
1030} 1068}
1031 1069
1032sub _set_text { 1070sub _set_text {
1033 my ($self, $text) = @_; 1071 my ($self, $text) = @_;
1034 1072
1073 my $old_text = $self->{text};
1074
1035 $self->{last_activity} = $::NOW; 1075 $self->{last_activity} = $::NOW;
1036 1076
1037 $self->{text} = $text; 1077 $self->{text} = $text;
1038 $self->{layout}->set_width ($self->{w}); 1078 $self->{layout}->set_width ($self->{w});
1079 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039 1080
1040 $text =~ s/./*/g if $self->{hidden}; 1081 $text =~ s/./*/g if $self->{hidden};
1041 1082
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1083 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043 1084
1044 $text = substr $text, 0, $self->{cursor}; 1085 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text; 1086 utf8::encode $text;
1046 1087
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1088 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1089
1090 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1091 if $old_text ne $self->{text};
1048} 1092}
1049 1093
1050sub size_request { 1094sub size_request {
1051 my ($self) = @_; 1095 my ($self) = @_;
1052 1096
… …
1091 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1135 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1092 } elsif ($sym == SDLK_HOME) { 1136 } elsif ($sym == SDLK_HOME) {
1093 $self->{cursor} = 0; 1137 $self->{cursor} = 0;
1094 } elsif ($sym == SDLK_END) { 1138 } elsif ($sym == SDLK_END) {
1095 $self->{cursor} = length $text; 1139 $self->{cursor} = length $text;
1140 } elsif ($sym == SDLK_ESCAPE) {
1141 $self->emit ('escape');
1096 } elsif ($uni) { 1142 } elsif ($uni) {
1097 substr $text, $self->{cursor}++, 0, chr $uni; 1143 substr $text, $self->{cursor}++, 0, chr $uni;
1098 } 1144 }
1099 1145
1100 $self->_set_text ($text); 1146 $self->_set_text ($text);
… …
1162 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1208 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1163 glEnd; 1209 glEnd;
1164 } 1210 }
1165} 1211}
1166 1212
1167#############################################################################
1168
1169package CFClient::UI::Button; 1213package CFClient::UI::LineEntry;
1170 1214
1171our @ISA = CFClient::UI::Label::; 1215our @ISA = CFClient::UI::Entry::;
1172 1216
1173use SDL; 1217use SDL;
1174use SDL::OpenGL; 1218use SDL::OpenGL;
1219
1220sub key_down {
1221 my ($self, $ev) = @_;
1222
1223 my $sym = $ev->key_sym;
1224
1225 if ($sym == SDLK_RETURN) {
1226 $self->emit (activate => $self->get_text);
1227 $self->update;
1228
1229 } else {
1230 $self->SUPER::key_down ($ev);
1231 }
1232
1233}
1234
1235#############################################################################
1236
1237package CFClient::UI::Button;
1238
1239our @ISA = CFClient::UI::Label::;
1240
1241use SDL;
1242use SDL::OpenGL;
1243
1244my @tex =
1245 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1246 qw(b1_button_active.png);
1175 1247
1176sub new { 1248sub new {
1177 my $class = shift; 1249 my $class = shift;
1178 1250
1179 $class->SUPER::new ( 1251 $class->SUPER::new (
1180 padding => 4, 1252 padding => 4,
1181 fg => [1, 1, 1], 1253 fg => [1, 1, 1],
1182 bg => [1, 1, 1, 0.2], 1254 bg => [1, 1, 1, 0.2],
1183 active_bg => [0, 0, 0, 0.5],
1184 active_fg => [1, 1, 0], 1255 active_fg => [1, 1, 0],
1185 border_fg => [1, 1, 0], 1256 can_hover => 1,
1186 @_ 1257 @_
1187 ) 1258 )
1188} 1259}
1189 1260
1190sub button_up { 1261sub button_up {
… …
1198 1269
1199sub _draw { 1270sub _draw {
1200 my ($self) = @_; 1271 my ($self) = @_;
1201 1272
1202 local $self->{fg} = $self->{fg}; 1273 local $self->{fg} = $self->{fg};
1274 my $tex = $tex[0];
1203 1275
1204 glEnable GL_BLEND; 1276 glEnable GL_BLEND;
1277 glEnable GL_TEXTURE_2D;
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1278 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1206 1279
1207 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1208
1209 glBegin GL_LINE_LOOP;
1210 glColor @{$self->{border_fg}};
1211 glVertex 1 , 1;
1212 glVertex 1 , $self->{h} - 2;
1213 glVertex $self->{w} - 2, $self->{h} - 2;
1214 glVertex $self->{w} - 2, 1;
1215 glEnd;
1216
1217 if ($GRAB == $self) { 1280 if ($GRAB == $self) {
1218 glColor @{$self->{active_bg}};
1219 $self->{fg} = $self->{active_fg}; 1281 $self->{fg} = $self->{active_fg};
1220 } else {
1221 glColor @{$self->{bg}};
1222 } 1282 }
1223 1283
1224 glBegin GL_QUADS; 1284 glBindTexture GL_TEXTURE_2D, $tex->{name};
1225 glVertex 2 , 2; 1285 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1226 glVertex 2 , $self->{h} - 2; 1286
1227 glVertex $self->{w} - 2, $self->{h} - 2; 1287 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1228 glVertex $self->{w} - 2, 2; 1288
1229 glEnd; 1289 glDisable GL_TEXTURE_2D;
1230 glDisable GL_BLEND; 1290 glDisable GL_BLEND;
1231 1291
1232 $self->SUPER::_draw; 1292 $self->SUPER::_draw;
1233} 1293}
1234 1294
1235############################################################################# 1295#############################################################################
1236 1296
1237package CFClient::UI::Slider; 1297package CFClient::UI::CheckBox;
1238 1298
1239use strict; 1299our @ISA = CFClient::UI::DrawBG::;
1240 1300
1301my @tex =
1302 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1303 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1304
1305use SDL;
1241use SDL::OpenGL; 1306use SDL::OpenGL;
1242
1243our @ISA = CFClient::UI::DrawBG::;
1244 1307
1245sub new { 1308sub new {
1246 my $class = shift; 1309 my $class = shift;
1247 1310
1311 $class->SUPER::new (
1312 padding => 2,
1313 fg => [1, 1, 1],
1314 active_fg => [1, 1, 0],
1315 state => 0,
1316 can_hover => 1,
1317 @_
1318 )
1319}
1320
1321sub size_request {
1322 my ($self) = @_;
1323
1324 ($self->{padding} * 2 + 6) x 2
1325}
1326
1327sub size_allocate {
1328 my ($self, $x, $y, $w, $h) = @_;
1329
1330 $self->_size_allocate ($x, $y, $w, $h);
1331}
1332
1333sub button_down {
1334 my ($self, $ev, $x, $y) = @_;
1335
1336 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1337 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1338 $self->{state} = !$self->{state};
1339 $self->emit (changed => $self->{state});
1340 }
1341}
1342
1343sub _draw {
1344 my ($self) = @_;
1345
1346 $self->SUPER::_draw;
1347
1348 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1349
1350 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1351
1352 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1353
1354 glEnable GL_BLEND;
1355 glEnable GL_TEXTURE_2D;
1356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1357
1358 my $tex = $self->{state} ? $tex[1] : $tex[0];
1359
1360 $tex->draw_quad (0, 0, $s, $s);
1361
1362 glDisable GL_TEXTURE_2D;
1363 glDisable GL_BLEND;
1364}
1365
1366#############################################################################
1367
1368package CFClient::UI::Slider;
1369
1370use strict;
1371
1372use SDL::OpenGL;
1373
1374our @ISA = CFClient::UI::DrawBG::;
1375
1376my @tex =
1377 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1378 qw(s1_slider.png s1_slider_bg.png);
1379
1380sub new {
1381 my $class = shift;
1382
1248 # range [value, low, high, page] 1383 # range [value, low, high, page]
1249 1384
1385 # TODO: 0-width page
1386 # TODO: req_w/h are wrong with vertical
1387 # TODO: calculations are off
1250 my $self = $class->SUPER::new ( 1388 my $self = $class->SUPER::new (
1251 fg => [1, 1, 1], 1389 fg => [1, 1, 1],
1252 active_fg => [0, 0, 0], 1390 active_fg => [0, 0, 0],
1253 range => [0, 0, 100, 10], 1391 range => [0, 0, 100, 10],
1254 req_w => 40, 1392 req_w => 40,
1255 req_h => 10, 1393 req_h => 13,
1256 vertical => 0, 1394 vertical => 0,
1395 can_hover => 1,
1396 inner_pad => 5,
1257 @_ 1397 @_
1258 ); 1398 );
1259 1399
1260 $self 1400 $self
1261} 1401}
… …
1282 if ($GRAB == $self) { 1422 if ($GRAB == $self) {
1283 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1423 my ($value, $lo, $hi, $page) = @{$self->{range}};
1284 1424
1285 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1425 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1286 1426
1427 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1428 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1429
1430 $x -= $inner_pad_px; # substract the padding
1287 $x = $x * ($hi - $lo) / $w + $lo; 1431 $x = $x * ($hi - $lo) / $inner_w + $lo;
1288 $x = $lo if $x < $lo; 1432 $x = $lo if $x < $lo;
1289 $x = $hi - $page if $x > $hi - $page; 1433 $x = $hi - $page if $x > $hi - $page;
1290 $self->{range}[0] = $x; 1434 $self->{range}[0] = $x;
1291 1435
1292 $self->emit (changed => $x); 1436 $self->emit (changed => $x);
1293 $self->update; 1437 $self->update;
1294 } 1438 }
1439}
1440
1441# the inner_* stuff is for generating a padding for the slider handle,
1442# so that the handle doesn't leave the texture. This calculation isn't 100%
1443# correct propably, but it does the job for now
1444sub _calc_inner_pad_px {
1445 my ($self, $w) = @_;
1446 ($w / 100) * $self->{inner_pad} # % to pixels
1295} 1447}
1296 1448
1297sub _draw { 1449sub _draw {
1298 my ($self) = @_; 1450 my ($self) = @_;
1299 1451
… …
1313 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1465 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1314 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1466 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1315 1467
1316 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1468 my ($value, $lo, $hi, $page) = @{$self->{range}};
1317 1469
1470 $hi = $value + 1 if $lo == $hi;
1471
1472 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1473 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1474
1318 $page = int $page * $w / ($hi - $lo); 1475 $page = int $page * $inner_w / ($hi - $lo);
1319 $value = int +($value - $lo) * $w / ($hi - $lo); 1476 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1320 1477
1321 $w -= $page; 1478 $w -= $page;
1322 $page &= ~1; 1479 $page &= ~1;
1323 glTranslate $page * 0.5, 0, 0; 1480 glTranslate $page * 0.5, 0, 0;
1324 $page ||= 2; 1481 $page ||= 2;
1325 1482
1326 glColor @$fg;
1327 glBegin GL_LINES;
1328 glVertex 0, 0; glVertex 0, $h;
1329 glVertex $w - 1, 0; glVertex $w - 1, $h;
1330 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1331 glEnd;
1332
1333 my $knob_a = $value - $page * 0.5; 1483 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1334 my $knob_b = $value + $page * 0.5; 1484 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1335 1485
1336 glBegin GL_QUADS; 1486 glEnable GL_BLEND;
1337 glColor @$fg; 1487 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1338 glVertex $knob_a, 0; 1488 glEnable GL_TEXTURE_2D;
1339 glVertex $knob_a, $h; 1489 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1340 glVertex $knob_b, $h;
1341 glVertex $knob_b, 0;
1342 1490
1343 if ($knob_a < $knob_b - 2) { 1491 # draw background
1344 glColor @$bg; 1492 $tex[1]->draw_quad (0, 0, $w, $h);
1345 glVertex $knob_a + 1, 1; 1493
1346 glVertex $knob_a + 1, $h - 1; 1494 # draw handle
1347 glVertex $knob_b - 1, $h - 1; 1495 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1348 glVertex $knob_b - 1, 1; 1496
1497 glDisable GL_BLEND;
1498 glDisable GL_TEXTURE_2D;
1499}
1500
1501#############################################################################
1502
1503package CFClient::UI::TextView;
1504
1505our @ISA = CFClient::UI::HBox::;
1506
1507use SDL::OpenGL;
1508
1509sub new {
1510 my $class = shift;
1511
1512 my $self = $class->SUPER::new (
1513 req_w => $::WIDTH / 6,
1514 req_h => $::HEIGHT / 6,
1515 fontsize => $::FONTSIZE,
1516 @_,
1517
1518 layout => (new CFClient::Layout),
1519 par => [],
1520 height => 0,
1521 children => [
1522 (new CFClient::UI::Empty expand => 1),
1523 (new CFClient::UI::Slider vertical => 1),
1524 ],
1525 );
1526
1527 $self->{children}[1]->connect (changed => sub {
1528 $self->update;
1529 });
1530
1531 $self
1532}
1533
1534sub set_fontsize {
1535 my ($self, $fontsize) = @_;
1536
1537 $self->{fontsize} = $fontsize;
1538 $self->reflow;
1539}
1540
1541sub text_height {
1542 my ($self, $text) = @_;
1543
1544 my $layout = $self->{layout};
1545
1546 $layout->set_height ($self->{fontsize});
1547 $layout->set_width ($self->{w});
1548 $layout->set_text ($text);
1349 } 1549
1350 glEnd; 1550 ($layout->size)[1]
1551}
1552
1553sub reflow {
1554 my ($self) = @_;
1555
1556 $self->{need_reflow}++;
1557 $self->update;
1558}
1559
1560sub size_request {
1561 my ($self) = @_;
1562
1563 ($self->{req_w}, $self->{req_h})
1564}
1565
1566sub size_allocate {
1567 my ($self, $x, $y, $w, $h) = @_;
1568
1569 $self->SUPER::size_allocate ($x, $y, $w, $h);
1570
1571 $self->{layout}->set_height ($self->{fontsize});
1572 $self->{layout}->set_width ($self->{w});
1573
1574 $self->reflow;
1575}
1576
1577sub add_paragraph {
1578 my ($self, $color, $text) = @_;
1579
1580 #TODO: intelligently "reformat" paragraph
1581
1582 my $height = $self->text_height ($text);
1583
1584 $self->{height} += $height;
1585
1586 push @{$self->{par}}, [$height, $color, $text];
1587
1588 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1589 $self->{children}[1]->update;
1590}
1591
1592sub update {
1593 my ($self) = @_;
1594
1595 $self->SUPER::update;
1596
1597 return unless $self->{h} > 0;
1598
1599 delete $self->{texture};
1600
1601 $ROOT->on_refresh ($self, sub {
1602 if (delete $self->{need_reflow}) {
1603 my $height = 0;
1604
1605 $height += $_->[0] = $self->text_height ($_->[2])
1606 for @{$self->{par}};
1607
1608 $self->{height} = $height;
1609
1610 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1611
1612 delete $self->{texture};
1613 }
1614
1615 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1616 glClearColor 0, 0, 0, 1;
1617 glClear GL_COLOR_BUFFER_BIT;
1618
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623
1624 my $top = int $self->{children}[1]{range}[0];
1625
1626 my $y0 = $top;
1627 my $y1 = $top + $self->{h};
1628
1629 my $y = 0;
1630
1631 my $layout = $self->{layout};
1632
1633 for my $par (@{$self->{par}}) {
1634 my $h = $par->[0];
1635
1636 if ($y0 < $y + $h && $y < $y1) {
1637 $layout->set_text ($par->[2]);
1638
1639 glColor @{ $par->[1] };
1640 my ($W, $H) = $layout->size;
1641 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1642 }
1643
1644 $y += $h;
1645 }
1646
1647 glDisable GL_TEXTURE_2D;
1648 glDisable GL_BLEND;
1649 };
1650 });
1651}
1652
1653sub _draw {
1654 my ($self) = @_;
1655
1656 if ($self->{texture}) {
1657 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1660 glDisable GL_TEXTURE_2D;
1661 }
1662
1663 $self->{children}[1]->draw;
1664
1351} 1665}
1352 1666
1353############################################################################# 1667#############################################################################
1354 1668
1355package CFClient::UI::MapWidget; 1669package CFClient::UI::MapWidget;
… …
1365 1679
1366sub new { 1680sub new {
1367 my $class = shift; 1681 my $class = shift;
1368 1682
1369 $class->SUPER::new ( 1683 $class->SUPER::new (
1370 z => -1, 1684 z => -1,
1685 can_focus => 1,
1371 list => (glGenLists 1), 1686 list => (glGenLists 1),
1372 @_ 1687 @_
1373 ) 1688 )
1374} 1689}
1375 1690
1376sub key_down { 1691sub key_down {
1377 print "MAPKEYDOWN\n"; 1692 print "MAPKEYDOWN\n";
1378} 1693}
1379 1694
1380sub key_up { 1695sub key_up {
1696}
1697
1698sub button_down {
1699 my ($self, $ev, $x, $y) = @_;
1700
1701 $self->focus_in;
1702
1703 if ($ev->button == 2) {
1704 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1705 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1706
1707 $self->{motion} = sub {
1708 my ($ev, $x, $y) = @_;
1709
1710 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1711
1712 $::CFG->{map_shift_x} = $bw + $x - $ox;
1713 $::CFG->{map_shift_y} = $bh + $y - $oy;
1714
1715 $self->update;
1716 };
1717 }
1718}
1719
1720sub button_up {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 delete $self->{motion};
1724}
1725
1726sub mouse_motion {
1727 my ($self, $ev, $x, $y) = @_;
1728
1729 $self->{motion}->($ev, $x, $y) if $self->{motion};
1381} 1730}
1382 1731
1383sub size_request { 1732sub size_request {
1384 ( 1733 (
1385 1 + 32 * int $::WIDTH / 32, 1734 1 + 32 * int $::WIDTH / 32,
… …
1398 my ($self) = @_; 1747 my ($self) = @_;
1399 1748
1400 if (delete $self->{need_update}) { 1749 if (delete $self->{need_update}) {
1401 glNewList $self->{list}, GL_COMPILE; 1750 glNewList $self->{list}, GL_COMPILE;
1402 1751
1403 my $mx = $::CONN->{mapx}; 1752 if ($::MAP) {
1404 my $my = $::CONN->{mapy};
1405
1406 my $map = $::CONN->{map};
1407
1408 my ($xofs, $yofs);
1409
1410 my $sw = 1 + int $::WIDTH / 32; 1753 my $sw = int $::WIDTH / 32;
1411 my $sh = 1 + int $::HEIGHT / 32; 1754 my $sh = int $::HEIGHT / 32;
1412 1755
1413 if ($::CONN->{mapw} > $sw) { 1756 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1414 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1757 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1415 } else { 1758
1416 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1759 glTranslate $sx0 - 32, $sy0 - 32, 0;
1760
1761 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1762
1763 if ($::CFG->{fow_enable}) {
1764 if ($::CFG->{fow_smooth}) { # smooth fog of war
1765 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1766 glConvolutionFilter2D
1767 GL_CONVOLUTION_2D,
1768 GL_ALPHA,
1769 3, 3,
1770 GL_ALPHA, GL_FLOAT,
1771 pack "f*",
1772 0.1, 0.1, 0.1,
1773 0.1, 0.2, 0.1,
1774 0.1, 0.1, 0.1,
1775 ;
1776 glEnable GL_CONVOLUTION_2D;
1777 }
1778
1779 my $tex = new CFClient::Texture
1780 w => $w,
1781 h => $h,
1782 data => $data,
1783 internalformat => GL_ALPHA,
1784 format => GL_ALPHA;
1785
1786 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1787
1788 glEnable GL_BLEND;
1789 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1790 glEnable GL_TEXTURE_2D;
1791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1792
1793 glColor +($::CFG->{fow_intensity}) x 3, 1;
1794 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1795
1796 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND;
1798 }
1799
1800 # HACK BEGIN
1801 {
1802 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1803 my ($w, $h) = (250, 250);
1804
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809
1810 CFClient::Texture->new (
1811 w => $w,
1812 h => $h,
1813 data => $::MAP->mapmap ($w, $h),
1814 type => GL_UNSIGNED_INT_8_8_8_8_REV
1815 )->draw_quad (100, 100);
1816
1817 glDisable GL_TEXTURE_2D;
1818 glDisable GL_BLEND;
1819 }
1820 # HACK END
1417 } 1821 }
1418 1822
1419 if ($::CONN->{maph} > $sh) {
1420 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1421 } else {
1422 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1423 }
1424
1425 glEnable GL_TEXTURE_2D;
1426 glEnable GL_BLEND;
1427 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1428 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1429
1430 my $sw4 = ($sw + 3) & ~3;
1431 my $darkness = "\x00" x ($sw4 * $sh);
1432
1433 for my $x (0 .. $sw - 1) {
1434 my $row = $map->[$x + $xofs];
1435 for my $y (0 .. $sh - 1) {
1436
1437 my $cell = $row->[$y + $yofs]
1438 or next;
1439
1440 my $dark = $cell->[0];
1441 if ($dark < 0) {
1442 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1443 } else {
1444 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1445 }
1446
1447 for my $num (grep $_, @$cell[1,2,3]) {
1448 my $tex = $::CONN->{face}[$num]{texture} || next;
1449
1450 my ($w, $h) = @$tex{qw(w h)};
1451
1452 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1453 }
1454 }
1455 }
1456
1457# if (1) { # higher quality darkness
1458# $lighting =~ s/(.)/$1$1$1/gs;
1459# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1460#
1461# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1462#
1463# $lighting = $pb->get_pixels;
1464# $lighting =~ s/(.)../$1/gs;
1465# }
1466
1467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1468
1469 $darkness = new CFClient::Texture
1470 w => $sw4,
1471 h => $sh,
1472 data => $darkness,
1473 internalformat => GL_ALPHA,
1474 format => GL_ALPHA;
1475
1476 glColor 0.45, 0.45, 0.45, 1;
1477 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1478
1479 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481
1482 glEndList; 1823 glEndList;
1483 } 1824 }
1484 1825
1826 glPushMatrix;
1485 glCallList $self->{list}; 1827 glCallList $self->{list};
1828 glPopMatrix;
1829
1830 if ($FOCUS != $self) {
1831 glColor 64/255, 64/255, 64/255;
1832 glLogicOp GL_AND;
1833 glEnable GL_COLOR_LOGIC_OP;
1834 glBegin GL_QUADS;
1835 glVertex 0, 0;
1836 glVertex 0, $::HEIGHT;
1837 glVertex $::WIDTH, $::HEIGHT;
1838 glVertex $::WIDTH, 0;
1839 glEnd;
1840 glDisable GL_COLOR_LOGIC_OP;
1841 }
1486} 1842}
1487 1843
1488my %DIR = ( 1844my %DIR = (
1489 SDLK_KP8, [1, "north"], 1845 SDLK_KP8, [1, "north"],
1490 SDLK_KP9, [2, "northeast"], 1846 SDLK_KP9, [2, "northeast"],
… …
1506 1862
1507 my $mod = $ev->key_mod; 1863 my $mod = $ev->key_mod;
1508 my $sym = $ev->key_sym; 1864 my $sym = $ev->key_sym;
1509 1865
1510 if ($sym == SDLK_KP5) { 1866 if ($sym == SDLK_KP5) {
1511 $::CONN->send ("command stay fire"); 1867 $::CONN->user_send ("command stay fire");
1868 } elsif ($sym == SDLK_a) {
1869 $::CONN->user_send ("command apply");
1870 } elsif ($sym == SDLK_QUOTE) {
1871 $self->emit ('activate_console');
1872 } elsif ($sym == SDLK_SLASH) {
1873 $self->emit ('activate_console' => '/');
1512 } elsif (exists $DIR{$sym}) { 1874 } elsif (exists $DIR{$sym}) {
1513 if ($mod & KMOD_SHIFT) { 1875 if ($mod & KMOD_SHIFT) {
1514 $self->{shft}++; 1876 $self->{shft}++;
1515 $::CONN->send ("command fire $DIR{$sym}[0]"); 1877 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1516 } elsif ($mod & KMOD_CTRL) { 1878 } elsif ($mod & KMOD_CTRL) {
1517 $self->{ctrl}++; 1879 $self->{ctrl}++;
1518 $::CONN->send ("command run $DIR{$sym}[0]"); 1880 $::CONN->user_send ("command run $DIR{$sym}[0]");
1519 } else { 1881 } else {
1520 $::CONN->send ("command $DIR{$sym}[1]"); 1882 $::CONN->user_send ("command $DIR{$sym}[1]");
1521 } 1883 }
1522 } 1884 }
1523} 1885}
1524 1886
1525sub key_up { 1887sub key_up {
… …
1527 1889
1528 my $mod = $ev->key_mod; 1890 my $mod = $ev->key_mod;
1529 my $sym = $ev->key_sym; 1891 my $sym = $ev->key_sym;
1530 1892
1531 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1893 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1532 $::CONN->send ("command fire_stop"); 1894 $::CONN->user_send ("command fire_stop");
1533 } 1895 }
1534 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1896 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1535 $::CONN->send ("command run_stop"); 1897 $::CONN->user_send ("command run_stop");
1536 } 1898 }
1537} 1899}
1538 1900
1539############################################################################# 1901#############################################################################
1540 1902
… …
1578 glPopMatrix; 1940 glPopMatrix;
1579} 1941}
1580 1942
1581############################################################################# 1943#############################################################################
1582 1944
1583package CFClient::UI::Toplevel; 1945package CFClient::UI::Flopper;
1946
1947our @ISA = CFClient::UI::Button::;
1948
1949sub new {
1950 my $class = shift;
1951
1952 my $self = $class->SUPER::new (
1953 state => 0,
1954 connect_activate => \&toggle_flopper,
1955 @_
1956 );
1957
1958 if ($self->{state}) {
1959 $self->{state} = 0;
1960 $self->toggle_flopper;
1961 }
1962
1963 $self
1964}
1965
1966sub toggle_flopper {
1967 my ($self) = @_;
1968
1969 # TODO: use animation
1970 if ($self->{state} = !$self->{state}) {
1971 $CFClient::UI::ROOT->add ($self->{other});
1972 $self->{other}->move ($self->coord2global (0, $self->{h}));
1973 $self->emit ("open");
1974 } else {
1975 $CFClient::UI::ROOT->remove ($self->{other});
1976 $self->emit ("close");
1977 }
1978
1979 $self->emit (changed => $self->{state});
1980}
1981
1982#############################################################################
1983
1984package CFClient::UI::Root;
1584 1985
1585our @ISA = CFClient::UI::Container::; 1986our @ISA = CFClient::UI::Container::;
1987
1988use SDL::OpenGL;
1586 1989
1587sub size_request { 1990sub size_request {
1588 ($::WIDTH, $::HEIGHT) 1991 ($::WIDTH, $::HEIGHT)
1589} 1992}
1590 1993
… …
1595 1998
1596 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1999 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1597 for @{$self->{children}}; 2000 for @{$self->{children}};
1598} 2001}
1599 2002
1600sub translate { 2003sub _topleft {
1601 my ($self, $x, $y) = @_; 2004 my ($self, $x, $y) = @_;
1602 2005
1603 ($x, $y) 2006 ($x, $y)
1604} 2007}
1605 2008
… …
1616 $self->SUPER::add ($widget); 2019 $self->SUPER::add ($widget);
1617 2020
1618 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2021 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1619} 2022}
1620 2023
2024sub on_refresh {
2025 my ($self, $id, $cb) = @_;
2026
2027 $self->{refresh_hook}{$id} = $cb;
2028}
2029
1621sub draw { 2030sub draw {
1622 my ($self) = @_; 2031 my ($self) = @_;
1623 2032
2033 while (my $rcb = delete $self->{refresh_hook}) {
2034 $_->() for values %$rcb;
2035 }
2036
2037 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2038 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2039 glClear GL_COLOR_BUFFER_BIT;
2040
2041 glMatrixMode GL_PROJECTION;
2042 glLoadIdentity;
2043 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2044 glMatrixMode GL_MODELVIEW;
2045 glLoadIdentity;
2046
1624 $self->_draw; 2047 $self->_draw;
1625} 2048}
1626 2049
1627############################################################################# 2050#############################################################################
1628 2051
1629package CFClient::UI; 2052package CFClient::UI;
1630 2053
1631$TOPLEVEL = new CFClient::UI::Toplevel; 2054$ROOT = new CFClient::UI::Root;
1632 2055
16331 20561
1634 2057

Diff Legend

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