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.344 by root, Sun Aug 13 16:29:36 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

… …
1127} 1127}
1128 1128
1129############################################################################# 1129#############################################################################
1130 1130
1131package CFPlus::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1132
1133our @ISA = CFPlus::UI::Bin::;
1134
1135use CFPlus::OpenGL;
1136
1137sub new {
1138 my ($class, %arg) = @_;
1139
1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1132 1232
1133our @ISA = CFPlus::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1134 1234
1135use CFPlus::OpenGL; 1235use CFPlus::OpenGL;
1136 1236
… …
2750 2850
2751 # todo: base offset on lines or so, not on pixels 2851 # todo: base offset on lines or so, not on pixels
2752 $self->{children}[1]->set_value ($offset); 2852 $self->{children}[1]->set_value ($offset);
2753} 2853}
2754 2854
2855sub current_paragraph {
2856 my ($self) = @_;
2857
2858 $self->{top_paragraph} - 1
2859}
2860
2861sub scroll_to {
2862 my ($self, $para) = @_;
2863
2864 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2865
2866 $self->{scroll_to} = $para;
2867 $self->update;
2868}
2869
2755sub clear { 2870sub clear {
2756 my ($self) = @_; 2871 my ($self) = @_;
2757 2872
2758 my (undef, undef, @other) = @{ $self->{children} }; 2873 my (undef, undef, @other) = @{ $self->{children} };
2759 $self->remove ($_) for @other; 2874 $self->remove ($_) for @other;
… …
2786} 2901}
2787 2902
2788sub scroll_to_bottom { 2903sub scroll_to_bottom {
2789 my ($self) = @_; 2904 my ($self) = @_;
2790 2905
2791 $self->{scroll_to_bottom} = 1; 2906 $self->{scroll_to} = $#{$self->{par}};
2792 $self->update; 2907 $self->update;
2793} 2908}
2794 2909
2910sub force_uptodate {
2911 my ($self) = @_;
2912
2913 if (delete $self->{need_reflow}) {
2914 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2915
2916 my $height = 0;
2917
2918 for my $para (@{$self->{par}}) {
2919 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2920 my $layout = $self->get_layout ($para);
2921 my ($w, $h) = $layout->size;
2922
2923 $para->{w} = $w + $para->{indent};
2924 $para->{h} = $h;
2925 $para->{wrapped} = $layout->has_wrapped;
2926 }
2927
2928 $para->{y} = $height;
2929 $height += $para->{h};
2930 }
2931
2932 $self->{height} = $height;
2933 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2934
2935 delete $self->{texture};
2936 }
2937
2938 if (my $paridx = delete $self->{scroll_to}) {
2939 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2940 }
2941}
2942
2795sub update { 2943sub update {
2796 my ($self) = @_; 2944 my ($self) = @_;
2797 2945
2798 $self->SUPER::update; 2946 $self->SUPER::update;
2799 2947
2800 return unless $self->{h} > 0; 2948 return unless $self->{h} > 0;
2801 2949
2802 delete $self->{texture}; 2950 delete $self->{texture};
2803 2951
2804 $ROOT->on_post_alloc ($self => sub { 2952 $ROOT->on_post_alloc ($self => sub {
2953 $self->force_uptodate;
2954
2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2955 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2806
2807 if (delete $self->{need_reflow}) {
2808 my $height = 0;
2809
2810 for my $para (@{$self->{par}}) {
2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2812 my $layout = $self->get_layout ($para);
2813 my ($w, $h) = $layout->size;
2814
2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2818 }
2819
2820 $height += $para->{h};
2821 }
2822
2823 $self->{height} = $height;
2824
2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2826
2827 delete $self->{texture};
2828 }
2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833 2956
2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 2957 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2835 glClearColor 0, 0, 0, 0; 2958 glClearColor 0, 0, 0, 0;
2836 glClear GL_COLOR_BUFFER_BIT; 2959 glClear GL_COLOR_BUFFER_BIT;
2837 2960
2838 my $top = int $self->{children}[1]{range}[0]; 2961 my $top = int $self->{children}[1]{range}[0];
2839 2962
2963 my $paridx = 0;
2964 my $top_paragraph;
2965 my $top = int $self->{children}[1]{range}[0];
2966
2840 my $y0 = $top; 2967 my $y0 = $top;
2841 my $y1 = $top + $H; 2968 my $y1 = $top + $H;
2842 2969
2843 my $y = 0;
2844
2845 for my $para (@{$self->{par}}) { 2970 for my $para (@{$self->{par}}) {
2846 my $h = $para->{h}; 2971 my $h = $para->{h};
2972 my $y = $para->{y};
2847 2973
2848 if ($y0 < $y + $h && $y < $y1) { 2974 if ($y0 < $y + $h && $y < $y1) {
2849
2850 my $layout = $self->get_layout ($para); 2975 my $layout = $self->get_layout ($para);
2851 2976
2852 $layout->render ($para->{indent}, $y - $y0); 2977 $layout->render ($para->{indent}, $y - $y0);
2853 2978
2854 if (my @w = @{ $para->{widget} }) { 2979 if (my @w = @{ $para->{widget} }) {
… …
2863 $_->draw; 2988 $_->draw;
2864 } 2989 }
2865 } 2990 }
2866 } 2991 }
2867 2992
2868 $y += $h; 2993 $paridx++;
2994 $top_paragraph ||= $paridx if $y >= $top;
2869 } 2995 }
2996
2997 $self->{top_paragraph} = $top_paragraph;
2870 }; 2998 };
2871 }); 2999 });
2872} 3000}
2873 3001
2874sub reconfigure { 3002sub reconfigure {
… …
3159 3287
3160############################################################################# 3288#############################################################################
3161 3289
3162package CFPlus::UI::Menu; 3290package CFPlus::UI::Menu;
3163 3291
3164our @ISA = CFPlus::UI::FancyFrame::; 3292our @ISA = CFPlus::UI::Toplevel::;
3165 3293
3166use CFPlus::OpenGL; 3294use CFPlus::OpenGL;
3167 3295
3168sub new { 3296sub new {
3169 my $class = shift; 3297 my $class = shift;

Diff Legend

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