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.74 by root, Tue Apr 11 19:31:18 2006 UTC vs.
Revision 1.97 by root, Fri Apr 14 02:03:11 2006 UTC

… …
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->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->translate ($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;
… …
79use SDL::OpenGL; 79use SDL::OpenGL;
80 80
81sub new { 81sub new {
82 my $class = shift; 82 my $class = shift;
83 83
84 bless { 84 my $self = bless {
85 x => 0, 85 x => 0,
86 y => 0, 86 y => 0,
87 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
88 @_ 90 @_
89 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
90} 100}
91 101
92sub move { 102sub move {
93 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
94 $self->{x} = $x; 104 $self->{x} = $x;
… …
103sub size_request { 113sub size_request {
104 require Carp; 114 require Carp;
105 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
106} 116}
107 117
118sub _size_allocate {
119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = int $x;
122 $self->{y} = int $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
125
126 $self->{w} = int $w;
127 $self->{h} = int $h;
128
129 1
130}
131
108sub size_allocate { 132sub size_allocate {
109 my ($self, $w, $h) = @_; 133 my ($self, $x, $y, $w, $h) = @_;
110 134
111 $self->{w} = $w; 135 $self->_size_allocate ($x, $y, $w, $h);
112 $self->{h} = $h;
113} 136}
114 137
115# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
116sub translate { 139sub translate {
117 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
118 141
119 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
120} 143}
121 144
122sub focus_in { 145sub focus_in {
123 my ($self) = @_; 146 my ($self) = @_;
124 147
125 return if $FOCUS == $self; 148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
126 150
127 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
128 $focus->update if $focus; 152 $focus->update if $focus;
129 $FOCUS->update; 153 $FOCUS->update;
130} 154}
… …
163 glPushMatrix; 187 glPushMatrix;
164 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
165 $self->_draw; 189 $self->_draw;
166 glPopMatrix; 190 glPopMatrix;
167 191
168 if ($self == $HOVER) { 192 if ($self == $HOVER && $self->{can_hover}) {
169 my ($x, $y) = @$self{qw(x y)}; 193 my ($x, $y) = @$self{qw(x y)};
170 194
171 glColor 1, 1, 1, 0.1; 195 glColor 0, 0, 1, 0.2;
172 glEnable GL_BLEND; 196 glEnable GL_BLEND;
173 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
174 glBegin GL_QUADS; 198 glBegin GL_QUADS;
175 glVertex $x , $y; 199 glVertex $x , $y;
176 glVertex $x + $self->{w}, $y; 200 glVertex $x + $self->{w}, $y;
… …
185 my ($self) = @_; 209 my ($self) = @_;
186 210
187 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
188} 212}
189 213
190sub bbox {
191 my ($self) = @_;
192 my ($w, $h) = $self->size_request;
193 (
194 $self->{x},
195 $self->{y},
196 $self->{x} = $w,
197 $self->{y} = $h
198 )
199}
200
201sub find_widget { 214sub find_widget {
202 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
203 216
204 return $self 217 return $self
205 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 218 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
206 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
207 220
208 () 221 ()
209} 222}
210 223
211sub del_parent { $_[0]->{parent} = undef }
212
213sub set_parent { 224sub set_parent {
214 my ($self, $par) = @_; 225 my ($self, $par) = @_;
215 226
216 $self->{parent} = $par; 227 $self->{parent} = $par;
217 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
260 my $class = shift; 271 my $class = shift;
261 272
262 # range [value, low, high, page] 273 # range [value, low, high, page]
263 274
264 $class->SUPER::new ( 275 $class->SUPER::new (
265 bg => [0, 0, 0, 0.4], 276 bg => [0, 0, 0, 0.2],
266 active_bg => [1, 1, 1], 277 active_bg => [1, 1, 1, 0.5],
267 @_ 278 @_
268 ) 279 )
269} 280}
270 281
271sub _draw { 282sub _draw {
272 my ($self) = @_; 283 my ($self) = @_;
273 284
274 my ($w, $h) = @$self{qw(w h)}; 285 my ($w, $h) = @$self{qw(w h)};
275 286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
276 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
277 glBegin GL_QUADS; 291 glBegin GL_QUADS;
278 glVertex 0 , 0; 292 glVertex 0 , 0;
279 glVertex 0 , $h; 293 glVertex 0 , $h;
280 glVertex $w, $h; 294 glVertex $w, $h;
281 glVertex $w, 0; 295 glVertex $w, 0;
282 glEnd; 296 glEnd;
297
298 glDisable GL_BLEND;
283} 299}
284 300
285############################################################################# 301#############################################################################
286 302
287package CFClient::UI::Empty; 303package CFClient::UI::Empty;
… …
310 326
311 $self 327 $self
312} 328}
313 329
314sub add { 330sub add {
315 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
316 332
317 $chld->{expand} = $expand;
318 $chld->set_parent ($self); 333 $chld->set_parent ($self);
319 334
320 $self->{children} = [ 335 $self->{children} = [
321 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
322 @{$self->{children}}, $chld 337 @{$self->{children}}, $chld
323 ]; 338 ];
324 339
325 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
326 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
327} 342}
328 343
329sub remove { 344sub remove {
330 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
331 346
332 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
333 348
334 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
335} 350}
336 351
337sub find_widget { 352sub find_widget {
338 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
339 354
… …
392sub size_request { 407sub size_request {
393 $_[0]{children}[0]->size_request 408 $_[0]{children}[0]->size_request
394} 409}
395 410
396sub size_allocate { 411sub size_allocate {
397 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
398 413
399 return unless $self->{w} != $w || $self->{h} != $h; 414 $self->_size_allocate ($x, $y, $w, $h) or return;
400 415
401 $self->SUPER::size_allocate ($w, $h);
402 $self->{children}[0]->size_allocate ($w, $h); 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
403} 417}
404 418
405############################################################################# 419#############################################################################
406 420
407package CFClient::UI::Window; 421package CFClient::UI::Window;
… …
432 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
433 ); 447 );
434} 448}
435 449
436sub size_allocate { 450sub size_allocate {
437 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
438 452
439 return unless $self->{w} != $w || $self->{h} != $h; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
440 454
441 $self->{w} = $w;
442 $self->{h} = $h;
443
444 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
445 456
446 $self->render_chld; 457 $self->render_chld;
447} 458}
448 459
449sub _draw { 460sub _draw {
… …
482 493
483 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
484} 495}
485 496
486sub size_allocate { 497sub size_allocate {
487 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
488 499
489 return unless $self->{w} != $w || $self->{h} != $h; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
490 501
491 $self->{w} = $w;
492 $self->{h} = $h;
493
494 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
495 $self->child->move (2, 2);
496} 503}
497 504
498sub _draw { 505sub _draw {
499 my ($self) = @_; 506 my ($self) = @_;
500 507
… …
523 530
524my @tex = 531my @tex =
525 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
526 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
527 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
528sub size_request { 548sub size_request {
529 my ($self) = @_; 549 my ($self) = @_;
530 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
531 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
532 554
533 $h += $tex[1]->{h}; 555 (
534 $h += $tex[4]->{h}; 556 $w + $self->{border} * 2,
535 $w += $tex[2]->{w}; 557 $h + $self->{border} * 2,
536 $w += $tex[3]->{w}; 558 )
537
538 ($w, $h)
539} 559}
540 560
541sub size_allocate { 561sub size_allocate {
542 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
543 563
544 return unless $self->{w} != $w || $self->{h} != $h; 564 $self->_size_allocate ($x, $y, $w, $h) or return;
545 565
546 $self->SUPER::size_allocate ($w, $h); 566 $h -= List::Util::max 0, $self->{border} * 2;
567 $w -= List::Util::max 0, $self->{border} * 2;
547 568
548 $h -= $tex[1]->{h}; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
549 $h -= $tex[4]->{h}; 570}
550 $w -= $tex[2]->{w};
551 $w -= $tex[3]->{w};
552 571
553 $h = $h < 0 ? 0 : $h; 572sub button_down {
554 $w = $w < 0 ? 0 : $w; 573 my ($self, $ev, $x, $y) = @_;
555 574
556 my $child = $self->child; 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
557 577
558 $child->size_allocate ($w, $h); 578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
559 $child->move ($tex[3]->{w}, $tex[1]->{h}); 579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
560} 618}
561 619
562sub _draw { 620sub _draw {
563 my ($self) = @_; 621 my ($self) = @_;
564 622
565 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
566 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
567 625
568 glEnable GL_BLEND; 626 glEnable GL_BLEND;
569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
570 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
572 630
573 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
574 $top->draw_quad (0, 0, $w, $top->{h}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
575 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
576 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
577 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
578
579 my $right = $tex[2];
580 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
581
582 my $bottom = $tex[4];
583 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
584 636
585 my $bg = $tex[0]; 637 my $bg = $tex[0];
586 glBindTexture GL_TEXTURE_2D, $bg->{name};
587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
588 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
589 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
590 638
639 # TODO: repeat texture not scale
591 my $rep_x = $cw / $bg->{w}; 640 my $rep_x = $cw / $bg->{w};
592 my $rep_y = $ch / $bg->{h}; 641 my $rep_y = $ch / $bg->{h};
593 642
643 glColor @{ $self->{bg} };
594 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
595 645
646 glDisable GL_TEXTURE_2D;
596 glDisable GL_BLEND; 647 glDisable GL_BLEND;
597 glDisable GL_TEXTURE_2D;
598 648
599 $self->child->draw; 649 $self->child->draw;
600
601} 650}
602 651
603############################################################################# 652#############################################################################
604 653
605package CFClient::UI::Table; 654package CFClient::UI::Table;
606 655
607our @ISA = CFClient::UI::Base::; 656our @ISA = CFClient::UI::Base::;
608 657
658use List::Util qw(max sum);
659
609use SDL::OpenGL; 660use SDL::OpenGL;
661
662sub new {
663 my $class = shift;
664
665 $class->SUPER::new (
666 col_expand => [],
667 @_
668 )
669}
610 670
611sub add { 671sub add {
612 my ($self, $x, $y, $chld) = @_; 672 my ($self, $x, $y, $chld) = @_;
613 my $old_chld = $self->{children}[$y][$x];
614 673
615 $self->{children}[$y][$x] = $chld; 674 $self->{children}[$y][$x] = $chld;
616 $chld->set_parent ($self); 675 $chld->set_parent ($self);
676
677 $self->{w} = $self->{h} = -1;
617 $self->update; 678 $self->update;
618} 679}
619 680
620sub max_row_height { 681sub get_wh {
621 my ($self, $row) = @_; 682 my ($self) = @_;
622 683
623 my $hs = 0; 684 my (@w, @h);
624 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 685
686 for my $y (0 .. $#{$self->{children}}) {
625 my $c = $self->{children}->[$row]->[$xi]; 687 my $row = $self->{children}[$y]
626 if ($c) { 688 or next;
689
690 for my $x (0 .. $#$row) {
691 my $widget = $row->[$x]
692 or next;
627 my ($w, $h) = $c->size_request; 693 my ($w, $h) = $widget->size_request;
628 if ($hs < $h) { $hs = $h } 694
695 $w[$x] = max $w[$x], $w;
696 $h[$y] = max $h[$y], $h;
629 } 697 }
630 } 698 }
631 return $hs;
632}
633 699
634sub max_col_width { 700 (\@w, \@h)
701}
702
703sub size_request {
635 my ($self, $col) = @_; 704 my ($self) = @_;
636 705
706 my ($ws, $hs) = $self->get_wh;
707
708 (
709 (sum @$ws),
710 (sum @$hs),
711 )
712}
713
714sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718
719 my ($ws, $hs) = $self->get_wh;
720
721 my $req_w = sum @$ws;
722 my $req_h = sum @$hs;
723
724 # TODO: nicer code && do row_expand
725 my @col_expand = @{$self->{col_expand}};
726 @col_expand = (1) x @$ws unless @col_expand;
727 my $col_expand = (sum @col_expand) || 1;
728
729 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
732
733 my $y;
734
735 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r]
737 or next;
738
637 my $ws = 0; 739 my $x = 0;
638 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 740 my $row_h = $hs->[$r];
639 my $c = ($self->{children}->[$yi] || [])->[$col]; 741
640 if ($c) { 742 for my $c (0 .. $#$row) {
641 my ($w, $h) = $c->size_request; 743 my $col_w = $ws->[$c];
642 if ($ws < $w) { $ws = $w } 744
745 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h);
747 }
748
749 $x += $col_w;
643 } 750 }
751
752 $y += $row_h;
644 } 753 }
645 return $ws; 754
646} 755}
756
757sub find_widget {
758 my ($self, $x, $y) = @_;
759
760 $x -= $self->{x};
761 $y -= $self->{y};
762
763 my $res;
764
765 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
766 $res = $_->find_widget ($x, $y)
767 and return $res;
768 }
769
770 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
771}
772
773sub _draw {
774 my ($self) = @_;
775
776 for (grep $_, @{$self->{children}}) {
777 $_->draw for grep $_, @$_;
778 }
779}
780
781#############################################################################
782
783package CFClient::UI::HBox;
784
785# TODO: wrap into common Box base class
786
787our @ISA = CFClient::UI::Container::;
647 788
648sub size_request { 789sub size_request {
649 my ($self) = @_; 790 my ($self) = @_;
650 791
792 my @alloc = map [$_->size_request], @{$self->{children}};
793
794 (
795 (List::Util::sum map $_->[0], @alloc),
796 (List::Util::max map $_->[1], @alloc),
797 )
798}
799
800sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804
651 my ($hs, $ws) = (0, 0); 805 ($h, $w) = ($w, $h);
652 806
653 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 807 my $children = $self->{children};
654 $hs += $self->max_row_height ($yi);
655 }
656 808
657 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 809 my @h = map +($_->size_request)[0], @$children;
658 my $wm = 0; 810
659 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 811 my $req_h = List::Util::sum @h;
660 $wm += $self->max_col_width ($xi) 812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ *= $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
661 } 826 }
662 if ($ws < $wm) { $ws = $wm }
663 } 827 }
664
665 return ($ws, $hs);
666}
667
668sub _draw {
669 my ($self) = @_;
670 828
671 my $y = 0; 829 my $y = 0;
672 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 for (0 .. $#$children) {
831 my $child = $children->[$_];
673 my $x = 0; 832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
674 834
675 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 835 $y += $h;
676
677 my $c = $self->{children}->[$yi]->[$xi];
678 if ($c) {
679 $c->move ($x, $y, 0); #TODO: Move to size_request
680 $c->draw if $c;
681 }
682
683 $x += $self->max_col_width ($xi);
684 }
685
686 $y += $self->max_row_height ($yi);
687 } 836 }
688} 837}
689 838
690############################################################################# 839#############################################################################
691 840
692package CFClient::UI::VBox; 841package CFClient::UI::VBox;
693 842
843# TODO: wrap into common Box base class
844
694our @ISA = CFClient::UI::Container::; 845our @ISA = CFClient::UI::Container::;
695
696use SDL::OpenGL;
697 846
698sub size_request { 847sub size_request {
699 my ($self) = @_; 848 my ($self) = @_;
700 849
701 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
705 (List::Util::sum map $_->[1], @alloc), 854 (List::Util::sum map $_->[1], @alloc),
706 ) 855 )
707} 856}
708 857
709sub size_allocate { 858sub size_allocate {
710 my ($self, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
711 860
712 return unless $self->{w} != $w || $self->{h} != $h; 861 $self->_size_allocate ($x, $y, $w, $h);
713
714 $self->{w} = $w;
715 $self->{h} = $h;
716
717 return unless $self->{h};
718 862
719 my $children = $self->{children}; 863 my $children = $self->{children};
720 864
721 my @h = map +($_->size_request)[1], @$children; 865 my @h = map +($_->size_request)[1], @$children;
722 866
723 my $req_h = List::Util::sum @h; 867 my $req_h = List::Util::sum @h;
724 868
725 if ($req_h > $h) { 869 if ($req_h > $h) {
726 # ah well, not enough space 870 # ah well, not enough space
727 $_ = $h[$_] * $h / $req_h for @h; 871 $_ *= $h / $req_h for @h;
728 } else { 872 } else {
729 my @exp = grep $_->{expand}, @$children; 873 my $exp = List::Util::sum map $_->{expand}, @$children;
730 @exp = @$children unless @exp; 874 $exp ||= 1;
731 875
732 my %exp = map +($_ => 1), @exp;
733
734 for (0 .. $#$children) { 876 for (0 .. $#$children) {
735 my $child = $children->[$_]; 877 my $child = $children->[$_];
736 878
737 my $alloc_h = $h[$_]; 879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
738 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
739 $h[$_] = $alloc_h;
740 } 880 }
741 } 881 }
742 882
743 my $y = 0; 883 my $y = 0;
744 for (0 .. $#$children) { 884 for (0 .. $#$children) {
745 my $child = $children->[$_]; 885 my $child = $children->[$_];
746 my $h = $h[$_]; 886 my $h = $h[$_];
747 $child->move (0, $y);
748 $child->size_allocate ($w, $h); 887 $child->size_allocate (0, $y, $w, $h);
749 888
750 $y += $h; 889 $y += $h;
751 } 890 }
752} 891}
753 892
… …
761 900
762sub new { 901sub new {
763 my ($class, %arg) = @_; 902 my ($class, %arg) = @_;
764 903
765 my $self = $class->SUPER::new ( 904 my $self = $class->SUPER::new (
766 fg => [1, 1, 1], 905 fg => [1, 1, 1],
767 height => $::FONTSIZE, 906 height => $::FONTSIZE,
768 text => "", 907 text => "",
769 align => -1, 908 align => -1,
909 padding => 2,
770 layout => new CFClient::Layout, 910 layout => new CFClient::Layout,
771 %arg 911 %arg
772 ); 912 );
773 913
774 $self->set_text ($self->{text}); 914 $self->set_text ($self->{text});
775 915
… …
791 931
792 $self->{text} = $text; 932 $self->{text} = $text;
793 $self->{layout}->set_markup ($text); 933 $self->{layout}->set_markup ($text);
794 934
795 delete $self->{texture}; 935 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
796 $self->update; 937 $self->update;
797} 938}
798 939
799sub get_text { 940sub get_text {
800 my ($self, $text) = @_; 941 my ($self, $text) = @_;
… …
805sub size_request { 946sub size_request {
806 my ($self) = @_; 947 my ($self) = @_;
807 948
808 $self->{layout}->set_width; 949 $self->{layout}->set_width;
809 $self->{layout}->set_height ($self->{height}); 950 $self->{layout}->set_height ($self->{height});
810 $self->{layout}->size 951 my ($w, $h) = $self->{layout}->size;
811# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 952
812# ( 953 (
813# $self->{texture}{w}, 954 $w + $self->{padding} * 2,
814# $self->{texture}{h}, 955 $h + $self->{padding} * 2,
815# ) 956 )
816# } else {
817# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
818#
819# ($w, $h)
820# }
821} 957}
822 958
823sub size_allocate { 959sub size_allocate {
824 my ($self, $w, $h) = @_; 960 my ($self, $x, $y, $w, $h) = @_;
825 961
826 return unless $self->{w} != $w || $self->{h} != $h; 962 $self->_size_allocate ($x, $y, $w, $h) or return;
827 963
828 $self->SUPER::size_allocate ($w, $h);
829 delete $self->{texture}; 964 delete $self->{texture};
830} 965}
831 966
832sub update { 967sub update {
833 my ($self) = @_; 968 my ($self) = @_;
… …
839sub _draw { 974sub _draw {
840 my ($self) = @_; 975 my ($self) = @_;
841 976
842 my $tex = $self->{texture} ||= do { 977 my $tex = $self->{texture} ||= do {
843 $self->{layout}->set_width ($self->{w}); 978 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
844 new_from_layout CFClient::Texture $self->{layout} 980 new_from_layout CFClient::Texture $self->{layout}
845 }; 981 };
846 982
847 glEnable GL_BLEND; 983 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
850 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
851 987
852 glColor @{$self->{fg}}; 988 glColor @{$self->{fg}};
853 989
854 my $x = 990 my $x =
855 $self->{align} < 0 ? 0 991 $self->{align} < 0 ? $self->{padding}
856 : $self->{align} > 0 ? $self->{w} - $tex->{w} 992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
857 : ($self->{w} - $tex->{w}) * 0.5; 993 : ($self->{w} - $tex->{w}) * 0.5;
858 994
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
859 $tex->draw_quad ($x, 0); 996 $tex->draw_quad (0, 0);
860 997
861 glDisable GL_TEXTURE_2D; 998 glDisable GL_TEXTURE_2D;
862 glDisable GL_BLEND; 999 glDisable GL_BLEND;
863 glGetError and die;
864} 1000}
865 1001
866############################################################################# 1002#############################################################################
867 1003
868package CFClient::UI::Entry; 1004package CFClient::UI::Entry;
… …
875sub new { 1011sub new {
876 my $class = shift; 1012 my $class = shift;
877 1013
878 $class->SUPER::new ( 1014 $class->SUPER::new (
879 fg => [1, 1, 1], 1015 fg => [1, 1, 1],
880 bg => [0, 0, 0, 0.4], 1016 bg => [0, 0, 0, 0.2],
881 active_bg => [1, 1, 1], 1017 active_bg => [1, 1, 1, 0.5],
882 active_fg => [0, 0, 0], 1018 active_fg => [0, 0, 0],
1019 can_hover => 1,
1020 can_focus => 1,
883 @_ 1021 @_
884 ) 1022 )
885} 1023}
886 1024
887sub _set_text { 1025sub _set_text {
… …
889 1027
890 $self->{last_activity} = $::NOW; 1028 $self->{last_activity} = $::NOW;
891 1029
892 $self->{text} = $text; 1030 $self->{text} = $text;
893 $self->{layout}->set_width ($self->{w}); 1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
894 1033
895 $text =~ s/./*/g if $self->{hidden}; 1034 $text =~ s/./*/g if $self->{hidden};
896 1035
897
898 $self->{layout}->set_markup ($self->escape_text ($text)); 1036 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
899 1037
900 $text = substr $text, 0, $self->{cursor}; 1038 $text = substr $text, 0, $self->{cursor};
901 utf8::encode $text; 1039 utf8::encode $text;
902 1040
903 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
… …
910 1048
911 ($w + 1, $h) # add 1 for cursor 1049 ($w + 1, $h) # add 1 for cursor
912} 1050}
913 1051
914sub size_allocate { 1052sub size_allocate {
915 my ($self, $w, $h) = @_; 1053 my ($self, $x, $y, $w, $h) = @_;
916 1054
917 return unless $self->{w} != $w || $self->{h} != $h;
918
919 $self->SUPER::size_allocate ($w, $h); 1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
920 1056
921 $self->_set_text ($self->{text}); 1057 $self->_set_text ($self->{text});
922} 1058}
923 1059
924sub set_text { 1060sub set_text {
… …
945 substr $text, $self->{cursor}, 1, ""; 1081 substr $text, $self->{cursor}, 1, "";
946 } elsif ($sym == SDLK_LEFT) { 1082 } elsif ($sym == SDLK_LEFT) {
947 --$self->{cursor} if $self->{cursor}; 1083 --$self->{cursor} if $self->{cursor};
948 } elsif ($sym == SDLK_RIGHT) { 1084 } elsif ($sym == SDLK_RIGHT) {
949 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1085 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text;
950 } elsif ($uni) { 1090 } elsif ($uni) {
951 substr $text, $self->{cursor}++, 0, chr $uni; 1091 substr $text, $self->{cursor}++, 0, chr $uni;
952 } 1092 }
953 1093
954 $self->_set_text ($text); 1094 $self->_set_text ($text);
… …
969 $self->SUPER::button_down ($ev, $x, $y); 1109 $self->SUPER::button_down ($ev, $x, $y);
970 1110
971 my $idx = $self->{layout}->xy_to_index ($x, $y); 1111 my $idx = $self->{layout}->xy_to_index ($x, $y);
972 1112
973 # byte-index to char-index 1113 # byte-index to char-index
974 my $text = $self->{layout}; 1114 my $text = $self->{text};
975 utf8::encode $text; 1115 utf8::encode $text;
976 $self->{cursor} = length substr $text, 0, $idx; 1116 $self->{cursor} = length substr $text, 0, $idx;
977 1117
978 $self->_set_text ($self->{text}); 1118 $self->_set_text ($self->{text});
979 $self->update; 1119 $self->update;
… …
994 $self->{fg} = $self->{active_fg}; 1134 $self->{fg} = $self->{active_fg};
995 } else { 1135 } else {
996 glColor @{$self->{bg}}; 1136 glColor @{$self->{bg}};
997 } 1137 }
998 1138
1139 glEnable GL_BLEND;
1140 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
999 glBegin GL_QUADS; 1141 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1142 glVertex 0 , 0;
1001 glVertex 0 , $self->{h}; 1143 glVertex 0 , $self->{h};
1002 glVertex $self->{w}, $self->{h}; 1144 glVertex $self->{w}, $self->{h};
1003 glVertex $self->{w}, 0; 1145 glVertex $self->{w}, 0;
1004 glEnd; 1146 glEnd;
1147 glDisable GL_BLEND;
1005 1148
1006 $self->SUPER::_draw; 1149 $self->SUPER::_draw;
1007 1150
1008 #TODO: force update every cursor change :( 1151 #TODO: force update every cursor change :(
1009 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
1015 } 1158 }
1016} 1159}
1017 1160
1018############################################################################# 1161#############################################################################
1019 1162
1020package CFClient::UI::Slider; 1163package CFClient::UI::Button;
1021 1164
1022use strict; 1165our @ISA = CFClient::UI::Label::;
1023 1166
1167use SDL;
1024use SDL::OpenGL; 1168use SDL::OpenGL;
1025 1169
1026our @ISA = CFClient::UI::DrawBG::; 1170my @tex =
1027 1171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1028sub size_request { 1172 qw(b1_button_active.png);
1029 my ($self) = @_;
1030
1031 my $w = 50;
1032 my $h = 10;
1033
1034 $self->{vertical} ? ($h, $w) : ($w, $h)
1035}
1036 1173
1037sub new { 1174sub new {
1038 my $class = shift; 1175 my $class = shift;
1039 1176
1177 $class->SUPER::new (
1178 padding => 4,
1179 fg => [1, 1, 1],
1180 bg => [1, 1, 1, 0.2],
1181 active_fg => [1, 1, 0],
1182 can_hover => 1,
1183 @_
1184 )
1185}
1186
1187sub button_up {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($x >= 0 && $x < $self->{w}
1191 && $y >= 0 && $y < $self->{h}) {
1192 $self->emit ("activate");
1193 }
1194}
1195
1196sub _draw {
1197 my ($self) = @_;
1198
1199 local $self->{fg} = $self->{fg};
1200 my $tex = $tex[0];
1201
1202 glEnable GL_BLEND;
1203 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205
1206 if ($GRAB == $self) {
1207 $self->{fg} = $self->{active_fg};
1208 }
1209
1210 glBindTexture GL_TEXTURE_2D, $tex->{name};
1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1212
1213 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1214
1215 glDisable GL_TEXTURE_2D;
1216 glDisable GL_BLEND;
1217
1218 $self->SUPER::_draw;
1219}
1220
1221#############################################################################
1222
1223package CFClient::UI::CheckBox;
1224
1225our @ISA = CFClient::UI::DrawBG::;
1226
1227use SDL;
1228use SDL::OpenGL;
1229
1230sub new {
1231 my $class = shift;
1232
1233 $class->SUPER::new (
1234 padding => 2,
1235 fg => [1, 1, 1],
1236 active_fg => [1, 1, 0],
1237 state => 0,
1238 can_hover => 1,
1239 @_
1240 )
1241}
1242
1243sub size_request {
1244 my ($self) = @_;
1245
1246 ($self->{padding} * 2 + 6) x 2
1247}
1248
1249sub size_allocate {
1250 my ($self, $x, $y, $w, $h) = @_;
1251
1252 $self->_size_allocate ($x, $y, $w, $h);
1253}
1254
1255sub button_down {
1256 my ($self, $ev, $x, $y) = @_;
1257
1258 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1259 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1260 $self->{state} = !$self->{state};
1261 $self->emit (changed => $self->{state});
1262 }
1263}
1264
1265sub _draw {
1266 my ($self) = @_;
1267
1268 $self->SUPER::_draw;
1269
1270 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271
1272 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1273
1274 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1275
1276 glBegin GL_LINE_LOOP;
1277 glVertex 0 , 0;
1278 glVertex 0 , $s;
1279 glVertex $s, $s;
1280 glVertex $s, 0;
1281 glEnd;
1282
1283 if ($self->{state}) {
1284 glBegin GL_LINES;
1285 glVertex 0 , 0;
1286 glVertex $s, $s;
1287 glVertex $s, 0;
1288 glVertex 0 , $s;
1289 glEnd;
1290 }
1291}
1292
1293#############################################################################
1294
1295package CFClient::UI::Slider;
1296
1297use strict;
1298
1299use SDL::OpenGL;
1300
1301our @ISA = CFClient::UI::DrawBG::;
1302
1303sub new {
1304 my $class = shift;
1305
1040 # range [value, low, high, page] 1306 # range [value, low, high, page]
1041 1307
1308 # TODO: 0-width page
1309 # TODO: req_w/h are wrong with vertical
1310 # TODO: calculations are off
1042 $class->SUPER::new ( 1311 my $self = $class->SUPER::new (
1043 fg => [1, 1, 1], 1312 fg => [1, 1, 1],
1044 active_fg => [0, 0, 0], 1313 active_fg => [0, 0, 0],
1045 range => [0, 0, 100, 10], 1314 range => [0, 0, 100, 10],
1315 req_w => 40,
1316 req_h => 13,
1046 vertical => 1, 1317 vertical => 0,
1318 can_hover => 1,
1047 @_ 1319 @_
1048 ) 1320 );
1321
1322 $self
1323}
1324
1325sub size_request {
1326 my ($self) = @_;
1327
1328 my $w = $self->{req_w};
1329 my $h = $self->{req_h};
1330
1331 $self->{vertical} ? ($h, $w) : ($w, $h)
1049} 1332}
1050 1333
1051sub button_down { 1334sub button_down {
1052 my ($self, $ev, $x, $y) = @_; 1335 my ($self, $ev, $x, $y) = @_;
1053 1336
… …
1098 $value = int +($value - $lo) * $w / ($hi - $lo); 1381 $value = int +($value - $lo) * $w / ($hi - $lo);
1099 1382
1100 $w -= $page; 1383 $w -= $page;
1101 $page &= ~1; 1384 $page &= ~1;
1102 glTranslate $page * 0.5, 0, 0; 1385 glTranslate $page * 0.5, 0, 0;
1386 $page ||= 2;
1103 1387
1104 glColor @$fg; 1388 glColor @$fg;
1105 glBegin GL_LINES; 1389 glBegin GL_LINES;
1106 glVertex 0, 0; glVertex 0, $h; 1390 glVertex 0, 0; glVertex 0, $h;
1107 glVertex $w - 1, 0; glVertex $w - 1, $h; 1391 glVertex $w - 1, 0; glVertex $w - 1, $h;
… …
1128 glEnd; 1412 glEnd;
1129} 1413}
1130 1414
1131############################################################################# 1415#############################################################################
1132 1416
1417package CFClient::UI::TextView;
1418
1419our @ISA = CFClient::UI::HBox::;
1420
1421use SDL::OpenGL;
1422
1423sub new {
1424 my $class = shift;
1425
1426 my $self = $class->SUPER::new (
1427 par => [],
1428 @_,
1429 children => [
1430 (new CFClient::UI::Empty expand => 1),
1431 (new CFClient::UI::Slider vertical => 1),
1432 ],
1433 );
1434
1435 $self
1436}
1437
1438sub add_paragraph {
1439 my ($self, $color, $text) = @_;
1440
1441 push @{$self->{par}}, [$color, $text];
1442 my $count = scalar @{$self->{par}};
1443 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1444 $self->{children}[1]->update;
1445}
1446
1447sub _draw {
1448 my ($self) = @_;
1449
1450 my $par = $self->{par};
1451
1452 my $bottom = (scalar @$par) - 1;
1453
1454 my $w = $self->{children}[0]{w};
1455 my $y = $self->{h};
1456
1457 glEnable GL_BLEND;
1458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459 glEnable GL_TEXTURE_2D;
1460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1461
1462 # TODO: everything!
1463 while ($y > 0 && $bottom >= 0) {
1464 my $par = $par->[$bottom--];
1465
1466 my $layout = new CFClient::Layout;
1467
1468 $layout->set_height ($::FONTSIZE);
1469 $layout->set_width ($w);
1470 $layout->set_text ($par->[1]);
1471 my $tex = new_from_layout CFClient::Texture $layout;
1472 $y -= $tex->{h};
1473
1474 glColor @{ $par->[0] };
1475 $tex->draw_quad (0, $y);
1476 }
1477
1478 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480}
1481
1482#############################################################################
1483
1133package CFClient::UI::MapWidget; 1484package CFClient::UI::MapWidget;
1134 1485
1135use strict; 1486use strict;
1136 1487
1137use List::Util qw(min max); 1488use List::Util qw(min max);
… …
1143 1494
1144sub new { 1495sub new {
1145 my $class = shift; 1496 my $class = shift;
1146 1497
1147 $class->SUPER::new ( 1498 $class->SUPER::new (
1148 z => -1, 1499 z => -1,
1500 can_focus => 1,
1149 list => (glGenLists 1), 1501 list => (glGenLists 1),
1150 @_ 1502 @_
1151 ) 1503 )
1152} 1504}
1153 1505
1154sub key_down { 1506sub key_down {
… …
1158sub key_up { 1510sub key_up {
1159} 1511}
1160 1512
1161sub size_request { 1513sub size_request {
1162 ( 1514 (
1163 1 + int $::WIDTH / 32, 1515 1 + 32 * int $::WIDTH / 32,
1164 1 + int $::HEIGHT / 32, 1516 1 + 32 * int $::HEIGHT / 32,
1165 ) 1517 )
1166} 1518}
1167 1519
1168sub update { 1520sub update {
1169 my ($self) = @_; 1521 my ($self) = @_;
1170 1522
1171 $self->{need_update} = 1; 1523 $self->{need_update} = 1;
1172 $self->SUPER::update; 1524 $self->SUPER::update;
1173} 1525}
1174 1526
1175sub _draw { 1527sub draw {
1176 my ($self) = @_; 1528 my ($self) = @_;
1177 1529
1530 $self->{need_update}++;#d#
1178 if (delete $self->{need_update}) { 1531 if (delete $self->{need_update}) {
1179 glNewList $self->{list}, GL_COMPILE; 1532 glNewList $self->{list}, GL_COMPILE;
1180 1533
1181 my $mx = $::CONN->{mapx};
1182 my $my = $::CONN->{mapy};
1183
1184 my $map = $::CONN->{map};
1185
1186 my ($xofs, $yofs);
1187
1188 my $sw = 1 + int $::WIDTH / 32; 1534 my $sw = int $::WIDTH / 32;
1189 my $sh = 1 + int $::HEIGHT / 32; 1535 my $sh = int $::HEIGHT / 32;
1190 1536
1191 if ($::CONN->{mapw} > $sw) { 1537 if ($::MAP) {
1192 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1538 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1193 } else {
1194 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1195 }
1196 1539
1197 if ($::CONN->{maph} > $sh) { 1540 if ($::CFG->{fow_enable}) {
1198 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1541 if ($::CFG->{fow_smooth}) { # smooth fog of war
1199 } else { 1542 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1200 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1543 glConvolutionFilter2D
1201 } 1544 GL_CONVOLUTION_2D,
1202 1545 GL_ALPHA,
1203 glEnable GL_TEXTURE_2D; 1546 3, 3,
1204 glEnable GL_BLEND; 1547 GL_ALPHA, GL_FLOAT,
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1548 pack "f*",
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1549 0.1, 0.1, 0.1,
1207 1550 0.1, 0.2, 0.1,
1208 my $sw4 = ($sw + 3) & ~3; 1551 0.1, 0.1, 0.1,
1209 my $darkness = "\x00" x ($sw4 * $sh);
1210
1211 for my $x (0 .. $sw - 1) {
1212 my $row = $map->[$x + $xofs];
1213 for my $y (0 .. $sh - 1) {
1214
1215 my $cell = $row->[$y + $yofs]
1216 or next; 1552 ;
1217 1553 glEnable GL_CONVOLUTION_2D;
1218 my $dark = $cell->[0];
1219 if ($dark < 0) {
1220 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1221 } else {
1222 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1223 } 1554 }
1224 1555
1225 for my $num (grep $_, @$cell[1,2,3]) { 1556 my $tex = new CFClient::Texture
1226 my $tex = $::CONN->{face}[$num]{texture} || next; 1557 w => $w,
1227 1558 h => $h,
1228 my ($w, $h) = @$tex{qw(w h)}; 1559 data => $data,
1560 internalformat => GL_ALPHA,
1561 format => GL_ALPHA;
1229 1562
1230 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1563 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1231 } 1564
1565 glEnable GL_BLEND;
1566 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1568
1569 glColor +($::CFG->{fow_intensity}) x 3, 1;
1570 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1571
1572 glDisable GL_TEXTURE_2D;
1573 glDisable GL_BLEND;
1232 } 1574 }
1233 } 1575 }
1234 1576
1235# if (1) { # higher quality darkness
1236# $lighting =~ s/(.)/$1$1$1/gs;
1237# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1238#
1239# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1240#
1241# $lighting = $pb->get_pixels;
1242# $lighting =~ s/(.)../$1/gs;
1243# }
1244
1245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1246
1247 $darkness = new CFClient::Texture
1248 w => $sw4,
1249 h => $sh,
1250 data => $darkness,
1251 internalformat => GL_ALPHA,
1252 format => GL_ALPHA;
1253
1254 glColor 0.45, 0.45, 0.45, 1;
1255 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1256
1257 glDisable GL_TEXTURE_2D;
1258 glDisable GL_BLEND;
1259
1260 glEndList; 1577 glEndList;
1261 } 1578 }
1262 1579
1263 glCallList $self->{list}; 1580 glCallList $self->{list};
1581
1582 if ($FOCUS != $self) {
1583 glColor 64/255, 64/255, 64/255;
1584 glLogicOp GL_AND;
1585 glEnable GL_COLOR_LOGIC_OP;
1586 glBegin GL_QUADS;
1587 glVertex 0, 0;
1588 glVertex 0, $::HEIGHT;
1589 glVertex $::WIDTH, $::HEIGHT;
1590 glVertex $::WIDTH, 0;
1591 glEnd;
1592 glDisable GL_COLOR_LOGIC_OP;
1593 }
1264} 1594}
1265 1595
1266my %DIR = ( 1596my %DIR = (
1267 SDLK_KP8, [1, "north"], 1597 SDLK_KP8, [1, "north"],
1268 SDLK_KP9, [2, "northeast"], 1598 SDLK_KP9, [2, "northeast"],
… …
1284 1614
1285 my $mod = $ev->key_mod; 1615 my $mod = $ev->key_mod;
1286 my $sym = $ev->key_sym; 1616 my $sym = $ev->key_sym;
1287 1617
1288 if ($sym == SDLK_KP5) { 1618 if ($sym == SDLK_KP5) {
1289 $::CONN->send ("command stay fire"); 1619 $::CONN->user_send ("command stay fire");
1620 } elsif ($sym == SDLK_a) {
1621 $::CONN->user_send ("command apply");
1290 } elsif (exists $DIR{$sym}) { 1622 } elsif (exists $DIR{$sym}) {
1291 if ($mod & KMOD_SHIFT) { 1623 if ($mod & KMOD_SHIFT) {
1292 $self->{shft}++; 1624 $self->{shft}++;
1293 $::CONN->send ("command fire $DIR{$sym}[0]"); 1625 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1294 } elsif ($mod & KMOD_CTRL) { 1626 } elsif ($mod & KMOD_CTRL) {
1295 $self->{ctrl}++; 1627 $self->{ctrl}++;
1296 $::CONN->send ("command run $DIR{$sym}[0]"); 1628 $::CONN->user_send ("command run $DIR{$sym}[0]");
1297 } else { 1629 } else {
1298 $::CONN->send ("command $DIR{$sym}[1]"); 1630 $::CONN->user_send ("command $DIR{$sym}[1]");
1299 } 1631 }
1300 } 1632 }
1301} 1633}
1302 1634
1303sub key_up { 1635sub key_up {
… …
1305 1637
1306 my $mod = $ev->key_mod; 1638 my $mod = $ev->key_mod;
1307 my $sym = $ev->key_sym; 1639 my $sym = $ev->key_sym;
1308 1640
1309 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1641 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1310 $::CONN->send ("command fire_stop"); 1642 $::CONN->user_send ("command fire_stop");
1311 } 1643 }
1312 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1644 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1313 $::CONN->send ("command run_stop"); 1645 $::CONN->user_send ("command run_stop");
1314 } 1646 }
1315} 1647}
1316 1648
1317############################################################################# 1649#############################################################################
1318 1650
… …
1356 glPopMatrix; 1688 glPopMatrix;
1357} 1689}
1358 1690
1359############################################################################# 1691#############################################################################
1360 1692
1693package CFClient::UI::Flopper;
1694
1695our @ISA = CFClient::UI::Button::;
1696
1697sub new {
1698 my $class = shift;
1699
1700 my $self = $class->SUPER::new (
1701 state => 0,
1702 connect_activate => \&toggle_flopper,
1703 @_
1704 );
1705
1706 if ($self->{state}) {
1707 $self->{state} = 0;
1708 $self->toggle_flopper;
1709 }
1710
1711 $self
1712}
1713
1714sub toggle_flopper {
1715 my ($self) = @_;
1716
1717 # TODO: use animation
1718 if ($self->{state} = !$self->{state}) {
1719 $CFClient::UI::TOPLEVEL->add ($self->{other});
1720 $self->{other}->move (
1721 ($::WIDTH - $self->{other}{w}) * 0.5,
1722 ($::HEIGHT - $self->{other}{h}) * 0.5,
1723 );
1724 } else {
1725 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1726 }
1727}
1728
1729#############################################################################
1730
1361package CFClient::UI::Toplevel; 1731package CFClient::UI::Toplevel;
1362 1732
1363our @ISA = CFClient::UI::Container::; 1733our @ISA = CFClient::UI::Container::;
1364 1734
1365sub size_request { 1735sub size_request {
1366 ($::WIDTH, $::HEIGHT) 1736 ($::WIDTH, $::HEIGHT)
1367} 1737}
1368 1738
1369sub size_allocate { 1739sub size_allocate {
1370 my ($self, $w, $h) = @_; 1740 my ($self, $x, $y, $w, $h) = @_;
1371 1741
1372 $self->SUPER::size_allocate ($w, $h); 1742 $self->_size_allocate ($x, $y, $w, $h);
1373 1743
1374 $_->size_allocate ($_->size_request) 1744 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1375 for @{$self->{children}}; 1745 for @{$self->{children}};
1376} 1746}
1377 1747
1378sub translate { 1748sub translate {
1379 my ($self, $x, $y) = @_; 1749 my ($self, $x, $y) = @_;
… …
1382} 1752}
1383 1753
1384sub update { 1754sub update {
1385 my ($self) = @_; 1755 my ($self) = @_;
1386 1756
1387 $self->size_allocate ($self->size_request); 1757 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1388 ::refresh (); 1758 ::refresh ();
1389} 1759}
1390 1760
1391sub add { 1761sub add {
1392 my ($self, $widget) = @_; 1762 my ($self, $widget) = @_;
1393 1763
1394 $self->SUPER::add ($widget); 1764 $self->SUPER::add ($widget);
1395 1765
1396 $widget->size_allocate ($widget->size_request); 1766 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1397} 1767}
1398 1768
1399sub draw { 1769sub draw {
1400 my ($self) = @_; 1770 my ($self) = @_;
1401 1771

Diff Legend

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