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.209 by root, Wed May 17 00:26:55 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 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) = @_;
… …
796 816
797 my $slider = new CFClient::UI::Slider 817 my $slider = new CFClient::UI::Slider
798 vertical => 1, 818 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 819 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 820 connect_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1]);
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});
812 $self->add ($self->{vp}); 832 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 833 $self->add ($self->{slider});
814 834
815 $self 835 $self
836}
837
838sub size_allocate {
839 my ($self, $w, $h) = @_;
840
841 $self->SUPER::size_allocate ($w, $h);
842
843 my $child = $self->{vp}->child;
844 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 845}
817 846
818#TODO# update range on size_allocate depending on child 847#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 848# update viewport offset on scroll
820 849
… …
1297 #bg => none 1326 #bg => none
1298 #active_bg => none 1327 #active_bg => none
1299 #font => default_font 1328 #font => default_font
1300 #text => initial text 1329 #text => initial text
1301 #markup => initial narkup 1330 #markup => initial narkup
1331 #max_w => maximum pixel width
1332 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1333 layout => (new CFClient::Layout),
1303 fontsize => 1, 1334 fontsize => 1,
1304 align => -1, 1335 align => -1,
1305 valign => -1, 1336 valign => -1,
1306 padding => 2, 1337 padding => 2,
… …
1371sub size_request { 1402sub size_request {
1372 my ($self) = @_; 1403 my ($self) = @_;
1373 1404
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1405 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1406 $self->{layout}->set_width ($self->{max_w} || -1);
1407 $self->{layout}->set_ellipsise ($self->{ellipsise});
1408 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1409 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1410
1378 my ($w, $h) = $self->{layout}->size; 1411 my ($w, $h) = $self->{layout}->size;
1379 1412
1380 if (exists $self->{template}) { 1413 if (exists $self->{template}) {
… …
1416 1449
1417 my $tex = $self->{texture} ||= do { 1450 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1451 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1452 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1453 $self->{layout}->set_width ($self->{w});
1454 $self->{layout}->set_ellipsise ($self->{ellipsise});
1455 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1456 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1457
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1458 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1459
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1460 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1461 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1464 active_fg => [0, 0, 0], 1499 active_fg => [0, 0, 0],
1465 can_hover => 1, 1500 can_hover => 1,
1466 can_focus => 1, 1501 can_focus => 1,
1467 valign => 0, 1502 valign => 0,
1468 can_events => 1, 1503 can_events => 1,
1504 #text => ...
1469 @_ 1505 @_
1470 ) 1506 )
1471} 1507}
1472 1508
1473sub _set_text { 1509sub _set_text {
… …
2043 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2081 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2082 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2084 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2085 req_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2086 req_h => $::WIDTH / 80,
2051 vertical => 0, 2087 vertical => 0,
2052 can_hover => 1, 2088 can_hover => 1,
2053 inner_pad => .05, 2089 inner_pad => 0.02,
2054 @_ 2090 @_
2055 ); 2091 );
2056 2092
2057 $self->set_value ($self->{range}[0]); 2093 $self->set_value ($self->{range}[0]);
2058 $self->update; 2094 $self->update;
2059 2095
2060 $self 2096 $self
2061} 2097}
2062 2098
2099sub set_range {
2100 my ($self, $range) = @_;
2101
2102 $self->{range} = $range;
2103
2104 $self->update;
2105}
2106
2063sub set_value { 2107sub set_value {
2064 my ($self, $value) = @_; 2108 my ($self, $value) = @_;
2065 2109
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2110 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2111
2068 $hi = $lo + 1 if $hi <= $lo; 2112 $hi = $lo + 1 if $hi <= $lo;
2069 2113
2114 $page = $hi - $lo if $page > $hi - $lo;
2115
2070 $value = $lo if $value < $lo; 2116 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2117 $value = $hi - $page if $value > $hi - $page;
2072 2118
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2120 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077 2121
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2123
2080 if ($value != $old_value) { 2124 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2125 $self->emit (changed => $value);
… …
2094 2138
2095sub button_down { 2139sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2140 my ($self, $ev, $x, $y) = @_;
2097 2141
2098 $self->SUPER::button_down ($ev, $x, $y); 2142 $self->SUPER::button_down ($ev, $x, $y);
2143
2144 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2145
2099 $self->mouse_motion ($ev, $x, $y); 2146 $self->mouse_motion ($ev, $x, $y);
2100} 2147}
2101 2148
2102sub mouse_motion { 2149sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2150 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2152 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2153 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2154
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2155 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2156
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2157 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2158
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2159 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2160 }
2114} 2161}
2115 2162
2116sub update { 2163sub update {
2117 my ($self) = @_; 2164 my ($self) = @_;
2118 2165
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2166 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2167 $self->set_value ($self->{range}[0]);
2121 2168
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2169 my ($value, $lo, $hi, $page) = @{$self->{range}};
2170 my $range = ($hi - $page - $lo) || 1e-100;
2123 2171
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2172 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2173
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2174 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2175 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2176
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2177 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2178 $value = $value * $self->{scale} + $self->{offset};
2130 2179
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; 2180 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2181 $self->{knob_w} = $knob_w;
2138 }); 2182 });
2139 2183
2140 $self->SUPER::update; 2184 $self->SUPER::update;
2141} 2185}
2142 2186
… …
2148 glScale $self->{w}, $self->{h}; 2192 glScale $self->{w}, $self->{h};
2149 2193
2150 if ($self->{vertical}) { 2194 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2195 # draw a vertical slider like a rotated horizontal slider
2152 2196
2197 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2198 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2199 }
2156 2200
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2201 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2202 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2203
… …
2166 # draw handle 2210 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2211 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2212
2169 glDisable GL_TEXTURE_2D; 2213 glDisable GL_TEXTURE_2D;
2170} 2214}
2215
2216#############################################################################
2217
2218package CFClient::UI::ValSlider;
2219
2220our @ISA = CFClient::UI::HBox::;
2221
2222sub new {
2223 my ($class, %arg) = @_;
2224
2225 my $range = delete $arg{range};
2226
2227 my $self = $class->SUPER::new (
2228 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2229 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2230 to_value => sub { shift },
2231 from_value => sub { shift },
2232 %arg,
2233 );
2234
2235 $self->{slider}->connect (changed => sub {
2236 my ($self, $value) = @_;
2237 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2238 $self->{parent}->emit (changed => $value);
2239 });
2240
2241# $self->{entry}->connect (changed => sub {
2242# my ($self, $value) = @_;
2243# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2244# $self->{parent}->emit (changed => $value);
2245# });
2246
2247 $self->add ($self->{slider}, $self->{entry});
2248
2249 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2250
2251 $self
2252}
2253
2254sub set_range { shift->{slider}->set_range (@_) }
2255sub set_value { shift->{slider}->set_value (@_) }
2171 2256
2172############################################################################# 2257#############################################################################
2173 2258
2174package CFClient::UI::TextView; 2259package CFClient::UI::TextView;
2175 2260
… …
2205 2290
2206 $self->{fontsize} = $fontsize; 2291 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2292 $self->reflow;
2208} 2293}
2209 2294
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2295sub size_allocate {
2230 my ($self, $w, $h) = @_; 2296 my ($self, $w, $h) = @_;
2231 2297
2232 $self->SUPER::size_allocate ($w, $h); 2298 $self->SUPER::size_allocate ($w, $h);
2233 2299
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2302 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2303
2238 $self->reflow; 2304 $self->reflow;
2239} 2305}
2240 2306
2307sub text_size {
2308 my ($self, $text, $indent) = @_;
2309
2310 my $layout = $self->{layout};
2311
2312 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2313 $layout->set_width ($self->{children}[0]{w} - $indent);
2314 $layout->set_markup ($text);
2315
2316 $layout->size
2317}
2318
2319sub reflow {
2320 my ($self) = @_;
2321
2322 $self->{need_reflow}++;
2323 $self->update;
2324}
2325
2326sub set_offset {
2327 my ($self, $offset) = @_;
2328
2329 # todo: base offset on lines or so, not on pixels
2330 $self->{children}[1]->set_value ($offset);
2331}
2332
2333sub clear {
2334 my ($self) = @_;
2335
2336 $self->{par} = [];
2337 $self->{height} = 0;
2338 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2339}
2340
2241sub add_paragraph { 2341sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2342 my ($self, $color, $text, $indent) = @_;
2243 2343
2244 #TODO: intelligently "reformat" paragraph 2344 for my $line (split /\n/, $text) {
2245 2345 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2346 $self->{height} += $h;
2347 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2348 }
2249 2349
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2350 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2351}
2255 2352
2256sub update { 2353sub update {
2257 my ($self) = @_; 2354 my ($self) = @_;
2258 2355
… …
2261 return unless $self->{h} > 0; 2358 return unless $self->{h} > 0;
2262 2359
2263 delete $self->{texture}; 2360 delete $self->{texture};
2264 2361
2265 $ROOT->on_post_alloc ($self, sub { 2362 $ROOT->on_post_alloc ($self, sub {
2363 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2364
2266 if (delete $self->{need_reflow}) { 2365 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2366 my $height = 0;
2268 2367
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2368 my $layout = $self->{layout};
2369
2370 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2371
2270 for @{$self->{par}}; 2372 for (@{$self->{par}}) {
2373 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2374 $layout->set_width ($W - $_->[3]);
2375 $layout->set_markup ($_->[4]);
2376 my ($w, $h) = $layout->size;
2377 $_->[0] = $w + $_->[3];
2378 $_->[1] = $h;
2379 }
2380
2381 $height += $_->[1];
2382 }
2271 2383
2272 $self->{height} = $height; 2384 $self->{height} = $height;
2273 2385
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2386 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2387
2276 delete $self->{texture}; 2388 delete $self->{texture};
2277 } 2389 }
2278 2390
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2391 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2392 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2393 glClear GL_COLOR_BUFFER_BIT;
2282 2394
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2395 my $top = int $self->{children}[1]{range}[0];
2287 2396
2288 my $y0 = $top; 2397 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2398 my $y1 = $top + $H;
2290 2399
2291 my $y = 0; 2400 my $y = 0;
2292 2401
2293 my $layout = $self->{layout}; 2402 my $layout = $self->{layout};
2294 2403
2295 $layout->set_font ($self->{font}) if $self->{font}; 2404 $layout->set_font ($self->{font}) if $self->{font};
2296 2405
2406 glEnable GL_BLEND;
2407 #TODO# not correct in windows where rgba is forced off
2408 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2409
2297 for my $par (@{$self->{par}}) { 2410 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2411 my $h = $par->[1];
2299 2412
2300 if ($y0 < $y + $h && $y < $y1) { 2413 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2414 $layout->set_foreground (@{ $par->[2] });
2415 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2416 $layout->set_markup ($par->[4]);
2303 2417
2304 my ($W, $H) = $layout->size; 2418 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2419
2420 glRasterPos $par->[3], $y - $y0;
2421 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2422 }
2307 2423
2308 $y += $h; 2424 $y += $h;
2309 } 2425 }
2310 2426
2311 glDisable GL_TEXTURE_2D; 2427 glDisable GL_BLEND;
2312 }; 2428 };
2313 }); 2429 });
2314} 2430}
2315 2431
2316sub _draw { 2432sub _draw {
2317 my ($self) = @_; 2433 my ($self) = @_;
2318 2434
2319 glEnable GL_TEXTURE_2D; 2435 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2437 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2438 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2439 glDisable GL_TEXTURE_2D;
2324 2440
2325 $self->{children}[1]->draw; 2441 $self->{children}[1]->draw;
2326 2442
2327} 2443}
… …
2426 2542
2427sub set_tooltip_from { 2543sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2544 my ($self, $widget) = @_;
2429 2545
2430 $self->add (new CFClient::UI::Label 2546 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2547 markup => $widget->{tooltip},
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2548 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2549 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2550 fg => [0, 0, 0, 1],
2551 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2552 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2553 );
2437} 2554}
2438 2555
2439sub size_request { 2556sub size_request {
2440 my ($self) = @_; 2557 my ($self) = @_;
… …
2486use CFClient::OpenGL; 2603use CFClient::OpenGL;
2487 2604
2488sub new { 2605sub new {
2489 my $class = shift; 2606 my $class = shift;
2490 2607
2491 $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2492 aspect => 1, 2609 aspect => 1,
2493 @_, 2610 @_,
2494 ) 2611 );
2612
2613 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self);
2615
2616 $self->{timer} = Event->timer (
2617 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2618 hard => 1,
2619 interval => $self->{animspeed},
2620 cb => sub {
2621 ++$widget->{frame};
2622 $widget->update;
2623 },
2624 );
2625 }
2626
2627 $self
2495} 2628}
2496 2629
2497sub size_request { 2630sub size_request {
2498 (32, 8) 2631 (32, 8)
2499} 2632}
2500 2633
2634sub update {
2635 my ($self) = @_;
2636
2637 return unless $self->{visible};
2638
2639 $self->SUPER::update;
2640}
2641
2501sub _draw { 2642sub _draw {
2502 my ($self) = @_; 2643 my ($self) = @_;
2503 2644
2504 return unless $::CONN;#d# manage and cache textures differently 2645 return unless $::CONN;
2646
2647 my $face;
2648
2649 if ($self->{frame}) {
2650 my $anim = $::CONN->{anim}[$self->{anim}];
2651
2652 $face = $anim->[ $self->{frame} % @$anim ]
2653 if $anim && @$anim;
2654 }
2655
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2656 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2657
2507 # TODO animation
2508 if ($tex) { 2658 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2659 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2661 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2662 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2663 glDisable GL_TEXTURE_2D;
2514 } 2664 }
2515} 2665}
2516 2666
2667sub DESTROY {
2668 my ($self) = @_;
2669
2670 $self->{timer}->cancel
2671 if $self->{timer};
2672
2673 $self->SUPER::DESTROY;
2674}
2675
2517############################################################################# 2676#############################################################################
2518 2677
2519package CFClient::UI::InventoryItem; 2678package CFClient::UI::InventoryItem;
2520 2679
2521our @ISA = CFClient::UI::HBox::; 2680our @ISA = CFClient::UI::HBox::;
2522 2681
2523sub new { 2682sub _item_to_desc {
2524 my $class = shift; 2683 my ($item) = @_;
2525 2684
2526 my %args = @_; 2685 my $desc =
2527
2528 my $item = delete $args{item};
2529
2530 my $desc = $item->{nrof} < 2 2686 $item->{nrof} < 2
2531 ? $item->{name} 2687 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}"; 2688 : "$item->{nrof} × $item->{name_pl}";
2533 2689
2534 $item->{flags} & Crossfire::Protocol::F_OPEN 2690 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)"; 2691 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED 2692 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)"; 2693 and $desc .= " (applied)";
… …
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED 2700 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)"; 2701 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED 2702 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *"; 2703 and $desc .= " *";
2548 2704
2705 $desc
2706}
2707
2708sub new {
2709 my $class = shift;
2710
2711 my %args = @_;
2712
2713 my $item = delete $args{item};
2714
2715 my $desc = _item_to_desc ($item);
2716
2549 my $self = $class->SUPER::new ( 2717 my $self = $class->SUPER::new (
2550 can_hover => 1, 2718 can_hover => 1,
2551 can_events => 1, 2719 can_events => 1,
2552 tooltip => ((CFClient::UI::Label::escape $desc) 2720 tooltip => ((CFClient::UI::Label::escape $desc)
2553 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2554 connect_button_down => sub { 2722 connect_button_down => sub {
2555 my ($self, $ev, $x, $y) = @_; 2723 my ($self, $ev, $x, $y) = @_;
2556 2724
2557 # todo: maybe put examine on 1? but should just be a tooltip :( 2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2727 my $targ = $::CONN->{player}{tag};
2728
2729 if ($item->{container} == $::CONN->{player}{tag}) {
2730 $targ = $main::OPENCONT;
2731 }
2732
2733 $::CONN->send ("move $targ $item->{tag} 0");
2558 if ($ev->{button} == 1) { 2734 } elsif ($ev->{button} == 1) {
2559 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2735 $::CONN->send ("examine $item->{tag}");
2560 } elsif ($ev->{button} == 2) { 2736 } elsif ($ev->{button} == 2) {
2561 $::CONN->send ("apply $item->{tag}"); 2737 $::CONN->send ("apply $item->{tag}");
2562 } elsif ($ev->{button} == 3) { 2738 } elsif ($ev->{button} == 3) {
2563 my @menu_items = ( 2739 my @menu_items = (
2564 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2740 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2741 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2566 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2742 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2743 (
2744 $item->{flags} & Crossfire::Protocol::F_LOCKED
2745 ? (
2746 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2747 )
2748 : (
2749 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2567 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2750 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568 [ 2751 )
2569 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571 ], 2752 ),
2572 ); 2753 );
2573 2754
2574 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2755 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575 } 2756 }
2576 2757
2577 1 2758 1
2578 }, 2759 },
2579 %args 2760 %args
2580 ); 2761 );
2762
2581 2763
2582 $self->add (new CFClient::UI::Face 2764 $self->add (new CFClient::UI::Face
2583 can_events => 0, 2765 can_events => 0,
2584 face => $item->{face}, 2766 face => $item->{face},
2585 anim => $item->{anim}, 2767 anim => $item->{anim},
2586 animspeed => $item->{animspeed}, 2768 animspeed => $item->{animspeed},
2587 ); 2769 );
2588 2770
2589 $self->add (new CFClient::UI::Label 2771 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2590 can_events => 0, 2772
2591 text => $desc, 2773 $self->{item} = $item;
2592 ); 2774
2775 $self->update_item;
2593 2776
2594 $self 2777 $self
2778}
2779
2780sub update_item {
2781 my ($self) = @_;
2782
2783 my $desc = _item_to_desc ($self->{item});
2784
2785 $self->{name_lbl}->set_text ($desc);
2595} 2786}
2596 2787
2597############################################################################# 2788#############################################################################
2598 2789
2599package CFClient::UI::Inventory; 2790package CFClient::UI::Inventory;
… …
2602 2793
2603sub new { 2794sub new {
2604 my $class = shift; 2795 my $class = shift;
2605 2796
2606 my $self = $class->SUPER::new ( 2797 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox), 2798 scrolled => (new CFClient::UI::Table),
2608 @_, 2799 @_,
2609 ); 2800 );
2610 2801
2611 $self 2802 $self
2612} 2803}
… …
2623 } @$items; 2814 } @$items;
2624 2815
2625 $self->{real_items} = \@items; 2816 $self->{real_items} = \@items;
2626 2817
2627 for my $item (@items) { 2818 for my $item (@items) {
2628 my $desc = $item->{nrof} < 2 2819 $item->{item} = $item;
2629 ? $item->{name}
2630 : "$item->{nrof} $item->{name_pl}";
2631
2632 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2633 } 2822 }
2634 2823
2824 my $i = 0;
2825 for (@items) {
2635 $self->{scrolled}->add (@items); 2826 $self->{scrolled}->add (0, $i, $_);
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2829 }
2636 2830
2637# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638} 2832}
2639 2833
2640sub size_request { 2834sub size_request {
… …
2718 2912
2719package CFClient::UI::Statusbox; 2913package CFClient::UI::Statusbox;
2720 2914
2721our @ISA = CFClient::UI::VBox::; 2915our @ISA = CFClient::UI::VBox::;
2722 2916
2917sub new {
2918 my $class = shift;
2919
2920 $class->SUPER::new (
2921 fontsize => 0.8,
2922 @_,
2923 )
2924}
2925
2723sub reorder { 2926sub reorder {
2724 my ($self) = @_; 2927 my ($self) = @_;
2725 my $NOW = time; 2928 my $NOW = time;
2726 2929
2727 while (my ($k, $v) = each %{ $self->{item} }) { 2930 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2746 : $item->{text}; 2949 : $item->{text};
2747 2950
2748 for ($short) { 2951 for ($short) {
2749 s/^\s+//; 2952 s/^\s+//;
2750 s/\s+/ /g; 2953 s/\s+/ /g;
2751 my $len = int 40 / $item->{fontsize};
2752 substr $_, $len, length, "…" if $len < length;
2753 } 2954 }
2754 2955
2755 new CFClient::UI::Label 2956 new CFClient::UI::Label
2756 markup => $short, 2957 markup => $short,
2757 tooltip => $item->{tooltip}, 2958 tooltip => $item->{tooltip},
2758 tooltip_font => $::FONT_PROP, 2959 tooltip_font => $::FONT_PROP,
2759 tooltip_width => 0.67, 2960 tooltip_width => 0.67,
2760 fontsize => $item->{fontsize}, 2961 fontsize => $item->{fontsize} || $self->{fontsize},
2962 max_w => $::WIDTH * 0.44,
2761 fg => $item->{fg}, 2963 fg => $item->{fg},
2762 can_events => 1, 2964 can_events => 1,
2763 can_hover => 1 2965 can_hover => 1
2764 }; 2966 };
2765 } 2967 }
… …
2792 $self->{item}{$group} = { 2994 $self->{item}{$group} = {
2793 id => ++$self->{id}, 2995 id => ++$self->{id},
2794 text => $text, 2996 text => $text,
2795 timeout => $timeout, 2997 timeout => $timeout,
2796 tooltip => $text, 2998 tooltip => $text,
2797 fontsize => 0.8,
2798 fg => [0.8, 0.8, 0.8, 0.8], 2999 fg => [0.8, 0.8, 0.8, 0.8],
2799 pri => 0, 3000 pri => 0,
2800 count => 1, 3001 count => 1,
2801 %arg, 3002 %arg,
2802 }; 3003 };
2803 } 3004 }
2804 3005
2805 $self->reorder; 3006 $self->reorder;
2806} 3007}
2807 3008
3009sub reconfigure {
3010 my ($self) = @_;
3011
3012 delete $_->{label}
3013 for values %{ $self->{item} || {} };
3014
3015 $self->reorder;
3016 $self->SUPER::reconfigure;
3017}
3018
2808############################################################################# 3019#############################################################################
2809 3020
2810package CFClient::UI::Root; 3021package CFClient::UI::Root;
2811 3022
2812our @ISA = CFClient::UI::Container::; 3023our @ISA = CFClient::UI::Container::;
… …
2886} 3097}
2887 3098
2888sub add { 3099sub add {
2889 my ($self, @children) = @_; 3100 my ($self, @children) = @_;
2890 3101
3102 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children;
3104 $w->{root} = $self;
3105 $w->{visible} = 1;
3106 }
3107
2891 for my $child (@children) { 3108 for my $child (@children) {
2892 $child->{toplevel} = 1; 3109 $child->{toplevel} = 1;
2893 3110
2894 # integerise window positions 3111 # integerise window positions
2895 $child->{x} = int $child->{x}; 3112 $child->{x} = int $child->{x};
2896 $child->{y} = int $child->{y}; 3113 $child->{y} = int $child->{y};
2897 } 3114 }
2898 3115
2899 $self->SUPER::add (@children); 3116 $self->SUPER::add (@children);
3117}
3118
3119sub remove {
3120 my ($self, @children) = @_;
3121
3122 $self->SUPER::remove (@children);
3123
3124 while (@children) {
3125 my $w = pop @children;
3126 push @children, $w->children;
3127 delete $w->{visible};
3128 }
2900} 3129}
2901 3130
2902sub on_refresh { 3131sub on_refresh {
2903 my ($self, $id, $cb) = @_; 3132 my ($self, $id, $cb) = @_;
2904 3133
… …
2973 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2974 glClear GL_COLOR_BUFFER_BIT; 3203 glClear GL_COLOR_BUFFER_BIT;
2975 3204
2976 glMatrixMode GL_PROJECTION; 3205 glMatrixMode GL_PROJECTION;
2977 glLoadIdentity; 3206 glLoadIdentity;
2978 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2979 glMatrixMode GL_MODELVIEW; 3208 glMatrixMode GL_MODELVIEW;
2980 glLoadIdentity; 3209 glLoadIdentity;
2981 3210
2982 $self->_draw; 3211 $self->_draw;
2983} 3212}
… …
2985############################################################################# 3214#############################################################################
2986 3215
2987package CFClient::UI; 3216package CFClient::UI;
2988 3217
2989$ROOT = new CFClient::UI::Root; 3218$ROOT = new CFClient::UI::Root;
2990$TOOLTIP = new CFClient::UI::Tooltip; 3219$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2991 3220
29921 32211
2993 3222

Diff Legend

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