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

Diff Legend

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