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.335 by root, Sun Jul 23 16:11:56 2006 UTC vs.
Revision 1.338 by root, Mon Jul 24 08:23:28 2006 UTC

… …
367 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
368 368
369 if ($self->{aspect}) { 369 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
371 371
372 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
374 374
375 # use alignment to adjust x, y 375 # use alignment to adjust x, y
376 376
377 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
2053 $self->SUPER::_draw; 2053 $self->SUPER::_draw;
2054} 2054}
2055 2055
2056############################################################################# 2056#############################################################################
2057 2057
2058package CFClient::UI::CheckBox;
2059
2060our @ISA = CFClient::UI::DrawBG::;
2061
2062my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065
2066use CFClient::OpenGL;
2067
2068sub new {
2069 my $class = shift;
2070
2071 $class->SUPER::new (
2072 padding_x => 2,
2073 padding_y => 2,
2074 fg => [1, 1, 1],
2075 active_fg => [1, 1, 0],
2076 bg => [0, 0, 0, 0.2],
2077 active_bg => [1, 1, 1, 0.5],
2078 state => 0,
2079 can_hover => 1,
2080 @_
2081 )
2082}
2083
2084sub size_request {
2085 my ($self) = @_;
2086
2087 (6) x 2
2088}
2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
2098sub invoke_button_down {
2099 my ($self, $ev, $x, $y) = @_;
2100
2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2103 $self->toggle;
2104 } else {
2105 return 0
2106 }
2107
2108 1
2109}
2110
2111sub _draw {
2112 my ($self) = @_;
2113
2114 $self->SUPER::_draw;
2115
2116 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2117
2118 my ($w, $h) = @$self{qw(w h)};
2119
2120 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2121
2122 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2123
2124 my $tex = $self->{state} ? $tex[1] : $tex[0];
2125
2126 glEnable GL_TEXTURE_2D;
2127 $tex->draw_quad_alpha (0, 0, $s, $s);
2128 glDisable GL_TEXTURE_2D;
2129}
2130
2131#############################################################################
2132
2133package CFClient::UI::Image;
2134
2135our @ISA = CFClient::UI::Base::;
2136
2137use CFClient::OpenGL;
2138
2139our %texture_cache;
2140
2141sub new {
2142 my $class = shift;
2143
2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
2148
2149 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required";
2151
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2154
2155 Scalar::Util::weaken $texture_cache{$self->{path}};
2156
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158
2159 $self
2160}
2161
2162sub STORABLE_freeze {
2163 my ($self, $cloning) = @_;
2164
2165 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2167
2168 $self->{path}
2169}
2170
2171sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_;
2173
2174 $self->new (path => $path)
2175}
2176
2177sub size_request {
2178 my ($self) = @_;
2179
2180 ($self->{tex}{w}, $self->{tex}{h})
2181}
2182
2183sub _draw {
2184 my ($self) = @_;
2185
2186 my $tex = $self->{tex};
2187
2188 my ($w, $h) = ($self->{w}, $self->{h});
2189
2190 if ($self->{rot90}) {
2191 glRotate 90, 0, 0, 1;
2192 glTranslate 0, -$self->{w}, 0;
2193
2194 ($w, $h) = ($h, $w);
2195 }
2196
2197 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200 $tex->draw_quad (0, 0, $w, $h);
2201
2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2058package CFClient::UI::ImageButton; 2207package CFClient::UI::ImageButton;
2059 2208
2060our @ISA = CFClient::UI::Image::; 2209our @ISA = CFClient::UI::Image::;
2061 2210
2062use CFClient::OpenGL; 2211use CFClient::OpenGL;
… …
2085 $self->emit ("activate") 2234 $self->emit ("activate")
2086 if $x >= 0 && $x < $self->{w} 2235 if $x >= 0 && $x < $self->{w}
2087 && $y >= 0 && $y < $self->{h}; 2236 && $y >= 0 && $y < $self->{h};
2088 2237
2089 1 2238 1
2090}
2091
2092#############################################################################
2093
2094package CFClient::UI::CheckBox;
2095
2096our @ISA = CFClient::UI::DrawBG::;
2097
2098my @tex =
2099 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2100 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2101
2102use CFClient::OpenGL;
2103
2104sub new {
2105 my $class = shift;
2106
2107 $class->SUPER::new (
2108 padding_x => 2,
2109 padding_y => 2,
2110 fg => [1, 1, 1],
2111 active_fg => [1, 1, 0],
2112 bg => [0, 0, 0, 0.2],
2113 active_bg => [1, 1, 1, 0.5],
2114 state => 0,
2115 can_hover => 1,
2116 @_
2117 )
2118}
2119
2120sub size_request {
2121 my ($self) = @_;
2122
2123 (6) x 2
2124}
2125
2126sub toggle {
2127 my ($self) = @_;
2128
2129 $self->{state} = !$self->{state};
2130 $self->emit (changed => $self->{state});
2131 $self->update;
2132}
2133
2134sub invoke_button_down {
2135 my ($self, $ev, $x, $y) = @_;
2136
2137 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2138 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2139 $self->toggle;
2140 } else {
2141 return 0
2142 }
2143
2144 1
2145}
2146
2147sub _draw {
2148 my ($self) = @_;
2149
2150 $self->SUPER::_draw;
2151
2152 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2153
2154 my ($w, $h) = @$self{qw(w h)};
2155
2156 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2157
2158 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2159
2160 my $tex = $self->{state} ? $tex[1] : $tex[0];
2161
2162 glEnable GL_TEXTURE_2D;
2163 $tex->draw_quad_alpha (0, 0, $s, $s);
2164 glDisable GL_TEXTURE_2D;
2165}
2166
2167#############################################################################
2168
2169package CFClient::UI::Image;
2170
2171our @ISA = CFClient::UI::Base::;
2172
2173use CFClient::OpenGL;
2174
2175our %texture_cache;
2176
2177sub new {
2178 my $class = shift;
2179
2180 my $self = $class->SUPER::new (
2181 can_events => 0,
2182 @_,
2183 );
2184
2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
2187
2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2190
2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2192
2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2194
2195 $self
2196}
2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2201 $self->{path}
2202 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2203
2204 $self->{path}
2205}
2206
2207sub STORABLE_attach {
2208 my ($self, $cloning, $path) = @_;
2209
2210 $self->new (path => $path)
2211}
2212
2213sub size_request {
2214 my ($self) = @_;
2215
2216 ($self->{tex}{w}, $self->{tex}{h})
2217}
2218
2219sub _draw {
2220 my ($self) = @_;
2221
2222 my $tex = $self->{tex};
2223
2224 my ($w, $h) = ($self->{w}, $self->{h});
2225
2226 if ($self->{rot90}) {
2227 glRotate 90, 0, 0, 1;
2228 glTranslate 0, -$self->{w}, 0;
2229
2230 ($w, $h) = ($h, $w);
2231 }
2232
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236 $tex->draw_quad (0, 0, $w, $h);
2237
2238 glDisable GL_TEXTURE_2D;
2239} 2239}
2240 2240
2241############################################################################# 2241#############################################################################
2242 2242
2243package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2755 $self->{height} = 0; 2755 $self->{height} = 0;
2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757} 2757}
2758 2758
2759sub add_paragraph { 2759sub add_paragraph {
2760 my ($self, $color, $para, $indent) = @_; 2760 my $self = shift;
2761 2761
2762 my ($text, @w) = ref $para ? @$para : $para; 2762 for my $para (@_) {
2763
2764 $para = { 2763 $para = {
2764 fg => [1, 1, 1, 1],
2765 indent => 0,
2766 markup => "",
2767 widget => [],
2768 ref $para ? %$para : (markup => $para),
2765 w => 1e10, 2769 w => 1e10,
2766 wrapped => 1, 2770 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2771 }; 2771 };
2772 2772
2773 $self->add (@w) if @w; 2773 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 2774 push @{$self->{par}}, $para;
2775 }
2775 2776
2776 $self->{need_reflow}++; 2777 $self->{need_reflow}++;
2777 $self->update; 2778 $self->update;
2778} 2779}
2779 2780
… …
3058 3059
3059############################################################################# 3060#############################################################################
3060 3061
3061package CFClient::UI::Face; 3062package CFClient::UI::Face;
3062 3063
3063our @ISA = CFClient::UI::Base::; 3064our @ISA = CFClient::UI::DrawBG::;
3064 3065
3065use CFClient::OpenGL; 3066use CFClient::OpenGL;
3066 3067
3067sub new { 3068sub new {
3068 my $class = shift; 3069 my $class = shift;
… …
3104 3105
3105sub _draw { 3106sub _draw {
3106 my ($self) = @_; 3107 my ($self) = @_;
3107 3108
3108 return unless $::CONN; 3109 return unless $::CONN;
3110
3111 $self->SUPER::_draw;
3109 3112
3110 my $face; 3113 my $face;
3111 3114
3112 if ($self->{frame}) { 3115 if ($self->{frame}) {
3113 my $anim = $::CONN->{anim}[$self->{anim}]; 3116 my $anim = $::CONN->{anim}[$self->{anim}];
… …
3360 $self->emit (page_changed => $self->{multiplexer}{current}); 3363 $self->emit (page_changed => $self->{multiplexer}{current});
3361} 3364}
3362 3365
3363############################################################################# 3366#############################################################################
3364 3367
3365package CFClient::UI::Combobox; 3368package CFClient::UI::Selector;
3366 3369
3367use utf8; 3370use utf8;
3368 3371
3369our @ISA = CFClient::UI::Button::; 3372our @ISA = CFClient::UI::Button::;
3370 3373
… …
3940 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3941 3944
3942 $w = max $widget->{min_w}, $w; 3945 $w = max $widget->{min_w}, $w;
3943 $h = max $widget->{min_h}, $h; 3946 $h = max $widget->{min_h}, $h;
3944 3947
3948# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3949# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3950
3945 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 3951 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3946 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 3952 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3947 3953
3948 $w = int $w + 0.5; 3954 $w = int $w + 0.5;
3949 $h = int $h + 0.5; 3955 $h = int $h + 0.5;

Diff Legend

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