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.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
392 399
393 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
394 401
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 405 }
399} 406}
400 407
401# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
402sub coord2local { 409sub coord2local {
… …
410 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
411 418
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 420}
414 421
415sub focus_in { 422sub invoke_focus_in {
416 my ($self) = @_; 423 my ($self) = @_;
417 424
418 return if $FOCUS == $self; 425 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
420 427
421 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
422 429
423 $self->_emit (focus_in => $focus);
424
425 $focus->update if $focus; 430 $focus->update if $focus;
426 $FOCUS->update; 431 $FOCUS->update;
427}
428 432
433 0
434}
435
429sub focus_out { 436sub invoke_focus_out {
430 my ($self) = @_; 437 my ($self) = @_;
431 438
432 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
433 440
434 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
435 442
436 $self->_emit (focus_out => $focus);
437
438 $focus->update if $focus; #? 443 $focus->update if $focus; #?
439 444
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 446 unless $FOCUS;
442}
443 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
444sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
445sub button_up { } 458sub invoke_button_up { 1 }
446sub key_down { } 459sub invoke_key_down { 1 }
447sub key_up { } 460sub invoke_key_up { 1 }
448 461
449sub button_down { 462sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
451 464
452 $self->focus_in; 465 $self->grab_focus;
466
467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
453} 483}
454 484
455sub find_widget { 485sub find_widget {
456 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
457 487
… …
467sub set_parent { 497sub set_parent {
468 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
469 499
470 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 502}
496 503
497sub realloc { 504sub realloc {
498 my ($self) = @_; 505 my ($self) = @_;
499 506
… …
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 550
544 glPushMatrix; 551 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 553
549 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 556 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 558 glBegin GL_QUADS;
556 glVertex $x , $y; 559 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
560 glEnd; 563 glEnd;
561 glDisable GL_BLEND; 564 glDisable GL_BLEND;
562 } 565 }
563 566
564 if ($ENV{CFPLUS_DEBUG} & 1) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 568 glPushMatrix;
566 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 572 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
573 glEnd; 576 glEnd;
574 glPopMatrix; 577 glPopMatrix;
575 #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;
576 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
577} 583}
578 584
579sub _draw { 585sub _draw {
580 my ($self) = @_; 586 my ($self) = @_;
581 587
… …
584 590
585sub DESTROY { 591sub DESTROY {
586 my ($self) = @_; 592 my ($self) = @_;
587 593
588 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
589 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590} 598}
591 599
592############################################################################# 600#############################################################################
593 601
594package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
619 627
620 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
622 630
623 glEnable GL_BLEND; 631 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 633 glColor_premultiply @$color;
626 634
627 glBegin GL_QUADS; 635 glBegin GL_QUADS;
628 glVertex 0 , 0; 636 glVertex 0 , 0;
629 glVertex 0 , $h; 637 glVertex 0 , $h;
630 glVertex $w, $h; 638 glVertex $w, $h;
… …
661our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
662 670
663sub new { 671sub new {
664 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
665 673
666 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
667 675
668 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
669 children => [], 677 children => [],
670 can_events => 0, 678 can_events => 0,
671 %arg, 679 %arg,
672 ); 680 );
681
673 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
674 684
675 $self 685 $self
676} 686}
677 687
678sub add { 688sub add {
… …
726 $x -= $self->{x}; 736 $x -= $self->{x};
727 $y -= $self->{y}; 737 $y -= $self->{y};
728 738
729 my $res; 739 my $res;
730 740
731 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
733 and return $res; 743 and return $res;
734 } 744 }
735 745
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757} 767}
758 768
759sub add { 769sub add {
760 my ($self, $child) = @_; 770 my ($self, $child) = @_;
761 771
762 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
763
764 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
765} 774}
766 775
767sub remove { 776sub remove {
768 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
777 786
778sub size_request { 787sub size_request {
779 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
780} 789}
781 790
782sub size_allocate { 791sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
784 793
785 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
786} 797}
787 798
788############################################################################# 799#############################################################################
800
801# back-buffered drawing area
789 802
790package CFClient::UI::Window; 803package CFClient::UI::Window;
791 804
792our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
793 806
… …
804 817
805 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
806 $self->SUPER::update; 819 $self->SUPER::update;
807} 820}
808 821
809sub size_allocate { 822sub invoke_size_allocate {
810 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
811 824
812 $self->SUPER::size_allocate ($w, $h);
813 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
814} 828}
815 829
816sub _render { 830sub _render {
817 my ($self) = @_; 831 my ($self) = @_;
818 832
… …
845 my $tex = $self->{texture} 859 my $tex = $self->{texture}
846 or return; 860 or return;
847 861
848 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
851 865
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 867
854 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
855} 869}
… …
879 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
880 894
881 ($w, $h) 895 ($w, $h)
882} 896}
883 897
884sub size_allocate { 898sub invoke_size_allocate {
885 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
886 900
887 my $child = $self->child; 901 my $child = $self->child;
888 902
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891 905
892 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
893 $self->update; 907 $self->update;
908
909 1
894} 910}
895 911
896sub set_offset { 912sub set_offset {
897 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
898 914
… …
946package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
947 963
948our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
949 965
950sub new { 966sub new {
951 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
952 970
953 my $self; 971 my $self;
954 972
955 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
956 vertical => 1, 974 vertical => 1,
… …
961 ; 979 ;
962 980
963 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 982 vp => (new CFClient::UI::ViewPort expand => 1),
965 slider => $slider, 983 slider => $slider,
966 @_, 984 %arg,
967 ); 985 );
968 986
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
972 989
973 $self 990 $self
991}
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
974} 997}
975 998
976sub update { 999sub update {
977 my ($self) = @_; 1000 my ($self) = @_;
978 1001
… …
981 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984} 1007}
985 1008
986sub size_allocate { 1009sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1010 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990 1011
991 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
993} 1016}
994 1017
995#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll 1019# update viewport offset on scroll
997 1020
… …
1017 1040
1018 if ($self->{bg}) { 1041 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
1020 1043
1021 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1024 1047
1025 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1049 glVertex 0 , 0;
1027 glVertex 0 , $h; 1050 glVertex 0 , $h;
1028 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1076
1054sub new { 1077sub new {
1055 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1056
1057 my $title = delete $arg{title};
1058 1079
1059 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1083 border => 0.6,
… …
1064 min_w => 16, 1085 min_w => 16,
1065 min_h => 16, 1086 min_h => 16,
1066 %arg, 1087 %arg,
1067 ); 1088 );
1068 1089
1069 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1070 align => 0, 1091 align => 0,
1071 valign => 1, 1092 valign => 1,
1072 text => $title, 1093 text => $self->{title},
1073 fontsize => $self->{border} 1094 fontsize => $self->{border},
1074 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1075 1105
1076 $self 1106 $self
1077} 1107}
1078 1108
1079sub add { 1109sub add {
1080 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1081 1111
1082 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1115}
1085 1116
1086sub border { 1117sub border {
1087 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1088} 1119}
1089 1120
1090sub size_request { 1121sub size_request {
1091 my ($self) = @_; 1122 my ($self) = @_;
1092 1123
1093 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1094 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1095 1129
1096 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1097 1131
1098 ( 1132 (
1099 $w + $self->border * 2, 1133 $w + $self->border * 2,
1100 $h + $self->border * 2, 1134 $h + $self->border * 2,
1101 ) 1135 )
1102} 1136}
1103 1137
1104sub size_allocate { 1138sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1106 1140
1107 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1145 }
1112 1146
1113 my $border = $self->border; 1147 my $border = $self->border;
1114 1148
1115 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1116 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1117 1151
1118 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1119}
1120 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1121sub button_down { 1160sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1123 1162
1124 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1164 my $border = $self->border;
1126 1165
… …
1142 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1143 1182
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1187 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1188 };
1150 1189
1151 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1157 1196
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1198
1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1161 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1162 } 1207 1
1163} 1208}
1164 1209
1165sub button_up { 1210sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1167 1212
1168 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1169} 1214}
1170 1215
1171sub mouse_motion { 1216sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1173 1218
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1175} 1222}
1176 1223
1177sub _draw { 1224sub _draw {
1178 my ($self) = @_; 1225 my ($self) = @_;
1179 1226
… …
1205 1252
1206 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1207 1254
1208 $child->draw; 1255 $child->draw;
1209 1256
1210 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1213 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1214} 1266}
1215 1267
1216############################################################################# 1268#############################################################################
1217 1269
1218package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1241 1293
1242 $child->set_parent ($self); 1294 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1244 1296
1245 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1246} 1304}
1247 1305
1248# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1249sub clear { 1307sub clear {
1250 my ($self) = @_; 1308 my ($self) = @_;
… …
1291 (sum @$ws), 1349 (sum @$ws),
1292 (sum @$hs), 1350 (sum @$hs),
1293 ) 1351 )
1294} 1352}
1295 1353
1296sub size_allocate { 1354sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1298 1356
1299 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1300 1358
1301 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1333 } 1391 }
1334 1392
1335 $y += $row_h; 1393 $y += $row_h;
1336 } 1394 }
1337 1395
1396 1
1338} 1397}
1339 1398
1340sub find_widget { 1399sub find_widget {
1341 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1342 1401
… …
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 ) 1440 )
1382} 1441}
1383 1442
1384sub size_allocate { 1443sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1386 1445
1387 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1389 1448
1390 my @req; 1449 my @req;
1391 1450
1392 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1394 } else { 1453 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1397 1456
1398 if ($req > $space) { 1457 if ($req > $space) {
1399 # ah well, not enough space 1458 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1401 } else { 1460 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1462
1404 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1405 1464
1406 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1466 for 0 .. $#children;
1408 } 1467 }
1409 } 1468 }
1410 1469
1411 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1412 1471
1413 my $pos = 0; 1472 my $pos = 0;
1414 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1417 1476
1418 $pos += $alloc; 1477 $pos += $alloc;
1419 } 1478 }
1420 1479
1421 1 1480 1
… …
1511 1570
1512 delete $self->{texture}; 1571 delete $self->{texture};
1513 $self->SUPER::update; 1572 $self->SUPER::update;
1514} 1573}
1515 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1516sub set_text { 1582sub set_text {
1517 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1518 1584
1519 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1521 1587
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1524 1590
1591 delete $self->{size_req};
1525 $self->realloc; 1592 $self->realloc;
1526 $self->update; 1593 $self->update;
1527} 1594}
1528 1595
1529sub set_markup { 1596sub set_markup {
… …
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1603
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1539 1606
1607 delete $self->{size_req};
1540 $self->realloc; 1608 $self->realloc;
1541 $self->update; 1609 $self->update;
1542} 1610}
1543 1611
1544sub size_request { 1612sub size_request {
1545 my ($self) = @_; 1613 my ($self) = @_;
1546 1614
1615 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1621
1553 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1554 1623
1555 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1627
1559 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1560 1629
1561 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1563 } 1635 };
1564 1636
1565 ($w, $h) 1637 @{ $self->{size_req} }
1566} 1638}
1567 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1568sub size_allocate { 1644sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1570 1646
1571 delete $self->{ox}; 1647 delete $self->{ox};
1572 1648
1573 delete $self->{texture} 1649 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1575} 1653}
1576 1654
1577sub set_fontsize { 1655sub set_fontsize {
1578 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1579 1657
1580 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1581 delete $self->{texture}; 1659 delete $self->{texture};
1582 1660
1583 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1584} 1670}
1585 1671
1586sub _draw { 1672sub _draw {
1587 my ($self) = @_; 1673 my ($self) = @_;
1588 1674
… …
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1610 }; 1696 };
1611 1697
1612 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1614 1702
1615 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1616 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1618 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1620 } 1710 }
1621 1711
1622 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1623} 1713}
1624 1714
… …
1641 can_hover => 1, 1731 can_hover => 1,
1642 can_focus => 1, 1732 can_focus => 1,
1643 valign => 0, 1733 valign => 0,
1644 can_events => 1, 1734 can_events => 1,
1645 #text => ... 1735 #text => ...
1736 #hidden => "*",
1646 @_ 1737 @_
1647 ) 1738 )
1648} 1739}
1649 1740
1650sub _set_text { 1741sub _set_text {
… …
1652 1743
1653 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1654 1745
1655 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1656 1747
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1749 $self->{text} = $text;
1661 1750
1662 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1664 1754
1665 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1666} 1759}
1667 1760
1668sub set_text { 1761sub set_text {
1669 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1670 1763
1671 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1765 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1766}
1676 1767
1677sub get_text { 1768sub get_text {
1678 $_[0]{text} 1769 $_[0]{text}
1679} 1770}
… …
1684 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1685 1776
1686 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1687} 1778}
1688 1779
1689sub key_down { 1780sub invoke_key_down {
1690 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1691 1782
1692 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1706 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1707 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1709 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1802 $self->emit ('escape');
1712 } elsif ($uni) { 1803 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1714 } 1807 }
1715 1808
1716 $self->_set_text ($text); 1809 $self->_set_text ($text);
1717 1810
1718 $self->realloc; 1811 $self->realloc;
1719}
1720 1812
1813 1
1814}
1815
1721sub focus_in { 1816sub invoke_focus_in {
1722 my ($self) = @_; 1817 my ($self) = @_;
1723 1818
1724 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1725 1820
1726 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1727} 1822}
1728 1823
1729sub button_down { 1824sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1731 1826
1732 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 1828
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 1830
1736 # byte-index to char-index 1831 # byte-index to char-index
1737 my $text = $self->{text}; 1832 my $text = $self->{text};
1738 utf8::encode $text; 1833 utf8::encode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1740 1835
1741 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1742 $self->update; 1837 $self->update;
1838
1839 1
1743} 1840}
1744 1841
1745sub mouse_motion { 1842sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1748} 1847}
1749 1848
1750sub _draw { 1849sub _draw {
1751 my ($self) = @_; 1850 my ($self) = @_;
1752 1851
1753 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1754 1853
1755 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1758 } else { 1857 } else {
1759 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1760 } 1859 }
1761 1860
1762 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1864 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1793 1892
1794our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1795 1894
1796use CFClient::OpenGL; 1895use CFClient::OpenGL;
1797 1896
1798sub key_down { 1897sub invoke_key_down {
1799 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1800 1899
1801 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1802 1901
1803 if ($sym == 13) { 1902 if ($sym == 13) {
1804 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1806 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1809 $self->update; 1909 $self->update;
1810 1910
1811 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1829 } else { 1929 } else {
1830 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1831 } 1931 }
1832 1932
1833 } else { 1933 } else {
1834 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1835 } 1937 1
1836
1837} 1938}
1838 1939
1839############################################################################# 1940#############################################################################
1840 1941
1841package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1862 can_events => 1, 1963 can_events => 1,
1863 @_ 1964 @_
1864 ) 1965 )
1865} 1966}
1866 1967
1867sub activate { }
1868
1869sub button_up { 1968sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1871 1970
1872 $self->emit ("activate") 1971 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1875} 1976}
1876 1977
1877sub _draw { 1978sub _draw {
1878 my ($self) = @_; 1979 my ($self) = @_;
1879 1980
1880 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 1982
1886 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1889 1986
1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1891 1988
1892 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1893 1990
1894 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1895} 2028}
1896 2029
1897############################################################################# 2030#############################################################################
1898 2031
1899package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1926 my ($self) = @_; 2059 my ($self) = @_;
1927 2060
1928 (6) x 2 2061 (6) x 2
1929} 2062}
1930 2063
1931sub button_down { 2064sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1933 2066
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1937 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1938 } 2075 1
1939} 2076}
1940 2077
1941sub _draw { 2078sub _draw {
1942 my ($self) = @_; 2079 my ($self) = @_;
1943 2080
… …
1963package CFClient::UI::Image; 2100package CFClient::UI::Image;
1964 2101
1965our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1966 2103
1967use CFClient::OpenGL; 2104use CFClient::OpenGL;
1968use Carp qw/confess/;
1969 2105
1970our %loaded_images; 2106our %texture_cache;
1971 2107
1972sub new { 2108sub new {
1973 my $class = shift; 2109 my $class = shift;
1974 2110
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1976 2115
1977 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1978 2118
1979 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1980 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1981 2121
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1983 2123
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2125
1988 $self 2126 $self
1989} 2127}
1990 2128
1991sub size_request { 2129sub size_request {
1992 my ($self) = @_; 2130 my ($self) = @_;
1993 2131
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1995} 2133}
1996 2134
1997sub _draw { 2135sub _draw {
1998 my ($self) = @_; 2136 my ($self) = @_;
1999 2137
… …
2110 2248
2111 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2113 2251
2114 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2257
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2234 $self->update; 2373 $self->update;
2235 2374
2236 $self 2375 $self
2237} 2376}
2238 2377
2239sub changed { }
2240
2241sub set_range { 2378sub set_range {
2242 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2243 2380
2244 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2245 2382
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2248} 2387}
2249 2388
2250sub set_value { 2389sub set_value {
2251 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2252 2391
… …
2263 if $unit; 2402 if $unit;
2264 2403
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 2405
2267 if ($value != $old_value) { 2406 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2269 $self->update; 2408 $self->update;
2270 } 2409 }
2271} 2410}
2272 2411
2273sub size_request { 2412sub size_request {
2274 my ($self) = @_; 2413 my ($self) = @_;
2275 2414
2276 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2277} 2416}
2278 2417
2279sub button_down { 2418sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2281 2420
2282 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 2422
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2424
2286 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2287} 2426}
2288 2427
2289sub mouse_motion { 2428sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2291 2430
2292 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 2433
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2435
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2437
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2300 } 2443 1
2301} 2444}
2302 2445
2303sub update { 2446sub update {
2304 my ($self) = @_; 2447 my ($self) = @_;
2305 2448
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2308 2458
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2311 2461
… …
2317 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2319 2469
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2322 }); 2472 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2473
2330 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2331 2475
2332 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2333 2477
… …
2394sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2396 2540
2397############################################################################# 2541#############################################################################
2398 2542
2399package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2400 2544
2401our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2402 2546
2403use CFClient::OpenGL; 2547use CFClient::OpenGL;
2404 2548
… …
2406 my $class = shift; 2550 my $class = shift;
2407 2551
2408 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2409 fontsize => 1, 2553 fontsize => 1,
2410 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2411 #font => default_font 2556 #font => default_font
2412 @_, 2557 @_,
2413 2558
2414 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2415 par => [], 2560 par => [],
… …
2430 2575
2431 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2432 $self->reflow; 2577 $self->reflow;
2433} 2578}
2434 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2435sub size_allocate { 2586sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 2587 my ($self, $w, $h) = @_;
2437 2588
2438 $self->SUPER::size_allocate ($w, $h); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 2591
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443 2596
2444 $self->reflow; 2597 $self->reflow;
2445}
2446 2598
2447sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2448 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2449 2604
2450 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2451 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2455 2618 );
2619
2456 $layout->size 2620 $layout
2457} 2621}
2458 2622
2459sub reflow { 2623sub reflow {
2460 my ($self) = @_; 2624 my ($self) = @_;
2461 2625
… …
2470 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2471} 2635}
2472 2636
2473sub clear { 2637sub clear {
2474 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2475 2642
2476 $self->{par} = []; 2643 $self->{par} = [];
2477 $self->{height} = 0; 2644 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 2646}
2480 2647
2481sub add_paragraph { 2648sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2483 2650
2484 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2485 my ($w, $h) = $self->text_size ($line); 2652
2486 $self->{height} += $h; 2653 $para = {
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2488 } 2660 };
2489 2661
2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2491} 2674}
2492 2675
2493sub update { 2676sub update {
2494 my ($self) = @_; 2677 my ($self) = @_;
2495 2678
… …
2497 2680
2498 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2499 2682
2500 delete $self->{texture}; 2683 delete $self->{texture};
2501 2684
2502 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 2687
2505 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2506 my $height = 0; 2689 my $height = 0;
2507 2690
2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2514 $layout->set_width ($W - $_->[3]); 2693 my $layout = $self->get_layout ($para);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size; 2694 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3]; 2695
2518 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2519 } 2699 }
2520 2700
2521 $height += $_->[1]; 2701 $height += $para->{h};
2522 } 2702 }
2523 2703
2524 $self->{height} = $height; 2704 $self->{height} = $height;
2525 2705
2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527 2707
2528 delete $self->{texture}; 2708 delete $self->{texture};
2529 } 2709 }
2530 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2716 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2534 2718
2535 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2536 2720
2537 my $y0 = $top; 2721 my $y0 = $top;
2538 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2539 2723
2540 my $y = 0; 2724 my $y = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545 2725
2546 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549 2729
2550 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 2731 my $h = $para->{h};
2552 2732
2553 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] }); 2734
2555 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($par->[4]);
2557 2736
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2559 2738
2560 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2562 } 2754 }
2563 2755
2564 $y += $h; 2756 $y += $h;
2565 } 2757 }
2566 2758
2567 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2568 }; 2760 };
2569 }); 2761 });
2570} 2762}
2571 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2572sub _draw { 2773sub _draw {
2573 my ($self) = @_; 2774 my ($self) = @_;
2574 2775
2575 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2580 2781
2581 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2582
2583} 2783}
2584 2784
2585############################################################################# 2785#############################################################################
2586 2786
2587package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 2874 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2875 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 2876 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 2877 . "visible $widget->{visible}";
2678 } 2878 }
2879
2880 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//;
2679 2882
2680 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2681 markup => $tooltip, 2884 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 2886 fontsize => 0.8,
… …
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 2897
2695 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2696} 2899}
2697 2900
2698sub size_allocate { 2901sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2700 2903
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 2905}
2703 2906
2704sub visibility_change { 2907sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 2908 my ($self, $visible) = @_;
2706 2909
2707 return unless $visible; 2910 return unless $visible;
2708 2911
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 2912 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2711 or return; 2914 or return;
2712 2915
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 2917
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 2919 if $x + $self->{w} > $self->{root}{w};
2717 2920
2718 $self->move_abs ($x, $y); 2921 $self->move_abs ($x, $y);
2719 }); 2922 });
2720} 2923}
2721 2924
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 3014
2812 if ($tex) { 3015 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2818 } 3021 }
2819} 3022}
2820 3023
2821sub DESTROY { 3024sub destroy {
2822 my ($self) = @_; 3025 my ($self) = @_;
2823 3026
2824 $self->{timer}->cancel 3027 $self->{timer}->cancel
2825 if $self->{timer}; 3028 if $self->{timer};
2826 3029
2827 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2828} 3031}
3032
3033#############################################################################
3034
3035package CFClient::UI::Buttonbar;
3036
3037our @ISA = CFClient::UI::HBox::;
3038
3039# TODO: should actualyl wrap buttons and other goodies.
2829 3040
2830############################################################################# 3041#############################################################################
2831 3042
2832package CFClient::UI::Menu; 3043package CFClient::UI::Menu;
2833 3044
… …
2845 ); 3056 );
2846 3057
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 3059
2849 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2851 3062
2852 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2853 if (!ref $widget) { 3064 if (!ref $widget) {
2854 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2855 can_hover => 1, 3066 can_hover => 1,
2856 can_events => 1, 3067 can_events => 1,
2857 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2858 } 3070 }
2859 3071
2860 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2861 3073
2862 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
… …
2867 3079
2868# popup given the event (must be a mouse button down event currently) 3080# popup given the event (must be a mouse button down event currently)
2869sub popup { 3081sub popup {
2870 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
2871 3083
2872 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
2873 3085
2874 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3087 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2877 3089
2878 $self->show; 3090 $self->show;
2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 3092}
2881 3093
2882sub mouse_motion { 3094sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2884 3096
2885 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3100
3101 0
3102}
3103
2890sub button_up { 3104sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2892 3106
2893 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3108 undef $GRAB;
2895 $self->hide; 3109 $self->hide;
2896 3110
2897 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3113 } else {
3114 return 0
3115 }
3116
2899 } 3117 1
2900} 3118}
2901 3119
2902############################################################################# 3120#############################################################################
2903 3121
2904package CFClient::UI::Statusbox; 3122package CFClient::UI::Multiplexer;
2905 3123
2906our @ISA = CFClient::UI::VBox::; 3124our @ISA = CFClient::UI::Container::;
2907 3125
2908sub new { 3126sub new {
2909 my $class = shift; 3127 my $class = shift;
2910 3128
2911 $class->SUPER::new ( 3129 my $self = $class->SUPER::new (
3130 @_,
3131 );
3132
3133 $self->{current} = $self->{children}[0]
3134 if @{ $self->{children} };
3135
3136 $self
3137}
3138
3139sub add {
3140 my ($self, @widgets) = @_;
3141
3142 $self->SUPER::add (@widgets);
3143
3144 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} };
3146}
3147
3148sub set_current_page {
3149 my ($self, $page_or_widget) = @_;
3150
3151 my $widget = ref $page_or_widget
3152 ? $page_or_widget
3153 : $self->{children}[$page_or_widget];
3154
3155 $self->{current} = $widget;
3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3157
3158 $self->emit (page_changed => $self->{current});
3159
3160 $self->realloc;
3161}
3162
3163sub visible_children {
3164 $_[0]{current}
3165}
3166
3167sub size_request {
3168 my ($self) = @_;
3169
3170 $self->{current}->size_request
3171}
3172
3173sub invoke_size_allocate {
3174 my ($self, $w, $h) = @_;
3175
3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3179}
3180
3181sub _draw {
3182 my ($self) = @_;
3183
3184 $self->{current}->draw;
3185}
3186
3187#############################################################################
3188
3189package CFClient::UI::Notebook;
3190
3191our @ISA = CFClient::UI::VBox::;
3192
3193sub new {
3194 my $class = shift;
3195
3196 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self
3200 @_,
3201 );
3202
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3204 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3205
3206 $self
3207}
3208
3209sub add {
3210 my ($self, $title, $widget, $tooltip) = @_;
3211
3212 Scalar::Util::weaken $self;
3213
3214 $self->{buttonbar}->add (new CFClient::UI::Button
3215 markup => $title,
3216 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) },
3218 );
3219
3220 $self->{multiplexer}->add ($widget);
3221}
3222
3223sub set_current_page {
3224 my ($self, $page) = @_;
3225
3226 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current});
3228}
3229
3230#############################################################################
3231
3232package CFClient::UI::Combobox;
3233
3234use utf8;
3235
3236our @ISA = CFClient::UI::Button::;
3237
3238sub new {
3239 my $class = shift;
3240
3241 my $self = $class->SUPER::new (
3242 options => [], # [value, title, longdesc], ...
3243 value => undef,
3244 @_,
3245 );
3246
3247 $self->_set_value ($self->{value});
3248
3249 $self
3250}
3251
3252sub invoke_button_down {
3253 my ($self, $ev) = @_;
3254
3255 my @menu_items;
3256
3257 for (@{ $self->{options} }) {
3258 my ($value, $title, $tooltip) = @$_;
3259
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 }
3262
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264}
3265
3266sub _set_value {
3267 my ($self, $value) = @_;
3268
3269 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3270 or return;
3271
3272 $self->{value} = $item->[0];
3273 $self->set_markup ("$item->[1] ⇓");
3274 $self->set_tooltip ($item->[2]);
3275}
3276
3277sub set_value {
3278 my ($self, $value) = @_;
3279
3280 return unless $self->{value} ne $value;
3281
3282 $self->_set_value ($value);
3283 $self->emit (changed => $value);
3284}
3285
3286#############################################################################
3287
3288package CFClient::UI::Statusbox;
3289
3290our @ISA = CFClient::UI::VBox::;
3291
3292sub new {
3293 my $class = shift;
3294
3295 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3296 fontsize => 0.8,
2913 @_, 3297 @_,
2914 ) 3298 );
3299
3300 Scalar::Util::weaken (my $this = $self);
3301
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303
3304 $self
2915} 3305}
2916 3306
2917sub reorder { 3307sub reorder {
2918 my ($self) = @_; 3308 my ($self) = @_;
2919 my $NOW = time; 3309 my $NOW = Time::HiRes::time;
3310
3311 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} };
2920 3315
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3318 }
2924 3319
… …
2927 my @items = sort { 3322 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3323 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3324 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3325 } values %{ $self->{item} };
2931 3326
3327 $self->{timer}->interval (1);
3328
2932 my $count = 10 + 1; 3329 my $count = 10 + 1;
2933 for my $item (@items) { 3330 for my $item (@items) {
2934 last unless --$count; 3331 last unless --$count;
2935 3332
2936 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3335 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3336 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3337 : $item->{text};
2941 3338
… …
2949 tooltip => $item->{tooltip}, 3346 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3347 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3348 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3349 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3350 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3351 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3352 can_events => 1,
2956 can_hover => 1 3353 can_hover => 1
2957 }; 3354 };
3355
3356 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3357 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3358 $label->update;
3359 $label->set_max_size (undef, $label->{req_h} * $diff)
3360 if $diff < 1;
3361 $self->{timer}->interval (1/30);
3362 } else {
3363 $label->{fg}[3] = $item->{fg}[3] || 1;
3364 }
3365
3366 push @widgets, $label;
2958 } 3367 }
2959 3368
2960 $self->clear; 3369 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3370 $self->SUPER::add (reverse @widgets);
2962} 3371}
… …
2967 $text =~ s/^\s+//; 3376 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3377 $text =~ s/\s+$//;
2969 3378
2970 return unless $text; 3379 return unless $text;
2971 3380
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3381 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3382
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3383 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3384
2976 if (my $item = $self->{item}{$group}) { 3385 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3386 if ($item->{text} eq $text) {
2978 $item->{count}++; 3387 $item->{count}++;
2979 } else { 3388 } else {
2980 $item->{count} = 1; 3389 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
2982 } 3391 }
2983 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3394 delete $item->{label};
2986 } else { 3395 } else {
2987 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3397 id => ++$self->{id},
… …
3007 3416
3008 $self->reorder; 3417 $self->reorder;
3009 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
3010} 3419}
3011 3420
3421sub destroy {
3422 my ($self) = @_;
3423
3424 $self->{timer}->cancel;
3425
3426 $self->SUPER::destroy;
3427}
3428
3012############################################################################# 3429#############################################################################
3013 3430
3014package CFClient::UI::Inventory; 3431package CFClient::UI::Inventory;
3015 3432
3016our @ISA = CFClient::UI::ScrolledWindow::; 3433our @ISA = CFClient::UI::ScrolledWindow::;
3017 3434
3018sub new { 3435sub new {
3019 my $class = shift; 3436 my $class = shift;
3020 3437
3021 my $self = $class->SUPER::new ( 3438 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_, 3440 @_,
3024 ); 3441 );
3025 3442
3026 $self 3443 $self
3027} 3444}
3028 3445
3029sub set_items { 3446sub set_items {
3030 my ($self, $items) = @_; 3447 my ($self, $items) = @_;
3031 3448
3032 $self->{scrolled}->clear; 3449 $self->{child}->clear;
3033 return unless $items; 3450 return unless $items;
3034 3451
3035 my @items = sort { 3452 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3453 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3454 or ($a->{name} cmp $b->{name})
… …
3041 3458
3042 my $row = 0; 3459 my $row = 0;
3043 for my $item (@items) { 3460 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3461 CFClient::Item::update_widgets $item;
3045 3462
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3463 $self->{child}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3464 $self->{child}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3465 $self->{child}->add (2, $row, $item->{weight_widget});
3049 3466
3050 $row++; 3467 $row++;
3051 } 3468 }
3052} 3469}
3053 3470
… …
3115 $self->update_binding_widgets; 3532 $self->update_binding_widgets;
3116 3533
3117 $self 3534 $self
3118} 3535}
3119 3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3120sub commit { 3549sub commit {
3121 my ($self) = @_; 3550 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding; 3551 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) { 3552 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3158 my ($self) = @_; 3587 my ($self) = @_;
3159 $self->ask_for_bind (1); 3588 $self->ask_for_bind (1);
3160} 3589}
3161 3590
3162sub ask_for_bind { 3591sub ask_for_bind {
3163 my ($self, $commit) = @_; 3592 my ($self, $commit, $end_cb) = @_;
3164 3593
3165 CFClient::Binder::open_binding_dialog (sub { 3594 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_; 3595 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets; 3597 $self->update_binding_widgets;
3169 $self->commit if $commit; 3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3170 }); 3600 });
3171} 3601}
3172 3602
3173# $mod and $sym are the modifiers and key symbol 3603# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands) 3604# $cmds is a array ref of strings (the commands)
… …
3192} 3622}
3193 3623
3194# this is a shortcut method that asks for a binding 3624# this is a shortcut method that asks for a binding
3195# and then just binds it. 3625# and then just binds it.
3196sub do_quick_binding { 3626sub do_quick_binding {
3197 my ($self, $cmds) = @_; 3627 my ($self, $cmds, $end_cb) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub { 3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1); 3629 $self->ask_for_bind (1, $end_cb);
3202} 3630}
3203 3631
3204sub update_binding_widgets { 3632sub update_binding_widgets {
3205 my ($self) = @_; 3633 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding; 3634 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3250 3678
3251############################################################################# 3679#############################################################################
3252 3680
3253package CFClient::UI::SpellList; 3681package CFClient::UI::SpellList;
3254 3682
3255our @ISA = CFClient::UI::FancyFrame::; 3683our @ISA = CFClient::UI::Table::;
3256 3684
3257sub new { 3685sub new {
3258 my $class = shift; 3686 my $class = shift;
3259 3687
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3688 my $self = $class->SUPER::new (
3261 3689 binding => [],
3262 $self->add (new CFClient::UI::ScrolledWindow 3690 commands => [],
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3691 @_,
3264 3692 )
3265 $self;
3266} 3693}
3267 3694
3268# XXX: Do sorting? Argl... 3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3269sub add_spell { 3780sub add_spell {
3270 my ($self, $spell) = @_; 3781 my ($self, $spell) = @_;
3782
3271 $self->{spells}->{$spell->{name}} = $spell; 3783 $self->{spell}->{$spell->{name}} = $spell;
3272 3784 $self->rebuild_spell_list;
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300} 3785}
3301 3786
3302sub remove_spell { 3787sub remove_spell {
3303 my ($self, $spell) = @_; 3788 my ($self, $spell) = @_;
3789
3304 delete $self->{spells}->{$spell->{name}}; 3790 delete $self->{spell}->{$spell->{name}};
3305 $self->rebuild_spell_list; 3791 $self->rebuild_spell_list;
3306} 3792}
3307 3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3308############################################################################# 3801#############################################################################
3309 3802
3310package CFClient::UI::Root; 3803package CFClient::UI::Root;
3311 3804
3312our @ISA = CFClient::UI::Container::; 3805our @ISA = CFClient::UI::Container::;
3806
3807use List::Util qw(min max);
3313 3808
3314use CFClient::OpenGL; 3809use CFClient::OpenGL;
3315 3810
3316sub new { 3811sub new {
3317 my $class = shift; 3812 my $class = shift;
… …
3344 $coord = $max - $size if $coord > $max - $size; 3839 $coord = $max - $size if $coord > $max - $size;
3345 3840
3346 int $coord + 0.5 3841 int $coord + 0.5
3347} 3842}
3348 3843
3349sub size_allocate { 3844sub invoke_size_allocate {
3350 my ($self, $w, $h) = @_; 3845 my ($self, $w, $h) = @_;
3351 3846
3352 for my $child ($self->children) { 3847 for my $child ($self->children) {
3353 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3354 3849
… …
3358 $X = _to_pixel $X, $W, $self->{w}; 3853 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
3360 3855
3361 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3362 } 3857 }
3858
3859 1
3363} 3860}
3364 3861
3365sub coord2local { 3862sub coord2local {
3366 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3367 3864
… …
3452 3949
3453 delete $queue{$widget+0}; 3950 delete $queue{$widget+0};
3454 3951
3455 my ($w, $h) = $widget->size_request; 3952 my ($w, $h) = $widget->size_request;
3456 3953
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3954 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3955 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3956
3957 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3958 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3459 3959
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 3960 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 3961 $h = $widget->{force_h} if exists $widget->{force_h};
3462 3962
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3963 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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