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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.207 by elmex, Mon May 15 18:23:33 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}) {
… …
24 26
25 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
26 28
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 30
29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font}); 31 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 32 $TOOLTIP->show;
32 33
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34 35
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
38 38
39 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
40 } 42 }
41 43
42 return; 44 return;
43 } 45 }
44 } 46 }
… …
131 133
132 for (@$vals) { 134 for (@$vals) {
133 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
134 $rem += $_ - $i; 136 $rem += $_ - $i;
135 $_ = $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;
136 } 158 }
137} 159}
138 160
139############################################################################# 161#############################################################################
140 162
… …
159 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
161 } 183 }
162 } 184 }
163 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
164 $self 188 $self
165} 189}
166 190
167sub destroy { 191sub destroy {
168 my ($self) = @_; 192 my ($self) = @_;
… …
241 265
242sub size_allocate { 266sub size_allocate {
243 # nothing to be done 267 # nothing to be done
244} 268}
245 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
246sub children { 277sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
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) = @_;
… …
383sub set_parent { 402sub set_parent {
384 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
385 404
386 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
387 406
407 # TODO: req_w _does_change after ->reconfigure
388 $self->check_size 408 $self->check_size
389 unless exists $self->{req_w}; 409 unless exists $self->{req_w};
390} 410}
391 411
392sub check_size { 412sub check_size {
393 my ($self) = @_; 413 my ($self, $forced) = @_;
394 414
415 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 417}
397 418
398sub update { 419sub update {
399 my ($self) = @_; 420 my ($self) = @_;
… …
415} 436}
416 437
417sub DESTROY { 438sub DESTROY {
418 my ($self) = @_; 439 my ($self) = @_;
419 440
441 delete $WIDGET{$self+0};
420 #$self->deactivate; 442 #$self->deactivate;
421} 443}
422 444
423############################################################################# 445#############################################################################
424 446
… …
509 $self->{children} = [ 531 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 533 @{$self->{children}}, @widgets
512 ]; 534 ];
513 535
514 $self->check_size; 536 $self->check_size (1);
515 $self->update; 537 $self->update;
516} 538}
517 539
518sub children { 540sub children {
519 @{ $_[0]{children} } 541 @{ $_[0]{children} }
… …
626} 648}
627 649
628sub update { 650sub update {
629 my ($self) = @_; 651 my ($self) = @_;
630 652
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 654 $self->SUPER::update;
633} 655}
634 656
635sub size_allocate { 657sub size_allocate {
636 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
… …
774 $self->add ($self->{slider}); 796 $self->add ($self->{slider});
775 797
776 $self 798 $self
777} 799}
778 800
779#TODO# update range on size_allocate depeneing on child 801#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 802# update viewport offset on scroll
781 803
782############################################################################# 804#############################################################################
783 805
784package CFClient::UI::Frame; 806package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 810use CFClient::OpenGL;
789 811
790sub new { 812sub new {
791 my $class = shift; 813 my $class = shift;
792 814
793 my $self = $class->SUPER::new ( 815 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 816 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 817 @_,
798 ); 818 )
799
800 $self
801} 819}
802 820
803sub _draw { 821sub _draw {
804 my ($self) = @_; 822 my ($self) = @_;
805 823
806 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
807 826
808 glEnable GL_BLEND; 827 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 830
813# glBegin GL_QUADS; 831 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 832 glVertex 0 , 0;
816# glVertex 0 , $h; 833 glVertex 0 , $h;
817# glVertex $w, $h; 834 glVertex $w, $h;
818# glVertex $w, 0; 835 glVertex $w, 0;
819# glEnd; 836 glEnd;
820 837
821
822 $self->child->draw;
823 glDisable GL_BLEND; 838 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
825} 842}
826 843
827############################################################################# 844#############################################################################
828 845
829package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
843 860
844 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
847 border => 0.6, 864 border => 0.6,
865 toplevel => 1,
848 can_events => 1, 866 can_events => 1,
849 @_ 867 @_
850 ); 868 );
851 869
852 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
… …
945 my ($self) = @_; 963 my ($self) = @_;
946 964
947 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 967
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 970
955 my $border = $self->border; 971 my $border = $self->border;
956 972
957 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 978
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 980 my $bg = $tex[0];
965 981
966 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
971 987
972 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
976 993
977 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 995
981 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
982 997
983 $self->child->draw; 998 $self->child->draw;
984} 999}
… …
1486 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1488 1503
1489 my $text = $self->get_text; 1504 my $text = $self->get_text;
1490 1505
1491 if ($sym == 8) { 1506 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1519 $self->emit ('escape');
1505 } elsif ($uni) { 1520 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1522 }
1508 1523
… …
1735 1750
1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1737 1752
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 1754
1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1740 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1747} 1760}
1748 1761
1749############################################################################# 1762#############################################################################
1750 1763
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
1998 2011
1999sub new { 2012sub new {
2000 my $class = shift; 2013 my $class = shift;
2001 2014
2002 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
2003 2016
2004 # TODO: 0-width page 2017 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2019 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
… …
2010 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
2011 req_w => $::WIDTH / 80, 2024 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2025 req_h => $::WIDTH / 80,
2013 vertical => 0, 2026 vertical => 0,
2014 can_hover => 1, 2027 can_hover => 1,
2015 inner_pad => 5, 2028 inner_pad => .05,
2016 @_ 2029 @_
2017 ); 2030 );
2018 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
2019 $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 }
2020} 2059}
2021 2060
2022sub size_request { 2061sub size_request {
2023 my ($self) = @_; 2062 my ($self) = @_;
2024 2063
… …
2037 2076
2038sub mouse_motion { 2077sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
2040 2079
2041 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
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2043 2098
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
2045 2100
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2048 2102
2049 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2105
2055 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2056 $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;
2057 } 2113 });
2058}
2059 2114
2060# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2116}
2067 2117
2068sub _draw { 2118sub _draw {
2069 my ($self) = @_; 2119 my ($self) = @_;
2070 2120
2071 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
2072 2122
2073 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
2074 2124
2075 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
2077 2127
2078 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2130 }
2083 2131
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2134
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2137
2108 # draw background 2138 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2140
2111 # draw handle 2141 # draw handle
2112 $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);
2113 2143
2114 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
2115} 2145}
2116 2146
2117############################################################################# 2147#############################################################################
… …
2205 2235
2206 return unless $self->{h} > 0; 2236 return unless $self->{h} > 0;
2207 2237
2208 delete $self->{texture}; 2238 delete $self->{texture};
2209 2239
2210 $ROOT->on_refresh ($self, sub { 2240 $ROOT->on_post_alloc ($self, sub {
2211 if (delete $self->{need_reflow}) { 2241 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2242 my $height = 0;
2213 2243
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2244 $height += $_->[0] = $self->text_height ($_->[2])
2215 for @{$self->{par}}; 2245 for @{$self->{par}};
… …
2367 @_, 2397 @_,
2368 can_events => 0, 2398 can_events => 0,
2369 ) 2399 )
2370} 2400}
2371 2401
2372sub set_markup { 2402sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2403 my ($self, $widget) = @_;
2374 2404
2375 $self->{label} = new CFClient::UI::Label 2405 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip},
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2408 fontsize => 0.8,
2377 fg => [0, 0, 0], 2409 fg => [0, 0, 0, 1],
2378 font => ($font || $::FONT_PROP); 2410 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2411 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2412}
2384 2413
2385sub size_request { 2414sub size_request {
2386 my ($self) = @_; 2415 my ($self) = @_;
2387 2416
… …
2397} 2426}
2398 2427
2399sub _draw { 2428sub _draw {
2400 my ($self) = @_; 2429 my ($self) = @_;
2401 2430
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2431 glTranslate 0.375, 0.375;
2404 2432
2405 my ($w, $h) = @$self{qw(w h)}; 2433 my ($w, $h) = @$self{qw(w h)};
2406 2434
2407 glColor 1, 0.8, 0.4; 2435 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2446 glVertex 0 , $h;
2419 glVertex $w, $h; 2447 glVertex $w, $h;
2420 glVertex $w, 0; 2448 glVertex $w, 0;
2421 glEnd; 2449 glEnd;
2422 2450
2423 glPopMatrix; 2451 glTranslate 2 - 0.375, 2 - 0.375;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2427} 2453}
2428 2454
2429############################################################################# 2455#############################################################################
2430 2456
… …
2478 2504
2479 my $desc = $item->{nrof} < 2 2505 my $desc = $item->{nrof} < 2
2480 ? $item->{name} 2506 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}"; 2507 : "$item->{nrof} $item->{name_pl}";
2482 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 .= " *";
2483 2523
2484 my $self = $class->SUPER::new ( 2524 my $self = $class->SUPER::new (
2485 can_hover => 1, 2525 can_hover => 1,
2486 can_events => 1, 2526 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc) 2527 tooltip => (CFClient::UI::Label->escape ($desc)
… …
2493 if ($ev->{button} == 1) { 2533 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) { 2535 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}"); 2536 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) { 2537 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new ( 2538 my @menu_items = (
2499 items => [
2500 ["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") }],
2501 [ 2543 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") }, 2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ], 2546 ],
2509 )->popup ($ev); 2547 );
2548
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2510 } 2550 }
2511 2551
2512 1 2552 1
2513 }, 2553 },
2514 %args 2554 %args
… …
2550 my ($self, $items) = @_; 2590 my ($self, $items) = @_;
2551 2591
2552 $self->{scrolled}->clear; 2592 $self->{scrolled}->clear;
2553 return unless $items; 2593 return unless $items;
2554 2594
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2595 my @items = sort {
2596 ($a->{type} <=> $b->{type})
2597 or ($a->{name} cmp $b->{name})
2598 } @$items;
2556 2599
2557 $self->{real_items} = \@items; 2600 $self->{real_items} = \@items;
2558 2601
2559 for my $item (@items) { 2602 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2 2603 my $desc = $item->{nrof} < 2
2561 ? $item->{name} 2604 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}"; 2605 : "$item->{nrof} $item->{name_pl}";
2563 2606
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2565 } 2608 }
2609
2610 $self->{scrolled}->add (@items);
2566 2611
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568} 2613}
2569 2614
2570sub size_request { 2615sub size_request {
… …
2657 while (my ($k, $v) = each %{ $self->{item} }) { 2702 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2703 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 2704 }
2660 2705
2661 my @widgets; 2706 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2707
2708 my @items = sort {
2709 $a->{pri} <=> $b->{pri}
2710 or $b->{id} <=> $a->{id}
2711 } values %{ $self->{item} };
2712
2663 my $count = 10 + 1; 2713 my $count = 10 + 1;
2664 for my $item (@items) { 2714 for my $item (@items) {
2665 last unless --$count; 2715 last unless --$count;
2666 2716
2667 push @widgets, $item->{label} ||= do { 2717 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 2718 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 2719 my $short = $item->{count} > 1
2720 ? "<b>$item->{count} ×</b> $item->{text}"
2721 : $item->{text};
2722
2670 for ($short) { 2723 for ($short) {
2671 s/^\s+//; 2724 s/^\s+//;
2672 s/\012.*//s; 2725 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize}; 2726 my $len = int 40 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length; 2727 substr $_, $len, length, "…" if $len < length;
2675 } 2728 }
2676 2729
2677 new CFClient::UI::Label 2730 new CFClient::UI::Label
2678 markup => $short, 2731 markup => $short,
2679 tooltip => delete $item->{tooltip}, 2732 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67,
2680 fontsize => delete $item->{fontsize}, 2735 fontsize => $item->{fontsize},
2681 color => delete $item->{color}, 2736 fg => $item->{fg},
2682 can_events => 1, 2737 can_events => 1,
2683 can_hover => 1, 2738 can_hover => 1
2684 }; 2739 };
2685 } 2740 }
2686 2741
2687 $self->clear; 2742 $self->clear;
2688 $self->SUPER::add (@widgets); 2743 $self->SUPER::add (reverse @widgets);
2689} 2744}
2690 2745
2691sub add { 2746sub add {
2692 my ($self, $text, %arg) = @_; 2747 my ($self, $text, %arg) = @_;
2693 2748
2694 my $item = { 2749 $text =~ s/^\s+//;
2695 time => time, 2750 $text =~ s/\s+$//;
2751
2752 my $timeout = time + ((delete $arg{timeout}) || 60);
2753
2754 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755
2756 if (my $item = $self->{item}{$group}) {
2757 if ($item->{text} eq $text) {
2758 $item->{count}++;
2759 } else {
2760 $item->{count} = 1;
2761 $item->{text} = $item->{tooltip} = $text;
2762 }
2763 $item->{id} = ++$self->{id};
2764 $item->{timeout} = $timeout;
2765 delete $item->{label};
2766 } else {
2767 $self->{item}{$group} = {
2768 id => ++$self->{id},
2696 text => $text, 2769 text => $text,
2697 timeout => 60, 2770 timeout => $timeout,
2698 tooltip => $text, 2771 tooltip => $text,
2699 fontsize => 0.8, 2772 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 2773 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0,
2775 count => 1,
2701 %arg, 2776 %arg,
2777 };
2702 }; 2778 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 2779
2709 $self->reorder; 2780 $self->reorder;
2710} 2781}
2711 2782
2712############################################################################# 2783#############################################################################
… …
2746} 2817}
2747 2818
2748sub size_allocate { 2819sub size_allocate {
2749 my ($self, $w, $h) = @_; 2820 my ($self, $w, $h) = @_;
2750 2821
2751 my $old_w = $self->{old_w}; 2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2752 my $old_h = $self->{old_h}; 2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2753 2824
2754 if ($old_w && $old_h) { 2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2755 for my $child ($self->children) { 2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766 2827
2767 for my $child ($self->children) { 2828 for my $child ($self->children) {
2768 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)};
2769 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
2770 $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;
2771 $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
2772 $child->configure ($X, $Y, $W, $H); 2840 $child->configure ($X, $Y, $W, $H);
2773 } 2841 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777} 2842}
2778 2843
2779sub coord2local { 2844sub coord2local {
2780 my ($self, $x, $y) = @_; 2845 my ($self, $x, $y) = @_;
2781 2846
… …
2794 $self->check_size; 2859 $self->check_size;
2795 $::WANT_REFRESH++; 2860 $::WANT_REFRESH++;
2796} 2861}
2797 2862
2798sub add { 2863sub add {
2799 my ($self, $child) = @_; 2864 my ($self, @children) = @_;
2800 2865
2866 for my $child (@children) {
2867 $child->{toplevel} = 1;
2868
2801 # integerise window positions 2869 # integerise window positions
2802 $child->{x} = int $child->{x}; 2870 $child->{x} = int $child->{x};
2803 $child->{y} = int $child->{y}; 2871 $child->{y} = int $child->{y};
2872 }
2804 2873
2805 $self->SUPER::add ($child); 2874 $self->SUPER::add (@children);
2806} 2875}
2807 2876
2808sub on_refresh { 2877sub on_refresh {
2809 my ($self, $id, $cb) = @_; 2878 my ($self, $id, $cb) = @_;
2810 2879
2811 $self->{refresh_hook}{$id} = $cb; 2880 $self->{refresh_hook}{$id} = $cb;
2812} 2881}
2813 2882
2883sub on_post_alloc {
2884 my ($self, $id, $cb) = @_;
2885
2886 $self->{post_alloc_hook}{$id} = $cb;
2887}
2888
2814sub draw { 2889sub draw {
2815 my ($self) = @_; 2890 my ($self) = @_;
2891
2892 while ($self->{refresh_hook}) {
2893 $_->()
2894 for values %{delete $self->{refresh_hook}};
2895 }
2816 2896
2817 if ($self->{check_size}) { 2897 if ($self->{check_size}) {
2818 my @queue = ([], []); 2898 my @queue = ([], []);
2819 2899
2820 for (;;) { 2900 for (;;) {
… …
2828 2908
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2909 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)} 2910 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request; 2911 : $widget->size_request;
2832 2912
2913 if (delete $widget->{force_alloc}
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2914 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 2915 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835 2916
2836 $widget->{req_w} = $w; 2917 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h; 2918 $widget->{req_h} = $h;
2838 2919
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2920 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2840 2921
2841 $widget->{parent}->check_size 2922 $widget->{parent}->check_size
2842 if $widget->{parent}; 2923 if $widget->{parent};
2843 } 2924 }
2844 } 2925 }
… …
2856 $widget->size_allocate ($w, $h); 2937 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h); 2938 $widget->emit (size_allocate => $w, $h);
2858 } 2939 }
2859 } 2940 }
2860 2941
2861 while ($self->{refresh_hook}) { 2942 while ($self->{post_alloc_hook}) {
2862 $_->() 2943 $_->()
2863 for values %{delete $self->{refresh_hook}}; 2944 for values %{delete $self->{post_alloc_hook}};
2864 } 2945 }
2865 2946
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 2949 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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