ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.76 by root, Tue Apr 11 21:24:09 2006 UTC vs.
Revision 1.119 by root, Sun Apr 16 07:25:30 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47 47
48 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for (@$vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
… …
79use SDL::OpenGL; 92use SDL::OpenGL;
80 93
81sub new { 94sub new {
82 my $class = shift; 95 my $class = shift;
83 96
84 bless { 97 my $self = bless {
85 x => 0, 98 x => 0,
86 y => 0, 99 y => 0,
87 z => 0, 100 z => 0,
88 w => -1, 101 w => -1,
89 h => -1, 102 h => -1,
90 @_ 103 @_
91 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
92} 113}
93 114
94sub move { 115sub move {
95 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 117 $self->{x} = int $x;
97 $self->{y} = $y; 118 $self->{y} = int $y;
98 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
99} 120}
100 121
101sub needs_redraw { 122sub needs_redraw {
102 0 123 0
… …
125 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
126 147
127 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
128} 149}
129 150
130# translate global koordinates to local coordinate system 151# return top left coordinates
131sub translate { 152sub _topleft {
132 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
133 154
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
135} 172}
136 173
137sub focus_in { 174sub focus_in {
138 my ($self) = @_; 175 my ($self) = @_;
139 176
140 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
141 179
142 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
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, $expand) = @_; 355 my ($self, $child) = @_;
336 356
337 $chld->{expand} = $expand;
338 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
339 360
340 $self->{children} = [ 361 $self->{children} = [
341 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
342 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
343 ]; 364 ];
344 365
345 $self->{w} = $self->{h} = -1; 366 $self->{w} = $self->{h} = -1;
346 $self->update; 367 $self->update;
347} 368}
… …
444} 465}
445 466
446sub render_chld { 467sub render_chld {
447 my ($self) = @_; 468 my ($self) = @_;
448 469
449 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
450 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
451 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
452 ); 473 $self->child->draw;
474 };
453} 475}
454 476
455sub size_allocate { 477sub size_allocate {
456 my ($self, $x, $y, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
457 479
… …
535 557
536my @tex = 558my @tex =
537 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
538 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 560 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
539 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
540sub size_request { 575sub size_request {
541 my ($self) = @_; 576 my ($self) = @_;
542 577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
543 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
544 581
545 $h += $tex[1]->{h}; 582 (
546 $h += $tex[4]->{h}; 583 $w + $self->{border} * 2,
547 $w += $tex[2]->{w}; 584 $h + $self->{border} * 2,
548 $w += $tex[3]->{w}; 585 )
549
550 ($w, $h)
551} 586}
552 587
553sub size_allocate { 588sub size_allocate {
554 my ($self, $x, $y, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
555 590
556 $self->_size_allocate ($x, $y, $w, $h) or return; 591 $self->_size_allocate ($x, $y, $w, $h) or return;
557 592
558 $h -= $tex[1]->{h}; 593 $h -= List::Util::max 0, $self->{border} * 2;
559 $h -= $tex[4]->{h}; 594 $w -= List::Util::max 0, $self->{border} * 2;
560 $w -= $tex[2]->{w};
561 $w -= $tex[3]->{w};
562 595
563 $h = $h < 0 ? 0 : $h; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
564 $w = $w < 0 ? 0 : $w; 597}
565 598
566 my $child = $self->child; 599sub button_down {
600 my ($self, $ev, $x, $y) = @_;
567 601
568 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); 602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
604
605 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
606 my ($bw, $bh) = ($self->{w}, $self->{h});
607
608 $self->{motion} = sub {
609 my ($ev, $x, $y) = @_;
610
611 ($x, $y) = ($ev->motion_x, $ev->motion_y);
612
613 $self->{user_w} = $bw + $x - $ox;
614 $self->{user_h} = $bh + $y - $oy;
615 $self->update;
616 };
617
618 } elsif ($x >= 0 && $x < $self->{w}
619 && $y >= 0 && $y < $self->{border}) {
620
621 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
622 my ($bx, $by) = ($self->{x}, $self->{y});
623
624 $self->{motion} = sub {
625 my ($ev, $x, $y) = @_;
626
627 ($x, $y) = ($ev->motion_x, $ev->motion_y);
628
629 $self->move ($bx + $x - $ox, $by + $y - $oy);
630 $self->update;
631 };
632 }
633}
634
635sub button_up {
636 my ($self, $ev, $x, $y) = @_;
637
638 delete $self->{motion};
639}
640
641sub mouse_motion {
642 my ($self, $ev, $x, $y) = @_;
643
644 $self->{motion}->($ev, $x, $y) if $self->{motion};
569} 645}
570 646
571sub _draw { 647sub _draw {
572 my ($self) = @_; 648 my ($self) = @_;
573 649
574 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
575 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
576 652
577 glEnable GL_BLEND; 653 glEnable GL_BLEND;
578 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
579 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
581 657
582 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
583 $top->draw_quad (0, 0, $w, $top->{h}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
584 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
585 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
586 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
587
588 my $right = $tex[2];
589 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
590
591 my $bottom = $tex[4];
592 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
593 663
594 my $bg = $tex[0]; 664 my $bg = $tex[0];
595 665
596 glBindTexture GL_TEXTURE_2D, $bg->{name}; 666 # TODO: repeat texture not scale
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
598 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
599 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
600
601 my $rep_x = $cw / $bg->{w}; 667 my $rep_x = $cw / $bg->{w};
602 my $rep_y = $ch / $bg->{h}; 668 my $rep_y = $ch / $bg->{h};
603 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
604 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
605 676
606 glDisable GL_TEXTURE_2D; 677 glDisable GL_TEXTURE_2D;
607 glDisable GL_BLEND; 678 glDisable GL_BLEND;
608 679
609 $self->child->draw; 680 $self->child->draw;
610
611} 681}
612 682
613############################################################################# 683#############################################################################
614 684
615package CFClient::UI::Table; 685package CFClient::UI::Table;
… …
618 688
619use List::Util qw(max sum); 689use List::Util qw(max sum);
620 690
621use SDL::OpenGL; 691use SDL::OpenGL;
622 692
693sub new {
694 my $class = shift;
695
696 $class->SUPER::new (
697 col_expand => [],
698 @_
699 )
700}
701
623sub add { 702sub add {
624 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
625 704
705 $child->set_parent ($self);
626 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
627 $chld->set_parent ($self);
628 707
629 $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};
630 $self->update; 717 $self->update;
631} 718}
632 719
633sub get_wh { 720sub get_wh {
634 my ($self) = @_; 721 my ($self) = @_;
… …
656 my ($self) = @_; 743 my ($self) = @_;
657 744
658 my ($ws, $hs) = $self->get_wh; 745 my ($ws, $hs) = $self->get_wh;
659 746
660 ( 747 (
661 (List::Util::sum @$ws), 748 (sum @$ws),
662 (List::Util::sum @$hs), 749 (sum @$hs),
663 ) 750 )
664} 751}
665 752
666sub size_allocate { 753sub size_allocate {
667 my ($self, $x, $y, $w, $h) = @_; 754 my ($self, $x, $y, $w, $h) = @_;
668 755
669 $self->_size_allocate ($x, $y, $w, $h) or return; 756 $self->_size_allocate ($x, $y, $w, $h) or return;
670 757
671 my ($ws, $hs) = $self->get_wh; 758 my ($ws, $hs) = $self->get_wh;
672 759
673 my $req_w = List::Util::sum @$ws; 760 my $req_w = sum @$ws;
674 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;
675 767
676 # linearly scale sizes 768 # linearly scale sizes
677 $_ *= $req_w / $w for @$ws; 769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
678 $_ *= $req_h / $h for @$hs; 770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
771
772 CFClient::UI::harmonize $ws;
773 CFClient::UI::harmonize $hs;
679 774
680 my $y; 775 my $y;
681 776
682 for my $r (0 .. $#{$self->{children}}) { 777 for my $r (0 .. $#{$self->{children}}) {
683 my $row = $self->{children}[$r] 778 my $row = $self->{children}[$r]
… …
685 780
686 my $x = 0; 781 my $x = 0;
687 my $row_h = $hs->[$r]; 782 my $row_h = $hs->[$r];
688 783
689 for my $c (0 .. $#$row) { 784 for my $c (0 .. $#$row) {
690 my $widget = $row->[$c]
691 or next;
692
693 my $col_w = $ws->[$c]; 785 my $col_w = $ws->[$c];
694 786
787 if (my $widget = $row->[$c]) {
695 $widget->size_allocate ($x, $y, $col_w, $row_h); 788 $widget->size_allocate ($x, $y, $col_w, $row_h);
789 }
696 790
697 $x += $col_w; 791 $x += $col_w;
698 } 792 }
699 793
700 $y += $row_h; 794 $y += $row_h;
… …
746} 840}
747 841
748sub size_allocate { 842sub size_allocate {
749 my ($self, $x, $y, $w, $h) = @_; 843 my ($self, $x, $y, $w, $h) = @_;
750 844
751 $self->_size_allocate ($x, $y, $w, $h) or return; 845 $self->_size_allocate ($x, $y, $w, $h);
752
753 return unless $self->{w};
754 846
755 ($h, $w) = ($w, $h); 847 ($h, $w) = ($w, $h);
756 848
757 my $children = $self->{children}; 849 my $children = $self->{children};
758 850
… …
760 852
761 my $req_h = List::Util::sum @h; 853 my $req_h = List::Util::sum @h;
762 854
763 if ($req_h > $h) { 855 if ($req_h > $h) {
764 # ah well, not enough space 856 # ah well, not enough space
765 $_ = $h[$_] * $h / $req_h for @h; 857 $_ *= $h / $req_h for @h;
766 } else { 858 } else {
767 my @exp = grep $_->{expand}, @$children; 859 my $exp = List::Util::sum map $_->{expand}, @$children;
768 @exp = @$children unless @exp; 860 $exp ||= 1;
769 861
770 my %exp = map +($_ => 1), @exp;
771
772 for (0 .. $#$children) { 862 for (0 .. $#$children) {
773 my $child = $children->[$_]; 863 my $child = $children->[$_];
774 864
775 my $alloc_h = $h[$_]; 865 my $alloc_h = $h[$_];
776 $alloc_h += ($h - $req_h) / @exp if $exp{$child}; 866 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
777 $h[$_] = $alloc_h; 867 $h[$_] = $alloc_h;
778 } 868 }
779 } 869 }
870
871 CFClient::UI::harmonize \@h;
780 872
781 my $y = 0; 873 my $y = 0;
782 for (0 .. $#$children) { 874 for (0 .. $#$children) {
783 my $child = $children->[$_]; 875 my $child = $children->[$_];
784 my $h = $h[$_]; 876 my $h = $h[$_];
… …
808} 900}
809 901
810sub size_allocate { 902sub size_allocate {
811 my ($self, $x, $y, $w, $h) = @_; 903 my ($self, $x, $y, $w, $h) = @_;
812 904
813 $self->_size_allocate ($x, $y, $w, $h) or return; 905 $self->_size_allocate ($x, $y, $w, $h);
814
815 return unless $self->{h};
816 906
817 my $children = $self->{children}; 907 my $children = $self->{children};
818 908
819 my @h = map +($_->size_request)[1], @$children; 909 my @h = map +($_->size_request)[1], @$children;
820 910
821 my $req_h = List::Util::sum @h; 911 my $req_h = List::Util::sum @h;
822 912
823 if ($req_h > $h) { 913 if ($req_h > $h) {
824 # ah well, not enough space 914 # ah well, not enough space
825 $_ = $h[$_] * $h / $req_h for @h; 915 $_ *= $h / $req_h for @h;
826 } else { 916 } else {
827 my @exp = grep $_->{expand}, @$children; 917 my $exp = List::Util::sum map $_->{expand}, @$children;
828 @exp = @$children unless @exp; 918 $exp ||= 1;
829 919
830 my %exp = map +($_ => 1), @exp;
831
832 for (0 .. $#$children) { 920 for (0 .. $#$children) {
833 my $child = $children->[$_]; 921 my $child = $children->[$_];
834 922
835 my $alloc_h = $h[$_]; 923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
836 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
837 $h[$_] = $alloc_h;
838 } 924 }
839 } 925 }
926
927 CFClient::UI::harmonize \@h;
840 928
841 my $y = 0; 929 my $y = 0;
842 for (0 .. $#$children) { 930 for (0 .. $#$children) {
843 my $child = $children->[$_]; 931 my $child = $children->[$_];
844 my $h = $h[$_]; 932 my $h = $h[$_];
… …
858 946
859sub new { 947sub new {
860 my ($class, %arg) = @_; 948 my ($class, %arg) = @_;
861 949
862 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
863 fg => [1, 1, 1], 951 fg => [1, 1, 1],
864 height => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
865 text => "", 953 text => "",
866 align => -1, 954 align => -1,
955 valign => -1,
867 padding => 2, 956 padding => 2,
868 layout => new CFClient::Layout, 957 layout => new CFClient::Layout,
869 %arg 958 %arg
870 ); 959 );
871 960
872 $self->set_text ($self->{text}); 961 $self->set_text ($self->{text});
873 962
… …
889 978
890 $self->{text} = $text; 979 $self->{text} = $text;
891 $self->{layout}->set_markup ($text); 980 $self->{layout}->set_markup ($text);
892 981
893 delete $self->{texture}; 982 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
894 $self->update; 984 $self->update;
895} 985}
896 986
897sub get_text { 987sub get_text {
898 my ($self, $text) = @_; 988 my ($self, $text) = @_;
… …
902 992
903sub size_request { 993sub size_request {
904 my ($self) = @_; 994 my ($self) = @_;
905 995
906 $self->{layout}->set_width; 996 $self->{layout}->set_width;
907 $self->{layout}->set_height ($self->{height}); 997 $self->{layout}->set_height ($self->{fontsize});
908 my ($w, $h) = $self->{layout}->size; 998 my ($w, $h) = $self->{layout}->size;
909 999
910 ( 1000 (
911 $w + $self->{padding} * 2, 1001 $w + $self->{padding} * 2,
912 $h + $self->{padding} * 2, 1002 $h + $self->{padding} * 2,
… …
931sub _draw { 1021sub _draw {
932 my ($self) = @_; 1022 my ($self) = @_;
933 1023
934 my $tex = $self->{texture} ||= do { 1024 my $tex = $self->{texture} ||= do {
935 $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});
936 new_from_layout CFClient::Texture $self->{layout} 1027 new_from_layout CFClient::Texture $self->{layout}
937 }; 1028 };
938 1029
939 glEnable GL_BLEND; 1030 glEnable GL_BLEND;
940 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
941 glEnable GL_TEXTURE_2D; 1032 glEnable GL_TEXTURE_2D;
942 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
943 1034
944 glColor @{$self->{fg}}; 1035 glColor @{$self->{fg}};
945 1036
946 my $x = 1037 my $x =
947 $self->{align} < 0 ? $self->{padding} 1038 $self->{align} < 0 ? $self->{padding}
948 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949 : ($self->{w} - $tex->{w}) * 0.5; 1040 : ($self->{w} - $tex->{w}) * 0.5;
950 1041
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
951 $tex->draw_quad ($x, 0); 1047 $tex->draw_quad (int $x, int $y);
952 1048
953 glDisable GL_TEXTURE_2D; 1049 glDisable GL_TEXTURE_2D;
954 glDisable GL_BLEND; 1050 glDisable GL_BLEND;
955} 1051}
956 1052
… …
967 my $class = shift; 1063 my $class = shift;
968 1064
969 $class->SUPER::new ( 1065 $class->SUPER::new (
970 fg => [1, 1, 1], 1066 fg => [1, 1, 1],
971 bg => [0, 0, 0, 0.2], 1067 bg => [0, 0, 0, 0.2],
972 active_bg => [1, 1, 1], 1068 active_bg => [1, 1, 1, 0.5],
973 active_fg => [0, 0, 0], 1069 active_fg => [0, 0, 0],
1070 can_hover => 1,
1071 can_focus => 1,
1072 valign => 0,
974 @_ 1073 @_
975 ) 1074 )
976} 1075}
977 1076
978sub _set_text { 1077sub _set_text {
979 my ($self, $text) = @_; 1078 my ($self, $text) = @_;
980 1079
1080 my $old_text = $self->{text};
1081
981 $self->{last_activity} = $::NOW; 1082 $self->{last_activity} = $::NOW;
982 1083
983 $self->{text} = $text; 1084 $self->{text} = $text;
984 $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});
985 1087
986 $text =~ s/./*/g if $self->{hidden}; 1088 $text =~ s/./*/g if $self->{hidden};
987 1089
988 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1090 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
989 1091
990 $text = substr $text, 0, $self->{cursor}; 1092 $text = substr $text, 0, $self->{cursor};
991 utf8::encode $text; 1093 utf8::encode $text;
992 1094
993 @$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};
994} 1099}
995 1100
996sub size_request { 1101sub size_request {
997 my ($self) = @_; 1102 my ($self) = @_;
998 1103
… …
1037 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1142 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1038 } elsif ($sym == SDLK_HOME) { 1143 } elsif ($sym == SDLK_HOME) {
1039 $self->{cursor} = 0; 1144 $self->{cursor} = 0;
1040 } elsif ($sym == SDLK_END) { 1145 } elsif ($sym == SDLK_END) {
1041 $self->{cursor} = length $text; 1146 $self->{cursor} = length $text;
1147 } elsif ($sym == SDLK_ESCAPE) {
1148 $self->emit ('escape');
1042 } elsif ($uni) { 1149 } elsif ($uni) {
1043 substr $text, $self->{cursor}++, 0, chr $uni; 1150 substr $text, $self->{cursor}++, 0, chr $uni;
1044 } 1151 }
1045 1152
1046 $self->_set_text ($text); 1153 $self->_set_text ($text);
… …
1108 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1215 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1109 glEnd; 1216 glEnd;
1110 } 1217 }
1111} 1218}
1112 1219
1113#############################################################################
1114
1115package CFClient::UI::Slider; 1220package CFClient::UI::LineEntry;
1116 1221
1117use strict; 1222our @ISA = CFClient::UI::Entry::;
1118 1223
1224use SDL;
1119use SDL::OpenGL; 1225use SDL::OpenGL;
1120 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
1121our @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);
1122 1254
1123sub new { 1255sub new {
1124 my $class = shift; 1256 my $class = shift;
1125 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
1282 if ($GRAB == $self) {
1283 $self->{fg} = $self->{active_fg};
1284 }
1285
1286 glEnable GL_BLEND;
1287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1288 glEnable GL_TEXTURE_2D;
1289 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1290 glColor 0, 0, 0, 1;
1291
1292 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1293
1294 glDisable GL_TEXTURE_2D;
1295 glDisable GL_BLEND;
1296
1297 $self->SUPER::_draw;
1298}
1299
1300#############################################################################
1301
1302package CFClient::UI::CheckBox;
1303
1304our @ISA = CFClient::UI::DrawBG::;
1305
1306my @tex =
1307 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1308 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1309
1310use SDL;
1311use SDL::OpenGL;
1312
1313sub new {
1314 my $class = shift;
1315
1316 $class->SUPER::new (
1317 padding => 2,
1318 fg => [1, 1, 1],
1319 active_fg => [1, 1, 0],
1320 state => 0,
1321 can_hover => 1,
1322 @_
1323 )
1324}
1325
1326sub size_request {
1327 my ($self) = @_;
1328
1329 ($self->{padding} * 2 + 6) x 2
1330}
1331
1332sub size_allocate {
1333 my ($self, $x, $y, $w, $h) = @_;
1334
1335 $self->_size_allocate ($x, $y, $w, $h);
1336}
1337
1338sub button_down {
1339 my ($self, $ev, $x, $y) = @_;
1340
1341 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1342 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1343 $self->{state} = !$self->{state};
1344 $self->emit (changed => $self->{state});
1345 }
1346}
1347
1348sub _draw {
1349 my ($self) = @_;
1350
1351 $self->SUPER::_draw;
1352
1353 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1354
1355 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1356
1357 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1358
1359 glEnable GL_BLEND;
1360 glEnable GL_TEXTURE_2D;
1361 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1362
1363 my $tex = $self->{state} ? $tex[1] : $tex[0];
1364
1365 $tex->draw_quad (0, 0, $s, $s);
1366
1367 glDisable GL_TEXTURE_2D;
1368 glDisable GL_BLEND;
1369}
1370
1371#############################################################################
1372
1373package CFClient::UI::Slider;
1374
1375use strict;
1376
1377use SDL::OpenGL;
1378
1379our @ISA = CFClient::UI::DrawBG::;
1380
1381my @tex =
1382 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1383 qw(s1_slider.png s1_slider_bg.png);
1384
1385sub new {
1386 my $class = shift;
1387
1126 # range [value, low, high, page] 1388 # range [value, low, high, page]
1127 1389
1390 # TODO: 0-width page
1391 # TODO: req_w/h are wrong with vertical
1392 # TODO: calculations are off
1128 my $self = $class->SUPER::new ( 1393 my $self = $class->SUPER::new (
1129 fg => [1, 1, 1], 1394 fg => [1, 1, 1],
1130 active_fg => [0, 0, 0], 1395 active_fg => [0, 0, 0],
1131 range => [0, 0, 100, 10], 1396 range => [0, 0, 100, 10],
1132 req_w => 40, 1397 req_w => 40,
1133 req_h => 10, 1398 req_h => 13,
1134 vertical => 0, 1399 vertical => 0,
1400 can_hover => 1,
1401 inner_pad => 5,
1135 @_ 1402 @_
1136 ); 1403 );
1137 1404
1138 $self 1405 $self
1139} 1406}
… …
1160 if ($GRAB == $self) { 1427 if ($GRAB == $self) {
1161 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1428 my ($value, $lo, $hi, $page) = @{$self->{range}};
1162 1429
1163 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1164 1431
1432 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1433 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1434
1435 $x -= $inner_pad_px; # substract the padding
1165 $x = $x * ($hi - $lo) / $w + $lo; 1436 $x = $x * ($hi - $lo) / $inner_w + $lo;
1166 $x = $lo if $x < $lo; 1437 $x = $lo if $x < $lo;
1167 $x = $hi - $page if $x > $hi - $page; 1438 $x = $hi - $page if $x > $hi - $page;
1168 $self->{range}[0] = $x; 1439 $self->{range}[0] = $x;
1169 1440
1170 $self->emit (changed => $x); 1441 $self->emit (changed => $x);
1171 $self->update; 1442 $self->update;
1172 } 1443 }
1444}
1445
1446# the inner_* stuff is for generating a padding for the slider handle,
1447# so that the handle doesn't leave the texture. This calculation isn't 100%
1448# correct propably, but it does the job for now
1449sub _calc_inner_pad_px {
1450 my ($self, $w) = @_;
1451 ($w / 100) * $self->{inner_pad} # % to pixels
1173} 1452}
1174 1453
1175sub _draw { 1454sub _draw {
1176 my ($self) = @_; 1455 my ($self) = @_;
1177 1456
… …
1191 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1470 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1192 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1471 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1193 1472
1194 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1473 my ($value, $lo, $hi, $page) = @{$self->{range}};
1195 1474
1475 $hi = $value + 1 if $lo == $hi;
1476
1477 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1478 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1479
1196 $page = int $page * $w / ($hi - $lo); 1480 $page = int $page * $inner_w / ($hi - $lo);
1197 $value = int +($value - $lo) * $w / ($hi - $lo); 1481 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1198 1482
1199 $w -= $page; 1483 $w -= $page;
1200 $page &= ~1; 1484 $page &= ~1;
1201 glTranslate $page * 0.5, 0, 0; 1485 glTranslate $page * 0.5, 0, 0;
1486 $page ||= 2;
1202 1487
1203 glColor @$fg;
1204 glBegin GL_LINES;
1205 glVertex 0, 0; glVertex 0, $h;
1206 glVertex $w - 1, 0; glVertex $w - 1, $h;
1207 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1208 glEnd;
1209
1210 my $knob_a = $value - $page * 0.5; 1488 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1211 my $knob_b = $value + $page * 0.5; 1489 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1212 1490
1213 glBegin GL_QUADS; 1491 glEnable GL_BLEND;
1214 glColor @$fg; 1492 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215 glVertex $knob_a, 0; 1493 glEnable GL_TEXTURE_2D;
1216 glVertex $knob_a, $h; 1494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1217 glVertex $knob_b, $h;
1218 glVertex $knob_b, 0;
1219 1495
1220 if ($knob_a < $knob_b - 2) { 1496 # draw background
1221 glColor @$bg; 1497 $tex[1]->draw_quad (0, 0, $w, $h);
1222 glVertex $knob_a + 1, 1; 1498
1223 glVertex $knob_a + 1, $h - 1; 1499 # draw handle
1224 glVertex $knob_b - 1, $h - 1; 1500 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1225 glVertex $knob_b - 1, 1; 1501
1502 glDisable GL_BLEND;
1503 glDisable GL_TEXTURE_2D;
1504}
1505
1506#############################################################################
1507
1508package CFClient::UI::TextView;
1509
1510our @ISA = CFClient::UI::HBox::;
1511
1512use SDL::OpenGL;
1513
1514sub new {
1515 my $class = shift;
1516
1517 my $self = $class->SUPER::new (
1518 req_w => $::WIDTH / 6,
1519 req_h => $::HEIGHT / 6,
1520 fontsize => $::FONTSIZE,
1521 @_,
1522
1523 layout => (new CFClient::Layout),
1524 par => [],
1525 height => 0,
1526 children => [
1527 (new CFClient::UI::Empty expand => 1),
1528 (new CFClient::UI::Slider vertical => 1),
1529 ],
1530 );
1531
1532 $self->{children}[1]->connect (changed => sub {
1533 $self->update;
1534 });
1535
1536 $self
1537}
1538
1539sub set_fontsize {
1540 my ($self, $fontsize) = @_;
1541
1542 $self->{fontsize} = $fontsize;
1543 $self->reflow;
1544}
1545
1546sub text_height {
1547 my ($self, $text) = @_;
1548
1549 my $layout = $self->{layout};
1550
1551 $layout->set_height ($self->{fontsize});
1552 $layout->set_width ($self->{w});
1553 $layout->set_text ($text);
1226 } 1554
1227 glEnd; 1555 ($layout->size)[1]
1556}
1557
1558sub reflow {
1559 my ($self) = @_;
1560
1561 $self->{need_reflow}++;
1562 $self->update;
1563}
1564
1565sub size_request {
1566 my ($self) = @_;
1567
1568 ($self->{req_w}, $self->{req_h})
1569}
1570
1571sub size_allocate {
1572 my ($self, $x, $y, $w, $h) = @_;
1573
1574 $self->SUPER::size_allocate ($x, $y, $w, $h);
1575
1576 $self->{layout}->set_height ($self->{fontsize});
1577 $self->{layout}->set_width ($self->{w});
1578
1579 $self->reflow;
1580}
1581
1582sub add_paragraph {
1583 my ($self, $color, $text) = @_;
1584
1585 #TODO: intelligently "reformat" paragraph
1586
1587 my $height = $self->text_height ($text);
1588
1589 $self->{height} += $height;
1590
1591 push @{$self->{par}}, [$height, $color, $text];
1592
1593 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1594 $self->{children}[1]->update;
1595}
1596
1597sub update {
1598 my ($self) = @_;
1599
1600 $self->SUPER::update;
1601
1602 return unless $self->{h} > 0;
1603
1604 delete $self->{texture};
1605
1606 $ROOT->on_refresh ($self, sub {
1607 if (delete $self->{need_reflow}) {
1608 my $height = 0;
1609
1610 $height += $_->[0] = $self->text_height ($_->[2])
1611 for @{$self->{par}};
1612
1613 $self->{height} = $height;
1614
1615 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1616
1617 delete $self->{texture};
1618 }
1619
1620 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1621 glClearColor 0, 0, 0, 1;
1622 glClear GL_COLOR_BUFFER_BIT;
1623
1624 glEnable GL_BLEND;
1625 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1626 glEnable GL_TEXTURE_2D;
1627 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1628
1629 my $top = int $self->{children}[1]{range}[0];
1630
1631 my $y0 = $top;
1632 my $y1 = $top + $self->{h};
1633
1634 my $y = 0;
1635
1636 my $layout = $self->{layout};
1637
1638 for my $par (@{$self->{par}}) {
1639 my $h = $par->[0];
1640
1641 if ($y0 < $y + $h && $y < $y1) {
1642 $layout->set_text ($par->[2]);
1643
1644 glColor @{ $par->[1] };
1645 my ($W, $H) = $layout->size;
1646 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1647 }
1648
1649 $y += $h;
1650 }
1651
1652 glDisable GL_TEXTURE_2D;
1653 glDisable GL_BLEND;
1654 };
1655 });
1656}
1657
1658sub _draw {
1659 my ($self) = @_;
1660
1661 if ($self->{texture}) {
1662 glEnable GL_TEXTURE_2D;
1663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1664 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1665 glDisable GL_TEXTURE_2D;
1666 }
1667
1668 $self->{children}[1]->draw;
1669
1228} 1670}
1229 1671
1230############################################################################# 1672#############################################################################
1231 1673
1232package CFClient::UI::MapWidget; 1674package CFClient::UI::MapWidget;
… …
1242 1684
1243sub new { 1685sub new {
1244 my $class = shift; 1686 my $class = shift;
1245 1687
1246 $class->SUPER::new ( 1688 $class->SUPER::new (
1247 z => -1, 1689 z => -1,
1690 can_focus => 1,
1248 list => (glGenLists 1), 1691 list => (glGenLists 1),
1249 @_ 1692 @_
1250 ) 1693 )
1251} 1694}
1252 1695
1253sub key_down { 1696sub key_down {
… …
1255} 1698}
1256 1699
1257sub key_up { 1700sub key_up {
1258} 1701}
1259 1702
1703sub button_down {
1704 my ($self, $ev, $x, $y) = @_;
1705
1706 $self->focus_in;
1707
1708 if ($ev->button == 2) {
1709 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1710 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1711
1712 $self->{motion} = sub {
1713 my ($ev, $x, $y) = @_;
1714
1715 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1716
1717 $::CFG->{map_shift_x} = $bw + $x - $ox;
1718 $::CFG->{map_shift_y} = $bh + $y - $oy;
1719
1720 $self->update;
1721 };
1722 }
1723}
1724
1725sub button_up {
1726 my ($self, $ev, $x, $y) = @_;
1727
1728 delete $self->{motion};
1729}
1730
1731sub mouse_motion {
1732 my ($self, $ev, $x, $y) = @_;
1733
1734 $self->{motion}->($ev, $x, $y) if $self->{motion};
1735}
1736
1260sub size_request { 1737sub size_request {
1261 ( 1738 (
1262 1 + int $::WIDTH / 32, 1739 1 + 32 * int $::WIDTH / 32,
1263 1 + int $::HEIGHT / 32, 1740 1 + 32 * int $::HEIGHT / 32,
1264 ) 1741 )
1265} 1742}
1266 1743
1267sub update { 1744sub update {
1268 my ($self) = @_; 1745 my ($self) = @_;
1269 1746
1270 $self->{need_update} = 1; 1747 $self->{need_update} = 1;
1271 $self->SUPER::update; 1748 $self->SUPER::update;
1272} 1749}
1273 1750
1274sub _draw { 1751sub draw {
1275 my ($self) = @_; 1752 my ($self) = @_;
1276 1753
1277 if (delete $self->{need_update}) { 1754 if (delete $self->{need_update}) {
1278 glNewList $self->{list}, GL_COMPILE; 1755 glNewList $self->{list}, GL_COMPILE;
1279 1756
1280 my $mx = $::CONN->{mapx}; 1757 if ($::MAP) {
1281 my $my = $::CONN->{mapy};
1282
1283 my $map = $::CONN->{map};
1284
1285 my ($xofs, $yofs);
1286
1287 my $sw = 1 + int $::WIDTH / 32; 1758 my $sw = int $::WIDTH / 32;
1288 my $sh = 1 + int $::HEIGHT / 32; 1759 my $sh = int $::HEIGHT / 32;
1289 1760
1290 if ($::CONN->{mapw} > $sw) { 1761 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1291 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1762 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1292 } else { 1763
1293 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1764 glTranslate $sx0 - 32, $sy0 - 32, 0;
1765
1766 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1767
1768 if ($::CFG->{fow_enable}) {
1769 if ($::CFG->{fow_smooth}) { # smooth fog of war
1770 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1771 glConvolutionFilter2D
1772 GL_CONVOLUTION_2D,
1773 GL_ALPHA,
1774 3, 3,
1775 GL_ALPHA, GL_FLOAT,
1776 pack "f*",
1777 0.1, 0.1, 0.1,
1778 0.1, 0.2, 0.1,
1779 0.1, 0.1, 0.1,
1780 ;
1781 glEnable GL_CONVOLUTION_2D;
1782 }
1783
1784 $self->{fow_texture} = new CFClient::Texture
1785 w => $w,
1786 h => $h,
1787 data => $data,
1788 internalformat => GL_ALPHA,
1789 format => GL_ALPHA;
1790
1791 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1792
1793 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1795 glEnable GL_TEXTURE_2D;
1796 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1797
1798 glColor +($::CFG->{fow_intensity}) x 3, 1;
1799 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1800
1801 glDisable GL_TEXTURE_2D;
1802 glDisable GL_BLEND;
1803 }
1804
1805 # HACK BEGIN
1806 {
1807 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1808 my ($w, $h) = (250, 250);
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814
1815 $self->{mapmap_texture} =
1816 new CFClient::Texture
1817 w => $w,
1818 h => $h,
1819 data => $::MAP->mapmap ($w, $h),
1820 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1821
1822 $self->{mapmap_texture}->draw_quad (100, 100);
1823
1824 glDisable GL_TEXTURE_2D;
1825 glDisable GL_BLEND;
1826 }
1827 # HACK END
1294 } 1828 }
1295 1829
1296 if ($::CONN->{maph} > $sh) {
1297 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1298 } else {
1299 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1300 }
1301
1302 glEnable GL_TEXTURE_2D;
1303 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1306
1307 my $sw4 = ($sw + 3) & ~3;
1308 my $darkness = "\x00" x ($sw4 * $sh);
1309
1310 for my $x (0 .. $sw - 1) {
1311 my $row = $map->[$x + $xofs];
1312 for my $y (0 .. $sh - 1) {
1313
1314 my $cell = $row->[$y + $yofs]
1315 or next;
1316
1317 my $dark = $cell->[0];
1318 if ($dark < 0) {
1319 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1320 } else {
1321 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1322 }
1323
1324 for my $num (grep $_, @$cell[1,2,3]) {
1325 my $tex = $::CONN->{face}[$num]{texture} || next;
1326
1327 my ($w, $h) = @$tex{qw(w h)};
1328
1329 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1330 }
1331 }
1332 }
1333
1334# if (1) { # higher quality darkness
1335# $lighting =~ s/(.)/$1$1$1/gs;
1336# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1337#
1338# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1339#
1340# $lighting = $pb->get_pixels;
1341# $lighting =~ s/(.)../$1/gs;
1342# }
1343
1344 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1345
1346 $darkness = new CFClient::Texture
1347 w => $sw4,
1348 h => $sh,
1349 data => $darkness,
1350 internalformat => GL_ALPHA,
1351 format => GL_ALPHA;
1352
1353 glColor 0.45, 0.45, 0.45, 1;
1354 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1355
1356 glDisable GL_TEXTURE_2D;
1357 glDisable GL_BLEND;
1358
1359 glEndList; 1830 glEndList;
1360 } 1831 }
1361 1832
1833 glPushMatrix;
1362 glCallList $self->{list}; 1834 glCallList $self->{list};
1835 glPopMatrix;
1836
1837 if ($FOCUS != $self) {
1838 glColor 64/255, 64/255, 64/255;
1839 glLogicOp GL_AND;
1840 glEnable GL_COLOR_LOGIC_OP;
1841 glBegin GL_QUADS;
1842 glVertex 0, 0;
1843 glVertex 0, $::HEIGHT;
1844 glVertex $::WIDTH, $::HEIGHT;
1845 glVertex $::WIDTH, 0;
1846 glEnd;
1847 glDisable GL_COLOR_LOGIC_OP;
1848 }
1363} 1849}
1364 1850
1365my %DIR = ( 1851my %DIR = (
1366 SDLK_KP8, [1, "north"], 1852 SDLK_KP8, [1, "north"],
1367 SDLK_KP9, [2, "northeast"], 1853 SDLK_KP9, [2, "northeast"],
… …
1383 1869
1384 my $mod = $ev->key_mod; 1870 my $mod = $ev->key_mod;
1385 my $sym = $ev->key_sym; 1871 my $sym = $ev->key_sym;
1386 1872
1387 if ($sym == SDLK_KP5) { 1873 if ($sym == SDLK_KP5) {
1388 $::CONN->send ("command stay fire"); 1874 $::CONN->user_send ("command stay fire");
1875 } elsif ($sym == SDLK_a) {
1876 $::CONN->user_send ("command apply");
1877 } elsif ($sym == SDLK_QUOTE) {
1878 $self->emit ('activate_console');
1879 } elsif ($sym == SDLK_SLASH) {
1880 $self->emit ('activate_console' => '/');
1389 } elsif (exists $DIR{$sym}) { 1881 } elsif (exists $DIR{$sym}) {
1390 if ($mod & KMOD_SHIFT) { 1882 if ($mod & KMOD_SHIFT) {
1391 $self->{shft}++; 1883 $self->{shft}++;
1392 $::CONN->send ("command fire $DIR{$sym}[0]"); 1884 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1393 } elsif ($mod & KMOD_CTRL) { 1885 } elsif ($mod & KMOD_CTRL) {
1394 $self->{ctrl}++; 1886 $self->{ctrl}++;
1395 $::CONN->send ("command run $DIR{$sym}[0]"); 1887 $::CONN->user_send ("command run $DIR{$sym}[0]");
1396 } else { 1888 } else {
1397 $::CONN->send ("command $DIR{$sym}[1]"); 1889 $::CONN->user_send ("command $DIR{$sym}[1]");
1398 } 1890 }
1399 } 1891 }
1400} 1892}
1401 1893
1402sub key_up { 1894sub key_up {
… …
1404 1896
1405 my $mod = $ev->key_mod; 1897 my $mod = $ev->key_mod;
1406 my $sym = $ev->key_sym; 1898 my $sym = $ev->key_sym;
1407 1899
1408 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1900 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1409 $::CONN->send ("command fire_stop"); 1901 $::CONN->user_send ("command fire_stop");
1410 } 1902 }
1411 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1903 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1412 $::CONN->send ("command run_stop"); 1904 $::CONN->user_send ("command run_stop");
1413 } 1905 }
1414} 1906}
1415 1907
1416############################################################################# 1908#############################################################################
1417 1909
… …
1455 glPopMatrix; 1947 glPopMatrix;
1456} 1948}
1457 1949
1458############################################################################# 1950#############################################################################
1459 1951
1460package CFClient::UI::Toplevel; 1952package CFClient::UI::Flopper;
1953
1954our @ISA = CFClient::UI::Button::;
1955
1956sub new {
1957 my $class = shift;
1958
1959 my $self = $class->SUPER::new (
1960 state => 0,
1961 connect_activate => \&toggle_flopper,
1962 @_
1963 );
1964
1965 if ($self->{state}) {
1966 $self->{state} = 0;
1967 $self->toggle_flopper;
1968 }
1969
1970 $self
1971}
1972
1973sub toggle_flopper {
1974 my ($self) = @_;
1975
1976 # TODO: use animation
1977 if ($self->{state} = !$self->{state}) {
1978 $CFClient::UI::ROOT->add ($self->{other});
1979 $self->{other}->move ($self->coord2global (0, $self->{h}));
1980 $self->emit ("open");
1981 } else {
1982 $CFClient::UI::ROOT->remove ($self->{other});
1983 $self->emit ("close");
1984 }
1985
1986 $self->emit (changed => $self->{state});
1987}
1988
1989#############################################################################
1990
1991package CFClient::UI::Root;
1461 1992
1462our @ISA = CFClient::UI::Container::; 1993our @ISA = CFClient::UI::Container::;
1994
1995use SDL::OpenGL;
1463 1996
1464sub size_request { 1997sub size_request {
1465 ($::WIDTH, $::HEIGHT) 1998 ($::WIDTH, $::HEIGHT)
1466} 1999}
1467 2000
… …
1472 2005
1473 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2006 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1474 for @{$self->{children}}; 2007 for @{$self->{children}};
1475} 2008}
1476 2009
1477sub translate { 2010sub _topleft {
1478 my ($self, $x, $y) = @_; 2011 my ($self, $x, $y) = @_;
1479 2012
1480 ($x, $y) 2013 ($x, $y)
1481} 2014}
1482 2015
… …
1490sub add { 2023sub add {
1491 my ($self, $widget) = @_; 2024 my ($self, $widget) = @_;
1492 2025
1493 $self->SUPER::add ($widget); 2026 $self->SUPER::add ($widget);
1494 2027
1495 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2028 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2029}
2030
2031sub on_refresh {
2032 my ($self, $id, $cb) = @_;
2033
2034 $self->{refresh_hook}{$id} = $cb;
1496} 2035}
1497 2036
1498sub draw { 2037sub draw {
1499 my ($self) = @_; 2038 my ($self) = @_;
1500 2039
2040 while (my $rcb = delete $self->{refresh_hook}) {
2041 $_->() for values %$rcb;
2042 }
2043
2044 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2045 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2046 glClear GL_COLOR_BUFFER_BIT;
2047
2048 glMatrixMode GL_PROJECTION;
2049 glLoadIdentity;
2050 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2051 glMatrixMode GL_MODELVIEW;
2052 glLoadIdentity;
2053
1501 $self->_draw; 2054 $self->_draw;
1502} 2055}
1503 2056
1504############################################################################# 2057#############################################################################
1505 2058
1506package CFClient::UI; 2059package CFClient::UI;
1507 2060
1508$TOPLEVEL = new CFClient::UI::Toplevel; 2061$ROOT = new CFClient::UI::Root;
1509 2062
15101 20631
1511 2064

Diff Legend

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