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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 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
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 373}
313 374
314sub children { 375sub children {
315} 376}
316 377
389 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
390 451
391 $self->focus_in; 452 $self->focus_in;
392} 453}
393 454
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 528
400sub draw { 529sub draw {
401 my ($self) = @_; 530 my ($self) = @_;
402 531
403 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 543
405 glPushMatrix; 544 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw; 546 $self->_draw;
408 glPopMatrix; 547 glPopMatrix;
420 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
421 glEnd; 560 glEnd;
422 glDisable GL_BLEND; 561 glDisable GL_BLEND;
423 } 562 }
424 563
425 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 565 glPushMatrix;
427 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 569 glVertex 0 , 0;
441 my ($self) = @_; 580 my ($self) = @_;
442 581
443 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
444} 583}
445 584
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504}
505
506sub DESTROY { 585sub DESTROY {
507 my ($self) = @_; 586 my ($self) = @_;
508 587
509 delete $WIDGET{$self+0}; 588 delete $WIDGET{$self+0};
510 #$self->deactivate; 589 #$self->deactivate;
566 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
568} 647}
569 648
570sub size_request { 649sub size_request {
571 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
572} 653}
573 654
574sub draw { } 655sub draw { }
575 656
576############################################################################# 657#############################################################################
605 $self->{children} = [ 686 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
608 ]; 689 ];
609 690
610 $self->check_size (1); 691 $self->realloc;
611 $self->update;
612} 692}
613 693
614sub children { 694sub children {
615 @{ $_[0]{children} } 695 @{ $_[0]{children} }
616} 696}
621 delete $child->{parent}; 701 delete $child->{parent};
622 $child->hide; 702 $child->hide;
623 703
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 705
626 $self->check_size (1); 706 $self->realloc;
627 $self->update;
628} 707}
629 708
630sub clear { 709sub clear {
631 my ($self) = @_; 710 my ($self) = @_;
632 711
636 for (@$children) { 715 for (@$children) {
637 delete $_->{parent}; 716 delete $_->{parent};
638 $_->hide; 717 $_->hide;
639 } 718 }
640 719
641 $self->check_size; 720 $self->realloc;
642 $self->update;
643} 721}
644 722
645sub find_widget { 723sub find_widget {
646 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
647 725
734 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 813 $self->update;
736} 814}
737 815
738sub _render { 816sub _render {
817 my ($self) = @_;
818
739 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
740} 820}
741 821
742sub render_child { 822sub render_child {
743 my ($self) = @_; 823 my ($self) = @_;
744 824
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
748 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
749 $self->_render; 836 $self->_render;
750 }; 837 };
751} 838}
752 839
753sub _draw { 840sub _draw {
754 my ($self) = @_; 841 my ($self) = @_;
755 842
756 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
757 844
758 my $tex = $self->{texture} 845 my $tex = $self->{texture}
759 or return; 846 or return;
760 847
761 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
784} 871}
785 872
786sub size_request { 873sub size_request {
787 my ($self) = @_; 874 my ($self) = @_;
788 875
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 877
791 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
792} 882}
793 883
794sub size_allocate { 884sub size_allocate {
795 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
796 886
887 my $child = $self->child;
888
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 891
800 $self->child->configure (0, 0, $w, $h); 892 $self->child->configure (0, 0, $w, $h);
801 $self->update; 893 $self->update;
802} 894}
803 895
839} 931}
840 932
841sub _render { 933sub _render {
842 my ($self) = @_; 934 my ($self) = @_;
843 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 940
846 $self->SUPER::_render; 941 $self->SUPER::_render;
847} 942}
848 943
856 my $class = shift; 951 my $class = shift;
857 952
858 my $self; 953 my $self;
859 954
860 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
861 vertical => 1, 956 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 958 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 959 $self->{vp}->set_offset (0, $_[1]);
865 }, 960 },
866 ; 961 ;
867 962
868 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
874 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp}); 970 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
877 972
878 $self 973 $self
974}
975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
879} 984}
880 985
881sub size_allocate { 986sub size_allocate {
882 my ($self, $w, $h) = @_; 987 my ($self, $w, $h) = @_;
883 988
936 1041
937our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
938 1043
939use CFClient::OpenGL; 1044use CFClient::OpenGL;
940 1045
941my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
944 1053
945sub new { 1054sub new {
946 my $class = shift; 1055 my ($class, %arg) = @_;
947 1056
948 # TODO: user_x, user_y, overwrite moveto? 1057 my $title = delete $arg{title};
949 1058
950 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1062 border => 0.6,
954 is_toplevel => 1,
955 can_events => 1, 1063 can_events => 1,
956 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
957 ); 1067 );
958 1068
959 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
960 align => 0, 1070 align => 0,
961 valign => 1, 1071 valign => 1,
962 text => $self->{title}, 1072 text => $title,
963 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
964 1075
965 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
966} 1084}
967 1085
968sub border { 1086sub border {
969 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
970} 1088}
971 1089
972sub size_request { 1090sub size_request {
973 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
974 1095
975 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
976 1097
977 ( 1098 (
978 $w + $self->border * 2, 1099 $w + $self->border * 2,
981} 1102}
982 1103
983sub size_allocate { 1104sub size_allocate {
984 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
985 1106
1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1112
1113 my $border = $self->border;
1114
986 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
987 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
988 1117
989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
990 if $self->{title};
991
992 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
993} 1119}
994 1120
995sub button_down { 1121sub button_down {
996 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
997 1123
1013 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
1014 1140
1015 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
1017 1143
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021 $self->check_size;
1022 }; 1149 };
1023 1150
1024 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
1028 $self->{motion} = sub { 1155 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
1030 1157
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1159
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034 $self->update;
1035 }; 1161 };
1036 } 1162 }
1037} 1163}
1038 1164
1039sub button_up { 1165sub button_up {
1049} 1175}
1050 1176
1051sub _draw { 1177sub _draw {
1052 my ($self) = @_; 1178 my ($self) = @_;
1053 1179
1180 my $child = $self->{children}[0];
1181
1054 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
1056 1184
1057 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059 1187
1060 my $border = $self->border; 1188 my $border = $self->border;
1061 1189
1062 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067 1195
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
1070 1198
1071 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
1072 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
1073 my $rep_y = $ch / $bg->{h}; 1202 $bg->{t} = $ch / $bg->{h};
1074
1075 glColor @{ $self->{bg} };
1076
1077 $bg->{s} = $rep_x;
1078 $bg->{t} = $rep_y;
1079 $bg->{wrap_mode} = 1;
1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 } 1204 }
1082 1205
1083 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
1084 1207
1085 $self->{title}->draw if $self->{title};
1086
1087 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
1088} 1214}
1089 1215
1090############################################################################# 1216#############################################################################
1091 1217
1092package CFClient::UI::Table; 1218package CFClient::UI::Table;
1114 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
1115 1241
1116 $child->set_parent ($self); 1242 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
1118 1244
1119 $self->check_size (1); 1245 $self->realloc;
1120} 1246}
1121 1247
1122# TODO: move to container class maybe? send children a signal on removal? 1248# TODO: move to container class maybe? send children a signal on removal?
1123sub clear { 1249sub clear {
1124 my ($self) = @_; 1250 my ($self) = @_;
1129 for (@children) { 1255 for (@children) {
1130 delete $_->{parent}; 1256 delete $_->{parent};
1131 $_->hide; 1257 $_->hide;
1132 } 1258 }
1133 1259
1134 $self->check_size (1); 1260 $self->realloc;
1135 $self->update;
1136} 1261}
1137 1262
1138sub get_wh { 1263sub get_wh {
1139 my ($self) = @_; 1264 my ($self) = @_;
1140 1265
1236 } 1361 }
1237} 1362}
1238 1363
1239############################################################################# 1364#############################################################################
1240 1365
1241package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1242
1243# TODO: wrap into common Box base class
1244 1367
1245our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1246 1369
1247sub size_request { 1370sub size_request {
1248 my ($self) = @_; 1371 my ($self) = @_;
1249 1372
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1251 1374 ? (
1252 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1253 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1254 (List::Util::max map $_->[1], @alloc), 1377 )
1255 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1256} 1382}
1257 1383
1258sub size_allocate { 1384sub size_allocate {
1259 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1260 1386
1261 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1262
1263 my $children = $self->{children}; 1388 my $children = $self->{children};
1264 1389
1265 my @h = map $_->{req_w}, @$children; 1390 my @req;
1266 1391
1267 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1268 1393 @req = ($space / (@$children || 1)) x @$children;
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } else { 1394 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1396 my $req = List::Util::sum @req;
1397
1398 if ($req > $space) {
1399 # ah well, not enough space
1400 $_ *= $space / $req for @req;
1401 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1274 $exp ||= 1;
1275 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1276 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 } 1408 }
1283 } 1409 }
1284 1410
1285 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1286 1412
1287 my $y = 0; 1413 my $pos = 0;
1288 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1291 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1292 1417
1293 $y += $h; 1418 $pos += $alloc;
1294 } 1419 }
1295 1420
1296 1 1421 1
1297} 1422}
1298 1423
1299############################################################################# 1424#############################################################################
1300 1425
1426package CFClient::UI::HBox;
1427
1428our @ISA = CFClient::UI::Box::;
1429
1430sub new {
1431 my $class = shift;
1432
1433 $class->SUPER::new (
1434 vertical => 0,
1435 @_,
1436 )
1437}
1438
1439#############################################################################
1440
1301package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1302 1442
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1306 1444
1307sub size_request { 1445sub new {
1308 my ($self) = @_; 1446 my $class = shift;
1309 1447
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1311 1449 vertical => 1,
1312 ( 1450 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1451 )
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355} 1452}
1356 1453
1357############################################################################# 1454#############################################################################
1358 1455
1359package CFClient::UI::Label; 1456package CFClient::UI::Label;
1376 ellipsise => 3, # end 1473 ellipsise => 3, # end
1377 layout => (new CFClient::Layout), 1474 layout => (new CFClient::Layout),
1378 fontsize => 1, 1475 fontsize => 1,
1379 align => -1, 1476 align => -1,
1380 valign => -1, 1477 valign => -1,
1381 padding => 2, 1478 padding_x => 2,
1479 padding_y => 2,
1382 can_events => 0, 1480 can_events => 0,
1383 %arg 1481 %arg
1384 ); 1482 );
1385 1483
1386 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
1422 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1423 1521
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1426 1524
1525 $self->realloc;
1427 $self->update; 1526 $self->update;
1428 $self->check_size;
1429} 1527}
1430 1528
1431sub set_markup { 1529sub set_markup {
1432 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1433 1531
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1536
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1440 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1441 1539
1540 $self->realloc;
1442 $self->update; 1541 $self->update;
1443 $self->check_size;
1444} 1542}
1445 1543
1446sub size_request { 1544sub size_request {
1447 my ($self) = @_; 1545 my ($self) = @_;
1448 1546
1462 1560
1463 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1464 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1465 } 1563 }
1466 1564
1467 ( 1565 ($w, $h)
1468 $w + $self->{padding} * 2,
1469 $h + $self->{padding} * 2,
1470 )
1471} 1566}
1472 1567
1473sub size_allocate { 1568sub size_allocate {
1474 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1475 1570
1571 delete $self->{ox};
1572
1476 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1477} 1575}
1478 1576
1479sub set_fontsize { 1577sub set_fontsize {
1480 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1481 1579
1482 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1483 delete $self->{texture}; 1581 delete $self->{texture};
1484 1582
1485 $self->update; 1583 $self->realloc;
1486 $self->check_size;
1487} 1584}
1488 1585
1489sub _draw { 1586sub _draw {
1490 my ($self) = @_; 1587 my ($self) = @_;
1491 1588
1497 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501 1598
1502 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1599 new_from_layout CFClient::Texture $self->{layout}
1600 };
1503 1601
1602 unless (exists $self->{ox}) {
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506 : ($self->{w} - $tex->{w}) * 0.5); 1605 : ($self->{w} - $tex->{w}) * 0.5);
1507 1606
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510 : ($self->{h} - $tex->{h}) * 0.5); 1609 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1513 }; 1610 };
1514 1611
1515 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1517 1614
1571sub set_text { 1668sub set_text {
1572 my ($self, $text) = @_; 1669 my ($self, $text) = @_;
1573 1670
1574 $self->{cursor} = length $text; 1671 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 1672 $self->_set_text ($text);
1576 $self->update; 1673
1577 $self->check_size; 1674 $self->realloc;
1578} 1675}
1579 1676
1580sub get_text { 1677sub get_text {
1581 $_[0]{text} 1678 $_[0]{text}
1582} 1679}
1615 } elsif ($uni) { 1712 } elsif ($uni) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1617 } 1714 }
1618 1715
1619 $self->_set_text ($text); 1716 $self->_set_text ($text);
1620 $self->update; 1717
1621 $self->check_size; 1718 $self->realloc;
1622} 1719}
1623 1720
1624sub focus_in { 1721sub focus_in {
1625 my ($self) = @_; 1722 my ($self) = @_;
1626 1723
1753 1850
1754sub new { 1851sub new {
1755 my $class = shift; 1852 my $class = shift;
1756 1853
1757 $class->SUPER::new ( 1854 $class->SUPER::new (
1758 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1759 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1760 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1761 can_hover => 1, 1859 can_hover => 1,
1762 align => 0, 1860 align => 0,
1763 valign => 0, 1861 valign => 0,
1810 1908
1811sub new { 1909sub new {
1812 my $class = shift; 1910 my $class = shift;
1813 1911
1814 $class->SUPER::new ( 1912 $class->SUPER::new (
1815 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1816 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1817 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2], 1917 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5], 1918 active_bg => [1, 1, 1, 0.5],
1820 state => 0, 1919 state => 0,
1824} 1923}
1825 1924
1826sub size_request { 1925sub size_request {
1827 my ($self) = @_; 1926 my ($self) = @_;
1828 1927
1829 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1830} 1929}
1831 1930
1832sub button_down { 1931sub button_down {
1833 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1834 1933
1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1838 $self->_emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1839 } 1938 }
1840} 1939}
1841 1940
1842sub _draw { 1941sub _draw {
1843 my ($self) = @_; 1942 my ($self) = @_;
1844 1943
1845 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1846 1945
1847 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848 1947
1849 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1850 1951
1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852 1953
1853 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854 1955
2119 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2120 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2], 2222 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5], 2223 active_bg => [1, 1, 1, 0.5],
2123 range => [0, 0, 100, 10, 0], 2224 range => [0, 0, 100, 10, 0],
2124 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2125 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2126 vertical => 0, 2227 vertical => 0,
2127 can_hover => 1, 2228 can_hover => 1,
2128 inner_pad => 0.02, 2229 inner_pad => 0.02,
2129 @_ 2230 @_
2130 ); 2231 );
2133 $self->update; 2234 $self->update;
2134 2235
2135 $self 2236 $self
2136} 2237}
2137 2238
2239sub changed { }
2240
2138sub set_range { 2241sub set_range {
2139 my ($self, $range) = @_; 2242 my ($self, $range) = @_;
2140 2243
2141 $self->{range} = $range; 2244 ($range, $self->{range}) = ($self->{range}, $range);
2142 2245
2143 $self->update; 2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2144} 2248}
2145 2249
2146sub set_value { 2250sub set_value {
2147 my ($self, $value) = @_; 2251 my ($self, $value) = @_;
2148 2252
2167} 2271}
2168 2272
2169sub size_request { 2273sub size_request {
2170 my ($self) = @_; 2274 my ($self) = @_;
2171 2275
2172 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2173 my $h = $self->{req_h};
2174
2175 $self->{vertical} ? ($h, $w) : ($w, $h)
2176} 2277}
2177 2278
2178sub button_down { 2279sub button_down {
2179 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2180 2281
2531 2632
2532sub new { 2633sub new {
2533 my $class = shift; 2634 my $class = shift;
2534 2635
2535 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2536 state => 0, 2637 state => 0,
2537 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2538 @_ 2639 @_
2539 ); 2640 );
2540 2641
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2642 $self
2547} 2643}
2548 2644
2549sub toggle_flopper { 2645sub toggle_flopper {
2550 my ($self) = @_; 2646 my ($self) = @_;
2551 2647
2552 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 2649}
2564 2650
2565############################################################################# 2651#############################################################################
2566 2652
2567package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
2580} 2666}
2581 2667
2582sub set_tooltip_from { 2668sub set_tooltip_from {
2583 my ($self, $widget) = @_; 2669 my ($self, $widget) = @_;
2584 2670
2671 my $tooltip = $widget->{tooltip};
2672
2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2585 $self->add (new CFClient::UI::Label 2680 $self->add (new CFClient::UI::Label
2586 markup => $widget->{tooltip}, 2681 markup => $tooltip,
2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8, 2683 fontsize => 0.8,
2589 fg => [0, 0, 0, 1], 2684 fg => [0, 0, 0, 1],
2590 ellipsise => 0, 2685 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP), 2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
2602 2697
2603sub size_allocate { 2698sub size_allocate {
2604 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2605 2700
2606 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2702}
2703
2704sub visibility_change {
2705 my ($self, $visible) = @_;
2706
2707 return unless $visible;
2708
2709 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner}
2711 or return;
2712
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH;
2717
2718 $self->move_abs ($x, $y);
2719 });
2607} 2720}
2608 2721
2609sub _draw { 2722sub _draw {
2610 my ($self) = @_; 2723 my ($self) = @_;
2611 2724
2628 glVertex $w, $h; 2741 glVertex $w, $h;
2629 glVertex $w, 0; 2742 glVertex $w, 0;
2630 glEnd; 2743 glEnd;
2631 2744
2632 glTranslate 2 - 0.375, 2 - 0.375; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2746
2633 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2634} 2748}
2635 2749
2636############################################################################# 2750#############################################################################
2637 2751
2713 $self->SUPER::DESTROY; 2827 $self->SUPER::DESTROY;
2714} 2828}
2715 2829
2716############################################################################# 2830#############################################################################
2717 2831
2718package CFClient::UI::Inventory;
2719
2720our @ISA = CFClient::UI::ScrolledWindow::;
2721
2722sub new {
2723 my $class = shift;
2724
2725 my $self = $class->SUPER::new (
2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727 @_,
2728 );
2729
2730 $self
2731}
2732
2733sub set_items {
2734 my ($self, $items) = @_;
2735
2736 $self->{scrolled}->clear;
2737 return unless $items;
2738
2739 my @items = sort {
2740 ($a->{type} <=> $b->{type})
2741 or ($a->{name} cmp $b->{name})
2742 } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 my $row = 0;
2747 for my $item (@items) {
2748 CFClient::Item::update_widgets $item;
2749
2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763}
2764
2765#############################################################################
2766
2767package CFClient::UI::Menu; 2832package CFClient::UI::Menu;
2768 2833
2769our @ISA = CFClient::UI::FancyFrame::; 2834our @ISA = CFClient::UI::FancyFrame::;
2770 2835
2771use CFClient::OpenGL; 2836use CFClient::OpenGL;
2809 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self; 2875 $GRAB = $self;
2811 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2812 2877
2813 $self->show; 2878 $self->show;
2814 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815} 2880}
2816 2881
2817sub mouse_motion { 2882sub mouse_motion {
2818 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2819 2884
2944 $self->SUPER::reconfigure; 3009 $self->SUPER::reconfigure;
2945} 3010}
2946 3011
2947############################################################################# 3012#############################################################################
2948 3013
2949package CFClient::UI::Root; 3014package CFClient::UI::Inventory;
2950 3015
2951our @ISA = CFClient::UI::Container::; 3016our @ISA = CFClient::UI::ScrolledWindow::;
2952
2953use CFClient::OpenGL;
2954 3017
2955sub new { 3018sub new {
2956 my $class = shift; 3019 my $class = shift;
2957 3020
2958 $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2959 @_, 3023 @_,
2960 ) 3024 );
2961}
2962 3025
2963sub configure { 3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156# if $commit is true, the binding will be set after the user entered a key combo
3157sub ask_for_bind {
3158 my ($self, $commit) = @_;
3159
3160 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_;
3162 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163 $self->update_binding_widgets;
3164 $self->commit if $commit;
3165 });
3166}
3167
3168# $mod and $sym are the modifiers and key symbol
3169# $cmds is a array ref of strings (the commands)
3170# $cb is the callback that is executed on OK
3171# $ccb is the callback that is executed on CANCEL and
3172# when the binding was unsuccessful on OK
3173sub set_binding {
2964 my ($self, $x, $y, $w, $h) = @_; 3174 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2965 3175
2966 $self->{w} = $w; 3176 $self->clear_command_list;
2967 $self->{h} = $h; 3177 $self->{recording} = 0;
2968} 3178 $self->{rec_btn}->set_text ("start recording");
2969 3179
2970sub check_size { 3180 $self->{binding} = [$mod, $sym];
3181 $self->{commands} = $cmds;
3182
3183 $self->{binding_change} = $cb;
3184 $self->{binding_cancel} = $ccb;
3185
3186 $self->update_binding_widgets;
3187}
3188
3189# this is a shortcut method that asks for a binding
3190# and then just binds it.
3191sub do_quick_binding {
2971 my ($self) = @_; 3192 my ($self, $cmds) = @_;
3193 $self->set_binding (undef, undef, $cmds, sub {
3194 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195 });
3196 $self->ask_for_bind (1);
3197}
2972 3198
2973 $self->size_allocate ($self->{w}, $self->{h}) 3199sub update_binding_widgets {
2974 if $self->{w}; 3200 my ($self) = @_;
3201 my ($mod, $sym, $cmds) = $self->get_binding;
3202 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203 $self->set_command_list ($cmds);
3204}
3205
3206sub get_binding {
3207 my ($self) = @_;
3208 return (
3209 $self->{binding}->[0],
3210 $self->{binding}->[1],
3211 [ grep { defined $_ } @{$self->{commands}} ]
3212 );
3213}
3214
3215sub clear_command_list {
3216 my ($self) = @_;
3217 $self->{cmdbox}->clear ();
3218}
3219
3220sub set_command_list {
3221 my ($self, $cmds) = @_;
3222
3223 $self->{cmdbox}->clear ();
3224 $self->{commands} = $cmds;
3225
3226 my $idx = 0;
3227
3228 for (@$cmds) {
3229 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231 my $i = $idx;
3232 $hb->add (new CFClient::UI::Label text => $_);
3233 $hb->add (new CFClient::UI::Button
3234 text => "delete",
3235 tooltip => "Deletes the action from the record",
3236 on_activate => sub {
3237 $self->{cmdbox}->remove ($hb);
3238 $cmds->[$i] = undef;
3239 });
3240
3241
3242 $idx++
3243 }
3244}
3245
3246#############################################################################
3247
3248package CFClient::UI::SpellList;
3249
3250our @ISA = CFClient::UI::FancyFrame::;
3251
3252sub new {
3253 my $class = shift;
3254
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257 $self->add (new CFClient::UI::ScrolledWindow
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260 $self;
3261}
3262
3263# XXX: Do sorting? Argl...
3264sub add_spell {
3265 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell;
3267
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295}
3296
3297sub remove_spell {
3298 my ($self, $spell) = @_;
3299 delete $self->{spells}->{$spell->{name}};
3300 $self->rebuild_spell_list;
3301}
3302
3303#############################################################################
3304
3305package CFClient::UI::Root;
3306
3307our @ISA = CFClient::UI::Container::;
3308
3309use CFClient::OpenGL;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
3315 visible => 1,
3316 @_,
3317 );
3318
3319 Scalar::Util::weaken ($self->{root} = $self);
3320
3321 $self
2975} 3322}
2976 3323
2977sub size_request { 3324sub size_request {
2978 my ($self) = @_; 3325 my ($self) = @_;
2979 3326
2980 ($self->{w}, $self->{h}) 3327 ($self->{w}, $self->{h})
3328}
3329
3330sub _to_pixel {
3331 my ($coord, $size, $max) = @_;
3332
3333 $coord =
3334 $coord eq "center" ? ($max - $size) * 0.5
3335 : $coord eq "max" ? $max
3336 : $coord;
3337
3338 $coord = 0 if $coord < 0;
3339 $coord = $max - $size if $coord > $max - $size;
3340
3341 int $coord + 0.5
2981} 3342}
2982 3343
2983sub size_allocate { 3344sub size_allocate {
2984 my ($self, $w, $h) = @_; 3345 my ($self, $w, $h) = @_;
2985 3346
2986 for my $child ($self->children) { 3347 for my $child ($self->children) {
2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2988 3349
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3350 $X = $child->{force_x} if exists $child->{force_x};
2990 if exists $child->{req_x}; 3351 $Y = $child->{force_y} if exists $child->{force_y};
2991 3352
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3353 $X = _to_pixel $X, $W, $self->{w};
2993 if exists $child->{req_y}; 3354 $Y = _to_pixel $Y, $H, $self->{h};
2994
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 3355
2998 $child->configure ($X, $Y, $W, $H); 3356 $child->configure ($X, $Y, $W, $H);
2999 } 3357 }
3000} 3358}
3001 3359
3012} 3370}
3013 3371
3014sub update { 3372sub update {
3015 my ($self) = @_; 3373 my ($self) = @_;
3016 3374
3017 $self->check_size;
3018 $::WANT_REFRESH++; 3375 $::WANT_REFRESH++;
3019} 3376}
3020 3377
3021sub add { 3378sub add {
3022 my ($self, @children) = @_; 3379 my ($self, @children) = @_;
3023 3380
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3381 $_->{is_toplevel} = 1
3032 3382 for @children;
3033 # integerise window positions
3034 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y};
3036 }
3037 3383
3038 $self->SUPER::add (@children); 3384 $self->SUPER::add (@children);
3039} 3385}
3040 3386
3041sub remove { 3387sub remove {
3042 my ($self, @children) = @_; 3388 my ($self, @children) = @_;
3043 3389
3044 $self->SUPER::remove (@children); 3390 $self->SUPER::remove (@children);
3391
3392 delete $self->{is_toplevel}
3393 for @children;
3045 3394
3046 while (@children) { 3395 while (@children) {
3047 my $w = pop @children; 3396 my $w = pop @children;
3048 push @children, $w->children; 3397 push @children, $w->children;
3049 $w->set_invisible; 3398 $w->set_invisible;
3068 while ($self->{refresh_hook}) { 3417 while ($self->{refresh_hook}) {
3069 $_->() 3418 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3419 for values %{delete $self->{refresh_hook}};
3071 } 3420 }
3072 3421
3073 if ($self->{check_size}) { 3422 if ($self->{realloc}) {
3074 my @queue = ([], []); 3423 my %queue;
3424 my @queue;
3425 my $widget;
3075 3426
3076 for (;;) { 3427 outer:
3077 if ($self->{check_size}) { 3428 while () {
3078 # heuristic: check containers last 3429 if (my $realloc = delete $self->{realloc}) {
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3430 for $widget (values %$realloc) {
3080 for values %{delete $self->{check_size}} 3431 $widget->{visible} or next; # do not resize invisible widgets
3432
3433 $queue{$widget+0}++ and next; # duplicates are common
3434
3435 push @{ $queue[$widget->{visible}] }, $widget;
3436 }
3081 } 3437 }
3082 3438
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3439 while () {
3440 @queue or last outer;
3084 3441
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3442 $widget = pop @{ $queue[-1] || [] }
3086 ? @$widget{qw(user_w user_h)} 3443 and last;
3087 : $widget->size_request;
3088
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092 3444
3445 pop @queue;
3446 }
3447
3448 delete $queue{$widget+0};
3449
3450 my ($w, $h) = $widget->size_request;
3451
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3454
3455 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h};
3457
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3459 || delete $widget->{force_realloc}) {
3093 $widget->{req_w} = $w; 3460 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 3461 $widget->{req_h} = $h;
3095 3462
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3463 $self->{size_alloc}{$widget+0} = $widget;
3097 3464
3098 $widget->{parent}->check_size
3099 if $widget->{parent}; 3465 if (my $parent = $widget->{parent}) {
3466 $self->{realloc}{$parent+0} = $parent
3467 unless $queue{$parent+0};
3468
3469 $parent->{force_size_alloc} = 1;
3470 $self->{size_alloc}{$parent+0} = $parent;
3471 }
3100 } 3472 }
3473
3474 delete $self->{realloc}{$widget+0};
3101 } 3475 }
3102 } 3476 }
3103 3477
3104 while ($self->{size_alloc}) { 3478 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 3479 my @queue = sort { $b->{visible} <=> $a->{visible} }
3106 my ($widget, $w, $h) = @$_; 3480 values %$size_alloc;
3481
3482 while () {
3483 my $widget = pop @queue || last;
3484
3485 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3107 3486
3108 $w = 0 if $w < 0; 3487 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 3488 $h = 0 if $h < 0;
3110 3489
3490 $w = int $w + 0.5;
3491 $h = int $h + 0.5;
3492
3493 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3494 $widget->{old_w} = $widget->{w};
3495 $widget->{old_h} = $widget->{h};
3496
3111 $widget->{w} = $w; 3497 $widget->{w} = $w;
3112 $widget->{h} = $h; 3498 $widget->{h} = $h;
3499
3113 $widget->emit (size_allocate => $w, $h); 3500 $widget->emit (size_allocate => $w, $h);
3501 }
3114 } 3502 }
3115 } 3503 }
3116 3504
3117 while ($self->{post_alloc_hook}) { 3505 while ($self->{post_alloc_hook}) {
3118 $_->() 3506 $_->()
3119 for values %{delete $self->{post_alloc_hook}}; 3507 for values %{delete $self->{post_alloc_hook}};
3120 } 3508 }
3509
3121 3510
3122 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3511 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3512 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3124 glClear GL_COLOR_BUFFER_BIT; 3513 glClear GL_COLOR_BUFFER_BIT;
3125 3514
3127 glLoadIdentity; 3516 glLoadIdentity;
3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3517 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3129 glMatrixMode GL_MODELVIEW; 3518 glMatrixMode GL_MODELVIEW;
3130 glLoadIdentity; 3519 glLoadIdentity;
3131 3520
3521 {
3522 package CFClient::UI::Base;
3523
3524 ($draw_x, $draw_y, $draw_w, $draw_h) =
3525 (0, 0, $self->{w}, $self->{h});
3526 }
3527
3132 $self->_draw; 3528 $self->_draw;
3133} 3529}
3134 3530
3135############################################################################# 3531#############################################################################
3136 3532

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines