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.357 by root, Fri Dec 8 13:49:57 2006 UTC

… …
514); 514);
515 515
516sub emit { 516sub emit {
517 my ($self, $signal, @args) = @_; 517 my ($self, $signal, @args) = @_;
518 518
519 # I do not really like this solution, but I dislike duplication 519 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 520 # and needlessly verbose code, either.
521 my @append 521 my @append
522 = $has_coords{$signal} 522 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 523 ? $args[0]->xy ($self)
524 : (); 524 : ();
525 525
… …
898 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
899 899
900 { 900 {
901 package CFPlus::UI::Base; 901 package CFPlus::UI::Base;
902 902
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
905
906 $self->_render;
905 } 907 }
906
907 $self->_render;
908 }; 908 };
909} 909}
910 910
911sub _draw { 911sub _draw {
912 my ($self) = @_; 912 my ($self) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 913
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;
… …
1867 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1868 } elsif ($sym == CFPlus::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1869 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1870 } elsif ($sym == CFPlus::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1871 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = "";
1973 $self->{cursor} = 0;
1872 } elsif ($uni == 27) { 1974 } elsif ($uni == 27) {
1873 $self->emit ('escape'); 1975 $self->emit ('escape');
1874 } elsif ($uni) { 1976 } elsif ($uni >= 0x20) {
1875 substr $text, $self->{cursor}++, 0, chr $uni; 1977 substr $text, $self->{cursor}++, 0, chr $uni;
1876 } else { 1978 } else {
1877 return 0; 1979 return 0;
1878 } 1980 }
1879 1981
… …
1949 utf8::encode $text; 2051 utf8::encode $text;
1950 2052
1951 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2053 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1952 } 2054 }
1953 2055
1954 glColor @{$self->{fg}};
1955 glBegin GL_LINES; 2056 glBegin GL_LINES;
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2057 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}; 2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958 glEnd; 2059 glEnd;
1959 } 2060 }
1960} 2061}
1961 2062
1962package CFPlus::UI::Entry; 2063package CFPlus::UI::Entry;
… …
2752 2853
2753 # todo: base offset on lines or so, not on pixels 2854 # todo: base offset on lines or so, not on pixels
2754 $self->{children}[1]->set_value ($offset); 2855 $self->{children}[1]->set_value ($offset);
2755} 2856}
2756 2857
2858sub current_paragraph {
2859 my ($self) = @_;
2860
2861 $self->{top_paragraph} - 1
2862}
2863
2864sub scroll_to {
2865 my ($self, $para) = @_;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868
2869 $self->{scroll_to} = $para;
2870 $self->update;
2871}
2872
2757sub clear { 2873sub clear {
2758 my ($self) = @_; 2874 my ($self) = @_;
2759 2875
2760 my (undef, undef, @other) = @{ $self->{children} }; 2876 my (undef, undef, @other) = @{ $self->{children} };
2761 $self->remove ($_) for @other; 2877 $self->remove ($_) for @other;
… …
2788} 2904}
2789 2905
2790sub scroll_to_bottom { 2906sub scroll_to_bottom {
2791 my ($self) = @_; 2907 my ($self) = @_;
2792 2908
2793 $self->{scroll_to_bottom} = 1; 2909 $self->{scroll_to} = $#{$self->{par}};
2794 $self->update; 2910 $self->update;
2795} 2911}
2796 2912
2913sub force_uptodate {
2914 my ($self) = @_;
2915
2916 if (delete $self->{need_reflow}) {
2917 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2918
2919 my $height = 0;
2920
2921 for my $para (@{$self->{par}}) {
2922 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2923 my $layout = $self->get_layout ($para);
2924 my ($w, $h) = $layout->size;
2925
2926 $para->{w} = $w + $para->{indent};
2927 $para->{h} = $h;
2928 $para->{wrapped} = $layout->has_wrapped;
2929 }
2930
2931 $para->{y} = $height;
2932 $height += $para->{h};
2933 }
2934
2935 $self->{height} = $height;
2936 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2937
2938 delete $self->{texture};
2939 }
2940
2941 if (my $paridx = delete $self->{scroll_to}) {
2942 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2943 }
2944}
2945
2797sub update { 2946sub update {
2798 my ($self) = @_; 2947 my ($self) = @_;
2799 2948
2800 $self->SUPER::update; 2949 $self->SUPER::update;
2801 2950
2802 return unless $self->{h} > 0; 2951 return unless $self->{h} > 0;
2803 2952
2804 delete $self->{texture}; 2953 delete $self->{texture};
2805 2954
2806 $ROOT->on_post_alloc ($self => sub { 2955 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate;
2957
2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2958 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 2959
2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837 glClearColor 0, 0, 0, 0; 2961 glClearColor 0, 0, 0, 0;
2838 glClear GL_COLOR_BUFFER_BIT; 2962 glClear GL_COLOR_BUFFER_BIT;
2839 2963
2964 package CFPlus::UI::Base;
2965 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2966 (0, 0, $self->{w}, $self->{h});
2967
2968 my $top = int $self->{children}[1]{range}[0];
2969
2970 my $paridx = 0;
2971 my $top_paragraph;
2840 my $top = int $self->{children}[1]{range}[0]; 2972 my $top = int $self->{children}[1]{range}[0];
2841 2973
2842 my $y0 = $top; 2974 my $y0 = $top;
2843 my $y1 = $top + $H; 2975 my $y1 = $top + $H;
2844 2976
2845 my $y = 0;
2846
2847 for my $para (@{$self->{par}}) { 2977 for my $para (@{$self->{par}}) {
2848 my $h = $para->{h}; 2978 my $h = $para->{h};
2979 my $y = $para->{y};
2849 2980
2850 if ($y0 < $y + $h && $y < $y1) { 2981 if ($y0 < $y + $h && $y < $y1) {
2851
2852 my $layout = $self->get_layout ($para); 2982 my $layout = $self->get_layout ($para);
2853 2983
2854 $layout->render ($para->{indent}, $y - $y0); 2984 $layout->render ($para->{indent}, $y - $y0);
2855 2985
2856 if (my @w = @{ $para->{widget} }) { 2986 if (my @w = @{ $para->{widget} }) {
… …
2865 $_->draw; 2995 $_->draw;
2866 } 2996 }
2867 } 2997 }
2868 } 2998 }
2869 2999
2870 $y += $h; 3000 $paridx++;
3001 $top_paragraph ||= $paridx if $y >= $top;
2871 } 3002 }
3003
3004 $self->{top_paragraph} = $top_paragraph;
2872 }; 3005 };
2873 }); 3006 });
2874} 3007}
2875 3008
2876sub reconfigure { 3009sub reconfigure {
… …
2997 3130
2998 $self->add (new CFPlus::UI::Label 3131 $self->add (new CFPlus::UI::Label
2999 markup => $tooltip, 3132 markup => $tooltip,
3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3133 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001 fontsize => 0.8, 3134 fontsize => 0.8,
3002 fg => [0, 0, 0, 1], 3135 style => 1, # FLAG_INVERSE
3003 ellipsise => 0, 3136 ellipsise => 0,
3004 font => ($widget->{tooltip_font} || $::FONT_PROP), 3137 font => ($widget->{tooltip_font} || $::FONT_PROP),
3005 ); 3138 );
3006} 3139}
3007 3140
… …
3155 3288
3156package CFPlus::UI::Buttonbar; 3289package CFPlus::UI::Buttonbar;
3157 3290
3158our @ISA = CFPlus::UI::HBox::; 3291our @ISA = CFPlus::UI::HBox::;
3159 3292
3160# TODO: should actualyl wrap buttons and other goodies. 3293# TODO: should actually wrap buttons and other goodies.
3161 3294
3162############################################################################# 3295#############################################################################
3163 3296
3164package CFPlus::UI::Menu; 3297package CFPlus::UI::Menu;
3165 3298
3166our @ISA = CFPlus::UI::FancyFrame::; 3299our @ISA = CFPlus::UI::Toplevel::;
3167 3300
3168use CFPlus::OpenGL; 3301use CFPlus::OpenGL;
3169 3302
3170sub new { 3303sub new {
3171 my $class = shift; 3304 my $class = shift;
… …
3694 if ($ev->{button} == 1) { 3827 if ($ev->{button} == 1) {
3695 $::CONN->user_send ("cast $spell->{name}"); 3828 $::CONN->user_send ("cast $spell->{name}");
3696 } elsif ($ev->{button} == 2) { 3829 } elsif ($ev->{button} == 2) {
3697 $::CONN->user_send ("invoke $spell->{name}"); 3830 $::CONN->user_send ("invoke $spell->{name}");
3698 } elsif ($ev->{button} == 3) { 3831 } elsif ($ev->{button} == 3) {
3832 my $shortname = CFPlus::shorten $spell->{name}, 14;
3699 (new CFPlus::UI::Menu 3833 (new CFPlus::UI::Menu
3700 items => [ 3834 items => [
3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3835 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3836 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703 ], 3837 ],
3704 )->popup ($ev); 3838 )->popup ($ev);
3705 } else { 3839 } else {
3706 return 0; 3840 return 0;
3707 } 3841 }
3708 3842
3709 1 3843 1
3710 }; 3844 };
3711 3845
3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3846 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3713 3847
3714 #TODO: add path info to tooltip 3848 #TODO: add path info to tooltip
3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path}); 3849 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716 3850
3717 $self->add (0, $row, new CFPlus::UI::Face 3851 $self->add (0, $row, new CFPlus::UI::Face
… …
3995 glLoadIdentity; 4129 glLoadIdentity;
3996 4130
3997 { 4131 {
3998 package CFPlus::UI::Base; 4132 package CFPlus::UI::Base;
3999 4133
4000 ($draw_x, $draw_y, $draw_w, $draw_h) = 4134 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001 (0, 0, $self->{w}, $self->{h}); 4135 (0, 0, $self->{w}, $self->{h});
4002 }
4003 4136
4004 $self->_draw; 4137 $self->_draw;
4138 }
4005} 4139}
4006 4140
4007############################################################################# 4141#############################################################################
4008 4142
4009package CFPlus::UI; 4143package CFPlus::UI;

Diff Legend

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