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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC

… …
134 for (@$vals) { 134 for (@$vals) {
135 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
136 $rem += $_ - $i; 136 $rem += $_ - $i;
137 $_ = $i; 137 $_ = $i;
138 } 138 }
139}
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;
139} 147}
140 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) = @_;
… …
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
798 }, 806 },
799 ; 807 ;
800 808
801 $self = $class->SUPER::new ( 809 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 810 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 811 slider => $slider,
804 @_, 812 @_,
805 ); 813 );
806 814
807 $self->{vp}->add ($self->{scrolled}); 815 $self->{vp}->add ($self->{scrolled});
… …
2050 range => [0, 0, 100, 10], 2058 range => [0, 0, 100, 10],
2051 req_w => $::WIDTH / 80, 2059 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2060 req_h => $::WIDTH / 80,
2053 vertical => 0, 2061 vertical => 0,
2054 can_hover => 1, 2062 can_hover => 1,
2055 inner_pad => .05, 2063 inner_pad => 0.02,
2056 @_ 2064 @_
2057 ); 2065 );
2058 2066
2059 $self->set_value ($self->{range}[0]); 2067 $self->set_value ($self->{range}[0]);
2060 $self->update; 2068 $self->update;
… …
2207 2215
2208 $self->{fontsize} = $fontsize; 2216 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2217 $self->reflow;
2210} 2218}
2211 2219
2220sub size_allocate {
2221 my ($self, $w, $h) = @_;
2222
2223 $self->SUPER::size_allocate ($w, $h);
2224
2225 $self->{layout}->set_font ($self->{font}) if $self->{font};
2226 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227 $self->{layout}->set_width ($self->{children}[0]{w});
2228
2229 $self->reflow;
2230}
2231
2212sub text_height { 2232sub text_height {
2213 my ($self, $text) = @_; 2233 my ($self, $text, $indent) = @_;
2214 2234
2215 my $layout = $self->{layout}; 2235 my $layout = $self->{layout};
2216 2236
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 2238 $layout->set_width ($self->{children}[0]{w} - $indent);
2219 $layout->set_markup ($text); 2239 $layout->set_markup ($text);
2220 2240
2221 ($layout->size)[1] 2241 ($layout->size)[1]
2222} 2242}
2223 2243
… …
2226 2246
2227 $self->{need_reflow}++; 2247 $self->{need_reflow}++;
2228 $self->update; 2248 $self->update;
2229} 2249}
2230 2250
2231sub size_allocate {
2232 my ($self, $w, $h) = @_;
2233
2234 $self->SUPER::size_allocate ($w, $h);
2235
2236 $self->{layout}->set_font ($self->{font}) if $self->{font};
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $self->{layout}->set_width ($self->{children}[0]{w});
2239
2240 $self->reflow;
2241}
2242
2243sub add_paragraph { 2251sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2252 my ($self, $color, $text, $indent) = @_;
2245 2253
2246 #TODO: intelligently "reformat" paragraph 2254 #TODO: intelligently "reformat" paragraph
2247 2255
2256 for my $line (split /\n/, $text) {
2248 my $height = $self->text_height ($text); 2257 my $height = $self->text_height ($line);
2249
2250 $self->{height} += $height; 2258 $self->{height} += $height;
2251
2252 push @{$self->{par}}, [$height, $color, $text]; 2259 push @{$self->{par}}, [$height, $color, $indent, $line];
2260 }
2253 2261
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2255 $self->{children}[1]->update; 2263 $self->{children}[1]->update;
2256} 2264}
2257 2265
… …
2266 2274
2267 $ROOT->on_post_alloc ($self, sub { 2275 $ROOT->on_post_alloc ($self, sub {
2268 if (delete $self->{need_reflow}) { 2276 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2277 my $height = 0;
2270 2278
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2272 for @{$self->{par}}; 2280 for @{$self->{par}};
2273 2281
2274 $self->{height} = $height; 2282 $self->{height} = $height;
2275 2283
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2285 $self->{children}[1]->update;
2277 2286
2278 delete $self->{texture}; 2287 delete $self->{texture};
2279 } 2288 }
2280 2289
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2291 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2292 glClear GL_COLOR_BUFFER_BIT;
2284 2293
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2294 my $top = int $self->{children}[1]{range}[0];
2289 2295
2290 my $y0 = $top; 2296 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2297 my $y1 = $top + $self->{h};
2292 2298
… …
2294 2300
2295 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2296 2302
2297 $layout->set_font ($self->{font}) if $self->{font}; 2303 $layout->set_font ($self->{font}) if $self->{font};
2298 2304
2305 glEnable GL_BLEND;
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307
2299 for my $par (@{$self->{par}}) { 2308 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2309 my $h = $par->[0];
2301 2310
2302 if ($y0 < $y + $h && $y < $y1) { 2311 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2312 $layout->set_foreground (@{ $par->[1] });
2313 $layout->set_width ($self->{w} - $par->[2]);
2304 $layout->set_markup ($par->[2]); 2314 $layout->set_markup ($par->[3]);
2305 2315
2306 my ($W, $H) = $layout->size; 2316 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2317
2318 glRasterPos $par->[2], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2320 }
2309 2321
2310 $y += $h; 2322 $y += $h;
2311 } 2323 }
2312 2324
2313 glDisable GL_TEXTURE_2D; 2325 glDisable GL_BLEND;
2314 }; 2326 };
2315 }); 2327 });
2316} 2328}
2317 2329
2318sub _draw { 2330sub _draw {
… …
2489use CFClient::OpenGL; 2501use CFClient::OpenGL;
2490 2502
2491sub new { 2503sub new {
2492 my $class = shift; 2504 my $class = shift;
2493 2505
2494 $class->SUPER::new ( 2506 my $self = $class->SUPER::new (
2495 aspect => 1, 2507 aspect => 1,
2496 @_, 2508 @_,
2497 ) 2509 );
2510
2511 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self);
2513
2514 $self->{timer} = Event->timer (
2515 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2516 hard => 1,
2517 interval => $self->{animspeed},
2518 cb => sub {
2519 ++$widget->{frame};
2520 $widget->update;
2521 },
2522 );
2523 }
2524
2525 $self
2498} 2526}
2499 2527
2500sub size_request { 2528sub size_request {
2501 (32, 8) 2529 (32, 8)
2502} 2530}
2503 2531
2504sub _draw { 2532sub _draw {
2505 my ($self) = @_; 2533 my ($self) = @_;
2506 2534
2507 return unless $::CONN;#d# manage and cache textures differently 2535 return unless $::CONN;#d# manage and cache textures differently
2536
2537 my $face;
2538
2539 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}];
2541
2542 $face = $anim->[ $self->{frame} % @$anim ]
2543 if $anim && @$anim;
2544 }
2545
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2547
2510 # TODO animation
2511 if ($tex) { 2548 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2549 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2551 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2553 glDisable GL_TEXTURE_2D;
2517 } 2554 }
2518} 2555}
2519 2556
2557sub DESTROY {
2558 my ($self) = @_;
2559
2560 $self->{timer}->cancel
2561 if $self->{timer};
2562
2563 $self->SUPER::DESTROY;
2564}
2565
2520############################################################################# 2566#############################################################################
2521 2567
2522package CFClient::UI::InventoryItem; 2568package CFClient::UI::InventoryItem;
2523 2569
2524our @ISA = CFClient::UI::HBox::; 2570our @ISA = CFClient::UI::HBox::;
… …
2527 my ($item) = @_; 2573 my ($item) = @_;
2528 2574
2529 my $desc = 2575 my $desc =
2530 $item->{nrof} < 2 2576 $item->{nrof} < 2
2531 ? $item->{name} 2577 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}"; 2578 : "$item->{nrof} × $item->{name_pl}";
2533 2579
2534 $item->{flags} & Crossfire::Protocol::F_OPEN 2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)"; 2581 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED 2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)"; 2583 and $desc .= " (applied)";
… …
2557 my $item = delete $args{item}; 2603 my $item = delete $args{item};
2558 2604
2559 my $desc = _item_to_desc ($item); 2605 my $desc = _item_to_desc ($item);
2560 2606
2561 my $self = $class->SUPER::new ( 2607 my $self = $class->SUPER::new (
2562 can_hover => 1, 2608 can_hover => 1,
2563 can_events => 1, 2609 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc) 2610 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub { 2612 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_; 2613 my ($self, $ev, $x, $y) = @_;
2568 2614
2569 # todo: maybe put examine on 1? but should just be a tooltip :( 2615 # todo: maybe put examine on 1? but should just be a tooltip :(
… …
2578 } elsif ($ev->{button} == 2) { 2624 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}"); 2625 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) { 2626 } elsif ($ev->{button} == 3) {
2581 my @menu_items = ( 2627 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [ 2639 )
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ], 2640 ),
2590 ); 2641 );
2591 2642
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 } 2644 }
2594 2645
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3067 glClear GL_COLOR_BUFFER_BIT;
3017 3068
3018 glMatrixMode GL_PROJECTION; 3069 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3070 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3072 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3073 glLoadIdentity;
3023 3074
3024 $self->_draw; 3075 $self->_draw;
3025} 3076}

Diff Legend

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