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.123 by root, Mon Apr 17 19:50:22 2006 UTC

7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47 47
48 $GRAB->button_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 1, 0.8, 0.5, 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;
189 glBegin GL_QUADS; 233 glBegin GL_QUADS;
190 glVertex $x , $y; 234 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y; 235 glVertex $x + $self->{w}, $y;
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->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
968
969 $self->set_text (delete $self->{text}) if exists $self->{text};
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
873 971
874 $self 972 $self
875} 973}
876 974
877sub escape_text { 975sub escape_text {
885} 983}
886 984
887sub set_text { 985sub set_text {
888 my ($self, $text) = @_; 986 my ($self, $text) = @_;
889 987
890 $self->{text} = $text;
891 $self->{layout}->set_markup ($text); 988 $self->{layout}->set_text ($text);
892 989
893 delete $self->{texture}; 990 delete $self->{texture};
894 $self->update; 991 $self->update;
895} 992}
896 993
897sub get_text { 994sub set_markup {
898 my ($self, $text) = @_; 995 my ($self, $markup) = @_;
899 996
900 $self->{text} 997 $self->{layout}->set_markup ($markup);
998
999 delete $self->{texture};
1000 $self->update;
901} 1001}
902 1002
903sub size_request { 1003sub size_request {
904 my ($self) = @_; 1004 my ($self) = @_;
905 1005
906 $self->{layout}->set_width; 1006 $self->{layout}->set_width;
907 $self->{layout}->set_height ($self->{height}); 1007 $self->{layout}->set_height ($self->{fontsize});
1008
908 my ($w, $h) = $self->{layout}->size; 1009 my ($w, $h) = $self->{layout}->size;
909 1010
910 ( 1011 (
911 $w + $self->{padding} * 2, 1012 $w + $self->{padding} * 2,
912 $h + $self->{padding} * 2, 1013 $h + $self->{padding} * 2,
931sub _draw { 1032sub _draw {
932 my ($self) = @_; 1033 my ($self) = @_;
933 1034
934 my $tex = $self->{texture} ||= do { 1035 my $tex = $self->{texture} ||= do {
935 $self->{layout}->set_width ($self->{w}); 1036 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
936 new_from_layout CFClient::Texture $self->{layout} 1038 new_from_layout CFClient::Texture $self->{layout}
937 }; 1039 };
938 1040
939 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
940 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
941 glEnable GL_TEXTURE_2D; 1043 glEnable GL_TEXTURE_2D;
942 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
943 1045
944 glColor @{$self->{fg}}; 1046 glColor @{$self->{fg}};
945 1047
946 my $x = 1048 $self->{ox} = int (
947 $self->{align} < 0 ? $self->{padding} 1049 $self->{align} < 0 ? $self->{padding}
948 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949 : ($self->{w} - $tex->{w}) * 0.5; 1051 : ($self->{w} - $tex->{w}) * 0.5
1052 );
950 1053
951 $tex->draw_quad ($x, 0); 1054 $self->{oy} = int (
1055 $self->{valign} < 0 ? $self->{padding}
1056 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1057 : ($self->{h} - $tex->{h}) * 0.5
1058 );
1059
1060 $tex->draw_quad ($self->{ox}, $self->{oy});
952 1061
953 glDisable GL_TEXTURE_2D; 1062 glDisable GL_TEXTURE_2D;
954 glDisable GL_BLEND; 1063 glDisable GL_BLEND;
955} 1064}
956 1065
957############################################################################# 1066#############################################################################
958 1067
959package CFClient::UI::Entry; 1068package CFClient::UI::EntryBase;
960 1069
961our @ISA = CFClient::UI::Label::; 1070our @ISA = CFClient::UI::Label::;
962 1071
963use SDL; 1072use SDL;
964use SDL::OpenGL; 1073use SDL::OpenGL;
967 my $class = shift; 1076 my $class = shift;
968 1077
969 $class->SUPER::new ( 1078 $class->SUPER::new (
970 fg => [1, 1, 1], 1079 fg => [1, 1, 1],
971 bg => [0, 0, 0, 0.2], 1080 bg => [0, 0, 0, 0.2],
972 active_bg => [1, 1, 1], 1081 active_bg => [1, 1, 1, 0.5],
973 active_fg => [0, 0, 0], 1082 active_fg => [0, 0, 0],
1083 can_hover => 1,
1084 can_focus => 1,
1085 valign => 0,
974 @_ 1086 @_
975 ) 1087 )
976} 1088}
977 1089
978sub _set_text { 1090sub _set_text {
979 my ($self, $text) = @_; 1091 my ($self, $text) = @_;
980 1092
1093 delete $self->{cur_h};
1094
1095 return if $self->{text} eq $text;
1096
981 $self->{last_activity} = $::NOW; 1097 $self->{last_activity} = $::NOW;
982
983 $self->{text} = $text; 1098 $self->{text} = $text;
984 $self->{layout}->set_width ($self->{w});
985 1099
986 $text =~ s/./*/g if $self->{hidden}; 1100 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text ");
987 1102
988 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1103 $self->emit (changed => $self->{text});
1104}
989 1105
990 $text = substr $text, 0, $self->{cursor}; 1106sub get_text {
991 utf8::encode $text; 1107 $_[0]{text}
992
993 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
994} 1108}
995 1109
996sub size_request { 1110sub size_request {
997 my ($self) = @_; 1111 my ($self) = @_;
998 1112
1037 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1151 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1038 } elsif ($sym == SDLK_HOME) { 1152 } elsif ($sym == SDLK_HOME) {
1039 $self->{cursor} = 0; 1153 $self->{cursor} = 0;
1040 } elsif ($sym == SDLK_END) { 1154 } elsif ($sym == SDLK_END) {
1041 $self->{cursor} = length $text; 1155 $self->{cursor} = length $text;
1156 } elsif ($sym == SDLK_ESCAPE) {
1157 $self->emit ('escape');
1042 } elsif ($uni) { 1158 } elsif ($uni) {
1043 substr $text, $self->{cursor}++, 0, chr $uni; 1159 substr $text, $self->{cursor}++, 0, chr $uni;
1044 } 1160 }
1045 1161
1046 $self->_set_text ($text); 1162 $self->_set_text ($text);
1100 1216
1101 $self->SUPER::_draw; 1217 $self->SUPER::_draw;
1102 1218
1103 #TODO: force update every cursor change :( 1219 #TODO: force update every cursor change :(
1104 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1220 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1221
1222 unless (exists $self->{cur_h}) {
1223 my $text = substr $self->{text}, 0, $self->{cursor};
1224 utf8::encode $text;
1225
1226 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1227 }
1228
1105 glColor @{$self->{fg}}; 1229 glColor @{$self->{fg}};
1106 glBegin GL_LINES; 1230 glBegin GL_LINES;
1107 glVertex $self->{cur_x}, $self->{cur_y};
1108 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1231 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1232 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1109 glEnd; 1233 glEnd;
1110 } 1234 }
1111} 1235}
1112 1236
1113#############################################################################
1114
1115package CFClient::UI::Slider; 1237package CFClient::UI::Entry;
1116 1238
1117use strict; 1239our @ISA = CFClient::UI::EntryBase::;
1118 1240
1241use SDL;
1119use SDL::OpenGL; 1242use SDL::OpenGL;
1120 1243
1244sub key_down {
1245 my ($self, $ev) = @_;
1246
1247 my $sym = $ev->key_sym;
1248
1249 if ($sym == SDLK_RETURN) {
1250 $self->emit (activate => $self->get_text);
1251 $self->update;
1252
1253 } else {
1254 $self->SUPER::key_down ($ev);
1255 }
1256
1257}
1258
1259#############################################################################
1260
1261package CFClient::UI::Button;
1262
1121our @ISA = CFClient::UI::DrawBG::; 1263our @ISA = CFClient::UI::Label::;
1264
1265use SDL;
1266use SDL::OpenGL;
1267
1268my @tex =
1269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1270 qw(b1_button_active.png);
1122 1271
1123sub new { 1272sub new {
1124 my $class = shift; 1273 my $class = shift;
1125 1274
1275 $class->SUPER::new (
1276 padding => 4,
1277 fg => [1, 1, 1],
1278 bg => [1, 1, 1, 0.2],
1279 active_fg => [0, 0, 1],
1280 can_hover => 1,
1281 @_
1282 )
1283}
1284
1285sub button_up {
1286 my ($self, $ev, $x, $y) = @_;
1287
1288 if ($x >= 0 && $x < $self->{w}
1289 && $y >= 0 && $y < $self->{h}) {
1290 $self->emit ("activate");
1291 }
1292}
1293
1294sub _draw {
1295 my ($self) = @_;
1296
1297 local $self->{fg} = $self->{fg};
1298
1299 if ($GRAB == $self) {
1300 $self->{fg} = $self->{active_fg};
1301 }
1302
1303 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305 glEnable GL_TEXTURE_2D;
1306 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1307 glColor 0, 0, 0, 1;
1308
1309 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1310
1311 glDisable GL_TEXTURE_2D;
1312 glDisable GL_BLEND;
1313
1314 $self->SUPER::_draw;
1315}
1316
1317#############################################################################
1318
1319package CFClient::UI::CheckBox;
1320
1321our @ISA = CFClient::UI::DrawBG::;
1322
1323my @tex =
1324 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1325 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1326
1327use SDL;
1328use SDL::OpenGL;
1329
1330sub new {
1331 my $class = shift;
1332
1333 $class->SUPER::new (
1334 padding => 2,
1335 fg => [1, 1, 1],
1336 active_fg => [1, 1, 0],
1337 state => 0,
1338 can_hover => 1,
1339 @_
1340 )
1341}
1342
1343sub size_request {
1344 my ($self) = @_;
1345
1346 ($self->{padding} * 2 + 6) x 2
1347}
1348
1349sub size_allocate {
1350 my ($self, $x, $y, $w, $h) = @_;
1351
1352 $self->_size_allocate ($x, $y, $w, $h);
1353}
1354
1355sub button_down {
1356 my ($self, $ev, $x, $y) = @_;
1357
1358 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1359 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1360 $self->{state} = !$self->{state};
1361 $self->emit (changed => $self->{state});
1362 }
1363}
1364
1365sub _draw {
1366 my ($self) = @_;
1367
1368 $self->SUPER::_draw;
1369
1370 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1371
1372 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1373
1374 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1375
1376 glEnable GL_BLEND;
1377 glEnable GL_TEXTURE_2D;
1378 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1379
1380 my $tex = $self->{state} ? $tex[1] : $tex[0];
1381
1382 $tex->draw_quad (0, 0, $s, $s);
1383
1384 glDisable GL_TEXTURE_2D;
1385 glDisable GL_BLEND;
1386}
1387
1388#############################################################################
1389
1390package CFClient::UI::Slider;
1391
1392use strict;
1393
1394use SDL::OpenGL;
1395
1396our @ISA = CFClient::UI::DrawBG::;
1397
1398my @tex =
1399 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1400 qw(s1_slider.png s1_slider_bg.png);
1401
1402sub new {
1403 my $class = shift;
1404
1126 # range [value, low, high, page] 1405 # range [value, low, high, page]
1127 1406
1407 # TODO: 0-width page
1408 # TODO: req_w/h are wrong with vertical
1409 # TODO: calculations are off
1128 my $self = $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
1129 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
1130 active_fg => [0, 0, 0], 1412 active_fg => [0, 0, 0],
1131 range => [0, 0, 100, 10], 1413 range => [0, 0, 100, 10],
1132 req_w => 40, 1414 req_w => 40,
1133 req_h => 10, 1415 req_h => 13,
1134 vertical => 0, 1416 vertical => 0,
1417 can_hover => 1,
1418 inner_pad => 5,
1135 @_ 1419 @_
1136 ); 1420 );
1137 1421
1138 $self 1422 $self
1139} 1423}
1160 if ($GRAB == $self) { 1444 if ($GRAB == $self) {
1161 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1445 my ($value, $lo, $hi, $page) = @{$self->{range}};
1162 1446
1163 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1447 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1164 1448
1449 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1450 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1451
1452 $x -= $inner_pad_px; # substract the padding
1165 $x = $x * ($hi - $lo) / $w + $lo; 1453 $x = $x * ($hi - $lo) / $inner_w + $lo;
1166 $x = $lo if $x < $lo; 1454 $x = $lo if $x < $lo;
1167 $x = $hi - $page if $x > $hi - $page; 1455 $x = $hi - $page if $x > $hi - $page;
1168 $self->{range}[0] = $x; 1456 $self->{range}[0] = $x;
1169 1457
1170 $self->emit (changed => $x); 1458 $self->emit (changed => $x);
1171 $self->update; 1459 $self->update;
1172 } 1460 }
1461}
1462
1463# the inner_* stuff is for generating a padding for the slider handle,
1464# so that the handle doesn't leave the texture. This calculation isn't 100%
1465# correct propably, but it does the job for now
1466sub _calc_inner_pad_px {
1467 my ($self, $w) = @_;
1468 ($w / 100) * $self->{inner_pad} # % to pixels
1173} 1469}
1174 1470
1175sub _draw { 1471sub _draw {
1176 my ($self) = @_; 1472 my ($self) = @_;
1177 1473
1191 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1487 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1192 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1488 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1193 1489
1194 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1490 my ($value, $lo, $hi, $page) = @{$self->{range}};
1195 1491
1492 $hi = $value + 1 if $lo == $hi;
1493
1494 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1495 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1496
1196 $page = int $page * $w / ($hi - $lo); 1497 $page = int $page * $inner_w / ($hi - $lo);
1197 $value = int +($value - $lo) * $w / ($hi - $lo); 1498 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1198 1499
1199 $w -= $page; 1500 $w -= $page;
1200 $page &= ~1; 1501 $page &= ~1;
1201 glTranslate $page * 0.5, 0, 0; 1502 glTranslate $page * 0.5, 0, 0;
1503 $page ||= 2;
1202 1504
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; 1505 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1211 my $knob_b = $value + $page * 0.5; 1506 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1212 1507
1213 glBegin GL_QUADS; 1508 glEnable GL_BLEND;
1214 glColor @$fg; 1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215 glVertex $knob_a, 0; 1510 glEnable GL_TEXTURE_2D;
1216 glVertex $knob_a, $h; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1217 glVertex $knob_b, $h;
1218 glVertex $knob_b, 0;
1219 1512
1220 if ($knob_a < $knob_b - 2) { 1513 # draw background
1221 glColor @$bg; 1514 $tex[1]->draw_quad (0, 0, $w, $h);
1222 glVertex $knob_a + 1, 1; 1515
1223 glVertex $knob_a + 1, $h - 1; 1516 # draw handle
1224 glVertex $knob_b - 1, $h - 1; 1517 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1225 glVertex $knob_b - 1, 1; 1518
1519 glDisable GL_BLEND;
1520 glDisable GL_TEXTURE_2D;
1521}
1522
1523#############################################################################
1524
1525package CFClient::UI::TextView;
1526
1527our @ISA = CFClient::UI::HBox::;
1528
1529use SDL::OpenGL;
1530
1531sub new {
1532 my $class = shift;
1533
1534 my $self = $class->SUPER::new (
1535 req_w => $::WIDTH / 6,
1536 req_h => $::HEIGHT / 6,
1537 fontsize => $::FONTSIZE,
1538 @_,
1539
1540 layout => (new CFClient::Layout),
1541 par => [],
1542 height => 0,
1543 children => [
1544 (new CFClient::UI::Empty expand => 1),
1545 (new CFClient::UI::Slider vertical => 1),
1546 ],
1547 );
1548
1549 $self->{children}[1]->connect (changed => sub {
1550 $self->update;
1551 });
1552
1553 $self
1554}
1555
1556sub set_fontsize {
1557 my ($self, $fontsize) = @_;
1558
1559 $self->{fontsize} = $fontsize;
1560 $self->reflow;
1561}
1562
1563sub text_height {
1564 my ($self, $text) = @_;
1565
1566 my $layout = $self->{layout};
1567
1568 $layout->set_height ($self->{fontsize});
1569 $layout->set_width ($self->{w});
1570 $layout->set_text ($text);
1226 } 1571
1227 glEnd; 1572 ($layout->size)[1]
1573}
1574
1575sub reflow {
1576 my ($self) = @_;
1577
1578 $self->{need_reflow}++;
1579 $self->update;
1580}
1581
1582sub size_request {
1583 my ($self) = @_;
1584
1585 ($self->{req_w}, $self->{req_h})
1586}
1587
1588sub size_allocate {
1589 my ($self, $x, $y, $w, $h) = @_;
1590
1591 $self->SUPER::size_allocate ($x, $y, $w, $h);
1592
1593 $self->{layout}->set_height ($self->{fontsize});
1594 $self->{layout}->set_width ($self->{w});
1595
1596 $self->reflow;
1597}
1598
1599sub add_paragraph {
1600 my ($self, $color, $text) = @_;
1601
1602 #TODO: intelligently "reformat" paragraph
1603
1604 my $height = $self->text_height ($text);
1605
1606 $self->{height} += $height;
1607
1608 push @{$self->{par}}, [$height, $color, $text];
1609
1610 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1611 $self->{children}[1]->update;
1612}
1613
1614sub update {
1615 my ($self) = @_;
1616
1617 $self->SUPER::update;
1618
1619 return unless $self->{h} > 0;
1620
1621 delete $self->{texture};
1622
1623 $ROOT->on_refresh ($self, sub {
1624 if (delete $self->{need_reflow}) {
1625 my $height = 0;
1626
1627 $height += $_->[0] = $self->text_height ($_->[2])
1628 for @{$self->{par}};
1629
1630 $self->{height} = $height;
1631
1632 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1633
1634 delete $self->{texture};
1635 }
1636
1637 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1638 glClearColor 0, 0, 0, 1;
1639 glClear GL_COLOR_BUFFER_BIT;
1640
1641 glEnable GL_BLEND;
1642 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1643 glEnable GL_TEXTURE_2D;
1644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645
1646 my $top = int $self->{children}[1]{range}[0];
1647
1648 my $y0 = $top;
1649 my $y1 = $top + $self->{h};
1650
1651 my $y = 0;
1652
1653 my $layout = $self->{layout};
1654
1655 for my $par (@{$self->{par}}) {
1656 my $h = $par->[0];
1657
1658 if ($y0 < $y + $h && $y < $y1) {
1659 $layout->set_text ($par->[2]);
1660
1661 glColor @{ $par->[1] };
1662 my ($W, $H) = $layout->size;
1663 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1664 }
1665
1666 $y += $h;
1667 }
1668
1669 glDisable GL_TEXTURE_2D;
1670 glDisable GL_BLEND;
1671 };
1672 });
1673}
1674
1675sub _draw {
1676 my ($self) = @_;
1677
1678 if ($self->{texture}) {
1679 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1682 glDisable GL_TEXTURE_2D;
1683 }
1684
1685 $self->{children}[1]->draw;
1686
1228} 1687}
1229 1688
1230############################################################################# 1689#############################################################################
1231 1690
1232package CFClient::UI::MapWidget; 1691package CFClient::UI::MapWidget;
1242 1701
1243sub new { 1702sub new {
1244 my $class = shift; 1703 my $class = shift;
1245 1704
1246 $class->SUPER::new ( 1705 $class->SUPER::new (
1247 z => -1, 1706 z => -1,
1707 can_focus => 1,
1248 list => (glGenLists 1), 1708 list => (glGenLists 1),
1249 @_ 1709 @_
1250 ) 1710 )
1251} 1711}
1252 1712
1253sub key_down { 1713sub key_down {
1255} 1715}
1256 1716
1257sub key_up { 1717sub key_up {
1258} 1718}
1259 1719
1720sub button_down {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 $self->focus_in;
1724
1725 if ($ev->button == 2) {
1726 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1727 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1728
1729 $self->{motion} = sub {
1730 my ($ev, $x, $y) = @_;
1731
1732 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1733
1734 $::CFG->{map_shift_x} = $bw + $x - $ox;
1735 $::CFG->{map_shift_y} = $bh + $y - $oy;
1736
1737 $self->update;
1738 };
1739 }
1740}
1741
1742sub button_up {
1743 my ($self, $ev, $x, $y) = @_;
1744
1745 delete $self->{motion};
1746}
1747
1748sub mouse_motion {
1749 my ($self, $ev, $x, $y) = @_;
1750
1751 $self->{motion}->($ev, $x, $y) if $self->{motion};
1752}
1753
1260sub size_request { 1754sub size_request {
1261 ( 1755 (
1262 1 + int $::WIDTH / 32, 1756 1 + 32 * int $::WIDTH / 32,
1263 1 + int $::HEIGHT / 32, 1757 1 + 32 * int $::HEIGHT / 32,
1264 ) 1758 )
1265} 1759}
1266 1760
1267sub update { 1761sub update {
1268 my ($self) = @_; 1762 my ($self) = @_;
1269 1763
1270 $self->{need_update} = 1; 1764 $self->{need_update} = 1;
1271 $self->SUPER::update; 1765 $self->SUPER::update;
1272} 1766}
1273 1767
1274sub _draw { 1768sub draw {
1275 my ($self) = @_; 1769 my ($self) = @_;
1276 1770
1277 if (delete $self->{need_update}) { 1771 if (delete $self->{need_update}) {
1278 glNewList $self->{list}, GL_COMPILE; 1772 glNewList $self->{list}, GL_COMPILE;
1279 1773
1280 my $mx = $::CONN->{mapx}; 1774 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; 1775 my $sw = int $::WIDTH / 32;
1288 my $sh = 1 + int $::HEIGHT / 32; 1776 my $sh = int $::HEIGHT / 32;
1289 1777
1290 if ($::CONN->{mapw} > $sw) { 1778 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1291 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1779 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1292 } else { 1780
1293 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1781 glTranslate $sx0 - 32, $sy0 - 32, 0;
1782
1783 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1784
1785 if ($::CFG->{fow_enable}) {
1786 if ($::CFG->{fow_smooth}) { # smooth fog of war
1787 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1788 glConvolutionFilter2D
1789 GL_CONVOLUTION_2D,
1790 GL_ALPHA,
1791 3, 3,
1792 GL_ALPHA, GL_FLOAT,
1793 pack "f*",
1794 0.1, 0.1, 0.1,
1795 0.1, 0.2, 0.1,
1796 0.1, 0.1, 0.1,
1797 ;
1798 glEnable GL_CONVOLUTION_2D;
1799 }
1800
1801 $self->{fow_texture} = new CFClient::Texture
1802 w => $w,
1803 h => $h,
1804 data => $data,
1805 internalformat => GL_ALPHA,
1806 format => GL_ALPHA;
1807
1808 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
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_MODULATE;
1814
1815 glColor +($::CFG->{fow_intensity}) x 3, 1;
1816 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1817
1818 glDisable GL_TEXTURE_2D;
1819 glDisable GL_BLEND;
1820 }
1821
1822 # HACK BEGIN
1823 {
1824 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1825 my ($w, $h) = (250, 250);
1826
1827 glEnable GL_BLEND;
1828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1829 glEnable GL_TEXTURE_2D;
1830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1831
1832 $self->{mapmap_texture} =
1833 new CFClient::Texture
1834 w => $w,
1835 h => $h,
1836 data => $::MAP->mapmap ($w, $h),
1837 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1838
1839 $self->{mapmap_texture}->draw_quad (100, 100);
1840
1841 glDisable GL_TEXTURE_2D;
1842 glDisable GL_BLEND;
1843 }
1844 # HACK END
1294 } 1845 }
1295 1846
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; 1847 glEndList;
1360 } 1848 }
1361 1849
1850 glPushMatrix;
1362 glCallList $self->{list}; 1851 glCallList $self->{list};
1852 glPopMatrix;
1853
1854 if ($FOCUS != $self) {
1855 glColor 64/255, 64/255, 64/255;
1856 glLogicOp GL_AND;
1857 glEnable GL_COLOR_LOGIC_OP;
1858 glBegin GL_QUADS;
1859 glVertex 0, 0;
1860 glVertex 0, $::HEIGHT;
1861 glVertex $::WIDTH, $::HEIGHT;
1862 glVertex $::WIDTH, 0;
1863 glEnd;
1864 glDisable GL_COLOR_LOGIC_OP;
1865 }
1363} 1866}
1364 1867
1365my %DIR = ( 1868my %DIR = (
1366 SDLK_KP8, [1, "north"], 1869 SDLK_KP8, [1, "north"],
1367 SDLK_KP9, [2, "northeast"], 1870 SDLK_KP9, [2, "northeast"],
1383 1886
1384 my $mod = $ev->key_mod; 1887 my $mod = $ev->key_mod;
1385 my $sym = $ev->key_sym; 1888 my $sym = $ev->key_sym;
1386 1889
1387 if ($sym == SDLK_KP5) { 1890 if ($sym == SDLK_KP5) {
1388 $::CONN->send ("command stay fire"); 1891 $::CONN->user_send ("stay fire");
1892 } elsif ($sym == SDLK_a) {
1893 $::CONN->user_send ("apply");
1894 } elsif ($sym == SDLK_QUOTE) {
1895 $self->emit ('activate_console');
1896 } elsif ($sym == SDLK_SLASH) {
1897 $self->emit ('activate_console' => '/');
1389 } elsif (exists $DIR{$sym}) { 1898 } elsif (exists $DIR{$sym}) {
1390 if ($mod & KMOD_SHIFT) { 1899 if ($mod & KMOD_SHIFT) {
1391 $self->{shft}++; 1900 $self->{shft}++;
1392 $::CONN->send ("command fire $DIR{$sym}[0]"); 1901 $::CONN->user_send ("fire $DIR{$sym}[0]");
1393 } elsif ($mod & KMOD_CTRL) { 1902 } elsif ($mod & KMOD_CTRL) {
1394 $self->{ctrl}++; 1903 $self->{ctrl}++;
1395 $::CONN->send ("command run $DIR{$sym}[0]"); 1904 $::CONN->user_send ("run $DIR{$sym}[0]");
1396 } else { 1905 } else {
1397 $::CONN->send ("command $DIR{$sym}[1]"); 1906 $::CONN->user_send ("$DIR{$sym}[1]");
1398 } 1907 }
1399 } 1908 }
1400} 1909}
1401 1910
1402sub key_up { 1911sub key_up {
1404 1913
1405 my $mod = $ev->key_mod; 1914 my $mod = $ev->key_mod;
1406 my $sym = $ev->key_sym; 1915 my $sym = $ev->key_sym;
1407 1916
1408 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1917 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1409 $::CONN->send ("command fire_stop"); 1918 $::CONN->user_send ("fire_stop");
1410 } 1919 }
1411 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1920 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1412 $::CONN->send ("command run_stop"); 1921 $::CONN->user_send ("run_stop");
1413 } 1922 }
1414} 1923}
1415 1924
1416############################################################################# 1925#############################################################################
1417 1926
1455 glPopMatrix; 1964 glPopMatrix;
1456} 1965}
1457 1966
1458############################################################################# 1967#############################################################################
1459 1968
1460package CFClient::UI::Toplevel; 1969package CFClient::UI::Flopper;
1970
1971our @ISA = CFClient::UI::Button::;
1972
1973sub new {
1974 my $class = shift;
1975
1976 my $self = $class->SUPER::new (
1977 state => 0,
1978 connect_activate => \&toggle_flopper,
1979 @_
1980 );
1981
1982 if ($self->{state}) {
1983 $self->{state} = 0;
1984 $self->toggle_flopper;
1985 }
1986
1987 $self
1988}
1989
1990sub toggle_flopper {
1991 my ($self) = @_;
1992
1993 # TODO: use animation
1994 if ($self->{state} = !$self->{state}) {
1995 $CFClient::UI::ROOT->add ($self->{other});
1996 $self->{other}->move ($self->coord2global (0, $self->{h}));
1997 $self->emit ("open");
1998 } else {
1999 $CFClient::UI::ROOT->remove ($self->{other});
2000 $self->emit ("close");
2001 }
2002
2003 $self->emit (changed => $self->{state});
2004}
2005
2006#############################################################################
2007
2008package CFClient::UI::Root;
1461 2009
1462our @ISA = CFClient::UI::Container::; 2010our @ISA = CFClient::UI::Container::;
2011
2012use SDL::OpenGL;
1463 2013
1464sub size_request { 2014sub size_request {
1465 ($::WIDTH, $::HEIGHT) 2015 ($::WIDTH, $::HEIGHT)
1466} 2016}
1467 2017
1472 2022
1473 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2023 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1474 for @{$self->{children}}; 2024 for @{$self->{children}};
1475} 2025}
1476 2026
1477sub translate { 2027sub _topleft {
1478 my ($self, $x, $y) = @_; 2028 my ($self, $x, $y) = @_;
1479 2029
1480 ($x, $y) 2030 ($x, $y)
1481} 2031}
1482 2032
1490sub add { 2040sub add {
1491 my ($self, $widget) = @_; 2041 my ($self, $widget) = @_;
1492 2042
1493 $self->SUPER::add ($widget); 2043 $self->SUPER::add ($widget);
1494 2044
1495 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2045 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2046}
2047
2048sub on_refresh {
2049 my ($self, $id, $cb) = @_;
2050
2051 $self->{refresh_hook}{$id} = $cb;
1496} 2052}
1497 2053
1498sub draw { 2054sub draw {
1499 my ($self) = @_; 2055 my ($self) = @_;
1500 2056
2057 while (my $rcb = delete $self->{refresh_hook}) {
2058 $_->() for values %$rcb;
2059 }
2060
2061 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2062 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2063 glClear GL_COLOR_BUFFER_BIT;
2064
2065 glMatrixMode GL_PROJECTION;
2066 glLoadIdentity;
2067 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2068 glMatrixMode GL_MODELVIEW;
2069 glLoadIdentity;
2070
1501 $self->_draw; 2071 $self->_draw;
1502} 2072}
1503 2073
1504############################################################################# 2074#############################################################################
1505 2075
1506package CFClient::UI; 2076package CFClient::UI;
1507 2077
1508$TOPLEVEL = new CFClient::UI::Toplevel; 2078$ROOT = new CFClient::UI::Root;
1509 2079
15101 20801
1511 2081

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines