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.394 by root, Sat Jul 21 13:54:03 2007 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 2007 UTC

… …
593 593
594# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 597
598sub draw { 598#sub draw {
599 my ($self) = @_; 599#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 600
645sub _draw { 601sub _draw {
646 my ($self) = @_; 602 my ($self) = @_;
647 603
648 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
649} 605}
650 606
651my $cntx;#d#
652sub DESTROY { 607sub DESTROY {
653 my ($self) = @_; 608 my ($self) = @_;
654 609
655 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
656 611
… …
769 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
771 ]; 726 ];
772 727
773 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
774} 731}
775 732
776sub children { 733sub children {
777 @{ $_[0]{children} } 734 @{ $_[0]{children} }
778} 735}
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1050 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1051 $vp->{parent}{vslider}->set_value ($y);
1095 1052
1096 0 1053 0
1097 }, 1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1098 ; 1060 ;
1099 1061
1100 $self->SUPER::add ($self->{vp}); 1062 $self->SUPER::add ($self->{vp});
1101 1063
1102 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1103 1065
1104 $self 1066 $self
1105} 1067}
1106
1107#TODO# update range on size_allocate depending on child?
1108 1068
1109sub add { 1069sub add {
1110 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1111 1071
1112 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
… …
1115sub update_slider { 1075sub update_slider {
1116 my ($self) = @_; 1076 my ($self) = @_;
1117 1077
1118 my $child = ($self->{vp} or return)->child; 1078 my $child = ($self->{vp} or return)->child;
1119 1079
1080 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1083
1123 my $visible = $w1 > $w2; 1084 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) { 1085 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible; 1086 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider}) 1087 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider}); 1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1128 } 1090 }
1129 1091
1092 if ($self->{scroll_y}) {
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132 1095
1133 my $visible = $h1 > $h2; 1096 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) { 1097 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible; 1098 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider}) 1099 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider}); 1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1138 } 1120 };
1139}
1140
1141sub update {
1142 my ($self) = @_;
1143
1144 $self->update_slider;
1145 $self->SUPER::update;
1146} 1121}
1147 1122
1148sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1149 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1150 1125
1151 $self->{vslider}->emit (mouse_wheel => $ev) 1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1152 if $ev->{dy};
1153
1154 $self->{hslider}->emit (mouse_wheel => $ev) 1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1155 if $ev->{dx};
1156 1128
1157 1 1129 1
1158} 1130}
1159 1131
1160sub invoke_button_down { 1132sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1162 1134
1163 if ($ev->{button} == 2) { 1135 if ($ev->{button} == 2) {
1164 $self->grab_focus; 1136 $self->start_dragging ($ev);
1165
1166 my $ox = $self->{vp}{view_x} + $ev->{x};
1167 my $oy = $self->{vp}{view_y} + $ev->{y};
1168
1169 $self->{motion} = sub {
1170 my ($ev, $x, $y) = @_;
1171
1172 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1173 $self->update;
1174 };
1175
1176 return 1; 1137 return 1;
1177 } 1138 }
1178 1139
1179 0 1140 0
1180} 1141}
… …
1725 1686
1726use List::Util qw(min max); 1687use List::Util qw(min max);
1727 1688
1728our @ISA = CFPlus::UI::Container::; 1689our @ISA = CFPlus::UI::Container::;
1729 1690
1730sub add { 1691sub add_fixed {
1731 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; 1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1732 1693
1733 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; 1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1734 $self->SUPER::add ($child); 1695 $self->SUPER::add ($child);
1735} 1696}
… …
1790 for my $child ($self->visible_children) { 1751 for my $child ($self->visible_children) {
1791 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1792 1753
1793 $x = _scale $pos, $x, $W; 1754 $x = _scale $pos, $x, $W;
1794 $y = _scale $pos, $x, $H; 1755 $y = _scale $pos, $x, $H;
1795 $w = _scale $size, $w, $child->{req_w}; 1756 $w = _scale $size, $w, $W;
1796 $h = _scale $size, $h, $child->{req_h}; 1757 $h = _scale $size, $h, $H;
1797 1758
1798 $child->configure ($x, $y, $w, $h); 1759 $child->configure ($x, $y, $w, $h);
1799 } 1760 }
1800 1761
1801 1 1762 1
… …
2066 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2067 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2068 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2069 }; 2030 };
2070 2031
2071 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2032# unless ($self->{list}) {
2072 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2033# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList;
2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
2073 2040
2074 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2075} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
2076 2051
2077############################################################################# 2052#############################################################################
2078 2053
2079package CFPlus::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
2080 2055
… …
3478 3453
3479 if ($self->{anim} && $self->{animspeed}) { 3454 if ($self->{anim} && $self->{animspeed}) {
3480 CFPlus::weaken (my $widget = $self); 3455 CFPlus::weaken (my $widget = $self);
3481 3456
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3484 $self->{timer} = Event->timer ( 3459 $self->{timer} = Event->timer (
3485 parked => 1, 3460 parked => 1,
3486 cb => sub { 3461 cb => sub {
3487 return unless $::CONN && $widget; 3462 return unless $::CONN && $widget;
3488 3463
… …
3525 3500
3526 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3527 if ($anim && @$anim) { 3502 if ($anim && @$anim) {
3528 delete $self->{wait_face}; 3503 delete $self->{wait_face};
3529 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3530 } 3506 }
3531 } 3507 }
3532} 3508}
3533 3509
3534sub size_request { 3510sub size_request {
3535 my ($self) = @_; 3511 my ($self) = @_;
3536 3512
3537 if ($::CONN) { 3513 if ($::CONN) {
3538 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3539 if (my $tex = $::CONN->{texture}[$faceid]) { 3515 if (my $tex = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex;
3540 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3541 } else { 3518 } else {
3542 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3543 $self->realloc; 3520 $self->realloc;
3544 }); 3521 });
… …
3566} 3543}
3567 3544
3568sub _draw { 3545sub _draw {
3569 my ($self) = @_; 3546 my ($self) = @_;
3570 3547
3571 return unless $::CONN;
3572
3573 $self->SUPER::_draw; 3548 $self->SUPER::_draw;
3574 3549
3575 my $faceid = $::CONN->{faceid}[$self->{face}] 3550 if (my $tex = $self->{tex}) {
3576 or return;
3577
3578 my $tex = $::CONN->{texture}[$faceid];
3579
3580 if ($tex) {
3581 glEnable GL_TEXTURE_2D; 3551 glEnable GL_TEXTURE_2D;
3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3583 glColor 0, 0, 0, 1; 3553 glColor 0, 0, 0, 1;
3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3554 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3585 glDisable GL_TEXTURE_2D; 3555 glDisable GL_TEXTURE_2D;
… …
3795sub add { 3765sub add {
3796 my ($self, $title, $widget, $tooltip) = @_; 3766 my ($self, $title, $widget, $tooltip) = @_;
3797 3767
3798 CFPlus::weaken $self; 3768 CFPlus::weaken $self;
3799 3769
3800 $self->{buttonbar}->add (new CFPlus::UI::Button 3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3801 markup => $title, 3772 markup => $title,
3802 tooltip => $tooltip, 3773 tooltip => $tooltip,
3774 );
3775 }
3776
3803 on_activate => sub { $self->set_current_page ($widget) }, 3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3804 ); 3778 $self->{buttonbar}->add ($title);
3805 3779
3806 $self->{multiplexer}->add ($widget); 3780 $self->{multiplexer}->add ($widget);
3807} 3781}
3808 3782
3809sub get_current_page { 3783sub get_current_page {
… …
4141 while ($self->{refresh_hook}) { 4115 while ($self->{refresh_hook}) {
4142 $_->() 4116 $_->()
4143 for values %{delete $self->{refresh_hook}}; 4117 for values %{delete $self->{refresh_hook}};
4144 } 4118 }
4145 4119
4146 if ($self->{realloc}) { 4120 while ($self->{realloc}) {
4147 my %queue; 4121 my %queue;
4148 my @queue; 4122 my @queue;
4149 my $widget; 4123 my $widget;
4150 4124
4151 outer: 4125 outer:
… …
4198 } 4172 }
4199 } 4173 }
4200 4174
4201 delete $self->{realloc}{$widget+0}; 4175 delete $self->{realloc}{$widget+0};
4202 } 4176 }
4203 }
4204 4177
4205 while (my $size_alloc = delete $self->{size_alloc}) { 4178 while (my $size_alloc = delete $self->{size_alloc}) {
4206 my @queue = sort { $b->{visible} <=> $a->{visible} } 4179 my @queue = sort { $a->{visible} <=> $b->{visible} }
4207 values %$size_alloc; 4180 values %$size_alloc;
4208 4181
4209 while () { 4182 while () {
4210 my $widget = pop @queue || last; 4183 my $widget = pop @queue || last;
4211 4184
4212 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4213 4186
4214 $w = 0 if $w < 0;
4215 $h = 0 if $h < 0;
4216
4217 $w = max $widget->{min_w}, $w; 4187 $w = max $widget->{min_w}, $w;
4218 $h = max $widget->{min_h}, $h; 4188 $h = max $widget->{min_h}, $h;
4219 4189
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4190# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4191# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222 4192
4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4193 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4194 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4225 4195
4226 $w = int $w + 0.5; 4196 $w = int $w + 0.5;
4227 $h = int $h + 0.5; 4197 $h = int $h + 0.5;
4228 4198
4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4199 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4230 $widget->{old_w} = $widget->{w}; 4200 $widget->{old_w} = $widget->{w};
4231 $widget->{old_h} = $widget->{h}; 4201 $widget->{old_h} = $widget->{h};
4232 4202
4233 $widget->{w} = $w; 4203 $widget->{w} = $w;
4234 $widget->{h} = $h; 4204 $widget->{h} = $h;
4235 4205
4236 $widget->emit (size_allocate => $w, $h); 4206 $widget->emit (size_allocate => $w, $h);
4207 }
4237 } 4208 }
4238 } 4209 }
4239 } 4210 }
4240 4211
4241 while ($self->{post_alloc_hook}) { 4212 while ($self->{post_alloc_hook}) {

Diff Legend

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