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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines