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.77 by root, Tue Apr 11 22:14:13 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_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for (@$vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
… …
79use SDL::OpenGL; 92use SDL::OpenGL;
80 93
81sub new { 94sub new {
82 my $class = shift; 95 my $class = shift;
83 96
84 bless { 97 my $self = bless {
85 x => 0, 98 x => 0,
86 y => 0, 99 y => 0,
87 z => 0, 100 z => 0,
88 w => -1, 101 w => -1,
89 h => -1, 102 h => -1,
90 @_ 103 @_
91 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
92} 113}
93 114
94sub move { 115sub move {
95 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 117 $self->{x} = int $x;
97 $self->{y} = $y; 118 $self->{y} = int $y;
98 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
99} 120}
100 121
101sub needs_redraw { 122sub needs_redraw {
102 0 123 0
… …
125 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
126 147
127 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
128} 149}
129 150
130# translate global koordinates to local coordinate system 151# return top left coordinates
131sub translate { 152sub _topleft {
132 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
133 154
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
135} 172}
136 173
137sub focus_in { 174sub focus_in {
138 my ($self) = @_; 175 my ($self) = @_;
139 176
140 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
141 179
142 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
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) = @_; 361 my ($self, $child) = @_;
336 362
337 $chld->set_parent ($self); 363 $child->set_parent ($self);
364
365 use sort 'stable';
338 366
339 $self->{children} = [ 367 $self->{children} = [
340 sort { $a->{z} <=> $b->{z} } 368 sort { $a->{z} <=> $b->{z} }
341 @{$self->{children}}, $chld 369 @{$self->{children}}, $child
342 ]; 370 ];
343 371
344 $self->{w} = $self->{h} = -1; 372 $self->{w} = $self->{h} = -1;
345 $self->update; 373 $self->update;
346} 374}
… …
443} 471}
444 472
445sub render_chld { 473sub render_chld {
446 my ($self) = @_; 474 my ($self) = @_;
447 475
448 $self->{texture} = 476 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
449 CFClient::Texture->new_from_opengl ( 477 glClearColor 0, 0, 0, 1;
450 $self->{w}, $self->{h}, sub { $self->child->draw } 478 glClear GL_COLOR_BUFFER_BIT;
451 ); 479 $self->child->draw;
480 };
452} 481}
453 482
454sub size_allocate { 483sub size_allocate {
455 my ($self, $x, $y, $w, $h) = @_; 484 my ($self, $x, $y, $w, $h) = @_;
456 485
… …
534 563
535my @tex = 564my @tex =
536 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
537 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);
538 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
539sub size_request { 581sub size_request {
540 my ($self) = @_; 582 my ($self) = @_;
541 583
542 my ($w, $h) = 584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
543 $self->{user_w} && $self->{user_h} 585
544 ? ($self->{user_w}, $self->{user_h})
545 : ($self->SUPER::size_request); 586 my ($w, $h) = $self->SUPER::size_request;
546 587
547 $h += $tex[1]->{h}; 588 (
548 $h += $tex[4]->{h}; 589 $w + $self->{border} * 2,
549 $w += $tex[2]->{w}; 590 $h + $self->{border} * 2,
550 $w += $tex[3]->{w}; 591 )
551
552 ($w, $h)
553} 592}
554 593
555sub size_allocate { 594sub size_allocate {
556 my ($self, $x, $y, $w, $h) = @_; 595 my ($self, $x, $y, $w, $h) = @_;
557 596
558 $self->_size_allocate ($x, $y, $w, $h) or return; 597 $self->_size_allocate ($x, $y, $w, $h) or return;
559 598
560 $h -= $tex[1]{h}; 599 $h -= List::Util::max 0, $self->{border} * 2;
561 $h -= $tex[4]{h}; 600 $w -= List::Util::max 0, $self->{border} * 2;
562 $w -= $tex[2]{w};
563 $w -= $tex[3]{w};
564 601
565 $h = $h < 0 ? 0 : $h; 602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
566 $w = $w < 0 ? 0 : $w;
567
568 my $child = $self->child;
569
570 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
571} 603}
572 604
573sub button_down { 605sub button_down {
574 my ($self, $ev, $x, $y) = @_; 606 my ($self, $ev, $x, $y) = @_;
575 607
576 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
577 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
578 610
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 611 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580 my ($bw, $bh) = ($self->{w}, $self->{h}); 612 my ($bw, $bh) = ($self->{w}, $self->{h});
581 613
582 $self->{motion} = sub { 614 $self->{motion} = sub {
… …
588 $self->{user_h} = $bh + $y - $oy; 620 $self->{user_h} = $bh + $y - $oy;
589 $self->update; 621 $self->update;
590 }; 622 };
591 623
592 } elsif ($x >= 0 && $x < $self->{w} 624 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $tex[1]{h}) { 625 && $y >= 0 && $y < $self->{border}) {
594 626
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 627 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596 my ($bx, $by) = ($self->{x}, $self->{y}); 628 my ($bx, $by) = ($self->{x}, $self->{y});
597 629
598 $self->{motion} = sub { 630 $self->{motion} = sub {
… …
619} 651}
620 652
621sub _draw { 653sub _draw {
622 my ($self) = @_; 654 my ($self) = @_;
623 655
624 my ($w, $h) = ($self->{w}, $self->{h}); 656 my ($w, $h ) = ($self->{w}, $self->{h});
625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 657 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
626 658
627 glEnable GL_BLEND; 659 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 661 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 663
632 my $top = $tex[1]; 664 glColor @{ $self->{border_bg} };
633 $top->draw_quad (0, 0, $w, $top->{h}); 665 $tex[1]->draw_quad (0, 0, $w, $self->{border});
634 666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
635 my $left = $tex[3]; 667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
636 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
637
638 my $right = $tex[2];
639 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
640
641 my $bottom = $tex[4];
642 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
643 669
644 my $bg = $tex[0]; 670 my $bg = $tex[0];
645 671
646 glBindTexture GL_TEXTURE_2D, $bg->{name}; 672 # TODO: repeat texture not scale
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
648 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
649 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
650
651 my $rep_x = $cw / $bg->{w}; 673 my $rep_x = $cw / $bg->{w};
652 my $rep_y = $ch / $bg->{h}; 674 my $rep_y = $ch / $bg->{h};
653 675
676 glColor @{ $self->{bg} };
677
678 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1;
654 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
655 682
656 glDisable GL_TEXTURE_2D; 683 glDisable GL_TEXTURE_2D;
657 glDisable GL_BLEND; 684 glDisable GL_BLEND;
658 685
659 $self->child->draw; 686 $self->child->draw;
660
661} 687}
662 688
663############################################################################# 689#############################################################################
664 690
665package CFClient::UI::Table; 691package CFClient::UI::Table;
… …
668 694
669use List::Util qw(max sum); 695use List::Util qw(max sum);
670 696
671use SDL::OpenGL; 697use SDL::OpenGL;
672 698
699sub new {
700 my $class = shift;
701
702 $class->SUPER::new (
703 col_expand => [],
704 @_
705 )
706}
707
673sub add { 708sub add {
674 my ($self, $x, $y, $chld) = @_; 709 my ($self, $x, $y, $child) = @_;
675 710
711 $child->set_parent ($self);
676 $self->{children}[$y][$x] = $chld; 712 $self->{children}[$y][$x] = $child;
677 $chld->set_parent ($self);
678 713
679 $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};
680 $self->update; 723 $self->update;
681} 724}
682 725
683sub get_wh { 726sub get_wh {
684 my ($self) = @_; 727 my ($self) = @_;
… …
706 my ($self) = @_; 749 my ($self) = @_;
707 750
708 my ($ws, $hs) = $self->get_wh; 751 my ($ws, $hs) = $self->get_wh;
709 752
710 ( 753 (
711 (List::Util::sum @$ws), 754 (sum @$ws),
712 (List::Util::sum @$hs), 755 (sum @$hs),
713 ) 756 )
714} 757}
715 758
716sub size_allocate { 759sub size_allocate {
717 my ($self, $x, $y, $w, $h) = @_; 760 my ($self, $x, $y, $w, $h) = @_;
718 761
719 $self->_size_allocate ($x, $y, $w, $h) or return; 762 $self->_size_allocate ($x, $y, $w, $h) or return;
720 763
721 my ($ws, $hs) = $self->get_wh; 764 my ($ws, $hs) = $self->get_wh;
722 765
723 my $req_w = List::Util::sum @$ws; 766 my $req_w = sum @$ws;
724 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;
725 773
726 # linearly scale sizes 774 # linearly scale sizes
727 $_ *= $w / $req_w for @$ws; 775 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $_ *= $h / $req_h for @$hs; 776 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
777
778 CFClient::UI::harmonize $ws;
779 CFClient::UI::harmonize $hs;
729 780
730 my $y; 781 my $y;
731 782
732 for my $r (0 .. $#{$self->{children}}) { 783 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 784 my $row = $self->{children}[$r]
… …
735 786
736 my $x = 0; 787 my $x = 0;
737 my $row_h = $hs->[$r]; 788 my $row_h = $hs->[$r];
738 789
739 for my $c (0 .. $#$row) { 790 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 791 my $col_w = $ws->[$c];
744 792
793 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 794 $widget->size_allocate ($x, $y, $col_w, $row_h);
795 }
746 796
747 $x += $col_w; 797 $x += $col_w;
748 } 798 }
749 799
750 $y += $row_h; 800 $y += $row_h;
… …
796} 846}
797 847
798sub size_allocate { 848sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 849 my ($self, $x, $y, $w, $h) = @_;
800 850
801 $self->_size_allocate ($x, $y, $w, $h) or return; 851 $self->_size_allocate ($x, $y, $w, $h);
802
803 return unless $self->{w};
804 852
805 ($h, $w) = ($w, $h); 853 ($h, $w) = ($w, $h);
806 854
807 my $children = $self->{children}; 855 my $children = $self->{children};
808 856
… …
810 858
811 my $req_h = List::Util::sum @h; 859 my $req_h = List::Util::sum @h;
812 860
813 if ($req_h > $h) { 861 if ($req_h > $h) {
814 # ah well, not enough space 862 # ah well, not enough space
815 $_ = $h[$_] * $h / $req_h for @h; 863 $_ *= $h / $req_h for @h;
816 } else { 864 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children; 865 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1; 866 $exp ||= 1;
819 867
820 for (0 .. $#$children) { 868 for (0 .. $#$children) {
… …
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 872 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 873 $h[$_] = $alloc_h;
826 } 874 }
827 } 875 }
828 876
877 CFClient::UI::harmonize \@h;
878
829 my $y = 0; 879 my $y = 0;
830 for (0 .. $#$children) { 880 for (0 .. $#$children) {
831 my $child = $children->[$_]; 881 my $child = $children->[$_];
832 my $h = $h[$_]; 882 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 883 $child->size_allocate ($y, 0, $h, $w);
… …
856} 906}
857 907
858sub size_allocate { 908sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 909 my ($self, $x, $y, $w, $h) = @_;
860 910
861 $self->_size_allocate ($x, $y, $w, $h) or return; 911 $self->_size_allocate ($x, $y, $w, $h);
862
863 return unless $self->{h};
864 912
865 my $children = $self->{children}; 913 my $children = $self->{children};
866 914
867 my @h = map +($_->size_request)[1], @$children; 915 my @h = map +($_->size_request)[1], @$children;
868 916
869 my $req_h = List::Util::sum @h; 917 my $req_h = List::Util::sum @h;
870 918
871 if ($req_h > $h) { 919 if ($req_h > $h) {
872 # ah well, not enough space 920 # ah well, not enough space
873 $_ = $h[$_] * $h / $req_h for @h; 921 $_ *= $h / $req_h for @h;
874 } else { 922 } else {
875 my $exp = List::Util::sum map $_->{expand}, @$children; 923 my $exp = List::Util::sum map $_->{expand}, @$children;
876 $exp ||= 1; 924 $exp ||= 1;
877 925
878 for (0 .. $#$children) { 926 for (0 .. $#$children) {
… …
880 928
881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 929 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
882 } 930 }
883 } 931 }
884 932
933 CFClient::UI::harmonize \@h;
934
885 my $y = 0; 935 my $y = 0;
886 for (0 .. $#$children) { 936 for (0 .. $#$children) {
887 my $child = $children->[$_]; 937 my $child = $children->[$_];
888 my $h = $h[$_]; 938 my $h = $h[$_];
889 $child->size_allocate (0, $y, $w, $h); 939 $child->size_allocate (0, $y, $w, $h);
… …
902 952
903sub new { 953sub new {
904 my ($class, %arg) = @_; 954 my ($class, %arg) = @_;
905 955
906 my $self = $class->SUPER::new ( 956 my $self = $class->SUPER::new (
907 fg => [1, 1, 1], 957 fg => [1, 1, 1],
908 height => $::FONTSIZE, 958 fontsize => $::FONTSIZE,
909 text => "", 959 text => "",
910 align => -1, 960 align => -1,
961 valign => -1,
911 padding => 2, 962 padding => 2,
912 layout => new CFClient::Layout, 963 layout => new CFClient::Layout,
913 %arg 964 %arg
914 ); 965 );
915 966
916 $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};
917 971
918 $self 972 $self
919} 973}
920 974
921sub escape_text { 975sub escape_text {
… …
929} 983}
930 984
931sub set_text { 985sub set_text {
932 my ($self, $text) = @_; 986 my ($self, $text) = @_;
933 987
934 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 988 $self->{layout}->set_text ($text);
936 989
937 delete $self->{texture}; 990 delete $self->{texture};
938 $self->update; 991 $self->update;
939} 992}
940 993
941sub get_text { 994sub set_markup {
942 my ($self, $text) = @_; 995 my ($self, $markup) = @_;
943 996
944 $self->{text} 997 $self->{layout}->set_markup ($markup);
998
999 delete $self->{texture};
1000 $self->update;
945} 1001}
946 1002
947sub size_request { 1003sub size_request {
948 my ($self) = @_; 1004 my ($self) = @_;
949 1005
950 $self->{layout}->set_width; 1006 $self->{layout}->set_width;
951 $self->{layout}->set_height ($self->{height}); 1007 $self->{layout}->set_height ($self->{fontsize});
1008
952 my ($w, $h) = $self->{layout}->size; 1009 my ($w, $h) = $self->{layout}->size;
953 1010
954 ( 1011 (
955 $w + $self->{padding} * 2, 1012 $w + $self->{padding} * 2,
956 $h + $self->{padding} * 2, 1013 $h + $self->{padding} * 2,
… …
975sub _draw { 1032sub _draw {
976 my ($self) = @_; 1033 my ($self) = @_;
977 1034
978 my $tex = $self->{texture} ||= do { 1035 my $tex = $self->{texture} ||= do {
979 $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});
980 new_from_layout CFClient::Texture $self->{layout} 1038 new_from_layout CFClient::Texture $self->{layout}
981 }; 1039 };
982 1040
983 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D; 1043 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987 1045
988 glColor @{$self->{fg}}; 1046 glColor @{$self->{fg}};
989 1047
990 my $x = 1048 $self->{ox} = int (
991 $self->{align} < 0 ? $self->{padding} 1049 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 1051 : ($self->{w} - $tex->{w}) * 0.5
1052 );
994 1053
995 $tex->draw_quad ($x, $self->{padding}); 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});
996 1061
997 glDisable GL_TEXTURE_2D; 1062 glDisable GL_TEXTURE_2D;
998 glDisable GL_BLEND; 1063 glDisable GL_BLEND;
999} 1064}
1000 1065
1001############################################################################# 1066#############################################################################
1002 1067
1003package CFClient::UI::Entry; 1068package CFClient::UI::EntryBase;
1004 1069
1005our @ISA = CFClient::UI::Label::; 1070our @ISA = CFClient::UI::Label::;
1006 1071
1007use SDL; 1072use SDL;
1008use SDL::OpenGL; 1073use SDL::OpenGL;
… …
1011 my $class = shift; 1076 my $class = shift;
1012 1077
1013 $class->SUPER::new ( 1078 $class->SUPER::new (
1014 fg => [1, 1, 1], 1079 fg => [1, 1, 1],
1015 bg => [0, 0, 0, 0.2], 1080 bg => [0, 0, 0, 0.2],
1016 active_bg => [1, 1, 1], 1081 active_bg => [1, 1, 1, 0.5],
1017 active_fg => [0, 0, 0], 1082 active_fg => [0, 0, 0],
1083 can_hover => 1,
1084 can_focus => 1,
1085 valign => 0,
1018 @_ 1086 @_
1019 ) 1087 )
1020} 1088}
1021 1089
1022sub _set_text { 1090sub _set_text {
1023 my ($self, $text) = @_; 1091 my ($self, $text) = @_;
1024 1092
1093 delete $self->{cur_h};
1094
1095 return if $self->{text} eq $text;
1096
1025 $self->{last_activity} = $::NOW; 1097 $self->{last_activity} = $::NOW;
1026
1027 $self->{text} = $text; 1098 $self->{text} = $text;
1028 $self->{layout}->set_width ($self->{w});
1029 1099
1030 $text =~ s/./*/g if $self->{hidden}; 1100 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text ");
1031 1102
1032 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1103 $self->emit (changed => $self->{text});
1104}
1033 1105
1034 $text = substr $text, 0, $self->{cursor}; 1106sub get_text {
1035 utf8::encode $text; 1107 $_[0]{text}
1036
1037 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1038} 1108}
1039 1109
1040sub size_request { 1110sub size_request {
1041 my ($self) = @_; 1111 my ($self) = @_;
1042 1112
… …
1081 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1151 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1082 } elsif ($sym == SDLK_HOME) { 1152 } elsif ($sym == SDLK_HOME) {
1083 $self->{cursor} = 0; 1153 $self->{cursor} = 0;
1084 } elsif ($sym == SDLK_END) { 1154 } elsif ($sym == SDLK_END) {
1085 $self->{cursor} = length $text; 1155 $self->{cursor} = length $text;
1156 } elsif ($sym == SDLK_ESCAPE) {
1157 $self->emit ('escape');
1086 } elsif ($uni) { 1158 } elsif ($uni) {
1087 substr $text, $self->{cursor}++, 0, chr $uni; 1159 substr $text, $self->{cursor}++, 0, chr $uni;
1088 } 1160 }
1089 1161
1090 $self->_set_text ($text); 1162 $self->_set_text ($text);
… …
1144 1216
1145 $self->SUPER::_draw; 1217 $self->SUPER::_draw;
1146 1218
1147 #TODO: force update every cursor change :( 1219 #TODO: force update every cursor change :(
1148 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
1149 glColor @{$self->{fg}}; 1229 glColor @{$self->{fg}};
1150 glBegin GL_LINES; 1230 glBegin GL_LINES;
1151 glVertex $self->{cur_x}, $self->{cur_y};
1152 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};
1153 glEnd; 1233 glEnd;
1154 } 1234 }
1155} 1235}
1156 1236
1157#############################################################################
1158
1159package CFClient::UI::Slider; 1237package CFClient::UI::Entry;
1160 1238
1161use strict; 1239our @ISA = CFClient::UI::EntryBase::;
1162 1240
1241use SDL;
1163use SDL::OpenGL; 1242use SDL::OpenGL;
1164 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
1165our @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);
1166 1271
1167sub new { 1272sub new {
1168 my $class = shift; 1273 my $class = shift;
1169 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
1170 # range [value, low, high, page] 1405 # range [value, low, high, page]
1171 1406
1407 # TODO: 0-width page
1408 # TODO: req_w/h are wrong with vertical
1409 # TODO: calculations are off
1172 my $self = $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
1173 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
1174 active_fg => [0, 0, 0], 1412 active_fg => [0, 0, 0],
1175 range => [0, 0, 100, 10], 1413 range => [0, 0, 100, 10],
1176 req_w => 40, 1414 req_w => 40,
1177 req_h => 10, 1415 req_h => 13,
1178 vertical => 0, 1416 vertical => 0,
1417 can_hover => 1,
1418 inner_pad => 5,
1179 @_ 1419 @_
1180 ); 1420 );
1181 1421
1182 $self 1422 $self
1183} 1423}
… …
1204 if ($GRAB == $self) { 1444 if ($GRAB == $self) {
1205 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1445 my ($value, $lo, $hi, $page) = @{$self->{range}};
1206 1446
1207 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1447 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1208 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
1209 $x = $x * ($hi - $lo) / $w + $lo; 1453 $x = $x * ($hi - $lo) / $inner_w + $lo;
1210 $x = $lo if $x < $lo; 1454 $x = $lo if $x < $lo;
1211 $x = $hi - $page if $x > $hi - $page; 1455 $x = $hi - $page if $x > $hi - $page;
1212 $self->{range}[0] = $x; 1456 $self->{range}[0] = $x;
1213 1457
1214 $self->emit (changed => $x); 1458 $self->emit (changed => $x);
1215 $self->update; 1459 $self->update;
1216 } 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
1217} 1469}
1218 1470
1219sub _draw { 1471sub _draw {
1220 my ($self) = @_; 1472 my ($self) = @_;
1221 1473
… …
1235 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1487 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1236 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1488 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1237 1489
1238 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1490 my ($value, $lo, $hi, $page) = @{$self->{range}};
1239 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
1240 $page = int $page * $w / ($hi - $lo); 1497 $page = int $page * $inner_w / ($hi - $lo);
1241 $value = int +($value - $lo) * $w / ($hi - $lo); 1498 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1242 1499
1243 $w -= $page; 1500 $w -= $page;
1244 $page &= ~1; 1501 $page &= ~1;
1245 glTranslate $page * 0.5, 0, 0; 1502 glTranslate $page * 0.5, 0, 0;
1503 $page ||= 2;
1246 1504
1247 glColor @$fg;
1248 glBegin GL_LINES;
1249 glVertex 0, 0; glVertex 0, $h;
1250 glVertex $w - 1, 0; glVertex $w - 1, $h;
1251 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1252 glEnd;
1253
1254 my $knob_a = $value - $page * 0.5; 1505 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1255 my $knob_b = $value + $page * 0.5; 1506 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1256 1507
1257 glBegin GL_QUADS; 1508 glEnable GL_BLEND;
1258 glColor @$fg; 1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1259 glVertex $knob_a, 0; 1510 glEnable GL_TEXTURE_2D;
1260 glVertex $knob_a, $h; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1261 glVertex $knob_b, $h;
1262 glVertex $knob_b, 0;
1263 1512
1264 if ($knob_a < $knob_b - 2) { 1513 # draw background
1265 glColor @$bg; 1514 $tex[1]->draw_quad (0, 0, $w, $h);
1266 glVertex $knob_a + 1, 1; 1515
1267 glVertex $knob_a + 1, $h - 1; 1516 # draw handle
1268 glVertex $knob_b - 1, $h - 1; 1517 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1269 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);
1270 } 1571
1271 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
1272} 1687}
1273 1688
1274############################################################################# 1689#############################################################################
1275 1690
1276package CFClient::UI::MapWidget; 1691package CFClient::UI::MapWidget;
… …
1286 1701
1287sub new { 1702sub new {
1288 my $class = shift; 1703 my $class = shift;
1289 1704
1290 $class->SUPER::new ( 1705 $class->SUPER::new (
1291 z => -1, 1706 z => -1,
1707 can_focus => 1,
1292 list => (glGenLists 1), 1708 list => (glGenLists 1),
1293 @_ 1709 @_
1294 ) 1710 )
1295} 1711}
1296 1712
1297sub key_down { 1713sub key_down {
1298 print "MAPKEYDOWN\n"; 1714 print "MAPKEYDOWN\n";
1299} 1715}
1300 1716
1301sub key_up { 1717sub key_up {
1718}
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};
1302} 1752}
1303 1753
1304sub size_request { 1754sub size_request {
1305 ( 1755 (
1306 1 + 32 * int $::WIDTH / 32, 1756 1 + 32 * int $::WIDTH / 32,
… …
1319 my ($self) = @_; 1769 my ($self) = @_;
1320 1770
1321 if (delete $self->{need_update}) { 1771 if (delete $self->{need_update}) {
1322 glNewList $self->{list}, GL_COMPILE; 1772 glNewList $self->{list}, GL_COMPILE;
1323 1773
1324 my $mx = $::CONN->{mapx}; 1774 if ($::MAP) {
1325 my $my = $::CONN->{mapy};
1326
1327 my $map = $::CONN->{map};
1328
1329 my ($xofs, $yofs);
1330
1331 my $sw = 1 + int $::WIDTH / 32; 1775 my $sw = int $::WIDTH / 32;
1332 my $sh = 1 + int $::HEIGHT / 32; 1776 my $sh = int $::HEIGHT / 32;
1333 1777
1334 if ($::CONN->{mapw} > $sw) { 1778 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1335 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1779 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1336 } else { 1780
1337 $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
1338 } 1845 }
1339 1846
1340 if ($::CONN->{maph} > $sh) {
1341 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1342 } else {
1343 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1344 }
1345
1346 glEnable GL_TEXTURE_2D;
1347 glEnable GL_BLEND;
1348 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1350
1351 my $sw4 = ($sw + 3) & ~3;
1352 my $darkness = "\x00" x ($sw4 * $sh);
1353
1354 for my $x (0 .. $sw - 1) {
1355 my $row = $map->[$x + $xofs];
1356 for my $y (0 .. $sh - 1) {
1357
1358 my $cell = $row->[$y + $yofs]
1359 or next;
1360
1361 my $dark = $cell->[0];
1362 if ($dark < 0) {
1363 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1364 } else {
1365 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1366 }
1367
1368 for my $num (grep $_, @$cell[1,2,3]) {
1369 my $tex = $::CONN->{face}[$num]{texture} || next;
1370
1371 my ($w, $h) = @$tex{qw(w h)};
1372
1373 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1374 }
1375 }
1376 }
1377
1378# if (1) { # higher quality darkness
1379# $lighting =~ s/(.)/$1$1$1/gs;
1380# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1381#
1382# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1383#
1384# $lighting = $pb->get_pixels;
1385# $lighting =~ s/(.)../$1/gs;
1386# }
1387
1388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1389
1390 $darkness = new CFClient::Texture
1391 w => $sw4,
1392 h => $sh,
1393 data => $darkness,
1394 internalformat => GL_ALPHA,
1395 format => GL_ALPHA;
1396
1397 glColor 0.45, 0.45, 0.45, 1;
1398 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1399
1400 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402
1403 glEndList; 1847 glEndList;
1404 } 1848 }
1405 1849
1850 glPushMatrix;
1406 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 }
1407} 1866}
1408 1867
1409my %DIR = ( 1868my %DIR = (
1410 SDLK_KP8, [1, "north"], 1869 SDLK_KP8, [1, "north"],
1411 SDLK_KP9, [2, "northeast"], 1870 SDLK_KP9, [2, "northeast"],
… …
1427 1886
1428 my $mod = $ev->key_mod; 1887 my $mod = $ev->key_mod;
1429 my $sym = $ev->key_sym; 1888 my $sym = $ev->key_sym;
1430 1889
1431 if ($sym == SDLK_KP5) { 1890 if ($sym == SDLK_KP5) {
1432 $::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' => '/');
1433 } elsif (exists $DIR{$sym}) { 1898 } elsif (exists $DIR{$sym}) {
1434 if ($mod & KMOD_SHIFT) { 1899 if ($mod & KMOD_SHIFT) {
1435 $self->{shft}++; 1900 $self->{shft}++;
1436 $::CONN->send ("command fire $DIR{$sym}[0]"); 1901 $::CONN->user_send ("fire $DIR{$sym}[0]");
1437 } elsif ($mod & KMOD_CTRL) { 1902 } elsif ($mod & KMOD_CTRL) {
1438 $self->{ctrl}++; 1903 $self->{ctrl}++;
1439 $::CONN->send ("command run $DIR{$sym}[0]"); 1904 $::CONN->user_send ("run $DIR{$sym}[0]");
1440 } else { 1905 } else {
1441 $::CONN->send ("command $DIR{$sym}[1]"); 1906 $::CONN->user_send ("$DIR{$sym}[1]");
1442 } 1907 }
1443 } 1908 }
1444} 1909}
1445 1910
1446sub key_up { 1911sub key_up {
… …
1448 1913
1449 my $mod = $ev->key_mod; 1914 my $mod = $ev->key_mod;
1450 my $sym = $ev->key_sym; 1915 my $sym = $ev->key_sym;
1451 1916
1452 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1917 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1453 $::CONN->send ("command fire_stop"); 1918 $::CONN->user_send ("fire_stop");
1454 } 1919 }
1455 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1920 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1456 $::CONN->send ("command run_stop"); 1921 $::CONN->user_send ("run_stop");
1457 } 1922 }
1458} 1923}
1459 1924
1460############################################################################# 1925#############################################################################
1461 1926
… …
1499 glPopMatrix; 1964 glPopMatrix;
1500} 1965}
1501 1966
1502############################################################################# 1967#############################################################################
1503 1968
1504package 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;
1505 2009
1506our @ISA = CFClient::UI::Container::; 2010our @ISA = CFClient::UI::Container::;
2011
2012use SDL::OpenGL;
1507 2013
1508sub size_request { 2014sub size_request {
1509 ($::WIDTH, $::HEIGHT) 2015 ($::WIDTH, $::HEIGHT)
1510} 2016}
1511 2017
… …
1516 2022
1517 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2023 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1518 for @{$self->{children}}; 2024 for @{$self->{children}};
1519} 2025}
1520 2026
1521sub translate { 2027sub _topleft {
1522 my ($self, $x, $y) = @_; 2028 my ($self, $x, $y) = @_;
1523 2029
1524 ($x, $y) 2030 ($x, $y)
1525} 2031}
1526 2032
… …
1534sub add { 2040sub add {
1535 my ($self, $widget) = @_; 2041 my ($self, $widget) = @_;
1536 2042
1537 $self->SUPER::add ($widget); 2043 $self->SUPER::add ($widget);
1538 2044
1539 $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;
1540} 2052}
1541 2053
1542sub draw { 2054sub draw {
1543 my ($self) = @_; 2055 my ($self) = @_;
1544 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
1545 $self->_draw; 2071 $self->_draw;
1546} 2072}
1547 2073
1548############################################################################# 2074#############################################################################
1549 2075
1550package CFClient::UI; 2076package CFClient::UI;
1551 2077
1552$TOPLEVEL = new CFClient::UI::Toplevel; 2078$ROOT = new CFClient::UI::Root;
1553 2079
15541 20801
1555 2081

Diff Legend

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