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.118 by root, Sat Apr 15 23:25: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;
143 $focus->update if $focus; 181 $focus->update if $focus;
144 $FOCUS->update; 182 $FOCUS->update;
145} 183}
… …
178 glPushMatrix; 216 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 217 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 218 $self->_draw;
181 glPopMatrix; 219 glPopMatrix;
182 220
183 if ($self == $HOVER) { 221 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 222 my ($x, $y) = @$self{qw(x y)};
185 223
186 glColor 0, 0, 1, 0.2; 224 glColor 0, 0, 1, 0.2;
187 glEnable GL_BLEND; 225 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
200 my ($self) = @_; 238 my ($self) = @_;
201 239
202 warn "no draw defined for $self\n"; 240 warn "no draw defined for $self\n";
203} 241}
204 242
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 { 243sub find_widget {
217 my ($self, $x, $y) = @_; 244 my ($self, $x, $y) = @_;
218 245
219 return $self 246 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 247 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 248 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 249
223 () 250 ()
224} 251}
225 252
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 253sub set_parent {
229 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
230 255
231 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
233}
234
235sub get_parent {
236 $_[0]->{parent}
237} 257}
238 258
239sub update { 259sub update {
240 my ($self) = @_; 260 my ($self) = @_;
241 261
… …
276 296
277 # range [value, low, high, page] 297 # range [value, low, high, page]
278 298
279 $class->SUPER::new ( 299 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2], 300 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 301 active_bg => [1, 1, 1, 0.5],
282 @_ 302 @_
283 ) 303 )
284} 304}
285 305
286sub _draw { 306sub _draw {
… …
330 350
331 $self 351 $self
332} 352}
333 353
334sub add { 354sub add {
335 my ($self, $chld) = @_; 355 my ($self, $child) = @_;
336 356
337 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
338 360
339 $self->{children} = [ 361 $self->{children} = [
340 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
341 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
342 ]; 364 ];
343 365
344 $self->{w} = $self->{h} = -1; 366 $self->{w} = $self->{h} = -1;
345 $self->update; 367 $self->update;
346} 368}
… …
443} 465}
444 466
445sub render_chld { 467sub render_chld {
446 my ($self) = @_; 468 my ($self) = @_;
447 469
448 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
449 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
450 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
451 ); 473 $self->child->draw;
474 };
452} 475}
453 476
454sub size_allocate { 477sub size_allocate {
455 my ($self, $x, $y, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
456 479
… …
534 557
535my @tex = 558my @tex =
536 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 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); 560 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
538 561
562sub new {
563 my $class = shift;
564
565 # TODO: user_x, user_y, overwrite moveto?
566
567 $class->SUPER::new (
568 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1],
570 border => int $::FONTSIZE * 0.8,
571 @_
572 )
573}
574
539sub size_request { 575sub size_request {
540 my ($self) = @_; 576 my ($self) = @_;
541 577
542 my ($w, $h) = 578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
543 $self->{user_w} && $self->{user_h} 579
544 ? ($self->{user_w}, $self->{user_h})
545 : ($self->SUPER::size_request); 580 my ($w, $h) = $self->SUPER::size_request;
546 581
547 $h += $tex[1]->{h}; 582 (
548 $h += $tex[4]->{h}; 583 $w + $self->{border} * 2,
549 $w += $tex[2]->{w}; 584 $h + $self->{border} * 2,
550 $w += $tex[3]->{w}; 585 )
551
552 ($w, $h)
553} 586}
554 587
555sub size_allocate { 588sub size_allocate {
556 my ($self, $x, $y, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
557 590
558 $self->_size_allocate ($x, $y, $w, $h) or return; 591 $self->_size_allocate ($x, $y, $w, $h) or return;
559 592
560 $h -= $tex[1]{h}; 593 $h -= List::Util::max 0, $self->{border} * 2;
561 $h -= $tex[4]{h}; 594 $w -= List::Util::max 0, $self->{border} * 2;
562 $w -= $tex[2]{w};
563 $w -= $tex[3]{w};
564 595
565 $h = $h < 0 ? 0 : $h; 596 $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} 597}
572 598
573sub button_down { 599sub button_down {
574 my ($self, $ev, $x, $y) = @_; 600 my ($self, $ev, $x, $y) = @_;
575 601
576 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
577 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
578 604
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 605 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580 my ($bw, $bh) = ($self->{w}, $self->{h}); 606 my ($bw, $bh) = ($self->{w}, $self->{h});
581 607
582 $self->{motion} = sub { 608 $self->{motion} = sub {
… …
588 $self->{user_h} = $bh + $y - $oy; 614 $self->{user_h} = $bh + $y - $oy;
589 $self->update; 615 $self->update;
590 }; 616 };
591 617
592 } elsif ($x >= 0 && $x < $self->{w} 618 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $tex[1]{h}) { 619 && $y >= 0 && $y < $self->{border}) {
594 620
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 621 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596 my ($bx, $by) = ($self->{x}, $self->{y}); 622 my ($bx, $by) = ($self->{x}, $self->{y});
597 623
598 $self->{motion} = sub { 624 $self->{motion} = sub {
… …
619} 645}
620 646
621sub _draw { 647sub _draw {
622 my ($self) = @_; 648 my ($self) = @_;
623 649
624 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
626 652
627 glEnable GL_BLEND; 653 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 657
632 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
633 $top->draw_quad (0, 0, $w, $top->{h}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
634 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
635 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
636 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 662 $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 663
644 my $bg = $tex[0]; 664 my $bg = $tex[0];
645 665
646 glBindTexture GL_TEXTURE_2D, $bg->{name}; 666 # 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}; 667 my $rep_x = $cw / $bg->{w};
652 my $rep_y = $ch / $bg->{h}; 668 my $rep_y = $ch / $bg->{h};
653 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
654 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
655 676
656 glDisable GL_TEXTURE_2D; 677 glDisable GL_TEXTURE_2D;
657 glDisable GL_BLEND; 678 glDisable GL_BLEND;
658 679
659 $self->child->draw; 680 $self->child->draw;
660
661} 681}
662 682
663############################################################################# 683#############################################################################
664 684
665package CFClient::UI::Table; 685package CFClient::UI::Table;
… …
668 688
669use List::Util qw(max sum); 689use List::Util qw(max sum);
670 690
671use SDL::OpenGL; 691use SDL::OpenGL;
672 692
693sub new {
694 my $class = shift;
695
696 $class->SUPER::new (
697 col_expand => [],
698 @_
699 )
700}
701
673sub add { 702sub add {
674 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
675 704
705 $child->set_parent ($self);
676 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
677 $chld->set_parent ($self);
678 707
679 $self->{w} = $self->{h} = -1; 708 $self->{w} = $self->{h} = -1;
709 $self->update;
710}
711
712# TODO: move to container class maybe? send childs a signal on removal?
713sub clear {
714 my ($self) = @_;
715
716 delete $self->{children};
680 $self->update; 717 $self->update;
681} 718}
682 719
683sub get_wh { 720sub get_wh {
684 my ($self) = @_; 721 my ($self) = @_;
… …
706 my ($self) = @_; 743 my ($self) = @_;
707 744
708 my ($ws, $hs) = $self->get_wh; 745 my ($ws, $hs) = $self->get_wh;
709 746
710 ( 747 (
711 (List::Util::sum @$ws), 748 (sum @$ws),
712 (List::Util::sum @$hs), 749 (sum @$hs),
713 ) 750 )
714} 751}
715 752
716sub size_allocate { 753sub size_allocate {
717 my ($self, $x, $y, $w, $h) = @_; 754 my ($self, $x, $y, $w, $h) = @_;
718 755
719 $self->_size_allocate ($x, $y, $w, $h) or return; 756 $self->_size_allocate ($x, $y, $w, $h) or return;
720 757
721 my ($ws, $hs) = $self->get_wh; 758 my ($ws, $hs) = $self->get_wh;
722 759
723 my $req_w = List::Util::sum @$ws; 760 my $req_w = sum @$ws;
724 my $req_h = List::Util::sum @$hs; 761 my $req_h = sum @$hs;
762
763 # TODO: nicer code && do row_expand
764 my @col_expand = @{$self->{col_expand}};
765 @col_expand = (1) x @$ws unless @col_expand;
766 my $col_expand = (sum @col_expand) || 1;
725 767
726 # linearly scale sizes 768 # linearly scale sizes
727 $_ *= $w / $req_w for @$ws; 769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $_ *= $h / $req_h for @$hs; 770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
771
772 CFClient::UI::harmonize $ws;
773 CFClient::UI::harmonize $hs;
729 774
730 my $y; 775 my $y;
731 776
732 for my $r (0 .. $#{$self->{children}}) { 777 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 778 my $row = $self->{children}[$r]
… …
735 780
736 my $x = 0; 781 my $x = 0;
737 my $row_h = $hs->[$r]; 782 my $row_h = $hs->[$r];
738 783
739 for my $c (0 .. $#$row) { 784 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 785 my $col_w = $ws->[$c];
744 786
787 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 788 $widget->size_allocate ($x, $y, $col_w, $row_h);
789 }
746 790
747 $x += $col_w; 791 $x += $col_w;
748 } 792 }
749 793
750 $y += $row_h; 794 $y += $row_h;
… …
796} 840}
797 841
798sub size_allocate { 842sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 843 my ($self, $x, $y, $w, $h) = @_;
800 844
801 $self->_size_allocate ($x, $y, $w, $h) or return; 845 $self->_size_allocate ($x, $y, $w, $h);
802
803 return unless $self->{w};
804 846
805 ($h, $w) = ($w, $h); 847 ($h, $w) = ($w, $h);
806 848
807 my $children = $self->{children}; 849 my $children = $self->{children};
808 850
… …
810 852
811 my $req_h = List::Util::sum @h; 853 my $req_h = List::Util::sum @h;
812 854
813 if ($req_h > $h) { 855 if ($req_h > $h) {
814 # ah well, not enough space 856 # ah well, not enough space
815 $_ = $h[$_] * $h / $req_h for @h; 857 $_ *= $h / $req_h for @h;
816 } else { 858 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children; 859 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1; 860 $exp ||= 1;
819 861
820 for (0 .. $#$children) { 862 for (0 .. $#$children) {
… …
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 866 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 867 $h[$_] = $alloc_h;
826 } 868 }
827 } 869 }
828 870
871 CFClient::UI::harmonize \@h;
872
829 my $y = 0; 873 my $y = 0;
830 for (0 .. $#$children) { 874 for (0 .. $#$children) {
831 my $child = $children->[$_]; 875 my $child = $children->[$_];
832 my $h = $h[$_]; 876 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 877 $child->size_allocate ($y, 0, $h, $w);
… …
856} 900}
857 901
858sub size_allocate { 902sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 903 my ($self, $x, $y, $w, $h) = @_;
860 904
861 $self->_size_allocate ($x, $y, $w, $h) or return; 905 $self->_size_allocate ($x, $y, $w, $h);
862
863 return unless $self->{h};
864 906
865 my $children = $self->{children}; 907 my $children = $self->{children};
866 908
867 my @h = map +($_->size_request)[1], @$children; 909 my @h = map +($_->size_request)[1], @$children;
868 910
869 my $req_h = List::Util::sum @h; 911 my $req_h = List::Util::sum @h;
870 912
871 if ($req_h > $h) { 913 if ($req_h > $h) {
872 # ah well, not enough space 914 # ah well, not enough space
873 $_ = $h[$_] * $h / $req_h for @h; 915 $_ *= $h / $req_h for @h;
874 } else { 916 } else {
875 my $exp = List::Util::sum map $_->{expand}, @$children; 917 my $exp = List::Util::sum map $_->{expand}, @$children;
876 $exp ||= 1; 918 $exp ||= 1;
877 919
878 for (0 .. $#$children) { 920 for (0 .. $#$children) {
… …
880 922
881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
882 } 924 }
883 } 925 }
884 926
927 CFClient::UI::harmonize \@h;
928
885 my $y = 0; 929 my $y = 0;
886 for (0 .. $#$children) { 930 for (0 .. $#$children) {
887 my $child = $children->[$_]; 931 my $child = $children->[$_];
888 my $h = $h[$_]; 932 my $h = $h[$_];
889 $child->size_allocate (0, $y, $w, $h); 933 $child->size_allocate (0, $y, $w, $h);
… …
902 946
903sub new { 947sub new {
904 my ($class, %arg) = @_; 948 my ($class, %arg) = @_;
905 949
906 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
907 fg => [1, 1, 1], 951 fg => [1, 1, 1],
908 height => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
909 text => "", 953 text => "",
910 align => -1, 954 align => -1,
955 valign => -1,
911 padding => 2, 956 padding => 2,
912 layout => new CFClient::Layout, 957 layout => new CFClient::Layout,
913 %arg 958 %arg
914 ); 959 );
915 960
916 $self->set_text ($self->{text}); 961 $self->set_text ($self->{text});
917 962
… …
933 978
934 $self->{text} = $text; 979 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 980 $self->{layout}->set_markup ($text);
936 981
937 delete $self->{texture}; 982 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
938 $self->update; 984 $self->update;
939} 985}
940 986
941sub get_text { 987sub get_text {
942 my ($self, $text) = @_; 988 my ($self, $text) = @_;
… …
946 992
947sub size_request { 993sub size_request {
948 my ($self) = @_; 994 my ($self) = @_;
949 995
950 $self->{layout}->set_width; 996 $self->{layout}->set_width;
951 $self->{layout}->set_height ($self->{height}); 997 $self->{layout}->set_height ($self->{fontsize});
952 my ($w, $h) = $self->{layout}->size; 998 my ($w, $h) = $self->{layout}->size;
953 999
954 ( 1000 (
955 $w + $self->{padding} * 2, 1001 $w + $self->{padding} * 2,
956 $h + $self->{padding} * 2, 1002 $h + $self->{padding} * 2,
… …
975sub _draw { 1021sub _draw {
976 my ($self) = @_; 1022 my ($self) = @_;
977 1023
978 my $tex = $self->{texture} ||= do { 1024 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 1025 $self->{layout}->set_width ($self->{w});
1026 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
980 new_from_layout CFClient::Texture $self->{layout} 1027 new_from_layout CFClient::Texture $self->{layout}
981 }; 1028 };
982 1029
983 glEnable GL_BLEND; 1030 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D; 1032 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987 1034
988 glColor @{$self->{fg}}; 1035 glColor @{$self->{fg}};
989 1036
990 my $x = 1037 my $x =
991 $self->{align} < 0 ? $self->{padding} 1038 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 1040 : ($self->{w} - $tex->{w}) * 0.5;
994 1041
995 $tex->draw_quad ($x, $self->{padding}); 1042 my $y =
1043 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5;
1046
1047 $tex->draw_quad (int $x, int $y);
996 1048
997 glDisable GL_TEXTURE_2D; 1049 glDisable GL_TEXTURE_2D;
998 glDisable GL_BLEND; 1050 glDisable GL_BLEND;
999} 1051}
1000 1052
… …
1011 my $class = shift; 1063 my $class = shift;
1012 1064
1013 $class->SUPER::new ( 1065 $class->SUPER::new (
1014 fg => [1, 1, 1], 1066 fg => [1, 1, 1],
1015 bg => [0, 0, 0, 0.2], 1067 bg => [0, 0, 0, 0.2],
1016 active_bg => [1, 1, 1], 1068 active_bg => [1, 1, 1, 0.5],
1017 active_fg => [0, 0, 0], 1069 active_fg => [0, 0, 0],
1070 can_hover => 1,
1071 can_focus => 1,
1072 valign => 0,
1018 @_ 1073 @_
1019 ) 1074 )
1020} 1075}
1021 1076
1022sub _set_text { 1077sub _set_text {
1023 my ($self, $text) = @_; 1078 my ($self, $text) = @_;
1024 1079
1080 my $old_text = $self->{text};
1081
1025 $self->{last_activity} = $::NOW; 1082 $self->{last_activity} = $::NOW;
1026 1083
1027 $self->{text} = $text; 1084 $self->{text} = $text;
1028 $self->{layout}->set_width ($self->{w}); 1085 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1029 1087
1030 $text =~ s/./*/g if $self->{hidden}; 1088 $text =~ s/./*/g if $self->{hidden};
1031 1089
1032 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1090 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1033 1091
1034 $text = substr $text, 0, $self->{cursor}; 1092 $text = substr $text, 0, $self->{cursor};
1035 utf8::encode $text; 1093 utf8::encode $text;
1036 1094
1037 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1095 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1096
1097 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1098 if $old_text ne $self->{text};
1038} 1099}
1039 1100
1040sub size_request { 1101sub size_request {
1041 my ($self) = @_; 1102 my ($self) = @_;
1042 1103
… …
1081 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1142 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1082 } elsif ($sym == SDLK_HOME) { 1143 } elsif ($sym == SDLK_HOME) {
1083 $self->{cursor} = 0; 1144 $self->{cursor} = 0;
1084 } elsif ($sym == SDLK_END) { 1145 } elsif ($sym == SDLK_END) {
1085 $self->{cursor} = length $text; 1146 $self->{cursor} = length $text;
1147 } elsif ($sym == SDLK_ESCAPE) {
1148 $self->emit ('escape');
1086 } elsif ($uni) { 1149 } elsif ($uni) {
1087 substr $text, $self->{cursor}++, 0, chr $uni; 1150 substr $text, $self->{cursor}++, 0, chr $uni;
1088 } 1151 }
1089 1152
1090 $self->_set_text ($text); 1153 $self->_set_text ($text);
… …
1152 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1215 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1153 glEnd; 1216 glEnd;
1154 } 1217 }
1155} 1218}
1156 1219
1157#############################################################################
1158
1159package CFClient::UI::Slider; 1220package CFClient::UI::LineEntry;
1160 1221
1161use strict; 1222our @ISA = CFClient::UI::Entry::;
1162 1223
1224use SDL;
1163use SDL::OpenGL; 1225use SDL::OpenGL;
1164 1226
1227sub key_down {
1228 my ($self, $ev) = @_;
1229
1230 my $sym = $ev->key_sym;
1231
1232 if ($sym == SDLK_RETURN) {
1233 $self->emit (activate => $self->get_text);
1234 $self->update;
1235
1236 } else {
1237 $self->SUPER::key_down ($ev);
1238 }
1239
1240}
1241
1242#############################################################################
1243
1244package CFClient::UI::Button;
1245
1165our @ISA = CFClient::UI::DrawBG::; 1246our @ISA = CFClient::UI::Label::;
1247
1248use SDL;
1249use SDL::OpenGL;
1250
1251my @tex =
1252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1253 qw(b1_button_active.png);
1166 1254
1167sub new { 1255sub new {
1168 my $class = shift; 1256 my $class = shift;
1169 1257
1258 $class->SUPER::new (
1259 padding => 4,
1260 fg => [1, 1, 1],
1261 bg => [1, 1, 1, 0.2],
1262 active_fg => [1, 1, 0],
1263 can_hover => 1,
1264 @_
1265 )
1266}
1267
1268sub button_up {
1269 my ($self, $ev, $x, $y) = @_;
1270
1271 if ($x >= 0 && $x < $self->{w}
1272 && $y >= 0 && $y < $self->{h}) {
1273 $self->emit ("activate");
1274 }
1275}
1276
1277sub _draw {
1278 my ($self) = @_;
1279
1280 local $self->{fg} = $self->{fg};
1281 my $tex = $tex[0];
1282
1283 glEnable GL_BLEND;
1284 glEnable GL_TEXTURE_2D;
1285 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1286
1287 if ($GRAB == $self) {
1288 $self->{fg} = $self->{active_fg};
1289 }
1290
1291 glBindTexture GL_TEXTURE_2D, $tex->{name};
1292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1293
1294 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1295
1296 glDisable GL_TEXTURE_2D;
1297 glDisable GL_BLEND;
1298
1299 $self->SUPER::_draw;
1300}
1301
1302#############################################################################
1303
1304package CFClient::UI::CheckBox;
1305
1306our @ISA = CFClient::UI::DrawBG::;
1307
1308my @tex =
1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1310 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1311
1312use SDL;
1313use SDL::OpenGL;
1314
1315sub new {
1316 my $class = shift;
1317
1318 $class->SUPER::new (
1319 padding => 2,
1320 fg => [1, 1, 1],
1321 active_fg => [1, 1, 0],
1322 state => 0,
1323 can_hover => 1,
1324 @_
1325 )
1326}
1327
1328sub size_request {
1329 my ($self) = @_;
1330
1331 ($self->{padding} * 2 + 6) x 2
1332}
1333
1334sub size_allocate {
1335 my ($self, $x, $y, $w, $h) = @_;
1336
1337 $self->_size_allocate ($x, $y, $w, $h);
1338}
1339
1340sub button_down {
1341 my ($self, $ev, $x, $y) = @_;
1342
1343 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1344 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1345 $self->{state} = !$self->{state};
1346 $self->emit (changed => $self->{state});
1347 }
1348}
1349
1350sub _draw {
1351 my ($self) = @_;
1352
1353 $self->SUPER::_draw;
1354
1355 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1356
1357 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1358
1359 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1360
1361 glEnable GL_BLEND;
1362 glEnable GL_TEXTURE_2D;
1363 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1364
1365 my $tex = $self->{state} ? $tex[1] : $tex[0];
1366
1367 $tex->draw_quad (0, 0, $s, $s);
1368
1369 glDisable GL_TEXTURE_2D;
1370 glDisable GL_BLEND;
1371}
1372
1373#############################################################################
1374
1375package CFClient::UI::Slider;
1376
1377use strict;
1378
1379use SDL::OpenGL;
1380
1381our @ISA = CFClient::UI::DrawBG::;
1382
1383my @tex =
1384 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1385 qw(s1_slider.png s1_slider_bg.png);
1386
1387sub new {
1388 my $class = shift;
1389
1170 # range [value, low, high, page] 1390 # range [value, low, high, page]
1171 1391
1392 # TODO: 0-width page
1393 # TODO: req_w/h are wrong with vertical
1394 # TODO: calculations are off
1172 my $self = $class->SUPER::new ( 1395 my $self = $class->SUPER::new (
1173 fg => [1, 1, 1], 1396 fg => [1, 1, 1],
1174 active_fg => [0, 0, 0], 1397 active_fg => [0, 0, 0],
1175 range => [0, 0, 100, 10], 1398 range => [0, 0, 100, 10],
1176 req_w => 40, 1399 req_w => 40,
1177 req_h => 10, 1400 req_h => 13,
1178 vertical => 0, 1401 vertical => 0,
1402 can_hover => 1,
1403 inner_pad => 5,
1179 @_ 1404 @_
1180 ); 1405 );
1181 1406
1182 $self 1407 $self
1183} 1408}
… …
1204 if ($GRAB == $self) { 1429 if ($GRAB == $self) {
1205 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1430 my ($value, $lo, $hi, $page) = @{$self->{range}};
1206 1431
1207 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1208 1433
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1436
1437 $x -= $inner_pad_px; # substract the padding
1209 $x = $x * ($hi - $lo) / $w + $lo; 1438 $x = $x * ($hi - $lo) / $inner_w + $lo;
1210 $x = $lo if $x < $lo; 1439 $x = $lo if $x < $lo;
1211 $x = $hi - $page if $x > $hi - $page; 1440 $x = $hi - $page if $x > $hi - $page;
1212 $self->{range}[0] = $x; 1441 $self->{range}[0] = $x;
1213 1442
1214 $self->emit (changed => $x); 1443 $self->emit (changed => $x);
1215 $self->update; 1444 $self->update;
1216 } 1445 }
1446}
1447
1448# the inner_* stuff is for generating a padding for the slider handle,
1449# so that the handle doesn't leave the texture. This calculation isn't 100%
1450# correct propably, but it does the job for now
1451sub _calc_inner_pad_px {
1452 my ($self, $w) = @_;
1453 ($w / 100) * $self->{inner_pad} # % to pixels
1217} 1454}
1218 1455
1219sub _draw { 1456sub _draw {
1220 my ($self) = @_; 1457 my ($self) = @_;
1221 1458
… …
1235 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1472 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1236 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1473 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1237 1474
1238 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1475 my ($value, $lo, $hi, $page) = @{$self->{range}};
1239 1476
1477 $hi = $value + 1 if $lo == $hi;
1478
1479 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1480 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1481
1240 $page = int $page * $w / ($hi - $lo); 1482 $page = int $page * $inner_w / ($hi - $lo);
1241 $value = int +($value - $lo) * $w / ($hi - $lo); 1483 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1242 1484
1243 $w -= $page; 1485 $w -= $page;
1244 $page &= ~1; 1486 $page &= ~1;
1245 glTranslate $page * 0.5, 0, 0; 1487 glTranslate $page * 0.5, 0, 0;
1488 $page ||= 2;
1246 1489
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; 1490 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1255 my $knob_b = $value + $page * 0.5; 1491 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1256 1492
1257 glBegin GL_QUADS; 1493 glEnable GL_BLEND;
1258 glColor @$fg; 1494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1259 glVertex $knob_a, 0; 1495 glEnable GL_TEXTURE_2D;
1260 glVertex $knob_a, $h; 1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1261 glVertex $knob_b, $h;
1262 glVertex $knob_b, 0;
1263 1497
1264 if ($knob_a < $knob_b - 2) { 1498 # draw background
1265 glColor @$bg; 1499 $tex[1]->draw_quad (0, 0, $w, $h);
1266 glVertex $knob_a + 1, 1; 1500
1267 glVertex $knob_a + 1, $h - 1; 1501 # draw handle
1268 glVertex $knob_b - 1, $h - 1; 1502 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1269 glVertex $knob_b - 1, 1; 1503
1504 glDisable GL_BLEND;
1505 glDisable GL_TEXTURE_2D;
1506}
1507
1508#############################################################################
1509
1510package CFClient::UI::TextView;
1511
1512our @ISA = CFClient::UI::HBox::;
1513
1514use SDL::OpenGL;
1515
1516sub new {
1517 my $class = shift;
1518
1519 my $self = $class->SUPER::new (
1520 req_w => $::WIDTH / 6,
1521 req_h => $::HEIGHT / 6,
1522 fontsize => $::FONTSIZE,
1523 @_,
1524
1525 layout => (new CFClient::Layout),
1526 par => [],
1527 height => 0,
1528 children => [
1529 (new CFClient::UI::Empty expand => 1),
1530 (new CFClient::UI::Slider vertical => 1),
1531 ],
1532 );
1533
1534 $self->{children}[1]->connect (changed => sub {
1535 $self->update;
1536 });
1537
1538 $self
1539}
1540
1541sub set_fontsize {
1542 my ($self, $fontsize) = @_;
1543
1544 $self->{fontsize} = $fontsize;
1545 $self->reflow;
1546}
1547
1548sub text_height {
1549 my ($self, $text) = @_;
1550
1551 my $layout = $self->{layout};
1552
1553 $layout->set_height ($self->{fontsize});
1554 $layout->set_width ($self->{w});
1555 $layout->set_text ($text);
1270 } 1556
1271 glEnd; 1557 ($layout->size)[1]
1558}
1559
1560sub reflow {
1561 my ($self) = @_;
1562
1563 $self->{need_reflow}++;
1564 $self->update;
1565}
1566
1567sub size_request {
1568 my ($self) = @_;
1569
1570 ($self->{req_w}, $self->{req_h})
1571}
1572
1573sub size_allocate {
1574 my ($self, $x, $y, $w, $h) = @_;
1575
1576 $self->SUPER::size_allocate ($x, $y, $w, $h);
1577
1578 $self->{layout}->set_height ($self->{fontsize});
1579 $self->{layout}->set_width ($self->{w});
1580
1581 $self->reflow;
1582}
1583
1584sub add_paragraph {
1585 my ($self, $color, $text) = @_;
1586
1587 #TODO: intelligently "reformat" paragraph
1588
1589 my $height = $self->text_height ($text);
1590
1591 $self->{height} += $height;
1592
1593 push @{$self->{par}}, [$height, $color, $text];
1594
1595 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1596 $self->{children}[1]->update;
1597}
1598
1599sub update {
1600 my ($self) = @_;
1601
1602 $self->SUPER::update;
1603
1604 return unless $self->{h} > 0;
1605
1606 delete $self->{texture};
1607
1608 $ROOT->on_refresh ($self, sub {
1609 if (delete $self->{need_reflow}) {
1610 my $height = 0;
1611
1612 $height += $_->[0] = $self->text_height ($_->[2])
1613 for @{$self->{par}};
1614
1615 $self->{height} = $height;
1616
1617 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1618
1619 delete $self->{texture};
1620 }
1621
1622 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1623 glClearColor 0, 0, 0, 1;
1624 glClear GL_COLOR_BUFFER_BIT;
1625
1626 glEnable GL_BLEND;
1627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1628 glEnable GL_TEXTURE_2D;
1629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1630
1631 my $top = int $self->{children}[1]{range}[0];
1632
1633 my $y0 = $top;
1634 my $y1 = $top + $self->{h};
1635
1636 my $y = 0;
1637
1638 my $layout = $self->{layout};
1639
1640 for my $par (@{$self->{par}}) {
1641 my $h = $par->[0];
1642
1643 if ($y0 < $y + $h && $y < $y1) {
1644 $layout->set_text ($par->[2]);
1645
1646 glColor @{ $par->[1] };
1647 my ($W, $H) = $layout->size;
1648 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1649 }
1650
1651 $y += $h;
1652 }
1653
1654 glDisable GL_TEXTURE_2D;
1655 glDisable GL_BLEND;
1656 };
1657 });
1658}
1659
1660sub _draw {
1661 my ($self) = @_;
1662
1663 if ($self->{texture}) {
1664 glEnable GL_TEXTURE_2D;
1665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1666 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1667 glDisable GL_TEXTURE_2D;
1668 }
1669
1670 $self->{children}[1]->draw;
1671
1272} 1672}
1273 1673
1274############################################################################# 1674#############################################################################
1275 1675
1276package CFClient::UI::MapWidget; 1676package CFClient::UI::MapWidget;
… …
1286 1686
1287sub new { 1687sub new {
1288 my $class = shift; 1688 my $class = shift;
1289 1689
1290 $class->SUPER::new ( 1690 $class->SUPER::new (
1291 z => -1, 1691 z => -1,
1692 can_focus => 1,
1292 list => (glGenLists 1), 1693 list => (glGenLists 1),
1293 @_ 1694 @_
1294 ) 1695 )
1295} 1696}
1296 1697
1297sub key_down { 1698sub key_down {
1298 print "MAPKEYDOWN\n"; 1699 print "MAPKEYDOWN\n";
1299} 1700}
1300 1701
1301sub key_up { 1702sub key_up {
1703}
1704
1705sub button_down {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 $self->focus_in;
1709
1710 if ($ev->button == 2) {
1711 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1712 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1713
1714 $self->{motion} = sub {
1715 my ($ev, $x, $y) = @_;
1716
1717 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1718
1719 $::CFG->{map_shift_x} = $bw + $x - $ox;
1720 $::CFG->{map_shift_y} = $bh + $y - $oy;
1721
1722 $self->update;
1723 };
1724 }
1725}
1726
1727sub button_up {
1728 my ($self, $ev, $x, $y) = @_;
1729
1730 delete $self->{motion};
1731}
1732
1733sub mouse_motion {
1734 my ($self, $ev, $x, $y) = @_;
1735
1736 $self->{motion}->($ev, $x, $y) if $self->{motion};
1302} 1737}
1303 1738
1304sub size_request { 1739sub size_request {
1305 ( 1740 (
1306 1 + 32 * int $::WIDTH / 32, 1741 1 + 32 * int $::WIDTH / 32,
… …
1319 my ($self) = @_; 1754 my ($self) = @_;
1320 1755
1321 if (delete $self->{need_update}) { 1756 if (delete $self->{need_update}) {
1322 glNewList $self->{list}, GL_COMPILE; 1757 glNewList $self->{list}, GL_COMPILE;
1323 1758
1324 my $mx = $::CONN->{mapx}; 1759 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; 1760 my $sw = int $::WIDTH / 32;
1332 my $sh = 1 + int $::HEIGHT / 32; 1761 my $sh = int $::HEIGHT / 32;
1333 1762
1334 if ($::CONN->{mapw} > $sw) { 1763 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1335 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1764 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1336 } else { 1765
1337 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1766 glTranslate $sx0 - 32, $sy0 - 32, 0;
1767
1768 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1769
1770 if ($::CFG->{fow_enable}) {
1771 if ($::CFG->{fow_smooth}) { # smooth fog of war
1772 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1773 glConvolutionFilter2D
1774 GL_CONVOLUTION_2D,
1775 GL_ALPHA,
1776 3, 3,
1777 GL_ALPHA, GL_FLOAT,
1778 pack "f*",
1779 0.1, 0.1, 0.1,
1780 0.1, 0.2, 0.1,
1781 0.1, 0.1, 0.1,
1782 ;
1783 glEnable GL_CONVOLUTION_2D;
1784 }
1785
1786 $self->{fow_texture} = new CFClient::Texture
1787 w => $w,
1788 h => $h,
1789 data => $data,
1790 internalformat => GL_ALPHA,
1791 format => GL_ALPHA;
1792
1793 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1794
1795 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797 glEnable GL_TEXTURE_2D;
1798 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1799
1800 glColor +($::CFG->{fow_intensity}) x 3, 1;
1801 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1802
1803 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805 }
1806
1807 # HACK BEGIN
1808 {
1809 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1810 my ($w, $h) = (250, 250);
1811
1812 glEnable GL_BLEND;
1813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1814 glEnable GL_TEXTURE_2D;
1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1816
1817 $self->{mapmap_texture} =
1818 new CFClient::Texture
1819 w => $w,
1820 h => $h,
1821 data => $::MAP->mapmap ($w, $h),
1822 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1823
1824 $self->{mapmap_texture}->draw_quad (100, 100);
1825
1826 glDisable GL_TEXTURE_2D;
1827 glDisable GL_BLEND;
1828 }
1829 # HACK END
1338 } 1830 }
1339 1831
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; 1832 glEndList;
1404 } 1833 }
1405 1834
1835 glPushMatrix;
1406 glCallList $self->{list}; 1836 glCallList $self->{list};
1837 glPopMatrix;
1838
1839 if ($FOCUS != $self) {
1840 glColor 64/255, 64/255, 64/255;
1841 glLogicOp GL_AND;
1842 glEnable GL_COLOR_LOGIC_OP;
1843 glBegin GL_QUADS;
1844 glVertex 0, 0;
1845 glVertex 0, $::HEIGHT;
1846 glVertex $::WIDTH, $::HEIGHT;
1847 glVertex $::WIDTH, 0;
1848 glEnd;
1849 glDisable GL_COLOR_LOGIC_OP;
1850 }
1407} 1851}
1408 1852
1409my %DIR = ( 1853my %DIR = (
1410 SDLK_KP8, [1, "north"], 1854 SDLK_KP8, [1, "north"],
1411 SDLK_KP9, [2, "northeast"], 1855 SDLK_KP9, [2, "northeast"],
… …
1427 1871
1428 my $mod = $ev->key_mod; 1872 my $mod = $ev->key_mod;
1429 my $sym = $ev->key_sym; 1873 my $sym = $ev->key_sym;
1430 1874
1431 if ($sym == SDLK_KP5) { 1875 if ($sym == SDLK_KP5) {
1432 $::CONN->send ("command stay fire"); 1876 $::CONN->user_send ("command stay fire");
1877 } elsif ($sym == SDLK_a) {
1878 $::CONN->user_send ("command apply");
1879 } elsif ($sym == SDLK_QUOTE) {
1880 $self->emit ('activate_console');
1881 } elsif ($sym == SDLK_SLASH) {
1882 $self->emit ('activate_console' => '/');
1433 } elsif (exists $DIR{$sym}) { 1883 } elsif (exists $DIR{$sym}) {
1434 if ($mod & KMOD_SHIFT) { 1884 if ($mod & KMOD_SHIFT) {
1435 $self->{shft}++; 1885 $self->{shft}++;
1436 $::CONN->send ("command fire $DIR{$sym}[0]"); 1886 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1437 } elsif ($mod & KMOD_CTRL) { 1887 } elsif ($mod & KMOD_CTRL) {
1438 $self->{ctrl}++; 1888 $self->{ctrl}++;
1439 $::CONN->send ("command run $DIR{$sym}[0]"); 1889 $::CONN->user_send ("command run $DIR{$sym}[0]");
1440 } else { 1890 } else {
1441 $::CONN->send ("command $DIR{$sym}[1]"); 1891 $::CONN->user_send ("command $DIR{$sym}[1]");
1442 } 1892 }
1443 } 1893 }
1444} 1894}
1445 1895
1446sub key_up { 1896sub key_up {
… …
1448 1898
1449 my $mod = $ev->key_mod; 1899 my $mod = $ev->key_mod;
1450 my $sym = $ev->key_sym; 1900 my $sym = $ev->key_sym;
1451 1901
1452 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1902 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1453 $::CONN->send ("command fire_stop"); 1903 $::CONN->user_send ("command fire_stop");
1454 } 1904 }
1455 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1905 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1456 $::CONN->send ("command run_stop"); 1906 $::CONN->user_send ("command run_stop");
1457 } 1907 }
1458} 1908}
1459 1909
1460############################################################################# 1910#############################################################################
1461 1911
… …
1499 glPopMatrix; 1949 glPopMatrix;
1500} 1950}
1501 1951
1502############################################################################# 1952#############################################################################
1503 1953
1504package CFClient::UI::Toplevel; 1954package CFClient::UI::Flopper;
1955
1956our @ISA = CFClient::UI::Button::;
1957
1958sub new {
1959 my $class = shift;
1960
1961 my $self = $class->SUPER::new (
1962 state => 0,
1963 connect_activate => \&toggle_flopper,
1964 @_
1965 );
1966
1967 if ($self->{state}) {
1968 $self->{state} = 0;
1969 $self->toggle_flopper;
1970 }
1971
1972 $self
1973}
1974
1975sub toggle_flopper {
1976 my ($self) = @_;
1977
1978 # TODO: use animation
1979 if ($self->{state} = !$self->{state}) {
1980 $CFClient::UI::ROOT->add ($self->{other});
1981 $self->{other}->move ($self->coord2global (0, $self->{h}));
1982 $self->emit ("open");
1983 } else {
1984 $CFClient::UI::ROOT->remove ($self->{other});
1985 $self->emit ("close");
1986 }
1987
1988 $self->emit (changed => $self->{state});
1989}
1990
1991#############################################################################
1992
1993package CFClient::UI::Root;
1505 1994
1506our @ISA = CFClient::UI::Container::; 1995our @ISA = CFClient::UI::Container::;
1996
1997use SDL::OpenGL;
1507 1998
1508sub size_request { 1999sub size_request {
1509 ($::WIDTH, $::HEIGHT) 2000 ($::WIDTH, $::HEIGHT)
1510} 2001}
1511 2002
… …
1516 2007
1517 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2008 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1518 for @{$self->{children}}; 2009 for @{$self->{children}};
1519} 2010}
1520 2011
1521sub translate { 2012sub _topleft {
1522 my ($self, $x, $y) = @_; 2013 my ($self, $x, $y) = @_;
1523 2014
1524 ($x, $y) 2015 ($x, $y)
1525} 2016}
1526 2017
… …
1534sub add { 2025sub add {
1535 my ($self, $widget) = @_; 2026 my ($self, $widget) = @_;
1536 2027
1537 $self->SUPER::add ($widget); 2028 $self->SUPER::add ($widget);
1538 2029
1539 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2030 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2031}
2032
2033sub on_refresh {
2034 my ($self, $id, $cb) = @_;
2035
2036 $self->{refresh_hook}{$id} = $cb;
1540} 2037}
1541 2038
1542sub draw { 2039sub draw {
1543 my ($self) = @_; 2040 my ($self) = @_;
1544 2041
2042 while (my $rcb = delete $self->{refresh_hook}) {
2043 $_->() for values %$rcb;
2044 }
2045
2046 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2047 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2048 glClear GL_COLOR_BUFFER_BIT;
2049
2050 glMatrixMode GL_PROJECTION;
2051 glLoadIdentity;
2052 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2053 glMatrixMode GL_MODELVIEW;
2054 glLoadIdentity;
2055
1545 $self->_draw; 2056 $self->_draw;
1546} 2057}
1547 2058
1548############################################################################# 2059#############################################################################
1549 2060
1550package CFClient::UI; 2061package CFClient::UI;
1551 2062
1552$TOPLEVEL = new CFClient::UI::Toplevel; 2063$ROOT = new CFClient::UI::Root;
1553 2064
15541 20651
1555 2066

Diff Legend

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