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.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.207 by elmex, Mon May 15 18:23:33 2006 UTC

… …
375 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
378 glEnd; 378 glEnd;
379 glPopMatrix; 379 glPopMatrix;
380 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 } 381 }
382} 382}
383 383
384sub _draw { 384sub _draw {
385 my ($self) = @_; 385 my ($self) = @_;
… …
2010 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
2011 2011
2012sub new { 2012sub new {
2013 my $class = shift; 2013 my $class = shift;
2014 2014
2015 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
2016 2016
2017 # TODO: 0-width page 2017 # TODO: 0-width page
2018 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2019 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
… …
2023 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
2024 req_w => $::WIDTH / 80, 2024 req_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2025 req_h => $::WIDTH / 80,
2026 vertical => 0, 2026 vertical => 0,
2027 can_hover => 1, 2027 can_hover => 1,
2028 inner_pad => 5, 2028 inner_pad => .05,
2029 @_ 2029 @_
2030 ); 2030 );
2031 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
2032 $self 2035 $self
2036}
2037
2038sub set_value {
2039 my ($self, $value) = @_;
2040
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042
2043 $hi = $lo + 1 if $hi <= $lo;
2044
2045 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi;
2047
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054
2055 if ($value != $old_value) {
2056 $self->emit (changed => $value);
2057 $self->update;
2058 }
2033} 2059}
2034 2060
2035sub size_request { 2061sub size_request {
2036 my ($self) = @_; 2062 my ($self) = @_;
2037 2063
… …
2050 2076
2051sub mouse_motion { 2077sub mouse_motion {
2052 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
2053 2079
2054 if ($GRAB == $self) { 2080 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082
2083 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2086
2087 $self->set_value ($x * ($hi - $lo) + $lo);
2088 }
2089}
2090
2091sub update {
2092 my ($self) = @_;
2093
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095 $self->set_value ($self->{range}[0]);
2096
2055 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2056 2098
2057 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
2058 2100
2059 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2060 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2061 2102
2062 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2063 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
2064 $x = $lo if $x < $lo;
2065 $x = $hi - $page if $x > $hi - $page;
2066 $self->{range}[0] = $x;
2067 2105
2068 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2069 $self->update; 2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value;
2112 $self->{knob_w} = $page;
2070 } 2113 });
2071}
2072 2114
2073# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
2074# so that the handle doesn't leave the texture. This calculation isn't 100%
2075# correct propably, but it does the job for now
2076sub _calc_inner_pad_px {
2077 my ($self, $w) = @_;
2078 ($w / 100) * $self->{inner_pad} # % to pixels
2079} 2116}
2080 2117
2081sub _draw { 2118sub _draw {
2082 my ($self) = @_; 2119 my ($self) = @_;
2083 2120
2084 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
2085 2122
2086 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
2087 2124
2088 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
2089 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
2090 2127
2091 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
2092 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
2093
2094 ($w, $h) = ($h, $w);
2095 } 2130 }
2096 2131
2097 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2098 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2099 2134
2100 my ($value, $lo, $hi, $page) = @{$self->{range}};
2101
2102 $hi = $value + 1 if $lo == $hi;
2103
2104 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2105 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2106
2107 $page = int $page * $inner_w / ($hi - $lo);
2108 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2109
2110 $w -= $page;
2111 $page &= ~1;
2112 glTranslate $page * 0.5, 0, 0;
2113 $page ||= 2;
2114
2115 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2116 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2117
2118 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120 2137
2121 # draw background 2138 # draw background
2122 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2123 2140
2124 # draw handle 2141 # draw handle
2125 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2142 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2126 2143
2127 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
2128} 2145}
2129 2146
2130############################################################################# 2147#############################################################################
… …
2487 2504
2488 my $desc = $item->{nrof} < 2 2505 my $desc = $item->{nrof} < 2
2489 ? $item->{name} 2506 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}"; 2507 : "$item->{nrof} $item->{name_pl}";
2491 2508
2509 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)";
2513 $item->{flags} & Crossfire::Protocol::F_UNPAID
2514 and $desc .= " (unpaid)";
2515 $item->{flags} & Crossfire::Protocol::F_MAGIC
2516 and $desc .= " (magic)";
2517 $item->{flags} & Crossfire::Protocol::F_CURSED
2518 and $desc .= " (cursed)";
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *";
2492 2523
2493 my $self = $class->SUPER::new ( 2524 my $self = $class->SUPER::new (
2494 can_hover => 1, 2525 can_hover => 1,
2495 can_events => 1, 2526 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc) 2527 tooltip => (CFClient::UI::Label->escape ($desc)
… …
2502 if ($ev->{button} == 1) { 2533 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) { 2535 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}"); 2536 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) { 2537 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new ( 2538 my @menu_items = (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2510 [ 2543 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") }, 2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ], 2546 ],
2518 )->popup ($ev); 2547 );
2548
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519 } 2550 }
2520 2551
2521 1 2552 1
2522 }, 2553 },
2523 %args 2554 %args
… …
2689 ? "<b>$item->{count} ×</b> $item->{text}" 2720 ? "<b>$item->{count} ×</b> $item->{text}"
2690 : $item->{text}; 2721 : $item->{text};
2691 2722
2692 for ($short) { 2723 for ($short) {
2693 s/^\s+//; 2724 s/^\s+//;
2694 s/\012.*/…/s; 2725 s/\s+/ /g;
2695 my $len = int 40 / $item->{fontsize}; 2726 my $len = int 40 / $item->{fontsize};
2696 substr $_, $len, length, "…" if $len < length; 2727 substr $_, $len, length, "…" if $len < length;
2697 } 2728 }
2698 2729
2699 new CFClient::UI::Label 2730 new CFClient::UI::Label
2700 markup => $short, 2731 markup => $short,
2701 tooltip => $item->{tooltip}, 2732 tooltip => $item->{tooltip},
2702 tooltip_font => $::FONT_PROP, 2733 tooltip_font => $::FONT_PROP,
2703 tooltip_width => 0.67, 2734 tooltip_width => 0.67,
2704 fontsize => $item->{fontsize}, 2735 fontsize => $item->{fontsize},
2705 color => $item->{color}, 2736 fg => $item->{fg},
2706 can_events => 1, 2737 can_events => 1,
2707 can_hover => 1 2738 can_hover => 1
2708 }; 2739 };
2709 } 2740 }
2710 2741
… …
2737 id => ++$self->{id}, 2768 id => ++$self->{id},
2738 text => $text, 2769 text => $text,
2739 timeout => $timeout, 2770 timeout => $timeout,
2740 tooltip => $text, 2771 tooltip => $text,
2741 fontsize => 0.8, 2772 fontsize => 0.8,
2742 color => [0.8, 0.8, 0.8, 0.8], 2773 fg => [0.8, 0.8, 0.8, 0.8],
2743 pri => 0, 2774 pri => 0,
2744 count => 1, 2775 count => 1,
2745 %arg, 2776 %arg,
2746 }; 2777 };
2747 } 2778 }
… …
2795 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2796 2827
2797 for my $child ($self->children) { 2828 for my $child ($self->children) {
2798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2799 2830
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832 if exists $child->{req_x};
2833
2834 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2835 if exists $child->{req_y};
2836
2800 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2837 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2801 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2838 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2839
2802 $child->configure ($X, $Y, $W, $H); 2840 $child->configure ($X, $Y, $W, $H);
2803 } 2841 }
2804} 2842}
2805 2843
2806sub coord2local { 2844sub coord2local {

Diff Legend

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