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.210 by root, Wed May 17 10:14:52 2006 UTC vs.
Revision 1.227 by root, Wed May 24 03:29:20 2006 UTC

… …
136 $rem += $_ - $i; 136 $rem += $_ - $i;
137 $_ = $i; 137 $_ = $i;
138 } 138 }
139} 139}
140 140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
141# call when resolution changes etc. 149# call when resolution changes etc.
142sub rescale_widgets { 150sub rescale_widgets {
143 my ($sx, $sy) = @_; 151 my ($sx, $sy) = @_;
144 152
153 # make a copy, otherwise for complains about freed values.
145 for my $widget (values %WIDGET) { 154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
146 if ($widget->{toplevel}) { 157 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
… …
195 %$self = (); 206 %$self = ();
196} 207}
197 208
198sub show { 209sub show {
199 my ($self) = @_; 210 my ($self) = @_;
200
201 return if $self->{parent}; 211 return if $self->{parent};
202 212
203 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
204} 227}
205 228
206sub hide { 229sub hide {
207 my ($self) = @_; 230 my ($self) = @_;
208 231
… …
416 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
417 440
418 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size 442 $self->check_size
420 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
421} 446}
422 447
423sub check_size { 448sub check_size {
424 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
425 450
… …
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
691 716
692 $self->_render; 717 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 718 };
701} 719}
702 720
703sub _draw { 721sub _draw {
704 my ($self) = @_; 722 my ($self) = @_;
… …
708 my $tex = $self->{texture} 726 my $tex = $self->{texture}
709 or return; 727 or return;
710 728
711 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
714 732
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 734
717 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
718} 736}
… …
725 743
726sub size_request { 744sub size_request {
727 my ($self) = @_; 745 my ($self) = @_;
728 746
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 748
732 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
733} 750}
734 751
735sub size_allocate { 752sub size_allocate {
736 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
737 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
738 $self->update; 758 $self->update;
739} 759}
740 760
741sub set_offset { 761sub set_offset {
742 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
802 }, 822 },
803 ; 823 ;
804 824
805 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 827 slider => $slider,
808 @_, 828 @_,
809 ); 829 );
810 830
811 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
1297 #bg => none 1317 #bg => none
1298 #active_bg => none 1318 #active_bg => none
1299 #font => default_font 1319 #font => default_font
1300 #text => initial text 1320 #text => initial text
1301 #markup => initial narkup 1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1324 layout => (new CFClient::Layout),
1303 fontsize => 1, 1325 fontsize => 1,
1304 align => -1, 1326 align => -1,
1305 valign => -1, 1327 valign => -1,
1306 padding => 2, 1328 padding => 2,
… …
1371sub size_request { 1393sub size_request {
1372 my ($self) = @_; 1394 my ($self) = @_;
1373 1395
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1401
1378 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1379 1403
1380 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1416 1440
1417 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1442 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1448
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1450
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1464 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1465 can_hover => 1, 1491 can_hover => 1,
1466 can_focus => 1, 1492 can_focus => 1,
1467 valign => 0, 1493 valign => 0,
1468 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1469 @_ 1496 @_
1470 ) 1497 )
1471} 1498}
1472 1499
1473sub _set_text { 1500sub _set_text {
… …
2043 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2073 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2074 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2051 vertical => 0, 2078 vertical => 0,
2052 can_hover => 1, 2079 can_hover => 1,
2053 inner_pad => .05, 2080 inner_pad => 0.02,
2054 @_ 2081 @_
2055 ); 2082 );
2056 2083
2057 $self->set_value ($self->{range}[0]); 2084 $self->set_value ($self->{range}[0]);
2058 $self->update; 2085 $self->update;
2059 2086
2060 $self 2087 $self
2061} 2088}
2062 2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2063sub set_value { 2098sub set_value {
2064 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2065 2100
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2102
2068 $hi = $lo + 1 if $hi <= $lo; 2103 $hi = $lo + 1 if $hi <= $lo;
2069 2104
2105 $page = $hi - $lo if $page > $hi - $lo;
2106
2070 $value = $lo if $value < $lo; 2107 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2108 $value = $hi - $page if $value > $hi - $page;
2072 2109
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2110 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2111 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077 2112
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2114
2080 if ($value != $old_value) { 2115 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2116 $self->emit (changed => $value);
… …
2094 2129
2095sub button_down { 2130sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
2097 2132
2098 $self->SUPER::button_down ($ev, $x, $y); 2133 $self->SUPER::button_down ($ev, $x, $y);
2134
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136
2099 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
2100} 2138}
2101 2139
2102sub mouse_motion { 2140sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2143 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2145
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2146 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2147
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2149
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2151 }
2114} 2152}
2115 2153
2116sub update { 2154sub update {
2117 my ($self) = @_; 2155 my ($self) = @_;
2118 2156
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2158 $self->set_value ($self->{range}[0]);
2121 2159
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
2123 2162
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2164
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2165 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2166 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2167
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2168 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2169 $value = $value * $self->{scale} + $self->{offset};
2130 2170
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2171 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2172 $self->{knob_w} = $knob_w;
2138 }); 2173 });
2139 2174
2140 $self->SUPER::update; 2175 $self->SUPER::update;
2141} 2176}
2142 2177
… …
2148 glScale $self->{w}, $self->{h}; 2183 glScale $self->{w}, $self->{h};
2149 2184
2150 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2152 2187
2188 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2190 }
2156 2191
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2194
… …
2166 # draw handle 2201 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2203
2169 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2170} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2171 2247
2172############################################################################# 2248#############################################################################
2173 2249
2174package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2175 2251
… …
2205 2281
2206 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2283 $self->reflow;
2208} 2284}
2209 2285
2286sub size_allocate {
2287 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290
2291 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294
2295 $self->reflow;
2296}
2297
2210sub text_height { 2298sub text_height {
2211 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2212 2300
2213 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2214 2302
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2217 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2218 2306
2219 ($layout->size)[1] 2307 ($layout->size)[1]
2220} 2308}
2221 2309
… …
2224 2312
2225 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2226 $self->update; 2314 $self->update;
2227} 2315}
2228 2316
2229sub size_allocate { 2317sub set_offset {
2318 my ($self, $offset) = @_;
2319
2320 # todo: base offset on lines or so, not on pixels
2321 $self->{children}[1]->set_value ($offset);
2322}
2323
2324sub clear {
2230 my ($self, $w, $h) = @_; 2325 my ($self) = @_;
2231 2326
2232 $self->SUPER::size_allocate ($w, $h); 2327 $self->{par} = [];
2233 2328 $self->{height} = 0;
2234 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2235 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2236 $self->{layout}->set_width ($self->{children}[0]{w});
2237
2238 $self->reflow;
2239} 2330}
2240 2331
2241sub add_paragraph { 2332sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2333 my ($self, $color, $text, $indent) = @_;
2243 2334
2244 #TODO: intelligently "reformat" paragraph 2335 for my $line (split /\n/, $text) {
2245
2246 my $height = $self->text_height ($text); 2336 my $height = $self->text_height ($line);
2247
2248 $self->{height} += $height; 2337 $self->{height} += $height;
2249
2250 push @{$self->{par}}, [$height, $color, $text]; 2338 push @{$self->{par}}, [$height, $color, $indent, $line];
2339 }
2251 2340
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2342}
2255 2343
2256sub update { 2344sub update {
2257 my ($self) = @_; 2345 my ($self) = @_;
2258 2346
… …
2264 2352
2265 $ROOT->on_post_alloc ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2266 if (delete $self->{need_reflow}) { 2354 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2355 my $height = 0;
2268 2356
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2357 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2270 for @{$self->{par}}; 2358 for @{$self->{par}};
2271 2359
2272 $self->{height} = $height; 2360 $self->{height} = $height;
2273 2361
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2362 $self->{children}[1]->set_range ([$height, 0, $height, $self->{h}, 1]);
2275 2363
2276 delete $self->{texture}; 2364 delete $self->{texture};
2277 } 2365 }
2278 2366
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2367 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2280 glClearColor 0, 0, 0, 0; 2368 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2369 glClear GL_COLOR_BUFFER_BIT;
2282
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285 2370
2286 my $top = int $self->{children}[1]{range}[0]; 2371 my $top = int $self->{children}[1]{range}[0];
2287 2372
2288 my $y0 = $top; 2373 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2374 my $y1 = $top + $self->{h};
… …
2292 2377
2293 my $layout = $self->{layout}; 2378 my $layout = $self->{layout};
2294 2379
2295 $layout->set_font ($self->{font}) if $self->{font}; 2380 $layout->set_font ($self->{font}) if $self->{font};
2296 2381
2382 glEnable GL_BLEND;
2383 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2384
2297 for my $par (@{$self->{par}}) { 2385 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2386 my $h = $par->[0];
2299 2387
2300 if ($y0 < $y + $h && $y < $y1) { 2388 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2389 $layout->set_foreground (@{ $par->[1] });
2390 $layout->set_width ($self->{w} - $par->[2]);
2302 $layout->set_markup ($par->[2]); 2391 $layout->set_markup ($par->[3]);
2303 2392
2304 my ($W, $H) = $layout->size; 2393 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2394
2395 glRasterPos $par->[2], $y - $y0;
2396 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2397 }
2307 2398
2308 $y += $h; 2399 $y += $h;
2309 } 2400 }
2310 2401
2311 glDisable GL_TEXTURE_2D; 2402 glDisable GL_BLEND;
2312 }; 2403 };
2313 }); 2404 });
2314} 2405}
2315 2406
2316sub _draw { 2407sub _draw {
2317 my ($self) = @_; 2408 my ($self) = @_;
2318 2409
2319 glEnable GL_TEXTURE_2D; 2410 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2412 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2413 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2324 2415
2325 $self->{children}[1]->draw; 2416 $self->{children}[1]->draw;
2326 2417
2327} 2418}
… …
2426 2517
2427sub set_tooltip_from { 2518sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2519 my ($self, $widget) = @_;
2429 2520
2430 $self->add (new CFClient::UI::Label 2521 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2522 markup => $widget->{tooltip},
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2523 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2524 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2525 fg => [0, 0, 0, 1],
2526 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2527 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2528 );
2437} 2529}
2438 2530
2439sub size_request { 2531sub size_request {
2440 my ($self) = @_; 2532 my ($self) = @_;
… …
2486use CFClient::OpenGL; 2578use CFClient::OpenGL;
2487 2579
2488sub new { 2580sub new {
2489 my $class = shift; 2581 my $class = shift;
2490 2582
2491 $class->SUPER::new ( 2583 my $self = $class->SUPER::new (
2492 aspect => 1, 2584 aspect => 1,
2493 @_, 2585 @_,
2494 ) 2586 );
2587
2588 if ($self->{anim} && $self->{animspeed}) {
2589 Scalar::Util::weaken (my $widget = $self);
2590
2591 $self->{timer} = Event->timer (
2592 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2593 hard => 1,
2594 interval => $self->{animspeed},
2595 cb => sub {
2596 ++$widget->{frame};
2597 $widget->update;
2598 },
2599 );
2600 }
2601
2602 $self
2495} 2603}
2496 2604
2497sub size_request { 2605sub size_request {
2498 (32, 8) 2606 (32, 8)
2499} 2607}
2500 2608
2609sub update {
2610 my ($self) = @_;
2611
2612 return unless $self->{visible};
2613
2614 $self->SUPER::update;
2615}
2616
2501sub _draw { 2617sub _draw {
2502 my ($self) = @_; 2618 my ($self) = @_;
2503 2619
2504 return unless $::CONN;#d# manage and cache textures differently 2620 return unless $::CONN;
2621
2622 my $face;
2623
2624 if ($self->{frame}) {
2625 my $anim = $::CONN->{anim}[$self->{anim}];
2626
2627 $face = $anim->[ $self->{frame} % @$anim ]
2628 if $anim && @$anim;
2629 }
2630
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2631 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2632
2507 # TODO animation
2508 if ($tex) { 2633 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2636 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2637 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2514 } 2639 }
2515} 2640}
2516 2641
2642sub DESTROY {
2643 my ($self) = @_;
2644
2645 $self->{timer}->cancel
2646 if $self->{timer};
2647
2648 $self->SUPER::DESTROY;
2649}
2650
2517############################################################################# 2651#############################################################################
2518 2652
2519package CFClient::UI::InventoryItem; 2653package CFClient::UI::InventoryItem;
2520 2654
2521our @ISA = CFClient::UI::HBox::; 2655our @ISA = CFClient::UI::HBox::;
2522 2656
2523sub new { 2657sub _item_to_desc {
2524 my $class = shift; 2658 my ($item) = @_;
2525 2659
2526 my %args = @_; 2660 my $desc =
2527
2528 my $item = delete $args{item};
2529
2530 my $desc = $item->{nrof} < 2 2661 $item->{nrof} < 2
2531 ? $item->{name} 2662 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}"; 2663 : "$item->{nrof} × $item->{name_pl}";
2533 2664
2534 $item->{flags} & Crossfire::Protocol::F_OPEN 2665 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)"; 2666 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED 2667 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)"; 2668 and $desc .= " (applied)";
… …
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED 2675 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)"; 2676 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED 2677 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *"; 2678 and $desc .= " *";
2548 2679
2680 $desc
2681}
2682
2683sub new {
2684 my $class = shift;
2685
2686 my %args = @_;
2687
2688 my $item = delete $args{item};
2689
2690 my $desc = _item_to_desc ($item);
2691
2549 my $self = $class->SUPER::new ( 2692 my $self = $class->SUPER::new (
2550 can_hover => 1, 2693 can_hover => 1,
2551 can_events => 1, 2694 can_events => 1,
2552 tooltip => ((CFClient::UI::Label::escape $desc) 2695 tooltip => ((CFClient::UI::Label::escape $desc)
2553 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2696 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2554 connect_button_down => sub { 2697 connect_button_down => sub {
2555 my ($self, $ev, $x, $y) = @_; 2698 my ($self, $ev, $x, $y) = @_;
2556 2699
2557 # todo: maybe put examine on 1? but should just be a tooltip :( 2700 # todo: maybe put examine on 1? but should just be a tooltip :(
2701 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2702 my $targ = $::CONN->{player}{tag};
2703
2704 if ($item->{container} == $::CONN->{player}{tag}) {
2705 $targ = $main::OPENCONT;
2706 }
2707
2708 $::CONN->send ("move $targ $item->{tag} 0");
2558 if ($ev->{button} == 1) { 2709 } elsif ($ev->{button} == 1) {
2559 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2710 $::CONN->send ("examine $item->{tag}");
2560 } elsif ($ev->{button} == 2) { 2711 } elsif ($ev->{button} == 2) {
2561 $::CONN->send ("apply $item->{tag}"); 2712 $::CONN->send ("apply $item->{tag}");
2562 } elsif ($ev->{button} == 3) { 2713 } elsif ($ev->{button} == 3) {
2563 my @menu_items = ( 2714 my @menu_items = (
2564 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2715 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2716 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2566 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2717 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2718 (
2719 $item->{flags} & Crossfire::Protocol::F_LOCKED
2720 ? (
2721 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2722 )
2723 : (
2724 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2567 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2725 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568 [ 2726 )
2569 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571 ], 2727 ),
2572 ); 2728 );
2573 2729
2574 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2730 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575 } 2731 }
2576 2732
2577 1 2733 1
2578 }, 2734 },
2579 %args 2735 %args
2580 ); 2736 );
2737
2581 2738
2582 $self->add (new CFClient::UI::Face 2739 $self->add (new CFClient::UI::Face
2583 can_events => 0, 2740 can_events => 0,
2584 face => $item->{face}, 2741 face => $item->{face},
2585 anim => $item->{anim}, 2742 anim => $item->{anim},
2586 animspeed => $item->{animspeed}, 2743 animspeed => $item->{animspeed},
2587 ); 2744 );
2588 2745
2589 $self->add (new CFClient::UI::Label 2746 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2590 can_events => 0, 2747
2591 text => $desc, 2748 $self->{item} = $item;
2592 ); 2749
2750 $self->update_item;
2593 2751
2594 $self 2752 $self
2753}
2754
2755sub update_item {
2756 my ($self) = @_;
2757
2758 my $desc = _item_to_desc ($self->{item});
2759
2760 $self->{name_lbl}->set_text ($desc);
2595} 2761}
2596 2762
2597############################################################################# 2763#############################################################################
2598 2764
2599package CFClient::UI::Inventory; 2765package CFClient::UI::Inventory;
… …
2602 2768
2603sub new { 2769sub new {
2604 my $class = shift; 2770 my $class = shift;
2605 2771
2606 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox), 2773 scrolled => (new CFClient::UI::Table),
2608 @_, 2774 @_,
2609 ); 2775 );
2610 2776
2611 $self 2777 $self
2612} 2778}
… …
2623 } @$items; 2789 } @$items;
2624 2790
2625 $self->{real_items} = \@items; 2791 $self->{real_items} = \@items;
2626 2792
2627 for my $item (@items) { 2793 for my $item (@items) {
2628 my $desc = $item->{nrof} < 2 2794 $item->{item} = $item;
2629 ? $item->{name}
2630 : "$item->{nrof} $item->{name_pl}";
2631
2632 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2795 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2796 $item->update_item ();
2633 } 2797 }
2634 2798
2799 my $i = 0;
2800 for (@items) {
2635 $self->{scrolled}->add (@items); 2801 $self->{scrolled}->add (0, $i, $_);
2802 my $nrof = $_->{item}->{nrof} || 1;
2803 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2804 }
2636 2805
2637# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2806# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638} 2807}
2639 2808
2640sub size_request { 2809sub size_request {
… …
2752 # TODO: doesn't handle markup well (read as: at all) 2921 # TODO: doesn't handle markup well (read as: at all)
2753 my $short = $item->{count} > 1 2922 my $short = $item->{count} > 1
2754 ? "<b>$item->{count} ×</b> $item->{text}" 2923 ? "<b>$item->{count} ×</b> $item->{text}"
2755 : $item->{text}; 2924 : $item->{text};
2756 2925
2757 my $fontsize = $item->{fontsize} || $self->{fontsize};
2758
2759 for ($short) { 2926 for ($short) {
2760 s/^\s+//; 2927 s/^\s+//;
2761 s/\s+/ /g; 2928 s/\s+/ /g;
2762 my $len = int 40 / $fontsize;
2763 substr $_, $len, length, "…" if $len < length;
2764 } 2929 }
2765 2930
2766 new CFClient::UI::Label 2931 new CFClient::UI::Label
2767 markup => $short, 2932 markup => $short,
2768 tooltip => $item->{tooltip}, 2933 tooltip => $item->{tooltip},
2769 tooltip_font => $::FONT_PROP, 2934 tooltip_font => $::FONT_PROP,
2770 tooltip_width => 0.67, 2935 tooltip_width => 0.67,
2771 fontsize => $fontsize, 2936 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44,
2772 fg => $item->{fg}, 2938 fg => $item->{fg},
2773 can_events => 1, 2939 can_events => 1,
2774 can_hover => 1 2940 can_hover => 1
2775 }; 2941 };
2776 } 2942 }
… …
2813 } 2979 }
2814 2980
2815 $self->reorder; 2981 $self->reorder;
2816} 2982}
2817 2983
2984sub reconfigure {
2985 my ($self) = @_;
2986
2987 delete $_->{label}
2988 for values %{ $self->{item} || {} };
2989
2990 $self->reorder;
2991 $self->SUPER::reconfigure;
2992}
2993
2818############################################################################# 2994#############################################################################
2819 2995
2820package CFClient::UI::Root; 2996package CFClient::UI::Root;
2821 2997
2822our @ISA = CFClient::UI::Container::; 2998our @ISA = CFClient::UI::Container::;
… …
2905 $child->{x} = int $child->{x}; 3081 $child->{x} = int $child->{x};
2906 $child->{y} = int $child->{y}; 3082 $child->{y} = int $child->{y};
2907 } 3083 }
2908 3084
2909 $self->SUPER::add (@children); 3085 $self->SUPER::add (@children);
3086
3087 while (@children) {
3088 my $w = pop @children;
3089 push @children, $w->children;
3090 $w->{visible} = 1;
3091 }
3092}
3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 delete $w->{visible};
3103 }
2910} 3104}
2911 3105
2912sub on_refresh { 3106sub on_refresh {
2913 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2914 3108
… …
2983 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3177 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2984 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2985 3179
2986 glMatrixMode GL_PROJECTION; 3180 glMatrixMode GL_PROJECTION;
2987 glLoadIdentity; 3181 glLoadIdentity;
2988 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2989 glMatrixMode GL_MODELVIEW; 3183 glMatrixMode GL_MODELVIEW;
2990 glLoadIdentity; 3184 glLoadIdentity;
2991 3185
2992 $self->_draw; 3186 $self->_draw;
2993} 3187}
… …
2995############################################################################# 3189#############################################################################
2996 3190
2997package CFClient::UI; 3191package CFClient::UI;
2998 3192
2999$ROOT = new CFClient::UI::Root; 3193$ROOT = new CFClient::UI::Root;
3000$TOOLTIP = new CFClient::UI::Tooltip; 3194$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3001 3195
30021 31961
3003 3197

Diff Legend

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