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

Diff Legend

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