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.80 by root, Wed Apr 12 00:36:13 2006 UTC vs.
Revision 1.118 by root, Sat Apr 15 23:25:00 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;
… …
99 $self 112 $self
100} 113}
101 114
102sub move { 115sub move {
103 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
104 $self->{x} = $x; 117 $self->{x} = int $x;
105 $self->{y} = $y; 118 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
107} 120}
108 121
109sub needs_redraw { 122sub needs_redraw {
110 0 123 0
… …
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 => int $::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,
955 valign => -1,
919 padding => 2, 956 padding => 2,
920 layout => new CFClient::Layout, 957 layout => new CFClient::Layout,
921 %arg 958 %arg
922 ); 959 );
923 960
924 $self->set_text ($self->{text}); 961 $self->set_text ($self->{text});
925 962
… …
941 978
942 $self->{text} = $text; 979 $self->{text} = $text;
943 $self->{layout}->set_markup ($text); 980 $self->{layout}->set_markup ($text);
944 981
945 delete $self->{texture}; 982 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
946 $self->update; 984 $self->update;
947} 985}
948 986
949sub get_text { 987sub get_text {
950 my ($self, $text) = @_; 988 my ($self, $text) = @_;
… …
954 992
955sub size_request { 993sub size_request {
956 my ($self) = @_; 994 my ($self) = @_;
957 995
958 $self->{layout}->set_width; 996 $self->{layout}->set_width;
959 $self->{layout}->set_height ($self->{height}); 997 $self->{layout}->set_height ($self->{fontsize});
960 my ($w, $h) = $self->{layout}->size; 998 my ($w, $h) = $self->{layout}->size;
961 999
962 ( 1000 (
963 $w + $self->{padding} * 2, 1001 $w + $self->{padding} * 2,
964 $h + $self->{padding} * 2, 1002 $h + $self->{padding} * 2,
… …
983sub _draw { 1021sub _draw {
984 my ($self) = @_; 1022 my ($self) = @_;
985 1023
986 my $tex = $self->{texture} ||= do { 1024 my $tex = $self->{texture} ||= do {
987 $self->{layout}->set_width ($self->{w}); 1025 $self->{layout}->set_width ($self->{w});
988 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 1026 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
989 new_from_layout CFClient::Texture $self->{layout} 1027 new_from_layout CFClient::Texture $self->{layout}
990 }; 1028 };
991 1029
992 glEnable GL_BLEND; 1030 glEnable GL_BLEND;
993 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
994 glEnable GL_TEXTURE_2D; 1032 glEnable GL_TEXTURE_2D;
995 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
996 1034
997 glColor @{$self->{fg}}; 1035 glColor @{$self->{fg}};
998 1036
999 my $x = 1037 my $x =
1000 $self->{align} < 0 ? $self->{padding} 1038 $self->{align} < 0 ? $self->{padding}
1001 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1002 : ($self->{w} - $tex->{w}) * 0.5; 1040 : ($self->{w} - $tex->{w}) * 0.5;
1003 1041
1004 $tex->draw_quad ($x, $self->{padding}); 1042 my $y =
1043 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5;
1046
1047 $tex->draw_quad (int $x, int $y);
1005 1048
1006 glDisable GL_TEXTURE_2D; 1049 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND; 1050 glDisable GL_BLEND;
1008} 1051}
1009 1052
… …
1022 $class->SUPER::new ( 1065 $class->SUPER::new (
1023 fg => [1, 1, 1], 1066 fg => [1, 1, 1],
1024 bg => [0, 0, 0, 0.2], 1067 bg => [0, 0, 0, 0.2],
1025 active_bg => [1, 1, 1, 0.5], 1068 active_bg => [1, 1, 1, 0.5],
1026 active_fg => [0, 0, 0], 1069 active_fg => [0, 0, 0],
1070 can_hover => 1,
1071 can_focus => 1,
1072 valign => 0,
1027 @_ 1073 @_
1028 ) 1074 )
1029} 1075}
1030 1076
1031sub _set_text { 1077sub _set_text {
1032 my ($self, $text) = @_; 1078 my ($self, $text) = @_;
1033 1079
1080 my $old_text = $self->{text};
1081
1034 $self->{last_activity} = $::NOW; 1082 $self->{last_activity} = $::NOW;
1035 1083
1036 $self->{text} = $text; 1084 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w}); 1085 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1038 1087
1039 $text =~ s/./*/g if $self->{hidden}; 1088 $text =~ s/./*/g if $self->{hidden};
1040 1089
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1090 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042 1091
1043 $text = substr $text, 0, $self->{cursor}; 1092 $text = substr $text, 0, $self->{cursor};
1044 utf8::encode $text; 1093 utf8::encode $text;
1045 1094
1046 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1095 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1096
1097 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1098 if $old_text ne $self->{text};
1047} 1099}
1048 1100
1049sub size_request { 1101sub size_request {
1050 my ($self) = @_; 1102 my ($self) = @_;
1051 1103
… …
1090 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1142 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1091 } elsif ($sym == SDLK_HOME) { 1143 } elsif ($sym == SDLK_HOME) {
1092 $self->{cursor} = 0; 1144 $self->{cursor} = 0;
1093 } elsif ($sym == SDLK_END) { 1145 } elsif ($sym == SDLK_END) {
1094 $self->{cursor} = length $text; 1146 $self->{cursor} = length $text;
1147 } elsif ($sym == SDLK_ESCAPE) {
1148 $self->emit ('escape');
1095 } elsif ($uni) { 1149 } elsif ($uni) {
1096 substr $text, $self->{cursor}++, 0, chr $uni; 1150 substr $text, $self->{cursor}++, 0, chr $uni;
1097 } 1151 }
1098 1152
1099 $self->_set_text ($text); 1153 $self->_set_text ($text);
… …
1161 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1215 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162 glEnd; 1216 glEnd;
1163 } 1217 }
1164} 1218}
1165 1219
1166#############################################################################
1167
1168package CFClient::UI::Button; 1220package CFClient::UI::LineEntry;
1169 1221
1170our @ISA = CFClient::UI::Label::; 1222our @ISA = CFClient::UI::Entry::;
1171 1223
1172use SDL; 1224use SDL;
1173use SDL::OpenGL; 1225use SDL::OpenGL;
1226
1227sub key_down {
1228 my ($self, $ev) = @_;
1229
1230 my $sym = $ev->key_sym;
1231
1232 if ($sym == SDLK_RETURN) {
1233 $self->emit (activate => $self->get_text);
1234 $self->update;
1235
1236 } else {
1237 $self->SUPER::key_down ($ev);
1238 }
1239
1240}
1241
1242#############################################################################
1243
1244package CFClient::UI::Button;
1245
1246our @ISA = CFClient::UI::Label::;
1247
1248use SDL;
1249use SDL::OpenGL;
1250
1251my @tex =
1252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1253 qw(b1_button_active.png);
1174 1254
1175sub new { 1255sub new {
1176 my $class = shift; 1256 my $class = shift;
1177 1257
1178 $class->SUPER::new ( 1258 $class->SUPER::new (
1179 padding => 4, 1259 padding => 4,
1180 fg => [1, 1, 1], 1260 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1261 bg => [1, 1, 1, 0.2],
1182 active_bg => [0, 0, 0, 0.5],
1183 active_fg => [1, 1, 0], 1262 active_fg => [1, 1, 0],
1184 border_fg => [1, 1, 0], 1263 can_hover => 1,
1185 @_ 1264 @_
1186 ) 1265 )
1187} 1266}
1188 1267
1189sub button_up { 1268sub button_up {
… …
1197 1276
1198sub _draw { 1277sub _draw {
1199 my ($self) = @_; 1278 my ($self) = @_;
1200 1279
1201 local $self->{fg} = $self->{fg}; 1280 local $self->{fg} = $self->{fg};
1281 my $tex = $tex[0];
1202 1282
1203 glEnable GL_BLEND; 1283 glEnable GL_BLEND;
1284 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1285 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 1286
1206 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1207
1208 glBegin GL_LINE_LOOP;
1209 glColor @{$self->{border_fg}};
1210 glVertex 1 , 1;
1211 glVertex 1 , $self->{h} - 2;
1212 glVertex $self->{w} - 2, $self->{h} - 2;
1213 glVertex $self->{w} - 2, 1;
1214 glEnd;
1215
1216 if ($GRAB == $self) { 1287 if ($GRAB == $self) {
1217 glColor @{$self->{active_bg}};
1218 $self->{fg} = $self->{active_fg}; 1288 $self->{fg} = $self->{active_fg};
1219 } else {
1220 glColor @{$self->{bg}};
1221 } 1289 }
1222 1290
1223 glBegin GL_QUADS; 1291 glBindTexture GL_TEXTURE_2D, $tex->{name};
1224 glVertex 2 , 2; 1292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1225 glVertex 2 , $self->{h} - 2; 1293
1226 glVertex $self->{w} - 2, $self->{h} - 2; 1294 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1227 glVertex $self->{w} - 2, 2; 1295
1228 glEnd; 1296 glDisable GL_TEXTURE_2D;
1229 glDisable GL_BLEND; 1297 glDisable GL_BLEND;
1230 1298
1231 $self->SUPER::_draw; 1299 $self->SUPER::_draw;
1232} 1300}
1233 1301
1234############################################################################# 1302#############################################################################
1235 1303
1236package CFClient::UI::Slider; 1304package CFClient::UI::CheckBox;
1237 1305
1238use strict; 1306our @ISA = CFClient::UI::DrawBG::;
1239 1307
1308my @tex =
1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1310 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1311
1312use SDL;
1240use SDL::OpenGL; 1313use SDL::OpenGL;
1241
1242our @ISA = CFClient::UI::DrawBG::;
1243 1314
1244sub new { 1315sub new {
1245 my $class = shift; 1316 my $class = shift;
1246 1317
1318 $class->SUPER::new (
1319 padding => 2,
1320 fg => [1, 1, 1],
1321 active_fg => [1, 1, 0],
1322 state => 0,
1323 can_hover => 1,
1324 @_
1325 )
1326}
1327
1328sub size_request {
1329 my ($self) = @_;
1330
1331 ($self->{padding} * 2 + 6) x 2
1332}
1333
1334sub size_allocate {
1335 my ($self, $x, $y, $w, $h) = @_;
1336
1337 $self->_size_allocate ($x, $y, $w, $h);
1338}
1339
1340sub button_down {
1341 my ($self, $ev, $x, $y) = @_;
1342
1343 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1344 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1345 $self->{state} = !$self->{state};
1346 $self->emit (changed => $self->{state});
1347 }
1348}
1349
1350sub _draw {
1351 my ($self) = @_;
1352
1353 $self->SUPER::_draw;
1354
1355 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1356
1357 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1358
1359 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1360
1361 glEnable GL_BLEND;
1362 glEnable GL_TEXTURE_2D;
1363 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1364
1365 my $tex = $self->{state} ? $tex[1] : $tex[0];
1366
1367 $tex->draw_quad (0, 0, $s, $s);
1368
1369 glDisable GL_TEXTURE_2D;
1370 glDisable GL_BLEND;
1371}
1372
1373#############################################################################
1374
1375package CFClient::UI::Slider;
1376
1377use strict;
1378
1379use SDL::OpenGL;
1380
1381our @ISA = CFClient::UI::DrawBG::;
1382
1383my @tex =
1384 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1385 qw(s1_slider.png s1_slider_bg.png);
1386
1387sub new {
1388 my $class = shift;
1389
1247 # range [value, low, high, page] 1390 # range [value, low, high, page]
1248 1391
1392 # TODO: 0-width page
1393 # TODO: req_w/h are wrong with vertical
1394 # TODO: calculations are off
1249 my $self = $class->SUPER::new ( 1395 my $self = $class->SUPER::new (
1250 fg => [1, 1, 1], 1396 fg => [1, 1, 1],
1251 active_fg => [0, 0, 0], 1397 active_fg => [0, 0, 0],
1252 range => [0, 0, 100, 10], 1398 range => [0, 0, 100, 10],
1253 req_w => 40, 1399 req_w => 40,
1254 req_h => 10, 1400 req_h => 13,
1255 vertical => 0, 1401 vertical => 0,
1402 can_hover => 1,
1403 inner_pad => 5,
1256 @_ 1404 @_
1257 ); 1405 );
1258 1406
1259 $self 1407 $self
1260} 1408}
… …
1281 if ($GRAB == $self) { 1429 if ($GRAB == $self) {
1282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1430 my ($value, $lo, $hi, $page) = @{$self->{range}};
1283 1431
1284 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1285 1433
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1436
1437 $x -= $inner_pad_px; # substract the padding
1286 $x = $x * ($hi - $lo) / $w + $lo; 1438 $x = $x * ($hi - $lo) / $inner_w + $lo;
1287 $x = $lo if $x < $lo; 1439 $x = $lo if $x < $lo;
1288 $x = $hi - $page if $x > $hi - $page; 1440 $x = $hi - $page if $x > $hi - $page;
1289 $self->{range}[0] = $x; 1441 $self->{range}[0] = $x;
1290 1442
1291 $self->emit (changed => $x); 1443 $self->emit (changed => $x);
1292 $self->update; 1444 $self->update;
1293 } 1445 }
1446}
1447
1448# the inner_* stuff is for generating a padding for the slider handle,
1449# so that the handle doesn't leave the texture. This calculation isn't 100%
1450# correct propably, but it does the job for now
1451sub _calc_inner_pad_px {
1452 my ($self, $w) = @_;
1453 ($w / 100) * $self->{inner_pad} # % to pixels
1294} 1454}
1295 1455
1296sub _draw { 1456sub _draw {
1297 my ($self) = @_; 1457 my ($self) = @_;
1298 1458
… …
1312 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1472 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1313 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1473 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1314 1474
1315 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1475 my ($value, $lo, $hi, $page) = @{$self->{range}};
1316 1476
1477 $hi = $value + 1 if $lo == $hi;
1478
1479 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1480 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1481
1317 $page = int $page * $w / ($hi - $lo); 1482 $page = int $page * $inner_w / ($hi - $lo);
1318 $value = int +($value - $lo) * $w / ($hi - $lo); 1483 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1319 1484
1320 $w -= $page; 1485 $w -= $page;
1321 $page &= ~1; 1486 $page &= ~1;
1322 glTranslate $page * 0.5, 0, 0; 1487 glTranslate $page * 0.5, 0, 0;
1323 $page ||= 2; 1488 $page ||= 2;
1324 1489
1325 glColor @$fg;
1326 glBegin GL_LINES;
1327 glVertex 0, 0; glVertex 0, $h;
1328 glVertex $w - 1, 0; glVertex $w - 1, $h;
1329 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1330 glEnd;
1331
1332 my $knob_a = $value - $page * 0.5; 1490 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1333 my $knob_b = $value + $page * 0.5; 1491 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1334 1492
1335 glBegin GL_QUADS; 1493 glEnable GL_BLEND;
1336 glColor @$fg; 1494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1337 glVertex $knob_a, 0; 1495 glEnable GL_TEXTURE_2D;
1338 glVertex $knob_a, $h; 1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1339 glVertex $knob_b, $h;
1340 glVertex $knob_b, 0;
1341 1497
1342 if ($knob_a < $knob_b - 2) { 1498 # draw background
1343 glColor @$bg; 1499 $tex[1]->draw_quad (0, 0, $w, $h);
1344 glVertex $knob_a + 1, 1; 1500
1345 glVertex $knob_a + 1, $h - 1; 1501 # draw handle
1346 glVertex $knob_b - 1, $h - 1; 1502 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1347 glVertex $knob_b - 1, 1; 1503
1504 glDisable GL_BLEND;
1505 glDisable GL_TEXTURE_2D;
1506}
1507
1508#############################################################################
1509
1510package CFClient::UI::TextView;
1511
1512our @ISA = CFClient::UI::HBox::;
1513
1514use SDL::OpenGL;
1515
1516sub new {
1517 my $class = shift;
1518
1519 my $self = $class->SUPER::new (
1520 req_w => $::WIDTH / 6,
1521 req_h => $::HEIGHT / 6,
1522 fontsize => $::FONTSIZE,
1523 @_,
1524
1525 layout => (new CFClient::Layout),
1526 par => [],
1527 height => 0,
1528 children => [
1529 (new CFClient::UI::Empty expand => 1),
1530 (new CFClient::UI::Slider vertical => 1),
1531 ],
1532 );
1533
1534 $self->{children}[1]->connect (changed => sub {
1535 $self->update;
1536 });
1537
1538 $self
1539}
1540
1541sub set_fontsize {
1542 my ($self, $fontsize) = @_;
1543
1544 $self->{fontsize} = $fontsize;
1545 $self->reflow;
1546}
1547
1548sub text_height {
1549 my ($self, $text) = @_;
1550
1551 my $layout = $self->{layout};
1552
1553 $layout->set_height ($self->{fontsize});
1554 $layout->set_width ($self->{w});
1555 $layout->set_text ($text);
1348 } 1556
1349 glEnd; 1557 ($layout->size)[1]
1558}
1559
1560sub reflow {
1561 my ($self) = @_;
1562
1563 $self->{need_reflow}++;
1564 $self->update;
1565}
1566
1567sub size_request {
1568 my ($self) = @_;
1569
1570 ($self->{req_w}, $self->{req_h})
1571}
1572
1573sub size_allocate {
1574 my ($self, $x, $y, $w, $h) = @_;
1575
1576 $self->SUPER::size_allocate ($x, $y, $w, $h);
1577
1578 $self->{layout}->set_height ($self->{fontsize});
1579 $self->{layout}->set_width ($self->{w});
1580
1581 $self->reflow;
1582}
1583
1584sub add_paragraph {
1585 my ($self, $color, $text) = @_;
1586
1587 #TODO: intelligently "reformat" paragraph
1588
1589 my $height = $self->text_height ($text);
1590
1591 $self->{height} += $height;
1592
1593 push @{$self->{par}}, [$height, $color, $text];
1594
1595 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1596 $self->{children}[1]->update;
1597}
1598
1599sub update {
1600 my ($self) = @_;
1601
1602 $self->SUPER::update;
1603
1604 return unless $self->{h} > 0;
1605
1606 delete $self->{texture};
1607
1608 $ROOT->on_refresh ($self, sub {
1609 if (delete $self->{need_reflow}) {
1610 my $height = 0;
1611
1612 $height += $_->[0] = $self->text_height ($_->[2])
1613 for @{$self->{par}};
1614
1615 $self->{height} = $height;
1616
1617 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1618
1619 delete $self->{texture};
1620 }
1621
1622 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1623 glClearColor 0, 0, 0, 1;
1624 glClear GL_COLOR_BUFFER_BIT;
1625
1626 glEnable GL_BLEND;
1627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1628 glEnable GL_TEXTURE_2D;
1629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1630
1631 my $top = int $self->{children}[1]{range}[0];
1632
1633 my $y0 = $top;
1634 my $y1 = $top + $self->{h};
1635
1636 my $y = 0;
1637
1638 my $layout = $self->{layout};
1639
1640 for my $par (@{$self->{par}}) {
1641 my $h = $par->[0];
1642
1643 if ($y0 < $y + $h && $y < $y1) {
1644 $layout->set_text ($par->[2]);
1645
1646 glColor @{ $par->[1] };
1647 my ($W, $H) = $layout->size;
1648 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1649 }
1650
1651 $y += $h;
1652 }
1653
1654 glDisable GL_TEXTURE_2D;
1655 glDisable GL_BLEND;
1656 };
1657 });
1658}
1659
1660sub _draw {
1661 my ($self) = @_;
1662
1663 if ($self->{texture}) {
1664 glEnable GL_TEXTURE_2D;
1665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1666 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1667 glDisable GL_TEXTURE_2D;
1668 }
1669
1670 $self->{children}[1]->draw;
1671
1350} 1672}
1351 1673
1352############################################################################# 1674#############################################################################
1353 1675
1354package CFClient::UI::MapWidget; 1676package CFClient::UI::MapWidget;
… …
1364 1686
1365sub new { 1687sub new {
1366 my $class = shift; 1688 my $class = shift;
1367 1689
1368 $class->SUPER::new ( 1690 $class->SUPER::new (
1369 z => -1, 1691 z => -1,
1692 can_focus => 1,
1370 list => (glGenLists 1), 1693 list => (glGenLists 1),
1371 @_ 1694 @_
1372 ) 1695 )
1373} 1696}
1374 1697
1375sub key_down { 1698sub key_down {
1376 print "MAPKEYDOWN\n"; 1699 print "MAPKEYDOWN\n";
1377} 1700}
1378 1701
1379sub key_up { 1702sub key_up {
1703}
1704
1705sub button_down {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 $self->focus_in;
1709
1710 if ($ev->button == 2) {
1711 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1712 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1713
1714 $self->{motion} = sub {
1715 my ($ev, $x, $y) = @_;
1716
1717 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1718
1719 $::CFG->{map_shift_x} = $bw + $x - $ox;
1720 $::CFG->{map_shift_y} = $bh + $y - $oy;
1721
1722 $self->update;
1723 };
1724 }
1725}
1726
1727sub button_up {
1728 my ($self, $ev, $x, $y) = @_;
1729
1730 delete $self->{motion};
1731}
1732
1733sub mouse_motion {
1734 my ($self, $ev, $x, $y) = @_;
1735
1736 $self->{motion}->($ev, $x, $y) if $self->{motion};
1380} 1737}
1381 1738
1382sub size_request { 1739sub size_request {
1383 ( 1740 (
1384 1 + 32 * int $::WIDTH / 32, 1741 1 + 32 * int $::WIDTH / 32,
… …
1397 my ($self) = @_; 1754 my ($self) = @_;
1398 1755
1399 if (delete $self->{need_update}) { 1756 if (delete $self->{need_update}) {
1400 glNewList $self->{list}, GL_COMPILE; 1757 glNewList $self->{list}, GL_COMPILE;
1401 1758
1402 my $mx = $::CONN->{mapx}; 1759 if ($::MAP) {
1403 my $my = $::CONN->{mapy};
1404
1405 my $map = $::CONN->{map};
1406
1407 my ($xofs, $yofs);
1408
1409 my $sw = 1 + int $::WIDTH / 32; 1760 my $sw = int $::WIDTH / 32;
1410 my $sh = 1 + int $::HEIGHT / 32; 1761 my $sh = int $::HEIGHT / 32;
1411 1762
1412 if ($::CONN->{mapw} > $sw) { 1763 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1413 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1764 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1414 } else { 1765
1415 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1766 glTranslate $sx0 - 32, $sy0 - 32, 0;
1767
1768 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1769
1770 if ($::CFG->{fow_enable}) {
1771 if ($::CFG->{fow_smooth}) { # smooth fog of war
1772 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1773 glConvolutionFilter2D
1774 GL_CONVOLUTION_2D,
1775 GL_ALPHA,
1776 3, 3,
1777 GL_ALPHA, GL_FLOAT,
1778 pack "f*",
1779 0.1, 0.1, 0.1,
1780 0.1, 0.2, 0.1,
1781 0.1, 0.1, 0.1,
1782 ;
1783 glEnable GL_CONVOLUTION_2D;
1784 }
1785
1786 $self->{fow_texture} = new CFClient::Texture
1787 w => $w,
1788 h => $h,
1789 data => $data,
1790 internalformat => GL_ALPHA,
1791 format => GL_ALPHA;
1792
1793 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1794
1795 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797 glEnable GL_TEXTURE_2D;
1798 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1799
1800 glColor +($::CFG->{fow_intensity}) x 3, 1;
1801 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1802
1803 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805 }
1806
1807 # HACK BEGIN
1808 {
1809 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1810 my ($w, $h) = (250, 250);
1811
1812 glEnable GL_BLEND;
1813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1814 glEnable GL_TEXTURE_2D;
1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1816
1817 $self->{mapmap_texture} =
1818 new CFClient::Texture
1819 w => $w,
1820 h => $h,
1821 data => $::MAP->mapmap ($w, $h),
1822 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1823
1824 $self->{mapmap_texture}->draw_quad (100, 100);
1825
1826 glDisable GL_TEXTURE_2D;
1827 glDisable GL_BLEND;
1828 }
1829 # HACK END
1416 } 1830 }
1417 1831
1418 if ($::CONN->{maph} > $sh) {
1419 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1420 } else {
1421 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1422 }
1423
1424 glEnable GL_TEXTURE_2D;
1425 glEnable GL_BLEND;
1426 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1428
1429 my $sw4 = ($sw + 3) & ~3;
1430 my $darkness = "\x00" x ($sw4 * $sh);
1431
1432 for my $x (0 .. $sw - 1) {
1433 my $row = $map->[$x + $xofs];
1434 for my $y (0 .. $sh - 1) {
1435
1436 my $cell = $row->[$y + $yofs]
1437 or next;
1438
1439 my $dark = $cell->[0];
1440 if ($dark < 0) {
1441 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1442 } else {
1443 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1444 }
1445
1446 for my $num (grep $_, @$cell[1,2,3]) {
1447 my $tex = $::CONN->{face}[$num]{texture} || next;
1448
1449 my ($w, $h) = @$tex{qw(w h)};
1450
1451 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1452 }
1453 }
1454 }
1455
1456# if (1) { # higher quality darkness
1457# $lighting =~ s/(.)/$1$1$1/gs;
1458# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1459#
1460# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1461#
1462# $lighting = $pb->get_pixels;
1463# $lighting =~ s/(.)../$1/gs;
1464# }
1465
1466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1467
1468 $darkness = new CFClient::Texture
1469 w => $sw4,
1470 h => $sh,
1471 data => $darkness,
1472 internalformat => GL_ALPHA,
1473 format => GL_ALPHA;
1474
1475 glColor 0.45, 0.45, 0.45, 1;
1476 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1477
1478 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480
1481 glEndList; 1832 glEndList;
1482 } 1833 }
1483 1834
1835 glPushMatrix;
1484 glCallList $self->{list}; 1836 glCallList $self->{list};
1837 glPopMatrix;
1838
1839 if ($FOCUS != $self) {
1840 glColor 64/255, 64/255, 64/255;
1841 glLogicOp GL_AND;
1842 glEnable GL_COLOR_LOGIC_OP;
1843 glBegin GL_QUADS;
1844 glVertex 0, 0;
1845 glVertex 0, $::HEIGHT;
1846 glVertex $::WIDTH, $::HEIGHT;
1847 glVertex $::WIDTH, 0;
1848 glEnd;
1849 glDisable GL_COLOR_LOGIC_OP;
1850 }
1485} 1851}
1486 1852
1487my %DIR = ( 1853my %DIR = (
1488 SDLK_KP8, [1, "north"], 1854 SDLK_KP8, [1, "north"],
1489 SDLK_KP9, [2, "northeast"], 1855 SDLK_KP9, [2, "northeast"],
… …
1505 1871
1506 my $mod = $ev->key_mod; 1872 my $mod = $ev->key_mod;
1507 my $sym = $ev->key_sym; 1873 my $sym = $ev->key_sym;
1508 1874
1509 if ($sym == SDLK_KP5) { 1875 if ($sym == SDLK_KP5) {
1510 $::CONN->send ("command stay fire"); 1876 $::CONN->user_send ("command stay fire");
1877 } elsif ($sym == SDLK_a) {
1878 $::CONN->user_send ("command apply");
1879 } elsif ($sym == SDLK_QUOTE) {
1880 $self->emit ('activate_console');
1881 } elsif ($sym == SDLK_SLASH) {
1882 $self->emit ('activate_console' => '/');
1511 } elsif (exists $DIR{$sym}) { 1883 } elsif (exists $DIR{$sym}) {
1512 if ($mod & KMOD_SHIFT) { 1884 if ($mod & KMOD_SHIFT) {
1513 $self->{shft}++; 1885 $self->{shft}++;
1514 $::CONN->send ("command fire $DIR{$sym}[0]"); 1886 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1515 } elsif ($mod & KMOD_CTRL) { 1887 } elsif ($mod & KMOD_CTRL) {
1516 $self->{ctrl}++; 1888 $self->{ctrl}++;
1517 $::CONN->send ("command run $DIR{$sym}[0]"); 1889 $::CONN->user_send ("command run $DIR{$sym}[0]");
1518 } else { 1890 } else {
1519 $::CONN->send ("command $DIR{$sym}[1]"); 1891 $::CONN->user_send ("command $DIR{$sym}[1]");
1520 } 1892 }
1521 } 1893 }
1522} 1894}
1523 1895
1524sub key_up { 1896sub key_up {
… …
1526 1898
1527 my $mod = $ev->key_mod; 1899 my $mod = $ev->key_mod;
1528 my $sym = $ev->key_sym; 1900 my $sym = $ev->key_sym;
1529 1901
1530 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1902 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1531 $::CONN->send ("command fire_stop"); 1903 $::CONN->user_send ("command fire_stop");
1532 } 1904 }
1533 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1905 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1534 $::CONN->send ("command run_stop"); 1906 $::CONN->user_send ("command run_stop");
1535 } 1907 }
1536} 1908}
1537 1909
1538############################################################################# 1910#############################################################################
1539 1911
… …
1577 glPopMatrix; 1949 glPopMatrix;
1578} 1950}
1579 1951
1580############################################################################# 1952#############################################################################
1581 1953
1582package CFClient::UI::Toplevel; 1954package CFClient::UI::Flopper;
1955
1956our @ISA = CFClient::UI::Button::;
1957
1958sub new {
1959 my $class = shift;
1960
1961 my $self = $class->SUPER::new (
1962 state => 0,
1963 connect_activate => \&toggle_flopper,
1964 @_
1965 );
1966
1967 if ($self->{state}) {
1968 $self->{state} = 0;
1969 $self->toggle_flopper;
1970 }
1971
1972 $self
1973}
1974
1975sub toggle_flopper {
1976 my ($self) = @_;
1977
1978 # TODO: use animation
1979 if ($self->{state} = !$self->{state}) {
1980 $CFClient::UI::ROOT->add ($self->{other});
1981 $self->{other}->move ($self->coord2global (0, $self->{h}));
1982 $self->emit ("open");
1983 } else {
1984 $CFClient::UI::ROOT->remove ($self->{other});
1985 $self->emit ("close");
1986 }
1987
1988 $self->emit (changed => $self->{state});
1989}
1990
1991#############################################################################
1992
1993package CFClient::UI::Root;
1583 1994
1584our @ISA = CFClient::UI::Container::; 1995our @ISA = CFClient::UI::Container::;
1996
1997use SDL::OpenGL;
1585 1998
1586sub size_request { 1999sub size_request {
1587 ($::WIDTH, $::HEIGHT) 2000 ($::WIDTH, $::HEIGHT)
1588} 2001}
1589 2002
… …
1594 2007
1595 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2008 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1596 for @{$self->{children}}; 2009 for @{$self->{children}};
1597} 2010}
1598 2011
1599sub translate { 2012sub _topleft {
1600 my ($self, $x, $y) = @_; 2013 my ($self, $x, $y) = @_;
1601 2014
1602 ($x, $y) 2015 ($x, $y)
1603} 2016}
1604 2017
… …
1612sub add { 2025sub add {
1613 my ($self, $widget) = @_; 2026 my ($self, $widget) = @_;
1614 2027
1615 $self->SUPER::add ($widget); 2028 $self->SUPER::add ($widget);
1616 2029
1617 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2030 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2031}
2032
2033sub on_refresh {
2034 my ($self, $id, $cb) = @_;
2035
2036 $self->{refresh_hook}{$id} = $cb;
1618} 2037}
1619 2038
1620sub draw { 2039sub draw {
1621 my ($self) = @_; 2040 my ($self) = @_;
1622 2041
2042 while (my $rcb = delete $self->{refresh_hook}) {
2043 $_->() for values %$rcb;
2044 }
2045
2046 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2047 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2048 glClear GL_COLOR_BUFFER_BIT;
2049
2050 glMatrixMode GL_PROJECTION;
2051 glLoadIdentity;
2052 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2053 glMatrixMode GL_MODELVIEW;
2054 glLoadIdentity;
2055
1623 $self->_draw; 2056 $self->_draw;
1624} 2057}
1625 2058
1626############################################################################# 2059#############################################################################
1627 2060
1628package CFClient::UI; 2061package CFClient::UI;
1629 2062
1630$TOPLEVEL = new CFClient::UI::Toplevel; 2063$ROOT = new CFClient::UI::Root;
1631 2064
16321 20651
1633 2066

Diff Legend

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