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.244 by root, Sat May 27 21:06:09 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
136 $rem += $_ - $i; 150 $rem += $_ - $i;
137 $_ = $i; 151 $_ = $i;
138 } 152 }
139} 153}
140 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
141# call when resolution changes etc. 171# call when resolution changes etc.
142sub rescale_widgets { 172sub rescale_widgets {
143 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
144 174
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 } 185 }
159
160 $widget->reconfigure;
161 } 186 }
187
188 reconfigure_widgets;
162} 189}
163 190
164############################################################################# 191#############################################################################
165 192
166package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
179 can_events => 1, 206 can_events => 1,
180 @_ 207 @_
181 }, $class; 208 }, $class;
182 209
183 for (keys %$self) { 210 for (keys %$self) {
184 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
186 } 213 }
187 } 214 }
188 215
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190 217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
191 $self 225 $self
192} 226}
193 227
194sub destroy { 228sub destroy {
195 my ($self) = @_; 229 my ($self) = @_;
… …
198 %$self = (); 232 %$self = ();
199} 233}
200 234
201sub show { 235sub show {
202 my ($self) = @_; 236 my ($self) = @_;
203
204 return if $self->{parent}; 237 return if $self->{parent};
205 238
206 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
207} 240}
208 241
209sub hide { 242sub show_centered {
210 my ($self) = @_; 243 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247
248 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 },
252 );
253}
254
255sub set_invisible {
256 my ($self) = @_;
257
258 return unless $self->{visible};
259
260 # broken show/hide model
261
262 delete $self->{root};
263 delete $self->{visible};
211 264
212 undef $GRAB if $GRAB == $self; 265 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 266 undef $HOVER if $HOVER == $self;
267
268 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self;
270
271 $self->focus_out;
272
273 $self->emit (visibility_change => 0);
274}
275
276sub hide {
277 my ($self) = @_;
278
279 $self->set_invisible;
214 280
215 $self->{parent}->remove ($self) 281 $self->{parent}->remove ($self)
216 if $self->{parent}; 282 if $self->{parent};
217} 283}
218 284
… …
288} 354}
289 355
290sub set_tooltip { 356sub set_tooltip {
291 my ($self, $tooltip) = @_; 357 my ($self, $tooltip) = @_;
292 358
359 $tooltip =~ s/^\s+//;
360 $tooltip =~ s/\s+$//;
361
362 return if $self->{tooltip} eq $tooltip;
363
293 $self->{tooltip} = $tooltip; 364 $self->{tooltip} = $tooltip;
294 365
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 366 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 367 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 368 CFClient::UI::check_tooltip;
… …
318 return if $FOCUS == $self; 389 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 390 return unless $self->{can_focus};
320 391
321 my $focus = $FOCUS; $FOCUS = $self; 392 my $focus = $FOCUS; $FOCUS = $self;
322 393
323 $self->emit (focus_in => $focus); 394 $self->_emit (focus_in => $focus);
324 395
325 $focus->update if $focus; 396 $focus->update if $focus;
326 $FOCUS->update; 397 $FOCUS->update;
327} 398}
328 399
… …
331 402
332 return unless $FOCUS == $self; 403 return unless $FOCUS == $self;
333 404
334 my $focus = $FOCUS; undef $FOCUS; 405 my $focus = $FOCUS; undef $FOCUS;
335 406
336 $self->emit (focus_out => $focus); 407 $self->_emit (focus_out => $focus);
337 408
338 $focus->update if $focus; #? 409 $focus->update if $focus; #?
410
411 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
412 unless $FOCUS;
339} 413}
340 414
341sub mouse_motion { } 415sub mouse_motion { }
342sub button_up { } 416sub button_up { }
343sub key_down { } 417sub key_down { }
344sub key_up { } 418sub key_up { }
345 419
346sub button_down { 420sub button_down {
347 my ($self, $ev, $x, $y) = @_; 421 my ($self, $ev, $x, $y) = @_;
348 422
349 $self->focus_in; 423 $self->focus_in;
… …
383 if ($ENV{PCLIENT_DEBUG}) { 457 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix; 458 glPushMatrix;
385 glColor 1, 1, 0, 1; 459 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 461 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 462 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 463 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 464 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 465 glVertex 0 , $self->{h} - 1;
392 glEnd; 466 glEnd;
393 glPopMatrix; 467 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 468 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 469 }
396} 470}
… …
416sub set_parent { 490sub set_parent {
417 my ($self, $parent) = @_; 491 my ($self, $parent) = @_;
418 492
419 Scalar::Util::weaken ($self->{parent} = $parent); 493 Scalar::Util::weaken ($self->{parent} = $parent);
420 494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
421 # TODO: req_w _does_change after ->reconfigure 503 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 504 $self->check_size
423 unless exists $self->{req_w}; 505 unless exists $self->{req_w};
506
507 $self->show;
424} 508}
425 509
426sub check_size { 510sub check_size {
427 my ($self, $forced) = @_; 511 my ($self, $forced) = @_;
428 512
… …
441 my ($self, $signal, $cb) = @_; 525 my ($self, $signal, $cb) = @_;
442 526
443 push @{ $self->{signal_cb}{$signal} }, $cb; 527 push @{ $self->{signal_cb}{$signal} }, $cb;
444} 528}
445 529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
446sub emit { 536sub emit {
447 my ($self, $signal, @args) = @_; 537 my ($self, $signal, @args) = @_;
448 538
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
450} 545}
451 546
452sub DESTROY { 547sub DESTROY {
453 my ($self) = @_; 548 my ($self) = @_;
454 549
… …
567 delete $child->{parent}; 662 delete $child->{parent};
568 $child->hide; 663 $child->hide;
569 664
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 666
572 $self->check_size; 667 $self->check_size (1);
573 $self->update; 668 $self->update;
574} 669}
575 670
576sub clear { 671sub clear {
577 my ($self) = @_; 672 my ($self) = @_;
… …
717 812
718package CFClient::UI::ViewPort; 813package CFClient::UI::ViewPort;
719 814
720our @ISA = CFClient::UI::Window::; 815our @ISA = CFClient::UI::Window::;
721 816
817sub new {
818 my $class = shift;
819
820 $class->SUPER::new (
821 scroll_x => 0,
822 scroll_y => 1,
823 @_,
824 )
825}
826
722sub size_request { 827sub size_request {
723 my ($self) = @_; 828 my ($self) = @_;
724 829
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 831
728 @$self{qw(child_w child_h)} 832 @$self{qw(child_w child_h)}
729} 833}
730 834
731sub size_allocate { 835sub size_allocate {
732 my ($self, $w, $h) = @_; 836 my ($self, $w, $h) = @_;
733 837
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
840
841 $self->child->configure (0, 0, $w, $h);
734 $self->update; 842 $self->update;
735} 843}
736 844
737sub set_offset { 845sub set_offset {
738 my ($self, $x, $y) = @_; 846 my ($self, $x, $y) = @_;
… …
789 my $class = shift; 897 my $class = shift;
790 898
791 my $self; 899 my $self;
792 900
793 my $slider = new CFClient::UI::Slider 901 my $slider = new CFClient::UI::Slider
794 vertical => 1, 902 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 903 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 904 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 905 $self->{vp}->set_offset (0, $_[1]);
798 }, 906 },
799 ; 907 ;
800 908
801 $self = $class->SUPER::new ( 909 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 910 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 911 slider => $slider,
804 @_, 912 @_,
805 ); 913 );
806 914
807 $self->{vp}->add ($self->{scrolled}); 915 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 916 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 917 $self->add ($self->{slider});
810 918
811 $self 919 $self
920}
921
922sub update {
923 my ($self) = @_;
924
925 $self->SUPER::update;
926
927 # todo: overwrite size_allocate of child
928 my $child = $self->{vp}->child;
929 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
930}
931
932sub size_allocate {
933 my ($self, $w, $h) = @_;
934
935 $self->SUPER::size_allocate ($w, $h);
936
937 my $child = $self->{vp}->child;
938 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812} 939}
813 940
814#TODO# update range on size_allocate depending on child 941#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 942# update viewport offset on scroll
816 943
… …
870 my $class = shift; 997 my $class = shift;
871 998
872 # TODO: user_x, user_y, overwrite moveto? 999 # TODO: user_x, user_y, overwrite moveto?
873 1000
874 my $self = $class->SUPER::new ( 1001 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1002 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1003 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1004 border => 0.6,
878 toplevel => 1, 1005 is_toplevel => 1,
879 can_events => 1, 1006 can_events => 1,
880 @_ 1007 @_
881 ); 1008 );
882 1009
883 $self->{title} &&= new CFClient::UI::Label 1010 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 1011 align => 0,
… …
937 my ($ev, $x, $y) = @_; 1064 my ($ev, $x, $y) = @_;
938 1065
939 my $dx = $ev->{x} - $ox; 1066 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1067 my $dy = $ev->{y} - $oy;
941 1068
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1073 $self->move ($self->{user_x}, $self->{user_y});
945 $self->check_size; 1074 $self->check_size;
946 }; 1075 };
947 1076
948 } elsif ($lr ^ $td) { 1077 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1078 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
952 $self->{motion} = sub { 1081 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
954 1083
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1084 ($x, $y) = ($ev->{x}, $ev->{y});
956 1085
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1086 $self->{user_x} = $bx + $x - $ox;
1087 $self->{user_y} = $by + $y - $oy;
1088 $self->move ($self->{user_x}, $self->{user_y});
958 $self->update; 1089 $self->update;
959 }; 1090 };
960 } 1091 }
961} 1092}
962 1093
… …
1024sub new { 1155sub new {
1025 my $class = shift; 1156 my $class = shift;
1026 1157
1027 $class->SUPER::new ( 1158 $class->SUPER::new (
1028 col_expand => [], 1159 col_expand => [],
1029 @_ 1160 @_,
1030 ) 1161 )
1162}
1163
1164sub children {
1165 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1166}
1032 1167
1033sub add { 1168sub add {
1034 my ($self, $x, $y, $child) = @_; 1169 my ($self, $x, $y, $child) = @_;
1035 1170
1036 $child->set_parent ($self); 1171 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1172 $self->{children}[$y][$x] = $child;
1038 1173
1039 $child->check_size; 1174 $self->check_size (1);
1040} 1175}
1041 1176
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal? 1177# TODO: move to container class maybe? send children a signal on removal?
1047sub clear { 1178sub clear {
1048 my ($self) = @_; 1179 my ($self) = @_;
1049 1180
1050 my @children = $self->children; 1181 my @children = $self->children;
1051 delete $self->{children}; 1182 delete $self->{children};
… …
1053 for (@children) { 1184 for (@children) {
1054 delete $_->{parent}; 1185 delete $_->{parent};
1055 $_->hide; 1186 $_->hide;
1056 } 1187 }
1057 1188
1189 $self->check_size (1);
1058 $self->update; 1190 $self->update;
1059} 1191}
1060 1192
1061sub get_wh { 1193sub get_wh {
1062 my ($self) = @_; 1194 my ($self) = @_;
… …
1094sub size_allocate { 1226sub size_allocate {
1095 my ($self, $w, $h) = @_; 1227 my ($self, $w, $h) = @_;
1096 1228
1097 my ($ws, $hs) = $self->get_wh; 1229 my ($ws, $hs) = $self->get_wh;
1098 1230
1099 my $req_w = sum @$ws; 1231 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1232 my $req_h = (sum @$hs) || 1;
1101 1233
1102 # TODO: nicer code && do row_expand 1234 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1235 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1236 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1237 my $col_expand = (sum @col_expand) || 1;
… …
1466 active_fg => [0, 0, 0], 1598 active_fg => [0, 0, 0],
1467 can_hover => 1, 1599 can_hover => 1,
1468 can_focus => 1, 1600 can_focus => 1,
1469 valign => 0, 1601 valign => 0,
1470 can_events => 1, 1602 can_events => 1,
1603 #text => ...
1471 @_ 1604 @_
1472 ) 1605 )
1473} 1606}
1474 1607
1475sub _set_text { 1608sub _set_text {
… …
1485 $self->{text} = $text; 1618 $self->{text} = $text;
1486 1619
1487 $text =~ s/./*/g if $self->{hidden}; 1620 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1621 $self->{layout}->set_text ("$text ");
1489 1622
1490 $self->emit (changed => $self->{text}); 1623 $self->_emit (changed => $self->{text});
1491} 1624}
1492 1625
1493sub set_text { 1626sub set_text {
1494 my ($self, $text) = @_; 1627 my ($self, $text) = @_;
1495 1628
… …
1507 my ($self) = @_; 1640 my ($self) = @_;
1508 1641
1509 my ($w, $h) = $self->SUPER::size_request; 1642 my ($w, $h) = $self->SUPER::size_request;
1510 1643
1511 ($w + 1, $h) # add 1 for cursor 1644 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1645}
1519 1646
1520sub key_down { 1647sub key_down {
1521 my ($self, $ev) = @_; 1648 my ($self, $ev) = @_;
1522 1649
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1664 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1665 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1666 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1667 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1668 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1669 $self->_emit ('escape');
1543 } elsif ($uni) { 1670 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1671 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1672 }
1546 1673
1547 $self->_set_text ($text); 1674 $self->_set_text ($text);
… …
1634 if ($sym == 13) { 1761 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1762 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1763 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1764 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1765 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1766 $self->_emit (activate => $txt);
1640 $self->update; 1767 $self->update;
1641 1768
1642 } elsif ($sym == CFClient::SDLK_UP) { 1769 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1770 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1771 $self->{history_saveback} = $self->get_text;
… …
1692 can_events => 1, 1819 can_events => 1,
1693 @_ 1820 @_
1694 ) 1821 )
1695} 1822}
1696 1823
1824sub activate { }
1825
1697sub button_up { 1826sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1827 my ($self, $ev, $x, $y) = @_;
1699 1828
1829 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1830 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1831 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1832}
1705 1833
1706sub _draw { 1834sub _draw {
1707 my ($self) = @_; 1835 my ($self) = @_;
1708 1836
… …
1760 my ($self, $ev, $x, $y) = @_; 1888 my ($self, $ev, $x, $y) = @_;
1761 1889
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764 $self->{state} = !$self->{state}; 1892 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1893 $self->_emit (changed => $self->{state});
1766 } 1894 }
1767} 1895}
1768 1896
1769sub _draw { 1897sub _draw {
1770 my ($self) = @_; 1898 my ($self) = @_;
… …
2045 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2179 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2180 req_h => $::WIDTH / 80,
2053 vertical => 0, 2181 vertical => 0,
2054 can_hover => 1, 2182 can_hover => 1,
2055 inner_pad => .05, 2183 inner_pad => 0.02,
2056 @_ 2184 @_
2057 ); 2185 );
2058 2186
2059 $self->set_value ($self->{range}[0]); 2187 $self->set_value ($self->{range}[0]);
2060 $self->update; 2188 $self->update;
2061 2189
2062 $self 2190 $self
2063} 2191}
2064 2192
2193sub set_range {
2194 my ($self, $range) = @_;
2195
2196 ($range, $self->{range}) = ($self->{range}, $range);
2197
2198 $self->update
2199 if "@$range" ne "@{$self->{range}}";
2200}
2201
2065sub set_value { 2202sub set_value {
2066 my ($self, $value) = @_; 2203 my ($self, $value) = @_;
2067 2204
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2205 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2206
2070 $hi = $lo + 1 if $hi <= $lo; 2207 $hi = $lo + 1 if $hi <= $lo;
2071 2208
2209 $page = $hi - $lo if $page > $hi - $lo;
2210
2072 $value = $lo if $value < $lo; 2211 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2212 $value = $hi - $page if $value > $hi - $page;
2074 2213
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2214 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2215 if $unit;
2077 2216
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2217 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2218
2082 if ($value != $old_value) { 2219 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2220 $self->_emit (changed => $value);
2084 $self->update; 2221 $self->update;
2085 } 2222 }
2086} 2223}
2087 2224
2088sub size_request { 2225sub size_request {
… …
2096 2233
2097sub button_down { 2234sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2099 2236
2100 $self->SUPER::button_down ($ev, $x, $y); 2237 $self->SUPER::button_down ($ev, $x, $y);
2238
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240
2101 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2102} 2242}
2103 2243
2104sub mouse_motion { 2244sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2247 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2249
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2250 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2251
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2253
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2255 }
2116} 2256}
2117 2257
2118sub update { 2258sub update {
2119 my ($self) = @_; 2259 my ($self) = @_;
2120 2260
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2262 $self->set_value ($self->{range}[0]);
2123 2263
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2125 2266
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2268
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2271
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2272 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2273 $value = $value * $self->{scale} + $self->{offset};
2132 2274
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2276 $self->{knob_w} = $knob_w;
2140 }); 2277 });
2141 2278
2142 $self->SUPER::update; 2279 $self->SUPER::update;
2143} 2280}
2144 2281
… …
2168 # draw handle 2305 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2306 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2307
2171 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2172} 2309}
2310
2311#############################################################################
2312
2313package CFClient::UI::ValSlider;
2314
2315our @ISA = CFClient::UI::HBox::;
2316
2317sub new {
2318 my ($class, %arg) = @_;
2319
2320 my $range = delete $arg{range};
2321
2322 my $self = $class->SUPER::new (
2323 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2324 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2325 to_value => sub { shift },
2326 from_value => sub { shift },
2327 %arg,
2328 );
2329
2330 $self->{slider}->connect (changed => sub {
2331 my ($self, $value) = @_;
2332 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2333 $self->{parent}->emit (changed => $value);
2334 });
2335
2336# $self->{entry}->connect (changed => sub {
2337# my ($self, $value) = @_;
2338# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2339# $self->{parent}->emit (changed => $value);
2340# });
2341
2342 $self->add ($self->{slider}, $self->{entry});
2343
2344 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2345
2346 $self
2347}
2348
2349sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) }
2173 2351
2174############################################################################# 2352#############################################################################
2175 2353
2176package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2177 2355
… …
2207 2385
2208 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2387 $self->reflow;
2210} 2388}
2211 2389
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2390sub size_allocate {
2232 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2233 2392
2234 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2235 2394
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2398
2240 $self->reflow; 2399 $self->reflow;
2241} 2400}
2242 2401
2402sub text_size {
2403 my ($self, $text, $indent) = @_;
2404
2405 my $layout = $self->{layout};
2406
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent);
2409 $layout->set_markup ($text);
2410
2411 $layout->size
2412}
2413
2414sub reflow {
2415 my ($self) = @_;
2416
2417 $self->{need_reflow}++;
2418 $self->update;
2419}
2420
2421sub set_offset {
2422 my ($self, $offset) = @_;
2423
2424 # todo: base offset on lines or so, not on pixels
2425 $self->{children}[1]->set_value ($offset);
2426}
2427
2428sub clear {
2429 my ($self) = @_;
2430
2431 $self->{par} = [];
2432 $self->{height} = 0;
2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2434}
2435
2243sub add_paragraph { 2436sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2245 2438
2246 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2247 2440 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2251 2444
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2446}
2257 2447
2258sub update { 2448sub update {
2259 my ($self) = @_; 2449 my ($self) = @_;
2260 2450
… …
2263 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2264 2454
2265 delete $self->{texture}; 2455 delete $self->{texture};
2266 2456
2267 $ROOT->on_post_alloc ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2268 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2461 my $height = 0;
2270 2462
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2272 for @{$self->{par}}; 2467 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]);
2470 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h;
2474 }
2475
2476 $height += $_->[1];
2477 }
2273 2478
2274 $self->{height} = $height; 2479 $self->{height} = $height;
2275 2480
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2482
2278 delete $self->{texture}; 2483 delete $self->{texture};
2279 } 2484 }
2280 2485
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2284 2489
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]; 2490 my $top = int $self->{children}[1]{range}[0];
2289 2491
2290 my $y0 = $top; 2492 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2493 my $y1 = $top + $H;
2292 2494
2293 my $y = 0; 2495 my $y = 0;
2294 2496
2295 my $layout = $self->{layout}; 2497 my $layout = $self->{layout};
2296 2498
2297 $layout->set_font ($self->{font}) if $self->{font}; 2499 $layout->set_font ($self->{font}) if $self->{font};
2298 2500
2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2504
2299 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2506 my $h = $par->[1];
2301 2507
2302 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2305 2512
2306 my ($W, $H) = $layout->size; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2514
2515 glRasterPos $par->[3], $y - $y0;
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2517 }
2309 2518
2310 $y += $h; 2519 $y += $h;
2311 } 2520 }
2312 2521
2313 glDisable GL_TEXTURE_2D; 2522 glDisable GL_BLEND;
2314 }; 2523 };
2315 }); 2524 });
2316} 2525}
2317 2526
2318sub _draw { 2527sub _draw {
… …
2378 2587
2379sub new { 2588sub new {
2380 my $class = shift; 2589 my $class = shift;
2381 2590
2382 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2383 state => 0, 2592 state => 0,
2384 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2385 @_ 2594 @_
2386 ); 2595 );
2387 2596
2388 if ($self->{state}) { 2597 if ($self->{state}) {
2389 $self->{state} = 0; 2598 $self->{state} = 0;
… …
2398 2607
2399 # TODO: use animation 2608 # TODO: use animation
2400 if ($self->{state} = !$self->{state}) { 2609 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other}); 2610 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h})); 2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open"); 2612 $self->_emit ("open");
2404 } else { 2613 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other}); 2614 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close"); 2615 $self->_emit ("close");
2407 } 2616 }
2408 2617
2409 $self->emit (changed => $self->{state}); 2618 $self->_emit (changed => $self->{state});
2410} 2619}
2411 2620
2412############################################################################# 2621#############################################################################
2413 2622
2414package CFClient::UI::Tooltip; 2623package CFClient::UI::Tooltip;
… …
2489use CFClient::OpenGL; 2698use CFClient::OpenGL;
2490 2699
2491sub new { 2700sub new {
2492 my $class = shift; 2701 my $class = shift;
2493 2702
2494 $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2495 aspect => 1, 2704 aspect => 1,
2705 can_events => 0,
2496 @_, 2706 @_,
2497 ) 2707 );
2708
2709 if ($self->{anim} && $self->{animspeed}) {
2710 Scalar::Util::weaken (my $widget = $self);
2711
2712 $self->{timer} = Event->timer (
2713 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2714 hard => 1,
2715 interval => $self->{animspeed},
2716 cb => sub {
2717 ++$widget->{frame};
2718 $widget->update;
2719 },
2720 );
2721 }
2722
2723 $self
2498} 2724}
2499 2725
2500sub size_request { 2726sub size_request {
2501 (32, 8) 2727 (32, 8)
2502} 2728}
2503 2729
2730sub update {
2731 my ($self) = @_;
2732
2733 return unless $self->{visible};
2734
2735 $self->SUPER::update;
2736}
2737
2504sub _draw { 2738sub _draw {
2505 my ($self) = @_; 2739 my ($self) = @_;
2506 2740
2507 return unless $::CONN;#d# manage and cache textures differently 2741 return unless $::CONN;
2742
2743 my $face;
2744
2745 if ($self->{frame}) {
2746 my $anim = $::CONN->{anim}[$self->{anim}];
2747
2748 $face = $anim->[ $self->{frame} % @$anim ]
2749 if $anim && @$anim;
2750 }
2751
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2753
2510 # TODO animation
2511 if ($tex) { 2754 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2755 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2757 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2517 } 2760 }
2518} 2761}
2519 2762
2763sub DESTROY {
2764 my ($self) = @_;
2765
2766 $self->{timer}->cancel
2767 if $self->{timer};
2768
2769 $self->SUPER::DESTROY;
2770}
2771
2520############################################################################# 2772#############################################################################
2521 2773
2522package CFClient::UI::InventoryItem; 2774package CFClient::UI::Inventory;
2523 2775
2524our @ISA = CFClient::UI::HBox::; 2776our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551 2777
2552sub new { 2778sub new {
2553 my $class = shift; 2779 my $class = shift;
2554 2780
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2562 can_hover => 1, 2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_, 2783 @_,
2637 ); 2784 );
2638 2785
2639 $self 2786 $self
2640} 2787}
… …
2650 or ($a->{name} cmp $b->{name}) 2797 or ($a->{name} cmp $b->{name})
2651 } @$items; 2798 } @$items;
2652 2799
2653 $self->{real_items} = \@items; 2800 $self->{real_items} = \@items;
2654 2801
2802 my $row = 0;
2655 for my $item (@items) { 2803 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2804 CFClient::Item::update_widgets $item;
2657 $item->update_item ();
2658 }
2659 2805
2660 $self->{scrolled}->add (@items); 2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2661 2809
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2810 $row++;
2811 }
2663} 2812}
2664 2813
2665sub size_request { 2814sub size_request {
2666 my ($self) = @_; 2815 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h}); 2816 ($self->{req_w}, $self->{req_h});
… …
2707 2856
2708# popup given the event (must be a mouse button down event currently) 2857# popup given the event (must be a mouse button down event currently)
2709sub popup { 2858sub popup {
2710 my ($self, $ev) = @_; 2859 my ($self, $ev) = @_;
2711 2860
2712 $self->emit ("popdown"); 2861 $self->_emit ("popdown");
2713 2862
2714 # maybe save $GRAB? must be careful about events... 2863 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2864 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2865 $self->{button} = $ev->{button};
2717 2866
… …
2732 2881
2733 if ($ev->{button} == $self->{button}) { 2882 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2883 undef $GRAB;
2735 $self->hide; 2884 $self->hide;
2736 2885
2737 $self->emit ("popdown"); 2886 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2887 $self->{hover}[1]->() if $self->{hover};
2739 } 2888 }
2740} 2889}
2741 2890
2742############################################################################# 2891#############################################################################
… …
2804sub add { 2953sub add {
2805 my ($self, $text, %arg) = @_; 2954 my ($self, $text, %arg) = @_;
2806 2955
2807 $text =~ s/^\s+//; 2956 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2957 $text =~ s/\s+$//;
2958
2959 return unless $text;
2809 2960
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2961 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2962
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2964
… …
2857 3008
2858sub new { 3009sub new {
2859 my $class = shift; 3010 my $class = shift;
2860 3011
2861 $class->SUPER::new ( 3012 $class->SUPER::new (
3013 visible => 1,
2862 @_, 3014 @_,
2863 ) 3015 )
2864} 3016}
2865 3017
2866sub configure { 3018sub configure {
… …
2884} 3036}
2885 3037
2886sub size_allocate { 3038sub size_allocate {
2887 my ($self, $w, $h) = @_; 3039 my ($self, $w, $h) = @_;
2888 3040
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895 for my $child ($self->children) { 3041 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 3043
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x}; 3045 if exists $child->{req_x};
2900 3046
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902 if exists $child->{req_y}; 3048 if exists $child->{req_y};
2903 3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3055
2907 $child->configure ($X, $Y, $W, $H); 3056 $child->configure ($X, $Y, $W, $H);
2908 } 3057 }
… …
2928} 3077}
2929 3078
2930sub add { 3079sub add {
2931 my ($self, @children) = @_; 3080 my ($self, @children) = @_;
2932 3081
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
2933 for my $child (@children) { 3088 for my $child (@children) {
2934 $child->{toplevel} = 1; 3089 $child->{is_toplevel} = 1;
2935 3090
2936 # integerise window positions 3091 # integerise window positions
2937 $child->{x} = int $child->{x}; 3092 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y}; 3093 $child->{y} = int $child->{y};
2939 } 3094 }
2940 3095
2941 $self->SUPER::add (@children); 3096 $self->SUPER::add (@children);
2942} 3097}
2943 3098
3099sub remove {
3100 my ($self, @children) = @_;
3101
3102 $self->SUPER::remove (@children);
3103
3104 while (@children) {
3105 my $w = pop @children;
3106 push @children, $w->children;
3107 $w->set_invisible;
3108 }
3109}
3110
2944sub on_refresh { 3111sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3112 my ($self, $id, $cb) = @_;
2946 3113
2947 $self->{refresh_hook}{$id} = $cb; 3114 $self->{refresh_hook}{$id} = $cb;
2948} 3115}
… …
2960 $_->() 3127 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
2962 } 3129 }
2963 3130
2964 if ($self->{check_size}) { 3131 if ($self->{check_size}) {
2965 my @queue = ([], []); 3132 my @queue;
2966 3133
2967 for (;;) { 3134 for (;;) {
2968 if ($self->{check_size}) { 3135 if ($self->{check_size}) {
2969 # heuristic: check containers last 3136 #TODO use array-of-depth approach
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3137
3138 @queue = sort { $a->{visible} <=> $b->{visible} }
2971 for values %{delete $self->{check_size}} 3139 @queue, values %{delete $self->{check_size}};
2972 } 3140 }
2973 3141
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3142 my $widget = pop @queue || last;
3143
3144 defined $widget->{visible} or last; # do not resize invisible widgets
2975 3145
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2977 ? @$widget{qw(user_w user_h)} 3147 ? @$widget{qw(user_w user_h)}
2978 : $widget->size_request; 3148 : $widget->size_request;
2979 3149
… …
2999 $w = 0 if $w < 0; 3169 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3170 $h = 0 if $h < 0;
3001 3171
3002 $widget->{w} = $w; 3172 $widget->{w} = $w;
3003 $widget->{h} = $h; 3173 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h);
3005 $widget->emit (size_allocate => $w, $h); 3174 $widget->emit (size_allocate => $w, $h);
3006 } 3175 }
3007 } 3176 }
3008 3177
3009 while ($self->{post_alloc_hook}) { 3178 while ($self->{post_alloc_hook}) {
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3185 glClear GL_COLOR_BUFFER_BIT;
3017 3186
3018 glMatrixMode GL_PROJECTION; 3187 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3188 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3190 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3191 glLoadIdentity;
3023 3192
3024 $self->_draw; 3193 $self->_draw;
3025} 3194}

Diff Legend

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