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.76 by root, Tue Apr 11 21:24:09 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_down ($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;
181
182 $self->emit (focus_in => $focus);
183
143 $focus->update if $focus; 184 $focus->update if $focus;
144 $FOCUS->update; 185 $FOCUS->update;
145} 186}
146 187
147sub focus_out { 188sub focus_out {
148 my ($self) = @_; 189 my ($self) = @_;
149 190
150 return unless $FOCUS == $self; 191 return unless $FOCUS == $self;
151 192
152 my $focus = $FOCUS; undef $FOCUS; 193 my $focus = $FOCUS; undef $FOCUS;
194
195 $self->emit (focus_out => $focus);
196
153 $focus->update if $focus; #? 197 $focus->update if $focus; #?
154} 198}
155 199
156sub mouse_motion { } 200sub mouse_motion { }
157sub button_up { } 201sub button_up { }
178 glPushMatrix; 222 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 223 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 224 $self->_draw;
181 glPopMatrix; 225 glPopMatrix;
182 226
183 if ($self == $HOVER) { 227 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 228 my ($x, $y) = @$self{qw(x y)};
185 229
186 glColor 0, 0, 1, 0.2; 230 glColor 0, 0, 1, 0.2;
187 glEnable GL_BLEND; 231 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
200 my ($self) = @_; 244 my ($self) = @_;
201 245
202 warn "no draw defined for $self\n"; 246 warn "no draw defined for $self\n";
203} 247}
204 248
205sub bbox {
206 my ($self) = @_;
207 my ($w, $h) = $self->size_request;
208 (
209 $self->{x},
210 $self->{y},
211 $self->{x} = $w,
212 $self->{y} = $h
213 )
214}
215
216sub find_widget { 249sub find_widget {
217 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
218 251
219 return $self 252 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 253 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 254 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 255
223 () 256 ()
224} 257}
225 258
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 259sub set_parent {
229 my ($self, $par) = @_; 260 my ($self, $parent) = @_;
230 261
231 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 262 Scalar::Util::weaken ($self->{parent} = $parent);
233}
234
235sub get_parent {
236 $_[0]->{parent}
237} 263}
238 264
239sub update { 265sub update {
240 my ($self) = @_; 266 my ($self) = @_;
241 267
276 302
277 # range [value, low, high, page] 303 # range [value, low, high, page]
278 304
279 $class->SUPER::new ( 305 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2], 306 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 307 active_bg => [1, 1, 1, 0.5],
282 @_ 308 @_
283 ) 309 )
284} 310}
285 311
286sub _draw { 312sub _draw {
330 356
331 $self 357 $self
332} 358}
333 359
334sub add { 360sub add {
335 my ($self, $chld, $expand) = @_; 361 my ($self, $child) = @_;
336 362
337 $chld->{expand} = $expand;
338 $chld->set_parent ($self); 363 $child->set_parent ($self);
364
365 use sort 'stable';
339 366
340 $self->{children} = [ 367 $self->{children} = [
341 sort { $a->{z} <=> $b->{z} } 368 sort { $a->{z} <=> $b->{z} }
342 @{$self->{children}}, $chld 369 @{$self->{children}}, $child
343 ]; 370 ];
344 371
345 $self->{w} = $self->{h} = -1; 372 $self->{w} = $self->{h} = -1;
346 $self->update; 373 $self->update;
347} 374}
444} 471}
445 472
446sub render_chld { 473sub render_chld {
447 my ($self) = @_; 474 my ($self) = @_;
448 475
449 $self->{texture} = 476 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
450 CFClient::Texture->new_from_opengl ( 477 glClearColor 0, 0, 0, 1;
451 $self->{w}, $self->{h}, sub { $self->child->draw } 478 glClear GL_COLOR_BUFFER_BIT;
452 ); 479 $self->child->draw;
480 };
453} 481}
454 482
455sub size_allocate { 483sub size_allocate {
456 my ($self, $x, $y, $w, $h) = @_; 484 my ($self, $x, $y, $w, $h) = @_;
457 485
535 563
536my @tex = 564my @tex =
537 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
538 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);
539 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
540sub size_request { 581sub size_request {
541 my ($self) = @_; 582 my ($self) = @_;
542 583
584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
543 my ($w, $h) = $self->SUPER::size_request; 586 my ($w, $h) = $self->SUPER::size_request;
544 587
545 $h += $tex[1]->{h}; 588 (
546 $h += $tex[4]->{h}; 589 $w + $self->{border} * 2,
547 $w += $tex[2]->{w}; 590 $h + $self->{border} * 2,
548 $w += $tex[3]->{w}; 591 )
549
550 ($w, $h)
551} 592}
552 593
553sub size_allocate { 594sub size_allocate {
554 my ($self, $x, $y, $w, $h) = @_; 595 my ($self, $x, $y, $w, $h) = @_;
555 596
556 $self->_size_allocate ($x, $y, $w, $h) or return; 597 $self->_size_allocate ($x, $y, $w, $h) or return;
557 598
558 $h -= $tex[1]->{h}; 599 $h -= List::Util::max 0, $self->{border} * 2;
559 $h -= $tex[4]->{h}; 600 $w -= List::Util::max 0, $self->{border} * 2;
560 $w -= $tex[2]->{w};
561 $w -= $tex[3]->{w};
562 601
563 $h = $h < 0 ? 0 : $h; 602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
564 $w = $w < 0 ? 0 : $w; 603}
565 604
566 my $child = $self->child; 605sub button_down {
606 my ($self, $ev, $x, $y) = @_;
567 607
568 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); 608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
610
611 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
612 my ($bw, $bh) = ($self->{w}, $self->{h});
613
614 $self->{motion} = sub {
615 my ($ev, $x, $y) = @_;
616
617 ($x, $y) = ($ev->motion_x, $ev->motion_y);
618
619 $self->{user_w} = $bw + $x - $ox;
620 $self->{user_h} = $bh + $y - $oy;
621 $self->update;
622 };
623
624 } elsif ($x >= 0 && $x < $self->{w}
625 && $y >= 0 && $y < $self->{border}) {
626
627 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
628 my ($bx, $by) = ($self->{x}, $self->{y});
629
630 $self->{motion} = sub {
631 my ($ev, $x, $y) = @_;
632
633 ($x, $y) = ($ev->motion_x, $ev->motion_y);
634
635 $self->move ($bx + $x - $ox, $by + $y - $oy);
636 $self->update;
637 };
638 }
639}
640
641sub button_up {
642 my ($self, $ev, $x, $y) = @_;
643
644 delete $self->{motion};
645}
646
647sub mouse_motion {
648 my ($self, $ev, $x, $y) = @_;
649
650 $self->{motion}->($ev, $x, $y) if $self->{motion};
569} 651}
570 652
571sub _draw { 653sub _draw {
572 my ($self) = @_; 654 my ($self) = @_;
573 655
574 my ($w, $h) = ($self->{w}, $self->{h}); 656 my ($w, $h ) = ($self->{w}, $self->{h});
575 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 657 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
576 658
577 glEnable GL_BLEND; 659 glEnable GL_BLEND;
578 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
579 glEnable GL_TEXTURE_2D; 661 glEnable GL_TEXTURE_2D;
580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
581 663
582 my $top = $tex[1]; 664 glColor @{ $self->{border_bg} };
583 $top->draw_quad (0, 0, $w, $top->{h}); 665 $tex[1]->draw_quad (0, 0, $w, $self->{border});
584 666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
585 my $left = $tex[3]; 667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
586 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
587
588 my $right = $tex[2];
589 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
590
591 my $bottom = $tex[4];
592 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
593 669
594 my $bg = $tex[0]; 670 my $bg = $tex[0];
595 671
596 glBindTexture GL_TEXTURE_2D, $bg->{name}; 672 # TODO: repeat texture not scale
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
598 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
599 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
600
601 my $rep_x = $cw / $bg->{w}; 673 my $rep_x = $cw / $bg->{w};
602 my $rep_y = $ch / $bg->{h}; 674 my $rep_y = $ch / $bg->{h};
603 675
676 glColor @{ $self->{bg} };
677
678 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1;
604 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
605 682
606 glDisable GL_TEXTURE_2D; 683 glDisable GL_TEXTURE_2D;
607 glDisable GL_BLEND; 684 glDisable GL_BLEND;
608 685
609 $self->child->draw; 686 $self->child->draw;
610
611} 687}
612 688
613############################################################################# 689#############################################################################
614 690
615package CFClient::UI::Table; 691package CFClient::UI::Table;
618 694
619use List::Util qw(max sum); 695use List::Util qw(max sum);
620 696
621use SDL::OpenGL; 697use SDL::OpenGL;
622 698
699sub new {
700 my $class = shift;
701
702 $class->SUPER::new (
703 col_expand => [],
704 @_
705 )
706}
707
623sub add { 708sub add {
624 my ($self, $x, $y, $chld) = @_; 709 my ($self, $x, $y, $child) = @_;
625 710
711 $child->set_parent ($self);
626 $self->{children}[$y][$x] = $chld; 712 $self->{children}[$y][$x] = $child;
627 $chld->set_parent ($self);
628 713
629 $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};
630 $self->update; 723 $self->update;
631} 724}
632 725
633sub get_wh { 726sub get_wh {
634 my ($self) = @_; 727 my ($self) = @_;
656 my ($self) = @_; 749 my ($self) = @_;
657 750
658 my ($ws, $hs) = $self->get_wh; 751 my ($ws, $hs) = $self->get_wh;
659 752
660 ( 753 (
661 (List::Util::sum @$ws), 754 (sum @$ws),
662 (List::Util::sum @$hs), 755 (sum @$hs),
663 ) 756 )
664} 757}
665 758
666sub size_allocate { 759sub size_allocate {
667 my ($self, $x, $y, $w, $h) = @_; 760 my ($self, $x, $y, $w, $h) = @_;
668 761
669 $self->_size_allocate ($x, $y, $w, $h) or return; 762 $self->_size_allocate ($x, $y, $w, $h) or return;
670 763
671 my ($ws, $hs) = $self->get_wh; 764 my ($ws, $hs) = $self->get_wh;
672 765
673 my $req_w = List::Util::sum @$ws; 766 my $req_w = sum @$ws;
674 my $req_h = List::Util::sum @$hs; 767 my $req_h = sum @$hs;
768
769 # TODO: nicer code && do row_expand
770 my @col_expand = @{$self->{col_expand}};
771 @col_expand = (1) x @$ws unless @col_expand;
772 my $col_expand = (sum @col_expand) || 1;
675 773
676 # linearly scale sizes 774 # linearly scale sizes
677 $_ *= $req_w / $w for @$ws; 775 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
678 $_ *= $req_h / $h for @$hs; 776 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
777
778 CFClient::UI::harmonize $ws;
779 CFClient::UI::harmonize $hs;
679 780
680 my $y; 781 my $y;
681 782
682 for my $r (0 .. $#{$self->{children}}) { 783 for my $r (0 .. $#{$self->{children}}) {
683 my $row = $self->{children}[$r] 784 my $row = $self->{children}[$r]
685 786
686 my $x = 0; 787 my $x = 0;
687 my $row_h = $hs->[$r]; 788 my $row_h = $hs->[$r];
688 789
689 for my $c (0 .. $#$row) { 790 for my $c (0 .. $#$row) {
690 my $widget = $row->[$c]
691 or next;
692
693 my $col_w = $ws->[$c]; 791 my $col_w = $ws->[$c];
694 792
793 if (my $widget = $row->[$c]) {
695 $widget->size_allocate ($x, $y, $col_w, $row_h); 794 $widget->size_allocate ($x, $y, $col_w, $row_h);
795 }
696 796
697 $x += $col_w; 797 $x += $col_w;
698 } 798 }
699 799
700 $y += $row_h; 800 $y += $row_h;
746} 846}
747 847
748sub size_allocate { 848sub size_allocate {
749 my ($self, $x, $y, $w, $h) = @_; 849 my ($self, $x, $y, $w, $h) = @_;
750 850
751 $self->_size_allocate ($x, $y, $w, $h) or return; 851 $self->_size_allocate ($x, $y, $w, $h);
752
753 return unless $self->{w};
754 852
755 ($h, $w) = ($w, $h); 853 ($h, $w) = ($w, $h);
756 854
757 my $children = $self->{children}; 855 my $children = $self->{children};
758 856
760 858
761 my $req_h = List::Util::sum @h; 859 my $req_h = List::Util::sum @h;
762 860
763 if ($req_h > $h) { 861 if ($req_h > $h) {
764 # ah well, not enough space 862 # ah well, not enough space
765 $_ = $h[$_] * $h / $req_h for @h; 863 $_ *= $h / $req_h for @h;
766 } else { 864 } else {
767 my @exp = grep $_->{expand}, @$children; 865 my $exp = List::Util::sum map $_->{expand}, @$children;
768 @exp = @$children unless @exp; 866 $exp ||= 1;
769 867
770 my %exp = map +($_ => 1), @exp;
771
772 for (0 .. $#$children) { 868 for (0 .. $#$children) {
773 my $child = $children->[$_]; 869 my $child = $children->[$_];
774 870
775 my $alloc_h = $h[$_]; 871 my $alloc_h = $h[$_];
776 $alloc_h += ($h - $req_h) / @exp if $exp{$child}; 872 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
777 $h[$_] = $alloc_h; 873 $h[$_] = $alloc_h;
778 } 874 }
779 } 875 }
876
877 CFClient::UI::harmonize \@h;
780 878
781 my $y = 0; 879 my $y = 0;
782 for (0 .. $#$children) { 880 for (0 .. $#$children) {
783 my $child = $children->[$_]; 881 my $child = $children->[$_];
784 my $h = $h[$_]; 882 my $h = $h[$_];
808} 906}
809 907
810sub size_allocate { 908sub size_allocate {
811 my ($self, $x, $y, $w, $h) = @_; 909 my ($self, $x, $y, $w, $h) = @_;
812 910
813 $self->_size_allocate ($x, $y, $w, $h) or return; 911 $self->_size_allocate ($x, $y, $w, $h);
814
815 return unless $self->{h};
816 912
817 my $children = $self->{children}; 913 my $children = $self->{children};
818 914
819 my @h = map +($_->size_request)[1], @$children; 915 my @h = map +($_->size_request)[1], @$children;
820 916
821 my $req_h = List::Util::sum @h; 917 my $req_h = List::Util::sum @h;
822 918
823 if ($req_h > $h) { 919 if ($req_h > $h) {
824 # ah well, not enough space 920 # ah well, not enough space
825 $_ = $h[$_] * $h / $req_h for @h; 921 $_ *= $h / $req_h for @h;
826 } else { 922 } else {
827 my @exp = grep $_->{expand}, @$children; 923 my $exp = List::Util::sum map $_->{expand}, @$children;
828 @exp = @$children unless @exp; 924 $exp ||= 1;
829 925
830 my %exp = map +($_ => 1), @exp;
831
832 for (0 .. $#$children) { 926 for (0 .. $#$children) {
833 my $child = $children->[$_]; 927 my $child = $children->[$_];
834 928
835 my $alloc_h = $h[$_]; 929 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
836 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
837 $h[$_] = $alloc_h;
838 } 930 }
839 } 931 }
932
933 CFClient::UI::harmonize \@h;
840 934
841 my $y = 0; 935 my $y = 0;
842 for (0 .. $#$children) { 936 for (0 .. $#$children) {
843 my $child = $children->[$_]; 937 my $child = $children->[$_];
844 my $h = $h[$_]; 938 my $h = $h[$_];
858 952
859sub new { 953sub new {
860 my ($class, %arg) = @_; 954 my ($class, %arg) = @_;
861 955
862 my $self = $class->SUPER::new ( 956 my $self = $class->SUPER::new (
863 fg => [1, 1, 1], 957 fg => [1, 1, 1],
864 height => $::FONTSIZE, 958 fontsize => $::FONTSIZE,
865 text => "", 959 text => "",
866 align => -1, 960 align => -1,
961 valign => -1,
867 padding => 2, 962 padding => 2,
868 layout => new CFClient::Layout, 963 layout => new CFClient::Layout,
869 %arg 964 %arg
870 ); 965 );
871 966
872 $self->set_text ($self->{text}); 967 $self->set_text ($self->{text});
873 968
889 984
890 $self->{text} = $text; 985 $self->{text} = $text;
891 $self->{layout}->set_markup ($text); 986 $self->{layout}->set_markup ($text);
892 987
893 delete $self->{texture}; 988 delete $self->{texture};
989# $self->{w} = $self->{h} = -1;
894 $self->update; 990 $self->update;
895} 991}
896 992
897sub get_text { 993sub get_text {
898 my ($self, $text) = @_; 994 my ($self, $text) = @_;
902 998
903sub size_request { 999sub size_request {
904 my ($self) = @_; 1000 my ($self) = @_;
905 1001
906 $self->{layout}->set_width; 1002 $self->{layout}->set_width;
907 $self->{layout}->set_height ($self->{height}); 1003 $self->{layout}->set_height ($self->{fontsize});
908 my ($w, $h) = $self->{layout}->size; 1004 my ($w, $h) = $self->{layout}->size;
909 1005
910 ( 1006 (
911 $w + $self->{padding} * 2, 1007 $w + $self->{padding} * 2,
912 $h + $self->{padding} * 2, 1008 $h + $self->{padding} * 2,
931sub _draw { 1027sub _draw {
932 my ($self) = @_; 1028 my ($self) = @_;
933 1029
934 my $tex = $self->{texture} ||= do { 1030 my $tex = $self->{texture} ||= do {
935 $self->{layout}->set_width ($self->{w}); 1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
936 new_from_layout CFClient::Texture $self->{layout} 1033 new_from_layout CFClient::Texture $self->{layout}
937 }; 1034 };
938 1035
939 glEnable GL_BLEND; 1036 glEnable GL_BLEND;
940 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1037 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
941 glEnable GL_TEXTURE_2D; 1038 glEnable GL_TEXTURE_2D;
942 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
943 1040
944 glColor @{$self->{fg}}; 1041 glColor @{$self->{fg}};
945 1042
946 my $x = 1043 my $x =
947 $self->{align} < 0 ? $self->{padding} 1044 $self->{align} < 0 ? $self->{padding}
948 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1045 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949 : ($self->{w} - $tex->{w}) * 0.5; 1046 : ($self->{w} - $tex->{w}) * 0.5;
950 1047
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
951 $tex->draw_quad ($x, 0); 1053 $tex->draw_quad (int $x, int $y);
952 1054
953 glDisable GL_TEXTURE_2D; 1055 glDisable GL_TEXTURE_2D;
954 glDisable GL_BLEND; 1056 glDisable GL_BLEND;
955} 1057}
956 1058
967 my $class = shift; 1069 my $class = shift;
968 1070
969 $class->SUPER::new ( 1071 $class->SUPER::new (
970 fg => [1, 1, 1], 1072 fg => [1, 1, 1],
971 bg => [0, 0, 0, 0.2], 1073 bg => [0, 0, 0, 0.2],
972 active_bg => [1, 1, 1], 1074 active_bg => [1, 1, 1, 0.5],
973 active_fg => [0, 0, 0], 1075 active_fg => [0, 0, 0],
1076 can_hover => 1,
1077 can_focus => 1,
1078 valign => 0,
974 @_ 1079 @_
975 ) 1080 )
976} 1081}
977 1082
978sub _set_text { 1083sub _set_text {
979 my ($self, $text) = @_; 1084 my ($self, $text) = @_;
980 1085
1086 my $old_text = $self->{text};
1087
981 $self->{last_activity} = $::NOW; 1088 $self->{last_activity} = $::NOW;
982 1089
983 $self->{text} = $text; 1090 $self->{text} = $text;
984 $self->{layout}->set_width ($self->{w}); 1091 $self->{layout}->set_width ($self->{w});
1092 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
985 1093
986 $text =~ s/./*/g if $self->{hidden}; 1094 $text =~ s/./*/g if $self->{hidden};
987 1095
988 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1096 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
989 1097
990 $text = substr $text, 0, $self->{cursor}; 1098 $text = substr $text, 0, $self->{cursor};
991 utf8::encode $text; 1099 utf8::encode $text;
992 1100
993 @$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};
994} 1105}
995 1106
996sub size_request { 1107sub size_request {
997 my ($self) = @_; 1108 my ($self) = @_;
998 1109
1037 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1148 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1038 } elsif ($sym == SDLK_HOME) { 1149 } elsif ($sym == SDLK_HOME) {
1039 $self->{cursor} = 0; 1150 $self->{cursor} = 0;
1040 } elsif ($sym == SDLK_END) { 1151 } elsif ($sym == SDLK_END) {
1041 $self->{cursor} = length $text; 1152 $self->{cursor} = length $text;
1153 } elsif ($sym == SDLK_ESCAPE) {
1154 $self->emit ('escape');
1042 } elsif ($uni) { 1155 } elsif ($uni) {
1043 substr $text, $self->{cursor}++, 0, chr $uni; 1156 substr $text, $self->{cursor}++, 0, chr $uni;
1044 } 1157 }
1045 1158
1046 $self->_set_text ($text); 1159 $self->_set_text ($text);
1108 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1221 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1109 glEnd; 1222 glEnd;
1110 } 1223 }
1111} 1224}
1112 1225
1113#############################################################################
1114
1115package CFClient::UI::Slider; 1226package CFClient::UI::LineEntry;
1116 1227
1117use strict; 1228our @ISA = CFClient::UI::Entry::;
1118 1229
1230use SDL;
1119use SDL::OpenGL; 1231use SDL::OpenGL;
1120 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
1248#############################################################################
1249
1250package CFClient::UI::Button;
1251
1121our @ISA = CFClient::UI::DrawBG::; 1252our @ISA = CFClient::UI::Label::;
1253
1254use SDL;
1255use SDL::OpenGL;
1256
1257my @tex =
1258 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1259 qw(b1_button_active.png);
1122 1260
1123sub new { 1261sub new {
1124 my $class = shift; 1262 my $class = shift;
1125 1263
1264 $class->SUPER::new (
1265 padding => 4,
1266 fg => [1, 1, 1],
1267 bg => [1, 1, 1, 0.2],
1268 active_fg => [1, 1, 0],
1269 can_hover => 1,
1270 @_
1271 )
1272}
1273
1274sub button_up {
1275 my ($self, $ev, $x, $y) = @_;
1276
1277 if ($x >= 0 && $x < $self->{w}
1278 && $y >= 0 && $y < $self->{h}) {
1279 $self->emit ("activate");
1280 }
1281}
1282
1283sub _draw {
1284 my ($self) = @_;
1285
1286 local $self->{fg} = $self->{fg};
1287
1288 if ($GRAB == $self) {
1289 $self->{fg} = $self->{active_fg};
1290 }
1291
1292 glEnable GL_BLEND;
1293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1294 glEnable GL_TEXTURE_2D;
1295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1296 glColor 0, 0, 0, 1;
1297
1298 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1299
1300 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302
1303 $self->SUPER::_draw;
1304}
1305
1306#############################################################################
1307
1308package CFClient::UI::CheckBox;
1309
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);
1315
1316use SDL;
1317use SDL::OpenGL;
1318
1319sub new {
1320 my $class = shift;
1321
1322 $class->SUPER::new (
1323 padding => 2,
1324 fg => [1, 1, 1],
1325 active_fg => [1, 1, 0],
1326 state => 0,
1327 can_hover => 1,
1328 @_
1329 )
1330}
1331
1332sub size_request {
1333 my ($self) = @_;
1334
1335 ($self->{padding} * 2 + 6) x 2
1336}
1337
1338sub size_allocate {
1339 my ($self, $x, $y, $w, $h) = @_;
1340
1341 $self->_size_allocate ($x, $y, $w, $h);
1342}
1343
1344sub button_down {
1345 my ($self, $ev, $x, $y) = @_;
1346
1347 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1348 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1349 $self->{state} = !$self->{state};
1350 $self->emit (changed => $self->{state});
1351 }
1352}
1353
1354sub _draw {
1355 my ($self) = @_;
1356
1357 $self->SUPER::_draw;
1358
1359 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1360
1361 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1362
1363 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1364
1365 glEnable GL_BLEND;
1366 glEnable GL_TEXTURE_2D;
1367 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1368
1369 my $tex = $self->{state} ? $tex[1] : $tex[0];
1370
1371 $tex->draw_quad (0, 0, $s, $s);
1372
1373 glDisable GL_TEXTURE_2D;
1374 glDisable GL_BLEND;
1375}
1376
1377#############################################################################
1378
1379package CFClient::UI::Slider;
1380
1381use strict;
1382
1383use SDL::OpenGL;
1384
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);
1390
1391sub new {
1392 my $class = shift;
1393
1126 # range [value, low, high, page] 1394 # range [value, low, high, page]
1127 1395
1396 # TODO: 0-width page
1397 # TODO: req_w/h are wrong with vertical
1398 # TODO: calculations are off
1128 my $self = $class->SUPER::new ( 1399 my $self = $class->SUPER::new (
1129 fg => [1, 1, 1], 1400 fg => [1, 1, 1],
1130 active_fg => [0, 0, 0], 1401 active_fg => [0, 0, 0],
1131 range => [0, 0, 100, 10], 1402 range => [0, 0, 100, 10],
1132 req_w => 40, 1403 req_w => 40,
1133 req_h => 10, 1404 req_h => 13,
1134 vertical => 0, 1405 vertical => 0,
1406 can_hover => 1,
1407 inner_pad => 5,
1135 @_ 1408 @_
1136 ); 1409 );
1137 1410
1138 $self 1411 $self
1139} 1412}
1160 if ($GRAB == $self) { 1433 if ($GRAB == $self) {
1161 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1434 my ($value, $lo, $hi, $page) = @{$self->{range}};
1162 1435
1163 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1436 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1164 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
1165 $x = $x * ($hi - $lo) / $w + $lo; 1442 $x = $x * ($hi - $lo) / $inner_w + $lo;
1166 $x = $lo if $x < $lo; 1443 $x = $lo if $x < $lo;
1167 $x = $hi - $page if $x > $hi - $page; 1444 $x = $hi - $page if $x > $hi - $page;
1168 $self->{range}[0] = $x; 1445 $self->{range}[0] = $x;
1169 1446
1170 $self->emit (changed => $x); 1447 $self->emit (changed => $x);
1171 $self->update; 1448 $self->update;
1172 } 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
1173} 1458}
1174 1459
1175sub _draw { 1460sub _draw {
1176 my ($self) = @_; 1461 my ($self) = @_;
1177 1462
1191 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1476 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1192 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1477 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1193 1478
1194 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1479 my ($value, $lo, $hi, $page) = @{$self->{range}};
1195 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
1196 $page = int $page * $w / ($hi - $lo); 1486 $page = int $page * $inner_w / ($hi - $lo);
1197 $value = int +($value - $lo) * $w / ($hi - $lo); 1487 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1198 1488
1199 $w -= $page; 1489 $w -= $page;
1200 $page &= ~1; 1490 $page &= ~1;
1201 glTranslate $page * 0.5, 0, 0; 1491 glTranslate $page * 0.5, 0, 0;
1492 $page ||= 2;
1202 1493
1203 glColor @$fg;
1204 glBegin GL_LINES;
1205 glVertex 0, 0; glVertex 0, $h;
1206 glVertex $w - 1, 0; glVertex $w - 1, $h;
1207 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1208 glEnd;
1209
1210 my $knob_a = $value - $page * 0.5; 1494 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1211 my $knob_b = $value + $page * 0.5; 1495 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1212 1496
1213 glBegin GL_QUADS; 1497 glEnable GL_BLEND;
1214 glColor @$fg; 1498 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215 glVertex $knob_a, 0; 1499 glEnable GL_TEXTURE_2D;
1216 glVertex $knob_a, $h; 1500 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1217 glVertex $knob_b, $h;
1218 glVertex $knob_b, 0;
1219 1501
1220 if ($knob_a < $knob_b - 2) { 1502 # draw background
1221 glColor @$bg; 1503 $tex[1]->draw_quad (0, 0, $w, $h);
1222 glVertex $knob_a + 1, 1; 1504
1223 glVertex $knob_a + 1, $h - 1; 1505 # draw handle
1224 glVertex $knob_b - 1, $h - 1; 1506 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1225 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);
1226 } 1560
1227 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
1228} 1676}
1229 1677
1230############################################################################# 1678#############################################################################
1231 1679
1232package CFClient::UI::MapWidget; 1680package CFClient::UI::MapWidget;
1242 1690
1243sub new { 1691sub new {
1244 my $class = shift; 1692 my $class = shift;
1245 1693
1246 $class->SUPER::new ( 1694 $class->SUPER::new (
1247 z => -1, 1695 z => -1,
1696 can_focus => 1,
1248 list => (glGenLists 1), 1697 list => (glGenLists 1),
1249 @_ 1698 @_
1250 ) 1699 )
1251} 1700}
1252 1701
1253sub key_down { 1702sub key_down {
1255} 1704}
1256 1705
1257sub key_up { 1706sub key_up {
1258} 1707}
1259 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};
1741}
1742
1260sub size_request { 1743sub size_request {
1261 ( 1744 (
1262 1 + int $::WIDTH / 32, 1745 1 + 32 * int $::WIDTH / 32,
1263 1 + int $::HEIGHT / 32, 1746 1 + 32 * int $::HEIGHT / 32,
1264 ) 1747 )
1265} 1748}
1266 1749
1267sub update { 1750sub update {
1268 my ($self) = @_; 1751 my ($self) = @_;
1269 1752
1270 $self->{need_update} = 1; 1753 $self->{need_update} = 1;
1271 $self->SUPER::update; 1754 $self->SUPER::update;
1272} 1755}
1273 1756
1274sub _draw { 1757sub draw {
1275 my ($self) = @_; 1758 my ($self) = @_;
1276 1759
1277 if (delete $self->{need_update}) { 1760 if (delete $self->{need_update}) {
1278 glNewList $self->{list}, GL_COMPILE; 1761 glNewList $self->{list}, GL_COMPILE;
1279 1762
1280 my $mx = $::CONN->{mapx}; 1763 if ($::MAP) {
1281 my $my = $::CONN->{mapy};
1282
1283 my $map = $::CONN->{map};
1284
1285 my ($xofs, $yofs);
1286
1287 my $sw = 1 + int $::WIDTH / 32; 1764 my $sw = int $::WIDTH / 32;
1288 my $sh = 1 + int $::HEIGHT / 32; 1765 my $sh = int $::HEIGHT / 32;
1289 1766
1290 if ($::CONN->{mapw} > $sw) { 1767 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1291 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1768 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1292 } else { 1769
1293 $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
1294 } 1834 }
1295 1835
1296 if ($::CONN->{maph} > $sh) {
1297 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1298 } else {
1299 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1300 }
1301
1302 glEnable GL_TEXTURE_2D;
1303 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1306
1307 my $sw4 = ($sw + 3) & ~3;
1308 my $darkness = "\x00" x ($sw4 * $sh);
1309
1310 for my $x (0 .. $sw - 1) {
1311 my $row = $map->[$x + $xofs];
1312 for my $y (0 .. $sh - 1) {
1313
1314 my $cell = $row->[$y + $yofs]
1315 or next;
1316
1317 my $dark = $cell->[0];
1318 if ($dark < 0) {
1319 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1320 } else {
1321 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1322 }
1323
1324 for my $num (grep $_, @$cell[1,2,3]) {
1325 my $tex = $::CONN->{face}[$num]{texture} || next;
1326
1327 my ($w, $h) = @$tex{qw(w h)};
1328
1329 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1330 }
1331 }
1332 }
1333
1334# if (1) { # higher quality darkness
1335# $lighting =~ s/(.)/$1$1$1/gs;
1336# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1337#
1338# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1339#
1340# $lighting = $pb->get_pixels;
1341# $lighting =~ s/(.)../$1/gs;
1342# }
1343
1344 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1345
1346 $darkness = new CFClient::Texture
1347 w => $sw4,
1348 h => $sh,
1349 data => $darkness,
1350 internalformat => GL_ALPHA,
1351 format => GL_ALPHA;
1352
1353 glColor 0.45, 0.45, 0.45, 1;
1354 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1355
1356 glDisable GL_TEXTURE_2D;
1357 glDisable GL_BLEND;
1358
1359 glEndList; 1836 glEndList;
1360 } 1837 }
1361 1838
1839 glPushMatrix;
1362 glCallList $self->{list}; 1840 glCallList $self->{list};
1841 glPopMatrix;
1842
1843 if ($FOCUS != $self) {
1844 glColor 64/255, 64/255, 64/255;
1845 glLogicOp GL_AND;
1846 glEnable GL_COLOR_LOGIC_OP;
1847 glBegin GL_QUADS;
1848 glVertex 0, 0;
1849 glVertex 0, $::HEIGHT;
1850 glVertex $::WIDTH, $::HEIGHT;
1851 glVertex $::WIDTH, 0;
1852 glEnd;
1853 glDisable GL_COLOR_LOGIC_OP;
1854 }
1363} 1855}
1364 1856
1365my %DIR = ( 1857my %DIR = (
1366 SDLK_KP8, [1, "north"], 1858 SDLK_KP8, [1, "north"],
1367 SDLK_KP9, [2, "northeast"], 1859 SDLK_KP9, [2, "northeast"],
1383 1875
1384 my $mod = $ev->key_mod; 1876 my $mod = $ev->key_mod;
1385 my $sym = $ev->key_sym; 1877 my $sym = $ev->key_sym;
1386 1878
1387 if ($sym == SDLK_KP5) { 1879 if ($sym == SDLK_KP5) {
1388 $::CONN->send ("command stay fire"); 1880 $::CONN->user_send ("command stay fire");
1881 } elsif ($sym == SDLK_a) {
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' => '/');
1389 } elsif (exists $DIR{$sym}) { 1887 } elsif (exists $DIR{$sym}) {
1390 if ($mod & KMOD_SHIFT) { 1888 if ($mod & KMOD_SHIFT) {
1391 $self->{shft}++; 1889 $self->{shft}++;
1392 $::CONN->send ("command fire $DIR{$sym}[0]"); 1890 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1393 } elsif ($mod & KMOD_CTRL) { 1891 } elsif ($mod & KMOD_CTRL) {
1394 $self->{ctrl}++; 1892 $self->{ctrl}++;
1395 $::CONN->send ("command run $DIR{$sym}[0]"); 1893 $::CONN->user_send ("command run $DIR{$sym}[0]");
1396 } else { 1894 } else {
1397 $::CONN->send ("command $DIR{$sym}[1]"); 1895 $::CONN->user_send ("command $DIR{$sym}[1]");
1398 } 1896 }
1399 } 1897 }
1400} 1898}
1401 1899
1402sub key_up { 1900sub key_up {
1404 1902
1405 my $mod = $ev->key_mod; 1903 my $mod = $ev->key_mod;
1406 my $sym = $ev->key_sym; 1904 my $sym = $ev->key_sym;
1407 1905
1408 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1906 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1409 $::CONN->send ("command fire_stop"); 1907 $::CONN->user_send ("command fire_stop");
1410 } 1908 }
1411 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1909 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1412 $::CONN->send ("command run_stop"); 1910 $::CONN->user_send ("command run_stop");
1413 } 1911 }
1414} 1912}
1415 1913
1416############################################################################# 1914#############################################################################
1417 1915
1455 glPopMatrix; 1953 glPopMatrix;
1456} 1954}
1457 1955
1458############################################################################# 1956#############################################################################
1459 1957
1460package 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;
1461 1998
1462our @ISA = CFClient::UI::Container::; 1999our @ISA = CFClient::UI::Container::;
2000
2001use SDL::OpenGL;
1463 2002
1464sub size_request { 2003sub size_request {
1465 ($::WIDTH, $::HEIGHT) 2004 ($::WIDTH, $::HEIGHT)
1466} 2005}
1467 2006
1472 2011
1473 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2012 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1474 for @{$self->{children}}; 2013 for @{$self->{children}};
1475} 2014}
1476 2015
1477sub translate { 2016sub _topleft {
1478 my ($self, $x, $y) = @_; 2017 my ($self, $x, $y) = @_;
1479 2018
1480 ($x, $y) 2019 ($x, $y)
1481} 2020}
1482 2021
1490sub add { 2029sub add {
1491 my ($self, $widget) = @_; 2030 my ($self, $widget) = @_;
1492 2031
1493 $self->SUPER::add ($widget); 2032 $self->SUPER::add ($widget);
1494 2033
1495 $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;
1496} 2041}
1497 2042
1498sub draw { 2043sub draw {
1499 my ($self) = @_; 2044 my ($self) = @_;
1500 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
1501 $self->_draw; 2060 $self->_draw;
1502} 2061}
1503 2062
1504############################################################################# 2063#############################################################################
1505 2064
1506package CFClient::UI; 2065package CFClient::UI;
1507 2066
1508$TOPLEVEL = new CFClient::UI::Toplevel; 2067$ROOT = new CFClient::UI::Root;
1509 2068
15101 20691
1511 2070

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines