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.75 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 13:56:25 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} = $x;
… …
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 1, 1, 1, 0.1; 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;
189 glBegin GL_QUADS; 227 glBegin GL_QUADS;
190 glVertex $x , $y; 228 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y; 229 glVertex $x + $self->{w}, $y;
… …
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
… …
275 my $class = shift; 295 my $class = shift;
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.4], 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 {
287 my ($self) = @_; 307 my ($self) = @_;
288 308
289 my ($w, $h) = @$self{qw(w h)}; 309 my ($w, $h) = @$self{qw(w h)};
290 310
311 glEnable GL_BLEND;
312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
291 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 313 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
314
292 glBegin GL_QUADS; 315 glBegin GL_QUADS;
293 glVertex 0 , 0; 316 glVertex 0 , 0;
294 glVertex 0 , $h; 317 glVertex 0 , $h;
295 glVertex $w, $h; 318 glVertex $w, $h;
296 glVertex $w, 0; 319 glVertex $w, 0;
297 glEnd; 320 glEnd;
321
322 glDisable GL_BLEND;
298} 323}
299 324
300############################################################################# 325#############################################################################
301 326
302package CFClient::UI::Empty; 327package CFClient::UI::Empty;
… …
325 350
326 $self 351 $self
327} 352}
328 353
329sub add { 354sub add {
330 my ($self, $chld, $expand) = @_; 355 my ($self, $child) = @_;
331 356
332 $chld->{expand} = $expand;
333 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
334 360
335 $self->{children} = [ 361 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
338 ]; 364 ];
339 365
340 $self->{w} = $self->{h} = -1; 366 $self->{w} = $self->{h} = -1;
341 $self->update; 367 $self->update;
342} 368}
… …
439} 465}
440 466
441sub render_chld { 467sub render_chld {
442 my ($self) = @_; 468 my ($self) = @_;
443 469
444 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
447 ); 473 $self->child->draw;
474 };
448} 475}
449 476
450sub size_allocate { 477sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
452 479
… …
530 557
531my @tex = 558my @tex =
532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
533 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);
534 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 => $::FONTSIZE * 0.8,
571 @_
572 )
573}
574
535sub size_request { 575sub size_request {
536 my ($self) = @_; 576 my ($self) = @_;
537 577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
538 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
539 581
540 $h += $tex[1]->{h}; 582 (
541 $h += $tex[4]->{h}; 583 $w + $self->{border} * 2,
542 $w += $tex[2]->{w}; 584 $h + $self->{border} * 2,
543 $w += $tex[3]->{w}; 585 )
544
545 ($w, $h)
546} 586}
547 587
548sub size_allocate { 588sub size_allocate {
549 my ($self, $x, $y, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
550 590
551 $self->_size_allocate ($x, $y, $w, $h) or return; 591 $self->_size_allocate ($x, $y, $w, $h) or return;
552 592
553 $h -= $tex[1]->{h}; 593 $h -= List::Util::max 0, $self->{border} * 2;
554 $h -= $tex[4]->{h}; 594 $w -= List::Util::max 0, $self->{border} * 2;
555 $w -= $tex[2]->{w};
556 $w -= $tex[3]->{w};
557 595
558 $h = $h < 0 ? 0 : $h; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
559 $w = $w < 0 ? 0 : $w; 597}
560 598
561 my $child = $self->child; 599sub button_down {
600 my ($self, $ev, $x, $y) = @_;
562 601
563 $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};
564} 645}
565 646
566sub _draw { 647sub _draw {
567 my ($self) = @_; 648 my ($self) = @_;
568 649
569 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
570 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
571 652
572 glEnable GL_BLEND; 653 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
574 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
576 657
577 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
578 $top->draw_quad (0, 0, $w, $top->{h}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
579 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
580 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
581 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
582
583 my $right = $tex[2];
584 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
585
586 my $bottom = $tex[4];
587 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
588 663
589 my $bg = $tex[0]; 664 my $bg = $tex[0];
590 glBindTexture GL_TEXTURE_2D, $bg->{name};
591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
592 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
593 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
594 665
666 # TODO: repeat texture not scale
595 my $rep_x = $cw / $bg->{w}; 667 my $rep_x = $cw / $bg->{w};
596 my $rep_y = $ch / $bg->{h}; 668 my $rep_y = $ch / $bg->{h};
597 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
598 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
599 676
677 glDisable GL_TEXTURE_2D;
600 glDisable GL_BLEND; 678 glDisable GL_BLEND;
601 glDisable GL_TEXTURE_2D;
602 679
603 $self->child->draw; 680 $self->child->draw;
604
605} 681}
606 682
607############################################################################# 683#############################################################################
608 684
609package CFClient::UI::Table; 685package CFClient::UI::Table;
… …
612 688
613use List::Util qw(max sum); 689use List::Util qw(max sum);
614 690
615use SDL::OpenGL; 691use SDL::OpenGL;
616 692
693sub new {
694 my $class = shift;
695
696 $class->SUPER::new (
697 col_expand => [],
698 @_
699 )
700}
701
617sub add { 702sub add {
618 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
619 704
705 $child->set_parent ($self);
620 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
621 $chld->set_parent ($self);
622 707
623 $self->{w} = $self->{h} = -1; 708 $self->{w} = $self->{h} = -1;
624 $self->update; 709 $self->update;
625} 710}
626 711
… …
650 my ($self) = @_; 735 my ($self) = @_;
651 736
652 my ($ws, $hs) = $self->get_wh; 737 my ($ws, $hs) = $self->get_wh;
653 738
654 ( 739 (
655 (List::Util::sum @$ws), 740 (sum @$ws),
656 (List::Util::sum @$hs), 741 (sum @$hs),
657 ) 742 )
658} 743}
659 744
660sub size_allocate { 745sub size_allocate {
661 my ($self, $x, $y, $w, $h) = @_; 746 my ($self, $x, $y, $w, $h) = @_;
662 747
663 $self->_size_allocate ($x, $y, $w, $h) or return; 748 $self->_size_allocate ($x, $y, $w, $h) or return;
664 749
665 my ($ws, $hs) = $self->get_wh; 750 my ($ws, $hs) = $self->get_wh;
666 751
667 my $req_w = List::Util::sum @$ws; 752 my $req_w = sum @$ws;
668 my $req_h = List::Util::sum @$hs; 753 my $req_h = sum @$hs;
754
755 # TODO: nicer code && do row_expand
756 my @col_expand = @{$self->{col_expand}};
757 @col_expand = (1) x @$ws unless @col_expand;
758 my $col_expand = (sum @col_expand) || 1;
669 759
670 # linearly scale sizes 760 # linearly scale sizes
671 $_ *= $req_w / $w for @$ws; 761 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
672 $_ *= $req_h / $h for @$hs; 762 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
763
764 CFClient::UI::harmonize $ws;
765 CFClient::UI::harmonize $hs;
673 766
674 my $y; 767 my $y;
675 768
676 for my $r (0 .. $#{$self->{children}}) { 769 for my $r (0 .. $#{$self->{children}}) {
677 my $row = $self->{children}[$r] 770 my $row = $self->{children}[$r]
… …
679 772
680 my $x = 0; 773 my $x = 0;
681 my $row_h = $hs->[$r]; 774 my $row_h = $hs->[$r];
682 775
683 for my $c (0 .. $#$row) { 776 for my $c (0 .. $#$row) {
684 my $widget = $row->[$c]
685 or next;
686
687 my $col_w = $ws->[$c]; 777 my $col_w = $ws->[$c];
688 778
779 if (my $widget = $row->[$c]) {
689 $widget->size_allocate ($x, $y, $col_w, $row_h); 780 $widget->size_allocate ($x, $y, $col_w, $row_h);
781 }
690 782
691 $x += $col_w; 783 $x += $col_w;
692 } 784 }
693 785
694 $y += $row_h; 786 $y += $row_h;
695 } 787 }
696 788
697} 789}
698 790
791sub find_widget {
792 my ($self, $x, $y) = @_;
793
794 $x -= $self->{x};
795 $y -= $self->{y};
796
797 my $res;
798
799 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
800 $res = $_->find_widget ($x, $y)
801 and return $res;
802 }
803
804 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
805}
806
699sub _draw { 807sub _draw {
700 my ($self) = @_; 808 my ($self) = @_;
701 809
702 for (grep $_, @{$self->{children}}) { 810 for (grep $_, @{$self->{children}}) {
703 $_->draw for grep $_, @$_; 811 $_->draw for grep $_, @$_;
704 } 812 }
705} 813}
706 814
707############################################################################# 815#############################################################################
708 816
817package CFClient::UI::HBox;
818
819# TODO: wrap into common Box base class
820
821our @ISA = CFClient::UI::Container::;
822
823sub size_request {
824 my ($self) = @_;
825
826 my @alloc = map [$_->size_request], @{$self->{children}};
827
828 (
829 (List::Util::sum map $_->[0], @alloc),
830 (List::Util::max map $_->[1], @alloc),
831 )
832}
833
834sub size_allocate {
835 my ($self, $x, $y, $w, $h) = @_;
836
837 $self->_size_allocate ($x, $y, $w, $h);
838
839 ($h, $w) = ($w, $h);
840
841 my $children = $self->{children};
842
843 my @h = map +($_->size_request)[0], @$children;
844
845 my $req_h = List::Util::sum @h;
846
847 if ($req_h > $h) {
848 # ah well, not enough space
849 $_ *= $h / $req_h for @h;
850 } else {
851 my $exp = List::Util::sum map $_->{expand}, @$children;
852 $exp ||= 1;
853
854 for (0 .. $#$children) {
855 my $child = $children->[$_];
856
857 my $alloc_h = $h[$_];
858 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
859 $h[$_] = $alloc_h;
860 }
861 }
862
863 CFClient::UI::harmonize \@h;
864
865 my $y = 0;
866 for (0 .. $#$children) {
867 my $child = $children->[$_];
868 my $h = $h[$_];
869 $child->size_allocate ($y, 0, $h, $w);
870
871 $y += $h;
872 }
873}
874
875#############################################################################
876
709package CFClient::UI::VBox; 877package CFClient::UI::VBox;
710 878
879# TODO: wrap into common Box base class
880
711our @ISA = CFClient::UI::Container::; 881our @ISA = CFClient::UI::Container::;
712
713use SDL::OpenGL;
714 882
715sub size_request { 883sub size_request {
716 my ($self) = @_; 884 my ($self) = @_;
717 885
718 my @alloc = map [$_->size_request], @{$self->{children}}; 886 my @alloc = map [$_->size_request], @{$self->{children}};
… …
724} 892}
725 893
726sub size_allocate { 894sub size_allocate {
727 my ($self, $x, $y, $w, $h) = @_; 895 my ($self, $x, $y, $w, $h) = @_;
728 896
729 $self->_size_allocate ($x, $y, $w, $h) or return; 897 $self->_size_allocate ($x, $y, $w, $h);
730
731 return unless $self->{h};
732 898
733 my $children = $self->{children}; 899 my $children = $self->{children};
734 900
735 my @h = map +($_->size_request)[1], @$children; 901 my @h = map +($_->size_request)[1], @$children;
736 902
737 my $req_h = List::Util::sum @h; 903 my $req_h = List::Util::sum @h;
738 904
739 if ($req_h > $h) { 905 if ($req_h > $h) {
740 # ah well, not enough space 906 # ah well, not enough space
741 $_ = $h[$_] * $h / $req_h for @h; 907 $_ *= $h / $req_h for @h;
742 } else { 908 } else {
743 my @exp = grep $_->{expand}, @$children; 909 my $exp = List::Util::sum map $_->{expand}, @$children;
744 @exp = @$children unless @exp; 910 $exp ||= 1;
745 911
746 my %exp = map +($_ => 1), @exp;
747
748 for (0 .. $#$children) { 912 for (0 .. $#$children) {
749 my $child = $children->[$_]; 913 my $child = $children->[$_];
750 914
751 my $alloc_h = $h[$_]; 915 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
752 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
753 $h[$_] = $alloc_h;
754 } 916 }
755 } 917 }
918
919 CFClient::UI::harmonize \@h;
756 920
757 my $y = 0; 921 my $y = 0;
758 for (0 .. $#$children) { 922 for (0 .. $#$children) {
759 my $child = $children->[$_]; 923 my $child = $children->[$_];
760 my $h = $h[$_]; 924 my $h = $h[$_];
… …
774 938
775sub new { 939sub new {
776 my ($class, %arg) = @_; 940 my ($class, %arg) = @_;
777 941
778 my $self = $class->SUPER::new ( 942 my $self = $class->SUPER::new (
779 fg => [1, 1, 1], 943 fg => [1, 1, 1],
780 height => $::FONTSIZE, 944 fontsize => $::FONTSIZE,
781 text => "", 945 text => "",
782 align => -1, 946 align => -1,
947 padding => 2,
783 layout => new CFClient::Layout, 948 layout => new CFClient::Layout,
784 %arg 949 %arg
785 ); 950 );
786 951
787 $self->set_text ($self->{text}); 952 $self->set_text ($self->{text});
788 953
… …
804 969
805 $self->{text} = $text; 970 $self->{text} = $text;
806 $self->{layout}->set_markup ($text); 971 $self->{layout}->set_markup ($text);
807 972
808 delete $self->{texture}; 973 delete $self->{texture};
974# $self->{w} = $self->{h} = -1;
809 $self->update; 975 $self->update;
810} 976}
811 977
812sub get_text { 978sub get_text {
813 my ($self, $text) = @_; 979 my ($self, $text) = @_;
… …
817 983
818sub size_request { 984sub size_request {
819 my ($self) = @_; 985 my ($self) = @_;
820 986
821 $self->{layout}->set_width; 987 $self->{layout}->set_width;
822 $self->{layout}->set_height ($self->{height}); 988 $self->{layout}->set_height ($self->{fontsize});
823 $self->{layout}->size 989 my ($w, $h) = $self->{layout}->size;
824# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 990
825# ( 991 (
826# $self->{texture}{w}, 992 $w + $self->{padding} * 2,
827# $self->{texture}{h}, 993 $h + $self->{padding} * 2,
828# ) 994 )
829# } else {
830# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
831#
832# ($w, $h)
833# }
834} 995}
835 996
836sub size_allocate { 997sub size_allocate {
837 my ($self, $x, $y, $w, $h) = @_; 998 my ($self, $x, $y, $w, $h) = @_;
838 999
… …
851sub _draw { 1012sub _draw {
852 my ($self) = @_; 1013 my ($self) = @_;
853 1014
854 my $tex = $self->{texture} ||= do { 1015 my $tex = $self->{texture} ||= do {
855 $self->{layout}->set_width ($self->{w}); 1016 $self->{layout}->set_width ($self->{w});
1017 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
856 new_from_layout CFClient::Texture $self->{layout} 1018 new_from_layout CFClient::Texture $self->{layout}
857 }; 1019 };
858 1020
859 glEnable GL_BLEND; 1021 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1023 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 1025
864 glColor @{$self->{fg}}; 1026 glColor @{$self->{fg}};
865 1027
866 my $x = 1028 my $x =
867 $self->{align} < 0 ? 0 1029 $self->{align} < 0 ? $self->{padding}
868 : $self->{align} > 0 ? $self->{w} - $tex->{w} 1030 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
869 : ($self->{w} - $tex->{w}) * 0.5; 1031 : ($self->{w} - $tex->{w}) * 0.5;
870 1032
871 $tex->draw_quad ($x, 0); 1033 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
872 1034
873 glDisable GL_TEXTURE_2D; 1035 glDisable GL_TEXTURE_2D;
874 glDisable GL_BLEND; 1036 glDisable GL_BLEND;
875} 1037}
876 1038
… …
886sub new { 1048sub new {
887 my $class = shift; 1049 my $class = shift;
888 1050
889 $class->SUPER::new ( 1051 $class->SUPER::new (
890 fg => [1, 1, 1], 1052 fg => [1, 1, 1],
891 bg => [0, 0, 0, 0.4], 1053 bg => [0, 0, 0, 0.2],
892 active_bg => [1, 1, 1], 1054 active_bg => [1, 1, 1, 0.5],
893 active_fg => [0, 0, 0], 1055 active_fg => [0, 0, 0],
1056 can_hover => 1,
1057 can_focus => 1,
894 @_ 1058 @_
895 ) 1059 )
896} 1060}
897 1061
898sub _set_text { 1062sub _set_text {
899 my ($self, $text) = @_; 1063 my ($self, $text) = @_;
900 1064
1065 my $old_text = $self->{text};
1066
901 $self->{last_activity} = $::NOW; 1067 $self->{last_activity} = $::NOW;
902 1068
903 $self->{text} = $text; 1069 $self->{text} = $text;
904 $self->{layout}->set_width ($self->{w}); 1070 $self->{layout}->set_width ($self->{w});
1071 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
905 1072
906 $text =~ s/./*/g if $self->{hidden}; 1073 $text =~ s/./*/g if $self->{hidden};
907 1074
908
909 $self->{layout}->set_markup ($self->escape_text ($text)); 1075 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
910 1076
911 $text = substr $text, 0, $self->{cursor}; 1077 $text = substr $text, 0, $self->{cursor};
912 utf8::encode $text; 1078 utf8::encode $text;
913 1079
914 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1080 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1081
1082 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1083 if $old_text ne $self->{text};
915} 1084}
916 1085
917sub size_request { 1086sub size_request {
918 my ($self) = @_; 1087 my ($self) = @_;
919 1088
… …
954 substr $text, $self->{cursor}, 1, ""; 1123 substr $text, $self->{cursor}, 1, "";
955 } elsif ($sym == SDLK_LEFT) { 1124 } elsif ($sym == SDLK_LEFT) {
956 --$self->{cursor} if $self->{cursor}; 1125 --$self->{cursor} if $self->{cursor};
957 } elsif ($sym == SDLK_RIGHT) { 1126 } elsif ($sym == SDLK_RIGHT) {
958 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1127 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1128 } elsif ($sym == SDLK_HOME) {
1129 $self->{cursor} = 0;
1130 } elsif ($sym == SDLK_END) {
1131 $self->{cursor} = length $text;
1132 } elsif ($sym == SDLK_ESCAPE) {
1133 $self->emit ('escape');
959 } elsif ($uni) { 1134 } elsif ($uni) {
960 substr $text, $self->{cursor}++, 0, chr $uni; 1135 substr $text, $self->{cursor}++, 0, chr $uni;
961 } 1136 }
962 1137
963 $self->_set_text ($text); 1138 $self->_set_text ($text);
… …
978 $self->SUPER::button_down ($ev, $x, $y); 1153 $self->SUPER::button_down ($ev, $x, $y);
979 1154
980 my $idx = $self->{layout}->xy_to_index ($x, $y); 1155 my $idx = $self->{layout}->xy_to_index ($x, $y);
981 1156
982 # byte-index to char-index 1157 # byte-index to char-index
983 my $text = $self->{layout}; 1158 my $text = $self->{text};
984 utf8::encode $text; 1159 utf8::encode $text;
985 $self->{cursor} = length substr $text, 0, $idx; 1160 $self->{cursor} = length substr $text, 0, $idx;
986 1161
987 $self->_set_text ($self->{text}); 1162 $self->_set_text ($self->{text});
988 $self->update; 1163 $self->update;
… …
1003 $self->{fg} = $self->{active_fg}; 1178 $self->{fg} = $self->{active_fg};
1004 } else { 1179 } else {
1005 glColor @{$self->{bg}}; 1180 glColor @{$self->{bg}};
1006 } 1181 }
1007 1182
1183 glEnable GL_BLEND;
1184 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1008 glBegin GL_QUADS; 1185 glBegin GL_QUADS;
1009 glVertex 0 , 0; 1186 glVertex 0 , 0;
1010 glVertex 0 , $self->{h}; 1187 glVertex 0 , $self->{h};
1011 glVertex $self->{w}, $self->{h}; 1188 glVertex $self->{w}, $self->{h};
1012 glVertex $self->{w}, 0; 1189 glVertex $self->{w}, 0;
1013 glEnd; 1190 glEnd;
1191 glDisable GL_BLEND;
1014 1192
1015 $self->SUPER::_draw; 1193 $self->SUPER::_draw;
1016 1194
1017 #TODO: force update every cursor change :( 1195 #TODO: force update every cursor change :(
1018 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1196 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
1022 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1200 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1023 glEnd; 1201 glEnd;
1024 } 1202 }
1025} 1203}
1026 1204
1027#############################################################################
1028
1029package CFClient::UI::Slider; 1205package CFClient::UI::LineEntry;
1030 1206
1031use strict; 1207our @ISA = CFClient::UI::Entry::;
1032 1208
1209use SDL;
1033use SDL::OpenGL; 1210use SDL::OpenGL;
1034 1211
1035our @ISA = CFClient::UI::DrawBG::; 1212sub key_down {
1036
1037sub size_request {
1038 my ($self) = @_; 1213 my ($self, $ev) = @_;
1039 1214
1040 my $w = 50; 1215 my $sym = $ev->key_sym;
1041 my $h = 10;
1042 1216
1043 $self->{vertical} ? ($h, $w) : ($w, $h) 1217 if ($sym == SDLK_RETURN) {
1218 $self->emit (activate => $self->get_text);
1219 $self->update;
1220
1221 } else {
1222 $self->SUPER::key_down ($ev);
1223 }
1224
1044} 1225}
1226
1227#############################################################################
1228
1229package CFClient::UI::Button;
1230
1231our @ISA = CFClient::UI::Label::;
1232
1233use SDL;
1234use SDL::OpenGL;
1235
1236my @tex =
1237 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1238 qw(b1_button_active.png);
1045 1239
1046sub new { 1240sub new {
1047 my $class = shift; 1241 my $class = shift;
1048 1242
1243 $class->SUPER::new (
1244 padding => 4,
1245 fg => [1, 1, 1],
1246 bg => [1, 1, 1, 0.2],
1247 active_fg => [1, 1, 0],
1248 can_hover => 1,
1249 @_
1250 )
1251}
1252
1253sub button_up {
1254 my ($self, $ev, $x, $y) = @_;
1255
1256 if ($x >= 0 && $x < $self->{w}
1257 && $y >= 0 && $y < $self->{h}) {
1258 $self->emit ("activate");
1259 }
1260}
1261
1262sub _draw {
1263 my ($self) = @_;
1264
1265 local $self->{fg} = $self->{fg};
1266 my $tex = $tex[0];
1267
1268 glEnable GL_BLEND;
1269 glEnable GL_TEXTURE_2D;
1270 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1271
1272 if ($GRAB == $self) {
1273 $self->{fg} = $self->{active_fg};
1274 }
1275
1276 glBindTexture GL_TEXTURE_2D, $tex->{name};
1277 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1278
1279 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1280
1281 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283
1284 $self->SUPER::_draw;
1285}
1286
1287#############################################################################
1288
1289package CFClient::UI::CheckBox;
1290
1291our @ISA = CFClient::UI::DrawBG::;
1292
1293my @tex =
1294 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1295 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1296
1297use SDL;
1298use SDL::OpenGL;
1299
1300sub new {
1301 my $class = shift;
1302
1303 $class->SUPER::new (
1304 padding => 2,
1305 fg => [1, 1, 1],
1306 active_fg => [1, 1, 0],
1307 state => 0,
1308 can_hover => 1,
1309 @_
1310 )
1311}
1312
1313sub size_request {
1314 my ($self) = @_;
1315
1316 ($self->{padding} * 2 + 6) x 2
1317}
1318
1319sub size_allocate {
1320 my ($self, $x, $y, $w, $h) = @_;
1321
1322 $self->_size_allocate ($x, $y, $w, $h);
1323}
1324
1325sub button_down {
1326 my ($self, $ev, $x, $y) = @_;
1327
1328 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1329 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1330 $self->{state} = !$self->{state};
1331 $self->emit (changed => $self->{state});
1332 }
1333}
1334
1335sub _draw {
1336 my ($self) = @_;
1337
1338 $self->SUPER::_draw;
1339
1340 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1341
1342 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1343
1344 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1345
1346 glEnable GL_BLEND;
1347 glEnable GL_TEXTURE_2D;
1348 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1349
1350 my $tex = $self->{state} ? $tex[1] : $tex[0];
1351
1352 $tex->draw_quad (0, 0, $s, $s);
1353
1354 glDisable GL_TEXTURE_2D;
1355 glDisable GL_BLEND;
1356}
1357
1358#############################################################################
1359
1360package CFClient::UI::Slider;
1361
1362use strict;
1363
1364use SDL::OpenGL;
1365
1366our @ISA = CFClient::UI::DrawBG::;
1367
1368my @tex =
1369 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1370 qw(s1_slider.png s1_slider_bg.png);
1371
1372sub new {
1373 my $class = shift;
1374
1049 # range [value, low, high, page] 1375 # range [value, low, high, page]
1050 1376
1377 # TODO: 0-width page
1378 # TODO: req_w/h are wrong with vertical
1379 # TODO: calculations are off
1051 $class->SUPER::new ( 1380 my $self = $class->SUPER::new (
1052 fg => [1, 1, 1], 1381 fg => [1, 1, 1],
1053 active_fg => [0, 0, 0], 1382 active_fg => [0, 0, 0],
1054 range => [0, 0, 100, 10], 1383 range => [0, 0, 100, 10],
1384 req_w => 40,
1385 req_h => 13,
1055 vertical => 1, 1386 vertical => 0,
1387 can_hover => 1,
1388 inner_pad => 5,
1056 @_ 1389 @_
1057 ) 1390 );
1391
1392 $self
1393}
1394
1395sub size_request {
1396 my ($self) = @_;
1397
1398 my $w = $self->{req_w};
1399 my $h = $self->{req_h};
1400
1401 $self->{vertical} ? ($h, $w) : ($w, $h)
1058} 1402}
1059 1403
1060sub button_down { 1404sub button_down {
1061 my ($self, $ev, $x, $y) = @_; 1405 my ($self, $ev, $x, $y) = @_;
1062 1406
… …
1070 if ($GRAB == $self) { 1414 if ($GRAB == $self) {
1071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1415 my ($value, $lo, $hi, $page) = @{$self->{range}};
1072 1416
1073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1417 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1074 1418
1419 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1420 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1421
1422 $x -= $inner_pad_px; # substract the padding
1075 $x = $x * ($hi - $lo) / $w + $lo; 1423 $x = $x * ($hi - $lo) / $inner_w + $lo;
1076 $x = $lo if $x < $lo; 1424 $x = $lo if $x < $lo;
1077 $x = $hi - $page if $x > $hi - $page; 1425 $x = $hi - $page if $x > $hi - $page;
1078 $self->{range}[0] = $x; 1426 $self->{range}[0] = $x;
1079 1427
1080 $self->emit (changed => $x); 1428 $self->emit (changed => $x);
1081 $self->update; 1429 $self->update;
1082 } 1430 }
1431}
1432
1433# the inner_* stuff is for generating a padding for the slider handle,
1434# so that the handle doesn't leave the texture. This calculation isn't 100%
1435# correct propably, but it does the job for now
1436sub _calc_inner_pad_px {
1437 my ($self, $w) = @_;
1438 ($w / 100) * $self->{inner_pad} # % to pixels
1083} 1439}
1084 1440
1085sub _draw { 1441sub _draw {
1086 my ($self) = @_; 1442 my ($self) = @_;
1087 1443
… …
1101 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1457 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1102 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1458 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1103 1459
1104 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1460 my ($value, $lo, $hi, $page) = @{$self->{range}};
1105 1461
1462 $hi = $value + 1 if $lo == $hi;
1463
1464 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1465 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1466
1106 $page = int $page * $w / ($hi - $lo); 1467 $page = int $page * $inner_w / ($hi - $lo);
1107 $value = int +($value - $lo) * $w / ($hi - $lo); 1468 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1108 1469
1109 $w -= $page; 1470 $w -= $page;
1110 $page &= ~1; 1471 $page &= ~1;
1111 glTranslate $page * 0.5, 0, 0; 1472 glTranslate $page * 0.5, 0, 0;
1473 $page ||= 2;
1112 1474
1113 glColor @$fg;
1114 glBegin GL_LINES;
1115 glVertex 0, 0; glVertex 0, $h;
1116 glVertex $w - 1, 0; glVertex $w - 1, $h;
1117 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1118 glEnd;
1119
1120 my $knob_a = $value - $page * 0.5; 1475 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1121 my $knob_b = $value + $page * 0.5; 1476 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1122 1477
1123 glBegin GL_QUADS; 1478 glEnable GL_BLEND;
1124 glColor @$fg; 1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1125 glVertex $knob_a, 0; 1480 glEnable GL_TEXTURE_2D;
1126 glVertex $knob_a, $h; 1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1127 glVertex $knob_b, $h;
1128 glVertex $knob_b, 0;
1129 1482
1130 if ($knob_a < $knob_b - 2) { 1483 # draw background
1131 glColor @$bg; 1484 $tex[1]->draw_quad (0, 0, $w, $h);
1132 glVertex $knob_a + 1, 1; 1485
1133 glVertex $knob_a + 1, $h - 1; 1486 # draw handle
1134 glVertex $knob_b - 1, $h - 1; 1487 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1135 glVertex $knob_b - 1, 1; 1488
1489 glDisable GL_BLEND;
1490 glDisable GL_TEXTURE_2D;
1491}
1492
1493#############################################################################
1494
1495package CFClient::UI::TextView;
1496
1497our @ISA = CFClient::UI::HBox::;
1498
1499use SDL::OpenGL;
1500
1501sub new {
1502 my $class = shift;
1503
1504 my $self = $class->SUPER::new (
1505 req_w => $::WIDTH / 6,
1506 req_h => $::HEIGHT / 6,
1507 fontsize => $::FONTSIZE,
1508 @_,
1509
1510 layout => (new CFClient::Layout),
1511 par => [],
1512 height => 0,
1513 children => [
1514 (new CFClient::UI::Empty expand => 1),
1515 (new CFClient::UI::Slider vertical => 1),
1516 ],
1517 );
1518
1519 $self->{children}[1]->connect (changed => sub {
1520 $self->update;
1521 });
1522
1523 $self
1524}
1525
1526sub set_fontsize {
1527 my ($self, $fontsize) = @_;
1528
1529 $self->{fontsize} = $fontsize;
1530 $self->reflow;
1531}
1532
1533sub text_height {
1534 my ($self, $text) = @_;
1535
1536 my $layout = $self->{layout};
1537
1538 $layout->set_height ($self->{fontsize});
1539 $layout->set_width ($self->{w});
1540 $layout->set_text ($text);
1136 } 1541
1137 glEnd; 1542 ($layout->size)[1]
1543}
1544
1545sub reflow {
1546 my ($self) = @_;
1547
1548 $self->{need_reflow}++;
1549 $self->update;
1550}
1551
1552sub size_request {
1553 my ($self) = @_;
1554
1555 ($self->{req_w}, $self->{req_h})
1556}
1557
1558sub size_allocate {
1559 my ($self, $x, $y, $w, $h) = @_;
1560
1561 $self->SUPER::size_allocate ($x, $y, $w, $h);
1562
1563 $self->{layout}->set_height ($self->{fontsize});
1564 $self->{layout}->set_width ($self->{w});
1565
1566 $self->reflow;
1567}
1568
1569sub add_paragraph {
1570 my ($self, $color, $text) = @_;
1571
1572 #TODO: intelligently "reformat" paragraph
1573
1574 my $height = $self->text_height ($text);
1575
1576 $self->{height} += $height;
1577
1578 push @{$self->{par}}, [$height, $color, $text];
1579
1580 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1581 $self->{children}[1]->update;
1582}
1583
1584sub update {
1585 my ($self) = @_;
1586
1587 $self->SUPER::update;
1588
1589 return unless $self->{h} > 0;
1590
1591 delete $self->{texture};
1592
1593 $ROOT->on_refresh ($self, sub {
1594 if (delete $self->{need_reflow}) {
1595 my $height = 0;
1596
1597 $height += $_->[0] = $self->text_height ($_->[2])
1598 for @{$self->{par}};
1599
1600 $self->{height} = $height;
1601
1602 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1603
1604 delete $self->{texture};
1605 }
1606
1607 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1608 glClearColor 0, 0, 0, 1;
1609 glClear GL_COLOR_BUFFER_BIT;
1610
1611 glEnable GL_BLEND;
1612 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1613 glEnable GL_TEXTURE_2D;
1614 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1615
1616 my $top = int $self->{children}[1]{range}[0];
1617
1618 my $y0 = $top;
1619 my $y1 = $top + $self->{h};
1620
1621 my $y = 0;
1622
1623 my $layout = $self->{layout};
1624
1625 for my $par (@{$self->{par}}) {
1626 my $h = $par->[0];
1627
1628 if ($y0 < $y + $h && $y < $y1) {
1629 $layout->set_text ($par->[2]);
1630
1631 glColor @{ $par->[1] };
1632 my ($W, $H) = $layout->size;
1633 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1634 }
1635
1636 $y += $h;
1637 }
1638
1639 glDisable GL_TEXTURE_2D;
1640 glDisable GL_BLEND;
1641 };
1642 });
1643}
1644
1645sub _draw {
1646 my ($self) = @_;
1647
1648 if ($self->{texture}) {
1649 glEnable GL_TEXTURE_2D;
1650 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1651 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1652 glDisable GL_TEXTURE_2D;
1653 }
1654
1655 $self->{children}[1]->draw;
1656
1138} 1657}
1139 1658
1140############################################################################# 1659#############################################################################
1141 1660
1142package CFClient::UI::MapWidget; 1661package CFClient::UI::MapWidget;
… …
1152 1671
1153sub new { 1672sub new {
1154 my $class = shift; 1673 my $class = shift;
1155 1674
1156 $class->SUPER::new ( 1675 $class->SUPER::new (
1157 z => -1, 1676 z => -1,
1677 can_focus => 1,
1158 list => (glGenLists 1), 1678 list => (glGenLists 1),
1159 @_ 1679 @_
1160 ) 1680 )
1161} 1681}
1162 1682
1163sub key_down { 1683sub key_down {
… …
1165} 1685}
1166 1686
1167sub key_up { 1687sub key_up {
1168} 1688}
1169 1689
1690sub button_down {
1691 my ($self, $ev, $x, $y) = @_;
1692
1693 $self->focus_in;
1694
1695 if ($ev->button == 2) {
1696 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1697 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1698
1699 $self->{motion} = sub {
1700 my ($ev, $x, $y) = @_;
1701
1702 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1703
1704 $::CFG->{map_shift_x} = $bw + $x - $ox;
1705 $::CFG->{map_shift_y} = $bh + $y - $oy;
1706
1707 $self->update;
1708 };
1709 }
1710}
1711
1712sub button_up {
1713 my ($self, $ev, $x, $y) = @_;
1714
1715 delete $self->{motion};
1716}
1717
1718sub mouse_motion {
1719 my ($self, $ev, $x, $y) = @_;
1720
1721 $self->{motion}->($ev, $x, $y) if $self->{motion};
1722}
1723
1170sub size_request { 1724sub size_request {
1171 ( 1725 (
1172 1 + int $::WIDTH / 32, 1726 1 + 32 * int $::WIDTH / 32,
1173 1 + int $::HEIGHT / 32, 1727 1 + 32 * int $::HEIGHT / 32,
1174 ) 1728 )
1175} 1729}
1176 1730
1177sub update { 1731sub update {
1178 my ($self) = @_; 1732 my ($self) = @_;
1179 1733
1180 $self->{need_update} = 1; 1734 $self->{need_update} = 1;
1181 $self->SUPER::update; 1735 $self->SUPER::update;
1182} 1736}
1183 1737
1184sub _draw { 1738sub draw {
1185 my ($self) = @_; 1739 my ($self) = @_;
1186 1740
1187 if (delete $self->{need_update}) { 1741 if (delete $self->{need_update}) {
1188 glNewList $self->{list}, GL_COMPILE; 1742 glNewList $self->{list}, GL_COMPILE;
1189 1743
1190 my $mx = $::CONN->{mapx}; 1744 if ($::MAP) {
1191 my $my = $::CONN->{mapy};
1192
1193 my $map = $::CONN->{map};
1194
1195 my ($xofs, $yofs);
1196
1197 my $sw = 1 + int $::WIDTH / 32; 1745 my $sw = int $::WIDTH / 32;
1198 my $sh = 1 + int $::HEIGHT / 32; 1746 my $sh = int $::HEIGHT / 32;
1199 1747
1200 if ($::CONN->{mapw} > $sw) { 1748 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1201 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1749 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1202 } else { 1750
1203 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1751 glTranslate $sx0 - 32, $sy0 - 32, 0;
1752
1753 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1754
1755 if ($::CFG->{fow_enable}) {
1756 if ($::CFG->{fow_smooth}) { # smooth fog of war
1757 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1758 glConvolutionFilter2D
1759 GL_CONVOLUTION_2D,
1760 GL_ALPHA,
1761 3, 3,
1762 GL_ALPHA, GL_FLOAT,
1763 pack "f*",
1764 0.1, 0.1, 0.1,
1765 0.1, 0.2, 0.1,
1766 0.1, 0.1, 0.1,
1767 ;
1768 glEnable GL_CONVOLUTION_2D;
1769 }
1770
1771 my $tex = new CFClient::Texture
1772 w => $w,
1773 h => $h,
1774 data => $data,
1775 internalformat => GL_ALPHA,
1776 format => GL_ALPHA;
1777
1778 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1779
1780 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1784
1785 glColor +($::CFG->{fow_intensity}) x 3, 1;
1786 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1787
1788 glDisable GL_TEXTURE_2D;
1789 glDisable GL_BLEND;
1790 }
1791
1792 # HACK BEGIN
1793 {
1794 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1795 my ($w, $h) = (250, 250);
1796
1797 glEnable GL_BLEND;
1798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1799 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801
1802 CFClient::Texture->new (
1803 w => $w,
1804 h => $h,
1805 data => $::MAP->mapmap ($w, $h),
1806 type => GL_UNSIGNED_INT_8_8_8_8_REV
1807 )->draw_quad (100, 100);
1808
1809 glDisable GL_TEXTURE_2D;
1810 glDisable GL_BLEND;
1811 }
1812 # HACK END
1204 } 1813 }
1205 1814
1206 if ($::CONN->{maph} > $sh) {
1207 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1208 } else {
1209 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1210 }
1211
1212 glEnable GL_TEXTURE_2D;
1213 glEnable GL_BLEND;
1214 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1216
1217 my $sw4 = ($sw + 3) & ~3;
1218 my $darkness = "\x00" x ($sw4 * $sh);
1219
1220 for my $x (0 .. $sw - 1) {
1221 my $row = $map->[$x + $xofs];
1222 for my $y (0 .. $sh - 1) {
1223
1224 my $cell = $row->[$y + $yofs]
1225 or next;
1226
1227 my $dark = $cell->[0];
1228 if ($dark < 0) {
1229 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1230 } else {
1231 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1232 }
1233
1234 for my $num (grep $_, @$cell[1,2,3]) {
1235 my $tex = $::CONN->{face}[$num]{texture} || next;
1236
1237 my ($w, $h) = @$tex{qw(w h)};
1238
1239 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1240 }
1241 }
1242 }
1243
1244# if (1) { # higher quality darkness
1245# $lighting =~ s/(.)/$1$1$1/gs;
1246# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1247#
1248# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1249#
1250# $lighting = $pb->get_pixels;
1251# $lighting =~ s/(.)../$1/gs;
1252# }
1253
1254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1255
1256 $darkness = new CFClient::Texture
1257 w => $sw4,
1258 h => $sh,
1259 data => $darkness,
1260 internalformat => GL_ALPHA,
1261 format => GL_ALPHA;
1262
1263 glColor 0.45, 0.45, 0.45, 1;
1264 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1265
1266 glDisable GL_TEXTURE_2D;
1267 glDisable GL_BLEND;
1268
1269 glEndList; 1815 glEndList;
1270 } 1816 }
1271 1817
1818 glPushMatrix;
1272 glCallList $self->{list}; 1819 glCallList $self->{list};
1820 glPopMatrix;
1821
1822 if ($FOCUS != $self) {
1823 glColor 64/255, 64/255, 64/255;
1824 glLogicOp GL_AND;
1825 glEnable GL_COLOR_LOGIC_OP;
1826 glBegin GL_QUADS;
1827 glVertex 0, 0;
1828 glVertex 0, $::HEIGHT;
1829 glVertex $::WIDTH, $::HEIGHT;
1830 glVertex $::WIDTH, 0;
1831 glEnd;
1832 glDisable GL_COLOR_LOGIC_OP;
1833 }
1273} 1834}
1274 1835
1275my %DIR = ( 1836my %DIR = (
1276 SDLK_KP8, [1, "north"], 1837 SDLK_KP8, [1, "north"],
1277 SDLK_KP9, [2, "northeast"], 1838 SDLK_KP9, [2, "northeast"],
… …
1293 1854
1294 my $mod = $ev->key_mod; 1855 my $mod = $ev->key_mod;
1295 my $sym = $ev->key_sym; 1856 my $sym = $ev->key_sym;
1296 1857
1297 if ($sym == SDLK_KP5) { 1858 if ($sym == SDLK_KP5) {
1298 $::CONN->send ("command stay fire"); 1859 $::CONN->user_send ("command stay fire");
1860 } elsif ($sym == SDLK_a) {
1861 $::CONN->user_send ("command apply");
1862 } elsif ($sym == SDLK_QUOTE) {
1863 $self->emit ('activate_console');
1864 } elsif ($sym == SDLK_SLASH) {
1865 $self->emit ('activate_console' => '/');
1299 } elsif (exists $DIR{$sym}) { 1866 } elsif (exists $DIR{$sym}) {
1300 if ($mod & KMOD_SHIFT) { 1867 if ($mod & KMOD_SHIFT) {
1301 $self->{shft}++; 1868 $self->{shft}++;
1302 $::CONN->send ("command fire $DIR{$sym}[0]"); 1869 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1303 } elsif ($mod & KMOD_CTRL) { 1870 } elsif ($mod & KMOD_CTRL) {
1304 $self->{ctrl}++; 1871 $self->{ctrl}++;
1305 $::CONN->send ("command run $DIR{$sym}[0]"); 1872 $::CONN->user_send ("command run $DIR{$sym}[0]");
1306 } else { 1873 } else {
1307 $::CONN->send ("command $DIR{$sym}[1]"); 1874 $::CONN->user_send ("command $DIR{$sym}[1]");
1308 } 1875 }
1309 } 1876 }
1310} 1877}
1311 1878
1312sub key_up { 1879sub key_up {
… …
1314 1881
1315 my $mod = $ev->key_mod; 1882 my $mod = $ev->key_mod;
1316 my $sym = $ev->key_sym; 1883 my $sym = $ev->key_sym;
1317 1884
1318 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1885 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1319 $::CONN->send ("command fire_stop"); 1886 $::CONN->user_send ("command fire_stop");
1320 } 1887 }
1321 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1888 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1322 $::CONN->send ("command run_stop"); 1889 $::CONN->user_send ("command run_stop");
1323 } 1890 }
1324} 1891}
1325 1892
1326############################################################################# 1893#############################################################################
1327 1894
… …
1365 glPopMatrix; 1932 glPopMatrix;
1366} 1933}
1367 1934
1368############################################################################# 1935#############################################################################
1369 1936
1370package CFClient::UI::Toplevel; 1937package CFClient::UI::Flopper;
1938
1939our @ISA = CFClient::UI::Button::;
1940
1941sub new {
1942 my $class = shift;
1943
1944 my $self = $class->SUPER::new (
1945 state => 0,
1946 connect_activate => \&toggle_flopper,
1947 @_
1948 );
1949
1950 if ($self->{state}) {
1951 $self->{state} = 0;
1952 $self->toggle_flopper;
1953 }
1954
1955 $self
1956}
1957
1958sub toggle_flopper {
1959 my ($self) = @_;
1960
1961 # TODO: use animation
1962 if ($self->{state} = !$self->{state}) {
1963 $CFClient::UI::ROOT->add ($self->{other});
1964 $self->{other}->move ($self->coord2global (0, $self->{h}));
1965 $self->emit ("open");
1966 } else {
1967 $CFClient::UI::ROOT->remove ($self->{other});
1968 $self->emit ("close");
1969 }
1970
1971 $self->emit (changed => $self->{state});
1972}
1973
1974#############################################################################
1975
1976package CFClient::UI::Root;
1371 1977
1372our @ISA = CFClient::UI::Container::; 1978our @ISA = CFClient::UI::Container::;
1979
1980use SDL::OpenGL;
1373 1981
1374sub size_request { 1982sub size_request {
1375 ($::WIDTH, $::HEIGHT) 1983 ($::WIDTH, $::HEIGHT)
1376} 1984}
1377 1985
… …
1382 1990
1383 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1991 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1384 for @{$self->{children}}; 1992 for @{$self->{children}};
1385} 1993}
1386 1994
1387sub translate { 1995sub _topleft {
1388 my ($self, $x, $y) = @_; 1996 my ($self, $x, $y) = @_;
1389 1997
1390 ($x, $y) 1998 ($x, $y)
1391} 1999}
1392 2000
… …
1403 $self->SUPER::add ($widget); 2011 $self->SUPER::add ($widget);
1404 2012
1405 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2013 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1406} 2014}
1407 2015
2016sub on_refresh {
2017 my ($self, $id, $cb) = @_;
2018
2019 $self->{refresh_hook}{$id} = $cb;
2020}
2021
1408sub draw { 2022sub draw {
1409 my ($self) = @_; 2023 my ($self) = @_;
1410 2024
2025 while (my $rcb = delete $self->{refresh_hook}) {
2026 $_->() for values %$rcb;
2027 }
2028
2029 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2030 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2031 glClear GL_COLOR_BUFFER_BIT;
2032
2033 glMatrixMode GL_PROJECTION;
2034 glLoadIdentity;
2035 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2036 glMatrixMode GL_MODELVIEW;
2037 glLoadIdentity;
2038
1411 $self->_draw; 2039 $self->_draw;
1412} 2040}
1413 2041
1414############################################################################# 2042#############################################################################
1415 2043
1416package CFClient::UI; 2044package CFClient::UI;
1417 2045
1418$TOPLEVEL = new CFClient::UI::Toplevel; 2046$ROOT = new CFClient::UI::Root;
1419 2047
14201 20481
1421 2049

Diff Legend

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