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.78 by root, Tue Apr 11 22:49:13 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;
… …
83 83
84 bless { 84 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
90} 92}
91 93
92sub move { 94sub move {
… …
103sub size_request { 105sub size_request {
104 require Carp; 106 require Carp;
105 Carp::confess "size_request is abtract"; 107 Carp::confess "size_request is abtract";
106} 108}
107 109
108sub size_allocate { 110sub _size_allocate {
109 my ($self, $w, $h) = @_; 111 my ($self, $x, $y, $w, $h) = @_;
112
113 $self->{x} = $x;
114 $self->{y} = $y;
115
116 return unless $self->{w} != $w || $self->{h} != $h;
110 117
111 $self->{w} = $w; 118 $self->{w} = $w;
112 $self->{h} = $h; 119 $self->{h} = $h;
120
121 1
122}
123
124sub size_allocate {
125 my ($self, $x, $y, $w, $h) = @_;
126
127 $self->_size_allocate ($x, $y, $w, $h);
113} 128}
114 129
115# translate global koordinates to local coordinate system 130# translate global koordinates to local coordinate system
116sub translate { 131sub translate {
117 my ($self, $x, $y) = @_; 132 my ($self, $x, $y) = @_;
… …
166 glPopMatrix; 181 glPopMatrix;
167 182
168 if ($self == $HOVER) { 183 if ($self == $HOVER) {
169 my ($x, $y) = @$self{qw(x y)}; 184 my ($x, $y) = @$self{qw(x y)};
170 185
171 glColor 1, 1, 1, 0.1; 186 glColor 0, 0, 1, 0.2;
172 glEnable GL_BLEND; 187 glEnable GL_BLEND;
173 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
174 glBegin GL_QUADS; 189 glBegin GL_QUADS;
175 glVertex $x , $y; 190 glVertex $x , $y;
176 glVertex $x + $self->{w}, $y; 191 glVertex $x + $self->{w}, $y;
… …
185 my ($self) = @_; 200 my ($self) = @_;
186 201
187 warn "no draw defined for $self\n"; 202 warn "no draw defined for $self\n";
188} 203}
189 204
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 { 205sub find_widget {
202 my ($self, $x, $y) = @_; 206 my ($self, $x, $y) = @_;
203 207
204 return $self 208 return $self
205 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 209 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
206 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 210 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
207 211
208 () 212 ()
209} 213}
210 214
211sub del_parent { $_[0]->{parent} = undef }
212
213sub set_parent { 215sub set_parent {
214 my ($self, $par) = @_; 216 my ($self, $par) = @_;
215 217
216 $self->{parent} = $par; 218 $self->{parent} = $par;
217 Scalar::Util::weaken $self->{parent}; 219 Scalar::Util::weaken $self->{parent};
… …
260 my $class = shift; 262 my $class = shift;
261 263
262 # range [value, low, high, page] 264 # range [value, low, high, page]
263 265
264 $class->SUPER::new ( 266 $class->SUPER::new (
265 bg => [0, 0, 0, 0.4], 267 bg => [0, 0, 0, 0.2],
266 active_bg => [1, 1, 1], 268 active_bg => [1, 1, 1],
267 @_ 269 @_
268 ) 270 )
269} 271}
270 272
271sub _draw { 273sub _draw {
272 my ($self) = @_; 274 my ($self) = @_;
273 275
274 my ($w, $h) = @$self{qw(w h)}; 276 my ($w, $h) = @$self{qw(w h)};
275 277
278 glEnable GL_BLEND;
279 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
276 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 280 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
281
277 glBegin GL_QUADS; 282 glBegin GL_QUADS;
278 glVertex 0 , 0; 283 glVertex 0 , 0;
279 glVertex 0 , $h; 284 glVertex 0 , $h;
280 glVertex $w, $h; 285 glVertex $w, $h;
281 glVertex $w, 0; 286 glVertex $w, 0;
282 glEnd; 287 glEnd;
288
289 glDisable GL_BLEND;
283} 290}
284 291
285############################################################################# 292#############################################################################
286 293
287package CFClient::UI::Empty; 294package CFClient::UI::Empty;
… …
310 317
311 $self 318 $self
312} 319}
313 320
314sub add { 321sub add {
315 my ($self, $chld, $expand) = @_; 322 my ($self, $chld) = @_;
316 323
317 $chld->{expand} = $expand;
318 $chld->set_parent ($self); 324 $chld->set_parent ($self);
319 325
320 $self->{children} = [ 326 $self->{children} = [
321 sort { $a->{z} <=> $b->{z} } 327 sort { $a->{z} <=> $b->{z} }
322 @{$self->{children}}, $chld 328 @{$self->{children}}, $chld
323 ]; 329 ];
324 330
325 $self->size_allocate ($self->{w}, $self->{h}) 331 $self->{w} = $self->{h} = -1;
326 if $self->{w}; #TODO: check for "realised state" 332 $self->update;
327} 333}
328 334
329sub remove { 335sub remove {
330 my ($self, $widget) = @_; 336 my ($self, $widget) = @_;
331 337
332 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 338 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
333 339
334 $self->size_allocate ($self->{w}, $self->{h}); 340 $self->size_allocate (0, 0, $self->{w}, $self->{h});
335} 341}
336 342
337sub find_widget { 343sub find_widget {
338 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
339 345
… …
392sub size_request { 398sub size_request {
393 $_[0]{children}[0]->size_request 399 $_[0]{children}[0]->size_request
394} 400}
395 401
396sub size_allocate { 402sub size_allocate {
397 my ($self, $w, $h) = @_; 403 my ($self, $x, $y, $w, $h) = @_;
398 404
399 return unless $self->{w} != $w || $self->{h} != $h; 405 $self->_size_allocate ($x, $y, $w, $h) or return;
400 406
401 $self->SUPER::size_allocate ($w, $h);
402 $self->{children}[0]->size_allocate ($w, $h); 407 $self->{children}[0]->size_allocate (0, 0, $w, $h);
403} 408}
404 409
405############################################################################# 410#############################################################################
406 411
407package CFClient::UI::Window; 412package CFClient::UI::Window;
… …
432 $self->{w}, $self->{h}, sub { $self->child->draw } 437 $self->{w}, $self->{h}, sub { $self->child->draw }
433 ); 438 );
434} 439}
435 440
436sub size_allocate { 441sub size_allocate {
437 my ($self, $w, $h) = @_; 442 my ($self, $x, $y, $w, $h) = @_;
438 443
439 return unless $self->{w} != $w || $self->{h} != $h; 444 $self->_size_allocate ($x, $y, $w, $h) or return;
440 445
441 $self->{w} = $w;
442 $self->{h} = $h;
443
444 $self->child->size_allocate ($w, $h); 446 $self->child->size_allocate (0, 0, $w, $h);
445 447
446 $self->render_chld; 448 $self->render_chld;
447} 449}
448 450
449sub _draw { 451sub _draw {
… …
482 484
483 map { $_ + 4 } $chld->size_request; 485 map { $_ + 4 } $chld->size_request;
484} 486}
485 487
486sub size_allocate { 488sub size_allocate {
487 my ($self, $w, $h) = @_; 489 my ($self, $x, $y, $w, $h) = @_;
488 490
489 return unless $self->{w} != $w || $self->{h} != $h; 491 $self->_size_allocate ($x, $y, $w, $h) or return;
490 492
491 $self->{w} = $w;
492 $self->{h} = $h;
493
494 $self->child->size_allocate ($w - 4, $h - 4); 493 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
495 $self->child->move (2, 2);
496} 494}
497 495
498sub _draw { 496sub _draw {
499 my ($self) = @_; 497 my ($self) = @_;
500 498
… …
526 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 524 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
527 525
528sub size_request { 526sub size_request {
529 my ($self) = @_; 527 my ($self) = @_;
530 528
529 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
530
531 my ($w, $h) = $self->SUPER::size_request; 531 my ($w, $h) = $self->SUPER::size_request;
532 532
533 $h += $tex[1]->{h}; 533 $h += $tex[1]->{h};
534 $h += $tex[4]->{h}; 534 $h += $tex[4]->{h};
535 $w += $tex[2]->{w}; 535 $w += $tex[2]->{w};
… …
537 537
538 ($w, $h) 538 ($w, $h)
539} 539}
540 540
541sub size_allocate { 541sub size_allocate {
542 my ($self, $w, $h) = @_; 542 my ($self, $x, $y, $w, $h) = @_;
543 543
544 return unless $self->{w} != $w || $self->{h} != $h; 544 $self->_size_allocate ($x, $y, $w, $h) or return;
545 545
546 $self->SUPER::size_allocate ($w, $h);
547
548 $h -= $tex[1]->{h}; 546 $h -= $tex[1]{h};
549 $h -= $tex[4]->{h}; 547 $h -= $tex[4]{h};
550 $w -= $tex[2]->{w}; 548 $w -= $tex[2]{w};
551 $w -= $tex[3]->{w}; 549 $w -= $tex[3]{w};
552 550
553 $h = $h < 0 ? 0 : $h; 551 $h = $h < 0 ? 0 : $h;
554 $w = $w < 0 ? 0 : $w; 552 $w = $w < 0 ? 0 : $w;
555 553
556 my $child = $self->child; 554 my $child = $self->child;
557 555
558 $child->size_allocate ($w, $h);
559 $child->move ($tex[3]->{w}, $tex[1]->{h}); 556 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
557}
558
559sub button_down {
560 my ($self, $ev, $x, $y) = @_;
561
562 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
563 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
564
565 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
566 my ($bw, $bh) = ($self->{w}, $self->{h});
567
568 $self->{motion} = sub {
569 my ($ev, $x, $y) = @_;
570
571 ($x, $y) = ($ev->motion_x, $ev->motion_y);
572
573 $self->{user_w} = $bw + $x - $ox;
574 $self->{user_h} = $bh + $y - $oy;
575 $self->update;
576 };
577
578 } elsif ($x >= 0 && $x < $self->{w}
579 && $y >= 0 && $y < $tex[1]{h}) {
580
581 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
582 my ($bx, $by) = ($self->{x}, $self->{y});
583
584 $self->{motion} = sub {
585 my ($ev, $x, $y) = @_;
586
587 ($x, $y) = ($ev->motion_x, $ev->motion_y);
588
589 $self->move ($bx + $x - $ox, $by + $y - $oy);
590 $self->update;
591 };
592 }
593}
594
595sub button_up {
596 my ($self, $ev, $x, $y) = @_;
597
598 delete $self->{motion};
599}
600
601sub mouse_motion {
602 my ($self, $ev, $x, $y) = @_;
603
604 $self->{motion}->($ev, $x, $y) if $self->{motion};
560} 605}
561 606
562sub _draw { 607sub _draw {
563 my ($self) = @_; 608 my ($self) = @_;
564 609
… …
581 626
582 my $bottom = $tex[4]; 627 my $bottom = $tex[4];
583 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h}); 628 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
584 629
585 my $bg = $tex[0]; 630 my $bg = $tex[0];
631
586 glBindTexture GL_TEXTURE_2D, $bg->{name}; 632 glBindTexture GL_TEXTURE_2D, $bg->{name};
587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
588 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 634 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
589 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 635 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
590 636
591 my $rep_x = $cw / $bg->{w}; 637 my $rep_x = $cw / $bg->{w};
592 my $rep_y = $ch / $bg->{h}; 638 my $rep_y = $ch / $bg->{h};
593 639
594 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 640 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
595 641
642 glDisable GL_TEXTURE_2D;
596 glDisable GL_BLEND; 643 glDisable GL_BLEND;
597 glDisable GL_TEXTURE_2D;
598 644
599 $self->child->draw; 645 $self->child->draw;
600 646
601} 647}
602 648
… …
604 650
605package CFClient::UI::Table; 651package CFClient::UI::Table;
606 652
607our @ISA = CFClient::UI::Base::; 653our @ISA = CFClient::UI::Base::;
608 654
655use List::Util qw(max sum);
656
609use SDL::OpenGL; 657use SDL::OpenGL;
658
659sub new {
660 my $class = shift;
661
662 $class->SUPER::new (
663 col_expand => [],
664 @_
665 )
666}
610 667
611sub add { 668sub add {
612 my ($self, $x, $y, $chld) = @_; 669 my ($self, $x, $y, $chld) = @_;
613 my $old_chld = $self->{children}[$y][$x];
614 670
615 $self->{children}[$y][$x] = $chld; 671 $self->{children}[$y][$x] = $chld;
616 $chld->set_parent ($self); 672 $chld->set_parent ($self);
673
674 $self->{w} = $self->{h} = -1;
617 $self->update; 675 $self->update;
618} 676}
619 677
620sub max_row_height { 678sub get_wh {
621 my ($self, $row) = @_; 679 my ($self) = @_;
622 680
623 my $hs = 0; 681 my (@w, @h);
624 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 682
683 for my $y (0 .. $#{$self->{children}}) {
625 my $c = $self->{children}->[$row]->[$xi]; 684 my $row = $self->{children}[$y]
626 if ($c) { 685 or next;
686
687 for my $x (0 .. $#$row) {
688 my $widget = $row->[$x]
689 or next;
627 my ($w, $h) = $c->size_request; 690 my ($w, $h) = $widget->size_request;
628 if ($hs < $h) { $hs = $h } 691
692 $w[$x] = max $w[$x], $w;
693 $h[$y] = max $h[$y], $h;
629 } 694 }
630 } 695 }
631 return $hs;
632}
633 696
634sub max_col_width { 697 (\@w, \@h)
698}
699
700sub size_request {
635 my ($self, $col) = @_; 701 my ($self) = @_;
636 702
703 my ($ws, $hs) = $self->get_wh;
704
705 (
706 (sum @$ws),
707 (sum @$hs),
708 )
709}
710
711sub size_allocate {
712 my ($self, $x, $y, $w, $h) = @_;
713
714 $self->_size_allocate ($x, $y, $w, $h) or return;
715
716 my ($ws, $hs) = $self->get_wh;
717
718 my $req_w = sum @$ws;
719 my $req_h = sum @$hs;
720
721 # TODO: nicer code && do row_expand
722 my @col_expand = @{$self->{col_expand}};
723 @col_expand = (1) x @$ws unless @col_expand;
724 my $col_expand = (sum @col_expand) || 1;
725
726 # linearly scale sizes
727 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729
730 my $y;
731
732 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r]
734 or next;
735
637 my $ws = 0; 736 my $x = 0;
638 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 737 my $row_h = $hs->[$r];
639 my $c = ($self->{children}->[$yi] || [])->[$col]; 738
640 if ($c) { 739 for my $c (0 .. $#$row) {
641 my ($w, $h) = $c->size_request; 740 my $widget = $row->[$c]
642 if ($ws < $w) { $ws = $w } 741 or next;
742
743 my $col_w = $ws->[$c];
744
745 $widget->size_allocate ($x, $y, $col_w, $row_h);
746
747 $x += $col_w;
643 } 748 }
749
750 $y += $row_h;
644 } 751 }
645 return $ws; 752
646} 753}
754
755sub find_widget {
756 my ($self, $x, $y) = @_;
757
758 $x -= $self->{x};
759 $y -= $self->{y};
760
761 my $res;
762
763 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
764 $res = $_->find_widget ($x, $y)
765 and return $res;
766 }
767
768 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
769}
770
771sub _draw {
772 my ($self) = @_;
773
774 for (grep $_, @{$self->{children}}) {
775 $_->draw for grep $_, @$_;
776 }
777}
778
779#############################################################################
780
781package CFClient::UI::HBox;
782
783# TODO: wrap into common Box base class
784
785our @ISA = CFClient::UI::Container::;
647 786
648sub size_request { 787sub size_request {
649 my ($self) = @_; 788 my ($self) = @_;
650 789
790 my @alloc = map [$_->size_request], @{$self->{children}};
791
792 (
793 (List::Util::sum map $_->[0], @alloc),
794 (List::Util::max map $_->[1], @alloc),
795 )
796}
797
798sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_;
800
801 $self->_size_allocate ($x, $y, $w, $h) or return;
802
803 return unless $self->{w};
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) or return;
713
714 $self->{w} = $w;
715 $self->{h} = $h;
716 862
717 return unless $self->{h}; 863 return unless $self->{h};
718 864
719 my $children = $self->{children}; 865 my $children = $self->{children};
720 866
… …
722 868
723 my $req_h = List::Util::sum @h; 869 my $req_h = List::Util::sum @h;
724 870
725 if ($req_h > $h) { 871 if ($req_h > $h) {
726 # ah well, not enough space 872 # ah well, not enough space
727 $_ = $h[$_] * $h / $req_h for @h; 873 $_ *= $h / $req_h for @h;
728 } else { 874 } else {
729 my @exp = grep $_->{expand}, @$children; 875 my $exp = List::Util::sum map $_->{expand}, @$children;
730 @exp = @$children unless @exp; 876 $exp ||= 1;
731 877
732 my %exp = map +($_ => 1), @exp;
733
734 for (0 .. $#$children) { 878 for (0 .. $#$children) {
735 my $child = $children->[$_]; 879 my $child = $children->[$_];
736 880
737 my $alloc_h = $h[$_]; 881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
738 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
739 $h[$_] = $alloc_h;
740 } 882 }
741 } 883 }
742 884
743 my $y = 0; 885 my $y = 0;
744 for (0 .. $#$children) { 886 for (0 .. $#$children) {
745 my $child = $children->[$_]; 887 my $child = $children->[$_];
746 my $h = $h[$_]; 888 my $h = $h[$_];
747 $child->move (0, $y);
748 $child->size_allocate ($w, $h); 889 $child->size_allocate (0, $y, $w, $h);
749 890
750 $y += $h; 891 $y += $h;
751 } 892 }
752} 893}
753 894
… …
761 902
762sub new { 903sub new {
763 my ($class, %arg) = @_; 904 my ($class, %arg) = @_;
764 905
765 my $self = $class->SUPER::new ( 906 my $self = $class->SUPER::new (
766 fg => [1, 1, 1], 907 fg => [1, 1, 1],
767 height => $::FONTSIZE, 908 height => $::FONTSIZE,
768 text => "", 909 text => "",
769 align => -1, 910 align => -1,
911 padding => 2,
770 layout => new CFClient::Layout, 912 layout => new CFClient::Layout,
771 %arg 913 %arg
772 ); 914 );
773 915
774 $self->set_text ($self->{text}); 916 $self->set_text ($self->{text});
775 917
… …
805sub size_request { 947sub size_request {
806 my ($self) = @_; 948 my ($self) = @_;
807 949
808 $self->{layout}->set_width; 950 $self->{layout}->set_width;
809 $self->{layout}->set_height ($self->{height}); 951 $self->{layout}->set_height ($self->{height});
810 $self->{layout}->size 952 my ($w, $h) = $self->{layout}->size;
811# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 953
812# ( 954 (
813# $self->{texture}{w}, 955 $w + $self->{padding} * 2,
814# $self->{texture}{h}, 956 $h + $self->{padding} * 2,
815# ) 957 )
816# } else {
817# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
818#
819# ($w, $h)
820# }
821} 958}
822 959
823sub size_allocate { 960sub size_allocate {
824 my ($self, $w, $h) = @_; 961 my ($self, $x, $y, $w, $h) = @_;
825 962
826 return unless $self->{w} != $w || $self->{h} != $h; 963 $self->_size_allocate ($x, $y, $w, $h) or return;
827 964
828 $self->SUPER::size_allocate ($w, $h);
829 delete $self->{texture}; 965 delete $self->{texture};
830} 966}
831 967
832sub update { 968sub update {
833 my ($self) = @_; 969 my ($self) = @_;
… …
839sub _draw { 975sub _draw {
840 my ($self) = @_; 976 my ($self) = @_;
841 977
842 my $tex = $self->{texture} ||= do { 978 my $tex = $self->{texture} ||= do {
843 $self->{layout}->set_width ($self->{w}); 979 $self->{layout}->set_width ($self->{w});
980 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height});
844 new_from_layout CFClient::Texture $self->{layout} 981 new_from_layout CFClient::Texture $self->{layout}
845 }; 982 };
846 983
847 glEnable GL_BLEND; 984 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
850 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
851 988
852 glColor @{$self->{fg}}; 989 glColor @{$self->{fg}};
853 990
854 my $x = 991 my $x =
855 $self->{align} < 0 ? 0 992 $self->{align} < 0 ? $self->{padding}
856 : $self->{align} > 0 ? $self->{w} - $tex->{w} 993 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
857 : ($self->{w} - $tex->{w}) * 0.5; 994 : ($self->{w} - $tex->{w}) * 0.5;
858 995
859 $tex->draw_quad ($x, 0); 996 $tex->draw_quad ($x, $self->{padding});
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],
882 active_fg => [0, 0, 0], 1018 active_fg => [0, 0, 0],
883 @_ 1019 @_
884 ) 1020 )
885} 1021}
… …
892 $self->{text} = $text; 1028 $self->{text} = $text;
893 $self->{layout}->set_width ($self->{w}); 1029 $self->{layout}->set_width ($self->{w});
894 1030
895 $text =~ s/./*/g if $self->{hidden}; 1031 $text =~ s/./*/g if $self->{hidden};
896 1032
897
898 $self->{layout}->set_markup ($self->escape_text ($text)); 1033 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
899 1034
900 $text = substr $text, 0, $self->{cursor}; 1035 $text = substr $text, 0, $self->{cursor};
901 utf8::encode $text; 1036 utf8::encode $text;
902 1037
903 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1038 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
… …
910 1045
911 ($w + 1, $h) # add 1 for cursor 1046 ($w + 1, $h) # add 1 for cursor
912} 1047}
913 1048
914sub size_allocate { 1049sub size_allocate {
915 my ($self, $w, $h) = @_; 1050 my ($self, $x, $y, $w, $h) = @_;
916 1051
917 return unless $self->{w} != $w || $self->{h} != $h;
918
919 $self->SUPER::size_allocate ($w, $h); 1052 $self->SUPER::size_allocate ($x, $y, $w, $h);
920 1053
921 $self->_set_text ($self->{text}); 1054 $self->_set_text ($self->{text});
922} 1055}
923 1056
924sub set_text { 1057sub set_text {
… …
945 substr $text, $self->{cursor}, 1, ""; 1078 substr $text, $self->{cursor}, 1, "";
946 } elsif ($sym == SDLK_LEFT) { 1079 } elsif ($sym == SDLK_LEFT) {
947 --$self->{cursor} if $self->{cursor}; 1080 --$self->{cursor} if $self->{cursor};
948 } elsif ($sym == SDLK_RIGHT) { 1081 } elsif ($sym == SDLK_RIGHT) {
949 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1082 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1083 } elsif ($sym == SDLK_HOME) {
1084 $self->{cursor} = 0;
1085 } elsif ($sym == SDLK_END) {
1086 $self->{cursor} = length $text;
950 } elsif ($uni) { 1087 } elsif ($uni) {
951 substr $text, $self->{cursor}++, 0, chr $uni; 1088 substr $text, $self->{cursor}++, 0, chr $uni;
952 } 1089 }
953 1090
954 $self->_set_text ($text); 1091 $self->_set_text ($text);
… …
969 $self->SUPER::button_down ($ev, $x, $y); 1106 $self->SUPER::button_down ($ev, $x, $y);
970 1107
971 my $idx = $self->{layout}->xy_to_index ($x, $y); 1108 my $idx = $self->{layout}->xy_to_index ($x, $y);
972 1109
973 # byte-index to char-index 1110 # byte-index to char-index
974 my $text = $self->{layout}; 1111 my $text = $self->{text};
975 utf8::encode $text; 1112 utf8::encode $text;
976 $self->{cursor} = length substr $text, 0, $idx; 1113 $self->{cursor} = length substr $text, 0, $idx;
977 1114
978 $self->_set_text ($self->{text}); 1115 $self->_set_text ($self->{text});
979 $self->update; 1116 $self->update;
… …
994 $self->{fg} = $self->{active_fg}; 1131 $self->{fg} = $self->{active_fg};
995 } else { 1132 } else {
996 glColor @{$self->{bg}}; 1133 glColor @{$self->{bg}};
997 } 1134 }
998 1135
1136 glEnable GL_BLEND;
1137 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
999 glBegin GL_QUADS; 1138 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1139 glVertex 0 , 0;
1001 glVertex 0 , $self->{h}; 1140 glVertex 0 , $self->{h};
1002 glVertex $self->{w}, $self->{h}; 1141 glVertex $self->{w}, $self->{h};
1003 glVertex $self->{w}, 0; 1142 glVertex $self->{w}, 0;
1004 glEnd; 1143 glEnd;
1144 glDisable GL_BLEND;
1005 1145
1006 $self->SUPER::_draw; 1146 $self->SUPER::_draw;
1007 1147
1008 #TODO: force update every cursor change :( 1148 #TODO: force update every cursor change :(
1009 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1149 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
1023 1163
1024use SDL::OpenGL; 1164use SDL::OpenGL;
1025 1165
1026our @ISA = CFClient::UI::DrawBG::; 1166our @ISA = CFClient::UI::DrawBG::;
1027 1167
1028sub size_request {
1029 my ($self) = @_;
1030
1031 my $w = 50;
1032 my $h = 10;
1033
1034 $self->{vertical} ? ($h, $w) : ($w, $h)
1035}
1036
1037sub new { 1168sub new {
1038 my $class = shift; 1169 my $class = shift;
1039 1170
1040 # range [value, low, high, page] 1171 # range [value, low, high, page]
1041 1172
1042 $class->SUPER::new ( 1173 my $self = $class->SUPER::new (
1043 fg => [1, 1, 1], 1174 fg => [1, 1, 1],
1044 active_fg => [0, 0, 0], 1175 active_fg => [0, 0, 0],
1045 range => [0, 0, 100, 10], 1176 range => [0, 0, 100, 10],
1177 req_w => 40,
1178 req_h => 10,
1046 vertical => 1, 1179 vertical => 0,
1047 @_ 1180 @_
1048 ) 1181 );
1182
1183 $self
1184}
1185
1186sub size_request {
1187 my ($self) = @_;
1188
1189 my $w = $self->{req_w};
1190 my $h = $self->{req_h};
1191
1192 $self->{vertical} ? ($h, $w) : ($w, $h)
1049} 1193}
1050 1194
1051sub button_down { 1195sub button_down {
1052 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1053 1197
… …
1158sub key_up { 1302sub key_up {
1159} 1303}
1160 1304
1161sub size_request { 1305sub size_request {
1162 ( 1306 (
1163 1 + int $::WIDTH / 32, 1307 1 + 32 * int $::WIDTH / 32,
1164 1 + int $::HEIGHT / 32, 1308 1 + 32 * int $::HEIGHT / 32,
1165 ) 1309 )
1166} 1310}
1167 1311
1168sub update { 1312sub update {
1169 my ($self) = @_; 1313 my ($self) = @_;
1170 1314
1171 $self->{need_update} = 1; 1315 $self->{need_update} = 1;
1172 $self->SUPER::update; 1316 $self->SUPER::update;
1173} 1317}
1174 1318
1175sub _draw { 1319sub draw {
1176 my ($self) = @_; 1320 my ($self) = @_;
1177 1321
1178 if (delete $self->{need_update}) { 1322 if (delete $self->{need_update}) {
1179 glNewList $self->{list}, GL_COMPILE; 1323 glNewList $self->{list}, GL_COMPILE;
1180 1324
… …
1365sub size_request { 1509sub size_request {
1366 ($::WIDTH, $::HEIGHT) 1510 ($::WIDTH, $::HEIGHT)
1367} 1511}
1368 1512
1369sub size_allocate { 1513sub size_allocate {
1370 my ($self, $w, $h) = @_; 1514 my ($self, $x, $y, $w, $h) = @_;
1371 1515
1372 $self->SUPER::size_allocate ($w, $h); 1516 $self->_size_allocate ($x, $y, $w, $h);
1373 1517
1374 $_->size_allocate ($_->size_request) 1518 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1375 for @{$self->{children}}; 1519 for @{$self->{children}};
1376} 1520}
1377 1521
1378sub translate { 1522sub translate {
1379 my ($self, $x, $y) = @_; 1523 my ($self, $x, $y) = @_;
… …
1382} 1526}
1383 1527
1384sub update { 1528sub update {
1385 my ($self) = @_; 1529 my ($self) = @_;
1386 1530
1387 $self->size_allocate ($self->size_request); 1531 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1388 ::refresh (); 1532 ::refresh ();
1389} 1533}
1390 1534
1391sub add { 1535sub add {
1392 my ($self, $widget) = @_; 1536 my ($self, $widget) = @_;
1393 1537
1394 $self->SUPER::add ($widget); 1538 $self->SUPER::add ($widget);
1395 1539
1396 $widget->size_allocate ($widget->size_request); 1540 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1397} 1541}
1398 1542
1399sub draw { 1543sub draw {
1400 my ($self) = @_; 1544 my ($self) = @_;
1401 1545

Diff Legend

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