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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.218 by root, Sat May 20 15:37:27 2006 UTC

… …
140 140
141# call when resolution changes etc. 141# call when resolution changes etc.
142sub rescale_widgets { 142sub rescale_widgets {
143 my ($sx, $sy) = @_; 143 my ($sx, $sy) = @_;
144 144
145 # make a copy, otherwise for complains about freed values.
145 for my $widget (values %WIDGET) { 146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
146 if ($widget->{toplevel}) { 149 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 150 $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}; 151 $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}; 152 $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}; 153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
… …
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
691 694
692 $self->_render; 695 $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 }; 696 };
701} 697}
702 698
703sub _draw { 699sub _draw {
704 my ($self) = @_; 700 my ($self) = @_;
… …
708 my $tex = $self->{texture} 704 my $tex = $self->{texture}
709 or return; 705 or return;
710 706
711 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
714 710
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 712
717 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
718} 714}
… …
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
802 }, 798 },
803 ; 799 ;
804 800
805 $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 802 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 803 slider => $slider,
808 @_, 804 @_,
809 ); 805 );
810 806
811 $self->{vp}->add ($self->{scrolled}); 807 $self->{vp}->add ($self->{scrolled});
… …
1297 #bg => none 1293 #bg => none
1298 #active_bg => none 1294 #active_bg => none
1299 #font => default_font 1295 #font => default_font
1300 #text => initial text 1296 #text => initial text
1301 #markup => initial narkup 1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1300 layout => (new CFClient::Layout),
1303 fontsize => 1, 1301 fontsize => 1,
1304 align => -1, 1302 align => -1,
1305 valign => -1, 1303 valign => -1,
1306 padding => 2, 1304 padding => 2,
… …
1371sub size_request { 1369sub size_request {
1372 my ($self) = @_; 1370 my ($self) = @_;
1373 1371
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1377
1378 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1379 1379
1380 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1416 1416
1417 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1424
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1426
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
2048 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2049 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2051 vertical => 0, 2053 vertical => 0,
2052 can_hover => 1, 2054 can_hover => 1,
2053 inner_pad => .05, 2055 inner_pad => 0.02,
2054 @_ 2056 @_
2055 ); 2057 );
2056 2058
2057 $self->set_value ($self->{range}[0]); 2059 $self->set_value ($self->{range}[0]);
2058 $self->update; 2060 $self->update;
… …
2148 glScale $self->{w}, $self->{h}; 2150 glScale $self->{w}, $self->{h};
2149 2151
2150 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2152 2154
2155 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2157 }
2156 2158
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2161
… …
2275 2277
2276 delete $self->{texture}; 2278 delete $self->{texture};
2277 } 2279 }
2278 2280
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2280 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2282 2284
2283 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285 2287
… …
2317 my ($self) = @_; 2319 my ($self) = @_;
2318 2320
2319 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2324 2326
2325 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2326 2328
2327} 2329}
… …
2426 2428
2427sub set_tooltip_from { 2429sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2430 my ($self, $widget) = @_;
2429 2431
2430 $self->add (new CFClient::UI::Label 2432 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2433 markup => $widget->{tooltip},
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2435 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2439 );
2437} 2440}
2438 2441
2439sub size_request { 2442sub size_request {
2440 my ($self) = @_; 2443 my ($self) = @_;
… …
2486use CFClient::OpenGL; 2489use CFClient::OpenGL;
2487 2490
2488sub new { 2491sub new {
2489 my $class = shift; 2492 my $class = shift;
2490 2493
2491 $class->SUPER::new ( 2494 my $self = $class->SUPER::new (
2492 aspect => 1, 2495 aspect => 1,
2493 @_, 2496 @_,
2494 ) 2497 );
2498
2499 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self);
2501
2502 $self->{timer} = Event->timer (
2503 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2504 hard => 1,
2505 interval => $self->{animspeed},
2506 cb => sub {
2507 ++$widget->{frame};
2508 $widget->update;
2509 },
2510 );
2511 }
2512
2513 $self
2495} 2514}
2496 2515
2497sub size_request { 2516sub size_request {
2498 (32, 8) 2517 (32, 8)
2499} 2518}
2500 2519
2501sub _draw { 2520sub _draw {
2502 my ($self) = @_; 2521 my ($self) = @_;
2503 2522
2504 return unless $::CONN;#d# manage and cache textures differently 2523 return unless $::CONN;#d# manage and cache textures differently
2524
2525 my $face;
2526
2527 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}];
2529
2530 $face = $anim->[ $self->{frame} % @$anim ]
2531 if $anim && @$anim;
2532 }
2533
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2535
2507 # TODO animation
2508 if ($tex) { 2536 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2537 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2539 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2541 glDisable GL_TEXTURE_2D;
2514 } 2542 }
2515} 2543}
2516 2544
2545sub DESTROY {
2546 my ($self) = @_;
2547
2548 $self->{timer}->cancel
2549 if $self->{timer};
2550
2551 $self->SUPER::DESTROY;
2552}
2553
2517############################################################################# 2554#############################################################################
2518 2555
2519package CFClient::UI::InventoryItem; 2556package CFClient::UI::InventoryItem;
2520 2557
2521our @ISA = CFClient::UI::HBox::; 2558our @ISA = CFClient::UI::HBox::;
… …
2524 my ($item) = @_; 2561 my ($item) = @_;
2525 2562
2526 my $desc = 2563 my $desc =
2527 $item->{nrof} < 2 2564 $item->{nrof} < 2
2528 ? $item->{name} 2565 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}"; 2566 : "$item->{nrof} × $item->{name_pl}";
2530 2567
2531 $item->{flags} & Crossfire::Protocol::F_OPEN 2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)"; 2569 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED 2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)"; 2571 and $desc .= " (applied)";
… …
2554 my $item = delete $args{item}; 2591 my $item = delete $args{item};
2555 2592
2556 my $desc = _item_to_desc ($item); 2593 my $desc = _item_to_desc ($item);
2557 2594
2558 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
2559 can_hover => 1, 2596 can_hover => 1,
2560 can_events => 1, 2597 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc) 2598 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub { 2600 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_; 2601 my ($self, $ev, $x, $y) = @_;
2565 2602
2566 # todo: maybe put examine on 1? but should just be a tooltip :( 2603 # todo: maybe put examine on 1? but should just be a tooltip :(
… …
2575 } elsif ($ev->{button} == 2) { 2612 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}"); 2613 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) { 2614 } elsif ($ev->{button} == 3) {
2578 my @menu_items = ( 2615 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2617 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 (
2620 $item->{flags} & Crossfire::Protocol::F_LOCKED
2621 ? (
2622 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2623 )
2624 : (
2625 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2626 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [ 2627 )
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ], 2628 ),
2587 ); 2629 );
2588 2630
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2631 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 } 2632 }
2591 2633
… …
2774 # TODO: doesn't handle markup well (read as: at all) 2816 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 2817 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 2818 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 2819 : $item->{text};
2778 2820
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 2821 for ($short) {
2782 s/^\s+//; 2822 s/^\s+//;
2783 s/\s+/ /g; 2823 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 2824 }
2787 2825
2788 new CFClient::UI::Label 2826 new CFClient::UI::Label
2789 markup => $short, 2827 markup => $short,
2790 tooltip => $item->{tooltip}, 2828 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 2829 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 2830 tooltip_width => 0.67,
2793 fontsize => $fontsize, 2831 fontsize => $item->{fontsize} || $self->{fontsize},
2832 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 2833 fg => $item->{fg},
2795 can_events => 1, 2834 can_events => 1,
2796 can_hover => 1 2835 can_hover => 1
2797 }; 2836 };
2798 } 2837 }
… …
2835 } 2874 }
2836 2875
2837 $self->reorder; 2876 $self->reorder;
2838} 2877}
2839 2878
2879sub reconfigure {
2880 my ($self) = @_;
2881
2882 delete $_->{label}
2883 for values %{ $self->{item} || {} };
2884
2885 $self->reorder;
2886 $self->SUPER::reconfigure;
2887}
2888
2840############################################################################# 2889#############################################################################
2841 2890
2842package CFClient::UI::Root; 2891package CFClient::UI::Root;
2843 2892
2844our @ISA = CFClient::UI::Container::; 2893our @ISA = CFClient::UI::Container::;
… …
3017############################################################################# 3066#############################################################################
3018 3067
3019package CFClient::UI; 3068package CFClient::UI;
3020 3069
3021$ROOT = new CFClient::UI::Root; 3070$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3071$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3072
30241 30731
3025 3074

Diff Legend

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