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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines