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.78 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.119 by root, Sun Apr 16 07:25:30 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;
… …
79use SDL::OpenGL; 92use SDL::OpenGL;
80 93
81sub new { 94sub new {
82 my $class = shift; 95 my $class = shift;
83 96
84 bless { 97 my $self = bless {
85 x => 0, 98 x => 0,
86 y => 0, 99 y => 0,
87 z => 0, 100 z => 0,
88 w => -1, 101 w => -1,
89 h => -1, 102 h => -1,
90 @_ 103 @_
91 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
92} 113}
93 114
94sub move { 115sub move {
95 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 117 $self->{x} = int $x;
97 $self->{y} = $y; 118 $self->{y} = int $y;
98 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
99} 120}
100 121
101sub needs_redraw { 122sub needs_redraw {
102 0 123 0
… …
125 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
126 147
127 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
128} 149}
129 150
130# translate global koordinates to local coordinate system 151# return top left coordinates
131sub translate { 152sub _topleft {
132 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
133 154
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
135} 172}
136 173
137sub focus_in { 174sub focus_in {
138 my ($self) = @_; 175 my ($self) = @_;
139 176
140 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
141 179
142 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
143 $focus->update if $focus; 181 $focus->update if $focus;
144 $FOCUS->update; 182 $FOCUS->update;
145} 183}
… …
178 glPushMatrix; 216 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 217 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 218 $self->_draw;
181 glPopMatrix; 219 glPopMatrix;
182 220
183 if ($self == $HOVER) { 221 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 222 my ($x, $y) = @$self{qw(x y)};
185 223
186 glColor 0, 0, 1, 0.2; 224 glColor 0, 0, 1, 0.2;
187 glEnable GL_BLEND; 225 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
211 249
212 () 250 ()
213} 251}
214 252
215sub set_parent { 253sub set_parent {
216 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
217 255
218 $self->{parent} = $par;
219 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
220}
221
222sub get_parent {
223 $_[0]->{parent}
224} 257}
225 258
226sub update { 259sub update {
227 my ($self) = @_; 260 my ($self) = @_;
228 261
… …
263 296
264 # range [value, low, high, page] 297 # range [value, low, high, page]
265 298
266 $class->SUPER::new ( 299 $class->SUPER::new (
267 bg => [0, 0, 0, 0.2], 300 bg => [0, 0, 0, 0.2],
268 active_bg => [1, 1, 1], 301 active_bg => [1, 1, 1, 0.5],
269 @_ 302 @_
270 ) 303 )
271} 304}
272 305
273sub _draw { 306sub _draw {
… …
317 350
318 $self 351 $self
319} 352}
320 353
321sub add { 354sub add {
322 my ($self, $chld) = @_; 355 my ($self, $child) = @_;
323 356
324 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
325 360
326 $self->{children} = [ 361 $self->{children} = [
327 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
328 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
329 ]; 364 ];
330 365
331 $self->{w} = $self->{h} = -1; 366 $self->{w} = $self->{h} = -1;
332 $self->update; 367 $self->update;
333} 368}
… …
430} 465}
431 466
432sub render_chld { 467sub render_chld {
433 my ($self) = @_; 468 my ($self) = @_;
434 469
435 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
436 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
437 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
438 ); 473 $self->child->draw;
474 };
439} 475}
440 476
441sub size_allocate { 477sub size_allocate {
442 my ($self, $x, $y, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
443 479
… …
521 557
522my @tex = 558my @tex =
523 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
524 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);
525 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
526sub size_request { 575sub size_request {
527 my ($self) = @_; 576 my ($self) = @_;
528 577
529 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};
530 579
531 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
532 581
533 $h += $tex[1]->{h}; 582 (
534 $h += $tex[4]->{h}; 583 $w + $self->{border} * 2,
535 $w += $tex[2]->{w}; 584 $h + $self->{border} * 2,
536 $w += $tex[3]->{w}; 585 )
537
538 ($w, $h)
539} 586}
540 587
541sub size_allocate { 588sub size_allocate {
542 my ($self, $x, $y, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
543 590
544 $self->_size_allocate ($x, $y, $w, $h) or return; 591 $self->_size_allocate ($x, $y, $w, $h) or return;
545 592
546 $h -= $tex[1]{h}; 593 $h -= List::Util::max 0, $self->{border} * 2;
547 $h -= $tex[4]{h}; 594 $w -= List::Util::max 0, $self->{border} * 2;
548 $w -= $tex[2]{w};
549 $w -= $tex[3]{w};
550 595
551 $h = $h < 0 ? 0 : $h; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
552 $w = $w < 0 ? 0 : $w;
553
554 my $child = $self->child;
555
556 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
557} 597}
558 598
559sub button_down { 599sub button_down {
560 my ($self, $ev, $x, $y) = @_; 600 my ($self, $ev, $x, $y) = @_;
561 601
562 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
563 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
564 604
565 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 605 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
566 my ($bw, $bh) = ($self->{w}, $self->{h}); 606 my ($bw, $bh) = ($self->{w}, $self->{h});
567 607
568 $self->{motion} = sub { 608 $self->{motion} = sub {
… …
574 $self->{user_h} = $bh + $y - $oy; 614 $self->{user_h} = $bh + $y - $oy;
575 $self->update; 615 $self->update;
576 }; 616 };
577 617
578 } elsif ($x >= 0 && $x < $self->{w} 618 } elsif ($x >= 0 && $x < $self->{w}
579 && $y >= 0 && $y < $tex[1]{h}) { 619 && $y >= 0 && $y < $self->{border}) {
580 620
581 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 621 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
582 my ($bx, $by) = ($self->{x}, $self->{y}); 622 my ($bx, $by) = ($self->{x}, $self->{y});
583 623
584 $self->{motion} = sub { 624 $self->{motion} = sub {
… …
605} 645}
606 646
607sub _draw { 647sub _draw {
608 my ($self) = @_; 648 my ($self) = @_;
609 649
610 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
611 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
612 652
613 glEnable GL_BLEND; 653 glEnable GL_BLEND;
614 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
615 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
617 657
618 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
619 $top->draw_quad (0, 0, $w, $top->{h}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
620 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
621 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
622 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
623
624 my $right = $tex[2];
625 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
626
627 my $bottom = $tex[4];
628 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
629 663
630 my $bg = $tex[0]; 664 my $bg = $tex[0];
631 665
632 glBindTexture GL_TEXTURE_2D, $bg->{name}; 666 # TODO: repeat texture not scale
633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
634 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
635 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
636
637 my $rep_x = $cw / $bg->{w}; 667 my $rep_x = $cw / $bg->{w};
638 my $rep_y = $ch / $bg->{h}; 668 my $rep_y = $ch / $bg->{h};
639 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
640 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
641 676
642 glDisable GL_TEXTURE_2D; 677 glDisable GL_TEXTURE_2D;
643 glDisable GL_BLEND; 678 glDisable GL_BLEND;
644 679
645 $self->child->draw; 680 $self->child->draw;
646
647} 681}
648 682
649############################################################################# 683#############################################################################
650 684
651package CFClient::UI::Table; 685package CFClient::UI::Table;
… …
664 @_ 698 @_
665 ) 699 )
666} 700}
667 701
668sub add { 702sub add {
669 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
670 704
705 $child->set_parent ($self);
671 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
672 $chld->set_parent ($self);
673 707
674 $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};
675 $self->update; 717 $self->update;
676} 718}
677 719
678sub get_wh { 720sub get_wh {
679 my ($self) = @_; 721 my ($self) = @_;
… …
725 767
726 # linearly scale sizes 768 # linearly scale sizes
727 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729 771
772 CFClient::UI::harmonize $ws;
773 CFClient::UI::harmonize $hs;
774
730 my $y; 775 my $y;
731 776
732 for my $r (0 .. $#{$self->{children}}) { 777 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 778 my $row = $self->{children}[$r]
734 or next; 779 or next;
735 780
736 my $x = 0; 781 my $x = 0;
737 my $row_h = $hs->[$r]; 782 my $row_h = $hs->[$r];
738 783
739 for my $c (0 .. $#$row) { 784 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 785 my $col_w = $ws->[$c];
744 786
787 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 788 $widget->size_allocate ($x, $y, $col_w, $row_h);
789 }
746 790
747 $x += $col_w; 791 $x += $col_w;
748 } 792 }
749 793
750 $y += $row_h; 794 $y += $row_h;
… …
796} 840}
797 841
798sub size_allocate { 842sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 843 my ($self, $x, $y, $w, $h) = @_;
800 844
801 $self->_size_allocate ($x, $y, $w, $h) or return; 845 $self->_size_allocate ($x, $y, $w, $h);
802
803 return unless $self->{w};
804 846
805 ($h, $w) = ($w, $h); 847 ($h, $w) = ($w, $h);
806 848
807 my $children = $self->{children}; 849 my $children = $self->{children};
808 850
… …
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 866 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 867 $h[$_] = $alloc_h;
826 } 868 }
827 } 869 }
828 870
871 CFClient::UI::harmonize \@h;
872
829 my $y = 0; 873 my $y = 0;
830 for (0 .. $#$children) { 874 for (0 .. $#$children) {
831 my $child = $children->[$_]; 875 my $child = $children->[$_];
832 my $h = $h[$_]; 876 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 877 $child->size_allocate ($y, 0, $h, $w);
… …
856} 900}
857 901
858sub size_allocate { 902sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 903 my ($self, $x, $y, $w, $h) = @_;
860 904
861 $self->_size_allocate ($x, $y, $w, $h) or return; 905 $self->_size_allocate ($x, $y, $w, $h);
862
863 return unless $self->{h};
864 906
865 my $children = $self->{children}; 907 my $children = $self->{children};
866 908
867 my @h = map +($_->size_request)[1], @$children; 909 my @h = map +($_->size_request)[1], @$children;
868 910
… …
880 922
881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
882 } 924 }
883 } 925 }
884 926
927 CFClient::UI::harmonize \@h;
928
885 my $y = 0; 929 my $y = 0;
886 for (0 .. $#$children) { 930 for (0 .. $#$children) {
887 my $child = $children->[$_]; 931 my $child = $children->[$_];
888 my $h = $h[$_]; 932 my $h = $h[$_];
889 $child->size_allocate (0, $y, $w, $h); 933 $child->size_allocate (0, $y, $w, $h);
… …
902 946
903sub new { 947sub new {
904 my ($class, %arg) = @_; 948 my ($class, %arg) = @_;
905 949
906 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
907 fg => [1, 1, 1], 951 fg => [1, 1, 1],
908 height => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
909 text => "", 953 text => "",
910 align => -1, 954 align => -1,
955 valign => -1,
911 padding => 2, 956 padding => 2,
912 layout => new CFClient::Layout, 957 layout => new CFClient::Layout,
913 %arg 958 %arg
914 ); 959 );
915 960
916 $self->set_text ($self->{text}); 961 $self->set_text ($self->{text});
917 962
… …
933 978
934 $self->{text} = $text; 979 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 980 $self->{layout}->set_markup ($text);
936 981
937 delete $self->{texture}; 982 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
938 $self->update; 984 $self->update;
939} 985}
940 986
941sub get_text { 987sub get_text {
942 my ($self, $text) = @_; 988 my ($self, $text) = @_;
… …
946 992
947sub size_request { 993sub size_request {
948 my ($self) = @_; 994 my ($self) = @_;
949 995
950 $self->{layout}->set_width; 996 $self->{layout}->set_width;
951 $self->{layout}->set_height ($self->{height}); 997 $self->{layout}->set_height ($self->{fontsize});
952 my ($w, $h) = $self->{layout}->size; 998 my ($w, $h) = $self->{layout}->size;
953 999
954 ( 1000 (
955 $w + $self->{padding} * 2, 1001 $w + $self->{padding} * 2,
956 $h + $self->{padding} * 2, 1002 $h + $self->{padding} * 2,
… …
975sub _draw { 1021sub _draw {
976 my ($self) = @_; 1022 my ($self) = @_;
977 1023
978 my $tex = $self->{texture} ||= do { 1024 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 1025 $self->{layout}->set_width ($self->{w});
980 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 1026 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
981 new_from_layout CFClient::Texture $self->{layout} 1027 new_from_layout CFClient::Texture $self->{layout}
982 }; 1028 };
983 1029
984 glEnable GL_BLEND; 1030 glEnable GL_BLEND;
985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
986 glEnable GL_TEXTURE_2D; 1032 glEnable GL_TEXTURE_2D;
987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
988 1034
989 glColor @{$self->{fg}}; 1035 glColor @{$self->{fg}};
990 1036
991 my $x = 1037 my $x =
992 $self->{align} < 0 ? $self->{padding} 1038 $self->{align} < 0 ? $self->{padding}
993 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994 : ($self->{w} - $tex->{w}) * 0.5; 1040 : ($self->{w} - $tex->{w}) * 0.5;
995 1041
996 $tex->draw_quad ($x, $self->{padding}); 1042 my $y =
1043 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5;
1046
1047 $tex->draw_quad (int $x, int $y);
997 1048
998 glDisable GL_TEXTURE_2D; 1049 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1050 glDisable GL_BLEND;
1000} 1051}
1001 1052
… …
1012 my $class = shift; 1063 my $class = shift;
1013 1064
1014 $class->SUPER::new ( 1065 $class->SUPER::new (
1015 fg => [1, 1, 1], 1066 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2], 1067 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1], 1068 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1069 active_fg => [0, 0, 0],
1070 can_hover => 1,
1071 can_focus => 1,
1072 valign => 0,
1019 @_ 1073 @_
1020 ) 1074 )
1021} 1075}
1022 1076
1023sub _set_text { 1077sub _set_text {
1024 my ($self, $text) = @_; 1078 my ($self, $text) = @_;
1025 1079
1080 my $old_text = $self->{text};
1081
1026 $self->{last_activity} = $::NOW; 1082 $self->{last_activity} = $::NOW;
1027 1083
1028 $self->{text} = $text; 1084 $self->{text} = $text;
1029 $self->{layout}->set_width ($self->{w}); 1085 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1030 1087
1031 $text =~ s/./*/g if $self->{hidden}; 1088 $text =~ s/./*/g if $self->{hidden};
1032 1089
1033 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1090 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1034 1091
1035 $text = substr $text, 0, $self->{cursor}; 1092 $text = substr $text, 0, $self->{cursor};
1036 utf8::encode $text; 1093 utf8::encode $text;
1037 1094
1038 @$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};
1039} 1099}
1040 1100
1041sub size_request { 1101sub size_request {
1042 my ($self) = @_; 1102 my ($self) = @_;
1043 1103
… …
1082 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1142 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1083 } elsif ($sym == SDLK_HOME) { 1143 } elsif ($sym == SDLK_HOME) {
1084 $self->{cursor} = 0; 1144 $self->{cursor} = 0;
1085 } elsif ($sym == SDLK_END) { 1145 } elsif ($sym == SDLK_END) {
1086 $self->{cursor} = length $text; 1146 $self->{cursor} = length $text;
1147 } elsif ($sym == SDLK_ESCAPE) {
1148 $self->emit ('escape');
1087 } elsif ($uni) { 1149 } elsif ($uni) {
1088 substr $text, $self->{cursor}++, 0, chr $uni; 1150 substr $text, $self->{cursor}++, 0, chr $uni;
1089 } 1151 }
1090 1152
1091 $self->_set_text ($text); 1153 $self->_set_text ($text);
… …
1153 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1215 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1154 glEnd; 1216 glEnd;
1155 } 1217 }
1156} 1218}
1157 1219
1158#############################################################################
1159
1160package CFClient::UI::Slider; 1220package CFClient::UI::LineEntry;
1161 1221
1162use strict; 1222our @ISA = CFClient::UI::Entry::;
1163 1223
1224use SDL;
1164use SDL::OpenGL; 1225use SDL::OpenGL;
1165 1226
1227sub key_down {
1228 my ($self, $ev) = @_;
1229
1230 my $sym = $ev->key_sym;
1231
1232 if ($sym == SDLK_RETURN) {
1233 $self->emit (activate => $self->get_text);
1234 $self->update;
1235
1236 } else {
1237 $self->SUPER::key_down ($ev);
1238 }
1239
1240}
1241
1242#############################################################################
1243
1244package CFClient::UI::Button;
1245
1166our @ISA = CFClient::UI::DrawBG::; 1246our @ISA = CFClient::UI::Label::;
1247
1248use SDL;
1249use SDL::OpenGL;
1250
1251my @tex =
1252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1253 qw(b1_button_active.png);
1167 1254
1168sub new { 1255sub new {
1169 my $class = shift; 1256 my $class = shift;
1170 1257
1258 $class->SUPER::new (
1259 padding => 4,
1260 fg => [1, 1, 1],
1261 bg => [1, 1, 1, 0.2],
1262 active_fg => [1, 1, 0],
1263 can_hover => 1,
1264 @_
1265 )
1266}
1267
1268sub button_up {
1269 my ($self, $ev, $x, $y) = @_;
1270
1271 if ($x >= 0 && $x < $self->{w}
1272 && $y >= 0 && $y < $self->{h}) {
1273 $self->emit ("activate");
1274 }
1275}
1276
1277sub _draw {
1278 my ($self) = @_;
1279
1280 local $self->{fg} = $self->{fg};
1281
1282 if ($GRAB == $self) {
1283 $self->{fg} = $self->{active_fg};
1284 }
1285
1286 glEnable GL_BLEND;
1287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1288 glEnable GL_TEXTURE_2D;
1289 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1290 glColor 0, 0, 0, 1;
1291
1292 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1293
1294 glDisable GL_TEXTURE_2D;
1295 glDisable GL_BLEND;
1296
1297 $self->SUPER::_draw;
1298}
1299
1300#############################################################################
1301
1302package CFClient::UI::CheckBox;
1303
1304our @ISA = CFClient::UI::DrawBG::;
1305
1306my @tex =
1307 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1308 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1309
1310use SDL;
1311use SDL::OpenGL;
1312
1313sub new {
1314 my $class = shift;
1315
1316 $class->SUPER::new (
1317 padding => 2,
1318 fg => [1, 1, 1],
1319 active_fg => [1, 1, 0],
1320 state => 0,
1321 can_hover => 1,
1322 @_
1323 )
1324}
1325
1326sub size_request {
1327 my ($self) = @_;
1328
1329 ($self->{padding} * 2 + 6) x 2
1330}
1331
1332sub size_allocate {
1333 my ($self, $x, $y, $w, $h) = @_;
1334
1335 $self->_size_allocate ($x, $y, $w, $h);
1336}
1337
1338sub button_down {
1339 my ($self, $ev, $x, $y) = @_;
1340
1341 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1342 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1343 $self->{state} = !$self->{state};
1344 $self->emit (changed => $self->{state});
1345 }
1346}
1347
1348sub _draw {
1349 my ($self) = @_;
1350
1351 $self->SUPER::_draw;
1352
1353 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1354
1355 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1356
1357 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1358
1359 glEnable GL_BLEND;
1360 glEnable GL_TEXTURE_2D;
1361 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1362
1363 my $tex = $self->{state} ? $tex[1] : $tex[0];
1364
1365 $tex->draw_quad (0, 0, $s, $s);
1366
1367 glDisable GL_TEXTURE_2D;
1368 glDisable GL_BLEND;
1369}
1370
1371#############################################################################
1372
1373package CFClient::UI::Slider;
1374
1375use strict;
1376
1377use SDL::OpenGL;
1378
1379our @ISA = CFClient::UI::DrawBG::;
1380
1381my @tex =
1382 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1383 qw(s1_slider.png s1_slider_bg.png);
1384
1385sub new {
1386 my $class = shift;
1387
1171 # range [value, low, high, page] 1388 # range [value, low, high, page]
1172 1389
1390 # TODO: 0-width page
1391 # TODO: req_w/h are wrong with vertical
1392 # TODO: calculations are off
1173 my $self = $class->SUPER::new ( 1393 my $self = $class->SUPER::new (
1174 fg => [1, 1, 1], 1394 fg => [1, 1, 1],
1175 active_fg => [0, 0, 0], 1395 active_fg => [0, 0, 0],
1176 range => [0, 0, 100, 10], 1396 range => [0, 0, 100, 10],
1177 req_w => 40, 1397 req_w => 40,
1178 req_h => 10, 1398 req_h => 13,
1179 vertical => 0, 1399 vertical => 0,
1400 can_hover => 1,
1401 inner_pad => 5,
1180 @_ 1402 @_
1181 ); 1403 );
1182 1404
1183 $self 1405 $self
1184} 1406}
… …
1205 if ($GRAB == $self) { 1427 if ($GRAB == $self) {
1206 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1428 my ($value, $lo, $hi, $page) = @{$self->{range}};
1207 1429
1208 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1209 1431
1432 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1433 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1434
1435 $x -= $inner_pad_px; # substract the padding
1210 $x = $x * ($hi - $lo) / $w + $lo; 1436 $x = $x * ($hi - $lo) / $inner_w + $lo;
1211 $x = $lo if $x < $lo; 1437 $x = $lo if $x < $lo;
1212 $x = $hi - $page if $x > $hi - $page; 1438 $x = $hi - $page if $x > $hi - $page;
1213 $self->{range}[0] = $x; 1439 $self->{range}[0] = $x;
1214 1440
1215 $self->emit (changed => $x); 1441 $self->emit (changed => $x);
1216 $self->update; 1442 $self->update;
1217 } 1443 }
1444}
1445
1446# the inner_* stuff is for generating a padding for the slider handle,
1447# so that the handle doesn't leave the texture. This calculation isn't 100%
1448# correct propably, but it does the job for now
1449sub _calc_inner_pad_px {
1450 my ($self, $w) = @_;
1451 ($w / 100) * $self->{inner_pad} # % to pixels
1218} 1452}
1219 1453
1220sub _draw { 1454sub _draw {
1221 my ($self) = @_; 1455 my ($self) = @_;
1222 1456
… …
1236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1470 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1471 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1238 1472
1239 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1473 my ($value, $lo, $hi, $page) = @{$self->{range}};
1240 1474
1475 $hi = $value + 1 if $lo == $hi;
1476
1477 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1478 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1479
1241 $page = int $page * $w / ($hi - $lo); 1480 $page = int $page * $inner_w / ($hi - $lo);
1242 $value = int +($value - $lo) * $w / ($hi - $lo); 1481 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1243 1482
1244 $w -= $page; 1483 $w -= $page;
1245 $page &= ~1; 1484 $page &= ~1;
1246 glTranslate $page * 0.5, 0, 0; 1485 glTranslate $page * 0.5, 0, 0;
1486 $page ||= 2;
1247 1487
1248 glColor @$fg;
1249 glBegin GL_LINES;
1250 glVertex 0, 0; glVertex 0, $h;
1251 glVertex $w - 1, 0; glVertex $w - 1, $h;
1252 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1253 glEnd;
1254
1255 my $knob_a = $value - $page * 0.5; 1488 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1256 my $knob_b = $value + $page * 0.5; 1489 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1257 1490
1258 glBegin GL_QUADS; 1491 glEnable GL_BLEND;
1259 glColor @$fg; 1492 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1260 glVertex $knob_a, 0; 1493 glEnable GL_TEXTURE_2D;
1261 glVertex $knob_a, $h; 1494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1262 glVertex $knob_b, $h;
1263 glVertex $knob_b, 0;
1264 1495
1265 if ($knob_a < $knob_b - 2) { 1496 # draw background
1266 glColor @$bg; 1497 $tex[1]->draw_quad (0, 0, $w, $h);
1267 glVertex $knob_a + 1, 1; 1498
1268 glVertex $knob_a + 1, $h - 1; 1499 # draw handle
1269 glVertex $knob_b - 1, $h - 1; 1500 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1270 glVertex $knob_b - 1, 1; 1501
1502 glDisable GL_BLEND;
1503 glDisable GL_TEXTURE_2D;
1504}
1505
1506#############################################################################
1507
1508package CFClient::UI::TextView;
1509
1510our @ISA = CFClient::UI::HBox::;
1511
1512use SDL::OpenGL;
1513
1514sub new {
1515 my $class = shift;
1516
1517 my $self = $class->SUPER::new (
1518 req_w => $::WIDTH / 6,
1519 req_h => $::HEIGHT / 6,
1520 fontsize => $::FONTSIZE,
1521 @_,
1522
1523 layout => (new CFClient::Layout),
1524 par => [],
1525 height => 0,
1526 children => [
1527 (new CFClient::UI::Empty expand => 1),
1528 (new CFClient::UI::Slider vertical => 1),
1529 ],
1530 );
1531
1532 $self->{children}[1]->connect (changed => sub {
1533 $self->update;
1534 });
1535
1536 $self
1537}
1538
1539sub set_fontsize {
1540 my ($self, $fontsize) = @_;
1541
1542 $self->{fontsize} = $fontsize;
1543 $self->reflow;
1544}
1545
1546sub text_height {
1547 my ($self, $text) = @_;
1548
1549 my $layout = $self->{layout};
1550
1551 $layout->set_height ($self->{fontsize});
1552 $layout->set_width ($self->{w});
1553 $layout->set_text ($text);
1271 } 1554
1272 glEnd; 1555 ($layout->size)[1]
1556}
1557
1558sub reflow {
1559 my ($self) = @_;
1560
1561 $self->{need_reflow}++;
1562 $self->update;
1563}
1564
1565sub size_request {
1566 my ($self) = @_;
1567
1568 ($self->{req_w}, $self->{req_h})
1569}
1570
1571sub size_allocate {
1572 my ($self, $x, $y, $w, $h) = @_;
1573
1574 $self->SUPER::size_allocate ($x, $y, $w, $h);
1575
1576 $self->{layout}->set_height ($self->{fontsize});
1577 $self->{layout}->set_width ($self->{w});
1578
1579 $self->reflow;
1580}
1581
1582sub add_paragraph {
1583 my ($self, $color, $text) = @_;
1584
1585 #TODO: intelligently "reformat" paragraph
1586
1587 my $height = $self->text_height ($text);
1588
1589 $self->{height} += $height;
1590
1591 push @{$self->{par}}, [$height, $color, $text];
1592
1593 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1594 $self->{children}[1]->update;
1595}
1596
1597sub update {
1598 my ($self) = @_;
1599
1600 $self->SUPER::update;
1601
1602 return unless $self->{h} > 0;
1603
1604 delete $self->{texture};
1605
1606 $ROOT->on_refresh ($self, sub {
1607 if (delete $self->{need_reflow}) {
1608 my $height = 0;
1609
1610 $height += $_->[0] = $self->text_height ($_->[2])
1611 for @{$self->{par}};
1612
1613 $self->{height} = $height;
1614
1615 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1616
1617 delete $self->{texture};
1618 }
1619
1620 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1621 glClearColor 0, 0, 0, 1;
1622 glClear GL_COLOR_BUFFER_BIT;
1623
1624 glEnable GL_BLEND;
1625 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1626 glEnable GL_TEXTURE_2D;
1627 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1628
1629 my $top = int $self->{children}[1]{range}[0];
1630
1631 my $y0 = $top;
1632 my $y1 = $top + $self->{h};
1633
1634 my $y = 0;
1635
1636 my $layout = $self->{layout};
1637
1638 for my $par (@{$self->{par}}) {
1639 my $h = $par->[0];
1640
1641 if ($y0 < $y + $h && $y < $y1) {
1642 $layout->set_text ($par->[2]);
1643
1644 glColor @{ $par->[1] };
1645 my ($W, $H) = $layout->size;
1646 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1647 }
1648
1649 $y += $h;
1650 }
1651
1652 glDisable GL_TEXTURE_2D;
1653 glDisable GL_BLEND;
1654 };
1655 });
1656}
1657
1658sub _draw {
1659 my ($self) = @_;
1660
1661 if ($self->{texture}) {
1662 glEnable GL_TEXTURE_2D;
1663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1664 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1665 glDisable GL_TEXTURE_2D;
1666 }
1667
1668 $self->{children}[1]->draw;
1669
1273} 1670}
1274 1671
1275############################################################################# 1672#############################################################################
1276 1673
1277package CFClient::UI::MapWidget; 1674package CFClient::UI::MapWidget;
… …
1287 1684
1288sub new { 1685sub new {
1289 my $class = shift; 1686 my $class = shift;
1290 1687
1291 $class->SUPER::new ( 1688 $class->SUPER::new (
1292 z => -1, 1689 z => -1,
1690 can_focus => 1,
1293 list => (glGenLists 1), 1691 list => (glGenLists 1),
1294 @_ 1692 @_
1295 ) 1693 )
1296} 1694}
1297 1695
1298sub key_down { 1696sub key_down {
1299 print "MAPKEYDOWN\n"; 1697 print "MAPKEYDOWN\n";
1300} 1698}
1301 1699
1302sub key_up { 1700sub key_up {
1701}
1702
1703sub button_down {
1704 my ($self, $ev, $x, $y) = @_;
1705
1706 $self->focus_in;
1707
1708 if ($ev->button == 2) {
1709 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1710 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1711
1712 $self->{motion} = sub {
1713 my ($ev, $x, $y) = @_;
1714
1715 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1716
1717 $::CFG->{map_shift_x} = $bw + $x - $ox;
1718 $::CFG->{map_shift_y} = $bh + $y - $oy;
1719
1720 $self->update;
1721 };
1722 }
1723}
1724
1725sub button_up {
1726 my ($self, $ev, $x, $y) = @_;
1727
1728 delete $self->{motion};
1729}
1730
1731sub mouse_motion {
1732 my ($self, $ev, $x, $y) = @_;
1733
1734 $self->{motion}->($ev, $x, $y) if $self->{motion};
1303} 1735}
1304 1736
1305sub size_request { 1737sub size_request {
1306 ( 1738 (
1307 1 + 32 * int $::WIDTH / 32, 1739 1 + 32 * int $::WIDTH / 32,
… …
1320 my ($self) = @_; 1752 my ($self) = @_;
1321 1753
1322 if (delete $self->{need_update}) { 1754 if (delete $self->{need_update}) {
1323 glNewList $self->{list}, GL_COMPILE; 1755 glNewList $self->{list}, GL_COMPILE;
1324 1756
1325 my $mx = $::CONN->{mapx}; 1757 if ($::MAP) {
1326 my $my = $::CONN->{mapy};
1327
1328 my $map = $::CONN->{map};
1329
1330 my ($xofs, $yofs);
1331
1332 my $sw = 1 + int $::WIDTH / 32; 1758 my $sw = int $::WIDTH / 32;
1333 my $sh = 1 + int $::HEIGHT / 32; 1759 my $sh = int $::HEIGHT / 32;
1334 1760
1335 if ($::CONN->{mapw} > $sw) { 1761 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1336 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1762 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1337 } else { 1763
1338 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1764 glTranslate $sx0 - 32, $sy0 - 32, 0;
1765
1766 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1767
1768 if ($::CFG->{fow_enable}) {
1769 if ($::CFG->{fow_smooth}) { # smooth fog of war
1770 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1771 glConvolutionFilter2D
1772 GL_CONVOLUTION_2D,
1773 GL_ALPHA,
1774 3, 3,
1775 GL_ALPHA, GL_FLOAT,
1776 pack "f*",
1777 0.1, 0.1, 0.1,
1778 0.1, 0.2, 0.1,
1779 0.1, 0.1, 0.1,
1780 ;
1781 glEnable GL_CONVOLUTION_2D;
1782 }
1783
1784 $self->{fow_texture} = new CFClient::Texture
1785 w => $w,
1786 h => $h,
1787 data => $data,
1788 internalformat => GL_ALPHA,
1789 format => GL_ALPHA;
1790
1791 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1792
1793 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1795 glEnable GL_TEXTURE_2D;
1796 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1797
1798 glColor +($::CFG->{fow_intensity}) x 3, 1;
1799 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1800
1801 glDisable GL_TEXTURE_2D;
1802 glDisable GL_BLEND;
1803 }
1804
1805 # HACK BEGIN
1806 {
1807 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1808 my ($w, $h) = (250, 250);
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814
1815 $self->{mapmap_texture} =
1816 new CFClient::Texture
1817 w => $w,
1818 h => $h,
1819 data => $::MAP->mapmap ($w, $h),
1820 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1821
1822 $self->{mapmap_texture}->draw_quad (100, 100);
1823
1824 glDisable GL_TEXTURE_2D;
1825 glDisable GL_BLEND;
1826 }
1827 # HACK END
1339 } 1828 }
1340 1829
1341 if ($::CONN->{maph} > $sh) {
1342 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1343 } else {
1344 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1345 }
1346
1347 glEnable GL_TEXTURE_2D;
1348 glEnable GL_BLEND;
1349 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1351
1352 my $sw4 = ($sw + 3) & ~3;
1353 my $darkness = "\x00" x ($sw4 * $sh);
1354
1355 for my $x (0 .. $sw - 1) {
1356 my $row = $map->[$x + $xofs];
1357 for my $y (0 .. $sh - 1) {
1358
1359 my $cell = $row->[$y + $yofs]
1360 or next;
1361
1362 my $dark = $cell->[0];
1363 if ($dark < 0) {
1364 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1365 } else {
1366 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1367 }
1368
1369 for my $num (grep $_, @$cell[1,2,3]) {
1370 my $tex = $::CONN->{face}[$num]{texture} || next;
1371
1372 my ($w, $h) = @$tex{qw(w h)};
1373
1374 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1375 }
1376 }
1377 }
1378
1379# if (1) { # higher quality darkness
1380# $lighting =~ s/(.)/$1$1$1/gs;
1381# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1382#
1383# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1384#
1385# $lighting = $pb->get_pixels;
1386# $lighting =~ s/(.)../$1/gs;
1387# }
1388
1389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1390
1391 $darkness = new CFClient::Texture
1392 w => $sw4,
1393 h => $sh,
1394 data => $darkness,
1395 internalformat => GL_ALPHA,
1396 format => GL_ALPHA;
1397
1398 glColor 0.45, 0.45, 0.45, 1;
1399 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1400
1401 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403
1404 glEndList; 1830 glEndList;
1405 } 1831 }
1406 1832
1833 glPushMatrix;
1407 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 }
1408} 1849}
1409 1850
1410my %DIR = ( 1851my %DIR = (
1411 SDLK_KP8, [1, "north"], 1852 SDLK_KP8, [1, "north"],
1412 SDLK_KP9, [2, "northeast"], 1853 SDLK_KP9, [2, "northeast"],
… …
1428 1869
1429 my $mod = $ev->key_mod; 1870 my $mod = $ev->key_mod;
1430 my $sym = $ev->key_sym; 1871 my $sym = $ev->key_sym;
1431 1872
1432 if ($sym == SDLK_KP5) { 1873 if ($sym == SDLK_KP5) {
1433 $::CONN->send ("command stay fire"); 1874 $::CONN->user_send ("command stay fire");
1875 } elsif ($sym == SDLK_a) {
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' => '/');
1434 } elsif (exists $DIR{$sym}) { 1881 } elsif (exists $DIR{$sym}) {
1435 if ($mod & KMOD_SHIFT) { 1882 if ($mod & KMOD_SHIFT) {
1436 $self->{shft}++; 1883 $self->{shft}++;
1437 $::CONN->send ("command fire $DIR{$sym}[0]"); 1884 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1438 } elsif ($mod & KMOD_CTRL) { 1885 } elsif ($mod & KMOD_CTRL) {
1439 $self->{ctrl}++; 1886 $self->{ctrl}++;
1440 $::CONN->send ("command run $DIR{$sym}[0]"); 1887 $::CONN->user_send ("command run $DIR{$sym}[0]");
1441 } else { 1888 } else {
1442 $::CONN->send ("command $DIR{$sym}[1]"); 1889 $::CONN->user_send ("command $DIR{$sym}[1]");
1443 } 1890 }
1444 } 1891 }
1445} 1892}
1446 1893
1447sub key_up { 1894sub key_up {
… …
1449 1896
1450 my $mod = $ev->key_mod; 1897 my $mod = $ev->key_mod;
1451 my $sym = $ev->key_sym; 1898 my $sym = $ev->key_sym;
1452 1899
1453 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1900 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1454 $::CONN->send ("command fire_stop"); 1901 $::CONN->user_send ("command fire_stop");
1455 } 1902 }
1456 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1903 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1457 $::CONN->send ("command run_stop"); 1904 $::CONN->user_send ("command run_stop");
1458 } 1905 }
1459} 1906}
1460 1907
1461############################################################################# 1908#############################################################################
1462 1909
… …
1500 glPopMatrix; 1947 glPopMatrix;
1501} 1948}
1502 1949
1503############################################################################# 1950#############################################################################
1504 1951
1505package 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;
1506 1992
1507our @ISA = CFClient::UI::Container::; 1993our @ISA = CFClient::UI::Container::;
1994
1995use SDL::OpenGL;
1508 1996
1509sub size_request { 1997sub size_request {
1510 ($::WIDTH, $::HEIGHT) 1998 ($::WIDTH, $::HEIGHT)
1511} 1999}
1512 2000
… …
1517 2005
1518 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2006 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1519 for @{$self->{children}}; 2007 for @{$self->{children}};
1520} 2008}
1521 2009
1522sub translate { 2010sub _topleft {
1523 my ($self, $x, $y) = @_; 2011 my ($self, $x, $y) = @_;
1524 2012
1525 ($x, $y) 2013 ($x, $y)
1526} 2014}
1527 2015
… …
1535sub add { 2023sub add {
1536 my ($self, $widget) = @_; 2024 my ($self, $widget) = @_;
1537 2025
1538 $self->SUPER::add ($widget); 2026 $self->SUPER::add ($widget);
1539 2027
1540 $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;
1541} 2035}
1542 2036
1543sub draw { 2037sub draw {
1544 my ($self) = @_; 2038 my ($self) = @_;
1545 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
1546 $self->_draw; 2054 $self->_draw;
1547} 2055}
1548 2056
1549############################################################################# 2057#############################################################################
1550 2058
1551package CFClient::UI; 2059package CFClient::UI;
1552 2060
1553$TOPLEVEL = new CFClient::UI::Toplevel; 2061$ROOT = new CFClient::UI::Root;
1554 2062
15551 20631
1556 2064

Diff Legend

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