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.342 by root, Sun Aug 13 14:38:35 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

… …
909} 909}
910 910
911sub _draw { 911sub _draw {
912 my ($self) = @_; 912 my ($self) = @_;
913 913
914 my ($w, $h) = @$self{qw(w h)};
915
916 my $tex = $self->{texture} 914 my $tex = $self->{texture}
917 or return; 915 or return;
918 916
919 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
922 920
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
924 922
925 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
926} 924}
927 925
928############################################################################# 926#############################################################################
… …
1129} 1127}
1130 1128
1131############################################################################# 1129#############################################################################
1132 1130
1133package 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;
1134 1232
1135our @ISA = CFPlus::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1136 1234
1137use CFPlus::OpenGL; 1235use CFPlus::OpenGL;
1138 1236
… …
1618 #active_bg => none 1716 #active_bg => none
1619 #font => default_font 1717 #font => default_font
1620 #text => initial text 1718 #text => initial text
1621 #markup => initial narkup 1719 #markup => initial narkup
1622 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1623 ellipsise => 3, # end 1722 ellipsise => 3, # end
1624 layout => (new CFPlus::Layout), 1723 layout => (new CFPlus::Layout),
1625 fontsize => 1, 1724 fontsize => 1,
1626 align => -1, 1725 align => -1,
1627 valign => -1, 1726 valign => -1,
… …
1778 }; 1877 };
1779 1878
1780 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1781 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1782 1881
1783 $self->{layout}->render ($self->{ox}, $self->{oy}); 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1784} 1883}
1785 1884
1786############################################################################# 1885#############################################################################
1787 1886
1788package CFPlus::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
… …
1949 utf8::encode $text; 2048 utf8::encode $text;
1950 2049
1951 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1952 } 2051 }
1953 2052
1954 glColor @{$self->{fg}};
1955 glBegin GL_LINES; 2053 glBegin GL_LINES;
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2054 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2055 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958 glEnd; 2056 glEnd;
1959 } 2057 }
1960} 2058}
1961 2059
1962package CFPlus::UI::Entry; 2060package CFPlus::UI::Entry;
… …
2752 2850
2753 # todo: base offset on lines or so, not on pixels 2851 # todo: base offset on lines or so, not on pixels
2754 $self->{children}[1]->set_value ($offset); 2852 $self->{children}[1]->set_value ($offset);
2755} 2853}
2756 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
2757sub clear { 2870sub clear {
2758 my ($self) = @_; 2871 my ($self) = @_;
2759 2872
2760 my (undef, undef, @other) = @{ $self->{children} }; 2873 my (undef, undef, @other) = @{ $self->{children} };
2761 $self->remove ($_) for @other; 2874 $self->remove ($_) for @other;
… …
2788} 2901}
2789 2902
2790sub scroll_to_bottom { 2903sub scroll_to_bottom {
2791 my ($self) = @_; 2904 my ($self) = @_;
2792 2905
2793 $self->{scroll_to_bottom} = 1; 2906 $self->{scroll_to} = $#{$self->{par}};
2794 $self->update; 2907 $self->update;
2795} 2908}
2796 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
2797sub update { 2943sub update {
2798 my ($self) = @_; 2944 my ($self) = @_;
2799 2945
2800 $self->SUPER::update; 2946 $self->SUPER::update;
2801 2947
2802 return unless $self->{h} > 0; 2948 return unless $self->{h} > 0;
2803 2949
2804 delete $self->{texture}; 2950 delete $self->{texture};
2805 2951
2806 $ROOT->on_post_alloc ($self => sub { 2952 $ROOT->on_post_alloc ($self => sub {
2953 $self->force_uptodate;
2954
2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2955 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2808
2809 if (delete $self->{need_reflow}) {
2810 my $height = 0;
2811
2812 for my $para (@{$self->{par}}) {
2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2814 my $layout = $self->get_layout ($para);
2815 my ($w, $h) = $layout->size;
2816
2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2820 }
2821
2822 $height += $para->{h};
2823 }
2824
2825 $self->{height} = $height;
2826
2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2828
2829 delete $self->{texture};
2830 }
2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835 2956
2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 2957 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837 glClearColor 0, 0, 0, 0; 2958 glClearColor 0, 0, 0, 0;
2838 glClear GL_COLOR_BUFFER_BIT; 2959 glClear GL_COLOR_BUFFER_BIT;
2839 2960
2840 my $top = int $self->{children}[1]{range}[0]; 2961 my $top = int $self->{children}[1]{range}[0];
2841 2962
2963 my $paridx = 0;
2964 my $top_paragraph;
2965 my $top = int $self->{children}[1]{range}[0];
2966
2842 my $y0 = $top; 2967 my $y0 = $top;
2843 my $y1 = $top + $H; 2968 my $y1 = $top + $H;
2844 2969
2845 my $y = 0;
2846
2847 for my $para (@{$self->{par}}) { 2970 for my $para (@{$self->{par}}) {
2848 my $h = $para->{h}; 2971 my $h = $para->{h};
2972 my $y = $para->{y};
2849 2973
2850 if ($y0 < $y + $h && $y < $y1) { 2974 if ($y0 < $y + $h && $y < $y1) {
2851
2852 my $layout = $self->get_layout ($para); 2975 my $layout = $self->get_layout ($para);
2853 2976
2854 $layout->render ($para->{indent}, $y - $y0); 2977 $layout->render ($para->{indent}, $y - $y0);
2855 2978
2856 if (my @w = @{ $para->{widget} }) { 2979 if (my @w = @{ $para->{widget} }) {
… …
2865 $_->draw; 2988 $_->draw;
2866 } 2989 }
2867 } 2990 }
2868 } 2991 }
2869 2992
2870 $y += $h; 2993 $paridx++;
2994 $top_paragraph ||= $paridx if $y >= $top;
2871 } 2995 }
2996
2997 $self->{top_paragraph} = $top_paragraph;
2872 }; 2998 };
2873 }); 2999 });
2874} 3000}
2875 3001
2876sub reconfigure { 3002sub reconfigure {
… …
2997 3123
2998 $self->add (new CFPlus::UI::Label 3124 $self->add (new CFPlus::UI::Label
2999 markup => $tooltip, 3125 markup => $tooltip,
3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3126 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001 fontsize => 0.8, 3127 fontsize => 0.8,
3002 fg => [0, 0, 0, 1], 3128 style => 1, # FLAG_INVERSE
3003 ellipsise => 0, 3129 ellipsise => 0,
3004 font => ($widget->{tooltip_font} || $::FONT_PROP), 3130 font => ($widget->{tooltip_font} || $::FONT_PROP),
3005 ); 3131 );
3006} 3132}
3007 3133
… …
3161 3287
3162############################################################################# 3288#############################################################################
3163 3289
3164package CFPlus::UI::Menu; 3290package CFPlus::UI::Menu;
3165 3291
3166our @ISA = CFPlus::UI::FancyFrame::; 3292our @ISA = CFPlus::UI::Toplevel::;
3167 3293
3168use CFPlus::OpenGL; 3294use CFPlus::OpenGL;
3169 3295
3170sub new { 3296sub new {
3171 my $class = shift; 3297 my $class = shift;

Diff Legend

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