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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 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};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 51 $TOOLTIP->hide;
46 52
47 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
48 54
165sub rescale_widgets { 171sub rescale_widgets {
166 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
167 173
168 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
169 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
170 $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.]+$/;
171 $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};
172 $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};
173 $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.]+$/;
174 $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};
175 $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};
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
176 } 189 }
177 } 190 }
178 191
179 reconfigure_widgets; 192 reconfigure_widgets;
180} 193}
189 202
190sub new { 203sub new {
191 my $class = shift; 204 my $class = shift;
192 205
193 my $self = bless { 206 my $self = bless {
194 x => 0, 207 x => "center",
195 y => 0, 208 y => "center",
196 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
197 can_events => 1, 212 can_events => 1,
198 @_ 213 @_
199 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 217
201 for (keys %$self) { 218 for (keys %$self) {
202 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
204 } 221 }
205 } 222 }
206 223
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
214 } 234 }
215 235
216 $self 236 $self
217} 237}
218 238
227 my ($self) = @_; 247 my ($self) = @_;
228 248
229 return if $self->{parent}; 249 return if $self->{parent};
230 250
231 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
232}
233
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244} 252}
245 253
246sub set_visible { 254sub set_visible {
247 my ($self) = @_; 255 my ($self) = @_;
248 256
303 311
304 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
305 if $self->{parent}; 313 if $self->{parent};
306} 314}
307 315
308sub move { 316sub move_abs {
309 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
310 318
311 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
312 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
313 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
314 322
315 $self->update; 323 $self->update;
316} 324}
317 325
318sub set_size { 326sub set_size {
319 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
320 328
321 $self->{def_w} = $w; 329 $self->{force_w} = $w;
322 $self->{def_h} = $h; 330 $self->{force_h} = $h;
323 331
324 $self->realloc; 332 $self->realloc;
325} 333}
326 334
327sub size_request { 335sub size_request {
331 339
332sub configure { 340sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
334 342
335 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
338 348
339 # use alignment to adjust x, y 349 # use alignment to adjust x, y
340 350
341 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 353 }
346 354
347 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 356 $self->{x} = $x;
349 $self->{y} = $y; 357 $self->{y} = $y;
350 $self->update; 358 $self->update;
351 } 359 }
352 360
353 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 362 return unless $self->{visible};
355 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
357 } 368 }
358} 369}
359 370
360sub size_allocate { 371sub size_allocate {
361 # nothing to be done 372 # nothing to be done
362} 373}
363 374
364sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
365} 381}
366 382
367sub set_max_size { 383sub set_max_size {
368 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
369 385
428 444
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 446 unless $FOCUS;
431} 447}
432 448
433sub mouse_motion { } 449sub mouse_motion { 0 }
434sub button_up { } 450sub button_up { 0 }
435sub key_down { } 451sub key_down { 0 }
436sub key_up { } 452sub key_up { 0 }
437 453
438sub button_down { 454sub button_down {
439 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
440 456
441 $self->focus_in; 457 $self->focus_in;
442}
443 458
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449 461
450sub find_widget { 462sub find_widget {
451 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
452 464
453 return () unless $self->{can_events}; 465 return () unless $self->{can_events};
461 473
462sub set_parent { 474sub set_parent {
463 my ($self, $parent) = @_; 475 my ($self, $parent) = @_;
464 476
465 Scalar::Util::weaken ($self->{parent} = $parent); 477 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 478 $self->set_visible if $parent->{visible};
468} 479}
469 480
470sub connect { 481sub connect {
471 my ($self, $signal, $cb) = @_; 482 my ($self, $signal, $cb) = @_;
492 503
493sub realloc { 504sub realloc {
494 my ($self) = @_; 505 my ($self) = @_;
495 506
496 if ($self->{visible}) { 507 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
498 509
499 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 511 $self->{root}->update;
501 } else { 512 } else {
502 delete $self->{req_w}; 513 delete $self->{req_w};
514 delete $self->{req_h};
503 } 515 }
504} 516}
505 517
506sub update { 518sub update {
507 my ($self) = @_; 519 my ($self) = @_;
508 520
509 $self->{parent}->update 521 $self->{parent}->update
510 if $self->{parent}; 522 if $self->{parent};
511} 523}
512 524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
513sub draw { 536sub draw {
514 my ($self) = @_; 537 my ($self) = @_;
515 538
516 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 550
518 glPushMatrix; 551 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw; 553 $self->_draw;
521 glPopMatrix; 554 glPopMatrix;
533 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
534 glEnd; 567 glEnd;
535 glDisable GL_BLEND; 568 glDisable GL_BLEND;
536 } 569 }
537 570
538 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 572 glPushMatrix;
540 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
542 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 576 glVertex 0 , 0;
619 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
621} 654}
622 655
623sub size_request { 656sub size_request {
624 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
625} 660}
626 661
627sub draw { } 662sub draw { }
628 663
629############################################################################# 664#############################################################################
633our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
634 669
635sub new { 670sub new {
636 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
637 672
638 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
639 674
640 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
641 children => [], 676 children => [],
642 can_events => 0, 677 can_events => 0,
643 %arg, 678 %arg,
644 ); 679 );
680
645 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
646 683
647 $self 684 $self
648} 685}
649 686
650sub add { 687sub add {
698 $x -= $self->{x}; 735 $x -= $self->{x};
699 $y -= $self->{y}; 736 $y -= $self->{y};
700 737
701 my $res; 738 my $res;
702 739
703 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
705 and return $res; 742 and return $res;
706 } 743 }
707 744
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
750sub size_request { 787sub size_request {
751 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
752} 789}
753 790
754sub size_allocate { 791sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 792 my ($self, $w, $h) = @_;
756 793
757 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
758} 795}
759 796
760############################################################################# 797#############################################################################
798
799# back-buffered drawing area
761 800
762package CFClient::UI::Window; 801package CFClient::UI::Window;
763 802
764our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
765 804
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 817 $self->SUPER::update;
779} 818}
780 819
781sub size_allocate { 820sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 821 my ($self, $w, $h) = @_;
783 822
784 $self->SUPER::size_allocate ($w, $h, $changed); 823 $self->SUPER::size_allocate ($w, $h);
785 $self->update 824 $self->update;
786 if $changed;
787} 825}
788 826
789sub _render { 827sub _render {
828 my ($self) = @_;
829
790 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
791} 831}
792 832
793sub render_child { 833sub render_child {
794 my ($self) = @_; 834 my ($self) = @_;
795 835
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
799 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
800 $self->_render; 847 $self->_render;
801 }; 848 };
802} 849}
803 850
804sub _draw { 851sub _draw {
805 my ($self) = @_; 852 my ($self) = @_;
806 853
807 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
808 855
809 my $tex = $self->{texture} 856 my $tex = $self->{texture}
810 or return; 857 or return;
811 858
812 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
835} 882}
836 883
837sub size_request { 884sub size_request {
838 my ($self) = @_; 885 my ($self) = @_;
839 886
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 888
842 $w = 10 if $self->{scroll_x}; 889 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 890 $h = 10 if $self->{scroll_y};
844 891
845 ($w, $h) 892 ($w, $h)
846} 893}
847 894
848sub size_allocate { 895sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 896 my ($self, $w, $h) = @_;
850 897
898 my $child = $self->child;
899
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 902
854 $self->child->configure (0, 0, $w, $h); 903 $self->child->configure (0, 0, $w, $h);
855 $self->update; 904 $self->update;
856} 905}
857 906
893} 942}
894 943
895sub _render { 944sub _render {
896 my ($self) = @_; 945 my ($self) = @_;
897 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 951
900 $self->SUPER::_render; 952 $self->SUPER::_render;
901} 953}
902 954
905package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
906 958
907our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
908 960
909sub new { 961sub new {
910 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
911 965
912 my $self; 966 my $self;
913 967
914 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
915 vertical => 1, 969 vertical => 1,
920 ; 974 ;
921 975
922 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 978 slider => $slider,
925 @_, 979 %arg,
926 ); 980 );
927 981
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
931 984
932 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
933} 992}
934 993
935sub update { 994sub update {
936 my ($self) = @_; 995 my ($self) = @_;
937 996
941 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1002}
944 1003
945sub size_allocate { 1004sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1005 my ($self, $w, $h) = @_;
947 1006
948 $self->SUPER::size_allocate ($w, $h, $changed); 1007 $self->SUPER::size_allocate ($w, $h);
949 1008
950 my $child = $self->{vp}->child; 1009 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 1011}
953 1012
1000 1059
1001our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
1002 1061
1003use CFClient::OpenGL; 1062use CFClient::OpenGL;
1004 1063
1005my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1071
1009sub new { 1072sub new {
1010 my $class = shift; 1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1011 1076
1012 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1080 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1081 can_events => 1,
1018 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
1019 ); 1085 );
1020 1086
1021 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
1022 align => 0, 1088 align => 0,
1023 valign => 1, 1089 valign => 1,
1024 text => $self->{title}, 1090 text => $title,
1025 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
1026 1093
1027 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1028} 1102}
1029 1103
1030sub border { 1104sub border {
1031 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
1032} 1106}
1033 1107
1034sub size_request { 1108sub size_request {
1035 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
1036 1113
1037 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
1038 1115
1039 ( 1116 (
1040 $w + $self->border * 2, 1117 $w + $self->border * 2,
1041 $h + $self->border * 2, 1118 $h + $self->border * 2,
1042 ) 1119 )
1043} 1120}
1044 1121
1045sub size_allocate { 1122sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1123 my ($self, $w, $h) = @_;
1047 1124
1048 return unless $changed; 1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1049 1130
1131 my $border = $self->border;
1132
1050 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
1052 1135
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054 if $self->{title};
1055
1056 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
1057} 1137}
1058 1138
1059sub button_down { 1139sub button_down {
1060 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1061 1141
1077 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
1078 1158
1079 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
1081 1161
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1164
1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1166 $self->realloc;
1088 }; 1167 };
1089 1168
1090 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1094 $self->{motion} = sub { 1173 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1096 1175
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1177
1099 $self->{user_x} = $bx + $x - $ox; 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1179 # HACK: the next line is required to enforce placement
1101 1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
1105 } 1186 1
1106} 1187}
1107 1188
1108sub button_up { 1189sub button_up {
1109 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
1110 1191
1111 delete $self->{motion}; 1192 !!delete $self->{motion}
1112} 1193}
1113 1194
1114sub mouse_motion { 1195sub mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1116 1197
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
1118} 1201}
1119 1202
1120sub _draw { 1203sub _draw {
1121 my ($self) = @_; 1204 my ($self) = @_;
1122 1205
1206 my $child = $self->{children}[0];
1207
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1210
1126 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1213
1129 my $border = $self->border; 1214 my $border = $self->border;
1130 1215
1131 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1221
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
1139 1224
1140 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1228 $bg->{t} = $ch / $bg->{h};
1143
1144 glColor @{ $self->{bg} };
1145
1146 $bg->{s} = $rep_x;
1147 $bg->{t} = $rep_y;
1148 $bg->{wrap_mode} = 1;
1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1230 }
1151 1231
1152 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1153 1233
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1157} 1240}
1158 1241
1159############################################################################# 1242#############################################################################
1160 1243
1161package CFClient::UI::Table; 1244package CFClient::UI::Table;
1235 (sum @$hs), 1318 (sum @$hs),
1236 ) 1319 )
1237} 1320}
1238 1321
1239sub size_allocate { 1322sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1323 my ($self, $w, $h) = @_;
1241 1324
1242 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1243 1326
1244 my $req_w = (sum @$ws) || 1; 1327 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1328 my $req_h = (sum @$hs) || 1;
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1407 )
1325} 1408}
1326 1409
1327sub size_allocate { 1410sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1411 my ($self, $w, $h) = @_;
1329 1412
1330 my $space = $self->{vertical} ? $h : $w; 1413 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1414 my $children = $self->{children};
1332 1415
1333 my @req; 1416 my @req;
1416 ellipsise => 3, # end 1499 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1418 fontsize => 1, 1501 fontsize => 1,
1419 align => -1, 1502 align => -1,
1420 valign => -1, 1503 valign => -1,
1421 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1422 can_events => 0, 1506 can_events => 0,
1423 %arg 1507 %arg
1424 ); 1508 );
1425 1509
1426 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
1502 1586
1503 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1505 } 1589 }
1506 1590
1507 ( 1591 ($w, $h)
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1592}
1512 1593
1513sub size_allocate { 1594sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1595 my ($self, $w, $h) = @_;
1596
1597 delete $self->{ox};
1515 1598
1516 delete $self->{texture} 1599 delete $self->{texture}
1517 if $changed; 1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518} 1601}
1519 1602
1520sub set_fontsize { 1603sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1522 1605
1537 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1624
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1543 1627
1628 unless (exists $self->{ox}) {
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1547 1632
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1551
1552 $tex
1553 }; 1636 };
1554 1637
1555 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1557 1640
1595 1678
1596 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1597 1680
1598 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1599 1682
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1684 $self->{text} = $text;
1604 1685
1605 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1607 1688
1608 $self->_emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1609} 1691}
1610 1692
1611sub set_text { 1693sub set_text {
1612 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1613 1695
1652 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1736 $self->_emit ('escape');
1655 } elsif ($uni) { 1737 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1657 } 1741 }
1658 1742
1659 $self->_set_text ($text); 1743 $self->_set_text ($text);
1660 1744
1661 $self->realloc; 1745 $self->realloc;
1746
1747 1
1662} 1748}
1663 1749
1664sub focus_in { 1750sub focus_in {
1665 my ($self) = @_; 1751 my ($self) = @_;
1666 1752
1681 utf8::encode $text; 1767 utf8::encode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1683 1769
1684 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1685 $self->update; 1771 $self->update;
1772
1773 1
1686} 1774}
1687 1775
1688sub mouse_motion { 1776sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1691} 1781}
1692 1782
1693sub _draw { 1783sub _draw {
1694 my ($self) = @_; 1784 my ($self) = @_;
1695 1785
1772 } else { 1862 } else {
1773 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1774 } 1864 }
1775 1865
1776 } else { 1866 } else {
1777 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1778 } 1870 1
1779
1780} 1871}
1781 1872
1782############################################################################# 1873#############################################################################
1783 1874
1784package CFClient::UI::Button; 1875package CFClient::UI::Button;
1793 1884
1794sub new { 1885sub new {
1795 my $class = shift; 1886 my $class = shift;
1796 1887
1797 $class->SUPER::new ( 1888 $class->SUPER::new (
1798 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1799 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1801 can_hover => 1, 1893 can_hover => 1,
1802 align => 0, 1894 align => 0,
1803 valign => 0, 1895 valign => 0,
1812 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1813 1905
1814 $self->emit ("activate") 1906 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 1908 && $y >= 0 && $y < $self->{h};
1909
1910 1
1817} 1911}
1818 1912
1819sub _draw { 1913sub _draw {
1820 my ($self) = @_; 1914 my ($self) = @_;
1821 1915
1850 1944
1851sub new { 1945sub new {
1852 my $class = shift; 1946 my $class = shift;
1853 1947
1854 $class->SUPER::new ( 1948 $class->SUPER::new (
1855 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1856 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 1953 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 1954 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 1955 state => 0,
1864} 1959}
1865 1960
1866sub size_request { 1961sub size_request {
1867 my ($self) = @_; 1962 my ($self) = @_;
1868 1963
1869 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1870} 1965}
1871 1966
1872sub button_down { 1967sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1874 1969
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1879 } 1978 1
1880} 1979}
1881 1980
1882sub _draw { 1981sub _draw {
1883 my ($self) = @_; 1982 my ($self) = @_;
1884 1983
1885 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1886 1985
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 1987
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 1991
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 1993
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 1995
2159 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2262 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2263 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2264 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
2166 vertical => 0, 2267 vertical => 0,
2167 can_hover => 1, 2268 can_hover => 1,
2168 inner_pad => 0.02, 2269 inner_pad => 0.02,
2169 @_ 2270 @_
2170 ); 2271 );
2210} 2311}
2211 2312
2212sub size_request { 2313sub size_request {
2213 my ($self) = @_; 2314 my ($self) = @_;
2214 2315
2215 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2317}
2220 2318
2221sub button_down { 2319sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2223 2321
2224 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2225 2323
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2325
2228 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2229} 2327}
2230 2328
2231sub mouse_motion { 2329sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2233 2331
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2336
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2338
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2242 } 2344 1
2243} 2345}
2244 2346
2245sub update { 2347sub update {
2246 my ($self) = @_; 2348 my ($self) = @_;
2247 2349
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2250 2359
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2361 my $range = ($hi - $page - $lo) || 1e-100;
2253 2362
2259 $value = ($value - $lo) / $range; 2368 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2369 $value = $value * $self->{scale} + $self->{offset};
2261 2370
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2372 $self->{knob_w} = $knob_w;
2264 }); 2373 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2374
2272 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2273 2376
2274 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2275 2378
2373 $self->{fontsize} = $fontsize; 2476 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2477 $self->reflow;
2375} 2478}
2376 2479
2377sub size_allocate { 2480sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2481 my ($self, $w, $h) = @_;
2379 2482
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2483 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2484
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2485 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2487 $self->{layout}->set_width ($self->{children}[0]{w});
2387 2488
2610} 2711}
2611 2712
2612sub set_tooltip_from { 2713sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2614 2715
2716 my $tooltip = $widget->{tooltip};
2717
2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2615 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2728 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2730 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
2629 2739
2630 ($w + 4, $h + 4) 2740 ($w + 4, $h + 4)
2631} 2741}
2632 2742
2633sub size_allocate { 2743sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2744 my ($self, $w, $h) = @_;
2635 2745
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2747}
2640 2748
2641sub visibility_change { 2749sub visibility_change {
2642 my ($self, $visible) = @_; 2750 my ($self, $visible) = @_;
2643 2751
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2759
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2761 if $x + $self->{w} > $::WIDTH;
2654 2762
2655 $self->move ($x, $y); 2763 $self->move_abs ($x, $y);
2656 }); 2764 });
2657} 2765}
2658 2766
2659sub _draw { 2767sub _draw {
2660 my ($self) = @_; 2768 my ($self) = @_;
2764 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2765} 2873}
2766 2874
2767############################################################################# 2875#############################################################################
2768 2876
2769package CFClient::UI::Inventory; 2877package CFClient::UI::Buttonbar;
2770 2878
2771our @ISA = CFClient::UI::ScrolledWindow::; 2879our @ISA = CFClient::UI::HBox::;
2772 2880
2773sub new { 2881# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808 2882
2809############################################################################# 2883#############################################################################
2810 2884
2811package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2812 2886
2853 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 2928 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2856 2930
2857 $self->show; 2931 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 2933}
2860 2934
2861sub mouse_motion { 2935sub mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2863 2937
2864 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2865 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2867} 2943}
2868 2944
2869sub button_up { 2945sub button_up {
2870 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2871 2947
2873 undef $GRAB; 2949 undef $GRAB;
2874 $self->hide; 2950 $self->hide;
2875 2951
2876 $self->_emit ("popdown"); 2952 $self->_emit ("popdown");
2877 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2958 1
2959}
2960
2961#############################################################################
2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
2878 } 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
2879} 3067}
2880 3068
2881############################################################################# 3069#############################################################################
2882 3070
2883package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
2988 $self->SUPER::reconfigure; 3176 $self->SUPER::reconfigure;
2989} 3177}
2990 3178
2991############################################################################# 3179#############################################################################
2992 3180
3181package CFClient::UI::Inventory;
3182
3183our @ISA = CFClient::UI::ScrolledWindow::;
3184
3185sub new {
3186 my $class = shift;
3187
3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
3430 @_,
3431 )
3432}
3433
3434# XXX: Do sorting? Argl...
3435sub add_spell {
3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
3438
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
2993package CFClient::UI::Root; 3476package CFClient::UI::Root;
2994 3477
2995our @ISA = CFClient::UI::Container::; 3478our @ISA = CFClient::UI::Container::;
2996 3479
2997use CFClient::OpenGL; 3480use CFClient::OpenGL;
3007 Scalar::Util::weaken ($self->{root} = $self); 3490 Scalar::Util::weaken ($self->{root} = $self);
3008 3491
3009 $self 3492 $self
3010} 3493}
3011 3494
3012sub configure {
3013 my ($self, $x, $y, $w, $h) = @_;
3014
3015 $self->{w} = $w;
3016 $self->{h} = $h;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 $self->SUPER::reconfigure;
3023
3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
3025 if $self->{w};
3026}
3027
3028sub size_request { 3495sub size_request {
3029 my ($self) = @_; 3496 my ($self) = @_;
3030 3497
3031 ($self->{w}, $self->{h}) 3498 ($self->{w}, $self->{h})
3032} 3499}
3033 3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
3513}
3514
3034sub size_allocate { 3515sub size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3516 my ($self, $w, $h) = @_;
3036 3517
3037 for my $child ($self->children) { 3518 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3520
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3521 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3522 $Y = $child->{force_y} if exists $child->{force_y};
3042 3523
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3524 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3525 $Y = _to_pixel $Y, $H, $self->{h};
3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3526
3051 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
3052 } 3528 }
3053} 3529}
3054 3530
3071} 3547}
3072 3548
3073sub add { 3549sub add {
3074 my ($self, @children) = @_; 3550 my ($self, @children) = @_;
3075 3551
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3552 $_->{is_toplevel} = 1
3078 3553 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3554
3084 $self->SUPER::add (@children); 3555 $self->SUPER::add (@children);
3085} 3556}
3086 3557
3087sub remove { 3558sub remove {
3088 my ($self, @children) = @_; 3559 my ($self, @children) = @_;
3089 3560
3090 $self->SUPER::remove (@children); 3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3091 3565
3092 while (@children) { 3566 while (@children) {
3093 my $w = pop @children; 3567 my $w = pop @children;
3094 push @children, $w->children; 3568 push @children, $w->children;
3095 $w->set_invisible; 3569 $w->set_invisible;
3115 $_->() 3589 $_->()
3116 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
3117 } 3591 }
3118 3592
3119 if ($self->{realloc}) { 3593 if ($self->{realloc}) {
3594 my %queue;
3120 my @queue; 3595 my @queue;
3596 my $widget;
3121 3597
3598 outer:
3122 while () { 3599 while () {
3123 if ($self->{realloc}) { 3600 if (my $realloc = delete $self->{realloc}) {
3124 #TODO use array-of-depth approach 3601 for $widget (values %$realloc) {
3602 $widget->{visible} or next; # do not resize invisible widgets
3125 3603
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3604 $queue{$widget+0}++ and next; # duplicates are common
3127 @queue, values %{delete $self->{realloc}}; 3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
3128 } 3608 }
3129 3609
3610 while () {
3611 @queue or last outer;
3612
3613 $widget = pop @{ $queue[-1] || [] }
3614 and last;
3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
3631 $widget->{req_w} = $w;
3632 $widget->{req_h} = $h;
3633
3634 $self->{size_alloc}{$widget+0} = $widget;
3635
3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
3643 }
3644
3645 delete $self->{realloc}{$widget+0};
3646 }
3647 }
3648
3649 while (my $size_alloc = delete $self->{size_alloc}) {
3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3651 values %$size_alloc;
3652
3653 while () {
3130 my $widget = pop @queue || last; 3654 my $widget = pop @queue || last;
3131 3655
3132 $widget->{visible} or last; # do not resize invisible widgets 3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135 ? @$widget{qw(def_w def_h)}
3136 : $widget->size_request;
3137
3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140 $widget->{req_w} = $w;
3141 $widget->{req_h} = $h;
3142
3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145 push @queue, $widget->{parent}
3146 if $widget->{parent};
3147 }
3148 }
3149
3150 while (my $size_alloc = delete $self->{size_alloc}) {
3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3156 3657
3157 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
3159 3660
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3161 3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3162 $widget->{w} = $w; 3668 $widget->{w} = $w;
3163 $widget->{h} = $h; 3669 $widget->{h} = $h;
3164 3670
3165 $widget->emit (size_allocate => $w, $h, $changed); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
3166 } 3673 }
3167 } 3674 }
3168 3675
3169 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
3170 $_->() 3677 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
3172 } 3679 }
3680
3173 3681
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
3177 3685
3179 glLoadIdentity; 3687 glLoadIdentity;
3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
3182 glLoadIdentity; 3690 glLoadIdentity;
3183 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
3184 $self->_draw; 3699 $self->_draw;
3185} 3700}
3186 3701
3187############################################################################# 3702#############################################################################
3188 3703

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines