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.200 by root, Sat May 13 00:27:09 2006 UTC vs.
Revision 1.206 by root, Mon May 15 17:45:29 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size; 40 $TOOLTIP->check_size;
40 $TOOLTIP->update; 41 $TOOLTIP->update;
41 } 42 }
… …
132 133
133 for (@$vals) { 134 for (@$vals) {
134 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
135 $rem += $_ - $i; 136 $rem += $_ - $i;
136 $_ = $i; 137 $_ = $i;
138 }
139}
140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $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};
149 $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};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
137 } 158 }
138} 159}
139 160
140############################################################################# 161#############################################################################
141 162
… …
160 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
162 } 183 }
163 } 184 }
164 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
165 $self 188 $self
166} 189}
167 190
168sub destroy { 191sub destroy {
169 my ($self) = @_; 192 my ($self) = @_;
… …
242 265
243sub size_allocate { 266sub size_allocate {
244 # nothing to be done 267 # nothing to be done
245} 268}
246 269
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure { 270sub reconfigure {
252 my ($self) = @_; 271 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256 272
257 $self->check_size (1); 273 $self->check_size (1);
258 $self->update; 274 $self->update;
275}
276
277sub children {
259} 278}
260 279
261sub set_max_size { 280sub set_max_size {
262 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
263 282
… …
356 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
359 glEnd; 378 glEnd;
360 glPopMatrix; 379 glPopMatrix;
361 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;
362 } 381 }
363} 382}
364 383
365sub _draw { 384sub _draw {
366 my ($self) = @_; 385 my ($self) = @_;
… …
417} 436}
418 437
419sub DESTROY { 438sub DESTROY {
420 my ($self) = @_; 439 my ($self) = @_;
421 440
441 delete $WIDGET{$self+0};
422 #$self->deactivate; 442 #$self->deactivate;
423} 443}
424 444
425############################################################################# 445#############################################################################
426 446
… …
840 860
841 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
844 border => 0.6, 864 border => 0.6,
865 toplevel => 1,
845 can_events => 1, 866 can_events => 1,
846 @_ 867 @_
847 ); 868 );
848 869
849 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
1990 2011
1991sub new { 2012sub new {
1992 my $class = shift; 2013 my $class = shift;
1993 2014
1994 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
1995 2016
1996 # TODO: 0-width page 2017 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2019 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
… …
2002 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
2003 req_w => $::WIDTH / 80, 2024 req_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2025 req_h => $::WIDTH / 80,
2005 vertical => 0, 2026 vertical => 0,
2006 can_hover => 1, 2027 can_hover => 1,
2007 inner_pad => 5, 2028 inner_pad => .05,
2008 @_ 2029 @_
2009 ); 2030 );
2010 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
2011 $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 }
2012} 2059}
2013 2060
2014sub size_request { 2061sub size_request {
2015 my ($self) = @_; 2062 my ($self) = @_;
2016 2063
… …
2029 2076
2030sub mouse_motion { 2077sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
2032 2079
2033 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
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2035 2098
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
2037 2100
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2040 2102
2041 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2105
2047 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2048 $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;
2049 } 2113 });
2050}
2051 2114
2052# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058} 2116}
2059 2117
2060sub _draw { 2118sub _draw {
2061 my ($self) = @_; 2119 my ($self) = @_;
2062 2120
2063 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
2064 2122
2065 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
2066 2124
2067 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
2069 2127
2070 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2130 }
2075 2131
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2134
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2137
2100 # draw background 2138 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2140
2103 # draw handle 2141 # draw handle
2104 $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);
2105 2143
2106 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
2107} 2145}
2108 2146
2109############################################################################# 2147#############################################################################
… …
2538 my ($self, $items) = @_; 2576 my ($self, $items) = @_;
2539 2577
2540 $self->{scrolled}->clear; 2578 $self->{scrolled}->clear;
2541 return unless $items; 2579 return unless $items;
2542 2580
2543 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2581 my @items = sort {
2582 ($a->{type} <=> $b->{type})
2583 or ($a->{name} cmp $b->{name})
2584 } @$items;
2544 2585
2545 $self->{real_items} = \@items; 2586 $self->{real_items} = \@items;
2546 2587
2547 for my $item (@items) { 2588 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2 2589 my $desc = $item->{nrof} < 2
2549 ? $item->{name} 2590 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}"; 2591 : "$item->{nrof} $item->{name_pl}";
2551 2592
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2593 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2553 } 2594 }
2595
2596 $self->{scrolled}->add (@items);
2554 2597
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556} 2599}
2557 2600
2558sub size_request { 2601sub size_request {
… …
2663 ? "<b>$item->{count} ×</b> $item->{text}" 2706 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text}; 2707 : $item->{text};
2665 2708
2666 for ($short) { 2709 for ($short) {
2667 s/^\s+//; 2710 s/^\s+//;
2668 s/\012.*/…/s; 2711 s/\s+/ /g;
2669 my $len = int 40 / $item->{fontsize}; 2712 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length; 2713 substr $_, $len, length, "…" if $len < length;
2671 } 2714 }
2672 2715
2673 new CFClient::UI::Label 2716 new CFClient::UI::Label
2674 markup => $short, 2717 markup => $short,
2675 tooltip => $item->{tooltip}, 2718 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP, 2719 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67, 2720 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize}, 2721 fontsize => $item->{fontsize},
2679 color => $item->{color}, 2722 fg => $item->{fg},
2680 can_events => 1, 2723 can_events => 1,
2681 can_hover => 1 2724 can_hover => 1
2682 }; 2725 };
2683 } 2726 }
2684 2727
… …
2711 id => ++$self->{id}, 2754 id => ++$self->{id},
2712 text => $text, 2755 text => $text,
2713 timeout => $timeout, 2756 timeout => $timeout,
2714 tooltip => $text, 2757 tooltip => $text,
2715 fontsize => 0.8, 2758 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8], 2759 fg => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0, 2760 pri => 0,
2718 count => 1, 2761 count => 1,
2719 %arg, 2762 %arg,
2720 }; 2763 };
2721 } 2764 }
… …
2760} 2803}
2761 2804
2762sub size_allocate { 2805sub size_allocate {
2763 my ($self, $w, $h) = @_; 2806 my ($self, $w, $h) = @_;
2764 2807
2765 my $old_w = $self->{old_w}; 2808 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2766 my $old_h = $self->{old_h}; 2809 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2767 2810
2768 if ($old_w && $old_h) { 2811 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2769 for my $child ($self->children) { 2812 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780 2813
2781 for my $child ($self->children) { 2814 for my $child ($self->children) {
2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2815 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2783 2816
2817 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2818 if exists $child->{req_x};
2819
2820 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2821 if exists $child->{req_y};
2822
2784 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2823 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2824 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2825
2786 $child->configure ($X, $Y, $W, $H); 2826 $child->configure ($X, $Y, $W, $H);
2787 } 2827 }
2788
2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791} 2828}
2792 2829
2793sub coord2local { 2830sub coord2local {
2794 my ($self, $x, $y) = @_; 2831 my ($self, $x, $y) = @_;
2795 2832
… …
2808 $self->check_size; 2845 $self->check_size;
2809 $::WANT_REFRESH++; 2846 $::WANT_REFRESH++;
2810} 2847}
2811 2848
2812sub add { 2849sub add {
2813 my ($self, $child) = @_; 2850 my ($self, @children) = @_;
2814 2851
2852 for my $child (@children) {
2853 $child->{toplevel} = 1;
2854
2815 # integerise window positions 2855 # integerise window positions
2816 $child->{x} = int $child->{x}; 2856 $child->{x} = int $child->{x};
2817 $child->{y} = int $child->{y}; 2857 $child->{y} = int $child->{y};
2858 }
2818 2859
2819 $self->SUPER::add ($child); 2860 $self->SUPER::add (@children);
2820} 2861}
2821 2862
2822sub on_refresh { 2863sub on_refresh {
2823 my ($self, $id, $cb) = @_; 2864 my ($self, $id, $cb) = @_;
2824 2865

Diff Legend

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