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.121 by root, Mon Apr 17 19:21:00 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 0, 0, 1, 0.2;
187 glEnable GL_BLEND; 231 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
200 my ($self) = @_; 244 my ($self) = @_;
201 245
202 warn "no draw defined for $self\n"; 246 warn "no draw defined for $self\n";
203} 247}
204 248
205sub bbox {
206 my ($self) = @_;
207 my ($w, $h) = $self->size_request;
208 (
209 $self->{x},
210 $self->{y},
211 $self->{x} = $w,
212 $self->{y} = $h
213 )
214}
215
216sub find_widget { 249sub find_widget {
217 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
218 251
219 return $self 252 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 253 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 254 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 255
223 () 256 ()
224} 257}
225 258
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 259sub set_parent {
229 my ($self, $par) = @_; 260 my ($self, $parent) = @_;
230 261
231 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 262 Scalar::Util::weaken ($self->{parent} = $parent);
233}
234
235sub get_parent {
236 $_[0]->{parent}
237} 263}
238 264
239sub update { 265sub update {
240 my ($self) = @_; 266 my ($self) = @_;
241 267
… …
276 302
277 # range [value, low, high, page] 303 # range [value, low, high, page]
278 304
279 $class->SUPER::new ( 305 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2], 306 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 307 active_bg => [1, 1, 1, 0.5],
282 @_ 308 @_
283 ) 309 )
284} 310}
285 311
286sub _draw { 312sub _draw {
… …
330 356
331 $self 357 $self
332} 358}
333 359
334sub add { 360sub add {
335 my ($self, $chld) = @_; 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 my $x =
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;
994 1052
995 $tex->draw_quad ($x, $self->{padding}); 1053 my $y =
1054 $self->{valign} < 0 ? $self->{padding}
1055 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1056 : ($self->{h} - $tex->{h}) * 0.5;
1057
1058 $tex->draw_quad (int $x, int $y);
996 1059
997 glDisable GL_TEXTURE_2D; 1060 glDisable GL_TEXTURE_2D;
998 glDisable GL_BLEND; 1061 glDisable GL_BLEND;
999} 1062}
1000 1063
1001############################################################################# 1064#############################################################################
1002 1065
1003package CFClient::UI::Entry; 1066package CFClient::UI::EntryBase;
1004 1067
1005our @ISA = CFClient::UI::Label::; 1068our @ISA = CFClient::UI::Label::;
1006 1069
1007use SDL; 1070use SDL;
1008use SDL::OpenGL; 1071use SDL::OpenGL;
… …
1011 my $class = shift; 1074 my $class = shift;
1012 1075
1013 $class->SUPER::new ( 1076 $class->SUPER::new (
1014 fg => [1, 1, 1], 1077 fg => [1, 1, 1],
1015 bg => [0, 0, 0, 0.2], 1078 bg => [0, 0, 0, 0.2],
1016 active_bg => [1, 1, 1], 1079 active_bg => [1, 1, 1, 0.5],
1017 active_fg => [0, 0, 0], 1080 active_fg => [0, 0, 0],
1081 can_hover => 1,
1082 can_focus => 1,
1083 valign => 0,
1018 @_ 1084 @_
1019 ) 1085 )
1020} 1086}
1021 1087
1022sub _set_text { 1088sub _set_text {
1023 my ($self, $text) = @_; 1089 my ($self, $text) = @_;
1024 1090
1091 delete $self->{cur_h};
1092
1093 return if $self->{text} eq $text;
1094
1025 $self->{last_activity} = $::NOW; 1095 $self->{last_activity} = $::NOW;
1026
1027 $self->{text} = $text; 1096 $self->{text} = $text;
1028 $self->{layout}->set_width ($self->{w});
1029 1097
1030 $text =~ s/./*/g if $self->{hidden}; 1098 $text =~ s/./*/g if $self->{hidden};
1099 $self->{layout}->set_text ("$text ");
1031 1100
1032 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1101 $self->emit (changed => $self->{text});
1102}
1033 1103
1034 $text = substr $text, 0, $self->{cursor}; 1104sub get_text {
1035 utf8::encode $text; 1105 $_[0]{text}
1036
1037 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1038} 1106}
1039 1107
1040sub size_request { 1108sub size_request {
1041 my ($self) = @_; 1109 my ($self) = @_;
1042 1110
… …
1081 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1149 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1082 } elsif ($sym == SDLK_HOME) { 1150 } elsif ($sym == SDLK_HOME) {
1083 $self->{cursor} = 0; 1151 $self->{cursor} = 0;
1084 } elsif ($sym == SDLK_END) { 1152 } elsif ($sym == SDLK_END) {
1085 $self->{cursor} = length $text; 1153 $self->{cursor} = length $text;
1154 } elsif ($sym == SDLK_ESCAPE) {
1155 $self->emit ('escape');
1086 } elsif ($uni) { 1156 } elsif ($uni) {
1087 substr $text, $self->{cursor}++, 0, chr $uni; 1157 substr $text, $self->{cursor}++, 0, chr $uni;
1088 } 1158 }
1089 1159
1090 $self->_set_text ($text); 1160 $self->_set_text ($text);
… …
1144 1214
1145 $self->SUPER::_draw; 1215 $self->SUPER::_draw;
1146 1216
1147 #TODO: force update every cursor change :( 1217 #TODO: force update every cursor change :(
1148 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1218 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1219
1220 unless (exists $self->{cur_h}) {
1221 my $text = substr $self->{text}, 0, $self->{cursor};
1222 utf8::encode $text;
1223
1224 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1225 }
1226
1149 glColor @{$self->{fg}}; 1227 glColor @{$self->{fg}};
1150 glBegin GL_LINES; 1228 glBegin GL_LINES;
1151 glVertex $self->{cur_x}, $self->{cur_y}; 1229 glVertex $self->{cur_x}, $self->{cur_y};
1152 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1230 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1153 glEnd; 1231 glEnd;
1154 } 1232 }
1155} 1233}
1156 1234
1157#############################################################################
1158
1159package CFClient::UI::Slider; 1235package CFClient::UI::Entry;
1160 1236
1161use strict; 1237our @ISA = CFClient::UI::EntryBase::;
1162 1238
1239use SDL;
1163use SDL::OpenGL; 1240use SDL::OpenGL;
1164 1241
1242sub key_down {
1243 my ($self, $ev) = @_;
1244
1245 my $sym = $ev->key_sym;
1246
1247 if ($sym == SDLK_RETURN) {
1248 $self->emit (activate => $self->get_text);
1249 $self->update;
1250
1251 } else {
1252 $self->SUPER::key_down ($ev);
1253 }
1254
1255}
1256
1257#############################################################################
1258
1259package CFClient::UI::Button;
1260
1165our @ISA = CFClient::UI::DrawBG::; 1261our @ISA = CFClient::UI::Label::;
1262
1263use SDL;
1264use SDL::OpenGL;
1265
1266my @tex =
1267 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1268 qw(b1_button_active.png);
1166 1269
1167sub new { 1270sub new {
1168 my $class = shift; 1271 my $class = shift;
1169 1272
1273 $class->SUPER::new (
1274 padding => 4,
1275 fg => [1, 1, 1],
1276 bg => [1, 1, 1, 0.2],
1277 active_fg => [1, 1, 0],
1278 can_hover => 1,
1279 @_
1280 )
1281}
1282
1283sub button_up {
1284 my ($self, $ev, $x, $y) = @_;
1285
1286 if ($x >= 0 && $x < $self->{w}
1287 && $y >= 0 && $y < $self->{h}) {
1288 $self->emit ("activate");
1289 }
1290}
1291
1292sub _draw {
1293 my ($self) = @_;
1294
1295 local $self->{fg} = $self->{fg};
1296
1297 if ($GRAB == $self) {
1298 $self->{fg} = $self->{active_fg};
1299 }
1300
1301 glEnable GL_BLEND;
1302 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1303 glEnable GL_TEXTURE_2D;
1304 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1305 glColor 0, 0, 0, 1;
1306
1307 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1308
1309 glDisable GL_TEXTURE_2D;
1310 glDisable GL_BLEND;
1311
1312 $self->SUPER::_draw;
1313}
1314
1315#############################################################################
1316
1317package CFClient::UI::CheckBox;
1318
1319our @ISA = CFClient::UI::DrawBG::;
1320
1321my @tex =
1322 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1323 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1324
1325use SDL;
1326use SDL::OpenGL;
1327
1328sub new {
1329 my $class = shift;
1330
1331 $class->SUPER::new (
1332 padding => 2,
1333 fg => [1, 1, 1],
1334 active_fg => [1, 1, 0],
1335 state => 0,
1336 can_hover => 1,
1337 @_
1338 )
1339}
1340
1341sub size_request {
1342 my ($self) = @_;
1343
1344 ($self->{padding} * 2 + 6) x 2
1345}
1346
1347sub size_allocate {
1348 my ($self, $x, $y, $w, $h) = @_;
1349
1350 $self->_size_allocate ($x, $y, $w, $h);
1351}
1352
1353sub button_down {
1354 my ($self, $ev, $x, $y) = @_;
1355
1356 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1357 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1358 $self->{state} = !$self->{state};
1359 $self->emit (changed => $self->{state});
1360 }
1361}
1362
1363sub _draw {
1364 my ($self) = @_;
1365
1366 $self->SUPER::_draw;
1367
1368 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1369
1370 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1371
1372 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1373
1374 glEnable GL_BLEND;
1375 glEnable GL_TEXTURE_2D;
1376 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1377
1378 my $tex = $self->{state} ? $tex[1] : $tex[0];
1379
1380 $tex->draw_quad (0, 0, $s, $s);
1381
1382 glDisable GL_TEXTURE_2D;
1383 glDisable GL_BLEND;
1384}
1385
1386#############################################################################
1387
1388package CFClient::UI::Slider;
1389
1390use strict;
1391
1392use SDL::OpenGL;
1393
1394our @ISA = CFClient::UI::DrawBG::;
1395
1396my @tex =
1397 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1398 qw(s1_slider.png s1_slider_bg.png);
1399
1400sub new {
1401 my $class = shift;
1402
1170 # range [value, low, high, page] 1403 # range [value, low, high, page]
1171 1404
1405 # TODO: 0-width page
1406 # TODO: req_w/h are wrong with vertical
1407 # TODO: calculations are off
1172 my $self = $class->SUPER::new ( 1408 my $self = $class->SUPER::new (
1173 fg => [1, 1, 1], 1409 fg => [1, 1, 1],
1174 active_fg => [0, 0, 0], 1410 active_fg => [0, 0, 0],
1175 range => [0, 0, 100, 10], 1411 range => [0, 0, 100, 10],
1176 req_w => 40, 1412 req_w => 40,
1177 req_h => 10, 1413 req_h => 13,
1178 vertical => 0, 1414 vertical => 0,
1415 can_hover => 1,
1416 inner_pad => 5,
1179 @_ 1417 @_
1180 ); 1418 );
1181 1419
1182 $self 1420 $self
1183} 1421}
… …
1204 if ($GRAB == $self) { 1442 if ($GRAB == $self) {
1205 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1443 my ($value, $lo, $hi, $page) = @{$self->{range}};
1206 1444
1207 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1445 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1208 1446
1447 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1448 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1449
1450 $x -= $inner_pad_px; # substract the padding
1209 $x = $x * ($hi - $lo) / $w + $lo; 1451 $x = $x * ($hi - $lo) / $inner_w + $lo;
1210 $x = $lo if $x < $lo; 1452 $x = $lo if $x < $lo;
1211 $x = $hi - $page if $x > $hi - $page; 1453 $x = $hi - $page if $x > $hi - $page;
1212 $self->{range}[0] = $x; 1454 $self->{range}[0] = $x;
1213 1455
1214 $self->emit (changed => $x); 1456 $self->emit (changed => $x);
1215 $self->update; 1457 $self->update;
1216 } 1458 }
1459}
1460
1461# the inner_* stuff is for generating a padding for the slider handle,
1462# so that the handle doesn't leave the texture. This calculation isn't 100%
1463# correct propably, but it does the job for now
1464sub _calc_inner_pad_px {
1465 my ($self, $w) = @_;
1466 ($w / 100) * $self->{inner_pad} # % to pixels
1217} 1467}
1218 1468
1219sub _draw { 1469sub _draw {
1220 my ($self) = @_; 1470 my ($self) = @_;
1221 1471
… …
1235 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1485 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1236 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1486 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1237 1487
1238 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1488 my ($value, $lo, $hi, $page) = @{$self->{range}};
1239 1489
1490 $hi = $value + 1 if $lo == $hi;
1491
1492 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1493 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1494
1240 $page = int $page * $w / ($hi - $lo); 1495 $page = int $page * $inner_w / ($hi - $lo);
1241 $value = int +($value - $lo) * $w / ($hi - $lo); 1496 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1242 1497
1243 $w -= $page; 1498 $w -= $page;
1244 $page &= ~1; 1499 $page &= ~1;
1245 glTranslate $page * 0.5, 0, 0; 1500 glTranslate $page * 0.5, 0, 0;
1501 $page ||= 2;
1246 1502
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; 1503 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1255 my $knob_b = $value + $page * 0.5; 1504 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1256 1505
1257 glBegin GL_QUADS; 1506 glEnable GL_BLEND;
1258 glColor @$fg; 1507 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1259 glVertex $knob_a, 0; 1508 glEnable GL_TEXTURE_2D;
1260 glVertex $knob_a, $h; 1509 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1261 glVertex $knob_b, $h;
1262 glVertex $knob_b, 0;
1263 1510
1264 if ($knob_a < $knob_b - 2) { 1511 # draw background
1265 glColor @$bg; 1512 $tex[1]->draw_quad (0, 0, $w, $h);
1266 glVertex $knob_a + 1, 1; 1513
1267 glVertex $knob_a + 1, $h - 1; 1514 # draw handle
1268 glVertex $knob_b - 1, $h - 1; 1515 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1269 glVertex $knob_b - 1, 1; 1516
1517 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D;
1519}
1520
1521#############################################################################
1522
1523package CFClient::UI::TextView;
1524
1525our @ISA = CFClient::UI::HBox::;
1526
1527use SDL::OpenGL;
1528
1529sub new {
1530 my $class = shift;
1531
1532 my $self = $class->SUPER::new (
1533 req_w => $::WIDTH / 6,
1534 req_h => $::HEIGHT / 6,
1535 fontsize => $::FONTSIZE,
1536 @_,
1537
1538 layout => (new CFClient::Layout),
1539 par => [],
1540 height => 0,
1541 children => [
1542 (new CFClient::UI::Empty expand => 1),
1543 (new CFClient::UI::Slider vertical => 1),
1544 ],
1545 );
1546
1547 $self->{children}[1]->connect (changed => sub {
1548 $self->update;
1549 });
1550
1551 $self
1552}
1553
1554sub set_fontsize {
1555 my ($self, $fontsize) = @_;
1556
1557 $self->{fontsize} = $fontsize;
1558 $self->reflow;
1559}
1560
1561sub text_height {
1562 my ($self, $text) = @_;
1563
1564 my $layout = $self->{layout};
1565
1566 $layout->set_height ($self->{fontsize});
1567 $layout->set_width ($self->{w});
1568 $layout->set_text ($text);
1270 } 1569
1271 glEnd; 1570 ($layout->size)[1]
1571}
1572
1573sub reflow {
1574 my ($self) = @_;
1575
1576 $self->{need_reflow}++;
1577 $self->update;
1578}
1579
1580sub size_request {
1581 my ($self) = @_;
1582
1583 ($self->{req_w}, $self->{req_h})
1584}
1585
1586sub size_allocate {
1587 my ($self, $x, $y, $w, $h) = @_;
1588
1589 $self->SUPER::size_allocate ($x, $y, $w, $h);
1590
1591 $self->{layout}->set_height ($self->{fontsize});
1592 $self->{layout}->set_width ($self->{w});
1593
1594 $self->reflow;
1595}
1596
1597sub add_paragraph {
1598 my ($self, $color, $text) = @_;
1599
1600 #TODO: intelligently "reformat" paragraph
1601
1602 my $height = $self->text_height ($text);
1603
1604 $self->{height} += $height;
1605
1606 push @{$self->{par}}, [$height, $color, $text];
1607
1608 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1609 $self->{children}[1]->update;
1610}
1611
1612sub update {
1613 my ($self) = @_;
1614
1615 $self->SUPER::update;
1616
1617 return unless $self->{h} > 0;
1618
1619 delete $self->{texture};
1620
1621 $ROOT->on_refresh ($self, sub {
1622 if (delete $self->{need_reflow}) {
1623 my $height = 0;
1624
1625 $height += $_->[0] = $self->text_height ($_->[2])
1626 for @{$self->{par}};
1627
1628 $self->{height} = $height;
1629
1630 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1631
1632 delete $self->{texture};
1633 }
1634
1635 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1636 glClearColor 0, 0, 0, 1;
1637 glClear GL_COLOR_BUFFER_BIT;
1638
1639 glEnable GL_BLEND;
1640 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1641 glEnable GL_TEXTURE_2D;
1642 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1643
1644 my $top = int $self->{children}[1]{range}[0];
1645
1646 my $y0 = $top;
1647 my $y1 = $top + $self->{h};
1648
1649 my $y = 0;
1650
1651 my $layout = $self->{layout};
1652
1653 for my $par (@{$self->{par}}) {
1654 my $h = $par->[0];
1655
1656 if ($y0 < $y + $h && $y < $y1) {
1657 $layout->set_text ($par->[2]);
1658
1659 glColor @{ $par->[1] };
1660 my ($W, $H) = $layout->size;
1661 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1662 }
1663
1664 $y += $h;
1665 }
1666
1667 glDisable GL_TEXTURE_2D;
1668 glDisable GL_BLEND;
1669 };
1670 });
1671}
1672
1673sub _draw {
1674 my ($self) = @_;
1675
1676 if ($self->{texture}) {
1677 glEnable GL_TEXTURE_2D;
1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1679 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1680 glDisable GL_TEXTURE_2D;
1681 }
1682
1683 $self->{children}[1]->draw;
1684
1272} 1685}
1273 1686
1274############################################################################# 1687#############################################################################
1275 1688
1276package CFClient::UI::MapWidget; 1689package CFClient::UI::MapWidget;
… …
1286 1699
1287sub new { 1700sub new {
1288 my $class = shift; 1701 my $class = shift;
1289 1702
1290 $class->SUPER::new ( 1703 $class->SUPER::new (
1291 z => -1, 1704 z => -1,
1705 can_focus => 1,
1292 list => (glGenLists 1), 1706 list => (glGenLists 1),
1293 @_ 1707 @_
1294 ) 1708 )
1295} 1709}
1296 1710
1297sub key_down { 1711sub key_down {
1298 print "MAPKEYDOWN\n"; 1712 print "MAPKEYDOWN\n";
1299} 1713}
1300 1714
1301sub key_up { 1715sub key_up {
1716}
1717
1718sub button_down {
1719 my ($self, $ev, $x, $y) = @_;
1720
1721 $self->focus_in;
1722
1723 if ($ev->button == 2) {
1724 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1725 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1726
1727 $self->{motion} = sub {
1728 my ($ev, $x, $y) = @_;
1729
1730 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1731
1732 $::CFG->{map_shift_x} = $bw + $x - $ox;
1733 $::CFG->{map_shift_y} = $bh + $y - $oy;
1734
1735 $self->update;
1736 };
1737 }
1738}
1739
1740sub button_up {
1741 my ($self, $ev, $x, $y) = @_;
1742
1743 delete $self->{motion};
1744}
1745
1746sub mouse_motion {
1747 my ($self, $ev, $x, $y) = @_;
1748
1749 $self->{motion}->($ev, $x, $y) if $self->{motion};
1302} 1750}
1303 1751
1304sub size_request { 1752sub size_request {
1305 ( 1753 (
1306 1 + 32 * int $::WIDTH / 32, 1754 1 + 32 * int $::WIDTH / 32,
… …
1319 my ($self) = @_; 1767 my ($self) = @_;
1320 1768
1321 if (delete $self->{need_update}) { 1769 if (delete $self->{need_update}) {
1322 glNewList $self->{list}, GL_COMPILE; 1770 glNewList $self->{list}, GL_COMPILE;
1323 1771
1324 my $mx = $::CONN->{mapx}; 1772 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; 1773 my $sw = int $::WIDTH / 32;
1332 my $sh = 1 + int $::HEIGHT / 32; 1774 my $sh = int $::HEIGHT / 32;
1333 1775
1334 if ($::CONN->{mapw} > $sw) { 1776 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1335 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1777 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1336 } else { 1778
1337 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1779 glTranslate $sx0 - 32, $sy0 - 32, 0;
1780
1781 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1782
1783 if ($::CFG->{fow_enable}) {
1784 if ($::CFG->{fow_smooth}) { # smooth fog of war
1785 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1786 glConvolutionFilter2D
1787 GL_CONVOLUTION_2D,
1788 GL_ALPHA,
1789 3, 3,
1790 GL_ALPHA, GL_FLOAT,
1791 pack "f*",
1792 0.1, 0.1, 0.1,
1793 0.1, 0.2, 0.1,
1794 0.1, 0.1, 0.1,
1795 ;
1796 glEnable GL_CONVOLUTION_2D;
1797 }
1798
1799 $self->{fow_texture} = new CFClient::Texture
1800 w => $w,
1801 h => $h,
1802 data => $data,
1803 internalformat => GL_ALPHA,
1804 format => GL_ALPHA;
1805
1806 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1807
1808 glEnable GL_BLEND;
1809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1810 glEnable GL_TEXTURE_2D;
1811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1812
1813 glColor +($::CFG->{fow_intensity}) x 3, 1;
1814 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1815
1816 glDisable GL_TEXTURE_2D;
1817 glDisable GL_BLEND;
1818 }
1819
1820 # HACK BEGIN
1821 {
1822 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1823 my ($w, $h) = (250, 250);
1824
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829
1830 $self->{mapmap_texture} =
1831 new CFClient::Texture
1832 w => $w,
1833 h => $h,
1834 data => $::MAP->mapmap ($w, $h),
1835 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1836
1837 $self->{mapmap_texture}->draw_quad (100, 100);
1838
1839 glDisable GL_TEXTURE_2D;
1840 glDisable GL_BLEND;
1841 }
1842 # HACK END
1338 } 1843 }
1339 1844
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; 1845 glEndList;
1404 } 1846 }
1405 1847
1848 glPushMatrix;
1406 glCallList $self->{list}; 1849 glCallList $self->{list};
1850 glPopMatrix;
1851
1852 if ($FOCUS != $self) {
1853 glColor 64/255, 64/255, 64/255;
1854 glLogicOp GL_AND;
1855 glEnable GL_COLOR_LOGIC_OP;
1856 glBegin GL_QUADS;
1857 glVertex 0, 0;
1858 glVertex 0, $::HEIGHT;
1859 glVertex $::WIDTH, $::HEIGHT;
1860 glVertex $::WIDTH, 0;
1861 glEnd;
1862 glDisable GL_COLOR_LOGIC_OP;
1863 }
1407} 1864}
1408 1865
1409my %DIR = ( 1866my %DIR = (
1410 SDLK_KP8, [1, "north"], 1867 SDLK_KP8, [1, "north"],
1411 SDLK_KP9, [2, "northeast"], 1868 SDLK_KP9, [2, "northeast"],
… …
1427 1884
1428 my $mod = $ev->key_mod; 1885 my $mod = $ev->key_mod;
1429 my $sym = $ev->key_sym; 1886 my $sym = $ev->key_sym;
1430 1887
1431 if ($sym == SDLK_KP5) { 1888 if ($sym == SDLK_KP5) {
1432 $::CONN->send ("command stay fire"); 1889 $::CONN->user_send ("command stay fire");
1890 } elsif ($sym == SDLK_a) {
1891 $::CONN->user_send ("command apply");
1892 } elsif ($sym == SDLK_QUOTE) {
1893 $self->emit ('activate_console');
1894 } elsif ($sym == SDLK_SLASH) {
1895 $self->emit ('activate_console' => '/');
1433 } elsif (exists $DIR{$sym}) { 1896 } elsif (exists $DIR{$sym}) {
1434 if ($mod & KMOD_SHIFT) { 1897 if ($mod & KMOD_SHIFT) {
1435 $self->{shft}++; 1898 $self->{shft}++;
1436 $::CONN->send ("command fire $DIR{$sym}[0]"); 1899 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1437 } elsif ($mod & KMOD_CTRL) { 1900 } elsif ($mod & KMOD_CTRL) {
1438 $self->{ctrl}++; 1901 $self->{ctrl}++;
1439 $::CONN->send ("command run $DIR{$sym}[0]"); 1902 $::CONN->user_send ("command run $DIR{$sym}[0]");
1440 } else { 1903 } else {
1441 $::CONN->send ("command $DIR{$sym}[1]"); 1904 $::CONN->user_send ("command $DIR{$sym}[1]");
1442 } 1905 }
1443 } 1906 }
1444} 1907}
1445 1908
1446sub key_up { 1909sub key_up {
… …
1448 1911
1449 my $mod = $ev->key_mod; 1912 my $mod = $ev->key_mod;
1450 my $sym = $ev->key_sym; 1913 my $sym = $ev->key_sym;
1451 1914
1452 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1915 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1453 $::CONN->send ("command fire_stop"); 1916 $::CONN->user_send ("command fire_stop");
1454 } 1917 }
1455 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1918 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1456 $::CONN->send ("command run_stop"); 1919 $::CONN->user_send ("command run_stop");
1457 } 1920 }
1458} 1921}
1459 1922
1460############################################################################# 1923#############################################################################
1461 1924
… …
1499 glPopMatrix; 1962 glPopMatrix;
1500} 1963}
1501 1964
1502############################################################################# 1965#############################################################################
1503 1966
1504package CFClient::UI::Toplevel; 1967package CFClient::UI::Flopper;
1968
1969our @ISA = CFClient::UI::Button::;
1970
1971sub new {
1972 my $class = shift;
1973
1974 my $self = $class->SUPER::new (
1975 state => 0,
1976 connect_activate => \&toggle_flopper,
1977 @_
1978 );
1979
1980 if ($self->{state}) {
1981 $self->{state} = 0;
1982 $self->toggle_flopper;
1983 }
1984
1985 $self
1986}
1987
1988sub toggle_flopper {
1989 my ($self) = @_;
1990
1991 # TODO: use animation
1992 if ($self->{state} = !$self->{state}) {
1993 $CFClient::UI::ROOT->add ($self->{other});
1994 $self->{other}->move ($self->coord2global (0, $self->{h}));
1995 $self->emit ("open");
1996 } else {
1997 $CFClient::UI::ROOT->remove ($self->{other});
1998 $self->emit ("close");
1999 }
2000
2001 $self->emit (changed => $self->{state});
2002}
2003
2004#############################################################################
2005
2006package CFClient::UI::Root;
1505 2007
1506our @ISA = CFClient::UI::Container::; 2008our @ISA = CFClient::UI::Container::;
2009
2010use SDL::OpenGL;
1507 2011
1508sub size_request { 2012sub size_request {
1509 ($::WIDTH, $::HEIGHT) 2013 ($::WIDTH, $::HEIGHT)
1510} 2014}
1511 2015
… …
1516 2020
1517 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2021 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1518 for @{$self->{children}}; 2022 for @{$self->{children}};
1519} 2023}
1520 2024
1521sub translate { 2025sub _topleft {
1522 my ($self, $x, $y) = @_; 2026 my ($self, $x, $y) = @_;
1523 2027
1524 ($x, $y) 2028 ($x, $y)
1525} 2029}
1526 2030
… …
1534sub add { 2038sub add {
1535 my ($self, $widget) = @_; 2039 my ($self, $widget) = @_;
1536 2040
1537 $self->SUPER::add ($widget); 2041 $self->SUPER::add ($widget);
1538 2042
1539 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2043 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2044}
2045
2046sub on_refresh {
2047 my ($self, $id, $cb) = @_;
2048
2049 $self->{refresh_hook}{$id} = $cb;
1540} 2050}
1541 2051
1542sub draw { 2052sub draw {
1543 my ($self) = @_; 2053 my ($self) = @_;
1544 2054
2055 while (my $rcb = delete $self->{refresh_hook}) {
2056 $_->() for values %$rcb;
2057 }
2058
2059 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2060 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2061 glClear GL_COLOR_BUFFER_BIT;
2062
2063 glMatrixMode GL_PROJECTION;
2064 glLoadIdentity;
2065 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2066 glMatrixMode GL_MODELVIEW;
2067 glLoadIdentity;
2068
1545 $self->_draw; 2069 $self->_draw;
1546} 2070}
1547 2071
1548############################################################################# 2072#############################################################################
1549 2073
1550package CFClient::UI; 2074package CFClient::UI;
1551 2075
1552$TOPLEVEL = new CFClient::UI::Toplevel; 2076$ROOT = new CFClient::UI::Root;
1553 2077
15541 20781
1555 2079

Diff Legend

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