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.96 by root, Fri Apr 14 00:15:52 2006 UTC vs.
Revision 1.123 by root, Mon Apr 17 19:50:22 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
151# return top left coordinates
152sub _topleft {
153 my ($self, $x, $y) = @_;
154
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
138# translate global coordinates to local coordinate system 158# translate global coordinates to local coordinate system
139sub translate { 159sub coord2local {
140 my ($self, $x, $y) = @_; 160 my ($self, $x, $y) = @_;
141 161
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 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;
181
182 $self->emit (focus_in => $focus);
183
151 $focus->update if $focus; 184 $focus->update if $focus;
152 $FOCUS->update; 185 $FOCUS->update;
153} 186}
154 187
155sub focus_out { 188sub focus_out {
156 my ($self) = @_; 189 my ($self) = @_;
157 190
158 return unless $FOCUS == $self; 191 return unless $FOCUS == $self;
159 192
160 my $focus = $FOCUS; undef $FOCUS; 193 my $focus = $FOCUS; undef $FOCUS;
194
195 $self->emit (focus_out => $focus);
196
161 $focus->update if $focus; #? 197 $focus->update if $focus; #?
162} 198}
163 199
164sub mouse_motion { } 200sub mouse_motion { }
165sub button_up { } 201sub button_up { }
… …
186 glPushMatrix; 222 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 223 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 224 $self->_draw;
189 glPopMatrix; 225 glPopMatrix;
190 226
191 if ($self == $HOVER) { 227 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 228 my ($x, $y) = @$self{qw(x y)};
193 229
194 glColor 0, 0, 1, 0.2; 230 glColor 1, 0.8, 0.5, 0.2;
195 glEnable GL_BLEND; 231 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197 glBegin GL_QUADS; 233 glBegin GL_QUADS;
198 glVertex $x , $y; 234 glVertex $x , $y;
199 glVertex $x + $self->{w}, $y; 235 glVertex $x + $self->{w}, $y;
… …
219 255
220 () 256 ()
221} 257}
222 258
223sub set_parent { 259sub set_parent {
224 my ($self, $par) = @_; 260 my ($self, $parent) = @_;
225 261
226 $self->{parent} = $par;
227 Scalar::Util::weaken $self->{parent}; 262 Scalar::Util::weaken ($self->{parent} = $parent);
228}
229
230sub get_parent {
231 $_[0]->{parent}
232} 263}
233 264
234sub update { 265sub update {
235 my ($self) = @_; 266 my ($self) = @_;
236 267
… …
325 356
326 $self 357 $self
327} 358}
328 359
329sub add { 360sub add {
330 my ($self, $chld) = @_; 361 my ($self, $child) = @_;
331 362
332 $chld->set_parent ($self); 363 $child->set_parent ($self);
364
365 use sort 'stable';
333 366
334 $self->{children} = [ 367 $self->{children} = [
335 sort { $a->{z} <=> $b->{z} } 368 sort { $a->{z} <=> $b->{z} }
336 @{$self->{children}}, $chld 369 @{$self->{children}}, $child
337 ]; 370 ];
338 371
339 $self->{w} = $self->{h} = -1; 372 $self->{w} = $self->{h} = -1;
340 $self->update; 373 $self->update;
341} 374}
… …
438} 471}
439 472
440sub render_chld { 473sub render_chld {
441 my ($self) = @_; 474 my ($self) = @_;
442 475
443 $self->{texture} = 476 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444 CFClient::Texture->new_from_opengl ( 477 glClearColor 0, 0, 0, 1;
445 $self->{w}, $self->{h}, sub { $self->child->draw } 478 glClear GL_COLOR_BUFFER_BIT;
446 ); 479 $self->child->draw;
480 };
447} 481}
448 482
449sub size_allocate { 483sub size_allocate {
450 my ($self, $x, $y, $w, $h) = @_; 484 my ($self, $x, $y, $w, $h) = @_;
451 485
… …
529 563
530my @tex = 564my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 565 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); 566 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533 567
568sub new {
569 my $class = shift;
570
571 # TODO: user_x, user_y, overwrite moveto?
572
573 $class->SUPER::new (
574 bg => [1, 1, 1, 1],
575 border_bg => [1, 1, 1, 1],
576 border => int $::FONTSIZE * 0.8,
577 @_
578 )
579}
580
534sub size_request { 581sub size_request {
535 my ($self) = @_; 582 my ($self) = @_;
536 583
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538 585
539 my ($w, $h) = $self->SUPER::size_request; 586 my ($w, $h) = $self->SUPER::size_request;
540 587
541 $h += $tex[1]->{h}; 588 (
542 $h += $tex[4]->{h}; 589 $w + $self->{border} * 2,
543 $w += $tex[2]->{w}; 590 $h + $self->{border} * 2,
544 $w += $tex[3]->{w}; 591 )
545
546 ($w, $h)
547} 592}
548 593
549sub size_allocate { 594sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_; 595 my ($self, $x, $y, $w, $h) = @_;
551 596
552 $self->_size_allocate ($x, $y, $w, $h) or return; 597 $self->_size_allocate ($x, $y, $w, $h) or return;
553 598
554 $h -= $tex[1]{h}; 599 $h -= List::Util::max 0, $self->{border} * 2;
555 $h -= $tex[4]{h}; 600 $w -= List::Util::max 0, $self->{border} * 2;
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558 601
559 $h = $h < 0 ? 0 : $h; 602 $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} 603}
566 604
567sub button_down { 605sub button_down {
568 my ($self, $ev, $x, $y) = @_; 606 my ($self, $ev, $x, $y) = @_;
569 607
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572 610
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 611 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h}); 612 my ($bw, $bh) = ($self->{w}, $self->{h});
575 613
576 $self->{motion} = sub { 614 $self->{motion} = sub {
… …
582 $self->{user_h} = $bh + $y - $oy; 620 $self->{user_h} = $bh + $y - $oy;
583 $self->update; 621 $self->update;
584 }; 622 };
585 623
586 } elsif ($x >= 0 && $x < $self->{w} 624 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) { 625 && $y >= 0 && $y < $self->{border}) {
588 626
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 627 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y}); 628 my ($bx, $by) = ($self->{x}, $self->{y});
591 629
592 $self->{motion} = sub { 630 $self->{motion} = sub {
… …
613} 651}
614 652
615sub _draw { 653sub _draw {
616 my ($self) = @_; 654 my ($self) = @_;
617 655
618 my ($w, $h) = ($self->{w}, $self->{h}); 656 my ($w, $h ) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 657 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 658
621 glEnable GL_BLEND; 659 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 661 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625 663
626 my $top = $tex[1]; 664 glColor @{ $self->{border_bg} };
627 $top->draw_quad (0, 0, $w, $top->{h}); 665 $tex[1]->draw_quad (0, 0, $w, $self->{border});
628 666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629 my $left = $tex[3]; 667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 668 $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 669
638 my $bg = $tex[0]; 670 my $bg = $tex[0];
639 671
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 672 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643 my $rep_x = $cw / $bg->{w}; 673 my $rep_x = $cw / $bg->{w};
644 my $rep_y = $ch / $bg->{h}; 674 my $rep_y = $ch / $bg->{h};
645 675
676 glColor @{ $self->{bg} };
677
678 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1;
646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
647 682
648 glDisable GL_TEXTURE_2D; 683 glDisable GL_TEXTURE_2D;
649 glDisable GL_BLEND; 684 glDisable GL_BLEND;
650 685
651 $self->child->draw; 686 $self->child->draw;
652
653} 687}
654 688
655############################################################################# 689#############################################################################
656 690
657package CFClient::UI::Table; 691package CFClient::UI::Table;
… …
670 @_ 704 @_
671 ) 705 )
672} 706}
673 707
674sub add { 708sub add {
675 my ($self, $x, $y, $chld) = @_; 709 my ($self, $x, $y, $child) = @_;
676 710
711 $child->set_parent ($self);
677 $self->{children}[$y][$x] = $chld; 712 $self->{children}[$y][$x] = $child;
678 $chld->set_parent ($self);
679 713
680 $self->{w} = $self->{h} = -1; 714 $self->{w} = $self->{h} = -1;
715 $self->update;
716}
717
718# TODO: move to container class maybe? send childs a signal on removal?
719sub clear {
720 my ($self) = @_;
721
722 delete $self->{children};
681 $self->update; 723 $self->update;
682} 724}
683 725
684sub get_wh { 726sub get_wh {
685 my ($self) = @_; 727 my ($self) = @_;
… …
730 my $col_expand = (sum @col_expand) || 1; 772 my $col_expand = (sum @col_expand) || 1;
731 773
732 # linearly scale sizes 774 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 775 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 776 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
777
778 CFClient::UI::harmonize $ws;
779 CFClient::UI::harmonize $hs;
735 780
736 my $y; 781 my $y;
737 782
738 for my $r (0 .. $#{$self->{children}}) { 783 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r] 784 my $row = $self->{children}[$r]
… …
827 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 872 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828 $h[$_] = $alloc_h; 873 $h[$_] = $alloc_h;
829 } 874 }
830 } 875 }
831 876
877 CFClient::UI::harmonize \@h;
878
832 my $y = 0; 879 my $y = 0;
833 for (0 .. $#$children) { 880 for (0 .. $#$children) {
834 my $child = $children->[$_]; 881 my $child = $children->[$_];
835 my $h = $h[$_]; 882 my $h = $h[$_];
836 $child->size_allocate ($y, 0, $h, $w); 883 $child->size_allocate ($y, 0, $h, $w);
… …
881 928
882 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 929 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
883 } 930 }
884 } 931 }
885 932
933 CFClient::UI::harmonize \@h;
934
886 my $y = 0; 935 my $y = 0;
887 for (0 .. $#$children) { 936 for (0 .. $#$children) {
888 my $child = $children->[$_]; 937 my $child = $children->[$_];
889 my $h = $h[$_]; 938 my $h = $h[$_];
890 $child->size_allocate (0, $y, $w, $h); 939 $child->size_allocate (0, $y, $w, $h);
… …
903 952
904sub new { 953sub new {
905 my ($class, %arg) = @_; 954 my ($class, %arg) = @_;
906 955
907 my $self = $class->SUPER::new ( 956 my $self = $class->SUPER::new (
908 fg => [1, 1, 1], 957 fg => [1, 1, 1],
909 height => $::FONTSIZE, 958 fontsize => $::FONTSIZE,
910 text => "", 959 text => "",
911 align => -1, 960 align => -1,
961 valign => -1,
912 padding => 2, 962 padding => 2,
913 layout => new CFClient::Layout, 963 layout => new CFClient::Layout,
914 %arg 964 %arg
915 ); 965 );
916 966
917 $self->set_text ($self->{text}); 967 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
968
969 $self->set_text (delete $self->{text}) if exists $self->{text};
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
918 971
919 $self 972 $self
920} 973}
921 974
922sub escape_text { 975sub escape_text {
… …
930} 983}
931 984
932sub set_text { 985sub set_text {
933 my ($self, $text) = @_; 986 my ($self, $text) = @_;
934 987
935 $self->{text} = $text;
936 $self->{layout}->set_markup ($text); 988 $self->{layout}->set_text ($text);
937 989
938 delete $self->{texture}; 990 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
940 $self->update; 991 $self->update;
941} 992}
942 993
943sub get_text { 994sub set_markup {
944 my ($self, $text) = @_; 995 my ($self, $markup) = @_;
945 996
946 $self->{text} 997 $self->{layout}->set_markup ($markup);
998
999 delete $self->{texture};
1000 $self->update;
947} 1001}
948 1002
949sub size_request { 1003sub size_request {
950 my ($self) = @_; 1004 my ($self) = @_;
951 1005
952 $self->{layout}->set_width; 1006 $self->{layout}->set_width;
953 $self->{layout}->set_height ($self->{height}); 1007 $self->{layout}->set_height ($self->{fontsize});
1008
954 my ($w, $h) = $self->{layout}->size; 1009 my ($w, $h) = $self->{layout}->size;
955 1010
956 ( 1011 (
957 $w + $self->{padding} * 2, 1012 $w + $self->{padding} * 2,
958 $h + $self->{padding} * 2, 1013 $h + $self->{padding} * 2,
… …
977sub _draw { 1032sub _draw {
978 my ($self) = @_; 1033 my ($self) = @_;
979 1034
980 my $tex = $self->{texture} ||= do { 1035 my $tex = $self->{texture} ||= do {
981 $self->{layout}->set_width ($self->{w}); 1036 $self->{layout}->set_width ($self->{w});
982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
983 new_from_layout CFClient::Texture $self->{layout} 1038 new_from_layout CFClient::Texture $self->{layout}
984 }; 1039 };
985 1040
986 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988 glEnable GL_TEXTURE_2D; 1043 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
990 1045
991 glColor @{$self->{fg}}; 1046 glColor @{$self->{fg}};
992 1047
993 my $x = 1048 $self->{ox} = int (
994 $self->{align} < 0 ? $self->{padding} 1049 $self->{align} < 0 ? $self->{padding}
995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996 : ($self->{w} - $tex->{w}) * 0.5; 1051 : ($self->{w} - $tex->{w}) * 0.5
1052 );
997 1053
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0; 1054 $self->{oy} = int (
999 $tex->draw_quad (0, 0); 1055 $self->{valign} < 0 ? $self->{padding}
1056 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1057 : ($self->{h} - $tex->{h}) * 0.5
1058 );
1059
1060 $tex->draw_quad ($self->{ox}, $self->{oy});
1000 1061
1001 glDisable GL_TEXTURE_2D; 1062 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND; 1063 glDisable GL_BLEND;
1003} 1064}
1004 1065
1005############################################################################# 1066#############################################################################
1006 1067
1007package CFClient::UI::Entry; 1068package CFClient::UI::EntryBase;
1008 1069
1009our @ISA = CFClient::UI::Label::; 1070our @ISA = CFClient::UI::Label::;
1010 1071
1011use SDL; 1072use SDL;
1012use SDL::OpenGL; 1073use SDL::OpenGL;
… …
1017 $class->SUPER::new ( 1078 $class->SUPER::new (
1018 fg => [1, 1, 1], 1079 fg => [1, 1, 1],
1019 bg => [0, 0, 0, 0.2], 1080 bg => [0, 0, 0, 0.2],
1020 active_bg => [1, 1, 1, 0.5], 1081 active_bg => [1, 1, 1, 0.5],
1021 active_fg => [0, 0, 0], 1082 active_fg => [0, 0, 0],
1083 can_hover => 1,
1084 can_focus => 1,
1085 valign => 0,
1022 @_ 1086 @_
1023 ) 1087 )
1024} 1088}
1025 1089
1026sub _set_text { 1090sub _set_text {
1027 my ($self, $text) = @_; 1091 my ($self, $text) = @_;
1028 1092
1093 delete $self->{cur_h};
1094
1095 return if $self->{text} eq $text;
1096
1029 $self->{last_activity} = $::NOW; 1097 $self->{last_activity} = $::NOW;
1030
1031 $self->{text} = $text; 1098 $self->{text} = $text;
1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034 1099
1035 $text =~ s/./*/g if $self->{hidden}; 1100 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text ");
1036 1102
1037 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1103 $self->emit (changed => $self->{text});
1104}
1038 1105
1039 $text = substr $text, 0, $self->{cursor}; 1106sub get_text {
1040 utf8::encode $text; 1107 $_[0]{text}
1041
1042 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043} 1108}
1044 1109
1045sub size_request { 1110sub size_request {
1046 my ($self) = @_; 1111 my ($self) = @_;
1047 1112
… …
1086 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1151 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1087 } elsif ($sym == SDLK_HOME) { 1152 } elsif ($sym == SDLK_HOME) {
1088 $self->{cursor} = 0; 1153 $self->{cursor} = 0;
1089 } elsif ($sym == SDLK_END) { 1154 } elsif ($sym == SDLK_END) {
1090 $self->{cursor} = length $text; 1155 $self->{cursor} = length $text;
1156 } elsif ($sym == SDLK_ESCAPE) {
1157 $self->emit ('escape');
1091 } elsif ($uni) { 1158 } elsif ($uni) {
1092 substr $text, $self->{cursor}++, 0, chr $uni; 1159 substr $text, $self->{cursor}++, 0, chr $uni;
1093 } 1160 }
1094 1161
1095 $self->_set_text ($text); 1162 $self->_set_text ($text);
… …
1149 1216
1150 $self->SUPER::_draw; 1217 $self->SUPER::_draw;
1151 1218
1152 #TODO: force update every cursor change :( 1219 #TODO: force update every cursor change :(
1153 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1220 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1221
1222 unless (exists $self->{cur_h}) {
1223 my $text = substr $self->{text}, 0, $self->{cursor};
1224 utf8::encode $text;
1225
1226 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1227 }
1228
1154 glColor @{$self->{fg}}; 1229 glColor @{$self->{fg}};
1155 glBegin GL_LINES; 1230 glBegin GL_LINES;
1156 glVertex $self->{cur_x}, $self->{cur_y};
1157 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1231 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1232 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1158 glEnd; 1233 glEnd;
1159 } 1234 }
1235}
1236
1237package CFClient::UI::Entry;
1238
1239our @ISA = CFClient::UI::EntryBase::;
1240
1241use SDL;
1242use SDL::OpenGL;
1243
1244sub key_down {
1245 my ($self, $ev) = @_;
1246
1247 my $sym = $ev->key_sym;
1248
1249 if ($sym == SDLK_RETURN) {
1250 $self->emit (activate => $self->get_text);
1251 $self->update;
1252
1253 } else {
1254 $self->SUPER::key_down ($ev);
1255 }
1256
1160} 1257}
1161 1258
1162############################################################################# 1259#############################################################################
1163 1260
1164package CFClient::UI::Button; 1261package CFClient::UI::Button;
… …
1177 1274
1178 $class->SUPER::new ( 1275 $class->SUPER::new (
1179 padding => 4, 1276 padding => 4,
1180 fg => [1, 1, 1], 1277 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1278 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5], 1279 active_fg => [0, 0, 1],
1184# border_fg => [1, 1, 0], 1280 can_hover => 1,
1185 @_ 1281 @_
1186 ) 1282 )
1187} 1283}
1188 1284
1189sub button_up { 1285sub button_up {
… …
1197 1293
1198sub _draw { 1294sub _draw {
1199 my ($self) = @_; 1295 my ($self) = @_;
1200 1296
1201 local $self->{fg} = $self->{fg}; 1297 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
1203
1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207 1298
1208 if ($GRAB == $self) { 1299 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg}; 1300 $self->{fg} = $self->{active_fg};
1210 } 1301 }
1211 1302
1212 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1303 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305 glEnable GL_TEXTURE_2D;
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1306 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1307 glColor 0, 0, 0, 1;
1214 1308
1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1309 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1216 1310
1217 glDisable GL_TEXTURE_2D; 1311 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND; 1312 glDisable GL_BLEND;
1219 1313
1220 $self->SUPER::_draw; 1314 $self->SUPER::_draw;
… …
1223############################################################################# 1317#############################################################################
1224 1318
1225package CFClient::UI::CheckBox; 1319package CFClient::UI::CheckBox;
1226 1320
1227our @ISA = CFClient::UI::DrawBG::; 1321our @ISA = CFClient::UI::DrawBG::;
1322
1323my @tex =
1324 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1325 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1228 1326
1229use SDL; 1327use SDL;
1230use SDL::OpenGL; 1328use SDL::OpenGL;
1231 1329
1232sub new { 1330sub new {
… …
1235 $class->SUPER::new ( 1333 $class->SUPER::new (
1236 padding => 2, 1334 padding => 2,
1237 fg => [1, 1, 1], 1335 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0], 1336 active_fg => [1, 1, 0],
1239 state => 0, 1337 state => 0,
1338 can_hover => 1,
1240 @_ 1339 @_
1241 ) 1340 )
1242} 1341}
1243 1342
1244sub size_request { 1343sub size_request {
… …
1269 $self->SUPER::_draw; 1368 $self->SUPER::_draw;
1270 1369
1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1370 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272 1371
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1372 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274 1373
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1374 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276 1375
1277 glBegin GL_LINE_LOOP; 1376 glEnable GL_BLEND;
1278 glVertex 0 , 0; 1377 glEnable GL_TEXTURE_2D;
1279 glVertex 0 , $s; 1378 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283 1379
1284 if ($self->{state}) { 1380 my $tex = $self->{state} ? $tex[1] : $tex[0];
1285 glBegin GL_LINES; 1381
1286 glVertex 0 , 0; 1382 $tex->draw_quad (0, 0, $s, $s);
1287 glVertex $s, $s; 1383
1288 glVertex $s, 0; 1384 glDisable GL_TEXTURE_2D;
1289 glVertex 0 , $s; 1385 glDisable GL_BLEND;
1290 glEnd;
1291 }
1292} 1386}
1293 1387
1294############################################################################# 1388#############################################################################
1295 1389
1296package CFClient::UI::Slider; 1390package CFClient::UI::Slider;
… …
1298use strict; 1392use strict;
1299 1393
1300use SDL::OpenGL; 1394use SDL::OpenGL;
1301 1395
1302our @ISA = CFClient::UI::DrawBG::; 1396our @ISA = CFClient::UI::DrawBG::;
1397
1398my @tex =
1399 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1400 qw(s1_slider.png s1_slider_bg.png);
1303 1401
1304sub new { 1402sub new {
1305 my $class = shift; 1403 my $class = shift;
1306 1404
1307 # range [value, low, high, page] 1405 # range [value, low, high, page]
1308 1406
1407 # TODO: 0-width page
1408 # TODO: req_w/h are wrong with vertical
1409 # TODO: calculations are off
1309 my $self = $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
1310 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
1311 active_fg => [0, 0, 0], 1412 active_fg => [0, 0, 0],
1312 range => [0, 0, 100, 10], 1413 range => [0, 0, 100, 10],
1313 req_w => 40, 1414 req_w => 40,
1314 req_h => 10, 1415 req_h => 13,
1315 vertical => 0, 1416 vertical => 0,
1417 can_hover => 1,
1418 inner_pad => 5,
1316 @_ 1419 @_
1317 ); 1420 );
1318 1421
1319 $self 1422 $self
1320} 1423}
… …
1341 if ($GRAB == $self) { 1444 if ($GRAB == $self) {
1342 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1445 my ($value, $lo, $hi, $page) = @{$self->{range}};
1343 1446
1344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1447 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345 1448
1449 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1450 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1451
1452 $x -= $inner_pad_px; # substract the padding
1346 $x = $x * ($hi - $lo) / $w + $lo; 1453 $x = $x * ($hi - $lo) / $inner_w + $lo;
1347 $x = $lo if $x < $lo; 1454 $x = $lo if $x < $lo;
1348 $x = $hi - $page if $x > $hi - $page; 1455 $x = $hi - $page if $x > $hi - $page;
1349 $self->{range}[0] = $x; 1456 $self->{range}[0] = $x;
1350 1457
1351 $self->emit (changed => $x); 1458 $self->emit (changed => $x);
1352 $self->update; 1459 $self->update;
1353 } 1460 }
1461}
1462
1463# the inner_* stuff is for generating a padding for the slider handle,
1464# so that the handle doesn't leave the texture. This calculation isn't 100%
1465# correct propably, but it does the job for now
1466sub _calc_inner_pad_px {
1467 my ($self, $w) = @_;
1468 ($w / 100) * $self->{inner_pad} # % to pixels
1354} 1469}
1355 1470
1356sub _draw { 1471sub _draw {
1357 my ($self) = @_; 1472 my ($self) = @_;
1358 1473
… …
1372 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1487 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1488 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374 1489
1375 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1490 my ($value, $lo, $hi, $page) = @{$self->{range}};
1376 1491
1492 $hi = $value + 1 if $lo == $hi;
1493
1494 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1495 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1496
1377 $page = int $page * $w / ($hi - $lo); 1497 $page = int $page * $inner_w / ($hi - $lo);
1378 $value = int +($value - $lo) * $w / ($hi - $lo); 1498 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1379 1499
1380 $w -= $page; 1500 $w -= $page;
1381 $page &= ~1; 1501 $page &= ~1;
1382 glTranslate $page * 0.5, 0, 0; 1502 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2; 1503 $page ||= 2;
1384 1504
1385 glColor @$fg;
1386 glBegin GL_LINES;
1387 glVertex 0, 0; glVertex 0, $h;
1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
1389 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390 glEnd;
1391
1392 my $knob_a = $value - $page * 0.5; 1505 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1393 my $knob_b = $value + $page * 0.5; 1506 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1394 1507
1395 glBegin GL_QUADS; 1508 glEnable GL_BLEND;
1396 glColor @$fg; 1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1397 glVertex $knob_a, 0; 1510 glEnable GL_TEXTURE_2D;
1398 glVertex $knob_a, $h; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1399 glVertex $knob_b, $h;
1400 glVertex $knob_b, 0;
1401 1512
1402 if ($knob_a < $knob_b - 2) { 1513 # draw background
1403 glColor @$bg; 1514 $tex[1]->draw_quad (0, 0, $w, $h);
1404 glVertex $knob_a + 1, 1; 1515
1405 glVertex $knob_a + 1, $h - 1; 1516 # draw handle
1406 glVertex $knob_b - 1, $h - 1; 1517 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1407 glVertex $knob_b - 1, 1; 1518
1519 glDisable GL_BLEND;
1520 glDisable GL_TEXTURE_2D;
1521}
1522
1523#############################################################################
1524
1525package CFClient::UI::TextView;
1526
1527our @ISA = CFClient::UI::HBox::;
1528
1529use SDL::OpenGL;
1530
1531sub new {
1532 my $class = shift;
1533
1534 my $self = $class->SUPER::new (
1535 req_w => $::WIDTH / 6,
1536 req_h => $::HEIGHT / 6,
1537 fontsize => $::FONTSIZE,
1538 @_,
1539
1540 layout => (new CFClient::Layout),
1541 par => [],
1542 height => 0,
1543 children => [
1544 (new CFClient::UI::Empty expand => 1),
1545 (new CFClient::UI::Slider vertical => 1),
1546 ],
1547 );
1548
1549 $self->{children}[1]->connect (changed => sub {
1550 $self->update;
1551 });
1552
1553 $self
1554}
1555
1556sub set_fontsize {
1557 my ($self, $fontsize) = @_;
1558
1559 $self->{fontsize} = $fontsize;
1560 $self->reflow;
1561}
1562
1563sub text_height {
1564 my ($self, $text) = @_;
1565
1566 my $layout = $self->{layout};
1567
1568 $layout->set_height ($self->{fontsize});
1569 $layout->set_width ($self->{w});
1570 $layout->set_text ($text);
1408 } 1571
1409 glEnd; 1572 ($layout->size)[1]
1573}
1574
1575sub reflow {
1576 my ($self) = @_;
1577
1578 $self->{need_reflow}++;
1579 $self->update;
1580}
1581
1582sub size_request {
1583 my ($self) = @_;
1584
1585 ($self->{req_w}, $self->{req_h})
1586}
1587
1588sub size_allocate {
1589 my ($self, $x, $y, $w, $h) = @_;
1590
1591 $self->SUPER::size_allocate ($x, $y, $w, $h);
1592
1593 $self->{layout}->set_height ($self->{fontsize});
1594 $self->{layout}->set_width ($self->{w});
1595
1596 $self->reflow;
1597}
1598
1599sub add_paragraph {
1600 my ($self, $color, $text) = @_;
1601
1602 #TODO: intelligently "reformat" paragraph
1603
1604 my $height = $self->text_height ($text);
1605
1606 $self->{height} += $height;
1607
1608 push @{$self->{par}}, [$height, $color, $text];
1609
1610 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1611 $self->{children}[1]->update;
1612}
1613
1614sub update {
1615 my ($self) = @_;
1616
1617 $self->SUPER::update;
1618
1619 return unless $self->{h} > 0;
1620
1621 delete $self->{texture};
1622
1623 $ROOT->on_refresh ($self, sub {
1624 if (delete $self->{need_reflow}) {
1625 my $height = 0;
1626
1627 $height += $_->[0] = $self->text_height ($_->[2])
1628 for @{$self->{par}};
1629
1630 $self->{height} = $height;
1631
1632 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1633
1634 delete $self->{texture};
1635 }
1636
1637 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1638 glClearColor 0, 0, 0, 1;
1639 glClear GL_COLOR_BUFFER_BIT;
1640
1641 glEnable GL_BLEND;
1642 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1643 glEnable GL_TEXTURE_2D;
1644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645
1646 my $top = int $self->{children}[1]{range}[0];
1647
1648 my $y0 = $top;
1649 my $y1 = $top + $self->{h};
1650
1651 my $y = 0;
1652
1653 my $layout = $self->{layout};
1654
1655 for my $par (@{$self->{par}}) {
1656 my $h = $par->[0];
1657
1658 if ($y0 < $y + $h && $y < $y1) {
1659 $layout->set_text ($par->[2]);
1660
1661 glColor @{ $par->[1] };
1662 my ($W, $H) = $layout->size;
1663 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1664 }
1665
1666 $y += $h;
1667 }
1668
1669 glDisable GL_TEXTURE_2D;
1670 glDisable GL_BLEND;
1671 };
1672 });
1673}
1674
1675sub _draw {
1676 my ($self) = @_;
1677
1678 if ($self->{texture}) {
1679 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1682 glDisable GL_TEXTURE_2D;
1683 }
1684
1685 $self->{children}[1]->draw;
1686
1410} 1687}
1411 1688
1412############################################################################# 1689#############################################################################
1413 1690
1414package CFClient::UI::MapWidget; 1691package CFClient::UI::MapWidget;
… …
1424 1701
1425sub new { 1702sub new {
1426 my $class = shift; 1703 my $class = shift;
1427 1704
1428 $class->SUPER::new ( 1705 $class->SUPER::new (
1429 z => -1, 1706 z => -1,
1707 can_focus => 1,
1430 list => (glGenLists 1), 1708 list => (glGenLists 1),
1431 @_ 1709 @_
1432 ) 1710 )
1433} 1711}
1434 1712
1435sub key_down { 1713sub key_down {
1436 print "MAPKEYDOWN\n"; 1714 print "MAPKEYDOWN\n";
1437} 1715}
1438 1716
1439sub key_up { 1717sub key_up {
1718}
1719
1720sub button_down {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 $self->focus_in;
1724
1725 if ($ev->button == 2) {
1726 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1727 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1728
1729 $self->{motion} = sub {
1730 my ($ev, $x, $y) = @_;
1731
1732 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1733
1734 $::CFG->{map_shift_x} = $bw + $x - $ox;
1735 $::CFG->{map_shift_y} = $bh + $y - $oy;
1736
1737 $self->update;
1738 };
1739 }
1740}
1741
1742sub button_up {
1743 my ($self, $ev, $x, $y) = @_;
1744
1745 delete $self->{motion};
1746}
1747
1748sub mouse_motion {
1749 my ($self, $ev, $x, $y) = @_;
1750
1751 $self->{motion}->($ev, $x, $y) if $self->{motion};
1440} 1752}
1441 1753
1442sub size_request { 1754sub size_request {
1443 ( 1755 (
1444 1 + 32 * int $::WIDTH / 32, 1756 1 + 32 * int $::WIDTH / 32,
… …
1454} 1766}
1455 1767
1456sub draw { 1768sub draw {
1457 my ($self) = @_; 1769 my ($self) = @_;
1458 1770
1459 $self->{need_update}++;#d#
1460 if (delete $self->{need_update}) { 1771 if (delete $self->{need_update}) {
1461 glNewList $self->{list}, GL_COMPILE; 1772 glNewList $self->{list}, GL_COMPILE;
1462 1773
1463 my $sw = int $::WIDTH / 32;
1464 my $sh = int $::HEIGHT / 32;
1465
1466 if ($::MAP) { 1774 if ($::MAP) {
1775 my $sw = int $::WIDTH / 32;
1776 my $sh = int $::HEIGHT / 32;
1777
1778 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1779 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1780
1781 glTranslate $sx0 - 32, $sy0 - 32, 0;
1782
1467 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1783 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1468 1784
1469 if ($::CFG->{fow_enable}) { 1785 if ($::CFG->{fow_enable}) {
1470 if ($::CFG->{fow_smooth}) { # smooth fog of war 1786 if ($::CFG->{fow_smooth}) { # smooth fog of war
1471 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1787 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1472 glConvolutionFilter2D 1788 glConvolutionFilter2D
… …
1480 0.1, 0.1, 0.1, 1796 0.1, 0.1, 0.1,
1481 ; 1797 ;
1482 glEnable GL_CONVOLUTION_2D; 1798 glEnable GL_CONVOLUTION_2D;
1483 } 1799 }
1484 1800
1485 my $tex = new CFClient::Texture 1801 $self->{fow_texture} = new CFClient::Texture
1486 w => $w, 1802 w => $w,
1487 h => $h, 1803 h => $h,
1488 data => $data, 1804 data => $data,
1489 internalformat => GL_ALPHA, 1805 internalformat => GL_ALPHA,
1490 format => GL_ALPHA; 1806 format => GL_ALPHA;
1491 1807
1492 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1808 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1493 1809
1494 glEnable GL_BLEND; 1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1495 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1497 1814
1498 glColor +($::CFG->{fow_intensity}) x 3, 1; 1815 glColor +($::CFG->{fow_intensity}) x 3, 1;
1499 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1816 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1500 1817
1501 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1502 glDisable GL_BLEND; 1819 glDisable GL_BLEND;
1503 } 1820 }
1821
1822 # HACK BEGIN
1823 {
1824 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1825 my ($w, $h) = (250, 250);
1826
1827 glEnable GL_BLEND;
1828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1829 glEnable GL_TEXTURE_2D;
1830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1831
1832 $self->{mapmap_texture} =
1833 new CFClient::Texture
1834 w => $w,
1835 h => $h,
1836 data => $::MAP->mapmap ($w, $h),
1837 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1838
1839 $self->{mapmap_texture}->draw_quad (100, 100);
1840
1841 glDisable GL_TEXTURE_2D;
1842 glDisable GL_BLEND;
1843 }
1844 # HACK END
1504 } 1845 }
1505 1846
1506 glEndList; 1847 glEndList;
1507 } 1848 }
1508 1849
1850 glPushMatrix;
1509 glCallList $self->{list}; 1851 glCallList $self->{list};
1852 glPopMatrix;
1510 1853
1511 if ($FOCUS != $self) { 1854 if ($FOCUS != $self) {
1512 glEnable GL_BLEND; 1855 glColor 64/255, 64/255, 64/255;
1513 glColor 0, 0, 1, 0.4; 1856 glLogicOp GL_AND;
1857 glEnable GL_COLOR_LOGIC_OP;
1514 glBegin GL_QUADS; 1858 glBegin GL_QUADS;
1515 glVertex 0, 0; 1859 glVertex 0, 0;
1516 glVertex 0, $::HEIGHT; 1860 glVertex 0, $::HEIGHT;
1517 glVertex $::WIDTH, $::HEIGHT; 1861 glVertex $::WIDTH, $::HEIGHT;
1518 glVertex $::WIDTH, 0; 1862 glVertex $::WIDTH, 0;
1519 glEnd; 1863 glEnd;
1520 glDisable GL_BLEND; 1864 glDisable GL_COLOR_LOGIC_OP;
1521 } 1865 }
1522} 1866}
1523 1867
1524my %DIR = ( 1868my %DIR = (
1525 SDLK_KP8, [1, "north"], 1869 SDLK_KP8, [1, "north"],
… …
1542 1886
1543 my $mod = $ev->key_mod; 1887 my $mod = $ev->key_mod;
1544 my $sym = $ev->key_sym; 1888 my $sym = $ev->key_sym;
1545 1889
1546 if ($sym == SDLK_KP5) { 1890 if ($sym == SDLK_KP5) {
1547 $::CONN->user_send ("command stay fire"); 1891 $::CONN->user_send ("stay fire");
1548 } elsif ($sym == SDLK_a) { 1892 } elsif ($sym == SDLK_a) {
1549 $::CONN->user_send ("command apply"); 1893 $::CONN->user_send ("apply");
1894 } elsif ($sym == SDLK_QUOTE) {
1895 $self->emit ('activate_console');
1896 } elsif ($sym == SDLK_SLASH) {
1897 $self->emit ('activate_console' => '/');
1550 } elsif (exists $DIR{$sym}) { 1898 } elsif (exists $DIR{$sym}) {
1551 if ($mod & KMOD_SHIFT) { 1899 if ($mod & KMOD_SHIFT) {
1552 $self->{shft}++; 1900 $self->{shft}++;
1553 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 1901 $::CONN->user_send ("fire $DIR{$sym}[0]");
1554 } elsif ($mod & KMOD_CTRL) { 1902 } elsif ($mod & KMOD_CTRL) {
1555 $self->{ctrl}++; 1903 $self->{ctrl}++;
1556 $::CONN->user_send ("command run $DIR{$sym}[0]"); 1904 $::CONN->user_send ("run $DIR{$sym}[0]");
1557 } else { 1905 } else {
1558 $::CONN->user_send ("command $DIR{$sym}[1]"); 1906 $::CONN->user_send ("$DIR{$sym}[1]");
1559 } 1907 }
1560 } 1908 }
1561} 1909}
1562 1910
1563sub key_up { 1911sub key_up {
… …
1565 1913
1566 my $mod = $ev->key_mod; 1914 my $mod = $ev->key_mod;
1567 my $sym = $ev->key_sym; 1915 my $sym = $ev->key_sym;
1568 1916
1569 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1917 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1570 $::CONN->user_send ("command fire_stop"); 1918 $::CONN->user_send ("fire_stop");
1571 } 1919 }
1572 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1920 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1573 $::CONN->user_send ("command run_stop"); 1921 $::CONN->user_send ("run_stop");
1574 } 1922 }
1575} 1923}
1576 1924
1577############################################################################# 1925#############################################################################
1578 1926
… …
1640} 1988}
1641 1989
1642sub toggle_flopper { 1990sub toggle_flopper {
1643 my ($self) = @_; 1991 my ($self) = @_;
1644 1992
1993 # TODO: use animation
1645 if ($self->{state} = !$self->{state}) { 1994 if ($self->{state} = !$self->{state}) {
1646 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1995 $CFClient::UI::ROOT->add ($self->{other});
1647 $self->{other}->move ( 1996 $self->{other}->move ($self->coord2global (0, $self->{h}));
1648 ($::WIDTH - $self->{other}{w}) * 0.5, 1997 $self->emit ("open");
1649 ($::HEIGHT - $self->{other}{h}) * 0.5,
1650 );
1651 } else { 1998 } else {
1652 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1999 $CFClient::UI::ROOT->remove ($self->{other});
2000 $self->emit ("close");
1653 } 2001 }
1654}
1655 2002
1656############################################################################# 2003 $self->emit (changed => $self->{state});
2004}
1657 2005
2006#############################################################################
2007
1658package CFClient::UI::Toplevel; 2008package CFClient::UI::Root;
1659 2009
1660our @ISA = CFClient::UI::Container::; 2010our @ISA = CFClient::UI::Container::;
2011
2012use SDL::OpenGL;
1661 2013
1662sub size_request { 2014sub size_request {
1663 ($::WIDTH, $::HEIGHT) 2015 ($::WIDTH, $::HEIGHT)
1664} 2016}
1665 2017
… …
1670 2022
1671 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2023 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1672 for @{$self->{children}}; 2024 for @{$self->{children}};
1673} 2025}
1674 2026
1675sub translate { 2027sub _topleft {
1676 my ($self, $x, $y) = @_; 2028 my ($self, $x, $y) = @_;
1677 2029
1678 ($x, $y) 2030 ($x, $y)
1679} 2031}
1680 2032
… …
1688sub add { 2040sub add {
1689 my ($self, $widget) = @_; 2041 my ($self, $widget) = @_;
1690 2042
1691 $self->SUPER::add ($widget); 2043 $self->SUPER::add ($widget);
1692 2044
1693 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2045 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2046}
2047
2048sub on_refresh {
2049 my ($self, $id, $cb) = @_;
2050
2051 $self->{refresh_hook}{$id} = $cb;
1694} 2052}
1695 2053
1696sub draw { 2054sub draw {
1697 my ($self) = @_; 2055 my ($self) = @_;
1698 2056
2057 while (my $rcb = delete $self->{refresh_hook}) {
2058 $_->() for values %$rcb;
2059 }
2060
2061 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2062 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2063 glClear GL_COLOR_BUFFER_BIT;
2064
2065 glMatrixMode GL_PROJECTION;
2066 glLoadIdentity;
2067 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2068 glMatrixMode GL_MODELVIEW;
2069 glLoadIdentity;
2070
1699 $self->_draw; 2071 $self->_draw;
1700} 2072}
1701 2073
1702############################################################################# 2074#############################################################################
1703 2075
1704package CFClient::UI; 2076package CFClient::UI;
1705 2077
1706$TOPLEVEL = new CFClient::UI::Toplevel; 2078$ROOT = new CFClient::UI::Root;
1707 2079
17081 20801
1709 2081

Diff Legend

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